From f0a1a07592c0528ba37c772decf16deada08c490 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 25 Nov 2020 08:19:23 +0100
Subject: [PATCH 001/437] chg: [galaxyElement] Added draft of element
 flattening and unflattening

---
 app/Controller/GalaxyElementsController.php | 11 +++++
 app/Lib/Tools/ArrayFlattenerTool.php        | 55 +++++++++++++++++++++
 app/View/GalaxyElements/ajax/index.ctp      |  2 +
 3 files changed, 68 insertions(+)
 create mode 100644 app/Lib/Tools/ArrayFlattenerTool.php

diff --git a/app/Controller/GalaxyElementsController.php b/app/Controller/GalaxyElementsController.php
index 68c3759c6..e60003aae 100644
--- a/app/Controller/GalaxyElementsController.php
+++ b/app/Controller/GalaxyElementsController.php
@@ -26,4 +26,15 @@ class GalaxyElementsController extends AppController
             $this->render('ajax/index');
         }
     }
+
+    public function indexTree($clusterId)
+    {
+        $elements = $this->GalaxyElement->fetchElements($this->Auth->user(), $clusterId);
+        $keyedValue = [];
+        foreach ($elements as $i => $element) {
+            $keyedValue[$element['key']][] = $element['value'];
+        }
+        $expanded = Hash::expand($keyedValue);
+        return $this->RestResponse->viewData($expanded);
+    }
 }
diff --git a/app/Lib/Tools/ArrayFlattenerTool.php b/app/Lib/Tools/ArrayFlattenerTool.php
new file mode 100644
index 000000000..a7b321459
--- /dev/null
+++ b/app/Lib/Tools/ArrayFlattenerTool.php
@@ -0,0 +1,55 @@
+<?php
+class ArrayFlattenerTool
+{
+    public function flatten($array)
+    {
+        return $this->array_flatten($array);
+    }
+
+    public function unflatten($array)
+    {
+        return $this->array_unflatten($array);
+    }
+    
+    /**
+     * array_flatten Perform a DFS while flattening the array
+     */
+    private function array_flatten($toFlatten, $prefix='', $separator='.')
+    {
+        $result = array();
+        foreach ($toFlatten as $k => $v)
+        {
+            $new_key = $prefix . (empty($prefix) ? '' : '.') . $k;
+            if (is_array($v)) {
+                $result = array_merge($result, $this->array_flatten($v, $new_key, $separator));
+            } else {
+                $result[$new_key] = $v;
+            }
+        }
+        return $result;
+    }
+
+    private function array_unflatten($toUnflatten, $separator='.')
+    {
+        $result = array();
+        foreach ($toUnflatten as $k => $v)
+        {
+            $decomposedKey = explode($separator, $k);
+            $result = $this->buildMultiDimensionalArrayFromKeypath($decomposedKey, $result, $v);
+        }
+        return $result;
+    }
+
+    private function buildMultiDimensionalArrayFromKeypath($keypath, $result, $value)
+    {
+        if (empty($keypath)) {
+            $result = $value;
+        } else {
+            foreach ($keypath as $key) {
+                array_shift($keypath);
+                $result[$key] = $this->buildMultiDimensionalArrayFromKeypath($keypath, $result, $value);
+            }
+        }
+        return $result;
+    }
+}
diff --git a/app/View/GalaxyElements/ajax/index.ctp b/app/View/GalaxyElements/ajax/index.ctp
index de3307d62..532052ecb 100755
--- a/app/View/GalaxyElements/ajax/index.ctp
+++ b/app/View/GalaxyElements/ajax/index.ctp
@@ -1,4 +1,6 @@
 <div class="pagination">
+    <!-- // CONVERT IT INTO generic index
+    // Add panel (index & tree view for key.with.dotted.path) -->
     <ul>
     <?php
         $this->Paginator->options(array(

From a8275e7503b3b6c0714e08957d0ce61bb8214a6a Mon Sep 17 00:00:00 2001
From: Koen Van Impe <koen.vanimpe@cudeso.be>
Date: Fri, 27 Nov 2020 12:41:23 +0100
Subject: [PATCH 002/437] Azure Active Directory Authentication

---
 .../Auth/AadAuthenticateAuthenticate.php      | 321 ++++++++++++++++++
 app/Plugin/AadAuth/README.md                  |  69 ++++
 app/View/Users/login.ctp                      |   3 +
 3 files changed, 393 insertions(+)
 create mode 100755 app/Plugin/AadAuth/Controller/Component/Auth/AadAuthenticateAuthenticate.php
 create mode 100755 app/Plugin/AadAuth/README.md

diff --git a/app/Plugin/AadAuth/Controller/Component/Auth/AadAuthenticateAuthenticate.php b/app/Plugin/AadAuth/Controller/Component/Auth/AadAuthenticateAuthenticate.php
new file mode 100755
index 000000000..a08fb646c
--- /dev/null
+++ b/app/Plugin/AadAuth/Controller/Component/Auth/AadAuthenticateAuthenticate.php
@@ -0,0 +1,321 @@
+<?php
+
+App::uses('BaseAuthenticate', 'Controller/Component/Auth');
+App::uses('RandomTool', 'Tools');
+
+if (session_status() == PHP_SESSION_NONE) {
+	session_start();
+}
+
+//  Generating a new session will fail the further flow of AAD. 
+//	session_regenerate_id();
+
+class AadAuthenticateAuthenticate extends BaseAuthenticate {	
+
+	/**
+	 * Holds the application ID
+	 *
+	 * @var string
+	 */
+	protected static $client_id;
+
+	/**
+	 * Azure Active Directory Tenant ID, with Multitenant apps you can use "common" as Tenant ID, but using specific endpoint is recommended when possible
+	 *
+	 * @var string
+	 */
+	protected static $ad_tenant;
+
+	/**
+	 * Client Secret, remember that this expires someday unless you haven't set it not to do so
+	 *
+	 * @var string
+	 */
+	protected static $client_secret;
+
+	/**
+	 * Redirect URI
+	 *
+	 * @var string
+	 */
+	protected static $redirect_uri;
+
+	/**
+	 * Provider authentication URL
+	 *
+	 * @var string
+	 */	
+	protected static $auth_provider;
+
+	/**
+	 * Provider URL for additional user details
+	 *
+	 * @var string
+	 */	
+	protected static $auth_provider_user;
+
+	/**
+	 * Flag that indicates if we need to check for AD groups for defining MISP access
+	 *
+	 * @var bool
+	 */	
+	protected static $check_ad_groups;
+
+	/**
+	 * AD group MISP user
+	 *
+	 * @var string
+	 */	
+	protected static $misp_user;
+
+	/**
+	 * AD group MISP org admin
+	 *
+	 * @var string
+	 */		
+	protected static $misp_orgadmin;
+
+	/**
+	 * AD group MISP siteadmin
+	 *
+	 * @var string
+	 */		
+	protected static $misp_siteadmin;
+
+
+	public function __construct()
+	{
+		self::$client_id = Configure::read('AadAuth.client_id');
+		self::$ad_tenant =  Configure::read('AadAuth.ad_tenant');
+		self::$client_secret =  Configure::read('AadAuth.client_secret');
+		self::$redirect_uri =  Configure::read('AadAuth.redirect_uri');
+		self::$auth_provider =  Configure::read('AadAuth.auth_provider');
+		self::$auth_provider_user =  Configure::read('AadAuth.auth_provider_user');
+		self::$misp_user =  Configure::read('AadAuth.misp_user');
+		self::$misp_orgadmin =  Configure::read('AadAuth.misp_orgadmin');
+		self::$misp_siteadmin =  Configure::read('AadAuth.misp_siteadmin');
+		self::$check_ad_groups =  Configure::read('AadAuth.check_ad_groups');
+
+		$this->Log = ClassRegistry::init('Log');
+		$this->Log->create();
+
+		$this->settings['fields'] = array('username' => 'email');
+	}
+
+	/**
+	 * Log to MISP and Cake
+	 * 
+	 * @param string $level			Log level
+	 * @param string $logmessage	Message to log
+	 * @return bool result of the log action
+	 */	
+	private function _log($level, $logmessage) 
+	{
+		$log = array(
+			'org' => 'SYSTEM',
+			'model' => 'User',
+			'model_id' => 0,
+			'email' => false,
+			'action' => 'auth',
+			'title' => $logmessage
+		);
+		$this->Log->save($log);				
+		CakeLog::write($level, $logmessage);
+
+		return true;
+	}
+
+	/**
+	 * Find the user to authenticate with
+	 * 
+	 * @param CakeRequest $request The request that contains login information.
+	 * @return mixed False on login failure. An array of User data on success.
+	 */		
+	public function getUser(CakeRequest $request) 
+	{
+		// we only proceed if called with a request to authenticate via AAD
+		if (array_key_exists('AzureAD', $request->query) and $request->query['AzureAD'] == 'enable') {
+			$user = $this->_getUserAad($request);
+			return $user;
+		}
+		elseif (array_key_exists('code', $request->query))  // in the Azure flow
+		{
+			$user = $this->_getUserAad($request);
+			return $user;
+		}
+		return false;
+	}
+
+	/**
+	 * Authenticate
+	 * 
+	 * @param CakeRequest $request The request that contains login information.
+	 * @param CakeResponse $response Unused response object.
+	 * @return mixed False on login failure. An array of User data on success.
+	 */	
+	public function authenticate(CakeRequest $request, CakeResponse $response) 
+	{
+		return self::getUser($request);
+	}
+
+	/**
+	 * Get the AAD user
+	 * 
+	 * @param CakeRequest $request The request that contains login information.
+	 * @return mixed False on login failure. An array of User data on success.
+	 */		
+	private function _getUserAad(CakeRequest $request)
+	{
+		if (!headers_sent()) {			
+			if (!isset($_GET["code"]) and !isset($_GET["error"])) {
+				$url = self::$auth_provider . self::$ad_tenant . "/oauth2/v2.0/authorize?";
+				$url .= "state=" . session_id();
+				$url .= "&scope=User.Read";
+				$url .= "&response_type=code";
+				$url .= "&approval_prompt=auto";
+				$url .= "&client_id=" . self::$client_id;
+				$url .= "&redirect_uri=" . urlencode(self::$redirect_uri);
+				header("Location: " . $url);  //So off you go my dear browser and welcome back for round two after some redirects at Azure end
+				$this->_log("info", "Redirect to Azure for authentication.");
+				exit; // we need to exit once the header to redirect to Azure is sent
+
+			} 
+			elseif (isset($_GET["error"])) {  //Second load of this page begins, but hopefully we end up to the next elseif section...
+				$this->_log("warning", "Return from Aure redirect. Error received at the beginning of second stage. _GET: " . http_build_query($_GET,'','  -  '));
+				return false;
+			}
+			elseif (strcmp(session_id(), $_GET["state"]) == 0) {
+				//Verifying the received tokens with Azure and finalizing the authentication part
+				$content = "grant_type=authorization_code";
+				$content .= "&client_id=" . self::$client_id;
+				$content .= "&redirect_uri=" . urlencode(self::$redirect_uri);
+				$content .= "&code=" . $_GET["code"];
+				$content .= "&client_secret=" . urlencode(self::$client_secret);
+				$options = array(
+					"http" => array(  //Use "http" even if you send the request with https
+					"method"  => "POST",
+					"header"  => "Content-Type: application/x-www-form-urlencoded\r\n" .
+						"Content-Length: " . strlen($content) . "\r\n",
+					"content" => $content
+					)
+				);
+				
+				$context  = stream_context_create($options);
+				$json = file_get_contents(self::$auth_provider . self::$ad_tenant . "/oauth2/v2.0/token", false, $context);
+  				if ($json === false) {
+					$this->_log("warning", "Error received during Bearer token fetch (context).");
+					// For debug : "PHP_Error" => error_get_last(), "\$_GET[]" => $_GET, "HTTP_msg" => $options), "");
+					return false;
+				} 
+
+  				$authdata = json_decode($json, true);
+				if (isset($authdata["error"])) {
+					$this->_log("warning", "Error received during Bearer token fetch (authdata).");
+					// For debug : "\$authdata[]" => $authdata, "\$_GET[]" => $_GET, "HTTP_msg" => $options), $error_email);
+					return false;
+				}
+
+				$options = array(
+					"http" => array(  //Use "http" even if you send the request with https
+					"method" => "GET",
+					"header" => "Accept: application/json\r\n" .
+						"Authorization: Bearer " . $authdata["access_token"] . "\r\n"
+					)
+				);
+
+				$context = stream_context_create($options); 
+				$this->_log("info", "Fetching user data from Azure.");
+				$json = file_get_contents(self::$auth_provider_user . "/v1.0/me", false, $context);
+				if ($json === false) {
+					$this->_log("warning", "Error received during user data fetch.");
+					// For debug : "PHP_Error" => error_get_last(), "\$_GET[]" => $_GET, "HTTP_msg" => $options), $error_email);
+					return false;
+				}
+
+				$userdata = json_decode($json, true);  //This should now contain your logged on user information
+				if (isset($userdata["error"])){
+					$this->_log("warning", "User data fetch contained an error.");
+					// For debug : "\$userdata[]" => $userdata, "\$authdata[]" => $authdata, "\$_GET[]" => $_GET, "HTTP_msg" => $options), $error_email);
+					return false;
+				} 
+
+				$mispUsername = false;
+				if (isset($userdata["userPrincipalName"])){
+					$userPrincipalName = $userdata["userPrincipalName"];
+
+					/*
+					 * TODO: add code to create users that exist in AAD but not in MISP
+					 * 		 similar as in ApacheShibbAuthenticate
+					 */
+
+					if (self::$check_ad_groups) {
+						if ($this->_checkAdGroup($authdata)) {
+							$mispUsername = $userPrincipalName;
+						}
+					}
+					else {
+						$mispUsername = $userPrincipalName;
+					}
+
+					if ($mispUsername) {
+						$this->_log("info", "Attempt authentication for ${mispUsername}");
+						return $this->_findUser($mispUsername);
+					}
+				}
+			}
+		}
+
+		// fall back
+		return false;
+	}
+
+	/**
+	 * Lookup the AAD groups this user belongs to
+	 * 
+	 * @param array $authdata The authdata array received from Azure
+	 * @return mixed False if no MISP groups have been found; String if a group was found
+	 */		
+	private function _checkAdGroup($authdata) 
+	{
+		$options = array(
+			"http" => array( //Use "http" even if you send the request with https
+			  "method" => "GET",
+			  "header" => "Accept: application/json\r\n" .
+				"Authorization: Bearer " . $authdata["access_token"] . "\r\n"
+			)
+		  );
+
+		$context = stream_context_create($options);
+		$this->_log("info", "Fetching user group data from Azure.");
+		$json = file_get_contents(self::$auth_provider_user . "/v1.0/me/memberOf", false, $context);
+		if ($json === false) {
+			$this->_log("warning", "Error received during user group data fetch.");	
+			// For debug : "PHP_Error" => error_get_last(), "\$_GET[]" => $_GET, "HTTP_msg" => $options), $error_email);
+			return false;
+		} 
+
+		$groupdata = json_decode($json, true);  //This should now contain your logged on user memberOf (groups) information
+		if (isset($groupdata["error"])) {
+			$this->_log("warning", "Group data fetch contained an error.");
+			// For debug : "\$groupdata[]" => $groupdata, "\$authdata[]" => $authdata, "\$_GET[]" => $_GET, "HTTP_msg" => $options), $error_email);
+			return false;
+		} 
+
+		// Now check if the user has any of the MISP AAD groups enabled
+		foreach ($groupdata["value"] as $group) {
+			$groupdisplayName = $group["displayName"];
+			if ($groupdisplayName == self::$misp_siteadmin) {
+				return self::$misp_siteadmin;
+			}			  
+			if ($groupdisplayName == self::$misp_orgadmin) {
+				return self::$misp_orgadmin;
+			}
+			if ($groupdisplayName == self::$misp_user) {
+				return self::$misp_user;
+			}
+		}
+
+		return false;
+	}
+
+}
diff --git a/app/Plugin/AadAuth/README.md b/app/Plugin/AadAuth/README.md
new file mode 100755
index 000000000..987c20b53
--- /dev/null
+++ b/app/Plugin/AadAuth/README.md
@@ -0,0 +1,69 @@
+# Azure Active Directory authentication
+
+This plugin enables authentication with an Azure Active Directory server. Under the hood it uses oAuth2.
+There are still a number of rough edges but in general the plugin works.
+
+It supports verification if a user has the proper 'MISP AD' groups.
+Users should already exist in MISP. TODO: autocreate users
+
+Azure authentication code inspired by https://www.sipponen.com/archives/4024
+
+## Configuration
+
+1. Create an Azure Application
+
+In Azure, add a new App Registration. Select **Web** and set the Redirect URI to your MISP server login page (fe. https://localhost/users/login). The MISP instance does not need to be publicly accessible, as long as it's reacheable by your browser. The redirect URI that you specify here must be exactly the same as used in the MISP configuration. Then note the
+
+* Application (client) ID
+* Directory (tenant) ID
+
+2. Set the application secret
+
+In the application details, select Certificates & secrets and then add a new client secret. Note the 
+* Client secret value
+
+3. (optional) Add group permissions
+
+If you want to limit access to users belonging to certain AD groups then add the permissions to query the group data. In the application details, select API permissions, select Microsoft Graph, Delegated permissions and add the permission 'Group.Read.All'. Once that's done, in the API permissions screen, click the "Grant admin consent".
+
+4. Enable the plugin
+
+Enable the plugin at bootstrap.php:
+
+```php
+CakePlugin::load('AadAuth');
+```
+
+5. Configure
+
+* Uncomment the line "'auth'=>array('AadAuth.AadAuthenticate')," in Config.php, section "Security"
+
+```php
+    ....
+	'Security'         =>
+		array(
+			'level'      => 'medium',
+			'salt'       => '',
+			'cipherSeed' => '',
+		    'auth'=>array('AadAuth.AadAuthenticate'), 
+		),
+    .....
+```
+
+* Uncomment the following lines in Config.php, section "AadAuth" and configure them.
+
+```php
+	'AadAuth'         =>
+        array(
+			'client_id' => '', // Client ID (see Azure AD)
+			'ad_tenant' => '', // Directory ID (see Azure AD)
+			'client_secret' => '', // Client secret (see Azure AD)
+			'redirect_uri' => '', // Your MISP URI, must be the same as in Azure AD
+			'auth_provider' => 'https://login.microsoftonline.com/',	// Can be left to this default
+			'auth_provider_user' => 'https://graph.microsoft.com/',		// Can be left to this default
+			'misp_user' => 'MISP Users',	// The AD group for MISP users
+			'misp_orgadmin' => 'MISP Administrators',	// The AD group for MISP administrators
+			'misp_siteadmin' => 'MISP Site Administrators', 	// The AD group for MISP site administrators
+			'check_ad_groups' => true	// Should we check if the user belongs to one of the above AD groups?
+		),
+```
diff --git a/app/View/Users/login.ctp b/app/View/Users/login.ctp
index 613d6b793..34876f1ed 100644
--- a/app/View/Users/login.ctp
+++ b/app/View/Users/login.ctp
@@ -55,6 +55,9 @@
             if (Configure::read('ApacheShibbAuth') == true) {
                 echo '<div class="clear"></div><a class="btn btn-info" href="/Shibboleth.sso/Login">Login with SAML</a>';
             }
+            if (Configure::read('AadAuth') == true) {
+                echo '<div class="clear"></div><a class="btn btn-info" href="/users/login?AzureAD=enable">Login with AzureAD</a>';
+            }            
         ?>
     </td>
     <td style="width:250px;padding-left:50px">

From b5e67948ed9cc08957e51a70f827c83b7a75af4a Mon Sep 17 00:00:00 2001
From: Koen Van Impe <koen.vanimpe@cudeso.be>
Date: Fri, 27 Nov 2020 20:29:38 +0100
Subject: [PATCH 003/437] Avoid "TODO" in the README to avoid CodeFactor

---
 app/Plugin/AadAuth/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Plugin/AadAuth/README.md b/app/Plugin/AadAuth/README.md
index 987c20b53..26ab6e9a3 100755
--- a/app/Plugin/AadAuth/README.md
+++ b/app/Plugin/AadAuth/README.md
@@ -4,7 +4,7 @@ This plugin enables authentication with an Azure Active Directory server. Under
 There are still a number of rough edges but in general the plugin works.
 
 It supports verification if a user has the proper 'MISP AD' groups.
-Users should already exist in MISP. TODO: autocreate users
+Users should already exist in MISP. Future enhancement could include autocreate users
 
 Azure authentication code inspired by https://www.sipponen.com/archives/4024
 

From 0a19148fbc33a96c7d34d12e9dfeb219ba0adad9 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 30 Nov 2020 16:29:31 +0100
Subject: [PATCH 004/437] new: [objectTemplate] Allow fetching the raw template
 stored on disk by UUID or name

---
 app/Controller/Component/ACLComponent.php    |  1 +
 app/Controller/ObjectTemplatesController.php |  9 +++++
 app/Model/ObjectTemplate.php                 | 37 ++++++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php
index 408742702..380ad9ed8 100644
--- a/app/Controller/Component/ACLComponent.php
+++ b/app/Controller/Component/ACLComponent.php
@@ -397,6 +397,7 @@ class ACLComponent extends Component
                 'edit' => array('perm_object_template'),
                 'delete' => array('perm_object_template'),
                 'getToggleField' => array(),
+                'getRaw' => array('perm_object_template'),
                 'objectChoice' => array('*'),
                 'objectMetaChoice' => array('perm_add'),
                 'view' => array('*'),
diff --git a/app/Controller/ObjectTemplatesController.php b/app/Controller/ObjectTemplatesController.php
index 11046e82a..1b1686ae4 100644
--- a/app/Controller/ObjectTemplatesController.php
+++ b/app/Controller/ObjectTemplatesController.php
@@ -295,4 +295,13 @@ class ObjectTemplatesController extends AppController
         $this->layout = 'ajax';
         $this->render('ajax/getToggleField');
     }
+
+    public function getRaw($uuidOrName)
+    {
+        $template = $this->ObjectTemplate->getRawFromDisk($uuidOrName);
+        if (empty($template)) {
+            throw new NotFoundException(__('Template not found'));
+        }
+        return $this->RestResponse->viewData($template, $this->response->type());
+    }
 }
diff --git a/app/Model/ObjectTemplate.php b/app/Model/ObjectTemplate.php
index 2608c01b1..9c8e59a51 100644
--- a/app/Model/ObjectTemplate.php
+++ b/app/Model/ObjectTemplate.php
@@ -316,4 +316,41 @@ class ObjectTemplate extends AppModel
         }
         return 1;
     }
+
+    public function getRawFromDisk($uuidOrName)
+    {
+        $templates = $this->readTemplatesFromDisk();
+        if (Validation::uuid($uuidOrName)) {
+            return $templates[$uuidOrName];
+        } else {
+            foreach ($templates as $uuid => $template) {
+                if ($template['name'] == $uuidOrName) {
+                    return $template;
+                }
+            }
+        }
+    }
+
+    private function readTemplatesFromDisk()
+    {
+        $objectsDir = APP . 'files/misp-objects/objects';
+        $directories = glob($objectsDir . '/*', GLOB_ONLYDIR);
+        foreach ($directories as $k => $dir) {
+            $dir = str_replace($objectsDir, '', $dir);
+            $directories[$k] = $dir;
+        }
+        $templates = [];
+        foreach ($directories as $dir) {
+            if (!file_exists($objectsDir . DS . $dir . DS . 'definition.json')) {
+                continue;
+            }
+            $file = new File($objectsDir . DS . $dir . DS . 'definition.json');
+            $template = json_decode($file->read(), true);
+            if (isset($template['uuid'])) {
+                $templates[$template['uuid']] = $template;
+            }
+            $file->close();
+        }
+        return $templates;
+    }
 }

From 0f16451959cb490e553bc7a1a931623fac6b3029 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Tue, 1 Dec 2020 15:38:34 +0100
Subject: [PATCH 005/437] chg: [galaxyElements] Migrated galaxy element index
 to generic factory

---
 app/Controller/GalaxyElementsController.php   |  28 +++-
 .../Fields/galaxy_element_value.ctp           |  11 ++
 app/View/GalaxyElements/ajax/index.ctp        | 131 ++++++++++--------
 3 files changed, 111 insertions(+), 59 deletions(-)
 create mode 100644 app/View/Elements/genericElements/IndexTable/Fields/galaxy_element_value.ctp
 mode change 100755 => 100644 app/View/GalaxyElements/ajax/index.ctp

diff --git a/app/Controller/GalaxyElementsController.php b/app/Controller/GalaxyElementsController.php
index e60003aae..797934483 100644
--- a/app/Controller/GalaxyElementsController.php
+++ b/app/Controller/GalaxyElementsController.php
@@ -17,10 +17,32 @@ class GalaxyElementsController extends AppController
     public function index($clusterId)
     {
         $aclConditions = $this->GalaxyElement->buildClusterConditions($this->Auth->user(), $clusterId);
-        $this->paginate['conditions'] = [$aclConditions];
+        if (empty($filters['context'])) {
+            $filters['context'] = 'all';
+        }
+        $searchConditions = array();
+        if (empty($filters['searchall'])) {
+            $filters['searchall'] = '';
+        }
+        if (strlen($filters['searchall']) > 0) {
+            $searchall = '%' . strtolower($filters['searchall']) . '%';
+            $searchConditions = array(
+                'OR' => array(
+                    'LOWER(GalaxyElement.key) LIKE' => $searchall,
+                    'LOWER(GalaxyElement.value) LIKE' => $searchall,
+                ),
+            );
+        }
+        $this->paginate['conditions'] = ['AND' => [$aclConditions, $searchConditions]];
         $this->paginate['contain'] = ['GalaxyCluster' => ['fields' => ['id', 'distribution', 'org_id']]];
-        $clusters = $this->paginate();
-        $this->set('list', $clusters);
+        $elements = $this->paginate();
+        $this->set('elements', $elements);
+        $this->set('clusterId', $clusterId);
+        $this->set('context', $filters['context']);
+        $cluster = $this->GalaxyElement->GalaxyCluster->fetchIfAuthorized($this->Auth->user(), $clusterId, array('edit', 'delete'), false, false);
+        $canModify = !empty($cluster['authorized']);
+        $canModify = true;
+        $this->set('canModify', $canModify);
         if ($this->request->is('ajax')) {
             $this->layout = 'ajax';
             $this->render('ajax/index');
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/galaxy_element_value.ctp b/app/View/Elements/genericElements/IndexTable/Fields/galaxy_element_value.ctp
new file mode 100644
index 000000000..bbb5b8fa9
--- /dev/null
+++ b/app/View/Elements/genericElements/IndexTable/Fields/galaxy_element_value.ctp
@@ -0,0 +1,11 @@
+<?php
+$value = Hash::get($row, $field['data_path']);
+$key = Hash::get($row, $field['elementParams']['data_path_key']);
+
+if ($key === 'refs') {
+    echo '<a href="' . h($value) . '" rel="noreferrer noopener">' . h($value) . '</a>';
+} else if ($key === 'country') {
+    echo $this->Icon->countryFlag($item['GalaxyElement']['value']) . ' ' . h($value);
+} else {
+    echo h($value);
+}
\ No newline at end of file
diff --git a/app/View/GalaxyElements/ajax/index.ctp b/app/View/GalaxyElements/ajax/index.ctp
old mode 100755
new mode 100644
index 532052ecb..1a072dc9f
--- a/app/View/GalaxyElements/ajax/index.ctp
+++ b/app/View/GalaxyElements/ajax/index.ctp
@@ -1,57 +1,76 @@
-<div class="pagination">
-    <!-- // CONVERT IT INTO generic index
-    // Add panel (index & tree view for key.with.dotted.path) -->
-    <ul>
-    <?php
-        $this->Paginator->options(array(
-                'update' => '#elements_div',
-                'evalScripts' => true,
-                'before' => '$(".progress").show()',
-                'complete' => '$(".progress").hide()',
-        ));
-        
-        echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
-        echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
-        echo $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
-    ?>
-    </ul>
-</div>
-
-<table class="table table-striped table-hover table-condensed">
-    <tr>
-        <th class="short"><?php echo $this->Paginator->sort('key', __('Key'));?></th>
-        <th><?php echo $this->Paginator->sort('value');?></th>
-    </tr>
 <?php
-    foreach ($list as $item):
-?>
-        <tr>
-            <td class="short"><?= h($item['GalaxyElement']['key']); ?></td>
-            <td class="short"><?php if ($item['GalaxyElement']['key'] === 'refs') {
-                echo '<a href="' . h($item['GalaxyElement']['value']) . '" rel="noreferrer noopener">' . h($item['GalaxyElement']['value']) . '</a>';
-            } else if ($item['GalaxyElement']['key'] === 'country') {
-                echo $this->Icon->countryFlag($item['GalaxyElement']['value']) . ' ' . h($item['GalaxyElement']['value']);
-            } else {
-                echo h($item['GalaxyElement']['value']);
-            }
-            ?></td>
-        </tr>
-    <?php
-        endforeach; 
-    ?>
-</table>
-<p>
-<?php
-    echo $this->Paginator->counter(array('format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}')));
-?>
-</p>
-<div class="pagination">
-    <ul>
-    <?php
-        echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
-        echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
-        echo $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
-    ?>
-    </ul>
-</div>
-<?php echo $this->Js->writeBuffer();
+echo $this->element('/genericElements/IndexTable/index_table', array(
+    'data' => array(
+        'paginatorOptions' => array(
+            'update' => '#elements_div',
+        ),
+        'data' => $elements,
+        'top_bar' => array(
+            'children' => array(
+                array(
+                    'type' => 'simple',
+                    'children' => array(
+                        array(
+                            'onClick' => 'openGenericModal',
+                            'onClickParams' => [$baseurl . '/galaxy_elements/flattenJson/' . h($clusterId)],
+                            'active' => true,
+                            'text' => __('Add JSON'),
+                            'title' => __('The provided JSON will be converted into Galaxy Cluster Elements'),
+                            'fa-icon' => 'plus',
+                            'requirement' => $canModify,
+                        ),
+                    )
+                ),
+                array(
+                    'type' => 'simple',
+                    'children' => array(
+                        array(
+                            'active' => $context === 'all',
+                            'url' => sprintf('%s/galaxy_elements/index/%s/context:all', $baseurl, $clusterId),
+                            'text' => __('Tabular view'),
+                        ),
+                        array(
+                            'active' => $context === 'treeView',
+                            'url' => sprintf('%s/galaxy_elements/index/%s/context:treeView', $baseurl, $clusterId),
+                            'text' => __('Tree view'),
+                        ),
+                    )
+                ),
+                array(
+                    'type' => 'search',
+                    'button' => __('Filter'),
+                    'placeholder' => __('Enter value to search'),
+                    'data' => '',
+                    'searchKey' => 'value'
+                )
+            )
+        ),
+        'primary_id_path' => 'GalaxyElement.id',
+        'fields' => array(
+            array(
+                'name' => __('Key'),
+                'data_path' => 'GalaxyElement.key',
+                'sort' => 'key',
+            ),
+            array(
+                'name' => __('Value'),
+                'data_path' => 'GalaxyElement.value',
+                'sort' => 'value',
+                'element' => 'galaxy_element_value',
+                'elementParams' => array(
+                    'data_path_key' =>'GalaxyElement.key'
+                ),
+            ),
+        ),
+        'actions' => array(
+            array(
+                'title' => __('Delete'),
+                'icon' => 'trash',
+                'onclick' => 'simplePopup(\'' . $baseurl . '/galaxy_elements/delete/[onclick_params_data_path]\');',
+                'onclick_params_data_path' => 'GalaxyElement.id',
+                'requirement' => $canModify,
+            )
+        )
+    )
+));
+echo $this->Js->writeBuffer();
\ No newline at end of file

From a2b3504c4202616d45633516c7c6dc399e01bf04 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Tue, 1 Dec 2020 15:58:57 +0100
Subject: [PATCH 006/437] fix: [galaxyCluster] Integrated changes of improved
 index factory

---
 app/Controller/GalaxyClustersController.php | 3 ++-
 app/Controller/GalaxyElementsController.php | 1 +
 app/View/GalaxyClusters/view_relations.ctp  | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Controller/GalaxyClustersController.php b/app/Controller/GalaxyClustersController.php
index 6e6308d10..c15d4110d 100644
--- a/app/Controller/GalaxyClustersController.php
+++ b/app/Controller/GalaxyClustersController.php
@@ -56,7 +56,7 @@ class GalaxyClustersController extends AppController
             $contextConditions['GalaxyCluster.deleted'] = true;
         }
 
-        $this->set('passedArgsArray', array('context' => $filters['context'], 'searchall' => isset($filters['searchall']) ? $filters['searchall'] : ''));
+        $this->set('passedArgs', json_encode(array('context' => $filters['context'], 'searchall' => isset($filters['searchall']) ? $filters['searchall'] : '')));
         $this->set('context', $filters['context']);
         $searchConditions = array();
         if (empty($filters['searchall'])) {
@@ -984,6 +984,7 @@ class GalaxyClustersController extends AppController
             ),
             'contain' => array('SharingGroup', 'TargetCluster', 'GalaxyClusterRelationTag' => array('Tag'))
         ));
+        $this->set('passedArgs', json_encode([]));
         $this->set('relations', $relations);
         $this->set('tree', $tree);
         $this->loadModel('Attribute');
diff --git a/app/Controller/GalaxyElementsController.php b/app/Controller/GalaxyElementsController.php
index 797934483..702f026ce 100644
--- a/app/Controller/GalaxyElementsController.php
+++ b/app/Controller/GalaxyElementsController.php
@@ -39,6 +39,7 @@ class GalaxyElementsController extends AppController
         $this->set('elements', $elements);
         $this->set('clusterId', $clusterId);
         $this->set('context', $filters['context']);
+        $this->set('passedArgs', json_encode(array('context' => $filters['context'], 'searchall' => isset($filters['searchall']) ? $filters['searchall'] : '')));
         $cluster = $this->GalaxyElement->GalaxyCluster->fetchIfAuthorized($this->Auth->user(), $clusterId, array('edit', 'delete'), false, false);
         $canModify = !empty($cluster['authorized']);
         $canModify = true;
diff --git a/app/View/GalaxyClusters/view_relations.ctp b/app/View/GalaxyClusters/view_relations.ctp
index 3ea3b9b82..e8c272d74 100644
--- a/app/View/GalaxyClusters/view_relations.ctp
+++ b/app/View/GalaxyClusters/view_relations.ctp
@@ -48,7 +48,6 @@
                     'element' => 'distribution_levels',
                 ),
             ),
-            'title' => __('Galaxy Cluster Relationships'),
             'actions' => array(
                 array(
                     'title' => 'Edit',

From 7fc33106870fed89bc6793455d38305dacf0d84a Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 2 Dec 2020 11:21:52 +0100
Subject: [PATCH 007/437] fix: [galaxyCluster] Delete elements if field is
 empty

---
 app/Model/GalaxyCluster.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 0c4430a2e..24dc55d2a 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -413,7 +413,7 @@ class GalaxyCluster extends AppModel
                 }
                 $saveSuccess = $this->save($cluster, array('fieldList' => $fieldList));
                 if ($saveSuccess) {
-                    if (!empty($cluster['GalaxyCluster']['GalaxyElement'])) {
+                    if (isset($cluster['GalaxyCluster']['GalaxyElement'])) {
                         $elementsToSave = array();
                         foreach ($cluster['GalaxyCluster']['GalaxyElement'] as $element) { // transform cluster into Galaxy meta format
                             $elementsToSave[$element['key']][] = $element['value'];

From 3f18da642239a8e5950bf20bf7999197574a0b4b Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 2 Dec 2020 11:51:19 +0100
Subject: [PATCH 008/437] chg: [misp.js] Allow index filtering without
 searchbox

---
 app/webroot/js/misp.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 563249c43..2a99fe6b1 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -2211,11 +2211,13 @@ function runIndexQuickFilter(preserveParams, url, target) {
         var passedArgsArray = [];
     }
     var searchKey = 'searchall';
-    if ($('#quickFilterField').data('searchkey')) {
-        searchKey = $('#quickFilterField').data('searchkey');
-    }
-    if ( $('#quickFilterField').val().trim().length > 0){
-        passedArgsArray[searchKey] = encodeURIComponent($('#quickFilterField').val().trim());
+    if ($('#quickFilterField').length > 0) {
+        if ($('#quickFilterField').data('searchkey')) {
+            searchKey = $('#quickFilterField').data('searchkey');
+        }
+        if ( $('#quickFilterField').val().trim().length > 0){
+            passedArgsArray[searchKey] = encodeURIComponent($('#quickFilterField').val().trim());
+        }
     }
     if (typeof url === "undefined") {
         url = here;

From f85dcc4fff99f7b46fc3b6c2362a12556445e22d Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 2 Dec 2020 11:55:15 +0100
Subject: [PATCH 009/437] chg: [galaxyElement] Added individual deletion and
 JSON flattening/expanding

---
 app/Controller/GalaxyElementsController.php  | 70 ++++++++++++++++--
 app/Model/GalaxyElement.php                  | 10 +++
 app/View/GalaxyClusters/view.ctp             |  4 +-
 app/View/GalaxyElements/ajax/delete.ctp      | 10 +++
 app/View/GalaxyElements/ajax/flattenJson.ctp | 25 +++++++
 app/View/GalaxyElements/ajax/index.ctp       | 77 +++++++++++++-------
 6 files changed, 159 insertions(+), 37 deletions(-)
 create mode 100644 app/View/GalaxyElements/ajax/delete.ctp
 create mode 100644 app/View/GalaxyElements/ajax/flattenJson.ctp

diff --git a/app/Controller/GalaxyElementsController.php b/app/Controller/GalaxyElementsController.php
index 702f026ce..e8422889c 100644
--- a/app/Controller/GalaxyElementsController.php
+++ b/app/Controller/GalaxyElementsController.php
@@ -16,6 +16,7 @@ class GalaxyElementsController extends AppController
 
     public function index($clusterId)
     {
+        $filters = $this->IndexFilter->harvestParameters(array('context', 'searchall'));
         $aclConditions = $this->GalaxyElement->buildClusterConditions($this->Auth->user(), $clusterId);
         if (empty($filters['context'])) {
             $filters['context'] = 'all';
@@ -39,25 +40,78 @@ class GalaxyElementsController extends AppController
         $this->set('elements', $elements);
         $this->set('clusterId', $clusterId);
         $this->set('context', $filters['context']);
-        $this->set('passedArgs', json_encode(array('context' => $filters['context'], 'searchall' => isset($filters['searchall']) ? $filters['searchall'] : '')));
+        $this->set('passedArgs', json_encode([
+            'context' => $filters['context'],
+            'searchall' => isset($filters['searchall']) ? $filters['searchall'] : ''
+        ]));
         $cluster = $this->GalaxyElement->GalaxyCluster->fetchIfAuthorized($this->Auth->user(), $clusterId, array('edit', 'delete'), false, false);
         $canModify = !empty($cluster['authorized']);
         $canModify = true;
         $this->set('canModify', $canModify);
+        if ($filters['context'] == 'JSONView') {
+            $expanded = $this->GalaxyElement->getExpandedJSONFromElements($elements);
+            $this->set('JSONElements', $expanded);
+        }
         if ($this->request->is('ajax')) {
             $this->layout = 'ajax';
             $this->render('ajax/index');
         }
     }
 
-    public function indexTree($clusterId)
+    public function delete($elementId)
     {
-        $elements = $this->GalaxyElement->fetchElements($this->Auth->user(), $clusterId);
-        $keyedValue = [];
-        foreach ($elements as $i => $element) {
-            $keyedValue[$element['key']][] = $element['value'];
+        $element = $this->GalaxyElement->find('first', array('conditions' => array('GalaxyElement.id' => $elementId)));
+        if (empty($element)) {
+            throw new Exception(__('Element not found'));
+        }
+        $this->set('element', $element);
+        $clusterId = $element['GalaxyElement']['galaxy_cluster_id'];
+        $cluster = $this->GalaxyElement->GalaxyCluster->fetchIfAuthorized($this->Auth->user(), $clusterId, array('edit'), true, false);
+        if ($this->request->is('post')) {
+            $deleteResult = $this->GalaxyElement->delete($elementId);
+            if ($deleteResult) {
+                $this->GalaxyElement->GalaxyCluster->editCluster($this->Auth->user(), $cluster, [], false);
+                $message = __('Galaxy element %s deleted', $elementId);
+                $this->Flash->success($message);
+            } else {
+                $message = __('Could not delete galaxy element');
+                $this->Flash->error($message);
+            }
+            $this->redirect($this->referer());
+        } else {
+            if (!$this->request->is('ajax')) {
+                throw new MethodNotAllowedException(__('This function can only be reached via AJAX.'));
+            } else {
+                $this->layout = 'ajax';
+                $this->set('elementId', $elementId);
+                $this->render('ajax/delete');
+            }
+        }
+    }
+
+    public function flattenJson($clusterId)
+    {
+        $cluster = $this->GalaxyElement->GalaxyCluster->fetchIfAuthorized($this->Auth->user(), $clusterId, array('edit'), true, false);
+        if ($this->request->is('post') || $this->request->is('put')) {
+            $json = $this->GalaxyElement->jsonDecode($this->request->data['GalaxyElement']['jsonData']);
+            $flattened = Hash::flatten($json);
+            $newElements = [];
+            foreach ($flattened as $k => $v) {
+                $newElements[] = ['key' => $k, 'value' => $v];
+            }
+            $cluster['GalaxyCluster']['GalaxyElement'] = $newElements;
+            $errors = $this->GalaxyElement->GalaxyCluster->editCluster($this->Auth->user(), $cluster, [], false);
+            if (empty($errors)) {
+                return $this->RestResponse->saveSuccessResponse('GalaxyElement', 'flattenJson', $clusterId, false);
+            } else {
+                $message = implode(', ', $errors);
+                return $this->RestResponse->saveFailResponse('GalaxyElement', 'flattenJson', $clusterId, $message, false);
+            }
+        }
+        $this->set('clusterId', $clusterId);
+        if ($this->request->is('ajax')) {
+            $this->layout = 'ajax';
+            $this->render('ajax/flattenJson');
         }
-        $expanded = Hash::expand($keyedValue);
-        return $this->RestResponse->viewData($expanded);
     }
 }
diff --git a/app/Model/GalaxyElement.php b/app/Model/GalaxyElement.php
index 5b0207b43..43a183bd4 100644
--- a/app/Model/GalaxyElement.php
+++ b/app/Model/GalaxyElement.php
@@ -128,4 +128,14 @@ class GalaxyElement extends AppModel
         }
         return $elements;
     }
+
+    public function getExpandedJSONFromElements($elements)
+    {
+        $keyedValue = [];
+        foreach ($elements as $i => $element) {
+            $keyedValue[$element['GalaxyElement']['key']][] = $element['GalaxyElement']['value'];
+        }
+        $expanded = Hash::expand($keyedValue);
+        return $expanded;
+    }
 }
diff --git a/app/View/GalaxyClusters/view.ctp b/app/View/GalaxyClusters/view.ctp
index c90cde3e4..2cf1b8647 100755
--- a/app/View/GalaxyClusters/view.ctp
+++ b/app/View/GalaxyClusters/view.ctp
@@ -88,8 +88,8 @@
     <div class="row-fuild">
         <div id="relations_container"></div>
     </div>
-    <div class="row-fluid">
-        <div id="elements_div" class="span8"></div>
+    <div class="">
+        <div id="elements_div"></div>
     </div>
 </div>
 <script type="text/javascript">
diff --git a/app/View/GalaxyElements/ajax/delete.ctp b/app/View/GalaxyElements/ajax/delete.ctp
new file mode 100644
index 000000000..e1de5726f
--- /dev/null
+++ b/app/View/GalaxyElements/ajax/delete.ctp
@@ -0,0 +1,10 @@
+<?php
+    echo $this->element('/genericElements/Form/hardSoftDeleteForm', [
+        'title' => __('Delete Galaxy Cluster Element'),
+        'modelName' => __('galaxy element'),
+        'value' => $element['GalaxyElement']['key'] . ' :: ' . $element['GalaxyElement']['value'],
+        'id' => $element['GalaxyElement']['id'],
+        'hardDeleteURL' => sprintf('%s/galaxy_elements/delete/%s/1', $baseurl, $element['GalaxyElement']['id']),
+        'doNotShowHelp' => true
+    ]);
+?>
diff --git a/app/View/GalaxyElements/ajax/flattenJson.ctp b/app/View/GalaxyElements/ajax/flattenJson.ctp
new file mode 100644
index 000000000..55fae2f66
--- /dev/null
+++ b/app/View/GalaxyElements/ajax/flattenJson.ctp
@@ -0,0 +1,25 @@
+<?php
+    $modelForForm = 'GalaxyElement';
+    echo $this->element('genericElements/Form/genericForm', array(
+        'form' => $this->Form,
+        'data' => array(
+            'title' => __('Convert JSON into galaxy cluster\'s elements'),
+            'model' => $modelForForm,
+            'fields' => array(
+                array(
+                    'field' => 'jsonData',
+                    'label' => __('JSON'),
+                    'type' => 'textarea',
+                    'class' => 'input span6',
+                    'div' => 'input clear'
+                ),
+            ),
+            'submit' => array(
+                'action' => $this->request->params['action'],
+                'ajaxSubmit' => sprintf('submitPopoverForm(\'%s\', \'flattenJson\', 0, 1)', h($clusterId))
+            ),
+        ),
+    ));
+?>
+
+<?php echo $this->Js->writeBuffer(); // Write cached scripts
diff --git a/app/View/GalaxyElements/ajax/index.ctp b/app/View/GalaxyElements/ajax/index.ctp
index 1a072dc9f..20872e342 100644
--- a/app/View/GalaxyElements/ajax/index.ctp
+++ b/app/View/GalaxyElements/ajax/index.ctp
@@ -1,5 +1,5 @@
 <?php
-echo $this->element('/genericElements/IndexTable/index_table', array(
+$indexOptions = array(
     'data' => array(
         'paginatorOptions' => array(
             'update' => '#elements_div',
@@ -7,6 +7,30 @@ echo $this->element('/genericElements/IndexTable/index_table', array(
         'data' => $elements,
         'top_bar' => array(
             'children' => array(
+                array(
+                    'children' => array(
+                        array(
+                            'active' => $context === 'all',
+                            'text' => __('Tabular view'),
+                            'onClick' => 'runIndexQuickFilter',
+                            'onClickParams' => [
+                                h($clusterId) . '/context:all',
+                                $baseurl . '/galaxy_elements/index',
+                                '#elements_div'
+                            ],
+                        ),
+                        array(
+                            'active' => $context === 'JSONView',
+                            'text' => __('JSON view'),
+                            'onClick' => 'runIndexQuickFilter',
+                            'onClickParams' => [
+                                h($clusterId) . '/context:JSONView',
+                                $baseurl . '/galaxy_elements/index',
+                                '#elements_div'
+                            ],
+                        ),
+                    )
+                ),
                 array(
                     'type' => 'simple',
                     'children' => array(
@@ -14,35 +38,13 @@ echo $this->element('/genericElements/IndexTable/index_table', array(
                             'onClick' => 'openGenericModal',
                             'onClickParams' => [$baseurl . '/galaxy_elements/flattenJson/' . h($clusterId)],
                             'active' => true,
-                            'text' => __('Add JSON'),
+                            'text' => __('Add JSON as cluster\'s elements'),
                             'title' => __('The provided JSON will be converted into Galaxy Cluster Elements'),
                             'fa-icon' => 'plus',
-                            'requirement' => $canModify,
+                            'requirement' => $canModify && ($context === 'JSONView'),
                         ),
                     )
                 ),
-                array(
-                    'type' => 'simple',
-                    'children' => array(
-                        array(
-                            'active' => $context === 'all',
-                            'url' => sprintf('%s/galaxy_elements/index/%s/context:all', $baseurl, $clusterId),
-                            'text' => __('Tabular view'),
-                        ),
-                        array(
-                            'active' => $context === 'treeView',
-                            'url' => sprintf('%s/galaxy_elements/index/%s/context:treeView', $baseurl, $clusterId),
-                            'text' => __('Tree view'),
-                        ),
-                    )
-                ),
-                array(
-                    'type' => 'search',
-                    'button' => __('Filter'),
-                    'placeholder' => __('Enter value to search'),
-                    'data' => '',
-                    'searchKey' => 'value'
-                )
             )
         ),
         'primary_id_path' => 'GalaxyElement.id',
@@ -72,5 +74,26 @@ echo $this->element('/genericElements/IndexTable/index_table', array(
             )
         )
     )
-));
-echo $this->Js->writeBuffer();
\ No newline at end of file
+);
+
+if ($context == 'JSONView') {
+    $indexOptions['data']['fields'] = [];
+    $indexOptions['data']['data'] = [];
+    $indexOptions['data']['skip_pagination'] = true;
+    $indexOptions['data']['actions'] = [];
+}
+
+echo $this->element('/genericElements/IndexTable/index_table', $indexOptions);
+if ($context == 'JSONView') {
+    echo sprintf('<div id="elementJSONDiv" class="well well-small">%s</div>', json_encode($JSONElements));
+}
+
+echo $this->Js->writeBuffer();
+?>
+
+<script>
+    var $jsondiv = $('#elementJSONDiv');
+    if ($jsondiv.length > 0) {
+        $jsondiv.html(syntaxHighlightJson($jsondiv.text(), 8));
+    }
+</script>
\ No newline at end of file

From 4c84f76542dcf7e458b6330200de4a0dcec854e5 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 4 Dec 2020 09:48:53 +0100
Subject: [PATCH 010/437] chg: [galaxyClusters:view_relation] Reuse already
 fetched relations

---
 app/Controller/GalaxyClustersController.php |  9 ++-------
 app/View/GalaxyClusters/view_relations.ctp  | 22 +++++++++------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/app/Controller/GalaxyClustersController.php b/app/Controller/GalaxyClustersController.php
index c15d4110d..aacfff798 100644
--- a/app/Controller/GalaxyClustersController.php
+++ b/app/Controller/GalaxyClustersController.php
@@ -967,7 +967,7 @@ class GalaxyClustersController extends AppController
         if (!$this->request->is('ajax')) {
             throw new MethodNotAllowedException('This function can only be reached via AJAX.');
         }
-        $cluster = $this->GalaxyCluster->fetchIfAuthorized($this->Auth->user(), $id, 'view', $throwErrors=true, $full=true);
+        $cluster = $this->GalaxyCluster->fetchIfAuthorized($this->Auth->user(), $id, 'view', true, true);
         $existingRelations = $this->GalaxyCluster->GalaxyClusterRelation->getExistingRelationships();
         $cluster = $this->GalaxyCluster->attachClusterToRelations($this->Auth->user(), $cluster);
 
@@ -978,12 +978,7 @@ class GalaxyClustersController extends AppController
 
         $this->set('existingRelations', $existingRelations);
         $this->set('cluster', $cluster);
-        $relations = $this->GalaxyCluster->GalaxyClusterRelation->fetchRelations($this->Auth->user(), array(
-            'conditions' => array(
-                'GalaxyClusterRelation.galaxy_cluster_uuid' => $cluster['GalaxyCluster']['uuid']
-            ),
-            'contain' => array('SharingGroup', 'TargetCluster', 'GalaxyClusterRelationTag' => array('Tag'))
-        ));
+        $relations = $cluster['GalaxyCluster']['GalaxyClusterRelation'];
         $this->set('passedArgs', json_encode([]));
         $this->set('relations', $relations);
         $this->set('tree', $tree);
diff --git a/app/View/GalaxyClusters/view_relations.ctp b/app/View/GalaxyClusters/view_relations.ctp
index e8c272d74..0445f6f85 100644
--- a/app/View/GalaxyClusters/view_relations.ctp
+++ b/app/View/GalaxyClusters/view_relations.ctp
@@ -6,9 +6,8 @@
             'fields' => array(
                 array(
                     'name' => __('Id'),
-                    'sort' => 'id',
                     'class' => 'short',
-                    'data_path' => 'GalaxyClusterRelation.id',
+                    'data_path' => 'id',
                 ),
                 array(
                     'name' => __('Default'),
@@ -18,23 +17,21 @@
                 ),
                 array(
                     'name' => __('Galaxy Cluster Target (galaxy :: cluster)'),
-                    'sort' => 'TargetCluster.tag_name',
                     'element' => 'galaxy_cluster_link',
-                    'data_path' => 'TargetCluster',
-                    'data_path_relation' => 'GalaxyClusterRelation',
-                    'url_params_data_paths' => 'TargetCluster.id',
+                    'data_path' => 'GalaxyCluster',
+                    'data_path_relation' => '',
+                    'url_params_data_paths' => 'GalaxyCluster.id',
                     'url' => $baseurl . '/galaxy_clusters/view'
                 ),
                 array(
                     'name' => __('Relationship Type'),
-                    'sort' => 'type',
                     'class' => 'short',
-                    'data_path' => 'GalaxyClusterRelation.referenced_galaxy_cluster_type',
+                    'data_path' => 'referenced_galaxy_cluster_type',
                 ),
                 array(
                     'name' => __('Relationship Tag'),
                     'class' => 'short',
-                    'data_path' => 'GalaxyClusterRelationTag.{n}.Tag',
+                    'data_path' => 'Tag',
                     'element' => 'tags',
                     'elementParams' => array(
                         'searchScope' => 'taxonomy'
@@ -43,8 +40,7 @@
                 ),
                 array(
                     'name' => __('Distribution'),
-                    'sort' => 'distribution',
-                    'data_path' => 'GalaxyClusterRelation.distribution',
+                    'data_path' => 'distribution',
                     'element' => 'distribution_levels',
                 ),
             ),
@@ -53,7 +49,7 @@
                     'title' => 'Edit',
                     'url' => '/galaxy_cluster_relations/edit',
                     'url_params_data_paths' => array(
-                        'GalaxyClusterRelation.id'
+                        'id'
                     ),
                     'icon' => 'edit',
                     'complex_requirement' => array(
@@ -70,7 +66,7 @@
                     'title' => 'Delete',
                     'url' => '/galaxy_cluster_relations/delete',
                     'url_params_data_paths' => array(
-                        'GalaxyClusterRelation.id'
+                        'id'
                     ),
                     'postLink' => true,
                     'postLinkConfirm' => __('Are you sure you want to delete the Relationship?'),

From 9506bfdc564132dd2ffa1c5740bf66770db3b7b9 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 4 Dec 2020 09:57:14 +0100
Subject: [PATCH 011/437] chg: [tools] Removed useless library

---
 app/Lib/Tools/ArrayFlattenerTool.php | 55 ----------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 app/Lib/Tools/ArrayFlattenerTool.php

diff --git a/app/Lib/Tools/ArrayFlattenerTool.php b/app/Lib/Tools/ArrayFlattenerTool.php
deleted file mode 100644
index a7b321459..000000000
--- a/app/Lib/Tools/ArrayFlattenerTool.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-class ArrayFlattenerTool
-{
-    public function flatten($array)
-    {
-        return $this->array_flatten($array);
-    }
-
-    public function unflatten($array)
-    {
-        return $this->array_unflatten($array);
-    }
-    
-    /**
-     * array_flatten Perform a DFS while flattening the array
-     */
-    private function array_flatten($toFlatten, $prefix='', $separator='.')
-    {
-        $result = array();
-        foreach ($toFlatten as $k => $v)
-        {
-            $new_key = $prefix . (empty($prefix) ? '' : '.') . $k;
-            if (is_array($v)) {
-                $result = array_merge($result, $this->array_flatten($v, $new_key, $separator));
-            } else {
-                $result[$new_key] = $v;
-            }
-        }
-        return $result;
-    }
-
-    private function array_unflatten($toUnflatten, $separator='.')
-    {
-        $result = array();
-        foreach ($toUnflatten as $k => $v)
-        {
-            $decomposedKey = explode($separator, $k);
-            $result = $this->buildMultiDimensionalArrayFromKeypath($decomposedKey, $result, $v);
-        }
-        return $result;
-    }
-
-    private function buildMultiDimensionalArrayFromKeypath($keypath, $result, $value)
-    {
-        if (empty($keypath)) {
-            $result = $value;
-        } else {
-            foreach ($keypath as $key) {
-                array_shift($keypath);
-                $result[$key] = $this->buildMultiDimensionalArrayFromKeypath($keypath, $result, $value);
-            }
-        }
-        return $result;
-    }
-}

From 740e8c4cd00ade8a1cda47219075633ade007d40 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 4 Dec 2020 09:59:50 +0100
Subject: [PATCH 012/437] chg: [ACLComponent] Added new galaxy element
 endpoints

---
 app/Controller/Component/ACLComponent.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php
index 925d29735..bcdd16ae7 100644
--- a/app/Controller/Component/ACLComponent.php
+++ b/app/Controller/Component/ACLComponent.php
@@ -341,7 +341,9 @@ class ACLComponent extends Component
                 'view' => array('*'),
             ),
             'galaxyElements' => array(
-                    'index' => array('*')
+                'delete' => array('perm_galaxy_editor'),
+                'flattenJson' => array('perm_galaxy_editor'),
+                'index' => array('*'),
             ),
             'jobs' => array(
                     'cache' => array('*'),

From 9826bbe62a6350f8884ddc228a6b799d30422b5d Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 10 Dec 2020 20:44:16 +0100
Subject: [PATCH 013/437] chg: [sighting] Simplified sighting deletion

---
 app/Controller/SightingsController.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Controller/SightingsController.php b/app/Controller/SightingsController.php
index 3ae3e2e79..078148fdf 100644
--- a/app/Controller/SightingsController.php
+++ b/app/Controller/SightingsController.php
@@ -223,7 +223,7 @@ class SightingsController extends AppController
         }
     }
 
-    // takes a sighting ID
+    // takes a sighting ID or UUID
     public function delete($id)
     {
         if (!$this->userRole['perm_modify_org']) {
@@ -232,22 +232,22 @@ class SightingsController extends AppController
         if (!$this->request->is('post')) {
             throw new MethodNotAllowedException('This action can only be accessed via a post request.');
         }
-        $id = $this->Toolbox->findIdByUuid($this->Sighting, $id);
-        $conditions = array('Sighting.id' => $id);
-        $sighting = $this->Sighting->find('first', array('conditions' => $conditions, 'recursive' => -1));
+        $sighting = $this->Sighting->find('first', array(
+            'conditions' => Validation::uuid($id) ? ['Sighting.uuid' => $id] : ['Sighting.id' => $id],
+            'recursive' => -1,
+            'fields' => ['id', 'org_id'],
+        ));
         if (empty($sighting)) {
             throw new NotFoundException('Invalid sighting.');
         }
-        if (!$this->_isSiteAdmin()) {
-            if ($sighting['Sighting']['org_id'] != $this->Auth->user('org_id')) {
-                throw new NotFoundException('Invalid sighting.');
-            }
+        if (!$this->_isSiteAdmin() && $sighting['Sighting']['org_id'] != $this->Auth->user('org_id')) {
+            throw new NotFoundException('Invalid sighting.');
         }
         $result = $this->Sighting->delete($sighting['Sighting']['id']);
         if (!$result) {
             return $this->RestResponse->saveFailResponse('Sighting', 'delete', $id, 'Could not delete the Sighting.');
         } else {
-            return $this->RestResponse->saveSuccessResponse('Sighting', 'delete', $id, false, 'Sighting successfuly deleted.');
+            return $this->RestResponse->saveSuccessResponse('Sighting', 'delete', $id, false, 'Sighting successfully deleted.');
         }
     }
 

From 35da3eb06cd2985f4cf88f6d9cd6a807eea2a03b Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 10 Dec 2020 21:02:50 +0100
Subject: [PATCH 014/437] fix: [internal] Remove compact method call that do
 nothing

---
 app/Controller/AttributesController.php | 1 -
 app/Controller/TagsController.php       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index f90a51243..9adc49fee 100644
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -1505,7 +1505,6 @@ class AttributesController extends AppController
                 'request' => $this->request,
                 'named_params' => $this->params['named'],
                 'paramArray' => $paramArray,
-                'ordered_url_params' => @compact($paramArray),
                 'additional_delimiters' => PHP_EOL
             );
             $exception = false;
diff --git a/app/Controller/TagsController.php b/app/Controller/TagsController.php
index e00dcf69a..c298c6715 100644
--- a/app/Controller/TagsController.php
+++ b/app/Controller/TagsController.php
@@ -41,7 +41,6 @@ class TagsController extends AppController
             'request' => $this->request,
             'named_params' => $this->params['named'],
             'paramArray' => ['favouritesOnly', 'filter', 'searchall', 'name', 'search', 'exclude_statistics'],
-            'ordered_url_params' => @compact($paramArray)
         );
         $exception = false;
         $passedArgsArray = $this->_harvestParameters($filterData, $exception);

From 8dfad4d2307c9064646815b48d2fd94eccee24d8 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 11 Dec 2020 14:09:31 +0100
Subject: [PATCH 015/437] fix: [post] Do not send emails to disabled user for
 new posts

---
 app/Model/Post.php | 107 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 76 insertions(+), 31 deletions(-)

diff --git a/app/Model/Post.php b/app/Model/Post.php
index ea3315a57..aba8994c5 100644
--- a/app/Model/Post.php
+++ b/app/Model/Post.php
@@ -1,8 +1,10 @@
 <?php
-
 App::uses('AppModel', 'Model');
-App::uses('CakeEmail', 'Network/Email');
 
+/**
+ * @property Thread $Thread
+ * @property User $User
+ */
 class Post extends AppModel
 {
     public $actsAs = array(
@@ -25,7 +27,7 @@ class Post extends AppModel
             ),
     );
 
-    public function sendPostsEmailRouter($user_id, $post_id, $event_id, $title, $message, $JobId = false)
+    public function sendPostsEmailRouter($user_id, $post_id, $event_id, $title, $message)
     {
         if (Configure::read('MISP.background_jobs')) {
             $user = $this->User->findById($user_id);
@@ -38,7 +40,7 @@ class Post extends AppModel
                     'status' => 0,
                     'retries' => 0,
                     'org_id' => $user['User']['org_id'],
-                    'message' => 'Sending..',
+                    'message' => 'Sending...',
             );
             $job->save($data);
             $jobId = $job->id;
@@ -51,50 +53,90 @@ class Post extends AppModel
             $job->saveField('process_id', $process_id);
             return true;
         } else {
-            $result = $this->sendPostsEmail($user_id, $post_id, $event_id, $title, $message);
-            return $result;
+            return $this->sendPostsEmail($user_id, $post_id, $event_id, $title, $message);
         }
     }
 
-    public function sendPostsEmail($user_id, $post_id, $event_id, $title, $message)
+    /**
+     * @param int $userId
+     * @param int $postId
+     * @param int|null $eventId
+     * @param string $title
+     * @param string $message
+     * @return bool
+     * @throws Exception
+     */
+    public function sendPostsEmail($userId, $postId, $eventId, $title, $message)
     {
-        // fetch the post
-        $post = $this->read(null, $post_id);
-        $this->User = ClassRegistry::init('User');
+        $post = $this->find('first', [
+            'recursive' => -1,
+            'conditions' => ['id' => $postId],
+            'fields' => ['id', 'thread_id'],
+        ]);
+        if (empty($post)) {
+            throw new Exception("Post with ID $postId not found.");
+        }
+
+        $userFields = ['id', 'email', 'gpgkey', 'certif_public', 'disabled'];
 
         // If the post belongs to an event, E-mail all users in the org that have contactalert set
-        if ($event_id) {
+        if ($eventId) {
             $this->Event = ClassRegistry::init('Event');
-            ;
-            $event = $this->Event->read(null, $event_id);
-            //Insert extra field here: alertOrg or something, then foreach all the org members
-            //limit this array to users with contactalerts turned on!
-            $orgMembers = array();
-            $this->User->recursive = -1;
-            $temp = $this->User->findAllByOrgId($event['Event']['org_id'], array('email', 'gpgkey', 'certif_public', 'contactalert', 'id'));
-            foreach ($temp as $tempElement) {
-                if ($tempElement['User']['id'] != $user_id && ($tempElement['User']['contactalert'] || $tempElement['User']['id'] == $event['Event']['user_id'])) {
-                    array_push($orgMembers, $tempElement);
-                }
+            $event = $this->Event->find('first', [
+                'recursive' => -1,
+                'conditions' => ['id' => $eventId],
+                'fields' => ['id', 'org_id', 'user_id'],
+            ]);
+            if (empty($event)) {
+                throw new Exception("Event with ID $eventId not found.");
             }
+            // Insert extra field here: alertOrg or something, then foreach all the org members
+            // limit this array to users with contactalerts turned on!
+            $orgMembers = $this->User->find('all', [
+                'recursive' => -1,
+                'conditions' => [
+                    'org_id' => $event['Event']['org_id'],
+                    'disabled' => 0,
+                    'NOT' => ['id' => $userId], // do not send to post creator
+                    'OR' => [ // send just to users with contactalert or to event creator
+                       'contactalert' => 1,
+                       'id' => $event['Event']['user_id'],
+                    ],
+               ],
+               'fields' => $userFields,
+            ]);
         } else {
             // Not an event: E-mail the user that started the thread
             $thread = $this->Thread->read(null, $post['Post']['thread_id']);
-            if ($thread['Thread']['user_id'] == $user_id) {
+            if ($thread['Thread']['user_id'] == $userId) {
                 $orgMembers = array();
             } else {
-                $orgMembers = $this->User->findAllById($thread['Thread']['user_id'], array('email', 'gpgkey', 'certif_public', 'contactalert', 'id'));
+                $orgMembers = $this->User->find('all', [
+                    'recursive' => -1,
+                    'fields' => $userFields,
+                    'conditions' => [
+                        'id' => $thread['Thread']['user_id'],
+                        'disabled' => 0,
+                    ]
+                ]);
             }
         }
 
         // Add all users who posted in this thread
-        $temp = $this->findAllByThreadId($post['Post']['thread_id'], array('user_id'));
-        foreach ($temp as $tempElement) {
-            $user = $this->User->findById($tempElement['Post']['user_id'], array('email', 'gpgkey', 'certif_public', 'contactalert', 'id'));
-            if (!empty($user) && $user['User']['id'] != $user_id && !in_array($user, $orgMembers)) {
-                array_push($orgMembers, $user);
-            }
-        }
+        $excludeUsers = Hash::extract($orgMembers, '{n}.User.id');
+        $excludeUsers[] = $userId;
+        $temp = $this->find('all', [
+            'recursive' => -1,
+            'fields' => ['Post.id'],
+            'conditions' => [
+                'Post.thread_id' => $post['Post']['thread_id'],
+                'User.disabled' => 0,
+                'NOT' => ['User.id' => $excludeUsers]
+            ],
+            'contain' => ['User' => ['fields' => $userFields]],
+            'group' => ['User.id'], // remove duplicates
+        ]);
+        $orgMembers = array_merge($orgMembers, $temp);
 
         // The mail body, h() is NOT needed as we are sending plain-text mails.
         $body = "";
@@ -118,11 +160,14 @@ class Post extends AppModel
         $bodyDetail .= "The following message was added: \n";
         $bodyDetail .= "\n";
         $bodyDetail .= $message . "\n";
+
         $tplColorString = Configure::read('MISP.email_subject_TLP_string') ?: "tlp:amber";
         $subject = "[" . Configure::read('MISP.org') . " MISP] New post in discussion " . $post['Post']['thread_id'] . " - " . strtoupper($tplColorString);
         foreach ($orgMembers as $recipient) {
             $this->User->sendEmail($recipient, $bodyDetail, $body, $subject);
         }
+
+        return true;
     }
 
     public function findPageNr($id, $context = 'thread', $post_id = false)

From 355abc05eb0348fe03e9a83a52c1af4f14ed5485 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 4 Jan 2021 18:29:32 +0100
Subject: [PATCH 016/437] chg: [internal] Small optimisation for filterEventIds

---
 app/Lib/Dashboard/CsseCovidTrendsWidget.php |  2 +-
 app/Model/Event.php                         | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/Lib/Dashboard/CsseCovidTrendsWidget.php b/app/Lib/Dashboard/CsseCovidTrendsWidget.php
index f9c9ef279..aaf446f9e 100644
--- a/app/Lib/Dashboard/CsseCovidTrendsWidget.php
+++ b/app/Lib/Dashboard/CsseCovidTrendsWidget.php
@@ -55,7 +55,7 @@ class CsseCovidTrendsWidget
             'date' => (empty($options['timeframe']) ? 10 : $options['timeframe']) . 'd'
         );
         $eventIds = $this->Event->filterEventIds($user, $params);
-        $eventIds = array_reverse(array_values($eventIds));
+        $eventIds = array_reverse($eventIds);
         $data = array();
         if (empty($options['type'])) {
             $options['type'] = 'confirmed';
diff --git a/app/Model/Event.php b/app/Model/Event.php
index ab2ac7e7d..926c48c08 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -1691,6 +1691,12 @@ class Event extends AppModel
         return $tempConditions;
     }
 
+    /**
+     * @param array $user
+     * @param array $params
+     * @param int $result_count
+     * @return array Event IDs, when `include_attribute_count` is enabled, then it is Event ID => Attribute count
+     */
     public function filterEventIds($user, &$params = array(), &$result_count = 0)
     {
         $conditions = $this->createEventConditions($user);
@@ -1774,14 +1780,9 @@ class Event extends AppModel
                 }
             }
         }
-        $fields = array('Event.id');
-        if (!empty($params['include_attribute_count'])) {
-            $fields[] = 'Event.attribute_count';
-        }
         $find_params = array(
             'conditions' => $conditions,
             'recursive' => -1,
-            'fields' => $fields
         );
         if (isset($params['order'])) {
             $find_params['order'] = $params['order'];
@@ -1794,7 +1795,13 @@ class Event extends AppModel
                 $find_params['page'] = $params['page'];
             }
         }
-        $results = $this->find('list', $find_params);
+        if (!empty($params['include_attribute_count'])) {
+            $find_params['fields'] = array('Event.id', 'Event.attribute_count');
+            $results = $this->find('list', $find_params);
+        } else {
+            $find_params['fields'] = array('Event.id');
+            $results = $this->find('column', $find_params);
+        }
         if (!isset($params['limit'])) {
             $result_count = count($results);
         }

From f17238997037139547317e81e9ba7645caa7f4d5 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 17 Jan 2021 18:41:31 +0100
Subject: [PATCH 017/437] chg: [internal] Faster Event::removeOlder method used
 when pulling from remote server

---
 app/Model/Event.php | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 5cc9b799f..8f1b667d9 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -4800,32 +4800,25 @@ class Event extends AppModel
         return false;
     }
 
-    public function removeOlder(&$eventArray, $scope = 'events')
+    public function removeOlder(array &$events, $scope = 'events')
     {
-        if ($scope === 'sightings' ) {
-            $field = 'sighting_timestamp';
-        } else {
-            $field = 'timestamp';
-        }
-        $uuidsToCheck = array();
-        foreach ($eventArray as $k => &$event) {
-            $uuidsToCheck[$event['uuid']] = $k;
-        }
-        $localEvents = array();
-        $temp = $this->find('all', array('recursive' => -1, 'fields' => array('Event.uuid', 'Event.' . $field, 'Event.locked')));
-        foreach ($temp as $e) {
-            $localEvents[$e['Event']['uuid']] = array($field => $e['Event'][$field], 'locked' => $e['Event']['locked']);
-        }
-        foreach ($uuidsToCheck as $uuid => $eventArrayId) {
+        $field = $scope === 'sightings' ? 'sighting_timestamp' : 'timestamp';
+        $localEvents = $this->find('all', [
+            'recursive' => -1,
+            'fields' => ['Event.uuid', 'Event.' . $field, 'Event.locked'],
+        ]);
+        $localEvents = array_column(array_column($localEvents, 'Event'), null, 'uuid');
+        foreach ($events as $k => $event) {
             // remove all events for the sighting sync if the remote is not aware of the new field yet
-            if (!isset($eventArray[$eventArrayId][$field])) {
-                unset($eventArray[$eventArrayId]);
+            if (!isset($event[$field])) {
+                unset($events[$k]);
             } else {
+                $uuid = $event['uuid'];
                 if (isset($localEvents[$uuid])
-                      && ($localEvents[$uuid][$field] >= $eventArray[$eventArrayId][$field]
+                      && ($localEvents[$uuid][$field] >= $event[$field]
                       || ($scope === 'events' && !$localEvents[$uuid]['locked'])))
                 {
-                    unset($eventArray[$eventArrayId]);
+                    unset($events[$k]);
                 }
             }
         }

From 23fff2766feb680bc12100dfa8ab6cf72cc8c990 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 17 Jan 2021 21:51:22 +0100
Subject: [PATCH 018/437] chg: [internal] Use RestResponse for
 filterEventIdsForPush

---
 app/Controller/EventsController.php               | 15 ++++++---------
 .../Events/json/filter_event_ids_for_push.ctp     |  2 --
 2 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 app/View/Events/json/filter_event_ids_for_push.ctp

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 6838a8f2b..d71607919 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -3699,9 +3699,6 @@ class EventsController extends AppController
 
     public function filterEventIdsForPush()
     {
-        if (!$this->userRole['perm_sync']) {
-            throw new MethodNotAllowedException(__('You do not have the permission to do that.'));
-        }
         if ($this->request->is('post')) {
             $incomingIDs = array();
             $incomingEvents = array();
@@ -3714,16 +3711,16 @@ class EventsController extends AppController
                 'recursive' => -1,
                 'fields' => array('Event.uuid', 'Event.timestamp', 'Event.locked'),
             ));
-            foreach ($events as $k => $v) {
-                if ($v['Event']['timestamp'] >= $incomingEvents[$v['Event']['uuid']]) {
-                    unset($incomingEvents[$v['Event']['uuid']]);
+            foreach ($events as $event) {
+                if ($event['Event']['timestamp'] >= $incomingEvents[$event['Event']['uuid']]) {
+                    unset($incomingEvents[$event['Event']['uuid']]);
                     continue;
                 }
-                if ($v['Event']['locked'] == 0) {
-                    unset($incomingEvents[$v['Event']['uuid']]);
+                if ($event['Event']['locked'] == 0) {
+                    unset($incomingEvents[$event['Event']['uuid']]);
                 }
             }
-            $this->set('result', array_keys($incomingEvents));
+            return $this->RestResponse->viewData(array_keys($incomingEvents), $this->response->type());
         }
     }
 
diff --git a/app/View/Events/json/filter_event_ids_for_push.ctp b/app/View/Events/json/filter_event_ids_for_push.ctp
deleted file mode 100644
index 060d1533e..000000000
--- a/app/View/Events/json/filter_event_ids_for_push.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-    echo json_encode($result);

From 69f901110a4f5e87856591f2cb85e0445d3b1d2f Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 19 Jan 2021 09:35:45 +0100
Subject: [PATCH 019/437] new: [sync] Compressed requests support

---
 app/Controller/AppController.php              |   1 +
 app/Controller/Component/ACLComponent.php     |   2 +-
 .../CompressedRequestHandlerComponent.php     | 145 ++++++++++++++++++
 app/Controller/ServersController.php          |  38 ++---
 4 files changed, 162 insertions(+), 24 deletions(-)
 create mode 100644 app/Controller/Component/CompressedRequestHandlerComponent.php

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 527998d8f..1d8a0ea62 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -78,6 +78,7 @@ class AppController extends Controller
             ),
             'Security',
             'ACL',
+            'CompressedRequestHandler',
             'RestResponse',
             'Flash',
             'Toolbox',
diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php
index 1ca5d94d6..f6715a70f 100644
--- a/app/Controller/Component/ACLComponent.php
+++ b/app/Controller/Component/ACLComponent.php
@@ -492,7 +492,7 @@ class ACLComponent extends Component
                     'getSubmodulesStatus' => array(),
                     'getSubmoduleQuickUpdateForm' => array(),
                     'getWorkers' => array(),
-                    'getVersion' => array('*'),
+                    'getVersion' => array('perm_auth'),
                     'idTranslator' => ['OR' => [
                         'host_org_user',
                         'perm_site_admin',
diff --git a/app/Controller/Component/CompressedRequestHandlerComponent.php b/app/Controller/Component/CompressedRequestHandlerComponent.php
new file mode 100644
index 000000000..969303257
--- /dev/null
+++ b/app/Controller/Component/CompressedRequestHandlerComponent.php
@@ -0,0 +1,145 @@
+<?php
+class CompressedRequestHandlerComponent extends Component
+{
+    // Maximum size of uncompressed data to prevent zip bombs
+    const MAX_SIZE = 1024 * 1024 * 100;
+
+    public function startup(Controller $controller)
+    {
+        $contentEncoding = CakeRequest::header('CONTENT_ENCODING');
+        if (!empty($contentEncoding)) {
+            if ($contentEncoding === 'br') {
+                $controller->request->setInput($this->decodeBrotliEncodedContent($controller));
+            } else if ($contentEncoding === 'gzip') {
+                $controller->request->setInput($this->decodeGzipEncodedContent($controller));
+            } else {
+                throw new MethodNotAllowedException("Unsupported content encoding '$contentEncoding'.");
+            }
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function supportedEncodings()
+    {
+        $supportedEncodings = [];
+        if (function_exists('gzdecode') || function_exists('inflate_init')) {
+            $supportedEncodings[] = 'gzip';
+        }
+        if (function_exists('brotli_uncompress') || function_exists('brotli_uncompress_init')) {
+            $supportedEncodings[] = 'br';
+        }
+        return $supportedEncodings;
+    }
+
+    /**
+     * @return string
+     * @throws Exception
+     * @see CakeRequest::_readInput()
+     */
+    private function decodeGzipEncodedContent(Controller $controller)
+    {
+        if (function_exists('inflate_init')) {
+            // Decompress data on the fly if supported
+            $resource = inflate_init(ZLIB_ENCODING_GZIP);
+            if ($resource === false) {
+                throw new Exception('GZIP incremental uncompress init failed.');
+            }
+            $uncompressed = '';
+            foreach ($this->streamInput() as $data) {
+                $uncompressedChunk = inflate_add($resource, $data);
+                if ($uncompressedChunk === false) {
+                    throw new MethodNotAllowedException('Invalid compressed data.');
+                }
+                $uncompressed .= $uncompressedChunk;
+                if (strlen($uncompressed) > self::MAX_SIZE) {
+                    throw new Exception("Uncompressed data are bigger than is limit.");
+                }
+            }
+            $uncompressedChunk = inflate_add($resource, '', ZLIB_FINISH);
+            if ($uncompressedChunk === false) {
+                throw new MethodNotAllowedException('Invalid compressed data.');
+            }
+            return $uncompressed . $uncompressedChunk;
+
+        } else if (function_exists('gzdecode')) {
+            $decoded = gzdecode($controller->request->input(), self::MAX_SIZE);
+            if ($decoded === false) {
+                throw new MethodNotAllowedException('Invalid compressed data.');
+            }
+            if (strlen($decoded) >= self::MAX_SIZE) {
+                throw new Exception("Uncompressed data are bigger than is limit.");
+            }
+            return $decoded;
+        } else {
+            throw new MethodNotAllowedException("This server doesn't support GZIP compressed requests.");
+        }
+    }
+
+    /**
+     * @param Controller $controller
+     * @return string
+     * @throws Exception
+     * @see CakeRequest::_readInput()
+     */
+    private function decodeBrotliEncodedContent(Controller $controller)
+    {
+        if (function_exists('brotli_uncompress_init')) {
+            // Decompress data on the fly if supported
+            $resource = brotli_uncompress_init();
+            if ($resource === false) {
+                throw new Exception('Brotli incremental uncompress init failed.');
+            }
+            $uncompressed = '';
+            foreach ($this->streamInput() as $data) {
+                $uncompressedChunk = brotli_uncompress_add($resource, $data, BROTLI_PROCESS);
+                if ($uncompressedChunk === false) {
+                    throw new MethodNotAllowedException('Invalid compressed data.');
+                }
+                $uncompressed .= $uncompressedChunk;
+                if (strlen($uncompressed) > self::MAX_SIZE) {
+                    throw new Exception("Uncompressed data are bigger than is limit.");
+                }
+            }
+            $uncompressedChunk = brotli_uncompress_add($resource, '', BROTLI_FINISH);
+            if ($uncompressedChunk === false) {
+                throw new MethodNotAllowedException('Invalid compressed data.');
+            }
+            return $uncompressed . $uncompressedChunk;
+
+        } else if (function_exists('brotli_uncompress')) {
+            $decoded = brotli_uncompress($controller->request->input(), self::MAX_SIZE);
+            if ($decoded === false) {
+                throw new MethodNotAllowedException('Invalid compressed data.');
+            }
+            if (strlen($decoded) >= self::MAX_SIZE) {
+                throw new Exception("Uncompressed data are bigger than is limit.");
+            }
+            return $decoded;
+        } else {
+            throw new MethodNotAllowedException("This server doesn't support brotli compressed requests.");
+        }
+    }
+
+    /**
+     * @param int $chunkSize
+     * @return Generator<string>
+     * @throws Exception
+     */
+    private function streamInput($chunkSize = 8192)
+    {
+        $fh = fopen('php://input', 'rb');
+        if ($fh === false) {
+            throw new Exception("Could not open PHP input for reading.");
+        }
+        while (!feof($fh)) {
+            $data = fread($fh, $chunkSize);
+            if ($data === false) {
+                throw new Exception("Could not read PHP input.");
+            }
+            yield $data;
+        }
+        fclose($fh);
+    }
+}
diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 16bd050da..d21f05b38 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -1703,23 +1703,17 @@ class ServersController extends AppController
                     $result['status'] = 8;
                     return new CakeResponse(array('body'=> json_encode($result), 'type' => 'json'));
                 }
-                return new CakeResponse(
-                        array(
-                        'body'=> json_encode(
-                            array(
-                                'status' => 1,
-                                'local_version' => implode('.', $local_version),
-                                'version' => implode('.', $version),
-                                'mismatch' => $mismatch,
-                                'newer' => $newer,
-                                'post' => isset($post) ? $post['status'] : 'too old',
-                                'response_encoding' => isset($post['content-encoding']) ? $post['content-encoding'] : null,
-                                'client_certificate' => $result['client_certificate'],
-                                )
-                            ),
-                            'type' => 'json'
-                        )
-                    );
+                return $this->RestResponse->viewData([
+                    'status' => 1,
+                    'local_version' => implode('.', $local_version),
+                    'version' => implode('.', $version),
+                    'mismatch' => $mismatch,
+                    'newer' => $newer,
+                    'post' => isset($post) ? $post['status'] : 'too old',
+                    'response_encoding' => isset($post['content-encoding']) ? $post['content-encoding'] : null,
+                    'request_encoding' => isset($result['info']['request_encoding']) ? $result['info']['request_encoding'] : null,
+                    'client_certificate' => $result['client_certificate'],
+                ], 'json');
             } else {
                 $result['status'] = 3;
             }
@@ -1799,17 +1793,15 @@ class ServersController extends AppController
 
     public function getVersion()
     {
-        if (!$this->userRole['perm_auth']) {
-            throw new MethodNotAllowedException('This action requires API access.');
-        }
         $versionArray = $this->Server->checkMISPVersion();
-        $this->set('response', array(
+        $response = [
             'version' => $versionArray['major'] . '.' . $versionArray['minor'] . '.' . $versionArray['hotfix'],
             'perm_sync' => $this->userRole['perm_sync'],
             'perm_sighting' => $this->userRole['perm_sighting'],
             'perm_galaxy_editor' => $this->userRole['perm_galaxy_editor'],
-        ));
-        $this->set('_serialize', 'response');
+            'request_encoding' => $this->CompressedRequestHandler->supportedEncodings(),
+        ];
+        return $this->RestResponse->viewData($response, $this->response->type());
     }
 
     public function getPyMISPVersion()

From afb4722f990013ba5836fd642b724dfede3010e7 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 20 Jan 2021 08:57:54 +0100
Subject: [PATCH 020/437] fix: [UI] Nicer forms

---
 app/webroot/css/main.css | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 8af1a0af0..c004267b3 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -205,9 +205,9 @@ div.actions h3 {
   color:#777;
 }
 
-div.input{
+div.input {
     float:left;
-    width: 230px;
+    margin-right: 10px;
 }
 
 div.forminfo{
@@ -2193,7 +2193,7 @@ table.table.table-striped tr.deleted_row td {
 }
 
 .checkbox input[type=checkbox] {
-    margin-top:0px;
+    margin-top:3px;
 }
 
 .simplepre {
@@ -2668,10 +2668,6 @@ table tr:hover .down-expand-button {
     margin-top: 3px;
 }
 
-.user-edit-checkboxes .checkbox input[type="checkbox"] {
-    margin-top: 4px;
-}
-
 .user-edit-checkboxes label {
     display: inline;
 }

From f4811def15ec69c4b999ee90dc1d75f736c023f7 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 20 Jan 2021 09:20:22 +0100
Subject: [PATCH 021/437] fix: [log] Allow to filter logs by org name

---
 app/Controller/LogsController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Controller/LogsController.php b/app/Controller/LogsController.php
index a8fcd70f8..ed5370ee3 100644
--- a/app/Controller/LogsController.php
+++ b/app/Controller/LogsController.php
@@ -108,7 +108,7 @@ class LogsController extends AppController
     }
 
     // Shows a minimalistic history for the currently selected event
-    public function event_index($id)
+    public function event_index($id, $org = null)
     {
         $this->loadModel('Event');
         $event = $this->Event->fetchEvent($this->Auth->user(), array(
@@ -183,6 +183,10 @@ class LogsController extends AppController
             );
         }
 
+        if ($org) {
+            $conditions['org'] = $org;
+        }
+
         $this->paginate['fields'] = array('title', 'created', 'model', 'model_id', 'action', 'change', 'org', 'email');
         $this->paginate['conditions'] = $conditions;
 
@@ -194,7 +198,7 @@ class LogsController extends AppController
                 'fields' => array('User.email')
             ));
             foreach ($list as $k => $item) {
-                if (!in_array($item['Log']['email'], $orgEmails)) {
+                if (!in_array($item['Log']['email'], $orgEmails, true)) {
                     $list[$k]['Log']['email'] = '';
                 }
             }

From fe0d0e3fa1a48dfa84a9bb567c2bd9cbd80ed021 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 20 Jan 2021 09:38:34 +0100
Subject: [PATCH 022/437] fix: [UI] Show proper unit for diagnostics

---
 app/Controller/ServersController.php          | 22 +++++++---------
 app/Model/Server.php                          | 26 +++++++++++++++++++
 .../Elements/healthElements/diagnostics.ctp   |  4 +--
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 16bd050da..1561e412a 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -1042,35 +1042,35 @@ class ServersController extends AppController
                 $this->set('branch', $gitStatus['branch']);
                 $this->set('commit', $gitStatus['commit']);
                 $this->set('latestCommit', $gitStatus['latestCommit']);
+
                 $phpSettings = array(
                     'max_execution_time' => array(
                         'explanation' => 'The maximum duration that a script can run (does not affect the background workers). A too low number will break long running scripts like comprehensive API exports',
                         'recommended' => 300,
-                        'unit' => false
+                        'unit' => 'seconds',
                     ),
                     'memory_limit' => array(
                         'explanation' => 'The maximum memory that PHP can consume. It is recommended to raise this number since certain exports can generate a fair bit of memory usage',
                         'recommended' => 2048,
-                        'unit' => 'M'
+                        'unit' => 'MB'
                     ),
                     'upload_max_filesize' => array(
                         'explanation' => 'The maximum size that an uploaded file can be. It is recommended to raise this number to allow for the upload of larger samples',
                         'recommended' => 50,
-                        'unit' => 'M'
+                        'unit' => 'MB'
                     ),
                     'post_max_size' => array(
                         'explanation' => 'The maximum size of a POSTed message, this has to be at least the same size as the upload_max_filesize setting',
                         'recommended' => 50,
-                        'unit' => 'M'
+                        'unit' => 'MB'
                     )
                 );
 
                 foreach ($phpSettings as $setting => $settingArray) {
-                    $phpSettings[$setting]['value'] = ini_get($setting);
-                    if ($settingArray['unit']) {
-                        $phpSettings[$setting]['value'] = intval(rtrim($phpSettings[$setting]['value'], $phpSettings[$setting]['unit']));
-                    } else {
-                        $phpSettings[$setting]['value'] = intval($phpSettings[$setting]['value']);
+                    $phpSettings[$setting]['value'] = $this->Server->getIniSetting($setting);
+                    if ($phpSettings[$setting]['value'] && $settingArray['unit'] && $settingArray['unit'] === 'MB') {
+                        // convert basic unit to M
+                        $phpSettings[$setting]['value'] = (int) floor($phpSettings[$setting]['value'] / 1024 / 1024);
                     }
                 }
                 $this->set('phpSettings', $phpSettings);
@@ -1651,10 +1651,6 @@ class ServersController extends AppController
 
     public function testConnection($id = false)
     {
-        if (!$this->Auth->user('Role')['perm_sync'] && !$this->Auth->user('Role')['perm_site_admin']) {
-            throw new MethodNotAllowedException('You don\'t have permission to do that.');
-        }
-
         $server = $this->Server->find('first', ['conditions' => ['Server.id' => $id]]);
         if (!$server) {
             throw new NotFoundException(__('Invalid server'));
diff --git a/app/Model/Server.php b/app/Model/Server.php
index d45cca956..228b63596 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -3432,6 +3432,32 @@ class Server extends AppModel
         return $settings;
     }
 
+    /**
+     * Return PHP setting in basic unit (bytes).
+     * @param string $setting
+     * @return string|int|null
+     */
+    public function getIniSetting($setting)
+    {
+        $value = ini_get($setting);
+        if ($value === '') {
+            return null;
+        }
+
+        switch ($setting) {
+            case 'memory_limit':
+            case 'upload_max_filesize':
+            case 'post_max_size':
+                return (int)preg_replace_callback('/(-?\d+)(.?)/', function ($m) {
+                    return $m[1] * pow(1024, strpos('BKMG', $m[2]));
+                }, strtoupper($value));
+            case 'max_execution_time':
+                return (int)$value;
+            default:
+                return $value;
+        }
+    }
+
     public function killWorker($pid, $user)
     {
         if (!is_numeric($pid)) {
diff --git a/app/View/Elements/healthElements/diagnostics.ctp b/app/View/Elements/healthElements/diagnostics.ctp
index 9df695155..a098823fd 100644
--- a/app/View/Elements/healthElements/diagnostics.ctp
+++ b/app/View/Elements/healthElements/diagnostics.ctp
@@ -156,11 +156,11 @@
     <p><?php echo __('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.');?></p>
     <?php
         foreach ($phpSettings as $settingName => &$phpSetting):
-            echo $settingName . ' (<span class="bold">' . $phpSetting['value'] . ($phpSetting['unit'] ? $phpSetting['unit'] : '') . '</span>' .')' . '…';
+            echo $settingName . ' (<b>' . $phpSetting['value'] . ($phpSetting['unit'] ? ' ' . $phpSetting['unit'] : '') . '</b>' .')' . '…';
             if ($phpSetting['value'] < $phpSetting['recommended']) $pass = false;
             else $pass = true;
     ?>
-    <span style="color:<?php echo $pass ? 'green': 'orange'; ?>"><?php echo $pass ? __('OK') : __('Low'); ?> (recommended: <?php echo strval($phpSetting['recommended']) . ($phpSetting['unit'] ? $phpSetting['unit'] : '') . ')'; ?></span><br />
+    <span style="color:<?php echo $pass ? 'green': 'orange'; ?>"><?php echo $pass ? __('OK') : __('Low'); ?> (recommended: <?php echo strval($phpSetting['recommended']) . ($phpSetting['unit'] ? ' ' . $phpSetting['unit'] : '') . ')'; ?></span><br>
     <?php
         endforeach;
     ?>

From e5d5b79e3fd7307bb9cbdc71d5899c0e20b84b51 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 20 Jan 2021 19:22:35 +0100
Subject: [PATCH 023/437] new: [modules] Export module can specify event fetch
 options

---
 app/Model/Event.php | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 5cc9b799f..7a3911ecd 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -5614,30 +5614,38 @@ class Event extends AppModel
         return $attribute;
     }
 
-    public function export($user = false, $module = false, $options = array())
+    /**
+     * @param array $user
+     * @param string $module
+     * @param array $options
+     * @return array
+     * @throws Exception
+     */
+    public function export(array $user, $module, array $options = array())
     {
-        if (empty($user)) {
-            return 'Invalid user.';
-        }
         if (empty($module)) {
-            return 'Invalid module.';
+            throw new InvalidArgumentException('Invalid module.');
         }
         $this->Module = ClassRegistry::init('Module');
         $module = $this->Module->getEnabledModule($module, 'Export');
+        if (!is_array($module)) {
+            throw new NotFoundException('Invalid module.');
+        }
+        // Export module can specify additional options for event fetch
+        if (isset($module['meta']['fetch_options'])) {
+            $options = array_merge($options, $module['meta']['fetch_options']);
+        }
         $events = $this->fetchEvent($user, $options);
         if (empty($events)) {
-            return 'Invalid event.';
+            throw new NotFoundException('Invalid event.');
         }
-        $standard_format = false;
         $modulePayload = array('module' => $module['name']);
-        if (!empty($module['meta']['require_standard_format'])) {
-            $standard_format = true;
-        }
         if (isset($module['meta']['config'])) {
             foreach ($module['meta']['config'] as $conf) {
                 $modulePayload['config'][$conf] = Configure::read('Plugin.Export_' . $module['name'] . '_' . $conf);
             }
         }
+        $standard_format = !empty($module['meta']['require_standard_format']);
         if ($standard_format) {
             App::uses('JSONConverterTool', 'Tools');
             $converter = new JSONConverterTool();
@@ -5647,11 +5655,11 @@ class Event extends AppModel
         }
         $modulePayload['data'] = $events;
         $result = $this->Module->queryModuleServer($modulePayload, false, 'Export');
-        return array(
-                'data' => $result['data'],
-                'extension' => $module['mispattributes']['outputFileExtension'],
-                'response' => $module['mispattributes']['responseType']
-        );
+        return [
+            'data' => $result['data'],
+            'extension' => $module['mispattributes']['outputFileExtension'],
+            'response' => $module['mispattributes']['responseType']
+        ];
     }
 
     public function cacheSgids($user, $useCache = false)

From 19a21fd3caf110530ede0695217dac55762b5845 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 18 Jan 2021 19:04:30 +0100
Subject: [PATCH 024/437] fix: [UI] Remote event preview

---
 .../Elements/Servers/View/row_attribute.ctp   | 27 +++++--------------
 app/View/Elements/Servers/eventattribute.ctp  | 15 +++--------
 app/View/Servers/preview_event.ctp            | 10 +++----
 3 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/app/View/Elements/Servers/View/row_attribute.ctp b/app/View/Elements/Servers/View/row_attribute.ctp
index 7ac9be7f7..4b8c6983a 100644
--- a/app/View/Elements/Servers/View/row_attribute.ctp
+++ b/app/View/Elements/Servers/View/row_attribute.ctp
@@ -27,7 +27,7 @@
     </td>
     <td class="short">
       <div id = "Attribute_<?php echo $object['id']; ?>_category_placeholder" class = "inline-field-placeholder"></div>
-      <div id = "Attribute_<?php echo $object['id']; ?>_category_solid" class="inline-field-solid" ondblclick="activateField('Attribute', '<?php echo $object['id']; ?>', 'category', <?php echo $event['Event']['id'];?>);">
+      <div id = "Attribute_<?php echo $object['id']; ?>_category_solid" class="inline-field-solid">
         <?php echo h($object['category']); ?>
       </div>
     </td>
@@ -41,31 +41,16 @@
       ?>
       <div></div>
       <div id = "Attribute_<?php echo $object['id']; ?>_type_placeholder" class = "inline-field-placeholder"></div>
-      <div id = "Attribute_<?php echo $object['id']; ?>_type_solid" class="inline-field-solid" ondblclick="activateField('Attribute', '<?php echo $object['id']; ?>', 'type', <?php echo $event['Event']['id'];?>);">
+      <div id = "Attribute_<?php echo $object['id']; ?>_type_solid" class="inline-field-solid">
         <?php echo h($object['type']); ?>
       </div>
     </td>
     <td id="Attribute_<?php echo h($object['id']); ?>_container" class="showspaces limitedWidth shortish">
       <div id="Attribute_<?php echo $object['id']; ?>_value_placeholder" class="inline-field-placeholder"></div>
-      <?php
-        if ('attachment' !== $object['type'] && 'malware-sample' !== $object['type']) $editable = ' ondblclick="activateField(\'Attribute\', \'' . $object['id'] . '\', \'value\', \'' . $event['Event']['id'] . '\');"';
-        else $editable = '';
-      ?>
-      <div id = "Attribute_<?php echo $object['id']; ?>_value_solid" class="inline-field-solid" <?php echo $editable; ?>>
+      <div id = "Attribute_<?php echo $object['id']; ?>_value_solid" class="inline-field-solid">
         <span <?php if (Configure::read('Plugin.Enrichment_hover_enable') && isset($modules) && isset($modules['hover_type'][$object['type']])) echo 'class="eventViewAttributeHover" data-object-type="Attribute" data-object-id="' . h($object['id']) . '"'?>>
-          <?php
-            echo $this->element('/Events/View/value_field', array('object' => $object, 'linkClass' => $linkClass));
-          ?>
+          <?= $this->element('/Events/View/value_field', array('object' => $object, 'linkClass' => $linkClass)); ?>
         </span>
-        <?php
-        if (isset($object['warnings'])) {
-            $temp = '';
-            foreach ($object['warnings'] as $warning) {
-                $temp .= '<span class="bold">' . h($warning['match']) . ':</span> <span class="red">' . h($warning['warninglist_name']) . '</span><br>';
-            }
-            echo ' <span aria-label="' . __('warning') . '" role="img" tabindex="0" class="fa fa-exclamation-triangle" data-placement="right" data-toggle="popover" data-content="' . h($temp) . '" data-trigger="hover" data-placement="right">&nbsp;</span>';
-        }
-        ?>
       </div>
     </td>
     <td class="shortish">
@@ -78,7 +63,7 @@
     </td>
     <td class="showspaces bitwider">
       <div id = "Attribute_<?php echo $object['id']; ?>_comment_placeholder" class = "inline-field-placeholder"></div>
-      <div id = "Attribute_<?php echo $object['id']; ?>_comment_solid" class="inline-field-solid" ondblclick="activateField('Attribute', '<?php echo $object['id']; ?>', 'comment', <?php echo $event['Event']['id'];?>);">
+      <div id = "Attribute_<?php echo $object['id']; ?>_comment_solid" class="inline-field-solid">
         <?php echo nl2br(h($object['comment'])); ?>&nbsp;
       </div>
     </td>
@@ -136,7 +121,7 @@
     </td>
     <td class="short">
       <div id = "Attribute_<?php echo $object['id']; ?>_to_ids_placeholder" class = "inline-field-placeholder"></div>
-      <div id = "Attribute_<?php echo $object['id']; ?>_to_ids_solid" class="inline-field-solid" ondblclick="activateField('Attribute', '<?php echo $object['id']; ?>', 'to_ids', <?php echo $event['Event']['id'];?>);">
+      <div id = "Attribute_<?php echo $object['id']; ?>_to_ids_solid" class="inline-field-solid">
         <?php echo $object['to_ids'] ? __('Yes') : __('No'); ?>
       </div>
     </td>
diff --git a/app/View/Elements/Servers/eventattribute.ctp b/app/View/Elements/Servers/eventattribute.ctp
index 7d7283db7..024e461d2 100644
--- a/app/View/Elements/Servers/eventattribute.ctp
+++ b/app/View/Elements/Servers/eventattribute.ctp
@@ -12,10 +12,7 @@
         <ul>
             <?php
                 $this->Paginator->options(array(
-                        'url' => array($server['Server']['id'], $event['Event']['id']),
-                        'evalScripts' => true,
-                        'before' => '$(".progress").show()',
-                        'complete' => '$(".progress").hide()',
+                    'url' => array($server['Server']['id'], $event['Event']['id']),
                 ));
                     echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
                     echo $this->Paginator->numbers(array('modulus' => 60, 'separator' => '', 'tag' => 'li', 'currentClass' => 'red', 'currentTag' => 'span'));
@@ -79,10 +76,7 @@
         <ul>
         <?php
             $this->Paginator->options(array(
-                    'url' => array($server['Server']['id'], $event['Event']['id']),
-                    'evalScripts' => true,
-                    'before' => '$(".progress").show()',
-                    'complete' => '$(".progress").hide()',
+                'url' => array($server['Server']['id'], $event['Event']['id']),
             ));
             echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
             echo $this->Paginator->numbers(array('modulus' => 60, 'separator' => '', 'tag' => 'li', 'currentClass' => 'red', 'currentTag' => 'span'));
@@ -105,7 +99,7 @@
     var currentUri = "<?php echo isset($currentUri) ? h($currentUri) : $baseurl . '/servers/previewEvent/' . h($server['Server']['id']) . '/' . h($event['Event']['id']); ?>";
     var lastSelected = false;
     var deleted = <?php echo (isset($deleted) && $deleted) ? 'true' : 'false';?>;
-    $(document).ready(function() {
+    $(function() {
         <?php
             if ($focusedRow !== false):
         ?>
@@ -118,6 +112,3 @@
         });
     });
 </script>
-<?php
-    echo $this->Js->writeBuffer();
-?>
diff --git a/app/View/Servers/preview_event.ctp b/app/View/Servers/preview_event.ctp
index 42f4dd791..47d4390a2 100644
--- a/app/View/Servers/preview_event.ctp
+++ b/app/View/Servers/preview_event.ctp
@@ -27,8 +27,8 @@
                     <dt><?php echo __('Tags');?></dt>
                     <dd class="eventTagContainer">
                     <?php if (!empty($event['Tag'])) foreach ($event['Tag'] as $tag): ?>
-                        <span style="padding-right:0px;">
-                            <span role="button" tabindex="0" aria-label="<?php echo __('Filter the remote instance by tag: %s', h($tag['name']));?>" title="<?php echo __('Filter the remote instance on the tag: %s', h($tag['name'])); ?>" onclick="document.location.href='<?php echo $baseurl . "/servers/previewIndex/" . h($server['Server']['id']); ?>/searchtag:<?php echo h($tag['name']); ?>';" class="tagFirstHalf" style="background-color:<?php echo h($tag['colour']);?>;color:<?php echo $this->TextColour->getTextColour($tag['colour']);?>"><?php echo h($tag['name']); ?></span>
+                        <span style="padding-right:0;">
+                            <span role="button" tabindex="0" aria-label="<?php echo __('Filter the remote instance by tag: %s', h($tag['name']));?>" title="<?php echo __('Filter the remote instance on the tag: %s', h($tag['name'])); ?>" onclick="document.location.href='<?php echo $baseurl . "/servers/previewIndex/" . h($server['Server']['id']); ?>/searchtag:<?php echo h($tag['id']); ?>';" class="tagFirstHalf" style="background-color:<?php echo h($tag['colour']);?>;color:<?php echo $this->TextColour->getTextColour($tag['colour']);?>"><?php echo h($tag['name']); ?></span>
                         </span>
                     <?php endforeach; ?>&nbsp;
                     </dd>
@@ -55,7 +55,7 @@
                     <?php
                         if ($event['Event']['distribution'] == 4):
                     ?>
-                            <?php echo h($event['SharingGroup']['name']); ?></a>
+                            <?php echo h($event['SharingGroup']['name']); ?>
                     <?php
                         else:
                             echo h($distributionLevels[$event['Event']['distribution']]);
@@ -129,8 +129,8 @@
 ?>
 <script type="text/javascript">
 // tooltips
-$(document).ready(function () {
-    //loadEventTags("<?php echo $event['Event']['id']; ?>");
+$(function () {
+    popoverStartup();
     $("th, td, dt, div, span, li").tooltip({
         'placement': 'top',
         'container' : 'body',

From 4c6445acb89a6177d8417e775694bce32061e310 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 21 Jan 2021 15:20:26 +0100
Subject: [PATCH 025/437] fix: [warninglists:index] Fixed URL for ID

---
 app/View/Warninglists/index.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/View/Warninglists/index.ctp b/app/View/Warninglists/index.ctp
index 9f5946389..4bcb52329 100644
--- a/app/View/Warninglists/index.ctp
+++ b/app/View/Warninglists/index.ctp
@@ -30,7 +30,7 @@
                     'class' => 'short',
                     'data_path' => 'Warninglist.id',
                     'element' => 'links',
-                    'url' => $baseurl . '/Warninglist/view/%s'
+                    'url' => $baseurl . '/warninglists/view/%s'
                 ),
                 array(
                     'name' => __('Name'),

From aa7ff5b3684d79d9e6099f907cafd61f18f7a6a6 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 21 Jan 2021 17:10:23 +0100
Subject: [PATCH 026/437] fix: [UI] Allow to download attachments from
 attribute index

---
 app/View/Attributes/index.ctp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/View/Attributes/index.ctp b/app/View/Attributes/index.ctp
index 90156df4c..b8d55324d 100755
--- a/app/View/Attributes/index.ctp
+++ b/app/View/Attributes/index.ctp
@@ -29,9 +29,10 @@
     <div class="pagination">
         <ul>
         <?php
-            echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
-            echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
-            echo $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
+            $paginator = $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
+            $paginator .= $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
+            $paginator .= $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
+            echo $paginator;
         ?>
         </ul>
     </div>
@@ -91,6 +92,7 @@
             if (!empty($attribute['Attribute']['RelatedAttribute'])) {
                 $event['RelatedAttribute'] = array($attribute['Attribute']['id'] => $attribute['Attribute']['RelatedAttribute']);
             }
+            $attribute['Attribute']['objectType'] = 'attribute';
             echo $this->element('/Events/View/row_attribute', array(
                 'object' => $attribute['Attribute'],
                 'k' => $k,
@@ -124,24 +126,18 @@
     </p>
     <div class="pagination">
         <ul>
-        <?php
-            echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
-            echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
-            echo $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
-        ?>
+        <?=  $paginator ?>
         </ul>
     </div>
 </div>
 <?php
-if ($isSearch == 1){
+if ($isSearch == 1) {
     $class = 'searchAttributes2';
 } else {
     $class = 'listAttributes';
 }
 ?>
-<?php
-    echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => $class));
-?>
+<?= $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => $class)); ?>
 <script type="text/javascript">
 // tooltips
 $(function () {

From ed10d2089edbad3c0c9fa6d0d987aea6b518868f Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 17 Jan 2021 20:54:14 +0100
Subject: [PATCH 027/437] chg: [internal] Generate event to TmpFile

---
 .../Component/RestResponseComponent.php       | 16 ++++-
 app/Controller/EventsController.php           | 61 ++++++++++++++-----
 app/Lib/Tools/JSONConverterTool.php           |  9 +--
 app/Lib/Tools/XMLConverterTool.php            | 13 ++--
 4 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/app/Controller/Component/RestResponseComponent.php b/app/Controller/Component/RestResponseComponent.php
index fd55e39f2..44558d8b9 100644
--- a/app/Controller/Component/RestResponseComponent.php
+++ b/app/Controller/Component/RestResponseComponent.php
@@ -532,7 +532,9 @@ class RestResponseComponent extends Component
                         $response['sql_dump'] = $this->Log->getDataSource()->getLog(false, false);
                     }
                 }
-                $response = json_encode($response, JSON_PRETTY_PRINT);
+                // Do not pretty print response for automatic tools
+                $flags = $this->isAutomaticTool() ? JSON_UNESCAPED_UNICODE : JSON_PRETTY_PRINT;
+                $response = json_encode($response, $flags);
             } else {
                 if ($dumpSql) {
                     $this->Log = ClassRegistry::init('Log');
@@ -582,6 +584,16 @@ class RestResponseComponent extends Component
         return $cakeResponse;
     }
 
+    /**
+     * Detect if request comes from automatic tool, like other MISP instance or PyMISP
+     * @return bool
+     */
+    public function isAutomaticTool()
+    {
+        $userAgent = CakeRequest::header('User-Agent');
+        return $userAgent && (substr($userAgent, 0, 6) === 'PyMISP' || substr($userAgent, 0, 4) === 'MISP');
+    }
+
     private function __generateURL($action, $controller, $id)
     {
         $controller = Inflector::underscore(Inflector::pluralize($controller));
@@ -1806,8 +1818,6 @@ class RestResponseComponent extends Component
     private function __overwriteReturnFormat($scope, $action, &$field) {
         switch($scope) {
             case "Attribute":
-                $field['values'] = array_keys(ClassRegistry::init($scope)->validFormats);
-                break;
             case "Event":
                 $field['values'] = array_keys(ClassRegistry::init($scope)->validFormats);
                 break;
diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 6838a8f2b..f7e871e3a 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -1612,17 +1612,17 @@ class EventsController extends AppController
         }
 
         if ($this->_isRest()) {
-            $this->set('event', $event);
-        } else {
-            $this->set('deleted', isset($deleted) ? ($deleted == 2 ? 0 : 1) : 0);
-            $this->set('includeRelatedTags', (!empty($this->params['named']['includeRelatedTags'])) ? 1 : 0);
-            $this->set('includeDecayScore', (!empty($this->params['named']['includeDecayScore'])) ? 1 : 0);
-
-            if ($this->_isSiteAdmin() && $event['Event']['orgc_id'] !== $this->Auth->user('org_id')) {
-                $this->Flash->info(__('You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work.'));
-            }
-            $this->__viewUI($event, $continue, $fromEvent);
+            return $this->__restResponse($event);
         }
+
+        $this->set('deleted', isset($deleted) ? ($deleted == 2 ? 0 : 1) : 0);
+        $this->set('includeRelatedTags', (!empty($this->params['named']['includeRelatedTags'])) ? 1 : 0);
+        $this->set('includeDecayScore', (!empty($this->params['named']['includeDecayScore'])) ? 1 : 0);
+
+        if ($this->_isSiteAdmin() && $event['Event']['orgc_id'] !== $this->Auth->user('org_id')) {
+            $this->Flash->info(__('You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work.'));
+        }
+        $this->__viewUI($event, $continue, $fromEvent);
     }
 
     private function __startPivoting($id, $info, $date)
@@ -1914,9 +1914,7 @@ class EventsController extends AppController
                         if (!empty($validationErrors)) {
                             $event['errors'] = $validationErrors;
                         }
-                        $this->set('event', $event);
-                        $this->render('view');
-                        return true;
+                        return $this->__restResponse($event);
                     } else {
                         // redirect to the view of the newly created event
                         $this->Flash->success(__('The event has been saved'));
@@ -2279,9 +2277,7 @@ class EventsController extends AppController
                     $metadata = $this->request->param('named.metadata');
                     $results = $this->Event->fetchEvent($this->Auth->user(), ['eventid' => $id, 'metadata' => $metadata]);
                     $event = $results[0];
-                    $this->set('event', $event);
-                    $this->render('view');
-                    return true;
+                    return $this->__restResponse($event);
                 } else {
                     $message = 'Error';
                     if ($this->_isRest()) {
@@ -5681,4 +5677,37 @@ class EventsController extends AppController
         }
         return $this->RestResponse->viewData($allConflicts);
     }
+
+    /**
+     * @param array $event
+     * @return CakeResponseTmp
+     * @throws Exception
+     */
+    private function __restResponse(array $event)
+    {
+        $tmpFile = new TmpFileTool();
+
+        if ($this->request->is('json')) {
+            App::uses('JSONConverterTool', 'Tools');
+            $converter = new JSONConverterTool();
+            if ($this->RestResponse->isAutomaticTool()) {
+                foreach ($converter->streamConvert($event) as $part) {
+                    $tmpFile->write($part);
+                }
+            } else {
+                $tmpFile->write($converter->convert($event));
+            }
+            $format = 'json';
+        } elseif ($this->request->is('xml')) {
+            App::uses('XMLConverterTool', 'Tools');
+            $converter = new XMLConverterTool();
+            foreach ($converter->frameCollection($converter->convert($event)) as $chunk) {
+                $tmpFile->write($chunk);
+            }
+            $format = 'xml';
+        } else {
+            throw new Exception("Invalid format, only JSON or XML is supported.");
+        }
+        return $this->RestResponse->viewData($tmpFile, $format, false, true);
+    }
 }
diff --git a/app/Lib/Tools/JSONConverterTool.php b/app/Lib/Tools/JSONConverterTool.php
index 74eb5154f..9cd63b954 100644
--- a/app/Lib/Tools/JSONConverterTool.php
+++ b/app/Lib/Tools/JSONConverterTool.php
@@ -105,18 +105,19 @@ class JSONConverterTool
     }
 
     /**
-     * Event to JSON stream convertor.
+     * Event to JSON convertor, but that is intended for machine to machine communication
      * @param array $event
      * @return Generator<string>
      */
     public function streamConvert(array $event)
     {
         $event = $this->convert($event, false, true);
+
         // Fast and inaccurate way how to check if event is too big for to convert in one call. This can be changed in future.
         $isBigEvent = (isset($event['Event']['Attribute']) ? count($event['Event']['Attribute']) : 0) +
             (isset($event['Event']['Object']) ? count($event['Event']['Object']) : 0) > 100;
         if (!$isBigEvent) {
-            yield json_encode($event, JSON_PRETTY_PRINT);
+            yield json_encode($event, JSON_UNESCAPED_UNICODE);
             return;
         }
 
@@ -127,11 +128,11 @@ class JSONConverterTool
                 yield ($firstKey === $key ? '' : ',') . json_encode($key) . ":[";
                 $firstInnerKey = key($value);
                 foreach ($value as $i => $attribute) {
-                    yield ($firstInnerKey === $i ? '' : ',')  . json_encode($attribute);
+                    yield ($firstInnerKey === $i ? '' : ',')  . json_encode($attribute, JSON_UNESCAPED_UNICODE);
                 }
                 yield "]";
             } else {
-                yield ($firstKey === $key ? '' : ',') . json_encode($key) . ":" . json_encode($value);
+                yield ($firstKey === $key ? '' : ',') . json_encode($key) . ":" . json_encode($value, JSON_UNESCAPED_UNICODE);
             }
         }
         if (isset($event['errors'])) {
diff --git a/app/Lib/Tools/XMLConverterTool.php b/app/Lib/Tools/XMLConverterTool.php
index e70032437..ef7653db5 100644
--- a/app/Lib/Tools/XMLConverterTool.php
+++ b/app/Lib/Tools/XMLConverterTool.php
@@ -198,13 +198,18 @@ class XMLConverterTool
         $field = str_replace($this->__toEscape, $this->__escapeWith, $field);
     }
 
+    /**
+     * @param string $input
+     * @param false $mispVersion
+     * @return Generator
+     */
     public function frameCollection($input, $mispVersion = false)
     {
-        $result = '<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL . '<response>' . PHP_EOL;
-        $result .= $input;
+        yield '<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL . '<response>' . PHP_EOL;
+        yield $input . PHP_EOL;
         if ($mispVersion) {
-            $result .= '<xml_version>' . $mispVersion . '</xml_version>';
+            yield '<xml_version>' . $mispVersion . '</xml_version>';
         }
-        return $result . '</response>' . PHP_EOL;
+        yield '</response>' . PHP_EOL;
     }
 }

From da6d048c6731a0656f6134734e13637eda54ee25 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 17 Jan 2021 21:54:23 +0100
Subject: [PATCH 028/437] chg: [internal] Raise memory limit for TmptFileTool
 to 5 MB

---
 app/Lib/Tools/TmpFileTool.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Lib/Tools/TmpFileTool.php b/app/Lib/Tools/TmpFileTool.php
index ce640a3d1..86e25e5cf 100644
--- a/app/Lib/Tools/TmpFileTool.php
+++ b/app/Lib/Tools/TmpFileTool.php
@@ -14,7 +14,7 @@ class TmpFileTool
     public function __construct($maxInMemory = null)
     {
         if ($maxInMemory === null) {
-            $maxInMemory = 2 * 1024 * 1024;
+            $maxInMemory = 5 * 1024 * 1024;
         }
         $this->tmpfile = fopen("php://temp/maxmemory:$maxInMemory", "w+");
         if ($this->tmpfile === false) {

From ef47a8af921e667d5c7666d456ee71c1a57154f7 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 22 Jan 2021 10:16:15 +0100
Subject: [PATCH 029/437] fix: [servers:rest] Speed up rest client and improved
 reactivity

- Added debounce when typing
- Only update query builder when its displayed
---
 app/webroot/js/restClient.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/webroot/js/restClient.js b/app/webroot/js/restClient.js
index c87d904e5..6c8a7b657 100644
--- a/app/webroot/js/restClient.js
+++ b/app/webroot/js/restClient.js
@@ -100,6 +100,7 @@ function removeRestClientHistoryItem(id) {
     var allValidApis;
     var fieldsConstraint;
     var querybuilderTool;
+    var debounceTimerUpdate;
 
     $('form').submit(function(e) {
         $('#querybuilder').remove();
@@ -141,8 +142,16 @@ function removeRestClientHistoryItem(id) {
         });
 
         $('#TemplateSelect').val($('#ServerUrl').val()).trigger("chosen:updated").trigger("change");
-        $('#ServerUrl').keyup(function() {
-            $('#TemplateSelect').val($(this).val()).trigger("chosen:updated").trigger("change");
+        $('#ServerUrl').keyup(function(e) {
+            var that = this
+            clearTimeout(debounceTimerUpdate);
+            var c = String.fromCharCode(e.keyCode);
+            var isWordCharacter = c.match(/\w/);
+            if (e.keyCode === undefined || isWordCharacter) {
+                debounceTimerUpdate = setTimeout(function() {
+                    $('#TemplateSelect').val($(that).val()).trigger("chosen:updated").trigger("change");
+                }, 200);
+            }
         });
 
         $('#TemplateSelect').change(function(e) {
@@ -227,6 +236,9 @@ function removeRestClientHistoryItem(id) {
 
 
 function updateQueryTool(url, isEmpty) {
+    if ($('#qb-div').css('display') == 'none') {
+        return
+    }
     var apiJson = allValidApis[url];
     var filtersJson = fieldsConstraint[url];
 

From 49c4e0c2ff877367b607f2a836f0bebbd0893173 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 22 Jan 2021 10:26:14 +0100
Subject: [PATCH 030/437] chg: [objects:delete] Support of hard flag in posted
 body. Fix #6689

---
 app/Controller/ObjectsController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Controller/ObjectsController.php b/app/Controller/ObjectsController.php
index 8cc806065..5a85b2a50 100644
--- a/app/Controller/ObjectsController.php
+++ b/app/Controller/ObjectsController.php
@@ -808,6 +808,9 @@ class ObjectsController extends AppController
             $this->MispObject->Event->insertLock($this->Auth->user(), $eventId);
         }
         if ($this->request->is('post') || $this->request->is('delete')) {
+            if (!empty($this->request->data['hard'])) {
+                $hard = true;
+            }
             if ($this->__delete($object['Object']['id'], $hard)) {
                 $message = 'Object deleted.';
                 if ($this->request->is('ajax')) {

From e93526c19e1ac8005d0f37cdbd7a26463cd35ff0 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 22 Jan 2021 10:49:33 +0100
Subject: [PATCH 031/437] chg: [console:admin] Improved feedback when updating
 object templates. Fix #6715

---
 app/Console/Command/AdminShell.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/Console/Command/AdminShell.php b/app/Console/Command/AdminShell.php
index f2b55953d..c6c9a757d 100644
--- a/app/Console/Command/AdminShell.php
+++ b/app/Console/Command/AdminShell.php
@@ -214,19 +214,24 @@ class AdminShell extends AppShell
             if (empty($user)) {
                 echo 'User with ID: ' . $userId . ' not found' . PHP_EOL;
                 $result = $this->ObjectTemplate->update();
-                if ($result) {
-                    echo 'Object templates updated' . PHP_EOL;
-                } else {
-                    echo 'Could not update object templates' . PHP_EOL;
-                }
             } else {
                 $result = $this->ObjectTemplate->update($user, false,false);
-                if ($result) {
-                    echo 'Object templates updated' . PHP_EOL;
-                } else {
-                    echo 'Could not update object templates' . PHP_EOL;
+            }
+
+            $successes = count(!empty($result['success']) ? $result['success'] : []);
+            $fails = count(!empty($result['fails']) ? $result['fails'] : []);
+            $message = '';
+            if ($successes == 0 && $fails == 0) {
+                $message = __('All object templates are up to date already.');
+            } elseif ($successes == 0 && $fails > 0) {
+                $message = __('Could not update any of the object templates.');
+            } elseif ($successes > 0 ) {
+                $message = __('Successfully updated %s object templates.', $successes);
+                if ($fails != 0) {
+                    $message .= __(' However, could not update %s object templates.', $fails);
                 }
             }
+            echo $message . PHP_EOL;
         }
     }
 

From 149d10fac5fb7be104ffa0e32630c0f40b92e074 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 22 Jan 2021 11:23:46 +0100
Subject: [PATCH 032/437] chg: [export:csv] Added support of decaying model.
 Fix #6734

---
 app/Lib/Export/CsvExport.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/Lib/Export/CsvExport.php b/app/Lib/Export/CsvExport.php
index a4c531387..37dfcc0da 100644
--- a/app/Lib/Export/CsvExport.php
+++ b/app/Lib/Export/CsvExport.php
@@ -6,6 +6,7 @@ class CsvExport
 	public $default_fields = array('uuid', 'event_id', 'category', 'type', 'value', 'comment', 'to_ids', 'timestamp', 'object_relation', 'attribute_tag');
 	public $default_obj_fields = array('object_uuid', 'object_name', 'object_meta-category');
 	public $requested_fields = array();
+	public $decaying_fields = array('decay_score_score', 'decay_score_decayed');
 	public $non_restrictive_export = true;
 
     public function handler($data, $options = array())
@@ -22,6 +23,9 @@ class CsvExport
 
 	public function modify_params($user, $params)
 	{
+		if (!empty($params['includeDecayScore'])) {
+			$this->enable_decaying();
+		}
 		if (empty($params['contain'])) {
 			$params['contain'] = array();
 		}
@@ -36,6 +40,11 @@ class CsvExport
 		return $params;
 	}
 
+	public function enable_decaying()
+	{
+		$this->default_fields = array_merge($this->default_fields, $this->decaying_fields);
+	}
+
 	private function __attributesHandler($attribute, $options)
 	{
 		$attribute = $this->__addMetadataToAttributeAtomic($attribute);
@@ -44,6 +53,17 @@ class CsvExport
 			$attribute['object_name'] = $attribute['Object']['name'];
 			$attribute['object_meta-category'] = $attribute['Object']['meta-category'];
 		}
+		if (!empty($attribute['decay_score'])) {
+			$all_scores = Hash::extract($attribute, 'decay_score.{n}.score');
+			$all_decayed = Hash::extract($attribute, 'decay_score.{n}.decayed');
+			$avg_score = array_sum($all_scores)/count($all_scores);
+			$avg_decayed = count(array_intersect([true], $all_decayed)) > 0;
+			$attribute['decay_score_score'] = $avg_score;
+			$attribute['decay_score_decayed'] = $avg_decayed;
+		} else {
+			$attribute['decay_score_score'] = 0;
+			$attribute['decay_score_decayed'] = false;
+		}
 		return $this->__addLine($attribute, $options);
 	}
 

From cfbf9346cb4d1613b57d8ad793200077a731d314 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 22 Jan 2021 11:35:36 +0100
Subject: [PATCH 033/437] chg: [eventReports] Improved manual extraction layout

---
 app/webroot/css/markdownEditor/event-report.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/webroot/css/markdownEditor/event-report.css b/app/webroot/css/markdownEditor/event-report.css
index 7dbd072df..eca9a1b0a 100644
--- a/app/webroot/css/markdownEditor/event-report.css
+++ b/app/webroot/css/markdownEditor/event-report.css
@@ -149,4 +149,12 @@ span.misp-element-wrapper.object {
 
 .popover {
     z-index: 1060;
+}
+
+#suggestion-container select{
+    margin-bottom: 0;
+}
+
+#suggestion-container .input-append, #suggestion-container .input-prepend{
+    margin-bottom: 0;
 }
\ No newline at end of file

From 60c9e064ec5e13230341e552b294b75bab1ea29a Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 22 Jan 2021 11:38:01 +0100
Subject: [PATCH 034/437] chg: bumped queryversion

---
 app/Controller/AppController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index d78a50bc5..6575bb0f0 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -25,7 +25,7 @@ class AppController extends Controller
 
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
 
-    private $__queryVersion = '120';
+    private $__queryVersion = '121';
     public $pyMispVersion = '2.4.137';
     public $phpmin = '7.2';
     public $phprec = '7.4';

From fea5fddc281a50f0a079fd71947b46e46c24c274 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 22 Jan 2021 13:57:19 +0100
Subject: [PATCH 035/437] fix: [server:recoveyQuery] Only add `unsigned` when
 applicable. Fix #6762

- Correctly compare return value of strpos
---
 app/Model/Server.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index 85c51869c..16e1d6cae 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -2724,7 +2724,7 @@ class Server extends AppModel
                             $field['column_name'],
                             $field['expected']['data_type'],
                             $length !== null ? sprintf('(%d)', $length) : '',
-                            strpos($field['expected']['column_type'], 'unsigned') != -1 ? 'UNSIGNED' : '',
+                            strpos($field['expected']['column_type'], 'unsigned') !== false ? 'UNSIGNED' : '',
                             isset($field['expected']['column_default']) ? 'DEFAULT "' . $field['expected']['column_default'] . '"' : '',
                             $field['expected']['is_nullable'] === 'NO' ? 'NOT NULL' : 'NULL',
                             empty($field['expected']['collation_name']) ? '' : 'COLLATE ' . $field['expected']['collation_name'],
@@ -2738,7 +2738,7 @@ class Server extends AppModel
                             $field['column_name'],
                             $field['expected']['data_type'],
                             $length !== null ? sprintf('(%d)', $length) : '',
-                            strpos($field['expected']['column_type'], 'unsigned') != -1 ? 'UNSIGNED' : '',
+                            strpos($field['expected']['column_type'], 'unsigned') !== false ? 'UNSIGNED' : '',
                             isset($field['expected']['column_default']) ? 'DEFAULT "' . $field['expected']['column_default'] . '"' : '',
                             $field['expected']['is_nullable'] === 'NO' ? 'NOT NULL' : 'NULL',
                             empty($field['expected']['collation_name']) ? '' : 'COLLATE ' . $field['expected']['collation_name'],
@@ -2763,7 +2763,7 @@ class Server extends AppModel
                         $expectedField['column_name'],
                         $expectedField['data_type'],
                         $length !== null ? sprintf('(%d)', $length) : '',
-                        strpos($expectedField['column_type'], 'unsigned') != -1 ? 'UNSIGNED' : '',
+                        strpos($expectedField['column_type'], 'unsigned') !== false ? 'UNSIGNED' : '',
                         isset($expectedField['column_default']) ? 'DEFAULT "' . $expectedField['column_default'] . '"' : '',
                         $expectedField['is_nullable'] === 'NO' ? 'NOT NULL' : 'NULL',
                         empty($expectedField['collation_name']) ? '' : 'COLLATE ' . $expectedField['collation_name'],

From af482e7eaf617bce40ba9775e41e2cc2c54b7d69 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 22 Jan 2021 14:13:06 +0100
Subject: [PATCH 036/437] fix: [eventReport:getProxyElement] Prevent crash if
 viewing a report for an extended event

- Make sure merging array happens in existing keys
---
 app/Model/Event.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 5cc9b799f..000c7a086 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -2469,6 +2469,12 @@ class Event extends AppModel
             $event['Event']['extensionEvents'][$eventMeta['id']] = $eventMeta;
             $thingsToMerge = array('Attribute', 'Object', 'ShadowAttribute', 'Galaxy');
             foreach ($thingsToMerge as $thingToMerge) {
+                if (!isset($event[$thingToMerge])) {
+                    $event[$thingToMerge] = [];
+                }
+                if (!isset($extensionEvent[$thingToMerge])) {
+                    $extensionEvent[$thingToMerge] = [];
+                }
                 $event[$thingToMerge] = array_merge($event[$thingToMerge], $extensionEvent[$thingToMerge]);
             }
             // Merge event reports if requested

From 942b6f1be83bd83cc95a8d32f495c785dff125a7 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 25 Jan 2021 13:57:50 +0100
Subject: [PATCH 037/437] fix: [events:eventGraph] Deleted object reference are
 no longer shown in the graph

- Fix #6487
---
 app/Lib/Tools/EventGraphTool.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Lib/Tools/EventGraphTool.php b/app/Lib/Tools/EventGraphTool.php
index adda8c2e0..ecb4eebf7 100644
--- a/app/Lib/Tools/EventGraphTool.php
+++ b/app/Lib/Tools/EventGraphTool.php
@@ -77,6 +77,11 @@
                 if (!($check1 && $check2)) {
                     unset($event['Object'][$i]);
                 }
+                foreach($obj['ObjectReference'] as $j => $rel) {
+                    if ($rel['deleted']) {
+                        unset($event['Object'][$i]['ObjectReference'][$j]);
+                    }
+                }
             }
             foreach ($event['Attribute'] as $i => $attr) {
                 $check1 = $this->__satisfy_val_filtering($attr, false);
@@ -519,7 +524,7 @@
         public function get_reference_data($uuid)
         {
             $objectReference = $this->__refModel->ObjectReference->find('all', array(
-                'conditions' => array('ObjectReference.uuid' => $uuid),
+                'conditions' => array('ObjectReference.uuid' => $uuid, 'ObjectReference.deleted' => false),
                 'recursive' => -1,
                 //'fields' => array('ObjectReference.id', 'relationship_type', 'comment', 'referenced_uuid')
                 ));

From eb6c8a14b0e59c434c31e8c56eaff464850f830b Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 25 Jan 2021 14:38:30 +0100
Subject: [PATCH 038/437] fix: [attributes:viewPicture] Allow viewing pictures
 of deleted attributes

---
 app/Controller/AttributesController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index 113e893c9..9424792be 100644
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -998,6 +998,7 @@ class AttributesController extends AppController
             'includeAllTags' => false,
             'includeAttributeUuid' => true,
             'flatten' => true,
+            'deleted' => [0, 1]
         );
 
         if ($this->_isRest()) {

From dab00a95691310d6cce85ada987b9f18a6f8d0a2 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 25 Jan 2021 15:26:53 +0100
Subject: [PATCH 039/437] fix: [shadowAttributes:viewPicture] Allows shadow
 attribute's pictures to be displayed

---
 app/Controller/ShadowAttributesController.php | 46 +++++++++++++++++++
 app/Model/Attribute.php                       |  2 +-
 app/Model/ShadowAttribute.php                 | 45 ++++++++++++++++++
 app/View/Elements/Events/View/value_field.ctp |  2 +-
 4 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/app/Controller/ShadowAttributesController.php b/app/Controller/ShadowAttributesController.php
index 214bd9daf..06faa8b5d 100644
--- a/app/Controller/ShadowAttributesController.php
+++ b/app/Controller/ShadowAttributesController.php
@@ -828,6 +828,52 @@ class ShadowAttributesController extends AppController
         $this->set('_serialize', array('ShadowAttribute'));
     }
 
+    public function viewPicture($id, $thumbnail=false)
+    {
+        $conditions['ShadowAttribute.id'] = $id;
+        $conditions['ShadowAttribute.type'] = 'attachment';
+        $options = array(
+            'conditions' => $conditions,
+            'includeAllTags' => false,
+            'includeAttributeUuid' => true,
+            'flatten' => true,
+            'deleted' => [0, 1]
+        );
+
+        
+        $sa = $this->ShadowAttribute->find('first', array(
+            'recursive' => -1,
+            'contain' => ['Event', 'Attribute'], // required because of conditions
+            'fields' => array(
+                'ShadowAttribute.id', 'ShadowAttribute.old_id', 'ShadowAttribute.event_id', 'ShadowAttribute.type', 'ShadowAttribute.category', 'ShadowAttribute.uuid', 'ShadowAttribute.to_ids', 'ShadowAttribute.value', 'ShadowAttribute.comment', 'ShadowAttribute.org_id', 'ShadowAttribute.first_seen', 'ShadowAttribute.last_seen',
+            ),
+            'conditions' => $conditions,
+        ));
+        if (empty($sa)) {
+            throw new NotFoundException(__('Invalid proposal.'));
+        }
+        
+        if (!$this->ShadowAttribute->Attribute->isImage($sa['ShadowAttribute'])) {
+            throw new NotFoundException("ShadowAttribute is not an image.");
+        }
+        if ($this->_isRest()) {
+            if ($this->ShadowAttribute->typeIsAttachment($sa['ShadowAttribute']['type'])) {
+                $encodedFile = $this->ShadowAttribute->base64EncodeAttachment($sa['ShadowAttribute']);
+                $sa['ShadowAttribute']['data'] = $encodedFile;
+            }
+        }
+
+        if ($this->_isRest()) {
+            return $this->RestResponse->viewData($sa['ShadowAttribute']['data'], $this->response->type());
+        } else {
+            $width = isset($this->request->params['named']['width']) ? $this->request->params['named']['width'] : 200;
+            $height = isset($this->request->params['named']['height']) ? $this->request->params['named']['height'] : 200;
+            $imageData = $this->ShadowAttribute->getPictureData($sa, $thumbnail, $width, $height);
+            $extension = pathinfo($sa['ShadowAttribute']['value'], PATHINFO_EXTENSION);
+            return new CakeResponse(array('body' => $imageData, 'type' => strtolower($extension)));
+        }
+    }
+
     public function index($eventId = false)
     {
         $conditions = array();
diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 3d1166213..f4b716ba3 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -1575,7 +1575,7 @@ class Attribute extends AppModel
      * @return string
      * @throws Exception
      */
-    private function resizeImage($data, $maxWidth, $maxHeight)
+    public function resizeImage($data, $maxWidth, $maxHeight)
     {
         $image = imagecreatefromstring($data);
         if ($image === false) {
diff --git a/app/Model/ShadowAttribute.php b/app/Model/ShadowAttribute.php
index be7054a03..26ca56687 100644
--- a/app/Model/ShadowAttribute.php
+++ b/app/Model/ShadowAttribute.php
@@ -819,4 +819,49 @@ class ShadowAttribute extends AppModel
             ));
         }
     }
+
+    public function saveAttachment($shadowAttribute, $path_suffix='')
+    {
+        $result = $this->loadAttachmentTool()->saveShadow($shadowAttribute['event_id'], $shadowAttribute['id'], $shadowAttribute['data'], $path_suffix);
+        if ($result) {
+            $this->loadAttachmentScan()->backgroundScan(AttachmentScan::TYPE_SHADOW_ATTRIBUTE, $shadowAttribute);
+        }
+        return $result;
+    }
+
+    /**
+     * @param array $shadowAttribute
+     * @param bool $thumbnail
+     * @param int $maxWidth - When $thumbnail is true
+     * @param int $maxHeight - When $thumbnail is true
+     * @return string
+     * @throws Exception
+     */
+    public function getPictureData(array $shadowAttribute, $thumbnail=false, $maxWidth=200, $maxHeight=200)
+    {
+        if ($thumbnail && extension_loaded('gd')) {
+            if ($maxWidth == 200 && $maxHeight == 200) {
+                // Return thumbnail directly if already exists
+                try {
+                    return $this->getAttachment($shadowAttribute['ShadowAttribute'], $path_suffix = '_thumbnail');
+                } catch (NotFoundException $e) {
+                    // pass
+                }
+            }
+
+            // Thumbnail doesn't exists, we need to generate it
+            $imageData = $this->getAttachment($shadowAttribute['ShadowAttribute']);
+            $imageData = $this->Attribute->resizeImage($imageData, $maxWidth, $maxHeight);
+
+            // Save just when requested default thumbnail size
+            if ($maxWidth == 200 && $maxHeight == 200) {
+                $shadowAttribute['ShadowAttribute']['data'] = $imageData;
+                $this->saveAttachment($shadowAttribute['ShadowAttribute'], $path_suffix='_thumbnail');
+            }
+        } else {
+            $imageData = $this->getAttachment($shadowAttribute['ShadowAttribute']);
+        }
+
+        return $imageData;
+    }
 }
diff --git a/app/View/Elements/Events/View/value_field.ctp b/app/View/Elements/Events/View/value_field.ctp
index ac2dcc3de..f4190d0ca 100644
--- a/app/View/Elements/Events/View/value_field.ctp
+++ b/app/View/Elements/Events/View/value_field.ctp
@@ -28,7 +28,7 @@ switch ($object['type']) {
         if ($object['type'] === 'attachment' && isset($object['image'])) {
             if ($object['image'] === true) {
                 $img = '<it class="fa fa-spin fa-spinner" style="font-size: large; left: 50%; top: 50%;"></it>';
-                $img .= '<img class="screenshot screenshot-collapsed useCursorPointer img-rounded hidden" src="' . $baseurl . '/attributes/viewPicture/' . h($object['id']) . '/1' . '" title="' . h($object['value']) . '" onload="$(this).show(200); $(this).parent().find(\'.fa-spinner\').remove();"/>';
+                $img .= '<img class="screenshot screenshot-collapsed useCursorPointer img-rounded hidden" src="' . $baseurl . sprintf('/%s/viewPicture/', $object['objectType'] == 'proposal' ? 'shadowAttributes' : 'attributes') . h($object['id']) . '/1' . '" title="' . h($object['value']) . '" onload="$(this).show(200); $(this).parent().find(\'.fa-spinner\').remove();"/>';
                 echo $img;
             } else {
                 $extension = pathinfo($object['value'], PATHINFO_EXTENSION);

From b36f685d88b8c91e6b5879445cb29363b4231157 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Tue, 26 Jan 2021 10:51:59 +0100
Subject: [PATCH 040/437] chg: [eventReports:delete] Accept hard flag to be
 passed in POST body

---
 app/Controller/EventReportsController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Controller/EventReportsController.php b/app/Controller/EventReportsController.php
index 8b6ddf1cb..90411d1ab 100644
--- a/app/Controller/EventReportsController.php
+++ b/app/Controller/EventReportsController.php
@@ -124,7 +124,10 @@ class EventReportsController extends AppController
     {
         $report = $this->EventReport->fetchIfAuthorized($this->Auth->user(), $id, 'delete', $throwErrors=true, $full=false);
         if ($this->request->is('post')) {
-            $errors = $this->EventReport->deleteReport($this->Auth->user(), $report, $hard=$hard);
+            if (!empty($this->request->data['hard'])) {
+                $hard = true;
+            }
+            $errors = $this->EventReport->deleteReport($this->Auth->user(), $report, $hard);
             $redirectTarget = $this->referer();
             if (empty($errors)) {
                 $successMessage = __('Event Report %s %s deleted', $id, $hard ? __('hard') : __('soft'));

From 5e6444a663085c2f45e33fed2240f5e17e484b36 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Tue, 26 Jan 2021 15:33:46 +0100
Subject: [PATCH 041/437] chg: [eventReports:delete] Make delete/restore call
 consistent with other models

---
 app/Controller/EventReportsController.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Controller/EventReportsController.php b/app/Controller/EventReportsController.php
index 90411d1ab..3d9bf0343 100644
--- a/app/Controller/EventReportsController.php
+++ b/app/Controller/EventReportsController.php
@@ -131,8 +131,7 @@ class EventReportsController extends AppController
             $redirectTarget = $this->referer();
             if (empty($errors)) {
                 $successMessage = __('Event Report %s %s deleted', $id, $hard ? __('hard') : __('soft'));
-                $report = $hard ? null : $this->EventReport->simpleFetchById($this->Auth->user(), $id);
-                return $this->__getSuccessResponseBasedOnContext($successMessage, $report, 'delete', $id, $redirectTarget);
+                return $this->__getSuccessResponseBasedOnContext($successMessage, null, 'delete', $id, $redirectTarget);
             } else {
                 $errorMessage = __('Event Report %s could not be %s deleted.%sReasons: %s', $id, $hard ? __('hard') : __('soft'), PHP_EOL, json_encode($errors));
                 return $this->__getFailResponseBasedOnContext($errorMessage, array(), 'edit', $id, $redirectTarget);
@@ -156,8 +155,7 @@ class EventReportsController extends AppController
             $redirectTarget = $this->referer();
             if (empty($errors)) {
                 $successMessage = __('Event Report %s restored', $id);
-                $report = $this->EventReport->simpleFetchById($this->Auth->user(), $id);
-                return $this->__getSuccessResponseBasedOnContext($successMessage, $report, 'restore', $id, $redirectTarget);
+                return $this->__getSuccessResponseBasedOnContext($successMessage, null, 'restore', $id, $redirectTarget);
             } else {
                 $errorMessage = __('Event Report %s could not be %s restored.%sReasons: %s', $id, PHP_EOL, json_encode($errors));
                 return $this->__getFailResponseBasedOnContext($errorMessage, array(), 'restore', $id, $redirectTarget);

From 75e36eaa3315d8558422a787746bee3f3a4641ab Mon Sep 17 00:00:00 2001
From: marjatech <github@marja.tech>
Date: Thu, 21 Jan 2021 13:16:51 +0000
Subject: [PATCH 042/437] switch S/MIME Signature generation to DETACHED mode

---
 app/Lib/Tools/SendEmail.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Lib/Tools/SendEmail.php b/app/Lib/Tools/SendEmail.php
index 74d3ea85f..a8b6e95f9 100644
--- a/app/Lib/Tools/SendEmail.php
+++ b/app/Lib/Tools/SendEmail.php
@@ -729,14 +729,14 @@ class SendEmail
         }
 
         list($inputFile, $outputFile) = $this->createInputOutputFiles($body);
-        $result = openssl_pkcs7_sign($inputFile->pwd(), $outputFile->pwd(), $certPublicSign, $keySign, array(), 0);
+        $result = openssl_pkcs7_sign($inputFile->pwd(), $outputFile->pwd(), $certPublicSign, $keySign, array(), PKCS7_DETACHED);
         $inputFile->delete();
 
         if ($result) {
             $data = $outputFile->read();
             $outputFile->delete();
             $parts = explode("\n\n", $data);
-            return $parts[1] . "\n";
+            return $parts[4] . "\n";
 
         } else {
             $outputFile->delete();

From 3bd8c93ad0217079d232c629335f94b0395d321c Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 27 Jan 2021 10:43:31 +0100
Subject: [PATCH 043/437] chg: [objecTemplate:getRaw] Refactored and optimized
 feature

---
 app/Model/ObjectTemplate.php | 68 ++++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 26 deletions(-)

diff --git a/app/Model/ObjectTemplate.php b/app/Model/ObjectTemplate.php
index 9c8e59a51..4a312ea91 100644
--- a/app/Model/ObjectTemplate.php
+++ b/app/Model/ObjectTemplate.php
@@ -31,6 +31,8 @@ class ObjectTemplate extends AppModel
     public $validate = array(
     );
 
+    public $objectsDir = APP . 'files/misp-objects/objects';
+
     public function afterFind($results, $primary = false)
     {
         foreach ($results as $k => $result) {
@@ -49,8 +51,7 @@ class ObjectTemplate extends AppModel
 
     public function update($user = false, $type = false, $force = false)
     {
-        $objectsDir = APP . 'files/misp-objects/objects';
-        $directories = glob($objectsDir . '/*', GLOB_ONLYDIR);
+        $directories = $this->getTemplateDirectoryPaths();
         foreach ($directories as $k => $dir) {
             $dir = str_replace($objectsDir, '', $dir);
             $directories[$k] = $dir;
@@ -60,10 +61,10 @@ class ObjectTemplate extends AppModel
             if ($type && '/' . $type != $dir) {
                 continue;
             }
-            if (!file_exists($objectsDir . DS . $dir . DS . 'definition.json')) {
+            if (!file_exists($this->objectsDir . DS . $dir . DS . 'definition.json')) {
                 continue;
             }
-            $file = new File($objectsDir . DS . $dir . DS . 'definition.json');
+            $file = new File($this->objectsDir . DS . $dir . DS . 'definition.json');
             $template = json_decode($file->read(), true);
             $file->close();
             if (!isset($template['version'])) {
@@ -319,38 +320,53 @@ class ObjectTemplate extends AppModel
 
     public function getRawFromDisk($uuidOrName)
     {
-        $templates = $this->readTemplatesFromDisk();
+        $template = [];
         if (Validation::uuid($uuidOrName)) {
-            return $templates[$uuidOrName];
-        } else {
-            foreach ($templates as $uuid => $template) {
-                if ($template['name'] == $uuidOrName) {
-                    return $template;
+            foreach ($this->readTemplatesFromDisk() as $templateFromDisk) {
+                if ($templateFromDisk['uuid'] == $uuidOrName) {
+                    $template = $templateFromDisk;
+                    break;
                 }
             }
+        } else {
+            $allTemplateNames = $this->getTemplateDirectoryPaths(false);
+            if (in_array($uuidOrName, $allTemplateNames)) { // ensure the path is not out of scope
+                $template = $this->readTemplateFromDisk($this->getFullPathFromTemplateName($uuidOrName));
+            }
         }
+        return $template;
+    }
+
+    private function readTemplateFromDisk($path)
+    {
+        $file = new File($path, false);
+        if (!$file->exists()) {
+            return false;
+        }
+        $template = json_decode($file->read(), true);
+        $file->close();
+        return $template;
     }
 
     private function readTemplatesFromDisk()
     {
-        $objectsDir = APP . 'files/misp-objects/objects';
-        $directories = glob($objectsDir . '/*', GLOB_ONLYDIR);
-        foreach ($directories as $k => $dir) {
-            $dir = str_replace($objectsDir, '', $dir);
-            $directories[$k] = $dir;
-        }
-        $templates = [];
-        foreach ($directories as $dir) {
-            if (!file_exists($objectsDir . DS . $dir . DS . 'definition.json')) {
-                continue;
-            }
-            $file = new File($objectsDir . DS . $dir . DS . 'definition.json');
-            $template = json_decode($file->read(), true);
+        foreach ($this->getTemplateDirectoryPaths() as $dirpath) {
+            $filepath = $dirpath . DS . 'definition.json';
+            $template = $this->readTemplateFromDisk($filepath);
             if (isset($template['uuid'])) {
-                $templates[$template['uuid']] = $template;
+                yield $template;
             }
-            $file->close();
         }
-        return $templates;
+    }
+
+    private function getTemplateDirectoryPaths($fullPath=true)
+    {
+        $dir = new Folder($this->objectsDir, false);
+        return $dir->read(true, false, $fullPath)[0];
+    }
+
+    private function getFullPathFromTemplateName($templateName)
+    {
+        return $this->objectsDir . DS . $templateName . DS . 'definition.json';
     }
 }

From 67f0c671ce76a6fa381cc289278c42a4b7d68167 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 27 Jan 2021 12:17:31 +0100
Subject: [PATCH 044/437] fix: [objectTemplate:update] Typo instance variable

---
 app/Model/ObjectTemplate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/ObjectTemplate.php b/app/Model/ObjectTemplate.php
index 4a312ea91..f721d48cb 100644
--- a/app/Model/ObjectTemplate.php
+++ b/app/Model/ObjectTemplate.php
@@ -53,7 +53,7 @@ class ObjectTemplate extends AppModel
     {
         $directories = $this->getTemplateDirectoryPaths();
         foreach ($directories as $k => $dir) {
-            $dir = str_replace($objectsDir, '', $dir);
+            $dir = str_replace($this->objectsDir, '', $dir);
             $directories[$k] = $dir;
         }
         $updated = array();

From 7bbd509e186ea548804668750090e95637f10fd9 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 27 Jan 2021 13:28:07 +0100
Subject: [PATCH 045/437] fix: [acl] Added missing ACL entry

---
 app/Controller/Component/ACLComponent.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php
index 31302d5b0..d31769222 100644
--- a/app/Controller/Component/ACLComponent.php
+++ b/app/Controller/Component/ACLComponent.php
@@ -543,6 +543,7 @@ class ACLComponent extends Component
                     'generateCorrelation' => array(),
                     'index' => array('*'),
                     'view' => array('*'),
+                    'viewPicture' => array('*'),
             ),
             'sharingGroups' => array(
                     'add' => array('perm_sharing_group'),

From 2ce6d0b240b34f34c7d2e30b40a6bfeff7727de6 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 28 Jan 2021 14:06:02 +0100
Subject: [PATCH 046/437] fix: [internal] Fix some warnings

---
 app/Controller/ServersController.php   | 12 +++++++-----
 app/Lib/Tools/CorrelationGraphTool.php |  9 +++++----
 app/Model/Tag.php                      |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 07fd65acc..070b855b5 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -1343,16 +1343,18 @@ class ServersController extends AppController
                 }
 
                 try {
-                    $remote_event = $this->Event->downloadEventFromServer($local_event['Event']['uuid'], $server, null, true);
-                    $remote_event_id = $remote_event[0]['id'];
+                    $remoteEvent = $this->Event->downloadEventFromServer($local_event['Event']['uuid'], $server, null, true);
                 } catch (Exception $e) {
-                    $remote_event_id = null;
+                    $remoteEvent = null;
+                }
+                if ($remoteEvent) {
+                    $remoteEventId = $remoteEvent[0]['id'];
                 }
                 $remote_events[] = array(
                     "server_id" => $server['Server']['id'],
                     "server_name" => $server['Server']['name'],
-                    "url" => isset($remote_event_id) ? $server['Server']['url']."/events/view/".$remote_event_id : $server['Server']['url'],
-                    "remote_id" => isset($remote_event_id) ? $remote_event_id : false
+                    "url" => isset($remoteEventId) ? $server['Server']['url'] . "/events/view/" . $remoteEventId : $server['Server']['url'],
+                    "remote_id" => isset($remoteEventId) ? $remoteEventId : false
                 );
             }
 
diff --git a/app/Lib/Tools/CorrelationGraphTool.php b/app/Lib/Tools/CorrelationGraphTool.php
index 2541c9350..0e18512be 100644
--- a/app/Lib/Tools/CorrelationGraphTool.php
+++ b/app/Lib/Tools/CorrelationGraphTool.php
@@ -4,13 +4,14 @@
       private $__lookupTables = array();
       private $__related_events = array();
       private $__related_attributes = array();
-      private $__eventModel = false;
+      /** @var Event */
+      private $__eventModel;
       private $__taxonomyModel = false;
       private $__galaxyClusterModel = false;
       private $__user = false;
       private $__json = array();
 
-      public function construct($eventModel, $taxonomyModel, $galaxyClusterModel, $user, $json)
+      public function construct(Event $eventModel, $taxonomyModel, $galaxyClusterModel, $user, $json)
       {
           $this->__eventModel = $eventModel;
           $this->__taxonomyModel = $taxonomyModel;
@@ -99,11 +100,11 @@
       {
           foreach ($objects as $k => $object) {
               $include = $full;
-              if (!$include) {
+              if (!$include && isset($object['Attribute'])) {
                   foreach ($object['Attribute'] as $attribute) {
                       if (isset($this->__related_attributes[$attribute['id']])) {
                           $include = true;
-                          continue;
+                          break;
                       }
                   }
               }
diff --git a/app/Model/Tag.php b/app/Model/Tag.php
index 9a9e5a45a..7cbe0e934 100644
--- a/app/Model/Tag.php
+++ b/app/Model/Tag.php
@@ -177,8 +177,8 @@ class Tag extends AppModel
     {
         $conditions = array();
         if (!$user['Role']['perm_site_admin']) {
-            $conditions['Tag.org_id'] = array(0, $user['User']['org_id']);
-            $conditions['Tag.user_id'] = array(0, $user['User']['id']);
+            $conditions['Tag.org_id'] = array(0, $user['org_id']);
+            $conditions['Tag.user_id'] = array(0, $user['id']);
             $conditions['Tag.hide_tag'] = 0;
         }
         return $this->find('all', array('conditions' => $conditions, 'recursive' => -1));

From c2a2f734168216368fb209e0835452b5c7fff0e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Thu, 28 Jan 2021 15:04:13 +0100
Subject: [PATCH 047/437] chg: Bump PyMISP

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index 5b97b7d01..82ca4ff04 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 5b97b7d0158906cd0f646a7273a3ca5b1828cd15
+Subproject commit 82ca4ff0433292db794d576a20573b120ef4c3f1

From c01028a036c8a88cb0f7e1fa2252dd2b0a6951b2 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 28 Jan 2021 19:19:34 +0100
Subject: [PATCH 048/437] new: [internal] Cidr tool for faster checking CIDR
 ranges

---
 .github/workflows/main.yml |   1 +
 app/Lib/Tools/CidrTool.php | 120 +++++++++++++++++++++++++++++++++++++
 app/Model/Warninglist.php  | 109 ++-------------------------------
 app/Test/CidrToolTest.php  |  41 +++++++++++++
 4 files changed, 166 insertions(+), 105 deletions(-)
 create mode 100644 app/Lib/Tools/CidrTool.php
 create mode 100644 app/Test/CidrToolTest.php

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f1e7d517b..c73df70de 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -212,6 +212,7 @@ jobs:
               ./app/Vendor/bin/parallel-lint --exclude app/Lib/cakephp/ --exclude app/Vendor/ --exclude app/Lib/random_compat/ -e php,ctp app/
               ./app/Vendor/bin/phpunit app/Test/ComplexTypeToolTest.php
               ./app/Vendor/bin/phpunit app/Test/JSONConverterToolTest.php
+              ./app/Vendor/bin/phpunit app/Test/CidrToolTest.php
 
               # Ensure the perms of config files
               sudo chown -R $USER:www-data `pwd`/app/Config
diff --git a/app/Lib/Tools/CidrTool.php b/app/Lib/Tools/CidrTool.php
new file mode 100644
index 000000000..603041f8a
--- /dev/null
+++ b/app/Lib/Tools/CidrTool.php
@@ -0,0 +1,120 @@
+<?php
+class CidrTool
+{
+    /** @var array */
+    private $ipv4 = [];
+
+    /** @var array */
+    private $ipv6 = [];
+
+    public function __construct(array $list)
+    {
+        $this->filterInputList($list);
+    }
+
+    /**
+     * @param string $value IPv4 or IPv6 address or range
+     * @return false|string
+     */
+    public function contains($value)
+    {
+        $valueMask = null;
+        if (strpos($value, '/') !== false) {
+            list($value, $valueMask) = explode('/', $value);
+        }
+
+        $match = false;
+        if (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+            // This code converts IP address to all possible CIDRs that can contains given IP address
+            // and then check if given hash table contains that CIDR.
+            $ip = ip2long($value);
+            // Start from 1, because doesn't make sense to check 0.0.0.0/0 match
+            for ($bits = 1; $bits <= 32; $bits++) {
+                $mask = -1 << (32 - $bits);
+                $needle = long2ip($ip & $mask) . "/$bits";
+                if (isset($this->ipv4[$needle])) {
+                    $match = $needle;
+                    break;
+                }
+            }
+
+        } elseif (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+            $value = unpack('n*', inet_pton($value));
+            foreach ($this->ipv6 as $lv) {
+                if ($this->ipv6InCidr($value, $lv)) {
+                    $match = $lv;
+                    break;
+                }
+            }
+        }
+
+        if ($match && $valueMask) {
+            $matchMask = explode('/', $match)[1];
+            if ($valueMask < $matchMask) {
+                return false;
+            }
+        }
+
+        return $match;
+    }
+
+    /**
+     * Using solution from https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpFoundation/IpUtils.php
+     *
+     * @param array $ip
+     * @param string $cidr
+     * @return bool
+     */
+    private function ipv6InCidr($ip, $cidr)
+    {
+        list($address, $netmask) = explode('/', $cidr);
+        $bytesAddr = unpack('n*', inet_pton($address));
+
+        for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
+            $left = $netmask - 16 * ($i - 1);
+            $left = ($left <= 16) ? $left : 16;
+            $mask = ~(0xffff >> $left) & 0xffff;
+            if (($bytesAddr[$i] & $mask) != ($ip[$i] & $mask)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Filter out invalid IPv4 or IPv4 CIDR and append maximum netmask if no netmask is given.
+     * @param array $list
+     */
+    private function filterInputList(array $list)
+    {
+        foreach ($list as $v) {
+            $parts = explode('/', $v, 2);
+            if (filter_var($parts[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                $maximumNetmask = 32;
+            } else if (filter_var($parts[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+                $parts[0] = strtolower($parts[0]);
+                $maximumNetmask = 128;
+            } else {
+                // IP address part of CIDR is invalid
+                continue;
+            }
+
+            if (!isset($parts[1])) {
+                // If CIDR doesnt contains '/', we will consider CIDR as /32 for IPv4 or /128 for IPv6
+                $v = "$v/$maximumNetmask";
+            } else if ($parts[1] > $maximumNetmask || $parts[1] < 0) {
+                // Netmask part of CIDR is invalid
+                continue;
+            }
+
+            if ($maximumNetmask === 32) {
+                $this->ipv4[$v] = true;
+            } else {
+                $this->ipv6[] = $v;
+            }
+        }
+    }
+}
+
+
diff --git a/app/Model/Warninglist.php b/app/Model/Warninglist.php
index 54de3c945..4e9977850 100644
--- a/app/Model/Warninglist.php
+++ b/app/Model/Warninglist.php
@@ -1,5 +1,6 @@
 <?php
 App::uses('AppModel', 'Model');
+App::uses('CidrTool', 'Tools');
 
 /**
  * @property WarninglistType $WarninglistType
@@ -398,39 +399,6 @@ class Warninglist extends AppModel
         }
     }
 
-    /**
-     * Filter out invalid IPv4 or IPv4 CIDR and append maximum netmaks if no netmask is given.
-     * @param array $inputValues
-     * @return array
-     */
-    private function filterCidrList($inputValues)
-    {
-        $outputValues = [];
-        foreach ($inputValues as $v) {
-            $v = strtolower($v);
-            $parts = explode('/', $v, 2);
-            if (filter_var($parts[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-                $maximumNetmask = 32;
-            } else if (filter_var($parts[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-                $maximumNetmask = 128;
-            } else {
-                // IP address part of CIDR is invalid
-                continue;
-            }
-
-            if (!isset($parts[1])) {
-                // If CIDR doesnt contains '/', we will consider CIDR as /32 for IPv4 or /128 for IPv6
-                $v = "$v/$maximumNetmask";
-            } else if ($parts[1] > $maximumNetmask || $parts[1] < 0) {
-                // Netmask part of CIDR is invalid
-                continue;
-            }
-
-            $outputValues[$v] = true;
-        }
-        return $outputValues;
-    }
-
     /**
      * For 'hostname', 'string' and 'cidr' warninglist type, values are just in keys to save memory.
      *
@@ -459,7 +427,7 @@ class Warninglist extends AppModel
             }
             $values = $output;
         } else if ($warninglist['Warninglist']['type'] === 'cidr') {
-            $values = $this->filterCidrList($values);
+            $values = new CidrTool($values);
         }
 
         $this->entriesCache[$id] = $values;
@@ -497,7 +465,7 @@ class Warninglist extends AppModel
     }
 
     /**
-     * @param array $listValues
+     * @param array|CidrTool $listValues
      * @param string $value
      * @param string $type
      * @param string $listType
@@ -512,7 +480,7 @@ class Warninglist extends AppModel
         }
         foreach ($value as $v) {
             if ($listType === 'cidr') {
-                $result = $this->__evalCidrList($listValues, $v);
+                $result = $listValues->contains($v);
             } elseif ($listType === 'string') {
                 $result = $this->__evalString($listValues, $v);
             } elseif ($listType === 'substring') {
@@ -536,75 +504,6 @@ class Warninglist extends AppModel
         return $this->__checkValue($listValues, $value, '', $type) !== false;
     }
 
-    private function __evalCidrList($listValues, $value)
-    {
-        $valueMask = null;
-        if (strpos($value, '/') !== false) {
-            list($value, $valueMask) = explode('/', $value);
-        }
-
-        $match = false;
-        if (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-            // This code converts IP address to all possible CIDRs that can contains given IP address
-            // and then check if given hash table contains that CIDR.
-            $ip = ip2long($value);
-            // Start from 1, because doesn't make sense to check 0.0.0.0/0 match
-            for ($bits = 1; $bits <= 32; $bits++) {
-                $mask = -1 << (32 - $bits);
-                $needle = long2ip($ip & $mask) . "/$bits";
-                if (isset($listValues[$needle])) {
-                    $match = $needle;
-                    break;
-                }
-            }
-
-        } elseif (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            foreach ($listValues as $lv => $foo) {
-                if (strpos($lv, ':') !== false) { // Filter out IPv4 CIDR, IPv6 CIDR must contain colon
-                    if ($this->__ipv6InCidr($value, $lv)) {
-                        $match = $lv;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if ($match && $valueMask) {
-            $matchMask = explode('/', $match)[1];
-            if ($valueMask < $matchMask) {
-                return false;
-            }
-        }
-
-        return $match;
-    }
-
-    /**
-     * Using solution from https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpFoundation/IpUtils.php
-     *
-     * @param string $ip
-     * @param string $cidr
-     * @return bool
-     */
-    private function __ipv6InCidr($ip, $cidr)
-    {
-        list($address, $netmask) = explode('/', $cidr);
-
-        $bytesAddr = unpack('n*', inet_pton($address));
-        $bytesTest = unpack('n*', inet_pton($ip));
-
-        for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
-            $left = $netmask - 16 * ($i - 1);
-            $left = ($left <= 16) ? $left : 16;
-            $mask = ~(0xffff >> $left) & 0xffff;
-            if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     /**
      * Check for exact match.
      *
diff --git a/app/Test/CidrToolTest.php b/app/Test/CidrToolTest.php
new file mode 100644
index 000000000..890542c46
--- /dev/null
+++ b/app/Test/CidrToolTest.php
@@ -0,0 +1,41 @@
+<?php
+require_once __DIR__ . '/../Lib/Tools/CidrTool.php';
+
+use PHPUnit\Framework\TestCase;
+
+class CidrToolTest extends TestCase
+{
+    public function testEmptyList(): void
+    {
+        $cidrTool = new CidrTool([]);
+        $this->assertFalse($cidrTool->contains('1.2.3.4'));
+    }
+
+    public function testIpv4Fullmask(): void
+    {
+        $cidrTool = new CidrTool(['1.2.3.4/32']);
+        $this->assertEquals('1.2.3.4/32', $cidrTool->contains('1.2.3.4'));
+    }
+
+    public function testIpv4WithoutNetmask(): void
+    {
+        $cidrTool = new CidrTool(['1.2.3.4']);
+        $this->assertEquals('1.2.3.4/32', $cidrTool->contains('1.2.3.4'));
+    }
+
+    public function testIpv4(): void
+    {
+        $cidrTool = new CidrTool(['10.0.0.0/8', '8.0.0.0/8', '9.0.0.0/8']);
+        $this->assertEquals('8.0.0.0/8', $cidrTool->contains('8.8.8.8'));
+        $this->assertFalse($cidrTool->contains('::1'));
+        $this->assertFalse($cidrTool->contains('7.1.2.3'));
+    }
+
+    public function testIpv6(): void
+    {
+        $cidrTool = new CidrTool(['2001:0db8:1234::/48']);
+        $this->assertEquals('2001:0db8:1234::/48', $cidrTool->contains('2001:0db8:1234:0000:0000:0000:0000:0000'));
+        $this->assertEquals('2001:0db8:1234::/48', $cidrTool->contains('2001:0db8:1234:ffff:ffff:ffff:ffff:ffff'));
+        $this->assertFalse($cidrTool->contains('2002:0db8:1234:ffff:ffff:ffff:ffff:ffff'));
+    }
+}

From 6421ccf11fcff102845ffc25227d086201c1dffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Fri, 29 Jan 2021 10:33:32 +0100
Subject: [PATCH 049/437] chg: [PyMISP] Bump, update deps (reportlab release
 removed)

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index 82ca4ff04..22bcda08d 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 82ca4ff0433292db794d576a20573b120ef4c3f1
+Subproject commit 22bcda08d4c37d67374aa89368f727589c8412cd

From 10f5e5137e81f426e6922dd0c8650082fe2e47a8 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 29 Jan 2021 10:34:13 +0100
Subject: [PATCH 050/437] fix: [logs:event] Added missing line breaks

---
 app/Model/Event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 95a962c3b..640aa2c65 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -6934,7 +6934,7 @@ class Event extends AppModel
                     'model_id' => 0,
                     'email' => 'SYSTEM',
                     'action' => 'error',
-                    'title' => sprintf('Event fetch potential memory exhaustion. During the fetching of events, a large event (#%s) was detected that exceeds the available PHP memory. Consider raising the PHP max_memory setting to at least %sM', $largest_event_id, ceil($largest_event/$memory_scaling_factor)),
+                    'title' => sprintf('Event fetch potential memory exhaustion.' . PHP_EOL . 'During the fetching of events, a large event (#%s) was detected that exceeds the available PHP memory.' . PHP_EOL . 'Consider raising the PHP max_memory setting to at least %sM', $largest_event_id, ceil($largest_event/$memory_scaling_factor)),
                     'change' => null,
             ));
         }

From 6bd3bdfc3eb4189cd89dcb6729d6f4a570b9aaa4 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 29 Jan 2021 14:31:13 +0100
Subject: [PATCH 051/437] chg: [internal] Optimise CidrTool

---
 app/Lib/Tools/CidrTool.php | 53 +++++++++++++++++++++-----------------
 app/Test/CidrToolTest.php  |  4 +--
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/app/Lib/Tools/CidrTool.php b/app/Lib/Tools/CidrTool.php
index 603041f8a..faf978f3d 100644
--- a/app/Lib/Tools/CidrTool.php
+++ b/app/Lib/Tools/CidrTool.php
@@ -4,6 +4,12 @@ class CidrTool
     /** @var array */
     private $ipv4 = [];
 
+    /**
+     * Minimum netmask for IPv4 in list. 33 because maximum netmask is 32..
+     * @var int
+     */
+    private $minimumIpv4Mask = 33;
+
     /** @var array */
     private $ipv6 = [];
 
@@ -29,7 +35,7 @@ class CidrTool
             // and then check if given hash table contains that CIDR.
             $ip = ip2long($value);
             // Start from 1, because doesn't make sense to check 0.0.0.0/0 match
-            for ($bits = 1; $bits <= 32; $bits++) {
+            for ($bits = $this->minimumIpv4Mask; $bits <= 32; $bits++) {
                 $mask = -1 << (32 - $bits);
                 $needle = long2ip($ip & $mask) . "/$bits";
                 if (isset($this->ipv4[$needle])) {
@@ -40,10 +46,12 @@ class CidrTool
 
         } elseif (filter_var($value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
             $value = unpack('n*', inet_pton($value));
-            foreach ($this->ipv6 as $lv) {
-                if ($this->ipv6InCidr($value, $lv)) {
-                    $match = $lv;
-                    break;
+            foreach ($this->ipv6 as $netmask => $lv) {
+                foreach ($lv as $l) {
+                    if ($this->ipv6InCidr($value, $l, $netmask)) {
+                        $match = inet_ntop($l) . "/$netmask";
+                        break;
+                    }
                 }
             }
         }
@@ -63,13 +71,12 @@ class CidrTool
      *
      * @param array $ip
      * @param string $cidr
+     * @param int $netmask
      * @return bool
      */
-    private function ipv6InCidr($ip, $cidr)
+    private function ipv6InCidr($ip, $cidr, $netmask)
     {
-        list($address, $netmask) = explode('/', $cidr);
-        $bytesAddr = unpack('n*', inet_pton($address));
-
+        $bytesAddr = unpack('n*', $cidr);
         for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
             $left = $netmask - 16 * ($i - 1);
             $left = ($left <= 16) ? $left : 16;
@@ -90,31 +97,29 @@ class CidrTool
     {
         foreach ($list as $v) {
             $parts = explode('/', $v, 2);
-            if (filter_var($parts[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-                $maximumNetmask = 32;
-            } else if (filter_var($parts[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-                $parts[0] = strtolower($parts[0]);
-                $maximumNetmask = 128;
-            } else {
-                // IP address part of CIDR is invalid
-                continue;
+            $ipBytes = inet_pton($parts[0]);
+            if ($ipBytes === false) {
+                continue; // IP address part of CIDR is invalid
             }
+            $maximumNetmask = strlen($ipBytes) === 4 ? 32 : 128;
 
-            if (!isset($parts[1])) {
-                // If CIDR doesnt contains '/', we will consider CIDR as /32 for IPv4 or /128 for IPv6
-                $v = "$v/$maximumNetmask";
-            } else if ($parts[1] > $maximumNetmask || $parts[1] < 0) {
+            if (isset($parts[1]) && ($parts[1] > $maximumNetmask || $parts[1] < 0)) {
                 // Netmask part of CIDR is invalid
                 continue;
             }
 
+            $mask = isset($parts[1]) ? $parts[1] : $maximumNetmask;
             if ($maximumNetmask === 32) {
+                if ($mask < $this->minimumIpv4Mask) {
+                    $this->minimumIpv4Mask = (int)$mask;
+                }
+                if (!isset($parts[1])) {
+                    $v = "$v/$maximumNetmask"; // If CIDR doesnt contains '/', we will consider CIDR as /32
+                }
                 $this->ipv4[$v] = true;
             } else {
-                $this->ipv6[] = $v;
+                $this->ipv6[$mask][] = $ipBytes;
             }
         }
     }
 }
-
-
diff --git a/app/Test/CidrToolTest.php b/app/Test/CidrToolTest.php
index 890542c46..2ea58bc29 100644
--- a/app/Test/CidrToolTest.php
+++ b/app/Test/CidrToolTest.php
@@ -34,8 +34,8 @@ class CidrToolTest extends TestCase
     public function testIpv6(): void
     {
         $cidrTool = new CidrTool(['2001:0db8:1234::/48']);
-        $this->assertEquals('2001:0db8:1234::/48', $cidrTool->contains('2001:0db8:1234:0000:0000:0000:0000:0000'));
-        $this->assertEquals('2001:0db8:1234::/48', $cidrTool->contains('2001:0db8:1234:ffff:ffff:ffff:ffff:ffff'));
+        $this->assertEquals('2001:db8:1234::/48', $cidrTool->contains('2001:0db8:1234:0000:0000:0000:0000:0000'));
+        $this->assertEquals('2001:db8:1234::/48', $cidrTool->contains('2001:0db8:1234:ffff:ffff:ffff:ffff:ffff'));
         $this->assertFalse($cidrTool->contains('2002:0db8:1234:ffff:ffff:ffff:ffff:ffff'));
     }
 }

From 49c8176473e69e894e24284cefe7f0af8b08e075 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 29 Jan 2021 16:02:24 +0100
Subject: [PATCH 052/437] chg: [internal] Optimise correlation exclusion

---
 app/Model/Attribute.php            | 16 +++++++---------
 app/Model/CorrelationExclusion.php |  6 +++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index f4b716ba3..81afad30f 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -62,6 +62,7 @@ class Attribute extends AppModel
 
     public $shortDist = array(0 => 'Organisation', 1 => 'Community', 2 => 'Connected', 3 => 'All', 4 => ' Sharing Group', 5 => 'Inherit');
 
+    private $exclusions = null;
 
     public function __construct($id = false, $table = null, $ds = null)
     {
@@ -1764,15 +1765,12 @@ class Attribute extends AppModel
         if (!empty($a['value2'])) {
             $value .= '|' . $a['value2'];
         }
-        if (empty($this->exclusions)) {
+        if ($this->exclusions === null) {
             try {
                 $redis = $this->setupRedisWithException();
-            } catch (Exception $e) {
-                $redisFail = true;
-            }
-            if (empty($redisFail)) {
-                $this->Correlation = ClassRegistry::init('Correlation');
                 $this->exclusions = $redis->sMembers('misp:correlation_exclusions');
+            } catch (Exception $e) {
+                $this->exclusions = [];
             }
         }
         foreach ($this->exclusions as $exclusion) {
@@ -1809,11 +1807,11 @@ class Attribute extends AppModel
         if (!empty($a['disable_correlation']) || Configure::read('MISP.completely_disable_correlation')) {
             return true;
         }
-        if ($this->__preventExcludedCorrelations($a)) {
+        // Don't do any correlation if the type is a non correlating type
+        if (in_array($a['type'], $this->nonCorrelatingTypes, true)) {
             return true;
         }
-        // Don't do any correlation if the type is a non correlating type
-        if (in_array($a['type'], $this->nonCorrelatingTypes)) {
+        if ($this->__preventExcludedCorrelations($a)) {
             return true;
         }
         if (!$event) {
diff --git a/app/Model/CorrelationExclusion.php b/app/Model/CorrelationExclusion.php
index 63553eb8e..4c18fc0e9 100644
--- a/app/Model/CorrelationExclusion.php
+++ b/app/Model/CorrelationExclusion.php
@@ -34,9 +34,8 @@ class CorrelationExclusion extends AppModel
             return false;
         }
         $redis->del($this->key);
-        $exclusions = $this->find('list', [
-            'recursive' => -1,
-            'fields' => ['id', 'value']
+        $exclusions = $this->find('column', [
+            'fields' => ['value']
         ]);
         $redis->sAddArray($this->key, $exclusions);
     }
@@ -85,6 +84,7 @@ class CorrelationExclusion extends AppModel
             $this->Job = ClassRegistry::init('Job');
             $this->Job->id = $jobId;
         }
+        $total = count($exclusions);
         foreach ($exclusions as $exclusion_chunk) {
             $i = 0;
             foreach ($exclusion_chunk as $exclusion) {

From 55a8850bf6f899dcb803c90b1ccb25698bdfaeaf Mon Sep 17 00:00:00 2001
From: Tom King <tom.king2@baesystems.com>
Date: Sat, 30 Jan 2021 13:51:12 +0000
Subject: [PATCH 053/437] fix: Allow 'hard' param in POSTed body for deleting a
 cluster, send back a proper message

---
 app/Controller/GalaxyClustersController.php | 7 +++++--
 app/Model/GalaxyCluster.php                 | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Controller/GalaxyClustersController.php b/app/Controller/GalaxyClustersController.php
index 6e6308d10..2d4e72d34 100644
--- a/app/Controller/GalaxyClustersController.php
+++ b/app/Controller/GalaxyClustersController.php
@@ -703,6 +703,9 @@ class GalaxyClustersController extends AppController
     {
         $cluster = $this->GalaxyCluster->fetchIfAuthorized($this->Auth->user(), $id, 'delete', $throwErrors=true, $full=false);
         if ($this->request->is('post')) {
+            if (!empty($this->request->data['hard'])) {
+                $hard = true;
+            }
             $result = $this->GalaxyCluster->deleteCluster($cluster['GalaxyCluster']['id'], $hard=$hard);
             $galaxyId = $cluster['GalaxyCluster']['galaxy_id'];
             if ($result) {
@@ -712,7 +715,7 @@ class GalaxyClustersController extends AppController
                     $hard ? __(' and added to the block list') : ''
                 );
                 if ($this->_isRest()) {
-                    return $this->RestResponse->saveSuccessResponse('GalaxyCluster', 'delete', $cluster['GalaxyCluster']['id'], $this->response->type());
+                    return $this->RestResponse->saveSuccessResponse('GalaxyCluster', 'delete', $cluster['GalaxyCluster']['id'], $this->response->type(), $message);
                 } else {
                     $this->Flash->success($message);
                     $this->redirect(array('controller' => 'galaxies', 'action' => 'view', $galaxyId));
@@ -720,7 +723,7 @@ class GalaxyClustersController extends AppController
             } else {
                 $message = __('Galaxy cluster could not be %s deleted.', $hard ? __('hard') : __('soft'));
                 if ($this->_isRest()) {
-                    return $this->RestResponse->saveFailResponse('GalaxyCluster', 'delete', $cluster['GalaxyCluster']['id'], $message, $this->response->type());
+                    return $this->RestResponse->saveFailResponse('GalaxyCluster', 'delete', $cluster['GalaxyCluster']['id'], $message, $this->response->type(), $message);
                 } else {
                     $this->Flash->error($message);
                     $this->redirect(array('controller' => 'galaxies', 'action' => 'view', $galaxyId));
diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 3335c9107..72bc5dd6d 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -101,7 +101,7 @@ class GalaxyCluster extends AppModel
         if (!isset($this->data['GalaxyCluster']['description'])) {
             $this->data['GalaxyCluster']['description'] = '';
         }
-        if ($this->data['GalaxyCluster']['distribution'] != 4) {
+        if (isset($this->data['GalaxyCluster']['distribution']) && $this->data['GalaxyCluster']['distribution'] != 4) {
             $this->data['GalaxyCluster']['sharing_group_id'] = null;
         }
         if (!isset($this->data['GalaxyCluster']['published'])) {

From 8892fed986ba10b775aedfe5f385618dbd441b07 Mon Sep 17 00:00:00 2001
From: Tom King <tom.king2@baesystems.com>
Date: Sat, 30 Jan 2021 15:15:00 +0000
Subject: [PATCH 054/437] fix: Allow cluster authors to be an actual array

---
 app/Controller/GalaxyClustersController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Controller/GalaxyClustersController.php b/app/Controller/GalaxyClustersController.php
index 2d4e72d34..f08fcb964 100644
--- a/app/Controller/GalaxyClustersController.php
+++ b/app/Controller/GalaxyClustersController.php
@@ -391,7 +391,9 @@ class GalaxyClustersController extends AppController
 
             if (empty($cluster['GalaxyCluster']['authors'])) {
                 $cluster['GalaxyCluster']['authors'] = [];
-            } else {
+            } else if (is_array($cluster['GalaxyCluster']['authors'])) {
+                // This is as intended, move on 
+            }else {
                 $decoded = json_decode($cluster['GalaxyCluster']['authors'], true);
                 if (is_null($decoded)) { // authors might be comma separated
                     $decoded = array_map('trim', explode(',', $cluster['GalaxyCluster']['authors']));

From 744711979cd8cae70c6c33e03320b09e3596c3a1 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 20 Jan 2021 19:34:35 +0100
Subject: [PATCH 055/437] new: [test] Update github actions build to Ubuntu
 20.04

---
 .github/workflows/main.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f1e7d517b..a5c4303f1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-20.04]
         php: ['7.2', '7.3', '7.4']
 
     # Steps represent a sequence of tasks that will be executed as part of the job
@@ -66,9 +66,14 @@ jobs:
         run: |
               git submodule update --init --recursive
               sudo apt-get -y update
-              sudo apt-get -y install curl python3 python3-venv virtualenv python3-pip python3-nose python3-redis python3-lxml apache2 libapache2-mod-php$php_version php$php_version-xml php$php_version-mbstring php$php_version-mysql libfuzzy-dev libemail-address-perl libemail-outlook-message-perl
-              sudo pip3 install --upgrade pip setuptools requests pyzmq poetry
+              if [[ $php_version == "7.4" ]]; then
+                # Repo is missing for unknown reason
+                LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
+              fi
+              sudo apt-get -y install curl python3 python3-zmq python3-requests python3-pip python3-nose python3-redis python3-lxml apache2 libapache2-mod-php$php_version libfuzzy-dev
+              sudo pip3 install virtualenv # virtualenv must be instaled from pip and not from ubuntu pacckages
               sudo pip3 install --upgrade -r requirements.txt
+              curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
               sudo chown $USER:www-data $HOME/.composer
               pushd app
               sudo -H -u $USER php composer.phar install --no-progress
@@ -185,7 +190,7 @@ jobs:
               sudo chmod -R 777 ./tests
               # Start workers
               # Dirty install python stuff
-              virtualenv -p python3 ./venv
+              python3 -m virtualenv -p python3 ./venv
               sudo -E su $USER -c 'app/Console/cake Admin setSetting "MISP.python_bin" "$GITHUB_WORKSPACE/venv/bin/python"'
               . ./venv/bin/activate
               pushd cti-python-stix2
@@ -209,6 +214,7 @@ jobs:
 
       - name: Run tests
         run: |
+              source $HOME/.poetry/env # enable poetry binary
               ./app/Vendor/bin/parallel-lint --exclude app/Lib/cakephp/ --exclude app/Vendor/ --exclude app/Lib/random_compat/ -e php,ctp app/
               ./app/Vendor/bin/phpunit app/Test/ComplexTypeToolTest.php
               ./app/Vendor/bin/phpunit app/Test/JSONConverterToolTest.php

From 3a1a9b12b3a8b637604cc090ae523eac8b458167 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 31 Jan 2021 20:02:27 +0100
Subject: [PATCH 056/437] chg: [UI] Make toggle buttons nicer

---
 app/View/Events/view.ctp  | 38 +++++++++++++++++++-------------------
 app/webroot/css/main.css  |  4 ++++
 app/webroot/css/print.css |  2 +-
 app/webroot/js/misp.js    | 12 ++++++------
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index 38dd83e15..e561eaec7 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -477,33 +477,33 @@
         </div>
     </div>
     <br />
-    <div class="toggleButtons">
-        <button class="btn btn-inverse toggle-left btn.active qet galaxy-toggle-button" id="pivots_toggle" data-toggle-type="pivots">
-            <span class="icon-minus icon-white" title="<?php echo __('Toggle pivot graph');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle pivot graph');?>" style="vertical-align:top;"></span><?php echo __('Pivots');?>
+    <div id="eventToggleButtons">
+        <button class="btn btn-inverse toggle-left qet" id="pivots_toggle" data-toggle-type="pivots">
+            <span class="fas fa-minus" title="<?php echo __('Toggle pivot graph');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle pivot graph');?>"></span><?php echo __('Pivots');?>
         </button>
-        <button class="btn btn-inverse toggle qet galaxy-toggle-button" id="galaxies_toggle" data-toggle-type="galaxies">
-            <span class="icon-minus icon-white" title="<?php echo __('Toggle galaxies');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle galaxies');?>" style="vertical-align:top;"></span><?php echo __('Galaxy');?>
+        <button class="btn btn-inverse toggle qet" id="galaxies_toggle" data-toggle-type="galaxies">
+            <span class="fas fa-minus" title="<?php echo __('Toggle galaxies');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle galaxies');?>"></span><?php echo __('Galaxy');?>
         </button>
-        <button class="btn btn-inverse toggle qet galaxy-toggle-button" id="eventgraph_toggle" data-toggle-type="eventgraph" onclick="enable_interactive_graph();">
-            <span class="icon-plus icon-white" title="<?php echo __('Toggle Event graph');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle Event graph');?>" style="vertical-align:top;"></span><?php echo __('Event graph');?>
+        <button class="btn btn-inverse toggle qet" id="eventgraph_toggle" data-toggle-type="eventgraph" onclick="enable_interactive_graph();">
+            <span class="fas fa-plus" title="<?php echo __('Toggle Event graph');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle Event graph');?>"></span><?php echo __('Event graph');?>
         </button>
-        <button class="btn btn-inverse toggle qet galaxy-toggle-button" id="eventtimeline_toggle" data-toggle-type="eventtimeline" onclick="enable_timeline();">
-            <span class="icon-plus icon-white" title="<?php echo __('Toggle Event timeline');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle Event timeline');?>" style="vertical-align:top;"></span><?php echo __('Event timeline');?>
+        <button class="btn btn-inverse toggle qet" id="eventtimeline_toggle" data-toggle-type="eventtimeline" onclick="enable_timeline();">
+            <span class="fas fa-plus" title="<?php echo __('Toggle Event timeline');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle Event timeline');?>"></span><?php echo __('Event timeline');?>
         </button>
-        <button class="btn btn-inverse toggle qet galaxy-toggle-button" id="correlationgraph_toggle" data-toggle-type="correlationgraph" data-load-url="<?= $baseurl ?>/events/viewGraph/<?= h($event['Event']['id']) ?>">
-            <span class="icon-plus icon-white" title="<?php echo __('Toggle Correlation graph');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle Correlation graph');?>" style="vertical-align:top;"></span><?php echo __('Correlation graph');?>
+        <button class="btn btn-inverse toggle qet" id="correlationgraph_toggle" data-toggle-type="correlationgraph" data-load-url="<?= $baseurl ?>/events/viewGraph/<?= h($event['Event']['id']) ?>">
+            <span class="fas fa-plus" title="<?php echo __('Toggle Correlation graph');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle Correlation graph');?>"></span><?php echo __('Correlation graph');?>
         </button>
-        <button class="btn btn-inverse toggle qet galaxy-toggle-button" id="attackmatrix_toggle" data-toggle-type="attackmatrix" data-load-url="<?= $baseurl; ?>/events/viewGalaxyMatrix/<?= h($event['Event']['id']) ?>/mitre-attack/event/1">
-            <span class="icon-plus icon-white" title="<?php echo __('Toggle ATT&CK matrix');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle ATT&CK matrix');?>" style="vertical-align:top;"></span><?php echo __('ATT&CK matrix');?>
+        <button class="btn btn-inverse toggle qet" id="attackmatrix_toggle" data-toggle-type="attackmatrix" data-load-url="<?= $baseurl; ?>/events/viewGalaxyMatrix/<?= h($event['Event']['id']) ?>/mitre-attack/event/1">
+            <span class="fas fa-plus" title="<?php echo __('Toggle ATT&CK matrix');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle ATT&CK matrix');?>"></span><?php echo __('ATT&CK matrix');?>
         </button>
-        <button class="btn btn-inverse toggle qet galaxy-toggle-button" id="eventreport_toggle" data-toggle-type="eventreport">
-            <span class="icon-plus icon-white" title="<?php echo __('Toggle reports');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle reports');?>" style="vertical-align:top;"></span><?php echo __('Event reports');?>
+        <button class="btn btn-inverse toggle qet" id="eventreport_toggle" data-toggle-type="eventreport">
+            <span class="fas fa-plus" title="<?php echo __('Toggle reports');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle reports');?>"></span><?php echo __('Event reports');?>
         </button>
-        <button class="btn btn-inverse toggle qet galaxy-toggle-button" id="attributes_toggle" data-toggle-type="attributes">
-            <span class="icon-minus icon-white" title="<?php echo __('Toggle attributes');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle attributes');?>" style="vertical-align:top;"></span><?php echo __('Attributes');?>
+        <button class="btn btn-inverse toggle qet" id="attributes_toggle" data-toggle-type="attributes">
+            <span class="fas fa-minus" title="<?php echo __('Toggle attributes');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle attributes');?>"></span><?php echo __('Attributes');?>
         </button>
-        <button class="btn btn-inverse toggle-right qet galaxy-toggle-button" id="discussions_toggle" data-toggle-type="discussions">
-            <span class="icon-minus icon-white" title="<?php echo __('Toggle discussions');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle discussions');?>" style="vertical-align:top;"></span><?php echo __('Discussion');?>
+        <button class="btn btn-inverse toggle-right qet" id="discussions_toggle" data-toggle-type="discussions">
+            <span class="fas fa-minus" title="<?php echo __('Toggle discussions');?>" role="button" tabindex="0" aria-label="<?php echo __('Toggle discussions');?>"></span><?php echo __('Discussion');?>
         </button>
     </div>
     <br />
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 8af1a0af0..5f0bee1d4 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -2729,3 +2729,7 @@ td.rotate + td:not(.rotate) {
     width: 400px;
     padding: .3em 0.5em;
 }
+
+#eventToggleButtons button span {
+    margin-right: 2px;
+}
diff --git a/app/webroot/css/print.css b/app/webroot/css/print.css
index 037342816..3bd6c60bf 100644
--- a/app/webroot/css/print.css
+++ b/app/webroot/css/print.css
@@ -1,5 +1,5 @@
 /* bootstrap changes */
-.actions, .header, .footer, .cake-sql-log, .comment, .pagination, .action-links, .addTagTD .tagSecondHalf, .toggleButtons{
+.actions, .header, .footer, .cake-sql-log, .comment, .pagination, .action-links, .addTagTD .tagSecondHalf, #eventToggleButtons {
 	display: none;
 }
 
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 2c7af2eeb..51e957279 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -4419,16 +4419,16 @@ function selectAllInbetween(last, current) {
     });
 }
 
-$('.galaxy-toggle-button').click(function() {
+$('#eventToggleButtons button').click(function() {
     var element = $(this).data('toggle-type');
     var $button = $(this).children('span');
-    if ($button.hasClass('icon-minus')) {
-        $button.addClass('icon-plus');
-        $button.removeClass('icon-minus');
+    if ($button.hasClass('fa-minus')) {
+        $button.addClass('fa-plus');
+        $button.removeClass('fa-minus');
         $('#' + element + '_div').hide();
     } else {
-        $button.removeClass('icon-plus');
-        $button.addClass('icon-minus');
+        $button.removeClass('fa-plus');
+        $button.addClass('fa-minus');
         $('#' + element + '_div').show();
 
         var loadUrl = $(this).data('load-url');

From 1843e3ddc2adf9b3152e30a7e24cf4344a62fdbc Mon Sep 17 00:00:00 2001
From: marjatech <github@marja.tech>
Date: Mon, 1 Feb 2021 09:02:20 +0000
Subject: [PATCH 057/437] fix: correctly show hidden tags in tag-list

---
 app/View/Tags/index.ctp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/View/Tags/index.ctp b/app/View/Tags/index.ctp
index 2c35fca6b..674aa35cd 100644
--- a/app/View/Tags/index.ctp
+++ b/app/View/Tags/index.ctp
@@ -45,10 +45,10 @@
                 ],
                 [
                     'name' => __('Hidden'),
-                    'sort' => 'Tag.hidden',
+                    'sort' => 'Tag.hide_tag',
                     'element' => 'boolean',
                     'class' => 'short',
-                    'data_path' => 'Tag.hidden',
+                    'data_path' => 'Tag.hide_tag',
                 ],
                 [
                     'name' => __('Name'),

From 67037f140dfbdd09c827289fbc8f0757ee25b547 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 1 Feb 2021 15:09:37 +0100
Subject: [PATCH 058/437] fix: [internal] Do not throw warning when user don't
 have collections

---
 app/Model/TagCollection.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Model/TagCollection.php b/app/Model/TagCollection.php
index 86ad7d343..e97135fe0 100644
--- a/app/Model/TagCollection.php
+++ b/app/Model/TagCollection.php
@@ -63,7 +63,7 @@ class TagCollection extends AppModel
         return true;
     }
 
-    public function fetchTagCollection($user, $params = array())
+    public function fetchTagCollection(array $user, $params = array())
     {
         if (empty($user['Role']['perm_site_admin'])) {
             $params['conditions']['AND'][] = array(
@@ -104,8 +104,17 @@ class TagCollection extends AppModel
         return true;
     }
 
-    public function cullBlockedTags($user, $tagCollections)
+    /**
+     * @param array $user
+     * @param array $tagCollections
+     * @return array|
+     */
+    public function cullBlockedTags(array $user, array $tagCollections)
     {
+        if (empty($tagCollection)) {
+            return [];
+        }
+
         $single = false;
         if (!isset($tagCollections[0])) {
             $tagCollections = array(0 => $tagCollections);

From 07b79aee780a70ccc2451ee3316743a17f747fae Mon Sep 17 00:00:00 2001
From: Tom King <tom.king2@baesystems.com>
Date: Mon, 1 Feb 2021 14:10:39 +0000
Subject: [PATCH 059/437] chg: Add in ability to update sightings against each
 attribute from a POSTed MISP Event

---
 app/Model/Attribute.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 3d1166213..e2738e462 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -4077,6 +4077,12 @@ class Attribute extends AppModel
                 $attribute['distribution'] = 5;
             }
         }
+        if (isset($attribute['Sighting']) && !empty($attribute['Sighting'])) {
+            $this->Sighting = ClassRegistry::init('Sighting');
+            foreach ($attribute['Sighting'] as $s) {
+                $result = $this->Sighting->saveSightings($attribute['uuid'], false, $s['date_sighting'], $user, $s['type'], $s['source'], isset($s['uuid']) ? $s['uuid']: false);
+            }
+        }
         $fieldList = $this->editableFields;
         if (empty($existingAttribute)) {
             $addableFieldList = array('event_id', 'type', 'uuid');

From a0a0d71241feee31f20a88334f68d1b1910f9015 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 2 Feb 2021 12:22:26 +0100
Subject: [PATCH 060/437] fix: [UI] Attribute create button nicer

---
 app/View/Elements/eventattributetoolbar.ctp |  2 +-
 app/webroot/css/main.css                    | 12 +++++++-----
 app/webroot/js/misp.js                      | 15 +++++++--------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/View/Elements/eventattributetoolbar.ctp b/app/View/Elements/eventattributetoolbar.ctp
index 025f3d576..500ddda51 100644
--- a/app/View/Elements/eventattributetoolbar.ctp
+++ b/app/View/Elements/eventattributetoolbar.ctp
@@ -51,7 +51,7 @@
                         'id' => 'create-button',
                         'title' => $possibleAction === 'attribute' ? __('Add attribute') : __('Add proposal'),
                         'fa-icon' => 'plus',
-                        //'onClick' => 'clickCreateButton',
+                        'class' => 'last',
                         'onClick' => 'openGenericModal',
                         'onClickParams' => array('/' . $possibleAction . 's/add/' . h($event['Event']['id']))
                     ),
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 1f76cfe85..0721b1a20 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -30,6 +30,11 @@ form button.btn[disabled] {
     cursor: not-allowed;
 }
 
+.btn-group > .btn.last {
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+}
+
 /*.close{
     float:none;
 }*/
@@ -114,7 +119,6 @@ pre {
     border-left: none;
     border-right: 6px solid #fff;
     border-bottom: 6px solid transparent;
-    left: 10px;
     top: 1px;
     left: -6px;
 }
@@ -1423,7 +1427,6 @@ span.success {
     border: 1px solid #ddd !important;
     border-bottom:0px !important;
     line-height:14px !important;
-    margin-right:0px !important;
     margin-bottom:1px !important;
     float:right;
 }
@@ -1449,7 +1452,6 @@ span.success {
     width:34px;
     padding-left:3px;
     margin:0px !important;
-    margin-bottom:1px !important;
     border: 1px solid #ddd !important;
     border-bottom:0px !important;
     margin-right:200px !important;
@@ -1755,7 +1757,6 @@ span.success {
     line-height:40px;
     background-color: #FFFFFF;
     padding:0px !important;
-    padding-right:0px !important;
     border: 1px dashed black !important;
     -webkit-radius: 8px;
     -moz-border-radius: 8px;
@@ -2189,7 +2190,8 @@ table.table.table-striped tr.deleted_row td {
 }
 
 .popover {
-    max-width:33%;
+    max-width: 33%;
+    color: #333333;
 }
 
 .checkbox input[type=checkbox] {
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 51e957279..17ba24ec4 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -895,8 +895,13 @@ function toggleAllTaxonomyCheckboxes() {
 }
 
 function attributeListAnyAttributeCheckBoxesChecked() {
-    if ($('.select_attribute:checked').length > 0) $('.mass-select').removeClass('hidden');
-    else $('.mass-select').addClass('hidden');
+    if ($('.select_attribute:checked').length > 0) {
+        $('.mass-select').removeClass('hidden');
+        $('#create-button').removeClass('last');
+    } else {
+        $('.mass-select').addClass('hidden');
+        $('#create-button').addClass('last');
+    }
 }
 
 function listCheckboxesChecked() {
@@ -1203,12 +1208,6 @@ function redirectAddObject(templateId, additionalData) {
     window.location = baseurl + '/objects/add/' + eventId + '/' + templateId;
 }
 
-function clickCreateButton(event, type) {
-    var destination = 'attributes';
-    if (type == 'Proposal') destination = 'shadow_attributes';
-    simplePopup(baseurl + "/" + destination + "/add/" + event);
-}
-
 function openGenericModal(url, modalData, callback) {
     $.ajax({
         type: "get",

From 3687488638257bce1c81614d494fa621d492a30e Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 2 Feb 2021 12:34:55 +0100
Subject: [PATCH 061/437] chg: [internal] Cache warninglist for eight hours

---
 app/Model/Warninglist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Warninglist.php b/app/Model/Warninglist.php
index 4e9977850..115a31887 100644
--- a/app/Model/Warninglist.php
+++ b/app/Model/Warninglist.php
@@ -155,7 +155,7 @@ class Warninglist extends AppModel
         if (!empty($saveToCache)) {
             $pipe = $redis->multi(Redis::PIPELINE);
             foreach ($saveToCache as $attributeKey => $json) {
-                $redis->setex($attributeKey, 3600, $json); // cache for one hour
+                $redis->setex($attributeKey, 8 * 3600, $json); // cache for eight hour
             }
             $pipe->exec();
         }

From e838a00264f0e74cd5bf1dcaa8f6d23bd589220d Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 2 Feb 2021 21:59:47 +0100
Subject: [PATCH 062/437] fix: [internal] Bump PyMISP

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index 22bcda08d..9e2b748b0 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 22bcda08d4c37d67374aa89368f727589c8412cd
+Subproject commit 9e2b748b023e2e296f536c3449cd3ce7a5a8c1b8

From 65156f5f642209d163a3397a8edb3d1e5731ff64 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 2 Feb 2021 22:03:15 +0100
Subject: [PATCH 063/437] fix: [internal] Bump CakePHP to 2.10.24

---
 app/Lib/cakephp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Lib/cakephp b/app/Lib/cakephp
index d0c51b374..cf14e6546 160000
--- a/app/Lib/cakephp
+++ b/app/Lib/cakephp
@@ -1 +1 @@
-Subproject commit d0c51b37422d0d2c99be74045d4439a674259308
+Subproject commit cf14e6546ec44e3369e3531add11fdb946656280

From b4fe070ff79b4e2389fb219826156c7206964229 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 2 Feb 2021 23:11:27 +0100
Subject: [PATCH 064/437] fix: [internal] Capturing sightings for attributes

---
 app/Model/Attribute.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 3d1166213..20e8e229e 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -12,6 +12,7 @@ App::uses('ComplexTypeTool', 'Tools');
 /**
  * @property Event $Event
  * @property AttributeTag $AttributeTag
+ * @property Sighting $Sighting
  * @property-read array $typeDefinitions
  * @property-read array $categoryDefinitions
  */
@@ -3979,7 +3980,7 @@ class Attribute extends AppModel
                 }
             }
             if (!empty($attribute['Sighting'])) {
-                $this->Sighting->captureSighting($attribute['Sighting'], $this->id, $eventId, $user);
+                $this->Sighting->captureSightings($attribute['Sighting'], $this->id, $eventId, $user);
             }
         }
         if (!empty($this->validationErrors)) {

From a335dff2e2c7178285cf9424065321cef4f3f704 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 3 Feb 2021 08:48:10 +0100
Subject: [PATCH 065/437] fix: [breakOnDuplicate] invalid placement return,
 affects #6917

- as reported by @github-germ
---
 app/Model/MispObject.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/MispObject.php b/app/Model/MispObject.php
index 93ae30870..8d23328e4 100644
--- a/app/Model/MispObject.php
+++ b/app/Model/MispObject.php
@@ -912,8 +912,8 @@ class MispObject extends AppModel
                         'title' => 'Object dropped due to it being a duplicate and breakOnDuplicate being requested for Event ' . $eventId,
                         'change' => 'Duplicate object found.',
                 ));
+                return true;
             }
-            return true;
         }
         if (empty($log)) {
             $log = ClassRegistry::init('Log');

From c123d39df8963c8743fd21590559be7fdb2f2a75 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 3 Feb 2021 09:10:13 +0100
Subject: [PATCH 066/437] fix: [extended event] layout broken, fixes #6946

---
 app/View/Elements/Events/View/row_attribute.ctp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/View/Elements/Events/View/row_attribute.ctp b/app/View/Elements/Events/View/row_attribute.ctp
index e1a561ff9..95d3ea57a 100644
--- a/app/View/Elements/Events/View/row_attribute.ctp
+++ b/app/View/Elements/Events/View/row_attribute.ctp
@@ -94,7 +94,7 @@ $quickEdit = function($fieldName) use ($editScope, $object, $event) {
         if (!empty($extended)):
           if ($object['event_id'] != $event['Event']['id']):
             $extensionOrg = $event['extensionEvents'][$object['event_id']]['Orgc'];
-            echo $this->OrgImg->getOrgLogo($extensionOrg['name'], 24);
+            echo $this->OrgImg->getOrgLogo($extensionOrg, 24);
           else:
             echo $this->OrgImg->getOrgLogo($event['Orgc'], 24);
           endif;
@@ -418,4 +418,3 @@ if (!empty($object['ShadowAttribute'])) {
         ));
     }
 }
-

From 338eda6eeec11833fb1f58d8965808595eedb734 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 3 Feb 2021 14:52:47 +0100
Subject: [PATCH 067/437] fix: [internal] timestmaping when adding clusters to
 attributes wasn't working

- added it as a quick fix, should be moved in the future to a more generic place
---
 app/Model/Galaxy.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/Model/Galaxy.php b/app/Model/Galaxy.php
index d31c30484..020bd291a 100644
--- a/app/Model/Galaxy.php
+++ b/app/Model/Galaxy.php
@@ -377,12 +377,23 @@ class Galaxy extends AppModel
         $result = $this->Tag->$connectorModel->save($toSave);
         if ($result) {
             if ($target_type !== 'tag_collection') {
+                $date = new DateTime();
                 if ($target_type === 'event') {
                     $event = $target;
+                } else if ($target_type === 'attribute') {
+                    $target['Attribute']['timestamp'] = $date->getTimestamp();
+                    $this->Tag->AttributeTag->Attribute->save($target);
+                    if (!empty($target['Attribute']['object_id'])) {
+                        $container_object = $this->Tag->AttributeTag->Attribute->Object->find('first', [
+                            'recursive' => -1,
+                            'conditions' => ['id' => $target['Attribute']['object_id']]
+                        ]);
+                        $container_object['Object']['timestamp'] = $date->getTimestamp();
+                        $this->Tag->AttributeTag->Attribute->Object->save($container_object);
+                    }
                 }
                 $this->Tag->EventTag->Event->insertLock($user, $event['Event']['id']);
                 $event['Event']['published'] = 0;
-                $date = new DateTime();
                 $event['Event']['timestamp'] = $date->getTimestamp();
                 $this->Tag->EventTag->Event->save($event);
             }

From dd6165762b632b6e82c42712b29066a9f337abd6 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 3 Feb 2021 15:45:26 +0100
Subject: [PATCH 068/437] fix: [UI] hard-delete option missing for soft-deleted
 objects

---
 app/View/Elements/Events/View/row_object.ctp | 47 ++++++++++++--------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/app/View/Elements/Events/View/row_object.ctp b/app/View/Elements/Events/View/row_object.ctp
index 43c57272c..1f462e4ba 100644
--- a/app/View/Elements/Events/View/row_object.ctp
+++ b/app/View/Elements/Events/View/row_object.ctp
@@ -115,23 +115,35 @@
   ?>
   <td class="short action-links">
     <?php
-      if ($mayModify && empty($object['deleted'])) {
-        echo sprintf(
-          '<a href="%s/objects/edit/%s" title="%s" aria-label="%s" class="fa fa-edit white useCursorPointer"></a> ',
-          $baseurl,
-          h($object['id']),
-          __('Edit'),
-          __('Edit')
-        );
-        echo sprintf(
-          '<span class="fa fa-trash white useCursorPointer" title="%1$s" role="button" tabindex="0" aria-label="%1$s" onClick="%2$s"></span>',
-          (empty($event['Event']['publish_timestamp']) ? __('Permanently delete object') : __('Soft delete object')),
-          sprintf(
-            'deleteObject(\'objects\', \'delete\', \'%s\', \'%s\');',
-            empty($event['Event']['publish_timestamp']) ? h($object['id']) . '/true' : h($object['id']),
-            h($event['Event']['id'])
-          )
-        );
+      if ($mayModify) {
+          if (empty($object['deleted'])) {
+            echo sprintf(
+              '<a href="%s/objects/edit/%s" title="%s" aria-label="%s" class="fa fa-edit white useCursorPointer"></a> ',
+              $baseurl,
+              h($object['id']),
+              __('Edit'),
+              __('Edit')
+            );
+            echo sprintf(
+              '<span class="fa fa-trash white useCursorPointer" title="%1$s" role="button" tabindex="0" aria-label="%1$s" onClick="%2$s"></span>',
+              (empty($event['Event']['publish_timestamp']) ? __('Permanently delete object') : __('Soft delete object')),
+              sprintf(
+                'deleteObject(\'objects\', \'delete\', \'%s\', \'%s\');',
+                empty($event['Event']['publish_timestamp']) ? h($object['id']) . '/true' : h($object['id']),
+                h($event['Event']['id'])
+              )
+            );
+        } else {
+            echo sprintf(
+              '<span class="fa fa-trash white useCursorPointer" title="%1$s" role="button" tabindex="0" aria-label="%1$s" onClick="%2$s"></span>',
+              __('Permanently delete object'),
+              sprintf(
+                'deleteObject(\'objects\', \'delete\', \'%s\', \'%s\');',
+                h($object['id']) . '/true',
+                h($event['Event']['id'])
+              )
+            );
+        }
       }
     ?>
   </td>
@@ -151,4 +163,3 @@
     }
     echo '<tr class="objectAddFieldTr"><td><span class="fa fa-plus-circle objectAddField" title="' . __('Add an Object Attribute') .'" onclick="popoverPopup(this, ' . h($object['id']) . ', \'objects\', \'quickFetchTemplateWithValidObjectAttributes\')"></span></td></tr>';
   }
-

From 3e2ba7d76e8c0ec48c8c99f4d0fd63da857d381d Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 2 Feb 2021 20:25:06 +0100
Subject: [PATCH 069/437] fix: [UI] passedArgs should be JSON encoded

---
 app/Controller/DashboardsController.php | 2 +-
 app/View/Dashboards/list_templates.ctp  | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/Controller/DashboardsController.php b/app/Controller/DashboardsController.php
index 0e588adba..49be74f83 100644
--- a/app/Controller/DashboardsController.php
+++ b/app/Controller/DashboardsController.php
@@ -392,7 +392,7 @@ class DashboardsController extends AppController
                     $element['User']['email'] = '';
                 }
             }
-            $this->set('passedArgs', $this->passedArgs);
+            $this->set('passedArgs', json_encode($this->passedArgs));
             $this->set('data', $data);
         }
     }
diff --git a/app/View/Dashboards/list_templates.ctp b/app/View/Dashboards/list_templates.ctp
index 3a772c962..edd37d9cf 100644
--- a/app/View/Dashboards/list_templates.ctp
+++ b/app/View/Dashboards/list_templates.ctp
@@ -91,12 +91,3 @@
     ));
     echo '</div>';
     echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'dashboard', 'menuItem' => 'dashboardTemplateIndex'));
-?>
-<script type="text/javascript">
-    var passedArgsArray = <?php echo json_encode($passedArgs); ?>;
-    $(document).ready(function() {
-        $('#quickFilterButton').click(function() {
-            runIndexQuickFilter();
-        });
-    });
-</script>

From a368e3196f735377774f3098a3dc44cf292a5527 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 3 Feb 2021 17:47:51 +0100
Subject: [PATCH 070/437] chg: [internal] Optimise fetching trending tags
 widget

---
 app/Controller/DashboardsController.php  | 84 +++++++++++++-----------
 app/Lib/Dashboard/TrendingTagsWidget.php | 49 +++++++-------
 app/View/Dashboards/widget_loader.ctp    |  2 +-
 app/webroot/js/misp.js                   | 14 ++--
 4 files changed, 80 insertions(+), 69 deletions(-)

diff --git a/app/Controller/DashboardsController.php b/app/Controller/DashboardsController.php
index 0e588adba..8a9345910 100644
--- a/app/Controller/DashboardsController.php
+++ b/app/Controller/DashboardsController.php
@@ -1,6 +1,9 @@
 <?php
 App::uses('AppController', 'Controller');
 
+/**
+ * @property Dashboard $Dashboard
+ */
 class DashboardsController extends AppController
 {
     public $components = array('Session', 'RequestHandler');
@@ -147,47 +150,50 @@ class DashboardsController extends AppController
 
     public function renderWidget($widget_id, $force = false)
     {
-        if ($this->request->is('post')) {
-            if (empty($this->request->data['data'])) {
-                $this->request->data = array('data' => $this->request->data);
-
-            }
-            if (empty($this->request->data['data'])) {
-                throw new MethodNotAllowedException(__('You need to specify the widget to use along with the configuration.'));
-            }
-            $value = $this->request->data['data'];
-            $dashboardWidget = $this->Dashboard->loadWidget($this->Auth->user(), $value['widget']);
-            $this->layout = false;
-            $this->set('title', $dashboardWidget->title);
-            $redis = $this->Dashboard->setupRedis();
-            $org_scope = $this->_isSiteAdmin() ? 0 : $this->Auth->user('org_id');
-            $lookup_hash = hash('sha256', $value['widget'] . $value['config']);
-            $data = $redis->get('misp:dashboard:' . $org_scope . ':' . $lookup_hash);
-            if (!isset($dashboardWidget->cacheLifetime)) {
-                $dashboardWidget->cacheLifetime = false;
-            }
-            if (empty($dashboardWidget->cacheLifetime) || empty($data)) {
-                $data = $dashboardWidget->handler($this->Auth->user(), json_decode($value['config'], true));
-                if (!empty($dashboardWidget->cacheLifetime)) {
-                    $redis->set('misp:dashboard:' . $org_scope . ':' . $lookup_hash, json_encode(array('data' => $data)));
-                    $redis->expire('misp:dashboard:' . $org_scope . ':' . $lookup_hash, $dashboardWidget->cacheLifetime);
-                }
-            } else {
-                $data = json_decode($data, true)['data'];
-            }
-            $valueConfig = json_decode($value['config'], true);
-            $config = array(
-                'render' => $dashboardWidget->render,
-                'autoRefreshDelay' => empty($dashboardWidget->autoRefreshDelay) ? false : $dashboardWidget->autoRefreshDelay,
-                'widget_config' => empty($valueConfig['widget_config']) ? array() : $valueConfig['widget_config']
-            );
-            $this->set('widget_id', $widget_id);
-            $this->set('data', $data);
-            $this->set('config', $config);
-            $this->render('widget_loader');
-        } else {
+        if (!$this->request->is('post')) {
             throw new MethodNotAllowedException(__('This endpoint can only be reached via POST requests.'));
         }
+
+        @session_write_close(); // allow concurrent AJAX requests (session hold lock by default)
+
+        if (empty($this->request->data['data'])) {
+            $this->request->data = array('data' => $this->request->data);
+        }
+        if (empty($this->request->data['data'])) {
+            throw new MethodNotAllowedException(__('You need to specify the widget to use along with the configuration.'));
+        }
+        $value = $this->request->data['data'];
+        $valueConfig = json_decode($value['config'], true);
+        $dashboardWidget = $this->Dashboard->loadWidget($this->Auth->user(), $value['widget']);
+
+        $redis = $this->Dashboard->setupRedis();
+        $org_scope = $this->_isSiteAdmin() ? 0 : $this->Auth->user('org_id');
+        $lookup_hash = hash('sha256', $value['widget'] . $value['config']);
+        $cacheKey = 'misp:dashboard:' . $org_scope . ':' . $lookup_hash;
+        $data = $redis->get($cacheKey);
+        if (!isset($dashboardWidget->cacheLifetime)) {
+            $dashboardWidget->cacheLifetime = false;
+        }
+        if (empty($dashboardWidget->cacheLifetime) || empty($data)) {
+            $data = $dashboardWidget->handler($this->Auth->user(), $valueConfig);
+            if (!empty($dashboardWidget->cacheLifetime)) {
+                $redis->setex($cacheKey, $dashboardWidget->cacheLifetime, json_encode(array('data' => $data)));
+            }
+        } else {
+            $data = json_decode($data, true)['data'];
+        }
+        $config = array(
+            'render' => $dashboardWidget->render,
+            'autoRefreshDelay' => empty($dashboardWidget->autoRefreshDelay) ? false : $dashboardWidget->autoRefreshDelay,
+            'widget_config' => empty($valueConfig['widget_config']) ? array() : $valueConfig['widget_config']
+        );
+
+        $this->layout = false;
+        $this->set('title', $dashboardWidget->title);
+        $this->set('widget_id', $widget_id);
+        $this->set('data', $data);
+        $this->set('config', $config);
+        $this->render('widget_loader');
     }
 
     public function import()
diff --git a/app/Lib/Dashboard/TrendingTagsWidget.php b/app/Lib/Dashboard/TrendingTagsWidget.php
index 0a1f6b25a..b9bdc9b7f 100644
--- a/app/Lib/Dashboard/TrendingTagsWidget.php
+++ b/app/Lib/Dashboard/TrendingTagsWidget.php
@@ -20,36 +20,41 @@ class TrendingTagsWidget
     "include": ["misp-galaxy:", "my-internal-taxonomy"]
 }';
     public $description = 'Widget showing the trending tags over the past x seconds, along with the possibility to include/exclude tags.';
+    public $cacheLifetime = 600;
 
 	public function handler($user, $options = array())
 	{
-        $this->Event = ClassRegistry::init('Event');
-        $params = array(
-            'metadata' => 1,
-            'timestamp' => time() - (empty($options['time_window']) ? 8640000 : $options['time_window'])
-        );
+	    /** @var Event $eventModel */
+        $eventModel = ClassRegistry::init('Event');
         $threshold = empty($options['threshold']) ? 10 : $options['threshold'];
-        $eventIds = $this->Event->filterEventIds($user, $params);
-        $params['eventid'] = $eventIds;
-        $events = array();
+        $params = [
+            'timestamp' => time() - (empty($options['time_window']) ? 8640000 : $options['time_window']),
+        ];
+        $eventIds = $eventModel->filterEventIds($user, $params);
+
+        $tags = [];
+        $tagColours = [];
         if (!empty($eventIds)) {
-            $events = $this->Event->fetchEvent($user, $params);
-        }
-        $tags = array();
-        $tagColours = array();
-        foreach ($events as $event) {
-            foreach ($event['EventTag'] as $et) {
-                if ($this->checkTag($options, $et['Tag']['name'])) {
-                    if (empty($tags[$et['Tag']['name']])) {
-                        $tags[$et['Tag']['name']] = 1;
-                        $tagColours[$et['Tag']['name']] = $et['Tag']['colour'];
-                    } else {
-                        $tags[$et['Tag']['name']] += 1;
-                    }
+            $eventTags = $eventModel->EventTag->find('all', [
+                'conditions' => ['EventTag.event_id' => $eventIds],
+                'contain' => ['Tag' => ['fields' => ['name', 'colour']]],
+                'recursive' => -1,
+                'fields' => ['id'],
+            ]);
+
+            foreach ($eventTags as $eventTag) {
+                $tagName = $eventTag['Tag']['name'];
+                if (isset($tags[$tagName])) {
+                    $tags[$tagName]++;
+                } else if ($this->checkTag($options, $tagName)) {
+                    $tags[$tagName] = 1;
+                    $tagColours[$tagName] = $eventTag['Tag']['colour'];
                 }
             }
+
+            arsort($tags);
         }
-        arsort($tags);
+
         $data['data'] = array_slice($tags, 0, $threshold);
         $data['colours'] = $tagColours;
         return $data;
diff --git a/app/View/Dashboards/widget_loader.ctp b/app/View/Dashboards/widget_loader.ctp
index d2e65d58b..0eda51ac0 100644
--- a/app/View/Dashboards/widget_loader.ctp
+++ b/app/View/Dashboards/widget_loader.ctp
@@ -8,7 +8,7 @@
     ?>
 </div>
 <script type="text/javascript">
-    $(document).ready(function() {
+    $(function() {
         if (<?= $config['autoRefreshDelay'] ? 'true' : 'false' ?>) {
             setTimeout( function(){
                 updateDashboardWidget("#widget_<?= h($widget_id) ?>")},
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 51e957279..83d7debcd 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -5391,12 +5391,12 @@ function saveDashboardState() {
 }
 
 function updateDashboardWidget(element) {
-    element = $(element);
+    var $element = $(element);
     if (element.length) {
-        var container_id = $(element).attr('id').substring(7);
-        var container = $(element).find('.widgetContent');
-        var titleText = $(element).find('.widgetTitleText');
-        var temp = JSON.parse($(element).attr('config'));
+        var container_id = $element.attr('id').substring(7);
+        var container = $element.find('.widgetContent');
+        var titleText = $element.find('.widgetTitleText');
+        var temp = JSON.parse($element.attr('config'));
         if (temp['alias'] !== undefined) {
             titleText.text(temp['alias']);
         }
@@ -5404,8 +5404,8 @@ function updateDashboardWidget(element) {
             type: 'POST',
             url: baseurl + '/dashboards/renderWidget/' + container_id,
             data: {
-                config: $(element).attr('config'),
-                widget: $(element).attr('widget')
+                config: $element.attr('config'),
+                widget: $element.attr('widget')
             },
             success:function (data, textStatus) {
                 container.html(data);

From e93767d814b142befdaa4aece2258a8449b57956 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 3 Feb 2021 20:26:21 +0100
Subject: [PATCH 071/437] fix: [widget] Typo in MispSystemResourceWidget

---
 .../Dashboard/MispSystemResourceWidget.php    | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/Lib/Dashboard/MispSystemResourceWidget.php b/app/Lib/Dashboard/MispSystemResourceWidget.php
index 0f2b7cf8d..656335631 100644
--- a/app/Lib/Dashboard/MispSystemResourceWidget.php
+++ b/app/Lib/Dashboard/MispSystemResourceWidget.php
@@ -7,41 +7,43 @@ class MispSystemResourceWidget
     public $width = 3;
     public $height = 3;
     public $params = array(
-        'treshold' => 'Treshold for disk space'
+        'threshold' => 'Threshold for disk space'
     );
     public $description = 'Basic widget showing some system server statistics.';
     public $cacheLifetime = false;
     public $autoRefreshDelay = 30;
     public $placeholder =
     '{
-        "treshold": "85"
+        "threshold": "85"
     }';
 
-	public function handler($user, $options = array())
+	public function handler(array $user, $options = array())
 	{
+	    // Keep BC with typo value
+        $threshold = isset($options['threshold']) ? $options['threshold'] : (isset($options['treshold']) ? $options['treshold'] : 85);
 
-        $drive = round((1 - disk_free_space(getcwd())/disk_total_space(getcwd()))*100,2);
+        $cwd = getcwd();
+        $drive = round((1 - disk_free_space($cwd)/disk_total_space($cwd))*100,2);
         $driveFree = $drive . "%";
         $driveFreeClass = "";
-        if ($drive > intval($options['treshold'])) {
-            $driveFree = $drive . "% - [Above Treshhold]";
+        if ($drive > intval($threshold)) {
+            $driveFree = $drive . "% - [Above Threshold]";
             $driveFreeClass = "red";
         }
 
-        $sysload = sys_getloadavg();
-
-        preg_match('#MemFree:[\s\t]+([\d]+)\s+kB#', file_get_contents('/proc/meminfo'), $matches);
+        $meminfo = file_get_contents('/proc/meminfo');
+        preg_match('#MemFree:[\s\t]+([\d]+)\s+kB#', $meminfo, $matches);
         $memoryFree = $matches[1];
-        preg_match('#MemTotal:[\s\t]+([\d]+)\s+kB#', file_get_contents('/proc/meminfo'), $matches);
+        preg_match('#MemTotal:[\s\t]+([\d]+)\s+kB#', $meminfo, $matches);
         $memoryTotal = $matches[1];
 
         $data = array(
-                array( 'title' => __('User'), 'value' => $user['email']),
-                array( 'title' => __('System'), 'value' => php_uname()),
-                array( 'title' => __('Disk usage'), 'value' => h($driveFree), 'class' => $driveFreeClass),
-                array( 'title' => __('Load'), 'value' => h($sysload[0] . " - " . $sysload[1] . " - " . $sysload[2])),
-                array( 'title' => __('Memory'), 'value' => h(round($memoryFree/1024,2) . "M free (" . round((1 - $memoryFree/$memoryTotal)*100,2) . "% used)")),
-                );
+            array( 'title' => __('User'), 'value' => $user['email']),
+            array( 'title' => __('System'), 'value' => php_uname()),
+            array( 'title' => __('Disk usage'), 'value' => h($driveFree), 'class' => $driveFreeClass),
+            array( 'title' => __('Load'), 'value' => h(implode(" - ", sys_getloadavg()))),
+            array( 'title' => __('Memory'), 'value' => h(round($memoryFree / 1024,2) . " MB free (" . round((1 - $memoryFree/$memoryTotal)*100,2) . " % used)")),
+        );
         return $data;
 	}
 

From be88afaba8700e2819732b87e498f3878ab2d2aa Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 4 Feb 2021 11:31:38 +0100
Subject: [PATCH 072/437] fix: [internal] First check if attribute value is
 valid composite, then run other checks

---
 app/Model/Attribute.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 81afad30f..58bd1b465 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -203,17 +203,17 @@ class Attribute extends AppModel
             'stringNotEmpty' => array(
                 'rule' => array('stringNotEmpty')
             ),
+            'validComposite' => array(
+                'rule' => array('validComposite'),
+                'message' => 'Composite type found but the value not in the composite (value1|value2) format.'
+            ),
             'userdefined' => array(
                 'rule' => array('validateAttributeValue'),
                 'message' => 'Value not in the right type/format. Please double check the value or select type "other".'
             ),
             'uniqueValue' => array(
-                    'rule' => array('valueIsUnique'),
-                    'message' => 'A similar attribute already exists for this event.'
-            ),
-            'validComposite' => array(
-                'rule' => array('validComposite'),
-                'message' => 'Composite type found but the value not in the composite (value1|value2) format.'
+                'rule' => array('valueIsUnique'),
+                'message' => 'A similar attribute already exists for this event.'
             ),
             'maxTextLength' => array(
                 'rule' => array('maxTextLength')
@@ -603,7 +603,7 @@ class Attribute extends AppModel
     public function validComposite($fields)
     {
         $compositeTypes = $this->getCompositeTypes();
-        if (in_array($this->data['Attribute']['type'], $compositeTypes)) {
+        if (in_array($this->data['Attribute']['type'], $compositeTypes, true)) {
             if (substr_count($fields['value'], '|') !== 1) {
                 return false;
             }

From 2dd0118d845184d2b33bfd1ce16fcf6291463231 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Thu, 4 Feb 2021 12:14:32 +0100
Subject: [PATCH 073/437] chg: [misp-objects] updated to the latest version

---
 app/files/misp-objects | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/misp-objects b/app/files/misp-objects
index 4b9f12c64..2b1c3532d 160000
--- a/app/files/misp-objects
+++ b/app/files/misp-objects
@@ -1 +1 @@
-Subproject commit 4b9f12c64467613ff8f8d67209345039b7acdd6e
+Subproject commit 2b1c3532dccad651f960ff71defdbc422c40ef0c

From 6fdee6216fbb2ddde4ba81985c7d775c79ceaa03 Mon Sep 17 00:00:00 2001
From: chrisr3d <chris.studer.68@gmail.com>
Date: Thu, 4 Feb 2021 16:46:11 +0100
Subject: [PATCH 074/437] fix: [stix2 import] Fixed pattern parsing

- Stripping patterns to avoid issue with space
  characters at the beginning or at the end of the
  patterns
---
 app/files/scripts/stix2/stix2misp.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/files/scripts/stix2/stix2misp.py b/app/files/scripts/stix2/stix2misp.py
index 81c050abc..b44e86121 100644
--- a/app/files/scripts/stix2/stix2misp.py
+++ b/app/files/scripts/stix2/stix2misp.py
@@ -491,7 +491,7 @@ class StixFromMISPParser(StixParser):
 
     def parse_indicator_object(self, indicator):
         misp_object, object_type = self.create_misp_object(indicator)
-        pattern = indicator.pattern.replace('\\\\', '\\').strip('[]').split(' AND ')
+        pattern = self._handle_pattern(indicator.pattern).replace('\\\\', '\\').split(' AND ')
         try:
             attributes = getattr(self, stix2misp_mapping.objects_mapping[object_type]['pattern'])(pattern)
         except KeyError:
@@ -1270,7 +1270,7 @@ class ExternalStixParser(StixParser):
             self.misp_event.add_object(**misp_object)
 
     def parse_usual_indicator(self, indicator, separator):
-        pattern = tuple(part.strip() for part in indicator.pattern.strip('[]').split(separator))
+        pattern = tuple(part.strip() for part in self._handle_pattern(indicator.pattern).split(separator))
         types = self._parse_pattern_types(pattern)
         try:
             getattr(self, stix2misp_mapping.pattern_mapping[types])(indicator, separator)
@@ -1664,7 +1664,7 @@ class ExternalStixParser(StixParser):
     def parse_domain_ip_port_pattern(self, indicator, separator):
         attributes = []
         references = defaultdict(dict)
-        for pattern_part in indicator.pattern.strip('[]').split(separator):
+        for pattern_part in self._handle_pattern(indicator.pattern).split(separator):
             pattern_type, pattern_value = self.get_type_and_value_from_pattern(pattern_part)
             if pattern_type not in stix2misp_mapping.domain_ip_mapping:
                 if any(pattern_type.startswith(f'network-traffic:{feature}_ref') for feature in ('src', 'dst')):
@@ -1689,7 +1689,7 @@ class ExternalStixParser(StixParser):
     def parse_email_message_pattern(self, indicator, separator):
         attributes = []
         attachments = defaultdict(dict)
-        for pattern_part in indicator.pattern.strip('[]').split(separator):
+        for pattern_part in self._handle_pattern(indicator.pattern).split(separator):
             pattern_type, pattern_value = self.get_type_and_value_from_pattern(pattern_part)
             if pattern_type not in stix2misp_mapping.email_mapping:
                 if pattern_type.startswith('email-message:body_multipart'):
@@ -1721,7 +1721,7 @@ class ExternalStixParser(StixParser):
         attributes = []
         attachment = {}
         extensions = defaultdict(lambda: defaultdict(dict))
-        for pattern_part in indicator.pattern.strip('[]').split(separator):
+        for pattern_part in self._handle_pattern(indicator.pattern).split(separator):
             pattern_type, pattern_value = self.get_type_and_value_from_pattern(pattern_part)
             if pattern_type in stix2misp_mapping.attachment_types:
                 attachment[pattern_type] = pattern_value.strip("'")
@@ -1812,7 +1812,7 @@ class ExternalStixParser(StixParser):
         protocols = []
         references = defaultdict(dict)
         extensions = defaultdict(dict)
-        for pattern_part in indicator.pattern.strip('[]').split(separator):
+        for pattern_part in self._handle_pattern(indicator.pattern).split(separator):
             pattern_type, pattern_value = self.get_type_and_value_from_pattern(pattern_part)
             if pattern_type in stix2misp_mapping.network_traffic_mapping:
                 attribute = deepcopy(stix2misp_mapping.network_traffic_mapping[pattern_type])
@@ -1845,7 +1845,7 @@ class ExternalStixParser(StixParser):
         attributes = []
         parent = {}
         child = defaultdict(set)
-        for pattern_part in indicator.pattern.strip('[]').split(separator):
+        for pattern_part in self._handle_pattern(indicator.pattern).split(separator):
             pattern_type, pattern_value = self.get_type_and_value_from_pattern(pattern_part)
             if 'parent_' in pattern_type:
                 child[pattern_type.split('.')[-1]].add(pattern_value)
@@ -1888,7 +1888,7 @@ class ExternalStixParser(StixParser):
 
     def parse_user_account_pattern(self, indicator, separator):
         attributes = []
-        pattern = indicator.pattern.strip('[]').split(separator)
+        pattern = self._handle_pattern(indicator.pattern).split(separator)
         object_name, mapping = self._fetch_user_account_type_pattern(pattern)
         for pattern_part in pattern:
             pattern_type, pattern_value = self.get_type_and_value_from_pattern(pattern_part)
@@ -1915,7 +1915,7 @@ class ExternalStixParser(StixParser):
     ################################################################################
 
     def add_attributes_from_indicator(self, indicator, attribute_type, separator):
-        patterns = indicator.pattern.strip('[]').split(separator)
+        patterns = self._handle_pattern(indicator.pattern).split(separator)
         if len(patterns) == 1:
             _, value = self.get_type_and_value_from_pattern(patterns[0])
             attribute = MISPAttribute()
@@ -2018,6 +2018,10 @@ class ExternalStixParser(StixParser):
             return attribute['object_relation'] in _force_object
         return _force_object
 
+    @staticmethod
+    def _handle_pattern(pattern):
+        return pattern.strip().strip('[]')
+
     @staticmethod
     def _parse_observable_types(observable_objects):
         types = {observable_object._type for observable_object in observable_objects.values()}

From e0036100785360888cc384c6ec0791d8c6459454 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Fri, 5 Feb 2021 09:28:35 +0100
Subject: [PATCH 075/437] chg: [PyMISP] bump to latest version

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index 5b97b7d01..c87bcf15a 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 5b97b7d0158906cd0f646a7273a3ca5b1828cd15
+Subproject commit c87bcf15acbe591fc026ebec4cf8452749405f22

From e07d682378676569c68eeb3872205991fbbcf1fd Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 11 Jan 2021 17:51:09 +0100
Subject: [PATCH 076/437] new: [settings] Allow to use ThreatLevel.name for
 alert filter

---
 app/Model/Event.php       | 18 +++++++-------
 app/Model/UserSetting.php | 49 ++++++++++++++++++---------------------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 640aa2c65..2596c4f82 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -3085,16 +3085,18 @@ class Event extends AppModel
         $userCount = count($usersWithAccess);
         $this->UserSetting = ClassRegistry::init('UserSetting');
         foreach ($usersWithAccess as $k => $user) {
-            if ($this->UserSetting->checkPublishFilter($user, $event)) {
-                // Fetch event for user that will receive alert e-mail to respect all ACLs
-                $eventForUser = $this->fetchEvent($user, [
-                    'eventid' => $id,
-                    'includeAllTags' => true,
-                    'includeEventCorrelations' => true,
-                ])[0];
+            // Fetch event for user that will receive alert e-mail to respect all ACLs
+            $eventForUser = $this->fetchEvent($user, [
+                'eventid' => $id,
+                'includeAllTags' => true,
+                'includeEventCorrelations' => true,
+                'noEventReports' => true,
+                'noSightings' => true,
+            ])[0];
 
+            if ($this->UserSetting->checkPublishFilter($user, $eventForUser)) {
                 $body = $this->__buildAlertEmailBody($eventForUser, $user, $oldpublish);
-                $this->User->sendEmail(array('User' => $user), $body, $bodyNoEnc, $subject);
+                $this->User->sendEmail(['User' => $user], $body, $bodyNoEnc, $subject);
             }
             if ($jobId) {
                 $this->Job->saveProgress($jobId, null, $k / $userCount * 100);
diff --git a/app/Model/UserSetting.php b/app/Model/UserSetting.php
index 35592faef..4c3ef2a15 100644
--- a/app/Model/UserSetting.php
+++ b/app/Model/UserSetting.php
@@ -230,25 +230,21 @@ class UserSetting extends AppModel
          return null;
      }
 
-    /*
-     *  Check whether the event is something the user is interested (to be alerted on)
-     *
+    /**
+     * Check whether the event is something the user is interested (to be alerted on)
+     * @param $user
+     * @param $event
+     * @return bool
      */
-    public function checkPublishFilter($user, $event)
+    public function checkPublishFilter(array $user, array $event)
     {
-        $rule = $this->find('first', array(
-            'recursive' => -1,
-            'conditions' => array(
-                'UserSetting.user_id' => $user['id'],
-                'UserSetting.setting' => 'publish_alert_filter'
-            )
-        ));
+        $rule = $this->getValueForUser($user['id'], 'publish_alert_filter');
         // We should return true if no setting has been configured, or there's a setting with an empty value
-        if (empty($rule) || empty($rule['UserSetting']['value'])) {
+        if (empty($rule)) {
             return true;
         }
         // recursively evaluate the boolean tree to true/false and return the value
-        $result = $this->__recursiveConvert($rule['UserSetting']['value'], $event);
+        $result = $this->__recursiveConvert($rule, $event);
         if (isset($result[0])) {
             return $result[0];
         } else {
@@ -256,7 +252,7 @@ class UserSetting extends AppModel
         }
     }
 
-    /*
+    /**
      * Convert a complex rule set recursively
      * takes as params a rule branch and an event to check against
      * evaluate whether the rule set evaluates as true/false
@@ -284,9 +280,9 @@ class UserSetting extends AppModel
                             }
                         }
                     }
-                    $toReturn []= $temp;
+                    $toReturn[] = $temp;
                 } else {
-                    $toReturn []= $this->__checkEvent($k, $v, $event);
+                    $toReturn[] = $this->__checkEvent($k, $v, $event);
                 }
             }
             return $toReturn;
@@ -303,6 +299,7 @@ class UserSetting extends AppModel
      * - Tag.name (checks against both event and attribute tags)
      * - Orgc.uuid
      * - Orgc.name
+     * - ThreatLevel.name
      * Values passed can be used for direct string comparisons or alternatively
      * as substring matches by encapsulating the string in a pair of "%" characters
      * Each rule can take a list of values
@@ -332,6 +329,8 @@ class UserSetting extends AppModel
                 Hash::extract($event, 'Object.{n}.Attribute.{n}.AttributeTag.{n}.Tag.name'),
                 Hash::extract($event, 'EventTag.{n}.Tag.name')
             );
+        } else if ($rule === 'ThreatLevel.name') {
+            $values = [$event['ThreatLevel']['name']];
         }
         if (!empty($values)) {
             foreach ($values as $extracted_value) {
@@ -405,18 +404,14 @@ class UserSetting extends AppModel
         return true;
     }
 
+    /**
+     * @param int $user_id
+     * @param string $setting
+     * @return array|mixed
+     * @deprecated
+     */
     public function getSetting($user_id, $setting)
     {
-        $setting = $this->find('first', array(
-            'recursive' => -1,
-            'conditions' => array(
-                'UserSetting.user_id' => $user_id,
-                'UserSetting.setting' => $setting
-            )
-        ));
-        if (empty($setting)) {
-            return array();
-        }
-        return $setting['UserSetting']['value'];
+        return $this->getValueForUser($user_id, $setting) ?: [];
     }
 }

From a5ff4d40bf7536c31af8b2be0c4194b6d4f62be9 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 8 Feb 2021 08:26:49 +0100
Subject: [PATCH 077/437] fix: [CLI] Check user existence

---
 app/Console/Command/EventShell.php | 45 ++++++++++++++----------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/Console/Command/EventShell.php b/app/Console/Command/EventShell.php
index 69d7c5bc0..bf8824db6 100644
--- a/app/Console/Command/EventShell.php
+++ b/app/Console/Command/EventShell.php
@@ -35,10 +35,7 @@ class EventShell extends AppShell
     public function import()
     {
         list($userId, $path) = $this->args;
-        $user = $this->User->getAuthUser($userId);
-        if (empty($user)) {
-            $this->error("User with ID $userId does not exists.");
-        }
+        $user = $this->getUser($userId);
 
         if (!file_exists($path)) {
             $this->error("File '$path' does not exists.");
@@ -113,7 +110,7 @@ class EventShell extends AppShell
         $timeStart = time();
         $userId = $this->args[0];
         $id = $this->args[1];
-        $user = $this->User->getAuthUser($userId);
+        $user = $this->getUser($userId);
         $this->Job->id = $id;
         $export_type = $this->args[2];
         file_put_contents('/tmp/test', $export_type);
@@ -204,10 +201,7 @@ class EventShell extends AppShell
         $jobId = $this->args[1];
         $eventId = $this->args[2];
         $oldpublish = $this->args[3];
-        $user = $this->User->getUserById($userId);
-        if (empty($user)) {
-            die("Invalid user ID '$userId' provided.");
-        }
+        $user = $this->getUser($userId);
         $this->Event->sendAlertEmail($eventId, $user, $oldpublish, $jobId);
     }
 
@@ -220,10 +214,7 @@ class EventShell extends AppShell
         $userId = $this->args[3];
         $processId = $this->args[4];
 
-        $user = $this->User->getUserById($userId);
-        if (empty($user)) {
-            die("Invalid user ID '$userId' provided.");
-        }
+        $user = $this->getUser($userId);
         $result = $this->Event->sendContactEmail($id, $message, $all, $user);
         $this->Job->saveStatus($processId, $result);
     }
@@ -305,10 +296,7 @@ class EventShell extends AppShell
         $passAlong = $this->args[1];
         $jobId = $this->args[2];
         $userId = $this->args[3];
-        $user = $this->User->getAuthUser($userId);
-        if (empty($user)) {
-            die("Invalid user ID '$userId' provided.");
-        }
+        $user = $this->getUser($userId);
         $job = $this->Job->read(null, $jobId);
         $this->Event->Behaviors->unload('SysLogLogable.SysLogLogable');
         $result = $this->Event->publish($id, $passAlong);
@@ -332,10 +320,7 @@ class EventShell extends AppShell
         $passAlong = $this->args[1];
         $jobId = $this->args[2];
         $userId = $this->args[3];
-        $user = $this->User->getAuthUser($userId);
-        if (empty($user)) {
-            die("Invalid user ID '$userId' provided.");
-        }
+        $user = $this->getUser($userId);
         $job = $this->Job->read(null, $jobId);
         $this->Event->Behaviors->unload('SysLogLogable.SysLogLogable');
         $result = $this->Event->publish_sightings($id, $passAlong);
@@ -359,7 +344,7 @@ class EventShell extends AppShell
         $jobId = $this->args[1];
         $userId = $this->args[2];
         $passAlong = $this->args[3];
-        $user = $this->User->getAuthUser($userId);
+        $user = $this->getUser($userId);
         $job = $this->Job->read(null, $jobId);
         $this->GalaxyCluster = ClassRegistry::init('GalaxyCluster');
         $result = $this->GalaxyCluster->publish($clusterId, $passAlong=$passAlong);
@@ -383,8 +368,7 @@ class EventShell extends AppShell
             die('Usage: ' . $this->Server->command_line_functions['enrichment'] . PHP_EOL);
         }
         $userId = $this->args[0];
-        $user = $this->User->getAuthUser($userId);
-        if (empty($user)) die('Invalid user.');
+        $user = $this->getUser($userId);
         $eventId = $this->args[1];
         $modulesRaw = $this->args[2];
         try {
@@ -484,4 +468,17 @@ class EventShell extends AppShell
         $job['Job']['message'] = __('Recovery complete. Event #%s recovered, using %s log entries.', $id, $result);
         $this->Job->save($job);
     }
+
+    /**
+     * @param int $userId
+     * @return array
+     */
+    private function getUser($userId)
+    {
+        $user = $this->User->getAuthUser($userId);
+        if (empty($user)) {
+            $this->error("User with ID $userId does not exists.");
+        }
+        return $user;
+    }
 }

From 2904a632874430853f76b51bd5af4c342e75d3c7 Mon Sep 17 00:00:00 2001
From: StefanKelm <StefanKelm@users.noreply.github.com>
Date: Mon, 8 Feb 2021 11:48:41 +0100
Subject: [PATCH 078/437] Update Server.php

wording
---
 app/Model/Server.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index dd743f9dc..b2d959800 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -5416,7 +5416,7 @@ class Server extends AppModel
                 ),
                 'obscure_subject' => array(
                     'level' => 2,
-                    'description' => __('When enabled, subject in signed and encrypted e-mails will not send in unencrypted form.'),
+                    'description' => __('When enabled, the subject in signed and encrypted e-mails will not be sent in unencrypted form.'),
                     'value' => false,
                     'errorMessage' => '',
                     'test' => 'testBool',
@@ -5516,7 +5516,7 @@ class Server extends AppModel
                     'level' => 0,
                     'description' => __('Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned.'),
                     'value' => false,
-                    'errorMessage' => 'This setting leaves your users open to CSRF attacks. Do not please consider disabling this setting.',
+                    'errorMessage' => 'This setting leaves your users open to CSRF attacks. Please consider disabling this setting.',
                     'test' => 'testBoolFalse',
                     'type' => 'boolean',
                     'null' => true
@@ -5559,7 +5559,7 @@ class Server extends AppModel
                 ],
                 'auth_enforced' => [
                     'level' => self::SETTING_OPTIONAL,
-                    'description' => __('This optional can be enabled if external auth provider is used and when set to true, it will disable default form authentication.'),
+                    'description' => __('This optionally can be enabled if an external auth provider is used. When set to true, it will disable the default form authentication.'),
                     'value' => false,
                     'errorMessage' => '',
                     'test' => 'testBool',

From 7f85db254c38d3af7cf8225de272b2f16c5e992d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Mon, 8 Feb 2021 12:08:46 +0100
Subject: [PATCH 079/437] chg: Bump PyMISP & version

---
 PyMISP                           | 2 +-
 app/Controller/AppController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PyMISP b/PyMISP
index c87bcf15a..9316420dc 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit c87bcf15acbe591fc026ebec4cf8452749405f22
+Subproject commit 9316420dc028a1ffc541986fc08793e669f2165e
diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index b80557c4b..5a1e21e09 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -26,7 +26,7 @@ class AppController extends Controller
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
 
     private $__queryVersion = '122';
-    public $pyMispVersion = '2.4.137';
+    public $pyMispVersion = '2.4.138';
     public $phpmin = '7.2';
     public $phprec = '7.4';
     public $phptoonew = '8.0';

From d6f9cdc5b14519075f2186a0332c2f0f2c14f5c9 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 8 Feb 2021 15:28:26 +0100
Subject: [PATCH 080/437] fix: [internal] idTranslator could show invalid
 results

---
 app/Controller/ServersController.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 070b855b5..0503a9fc0 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -1347,9 +1347,7 @@ class ServersController extends AppController
                 } catch (Exception $e) {
                     $remoteEvent = null;
                 }
-                if ($remoteEvent) {
-                    $remoteEventId = $remoteEvent[0]['id'];
-                }
+                $remoteEventId = isset($remoteEvent[0]['id']) ? $remoteEvent[0]['id'] : null;
                 $remote_events[] = array(
                     "server_id" => $server['Server']['id'],
                     "server_name" => $server['Server']['name'],

From 23b3d53efe228e0d8a2ed5116843238bad790929 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 8 Feb 2021 16:46:41 +0100
Subject: [PATCH 081/437] chg: [version] bump

---
 VERSION.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.json b/VERSION.json
index e981bf379..764288e82 100644
--- a/VERSION.json
+++ b/VERSION.json
@@ -1 +1 @@
-{"major":2, "minor":4, "hotfix":137}
+{"major":2, "minor":4, "hotfix":138}

From 1c886c7d28be62b96607c4ed798bb7858d157d78 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 8 Feb 2021 16:49:27 +0100
Subject: [PATCH 082/437] fix: [UI] notice resolved on the feed index

---
 app/View/Feeds/index.ctp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/View/Feeds/index.ctp b/app/View/Feeds/index.ctp
index ee50c3c31..a82cf5c08 100644
--- a/app/View/Feeds/index.ctp
+++ b/app/View/Feeds/index.ctp
@@ -191,7 +191,8 @@
                     'name' => __('Tag'),
                     'class' => 'short',
                     'data_path' => 'Tag',
-                    'element' => 'tags'
+                    'element' => 'tags',
+                    'scope' => 'feeds'
                 ),
                 array(
                     'name' => __('Visible'),

From b87c80cd3b994d2cc5e57eae17cd72388a326cf2 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 8 Feb 2021 16:59:57 +0100
Subject: [PATCH 083/437] fix: [zmq/kafka] attribute edits should include non
 exportable attributes

---
 app/Model/Attribute.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index c7806acf6..1dfa1fca0 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -2943,9 +2943,7 @@ class Attribute extends AppModel
         if (!empty($attribute)) {
             if (!empty($attribute['AttributeTag'])) {
                 foreach ($attribute['AttributeTag'] as $at) {
-                    if ($at['Tag']['exportable']) {
-                        $attribute['Attribute']['Tag'][] = $at['Tag'];
-                    }
+                    $attribute['Attribute']['Tag'][] = $at['Tag'];
                 }
             }
             unset($attribute['AttributeTag']);

From 1ddc708a2501b5f86c12406c5ce89718b7b5e2f3 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Mon, 8 Feb 2021 17:01:45 +0100
Subject: [PATCH 084/437] chg: [taxonomies] updated to the latest version

---
 app/files/taxonomies | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/taxonomies b/app/files/taxonomies
index ec5d06913..82fbe9b0a 160000
--- a/app/files/taxonomies
+++ b/app/files/taxonomies
@@ -1 +1 @@
-Subproject commit ec5d0691332202a2980ef3ede694f02d4968e73d
+Subproject commit 82fbe9b0a8ac0e8f52c447fb5e49ccb31d4e6374

From 7dfe92655f2cb2c79728b95a7e3b928dccae1d01 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Mon, 8 Feb 2021 17:02:58 +0100
Subject: [PATCH 085/437] chg: [misp-galaxy] updated to the latest version

---
 app/files/misp-galaxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/misp-galaxy b/app/files/misp-galaxy
index 815e5c4fe..fa05eb04e 160000
--- a/app/files/misp-galaxy
+++ b/app/files/misp-galaxy
@@ -1 +1 @@
-Subproject commit 815e5c4fe4b3ac4de4966dbf65dad876d5c1660c
+Subproject commit fa05eb04e38cfb76ae353cc158fb5d98160969a3

From 83e9580b97a2a4f0494d2819160fd209dc137141 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 8 Feb 2021 23:15:34 +0100
Subject: [PATCH 086/437] fix: [bro] export fixed

- invalid group by statement removed
---
 app/Model/Attribute.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 1dfa1fca0..a94a38fd9 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -2541,7 +2541,6 @@ class Attribute extends AppModel
                 'recursive' => -1, // int
                 '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,
                 'flatten' => 1
             )
@@ -3089,7 +3088,7 @@ class Attribute extends AppModel
             $params['conditions']['AND'][] = $options['conditions'];
         }
         if (empty($options['flatten'])) {
-            $params['conditions']['AND'][] = array('(Attribute.object_id + 0)' => 0);
+            $params['conditions']['AND'][] = array('Attribute.object_id' => 0);
         }
         if (isset($options['order'])) {
             $params['order'] = $options['order'];
@@ -3124,7 +3123,7 @@ class Attribute extends AppModel
             $options['includeEventTags'] = true;
         }
         if (!$user['Role']['perm_sync'] || !isset($options['deleted']) || !$options['deleted']) {
-            $params['conditions']['AND']['(Attribute.deleted + 0)'] = 0;
+            $params['conditions']['AND']['Attribute.deleted'] = 0;
         } else {
             if ($options['deleted'] === "only") {
                 $options['deleted'] = 1;

From 4c9ba9dcc7802e4ad387cbfad1245685b1ff0757 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 9 Feb 2021 10:57:01 +0100
Subject: [PATCH 087/437] chg: [internal] Refactor TagsController::view

---
 app/Controller/TagsController.php | 96 ++++++++-----------------------
 app/Model/AttributeTag.php        |  1 +
 app/Model/Tag.php                 |  4 ++
 3 files changed, 30 insertions(+), 71 deletions(-)

diff --git a/app/Controller/TagsController.php b/app/Controller/TagsController.php
index 08a725aba..44d4bc2b2 100644
--- a/app/Controller/TagsController.php
+++ b/app/Controller/TagsController.php
@@ -343,79 +343,33 @@ class TagsController extends AppController
 
     public function view($id)
     {
-        if ($this->_isRest()) {
-            $contain = array('EventTag' => array('fields' => 'event_id'));
-            $contain['AttributeTag'] = array('fields' => 'attribute_id');
-            $tag = $this->Tag->find('first', array(
-                    'conditions' => array('id' => $id),
-                    'recursive' => -1,
-                    'contain' => $contain
-            ));
-            if (empty($tag)) {
-                throw new MethodNotAllowedException('Invalid Tag');
-            }
-            if (empty($tag['EventTag'])) {
-                $tag['Tag']['count'] = 0;
-            } else {
-                $eventIDs = array();
-                foreach ($tag['EventTag'] as $eventTag) {
-                    $eventIDs[] = $eventTag['event_id'];
-                }
-                $conditions = array('Event.id' => $eventIDs);
-                if (!$this->_isSiteAdmin()) {
-                    $conditions = array_merge(
-                        $conditions,
-                        array('OR' => array(
-                                array('AND' => array(
-                                        array('Event.distribution >' => 0),
-                                        array('Event.published =' => 1)
-                                )),
-                                array('Event.orgc_id' => $this->Auth->user('org_id'))
-                        ))
-                );
-                }
-                $events = $this->Tag->EventTag->Event->find('all', array(
-                        'fields' => array('Event.id', 'Event.distribution', 'Event.orgc_id'),
-                        'conditions' => $conditions
-                ));
-                $tag['Tag']['count'] = count($events);
-            }
-            unset($tag['EventTag']);
-            if (empty($tag['AttributeTag'])) {
-                $tag['Tag']['attribute_count'] = 0;
-            } else {
-                $attributeIDs = array();
-                foreach ($tag['AttributeTag'] as $attributeTag) {
-                    $attributeIDs[] = $attributeTag['attribute_id'];
-                }
-                $conditions = array('Attribute.id' => $attributeIDs);
-                if (!$this->_isSiteAdmin()) {
-                    $conditions = array_merge(
-                        $conditions,
-                        array('OR' => array(
-                            array('AND' => array(
-                                array('Attribute.deleted =' => 0),
-                                array('Attribute.distribution >' => 0),
-                                array('Event.distribution >' => 0),
-                                array('Event.published =' => 1)
-                            )),
-                            array('Event.orgc_id' => $this->Auth->user('org_id'))
-                        ))
-                    );
-                }
-                $attributes = $this->Tag->AttributeTag->Attribute->find('all', array(
-                    'fields'     => array('Attribute.id', 'Attribute.deleted', 'Attribute.distribution', 'Event.id', 'Event.distribution', 'Event.orgc_id'),
-                    'contain'    => array('Event' => array('fields' => array('id', 'distribution', 'orgc_id'))),
-                    'conditions' => $conditions
-                ));
-                $tag['Tag']['attribute_count'] = count($attributes);
-            }
-            unset($tag['AttributeTag']);
-            $this->set('Tag', $tag['Tag']);
-            $this->set('_serialize', 'Tag');
-        } else {
+        if (!$this->_isRest()) {
             throw new MethodNotAllowedException('This action is only for REST users.');
         }
+
+        $tag = $this->Tag->find('first', array(
+            'conditions' => array('id' => $id),
+            'recursive' => -1,
+            'contain' => ['AttributeTag' => ['fields' => 'attribute_id']],
+        ));
+        if (empty($tag)) {
+            throw new MethodNotAllowedException('Invalid Tag');
+        }
+
+        $tag['Tag']['count'] = $this->Tag->EventTag->countForTag($tag['Tag']['id'], $this->Auth->user());
+
+        if (empty($tag['AttributeTag'])) {
+            $tag['Tag']['attribute_count'] = 0;
+        } else {
+            $attributeIDs = array_column($tag['AttributeTag'], 'attribute_id');
+            $tag['Tag']['attribute_count'] = count($this->Tag->AttributeTag->Attribute->fetchAttributes($this->Auth->user(), [
+                'conditions' => ['Attribute.id' => $attributeIDs],
+                'list' => true,
+            ]));
+        }
+        unset($tag['AttributeTag']);
+
+        return $this->RestResponse->viewData($tag['Tag'], $this->response->type());
     }
 
     public function showEventTag($id)
diff --git a/app/Model/AttributeTag.php b/app/Model/AttributeTag.php
index d4054694d..e3a71f3c9 100644
--- a/app/Model/AttributeTag.php
+++ b/app/Model/AttributeTag.php
@@ -3,6 +3,7 @@ App::uses('AppModel', 'Model');
 
 /**
  * @property Tag $Tag
+ * @property Attribute $Attribute
  */
 class AttributeTag extends AppModel
 {
diff --git a/app/Model/Tag.php b/app/Model/Tag.php
index 7cbe0e934..8bf3a6c34 100644
--- a/app/Model/Tag.php
+++ b/app/Model/Tag.php
@@ -1,6 +1,10 @@
 <?php
 App::uses('AppModel', 'Model');
 
+/**
+ * @property EventTag $EventTag
+ * @property AttributeTag $AttributeTag
+ */
 class Tag extends AppModel
 {
     public $useTable = 'tags';

From e82c2b6544af67c050d23312ee11f212550cee29 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 9 Feb 2021 15:09:13 +0100
Subject: [PATCH 088/437] chg: [UI] Use TimeHelper for datetime formatting

---
 app/View/AuthKeys/view.ctp                     |  2 +-
 app/View/Elements/Events/View/seen_field.ctp   | 11 ++++++++---
 .../Elements/Events/View/sighting_field.ctp    |  4 ++--
 app/View/Elements/Events/View/value_field.ctp  |  3 +++
 app/View/Elements/footer.ctp                   |  2 +-
 .../IndexTable/Fields/datetime.ctp             |  6 +-----
 .../IndexTable/Fields/expiration.ctp           |  2 +-
 .../SingleViews/Fields/datetimeField.ctp       |  2 +-
 app/View/EventReports/view.ctp                 |  5 ++++-
 app/View/Events/view.ctp                       |  4 ++--
 app/View/Helper/TimeHelper.php                 | 18 ++++++++++++++++++
 app/View/Jobs/index.ctp                        |  4 ++--
 app/View/Logs/admin_index.ctp                  |  2 +-
 app/View/News/index.ctp                        |  2 +-
 app/View/Sightings/ajax/list_sightings.ctp     |  2 +-
 app/View/Users/view.ctp                        |  4 ++--
 16 files changed, 49 insertions(+), 24 deletions(-)
 create mode 100644 app/View/Helper/TimeHelper.php

diff --git a/app/View/AuthKeys/view.ctp b/app/View/AuthKeys/view.ctp
index b2ccacc4e..4ef265df9 100644
--- a/app/View/AuthKeys/view.ctp
+++ b/app/View/AuthKeys/view.ctp
@@ -63,7 +63,7 @@ echo $this->element(
             ],
             [
                 'key' => __('Last used'),
-                'raw' => $lastUsed ? date('Y-m-d H:i:s', $lastUsed) : __('Not used yet'),
+                'raw' => $lastUsed ? $this->Time->time($lastUsed) : __('Not used yet'),
                 'requirement' => isset($keyUsage),
             ],
             [
diff --git a/app/View/Elements/Events/View/seen_field.ctp b/app/View/Elements/Events/View/seen_field.ctp
index 21ec68587..e7755409a 100644
--- a/app/View/Elements/Events/View/seen_field.ctp
+++ b/app/View/Elements/Events/View/seen_field.ctp
@@ -1,7 +1,12 @@
-<?php if ($object['first_seen'] != null || $object['last_seen'] != null): ?>
+<?php
+$time = function ($value) {
+    return $value != null ? $this->Time->time($value) : '<span style="display: block; text-align:center;">_</span>';
+};
+
+if ($object['first_seen'] != null || $object['last_seen'] != null): ?>
     <div>
-        <div><?php echo $object['first_seen'] != null ? h($object['first_seen']) : '<span style="display: block; text-align:center;">_</span>'; ?></div>
+        <div><?= $time($object['first_seen']) ?></div>
         <i style="display: block; text-align: center;" class="fas fa-arrow-down"></i>
-        <div><?php echo $object['last_seen'] != null ? h($object['last_seen']) : '<span style="display: block; text-align:center;">_</span>'; ?></div>
+        <div><?= $time($object['last_seen']) ?></div>
     </div>
 <?php endif ?>
diff --git a/app/View/Elements/Events/View/sighting_field.ctp b/app/View/Elements/Events/View/sighting_field.ctp
index 4ca14d20d..796f6e488 100644
--- a/app/View/Elements/Events/View/sighting_field.ctp
+++ b/app/View/Elements/Events/View/sighting_field.ctp
@@ -9,9 +9,9 @@ if (isset($sightingsData['data'][$objectId])) {
         foreach ($typeData['orgs'] as $org => $orgData) {
             $extra = $org === $me['Organisation']['name'] ? ' class="bold"' : "";
             if ($type == 'expiration') {
-                $html .= '<span' . $extra . '>' . h($org) . '</span>: <span class="orange bold">' . date('Y-m-d H:i:s', $orgData['date']) . '</span><br>';
+                $html .= '<span' . $extra . '>' . h($org) . '</span>: <span class="orange bold">' . $this->Time->time($orgData['date']) . '</span><br>';
             } else {
-                $html .= '<span' . $extra . '>' . h($org) . '</span>: <span class="' . ($type === 'sighting' ? 'green' : 'red') . ' bold">' . h($orgData['count']) . ' (' . date('Y-m-d H:i:s', $orgData['date']) . ')</span><br>';
+                $html .= '<span' . $extra . '>' . h($org) . '</span>: <span class="' . ($type === 'sighting' ? 'green' : 'red') . ' bold">' . h($orgData['count']) . ' (' . $this->Time->time($orgData['date']) . ')</span><br>';
             }
         }
     }
diff --git a/app/View/Elements/Events/View/value_field.ctp b/app/View/Elements/Events/View/value_field.ctp
index f4190d0ca..8f574606b 100644
--- a/app/View/Elements/Events/View/value_field.ctp
+++ b/app/View/Elements/Events/View/value_field.ctp
@@ -70,6 +70,9 @@ switch ($object['type']) {
             }
         }
         break;
+    case 'datetime':
+        echo $this->Time->time($object['value']);
+        break;
 
     case 'vulnerability':
         $cveUrl = Configure::read('MISP.cveurl') ?: 'https://cve.circl.lu/cve/';
diff --git a/app/View/Elements/footer.ctp b/app/View/Elements/footer.ctp
index f1c1945b4..387c8d56f 100644
--- a/app/View/Elements/footer.ctp
+++ b/app/View/Elements/footer.ctp
@@ -29,7 +29,7 @@
                 ?>
             </div>
             <div class="footerText footerCenterText">
-                <span><?php echo h(Configure::read('MISP.footermidleft')); ?> Powered by <a href="https://github.com/MISP/MISP">MISP <?php if (isset($me['id'])) echo h($mispVersionFull);?></a> <?php echo h(Configure::read('MISP.footermidright')); ?> - <?php echo date("Y-m-d H:i:s"); ?></span>
+                <span><?= h(Configure::read('MISP.footermidleft')); ?> Powered by <a href="https://github.com/MISP/MISP" rel="noopener">MISP <?= isset($me['id']) ? h($mispVersionFull) : '' ?></a> <?= h(Configure::read('MISP.footermidright')); ?> - <?= $this->Time->time(time()) ?></span>
             </div>
             <div class="pull-right" style="position:relative;padding-top:9px;z-index:2;">
                 <?php
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/datetime.ctp b/app/View/Elements/genericElements/IndexTable/Fields/datetime.ctp
index dd3d6161d..34d3f3bbf 100644
--- a/app/View/Elements/genericElements/IndexTable/Fields/datetime.ctp
+++ b/app/View/Elements/genericElements/IndexTable/Fields/datetime.ctp
@@ -14,11 +14,7 @@
     if (empty($data) && !empty($field['empty'])) {
         $data = $field['empty'];
     }
-    if (is_numeric($data)) {
-        $data = date('Y-m-d H:i:s', $data);
-    } else {
-        $data = h($data);
-    }
+    $data = $this->Time->time($data);
     if (!empty($field['onClick'])) {
         $data = sprintf(
             '<span onClick="%s">%s</span>',
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/expiration.ctp b/app/View/Elements/genericElements/IndexTable/Fields/expiration.ctp
index 09fbdf8bb..bead323eb 100644
--- a/app/View/Elements/genericElements/IndexTable/Fields/expiration.ctp
+++ b/app/View/Elements/genericElements/IndexTable/Fields/expiration.ctp
@@ -23,7 +23,7 @@
                 $diffInDays = floor(($data - time()) / (3600 * 24));
                 $class = $diffInDays <= 14 ? 'text-warning bold' : 'text-success';
                 $title = __n('Will expire in %s day', 'Will expire in %s days', $diffInDays, $diffInDays);
-                $data = '<span class="' . $class . '" title="' . $title . '">' . date('Y-m-d H:i:s', $data) . '</span>';
+                $data = '<span class="' . $class . '" title="' . $title . '">' . $this->Time->time($data) . '</span>';
             }
         }
     }
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/datetimeField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/datetimeField.ctp
index 2a3abe55f..1e876b578 100644
--- a/app/View/Elements/genericElements/SingleViews/Fields/datetimeField.ctp
+++ b/app/View/Elements/genericElements/SingleViews/Fields/datetimeField.ctp
@@ -1,3 +1,3 @@
 <?php
     $value = Hash::extract($data, $field['path'])[0];
-    echo date('Y-m-d H:i:s', $value);
+    echo $this->Time->time($value);
diff --git a/app/View/EventReports/view.ctp b/app/View/EventReports/view.ctp
index e2fe49cf8..7b5e4e5aa 100644
--- a/app/View/EventReports/view.ctp
+++ b/app/View/EventReports/view.ctp
@@ -19,7 +19,10 @@
                 h($distributionLevels[$report['EventReport']['distribution']])
     );
 
-    $table_data[] = array('key' => __('Last update'), 'value' => date('Y-m-d H:i:s', $report['EventReport']['timestamp']));
+    $table_data[] = array(
+        'key' => __('Last update'),
+        'html' => $this->Time->time($report['EventReport']['timestamp']),
+    );
     if ($report['EventReport']['deleted']) {
         $table_data[] = array(
             'key' => __('Deleted'),
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index e561eaec7..3355a9a11 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -172,11 +172,11 @@
         );
         $table_data[] = array(
             'key' => __('First recorded change'),
-            'value' => (!$oldest_timestamp) ? '' : date('Y-m-d H:i:s', $oldest_timestamp)
+            'html' => !$oldest_timestamp ? '' : $this->Time->time($oldest_timestamp),
         );
         $table_data[] = array(
             'key' => __('Last change'),
-            'value' => date('Y-m-d H:i:s', $event['Event']['timestamp'])
+            'html' => $this->Time->time($event['Event']['timestamp']),
         );
         $table_data[] = array(
             'key' => __('Modification map'),
diff --git a/app/View/Helper/TimeHelper.php b/app/View/Helper/TimeHelper.php
new file mode 100644
index 000000000..a2e25e6ba
--- /dev/null
+++ b/app/View/Helper/TimeHelper.php
@@ -0,0 +1,18 @@
+<?php
+App::uses('AppHelper', 'View/Helper');
+
+class TimeHelper extends AppHelper
+{
+    public function time($time)
+    {
+        if (empty($time)) {
+            return '';
+        }
+        if (is_numeric($time)) {
+            $time = date('Y-m-d H:i:s', $time);
+        }
+
+        $time = h($time);
+        return '<time>' . $time . '</time>';
+    }
+}
diff --git a/app/View/Jobs/index.ctp b/app/View/Jobs/index.ctp
index 87d25dea0..fd1fd4b30 100644
--- a/app/View/Jobs/index.ctp
+++ b/app/View/Jobs/index.ctp
@@ -127,8 +127,8 @@
 ?>
         <tr>
             <td class="short"><?php echo h($item['Job']['id']); ?>&nbsp;</td>
-            <td class="short"><?php echo h($item['Job']['date_created']); ?>&nbsp;</td>
-            <td class="short"><?php echo h($item['Job']['date_modified']); ?>&nbsp;</td>
+            <td class="short"><?= $this->Time->time($item['Job']['date_created']) ?></td>
+            <td class="short"><?= $this->Time->time($item['Job']['date_modified']) ?></td>
             <td class="short"><?php echo h($item['Job']['process_id']); ?>&nbsp;</td>
             <td class="short"><?php echo h($item['Job']['worker']); ?>&nbsp;</td>
             <td class="short"><?php echo h($item['Job']['job_type']); ?>&nbsp;</td>
diff --git a/app/View/Logs/admin_index.ctp b/app/View/Logs/admin_index.ctp
index 6ef309430..64345af8e 100644
--- a/app/View/Logs/admin_index.ctp
+++ b/app/View/Logs/admin_index.ctp
@@ -87,7 +87,7 @@
             <td class="short"><?php
                 if (isset($orgSearch) && $orgSearch != null) echo nl2br($this->Highlight->highlighter(h($item['Log']['org']), $orgSearchReplacePairs));
                 else echo (h($item['Log']['org'])); ?>&nbsp;</td>
-            <td class="short"><?php echo h($item['Log']['created']); ?>&nbsp;</td>
+            <td class="short"><?= $this->Time->time($item['Log']['created']) ?>&nbsp;</td>
             <td class="short"><?php
                 if (isset($modelSearch) && $modelSearch != null) echo nl2br($this->Highlight->highlighter(h($item['Log']['model']), $modelSearchReplacePairs));
                 else echo (h($item['Log']['model'])); ?>&nbsp;</td>
diff --git a/app/View/News/index.ctp b/app/View/News/index.ctp
index 62ce332c7..6b9c8b698 100644
--- a/app/View/News/index.ctp
+++ b/app/View/News/index.ctp
@@ -9,7 +9,7 @@
                             <div class="templateGlass"></div>
                             <div class ="templateElementHeaderText" style="width:100%;">
                                 <div style="float:left;width:83%;"><?php echo $newsItem['User']['email'] ? h($newsItem['User']['email']) : 'Administrator'; ?></div>
-                                <div style="float:left;width:17%;"><?php echo date('Y-m-d H:i:s', $newsItem['News']['date_created']); ?></div>
+                                <div style="float:left;width:17%;"><?= $this->Time->time($newsItem['News']['date_created']); ?></div>
                             </div>
                         </div>
                         <div style="padding:6px;">
diff --git a/app/View/Sightings/ajax/list_sightings.ctp b/app/View/Sightings/ajax/list_sightings.ctp
index 1557d0ab5..5bf626c10 100644
--- a/app/View/Sightings/ajax/list_sightings.ctp
+++ b/app/View/Sightings/ajax/list_sightings.ctp
@@ -18,7 +18,7 @@ $deleteSightingTitle = __('Delete sighting');
     foreach ($sightings as $item):
 ?>
     <tr>
-        <td class="short"><?php echo date('Y-m-d H:i:s', $item['Sighting']['date_sighting']);?></td>
+        <td class="short"><?= $this->Time->time($item['Sighting']['date_sighting']) ?></td>
         <td class="short">
           <?php if ($item['Organisation']['name']) {
               echo $this->OrgImg->getOrgImg(array('name' => $item['Organisation']['name'], 'id' => $item['Sighting']['org_id'], 'size' => 24));
diff --git a/app/View/Users/view.ctp b/app/View/Users/view.ctp
index 2cb36ca17..c29807d9f 100755
--- a/app/View/Users/view.ctp
+++ b/app/View/Users/view.ctp
@@ -102,12 +102,12 @@
     }
     $table_data[] = array(
         'key' => __('Created'),
-        'value' => $user['User']['date_created'] ? date('Y-m-d H:i:s', $user['User']['date_created']) : __('N/A')
+        'value' => $user['User']['date_created'] ? $this->Time->time($user['User']['date_created']) : __('N/A')
     );
     if ($admin_view) {
         $table_data[] = array(
             'key' => __('News read at'),
-            'value' => $user['User']['newsread'] ? date('Y-m-d H:i:s', $user['User']['newsread']) : __('N/A')
+            'value' => $user['User']['newsread'] ? $this->Time->time($user['User']['newsread']) : __('N/A')
         );
         $table_data[] = array(
             'key' => __('Disabled'),

From 6963875a33f5deff3cac3e2708f542083a1517ca Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 9 Feb 2021 16:07:01 +0100
Subject: [PATCH 089/437] chg: [internal] Update composer to 2.0.9

---
 app/composer.json |   3 ++-
 app/composer.phar | Bin 1995208 -> 2205196 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/composer.json b/app/composer.json
index 0a2941e15..ac492b7f4 100644
--- a/app/composer.json
+++ b/app/composer.json
@@ -32,6 +32,7 @@
         "aws/aws-sdk-php": "To upload samples to S3"
     },
     "config": {
-        "vendor-dir": "Vendor"
+        "vendor-dir": "Vendor",
+        "optimize-autoloader": true
     }
 }
diff --git a/app/composer.phar b/app/composer.phar
index 2eabe229f1ad2e8085e610f2a67cd2d60f0b3414..3791ce36ed26e033e485226ed288050ead25032b 100644
GIT binary patch
delta 303788
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
H#LE8y5KG}?

delta 155458
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
QHL3AG69WT-JFq1V0HS5aW&i*H


From 241367dd8bdd6360bc32b193b1a69b39a2d8dd24 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 9 Feb 2021 20:09:40 +0100
Subject: [PATCH 090/437] fix: [UI] Remove right margin from form seen input

---
 app/View/Elements/form_seen_input.ctp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/View/Elements/form_seen_input.ctp b/app/View/Elements/form_seen_input.ctp
index ab48006c9..5981d4473 100644
--- a/app/View/Elements/form_seen_input.ctp
+++ b/app/View/Elements/form_seen_input.ctp
@@ -49,22 +49,22 @@ $(function() {
     var $sliders_container = $("#bothSeenSliderContainer");
     var inputs_container = $('<div class="input-group input-daterange"></div>');
     // create separate date and time input
-    var date_div_fs = $('<div class="input clear" style="width: 257px"></div>').append(
+    var date_div_fs = $('<div class="input clear" style="width: 257px; margin-right: 0"></div>').append(
         $('<label><?php echo __('First seen date') . '<span class="fas fa-calendar label-icon"></span>'; ?><input id="date_fs" type="text" style="width: 240px;"></input></label>')
     );
     $(inputs_container).append(date_div_fs);
-    var date_div_ls = $('<div class="input text" style="width: 257px"></div>').append(
+    var date_div_ls = $('<div class="input text" style="width: 257px; margin-right: 0"></div>').append(
         $('<label><?php echo __('Last seen date') . '<span class="fas fa-calendar label-icon"></span>'; ?><input id="date_ls" type="text" style="width: 240px;"></input></label>')
     );
     $(inputs_container).append(date_div_ls);
     $sliders_container.append(inputs_container);
 
-    var time_div_fs = $('<div class="input clear" style="width: 257px"></div>').append(
+    var time_div_fs = $('<div class="input clear" style="width: 257px; margin-right: 0"></div>').append(
         $('<label><?php echo __('First seen time') . '<span class="fas fa-clock label-icon"></span>'; ?><input id="time_fs" type="text" style="width: 240px; text-align: center; margin-bottom: 0px" placeholder="HH:MM:SS.ssssss+TT:TT"></input></label>'),
         $('<span class="apply_css_arrow"></span>').text('<?php echo __('Expected format: HH:MM:SS.ssssss+TT:TT') ?>')
     );
     $sliders_container.append(time_div_fs);
-    var time_div_ls = $('<div class="input" style="width: 257px"></div>').append(
+    var time_div_ls = $('<div class="input" style="width: 257px; margin-right: 0"></div>').append(
         $('<label><?php echo __('Last seen time') . '<span class="fas fa-clock label-icon"></span>'; ?><input id="time_ls" type="text" style="width: 240px; text-align: center; margin-bottom: 0px" placeholder="HH:MM:SS.ssssss+TT:TT"></input></label>'),
         $('<span class="apply_css_arrow"></span>').text('<?php echo __('Expected format: HH:MM:SS.ssssss+TT:TT') ?>')
     );

From a70aa9c392998e08e618237dfb28df212ad127f4 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 9 Feb 2021 21:36:36 +0100
Subject: [PATCH 091/437] fix: [feed] Feed name is required

---
 app/Model/Feed.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Model/Feed.php b/app/Model/Feed.php
index e94d481ab..0b149c646 100644
--- a/app/Model/Feed.php
+++ b/app/Model/Feed.php
@@ -32,7 +32,10 @@ class Feed extends AppModel
             'rule' => array('urlOrExistingFilepath')
         ),
         'provider' => 'valueNotEmpty',
-        'name' => 'valueNotEmpty',
+        'name' => [
+            'rule' => 'valueNotEmpty',
+            'required' => true,
+        ],
         'event_id' => array(
             'rule' => array('numeric'),
             'message' => 'Please enter a numeric event ID or leave this field blank.',

From d59d28eb7688582afc0c44ce3dceab52ab0cd12e Mon Sep 17 00:00:00 2001
From: Tom King <tom.king2@baesystems.com>
Date: Wed, 10 Feb 2021 09:19:34 +0000
Subject: [PATCH 092/437] fix: Elasticsearch complains when an IP is an empty
 string

---
 app/Lib/Tools/ElasticSearchClient.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Lib/Tools/ElasticSearchClient.php b/app/Lib/Tools/ElasticSearchClient.php
index f353f589b..6644e3f2d 100644
--- a/app/Lib/Tools/ElasticSearchClient.php
+++ b/app/Lib/Tools/ElasticSearchClient.php
@@ -40,6 +40,9 @@ class ElasticSearchClient
         // Format timestamp
         $time = strftime("%Y-%m-%d %H:%M:%S", strtotime($document["Log"]["created"]));
         $document["Log"]["created"] = $time;
+        if (empty($document["Log"]["ip"])) {
+            $document["Log"]["ip"] = null;
+        }
         $params = array(
             'index' => $index,
             'type' => $document_type,

From 74e0a9ff55e775778d923de05602855a66b92f4c Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 10 Feb 2021 10:38:49 +0100
Subject: [PATCH 093/437] fix: [generic_picker] Improved perfs by adding a
 debounce for redrawing results

---
 app/View/Elements/generic_picker.ctp | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/View/Elements/generic_picker.ctp b/app/View/Elements/generic_picker.ctp
index e0c223357..9ced1bae5 100644
--- a/app/View/Elements/generic_picker.ctp
+++ b/app/View/Elements/generic_picker.ctp
@@ -22,7 +22,8 @@
         'functionName' => '', // function to be called on submit
         'submitButtonText' => 'Submit',
         'disabledSubmitButton' => false, // wether to not draw the submit button
-        'flag_redraw_chosen' => false // should chosen picker be redraw at drawing time
+        'flag_redraw_chosen' => false, // should chosen picker be redraw at drawing time
+        'redraw_debounce_time' => 200,
     );
     /**
     * Supported default option in <Option> fields:
@@ -98,11 +99,11 @@ function setupChosen(id, redrawChosen) {
     // hack to add template into the div
     var $chosenContainer = $elem.parent().find('.chosen-container');
     $elem.on('chosen:searchdone chosen:picked keyup change', function(e) {
-        redrawChosenWithTemplate($elem, $chosenContainer, e.type)
+        redrawChosenWithTemplateDebounced(true, $elem, $chosenContainer, e.type)
     });
 
     if (redrawChosen) {
-        redrawChosenWithTemplate($elem, $chosenContainer);
+        redrawChosenWithTemplateDebounced(false, $elem, $chosenContainer);
     }
 
     if ($elem.prop('multiple')) {
@@ -112,6 +113,23 @@ function setupChosen(id, redrawChosen) {
     }
 }
 
+var debounceTimer;
+function redrawChosenWithTemplateDebounced(useDebounce, $select, $chosenContainer, eventType) {
+    if (useDebounce) {
+        clearTimeout(debounceTimer);
+        var timerValue = <?= $defaults['redraw_debounce_time'] ?>;
+        var resultCount = $select.data('chosen').search_results.children().length;
+        if (resultCount <= 20) {
+            timerValue = 0
+        }
+        debounceTimer = setTimeout(function() {
+            redrawChosenWithTemplate($select, $chosenContainer, eventType);
+        }, timerValue);
+    } else {
+        redrawChosenWithTemplate($select, $chosenContainer, eventType);
+    }
+}
+
 function redrawChosenWithTemplate($select, $chosenContainer, eventType) {
     var optionLength = $select.find('option').length;
     if (optionLength > 1000) {

From 362330d977add043312b36dff85730034b1b523d Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 10 Feb 2021 10:50:36 +0100
Subject: [PATCH 094/437] chg: [internal] Update moment javascript library

---
 app/View/Elements/form_seen_input.ctp         |     3 +-
 .../markdownEditor/markdownEditor.ctp         |     4 +-
 app/View/Elements/view_timeline.ctp           |     2 +-
 app/View/Events/view.ctp                      |     2 +-
 app/View/Servers/rest.ctp                     |     2 +-
 app/webroot/js/moment-with-locales.js         | 14492 ----------------
 app/webroot/js/moment.min.js                  |     2 +
 app/webroot/js/moment.min.js.map              |     1 +
 8 files changed, 9 insertions(+), 14499 deletions(-)
 delete mode 100644 app/webroot/js/moment-with-locales.js
 create mode 100644 app/webroot/js/moment.min.js
 create mode 100644 app/webroot/js/moment.min.js.map

diff --git a/app/View/Elements/form_seen_input.ctp b/app/View/Elements/form_seen_input.ctp
index ab48006c9..1dee6598c 100644
--- a/app/View/Elements/form_seen_input.ctp
+++ b/app/View/Elements/form_seen_input.ctp
@@ -1,5 +1,4 @@
-<?php echo $this->Html->script('moment-with-locales'); ?>
-
+<?= $this->Html->script('moment.min'); ?>
 <script>
 <?php
     $temp = explode('_', $this->params->controller);
diff --git a/app/View/Elements/markdownEditor/markdownEditor.ctp b/app/View/Elements/markdownEditor/markdownEditor.ctp
index ea898d8dd..8bdd92608 100644
--- a/app/View/Elements/markdownEditor/markdownEditor.ctp
+++ b/app/View/Elements/markdownEditor/markdownEditor.ctp
@@ -201,7 +201,7 @@
     if ($canEdit) {
         echo $this->element('genericElements/assetLoader', array(
             'js' => array(
-                'moment-with-locales',
+                'moment.min',
                 'codemirror/codemirror',
                 'codemirror/modes/markdown',
                 'codemirror/addons/simplescrollbars',
@@ -221,4 +221,4 @@
     if (!empty($additionalMarkdownElements)) {
         echo $this->element($additionalMarkdownElements['path'], $additionalMarkdownElements['variables']);
     }
-?>
+
diff --git a/app/View/Elements/view_timeline.ctp b/app/View/Elements/view_timeline.ctp
index 87ea4ead7..5c30a1a6a 100644
--- a/app/View/Elements/view_timeline.ctp
+++ b/app/View/Elements/view_timeline.ctp
@@ -27,7 +27,7 @@
 </div>
 
 <?php
-    echo $this->Html->script('moment-with-locales');
+    echo $this->Html->script('moment.min');
     echo $this->Html->script('event-timeline');
     echo $this->Html->css('event-timeline');
 ?>
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index e561eaec7..bf2c8a4f9 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -5,7 +5,7 @@
     echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'viewEvent', 'mayModify' => $mayModify, 'mayPublish' => $mayPublish));
     echo $this->Html->script('doT');
     echo $this->Html->script('extendext');
-    echo $this->Html->script('moment-with-locales');
+    echo $this->Html->script('moment.min');
     echo $this->Html->css('query-builder.default');
     echo $this->Html->script('query-builder');
     echo $this->Html->css('attack_matrix');
diff --git a/app/View/Servers/rest.ctp b/app/View/Servers/rest.ctp
index 9e29745a7..61d86edc6 100644
--- a/app/View/Servers/rest.ctp
+++ b/app/View/Servers/rest.ctp
@@ -192,7 +192,7 @@
     echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'rest'));
     echo $this->element('genericElements/assetLoader', array(
         'js' => array(
-            'moment-with-locales',
+            'moment.min',
             'extendext',
             'doT',
             'query-builder',
diff --git a/app/webroot/js/moment-with-locales.js b/app/webroot/js/moment-with-locales.js
deleted file mode 100644
index 61ff67408..000000000
--- a/app/webroot/js/moment-with-locales.js
+++ /dev/null
@@ -1,14492 +0,0 @@
-;(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-    typeof define === 'function' && define.amd ? define(factory) :
-    global.moment = factory()
-}(this, (function () { 'use strict';
-
-    var hookCallback;
-
-    function hooks () {
-        return hookCallback.apply(null, arguments);
-    }
-
-    // This is done to register the method called with moment()
-    // without creating circular dependencies.
-    function setHookCallback (callback) {
-        hookCallback = callback;
-    }
-
-    function isArray(input) {
-        return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';
-    }
-
-    function isObject(input) {
-        // IE8 will treat undefined and null as object if it wasn't for
-        // input != null
-        return input != null && Object.prototype.toString.call(input) === '[object Object]';
-    }
-
-    function isObjectEmpty(obj) {
-        if (Object.getOwnPropertyNames) {
-            return (Object.getOwnPropertyNames(obj).length === 0);
-        } else {
-            var k;
-            for (k in obj) {
-                if (obj.hasOwnProperty(k)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    }
-
-    function isUndefined(input) {
-        return input === void 0;
-    }
-
-    function isNumber(input) {
-        return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]';
-    }
-
-    function isDate(input) {
-        return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
-    }
-
-    function map(arr, fn) {
-        var res = [], i;
-        for (i = 0; i < arr.length; ++i) {
-            res.push(fn(arr[i], i));
-        }
-        return res;
-    }
-
-    function hasOwnProp(a, b) {
-        return Object.prototype.hasOwnProperty.call(a, b);
-    }
-
-    function extend(a, b) {
-        for (var i in b) {
-            if (hasOwnProp(b, i)) {
-                a[i] = b[i];
-            }
-        }
-
-        if (hasOwnProp(b, 'toString')) {
-            a.toString = b.toString;
-        }
-
-        if (hasOwnProp(b, 'valueOf')) {
-            a.valueOf = b.valueOf;
-        }
-
-        return a;
-    }
-
-    function createUTC (input, format, locale, strict) {
-        return createLocalOrUTC(input, format, locale, strict, true).utc();
-    }
-
-    function defaultParsingFlags() {
-        // We need to deep clone this object.
-        return {
-            empty           : false,
-            unusedTokens    : [],
-            unusedInput     : [],
-            overflow        : -2,
-            charsLeftOver   : 0,
-            nullInput       : false,
-            invalidMonth    : null,
-            invalidFormat   : false,
-            userInvalidated : false,
-            iso             : false,
-            parsedDateParts : [],
-            meridiem        : null,
-            rfc2822         : false,
-            weekdayMismatch : false
-        };
-    }
-
-    function getParsingFlags(m) {
-        if (m._pf == null) {
-            m._pf = defaultParsingFlags();
-        }
-        return m._pf;
-    }
-
-    var some;
-    if (Array.prototype.some) {
-        some = Array.prototype.some;
-    } else {
-        some = function (fun) {
-            var t = Object(this);
-            var len = t.length >>> 0;
-
-            for (var i = 0; i < len; i++) {
-                if (i in t && fun.call(this, t[i], i, t)) {
-                    return true;
-                }
-            }
-
-            return false;
-        };
-    }
-
-    function isValid(m) {
-        if (m._isValid == null) {
-            var flags = getParsingFlags(m);
-            var parsedParts = some.call(flags.parsedDateParts, function (i) {
-                return i != null;
-            });
-            var isNowValid = !isNaN(m._d.getTime()) &&
-                flags.overflow < 0 &&
-                !flags.empty &&
-                !flags.invalidMonth &&
-                !flags.invalidWeekday &&
-                !flags.weekdayMismatch &&
-                !flags.nullInput &&
-                !flags.invalidFormat &&
-                !flags.userInvalidated &&
-                (!flags.meridiem || (flags.meridiem && parsedParts));
-
-            if (m._strict) {
-                isNowValid = isNowValid &&
-                    flags.charsLeftOver === 0 &&
-                    flags.unusedTokens.length === 0 &&
-                    flags.bigHour === undefined;
-            }
-
-            if (Object.isFrozen == null || !Object.isFrozen(m)) {
-                m._isValid = isNowValid;
-            }
-            else {
-                return isNowValid;
-            }
-        }
-        return m._isValid;
-    }
-
-    function createInvalid (flags) {
-        var m = createUTC(NaN);
-        if (flags != null) {
-            extend(getParsingFlags(m), flags);
-        }
-        else {
-            getParsingFlags(m).userInvalidated = true;
-        }
-
-        return m;
-    }
-
-    // Plugins that add properties should also add the key here (null value),
-    // so we can properly clone ourselves.
-    var momentProperties = hooks.momentProperties = [];
-
-    function copyConfig(to, from) {
-        var i, prop, val;
-
-        if (!isUndefined(from._isAMomentObject)) {
-            to._isAMomentObject = from._isAMomentObject;
-        }
-        if (!isUndefined(from._i)) {
-            to._i = from._i;
-        }
-        if (!isUndefined(from._f)) {
-            to._f = from._f;
-        }
-        if (!isUndefined(from._l)) {
-            to._l = from._l;
-        }
-        if (!isUndefined(from._strict)) {
-            to._strict = from._strict;
-        }
-        if (!isUndefined(from._tzm)) {
-            to._tzm = from._tzm;
-        }
-        if (!isUndefined(from._isUTC)) {
-            to._isUTC = from._isUTC;
-        }
-        if (!isUndefined(from._offset)) {
-            to._offset = from._offset;
-        }
-        if (!isUndefined(from._pf)) {
-            to._pf = getParsingFlags(from);
-        }
-        if (!isUndefined(from._locale)) {
-            to._locale = from._locale;
-        }
-
-        if (momentProperties.length > 0) {
-            for (i = 0; i < momentProperties.length; i++) {
-                prop = momentProperties[i];
-                val = from[prop];
-                if (!isUndefined(val)) {
-                    to[prop] = val;
-                }
-            }
-        }
-
-        return to;
-    }
-
-    var updateInProgress = false;
-
-    // Moment prototype object
-    function Moment(config) {
-        copyConfig(this, config);
-        this._d = new Date(config._d != null ? config._d.getTime() : NaN);
-        if (!this.isValid()) {
-            this._d = new Date(NaN);
-        }
-        // Prevent infinite loop in case updateOffset creates new moment
-        // objects.
-        if (updateInProgress === false) {
-            updateInProgress = true;
-            hooks.updateOffset(this);
-            updateInProgress = false;
-        }
-    }
-
-    function isMoment (obj) {
-        return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
-    }
-
-    function absFloor (number) {
-        if (number < 0) {
-            // -0 -> 0
-            return Math.ceil(number) || 0;
-        } else {
-            return Math.floor(number);
-        }
-    }
-
-    function toInt(argumentForCoercion) {
-        var coercedNumber = +argumentForCoercion,
-            value = 0;
-
-        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
-            value = absFloor(coercedNumber);
-        }
-
-        return value;
-    }
-
-    // compare two arrays, return the number of differences
-    function compareArrays(array1, array2, dontConvert) {
-        var len = Math.min(array1.length, array2.length),
-            lengthDiff = Math.abs(array1.length - array2.length),
-            diffs = 0,
-            i;
-        for (i = 0; i < len; i++) {
-            if ((dontConvert && array1[i] !== array2[i]) ||
-                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
-                diffs++;
-            }
-        }
-        return diffs + lengthDiff;
-    }
-
-    function warn(msg) {
-        if (hooks.suppressDeprecationWarnings === false &&
-                (typeof console !==  'undefined') && console.warn) {
-            console.warn('Deprecation warning: ' + msg);
-        }
-    }
-
-    function deprecate(msg, fn) {
-        var firstTime = true;
-
-        return extend(function () {
-            if (hooks.deprecationHandler != null) {
-                hooks.deprecationHandler(null, msg);
-            }
-            if (firstTime) {
-                var args = [];
-                var arg;
-                for (var i = 0; i < arguments.length; i++) {
-                    arg = '';
-                    if (typeof arguments[i] === 'object') {
-                        arg += '\n[' + i + '] ';
-                        for (var key in arguments[0]) {
-                            arg += key + ': ' + arguments[0][key] + ', ';
-                        }
-                        arg = arg.slice(0, -2); // Remove trailing comma and space
-                    } else {
-                        arg = arguments[i];
-                    }
-                    args.push(arg);
-                }
-                warn(msg + '\nArguments: ' + Array.prototype.slice.call(args).join('') + '\n' + (new Error()).stack);
-                firstTime = false;
-            }
-            return fn.apply(this, arguments);
-        }, fn);
-    }
-
-    var deprecations = {};
-
-    function deprecateSimple(name, msg) {
-        if (hooks.deprecationHandler != null) {
-            hooks.deprecationHandler(name, msg);
-        }
-        if (!deprecations[name]) {
-            warn(msg);
-            deprecations[name] = true;
-        }
-    }
-
-    hooks.suppressDeprecationWarnings = false;
-    hooks.deprecationHandler = null;
-
-    function isFunction(input) {
-        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
-    }
-
-    function set (config) {
-        var prop, i;
-        for (i in config) {
-            prop = config[i];
-            if (isFunction(prop)) {
-                this[i] = prop;
-            } else {
-                this['_' + i] = prop;
-            }
-        }
-        this._config = config;
-        // Lenient ordinal parsing accepts just a number in addition to
-        // number + (possibly) stuff coming from _dayOfMonthOrdinalParse.
-        // TODO: Remove "ordinalParse" fallback in next major release.
-        this._dayOfMonthOrdinalParseLenient = new RegExp(
-            (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) +
-                '|' + (/\d{1,2}/).source);
-    }
-
-    function mergeConfigs(parentConfig, childConfig) {
-        var res = extend({}, parentConfig), prop;
-        for (prop in childConfig) {
-            if (hasOwnProp(childConfig, prop)) {
-                if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {
-                    res[prop] = {};
-                    extend(res[prop], parentConfig[prop]);
-                    extend(res[prop], childConfig[prop]);
-                } else if (childConfig[prop] != null) {
-                    res[prop] = childConfig[prop];
-                } else {
-                    delete res[prop];
-                }
-            }
-        }
-        for (prop in parentConfig) {
-            if (hasOwnProp(parentConfig, prop) &&
-                    !hasOwnProp(childConfig, prop) &&
-                    isObject(parentConfig[prop])) {
-                // make sure changes to properties don't modify parent config
-                res[prop] = extend({}, res[prop]);
-            }
-        }
-        return res;
-    }
-
-    function Locale(config) {
-        if (config != null) {
-            this.set(config);
-        }
-    }
-
-    var keys;
-
-    if (Object.keys) {
-        keys = Object.keys;
-    } else {
-        keys = function (obj) {
-            var i, res = [];
-            for (i in obj) {
-                if (hasOwnProp(obj, i)) {
-                    res.push(i);
-                }
-            }
-            return res;
-        };
-    }
-
-    var defaultCalendar = {
-        sameDay : '[Today at] LT',
-        nextDay : '[Tomorrow at] LT',
-        nextWeek : 'dddd [at] LT',
-        lastDay : '[Yesterday at] LT',
-        lastWeek : '[Last] dddd [at] LT',
-        sameElse : 'L'
-    };
-
-    function calendar (key, mom, now) {
-        var output = this._calendar[key] || this._calendar['sameElse'];
-        return isFunction(output) ? output.call(mom, now) : output;
-    }
-
-    var defaultLongDateFormat = {
-        LTS  : 'h:mm:ss A',
-        LT   : 'h:mm A',
-        L    : 'MM/DD/YYYY',
-        LL   : 'MMMM D, YYYY',
-        LLL  : 'MMMM D, YYYY h:mm A',
-        LLLL : 'dddd, MMMM D, YYYY h:mm A'
-    };
-
-    function longDateFormat (key) {
-        var format = this._longDateFormat[key],
-            formatUpper = this._longDateFormat[key.toUpperCase()];
-
-        if (format || !formatUpper) {
-            return format;
-        }
-
-        this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) {
-            return val.slice(1);
-        });
-
-        return this._longDateFormat[key];
-    }
-
-    var defaultInvalidDate = 'Invalid date';
-
-    function invalidDate () {
-        return this._invalidDate;
-    }
-
-    var defaultOrdinal = '%d';
-    var defaultDayOfMonthOrdinalParse = /\d{1,2}/;
-
-    function ordinal (number) {
-        return this._ordinal.replace('%d', number);
-    }
-
-    var defaultRelativeTime = {
-        future : 'in %s',
-        past   : '%s ago',
-        s  : 'a few seconds',
-        ss : '%d seconds',
-        m  : 'a minute',
-        mm : '%d minutes',
-        h  : 'an hour',
-        hh : '%d hours',
-        d  : 'a day',
-        dd : '%d days',
-        M  : 'a month',
-        MM : '%d months',
-        y  : 'a year',
-        yy : '%d years'
-    };
-
-    function relativeTime (number, withoutSuffix, string, isFuture) {
-        var output = this._relativeTime[string];
-        return (isFunction(output)) ?
-            output(number, withoutSuffix, string, isFuture) :
-            output.replace(/%d/i, number);
-    }
-
-    function pastFuture (diff, output) {
-        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
-        return isFunction(format) ? format(output) : format.replace(/%s/i, output);
-    }
-
-    var aliases = {};
-
-    function addUnitAlias (unit, shorthand) {
-        var lowerCase = unit.toLowerCase();
-        aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
-    }
-
-    function normalizeUnits(units) {
-        return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
-    }
-
-    function normalizeObjectUnits(inputObject) {
-        var normalizedInput = {},
-            normalizedProp,
-            prop;
-
-        for (prop in inputObject) {
-            if (hasOwnProp(inputObject, prop)) {
-                normalizedProp = normalizeUnits(prop);
-                if (normalizedProp) {
-                    normalizedInput[normalizedProp] = inputObject[prop];
-                }
-            }
-        }
-
-        return normalizedInput;
-    }
-
-    var priorities = {};
-
-    function addUnitPriority(unit, priority) {
-        priorities[unit] = priority;
-    }
-
-    function getPrioritizedUnits(unitsObj) {
-        var units = [];
-        for (var u in unitsObj) {
-            units.push({unit: u, priority: priorities[u]});
-        }
-        units.sort(function (a, b) {
-            return a.priority - b.priority;
-        });
-        return units;
-    }
-
-    function zeroFill(number, targetLength, forceSign) {
-        var absNumber = '' + Math.abs(number),
-            zerosToFill = targetLength - absNumber.length,
-            sign = number >= 0;
-        return (sign ? (forceSign ? '+' : '') : '-') +
-            Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;
-    }
-
-    var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
-
-    var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
-
-    var formatFunctions = {};
-
-    var formatTokenFunctions = {};
-
-    // token:    'M'
-    // padded:   ['MM', 2]
-    // ordinal:  'Mo'
-    // callback: function () { this.month() + 1 }
-    function addFormatToken (token, padded, ordinal, callback) {
-        var func = callback;
-        if (typeof callback === 'string') {
-            func = function () {
-                return this[callback]();
-            };
-        }
-        if (token) {
-            formatTokenFunctions[token] = func;
-        }
-        if (padded) {
-            formatTokenFunctions[padded[0]] = function () {
-                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
-            };
-        }
-        if (ordinal) {
-            formatTokenFunctions[ordinal] = function () {
-                return this.localeData().ordinal(func.apply(this, arguments), token);
-            };
-        }
-    }
-
-    function removeFormattingTokens(input) {
-        if (input.match(/\[[\s\S]/)) {
-            return input.replace(/^\[|\]$/g, '');
-        }
-        return input.replace(/\\/g, '');
-    }
-
-    function makeFormatFunction(format) {
-        var array = format.match(formattingTokens), i, length;
-
-        for (i = 0, length = array.length; i < length; i++) {
-            if (formatTokenFunctions[array[i]]) {
-                array[i] = formatTokenFunctions[array[i]];
-            } else {
-                array[i] = removeFormattingTokens(array[i]);
-            }
-        }
-
-        return function (mom) {
-            var output = '', i;
-            for (i = 0; i < length; i++) {
-                output += isFunction(array[i]) ? array[i].call(mom, format) : array[i];
-            }
-            return output;
-        };
-    }
-
-    // format date using native date object
-    function formatMoment(m, format) {
-        if (!m.isValid()) {
-            return m.localeData().invalidDate();
-        }
-
-        format = expandFormat(format, m.localeData());
-        formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);
-
-        return formatFunctions[format](m);
-    }
-
-    function expandFormat(format, locale) {
-        var i = 5;
-
-        function replaceLongDateFormatTokens(input) {
-            return locale.longDateFormat(input) || input;
-        }
-
-        localFormattingTokens.lastIndex = 0;
-        while (i >= 0 && localFormattingTokens.test(format)) {
-            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
-            localFormattingTokens.lastIndex = 0;
-            i -= 1;
-        }
-
-        return format;
-    }
-
-    var match1         = /\d/;            //       0 - 9
-    var match2         = /\d\d/;          //      00 - 99
-    var match3         = /\d{3}/;         //     000 - 999
-    var match4         = /\d{4}/;         //    0000 - 9999
-    var match6         = /[+-]?\d{6}/;    // -999999 - 999999
-    var match1to2      = /\d\d?/;         //       0 - 99
-    var match3to4      = /\d\d\d\d?/;     //     999 - 9999
-    var match5to6      = /\d\d\d\d\d\d?/; //   99999 - 999999
-    var match1to3      = /\d{1,3}/;       //       0 - 999
-    var match1to4      = /\d{1,4}/;       //       0 - 9999
-    var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
-
-    var matchUnsigned  = /\d+/;           //       0 - inf
-    var matchSigned    = /[+-]?\d+/;      //    -inf - inf
-
-    var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
-    var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z
-
-    var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
-
-    // any word (or two) characters or numbers including two/three word month in arabic.
-    // includes scottish gaelic two word and hyphenated months
-    var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;
-
-    var regexes = {};
-
-    function addRegexToken (token, regex, strictRegex) {
-        regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) {
-            return (isStrict && strictRegex) ? strictRegex : regex;
-        };
-    }
-
-    function getParseRegexForToken (token, config) {
-        if (!hasOwnProp(regexes, token)) {
-            return new RegExp(unescapeFormat(token));
-        }
-
-        return regexes[token](config._strict, config._locale);
-    }
-
-    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
-    function unescapeFormat(s) {
-        return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
-            return p1 || p2 || p3 || p4;
-        }));
-    }
-
-    function regexEscape(s) {
-        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-    }
-
-    var tokens = {};
-
-    function addParseToken (token, callback) {
-        var i, func = callback;
-        if (typeof token === 'string') {
-            token = [token];
-        }
-        if (isNumber(callback)) {
-            func = function (input, array) {
-                array[callback] = toInt(input);
-            };
-        }
-        for (i = 0; i < token.length; i++) {
-            tokens[token[i]] = func;
-        }
-    }
-
-    function addWeekParseToken (token, callback) {
-        addParseToken(token, function (input, array, config, token) {
-            config._w = config._w || {};
-            callback(input, config._w, config, token);
-        });
-    }
-
-    function addTimeToArrayFromToken(token, input, config) {
-        if (input != null && hasOwnProp(tokens, token)) {
-            tokens[token](input, config._a, config, token);
-        }
-    }
-
-    var YEAR = 0;
-    var MONTH = 1;
-    var DATE = 2;
-    var HOUR = 3;
-    var MINUTE = 4;
-    var SECOND = 5;
-    var MILLISECOND = 6;
-    var WEEK = 7;
-    var WEEKDAY = 8;
-
-    // FORMATTING
-
-    addFormatToken('Y', 0, 0, function () {
-        var y = this.year();
-        return y <= 9999 ? '' + y : '+' + y;
-    });
-
-    addFormatToken(0, ['YY', 2], 0, function () {
-        return this.year() % 100;
-    });
-
-    addFormatToken(0, ['YYYY',   4],       0, 'year');
-    addFormatToken(0, ['YYYYY',  5],       0, 'year');
-    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
-
-    // ALIASES
-
-    addUnitAlias('year', 'y');
-
-    // PRIORITIES
-
-    addUnitPriority('year', 1);
-
-    // PARSING
-
-    addRegexToken('Y',      matchSigned);
-    addRegexToken('YY',     match1to2, match2);
-    addRegexToken('YYYY',   match1to4, match4);
-    addRegexToken('YYYYY',  match1to6, match6);
-    addRegexToken('YYYYYY', match1to6, match6);
-
-    addParseToken(['YYYYY', 'YYYYYY'], YEAR);
-    addParseToken('YYYY', function (input, array) {
-        array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input);
-    });
-    addParseToken('YY', function (input, array) {
-        array[YEAR] = hooks.parseTwoDigitYear(input);
-    });
-    addParseToken('Y', function (input, array) {
-        array[YEAR] = parseInt(input, 10);
-    });
-
-    // HELPERS
-
-    function daysInYear(year) {
-        return isLeapYear(year) ? 366 : 365;
-    }
-
-    function isLeapYear(year) {
-        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
-    }
-
-    // HOOKS
-
-    hooks.parseTwoDigitYear = function (input) {
-        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
-    };
-
-    // MOMENTS
-
-    var getSetYear = makeGetSet('FullYear', true);
-
-    function getIsLeapYear () {
-        return isLeapYear(this.year());
-    }
-
-    function makeGetSet (unit, keepTime) {
-        return function (value) {
-            if (value != null) {
-                set$1(this, unit, value);
-                hooks.updateOffset(this, keepTime);
-                return this;
-            } else {
-                return get(this, unit);
-            }
-        };
-    }
-
-    function get (mom, unit) {
-        return mom.isValid() ?
-            mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN;
-    }
-
-    function set$1 (mom, unit, value) {
-        if (mom.isValid() && !isNaN(value)) {
-            if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) {
-                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month()));
-            }
-            else {
-                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
-            }
-        }
-    }
-
-    // MOMENTS
-
-    function stringGet (units) {
-        units = normalizeUnits(units);
-        if (isFunction(this[units])) {
-            return this[units]();
-        }
-        return this;
-    }
-
-
-    function stringSet (units, value) {
-        if (typeof units === 'object') {
-            units = normalizeObjectUnits(units);
-            var prioritized = getPrioritizedUnits(units);
-            for (var i = 0; i < prioritized.length; i++) {
-                this[prioritized[i].unit](units[prioritized[i].unit]);
-            }
-        } else {
-            units = normalizeUnits(units);
-            if (isFunction(this[units])) {
-                return this[units](value);
-            }
-        }
-        return this;
-    }
-
-    function mod(n, x) {
-        return ((n % x) + x) % x;
-    }
-
-    var indexOf;
-
-    if (Array.prototype.indexOf) {
-        indexOf = Array.prototype.indexOf;
-    } else {
-        indexOf = function (o) {
-            // I know
-            var i;
-            for (i = 0; i < this.length; ++i) {
-                if (this[i] === o) {
-                    return i;
-                }
-            }
-            return -1;
-        };
-    }
-
-    function daysInMonth(year, month) {
-        if (isNaN(year) || isNaN(month)) {
-            return NaN;
-        }
-        var modMonth = mod(month, 12);
-        year += (month - modMonth) / 12;
-        return modMonth === 1 ? (isLeapYear(year) ? 29 : 28) : (31 - modMonth % 7 % 2);
-    }
-
-    // FORMATTING
-
-    addFormatToken('M', ['MM', 2], 'Mo', function () {
-        return this.month() + 1;
-    });
-
-    addFormatToken('MMM', 0, 0, function (format) {
-        return this.localeData().monthsShort(this, format);
-    });
-
-    addFormatToken('MMMM', 0, 0, function (format) {
-        return this.localeData().months(this, format);
-    });
-
-    // ALIASES
-
-    addUnitAlias('month', 'M');
-
-    // PRIORITY
-
-    addUnitPriority('month', 8);
-
-    // PARSING
-
-    addRegexToken('M',    match1to2);
-    addRegexToken('MM',   match1to2, match2);
-    addRegexToken('MMM',  function (isStrict, locale) {
-        return locale.monthsShortRegex(isStrict);
-    });
-    addRegexToken('MMMM', function (isStrict, locale) {
-        return locale.monthsRegex(isStrict);
-    });
-
-    addParseToken(['M', 'MM'], function (input, array) {
-        array[MONTH] = toInt(input) - 1;
-    });
-
-    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
-        var month = config._locale.monthsParse(input, token, config._strict);
-        // if we didn't find a month name, mark the date as invalid.
-        if (month != null) {
-            array[MONTH] = month;
-        } else {
-            getParsingFlags(config).invalidMonth = input;
-        }
-    });
-
-    // LOCALES
-
-    var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/;
-    var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
-    function localeMonths (m, format) {
-        if (!m) {
-            return isArray(this._months) ? this._months :
-                this._months['standalone'];
-        }
-        return isArray(this._months) ? this._months[m.month()] :
-            this._months[(this._months.isFormat || MONTHS_IN_FORMAT).test(format) ? 'format' : 'standalone'][m.month()];
-    }
-
-    var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
-    function localeMonthsShort (m, format) {
-        if (!m) {
-            return isArray(this._monthsShort) ? this._monthsShort :
-                this._monthsShort['standalone'];
-        }
-        return isArray(this._monthsShort) ? this._monthsShort[m.month()] :
-            this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
-    }
-
-    function handleStrictParse(monthName, format, strict) {
-        var i, ii, mom, llc = monthName.toLocaleLowerCase();
-        if (!this._monthsParse) {
-            // this is not used
-            this._monthsParse = [];
-            this._longMonthsParse = [];
-            this._shortMonthsParse = [];
-            for (i = 0; i < 12; ++i) {
-                mom = createUTC([2000, i]);
-                this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase();
-                this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase();
-            }
-        }
-
-        if (strict) {
-            if (format === 'MMM') {
-                ii = indexOf.call(this._shortMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._longMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        } else {
-            if (format === 'MMM') {
-                ii = indexOf.call(this._shortMonthsParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._longMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._longMonthsParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._shortMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        }
-    }
-
-    function localeMonthsParse (monthName, format, strict) {
-        var i, mom, regex;
-
-        if (this._monthsParseExact) {
-            return handleStrictParse.call(this, monthName, format, strict);
-        }
-
-        if (!this._monthsParse) {
-            this._monthsParse = [];
-            this._longMonthsParse = [];
-            this._shortMonthsParse = [];
-        }
-
-        // TODO: add sorting
-        // Sorting makes sure if one month (or abbr) is a prefix of another
-        // see sorting in computeMonthsParse
-        for (i = 0; i < 12; i++) {
-            // make the regex if we don't have it already
-            mom = createUTC([2000, i]);
-            if (strict && !this._longMonthsParse[i]) {
-                this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
-                this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
-            }
-            if (!strict && !this._monthsParse[i]) {
-                regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
-                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
-            }
-            // test the regex
-            if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
-                return i;
-            } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
-                return i;
-            } else if (!strict && this._monthsParse[i].test(monthName)) {
-                return i;
-            }
-        }
-    }
-
-    // MOMENTS
-
-    function setMonth (mom, value) {
-        var dayOfMonth;
-
-        if (!mom.isValid()) {
-            // No op
-            return mom;
-        }
-
-        if (typeof value === 'string') {
-            if (/^\d+$/.test(value)) {
-                value = toInt(value);
-            } else {
-                value = mom.localeData().monthsParse(value);
-                // TODO: Another silent failure?
-                if (!isNumber(value)) {
-                    return mom;
-                }
-            }
-        }
-
-        dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
-        mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
-        return mom;
-    }
-
-    function getSetMonth (value) {
-        if (value != null) {
-            setMonth(this, value);
-            hooks.updateOffset(this, true);
-            return this;
-        } else {
-            return get(this, 'Month');
-        }
-    }
-
-    function getDaysInMonth () {
-        return daysInMonth(this.year(), this.month());
-    }
-
-    var defaultMonthsShortRegex = matchWord;
-    function monthsShortRegex (isStrict) {
-        if (this._monthsParseExact) {
-            if (!hasOwnProp(this, '_monthsRegex')) {
-                computeMonthsParse.call(this);
-            }
-            if (isStrict) {
-                return this._monthsShortStrictRegex;
-            } else {
-                return this._monthsShortRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_monthsShortRegex')) {
-                this._monthsShortRegex = defaultMonthsShortRegex;
-            }
-            return this._monthsShortStrictRegex && isStrict ?
-                this._monthsShortStrictRegex : this._monthsShortRegex;
-        }
-    }
-
-    var defaultMonthsRegex = matchWord;
-    function monthsRegex (isStrict) {
-        if (this._monthsParseExact) {
-            if (!hasOwnProp(this, '_monthsRegex')) {
-                computeMonthsParse.call(this);
-            }
-            if (isStrict) {
-                return this._monthsStrictRegex;
-            } else {
-                return this._monthsRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_monthsRegex')) {
-                this._monthsRegex = defaultMonthsRegex;
-            }
-            return this._monthsStrictRegex && isStrict ?
-                this._monthsStrictRegex : this._monthsRegex;
-        }
-    }
-
-    function computeMonthsParse () {
-        function cmpLenRev(a, b) {
-            return b.length - a.length;
-        }
-
-        var shortPieces = [], longPieces = [], mixedPieces = [],
-            i, mom;
-        for (i = 0; i < 12; i++) {
-            // make the regex if we don't have it already
-            mom = createUTC([2000, i]);
-            shortPieces.push(this.monthsShort(mom, ''));
-            longPieces.push(this.months(mom, ''));
-            mixedPieces.push(this.months(mom, ''));
-            mixedPieces.push(this.monthsShort(mom, ''));
-        }
-        // Sorting makes sure if one month (or abbr) is a prefix of another it
-        // will match the longer piece.
-        shortPieces.sort(cmpLenRev);
-        longPieces.sort(cmpLenRev);
-        mixedPieces.sort(cmpLenRev);
-        for (i = 0; i < 12; i++) {
-            shortPieces[i] = regexEscape(shortPieces[i]);
-            longPieces[i] = regexEscape(longPieces[i]);
-        }
-        for (i = 0; i < 24; i++) {
-            mixedPieces[i] = regexEscape(mixedPieces[i]);
-        }
-
-        this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
-        this._monthsShortRegex = this._monthsRegex;
-        this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
-        this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
-    }
-
-    function createDate (y, m, d, h, M, s, ms) {
-        // can't just apply() to create a date:
-        // https://stackoverflow.com/q/181348
-        var date = new Date(y, m, d, h, M, s, ms);
-
-        // the date constructor remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0 && isFinite(date.getFullYear())) {
-            date.setFullYear(y);
-        }
-        return date;
-    }
-
-    function createUTCDate (y) {
-        var date = new Date(Date.UTC.apply(null, arguments));
-
-        // the Date.UTC function remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0 && isFinite(date.getUTCFullYear())) {
-            date.setUTCFullYear(y);
-        }
-        return date;
-    }
-
-    // start-of-first-week - start-of-year
-    function firstWeekOffset(year, dow, doy) {
-        var // first-week day -- which january is always in the first week (4 for iso, 1 for other)
-            fwd = 7 + dow - doy,
-            // first-week day local weekday -- which local weekday is fwd
-            fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
-
-        return -fwdlw + fwd - 1;
-    }
-
-    // https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
-    function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
-        var localWeekday = (7 + weekday - dow) % 7,
-            weekOffset = firstWeekOffset(year, dow, doy),
-            dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,
-            resYear, resDayOfYear;
-
-        if (dayOfYear <= 0) {
-            resYear = year - 1;
-            resDayOfYear = daysInYear(resYear) + dayOfYear;
-        } else if (dayOfYear > daysInYear(year)) {
-            resYear = year + 1;
-            resDayOfYear = dayOfYear - daysInYear(year);
-        } else {
-            resYear = year;
-            resDayOfYear = dayOfYear;
-        }
-
-        return {
-            year: resYear,
-            dayOfYear: resDayOfYear
-        };
-    }
-
-    function weekOfYear(mom, dow, doy) {
-        var weekOffset = firstWeekOffset(mom.year(), dow, doy),
-            week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,
-            resWeek, resYear;
-
-        if (week < 1) {
-            resYear = mom.year() - 1;
-            resWeek = week + weeksInYear(resYear, dow, doy);
-        } else if (week > weeksInYear(mom.year(), dow, doy)) {
-            resWeek = week - weeksInYear(mom.year(), dow, doy);
-            resYear = mom.year() + 1;
-        } else {
-            resYear = mom.year();
-            resWeek = week;
-        }
-
-        return {
-            week: resWeek,
-            year: resYear
-        };
-    }
-
-    function weeksInYear(year, dow, doy) {
-        var weekOffset = firstWeekOffset(year, dow, doy),
-            weekOffsetNext = firstWeekOffset(year + 1, dow, doy);
-        return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;
-    }
-
-    // FORMATTING
-
-    addFormatToken('w', ['ww', 2], 'wo', 'week');
-    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
-
-    // ALIASES
-
-    addUnitAlias('week', 'w');
-    addUnitAlias('isoWeek', 'W');
-
-    // PRIORITIES
-
-    addUnitPriority('week', 5);
-    addUnitPriority('isoWeek', 5);
-
-    // PARSING
-
-    addRegexToken('w',  match1to2);
-    addRegexToken('ww', match1to2, match2);
-    addRegexToken('W',  match1to2);
-    addRegexToken('WW', match1to2, match2);
-
-    addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
-        week[token.substr(0, 1)] = toInt(input);
-    });
-
-    // HELPERS
-
-    // LOCALES
-
-    function localeWeek (mom) {
-        return weekOfYear(mom, this._week.dow, this._week.doy).week;
-    }
-
-    var defaultLocaleWeek = {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 6th is the first week of the year.
-    };
-
-    function localeFirstDayOfWeek () {
-        return this._week.dow;
-    }
-
-    function localeFirstDayOfYear () {
-        return this._week.doy;
-    }
-
-    // MOMENTS
-
-    function getSetWeek (input) {
-        var week = this.localeData().week(this);
-        return input == null ? week : this.add((input - week) * 7, 'd');
-    }
-
-    function getSetISOWeek (input) {
-        var week = weekOfYear(this, 1, 4).week;
-        return input == null ? week : this.add((input - week) * 7, 'd');
-    }
-
-    // FORMATTING
-
-    addFormatToken('d', 0, 'do', 'day');
-
-    addFormatToken('dd', 0, 0, function (format) {
-        return this.localeData().weekdaysMin(this, format);
-    });
-
-    addFormatToken('ddd', 0, 0, function (format) {
-        return this.localeData().weekdaysShort(this, format);
-    });
-
-    addFormatToken('dddd', 0, 0, function (format) {
-        return this.localeData().weekdays(this, format);
-    });
-
-    addFormatToken('e', 0, 0, 'weekday');
-    addFormatToken('E', 0, 0, 'isoWeekday');
-
-    // ALIASES
-
-    addUnitAlias('day', 'd');
-    addUnitAlias('weekday', 'e');
-    addUnitAlias('isoWeekday', 'E');
-
-    // PRIORITY
-    addUnitPriority('day', 11);
-    addUnitPriority('weekday', 11);
-    addUnitPriority('isoWeekday', 11);
-
-    // PARSING
-
-    addRegexToken('d',    match1to2);
-    addRegexToken('e',    match1to2);
-    addRegexToken('E',    match1to2);
-    addRegexToken('dd',   function (isStrict, locale) {
-        return locale.weekdaysMinRegex(isStrict);
-    });
-    addRegexToken('ddd',   function (isStrict, locale) {
-        return locale.weekdaysShortRegex(isStrict);
-    });
-    addRegexToken('dddd',   function (isStrict, locale) {
-        return locale.weekdaysRegex(isStrict);
-    });
-
-    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
-        var weekday = config._locale.weekdaysParse(input, token, config._strict);
-        // if we didn't get a weekday name, mark the date as invalid
-        if (weekday != null) {
-            week.d = weekday;
-        } else {
-            getParsingFlags(config).invalidWeekday = input;
-        }
-    });
-
-    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
-        week[token] = toInt(input);
-    });
-
-    // HELPERS
-
-    function parseWeekday(input, locale) {
-        if (typeof input !== 'string') {
-            return input;
-        }
-
-        if (!isNaN(input)) {
-            return parseInt(input, 10);
-        }
-
-        input = locale.weekdaysParse(input);
-        if (typeof input === 'number') {
-            return input;
-        }
-
-        return null;
-    }
-
-    function parseIsoWeekday(input, locale) {
-        if (typeof input === 'string') {
-            return locale.weekdaysParse(input) % 7 || 7;
-        }
-        return isNaN(input) ? null : input;
-    }
-
-    // LOCALES
-
-    var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
-    function localeWeekdays (m, format) {
-        if (!m) {
-            return isArray(this._weekdays) ? this._weekdays :
-                this._weekdays['standalone'];
-        }
-        return isArray(this._weekdays) ? this._weekdays[m.day()] :
-            this._weekdays[this._weekdays.isFormat.test(format) ? 'format' : 'standalone'][m.day()];
-    }
-
-    var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
-    function localeWeekdaysShort (m) {
-        return (m) ? this._weekdaysShort[m.day()] : this._weekdaysShort;
-    }
-
-    var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
-    function localeWeekdaysMin (m) {
-        return (m) ? this._weekdaysMin[m.day()] : this._weekdaysMin;
-    }
-
-    function handleStrictParse$1(weekdayName, format, strict) {
-        var i, ii, mom, llc = weekdayName.toLocaleLowerCase();
-        if (!this._weekdaysParse) {
-            this._weekdaysParse = [];
-            this._shortWeekdaysParse = [];
-            this._minWeekdaysParse = [];
-
-            for (i = 0; i < 7; ++i) {
-                mom = createUTC([2000, 1]).day(i);
-                this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase();
-                this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase();
-                this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase();
-            }
-        }
-
-        if (strict) {
-            if (format === 'dddd') {
-                ii = indexOf.call(this._weekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else if (format === 'ddd') {
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        } else {
-            if (format === 'dddd') {
-                ii = indexOf.call(this._weekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else if (format === 'ddd') {
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._weekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._weekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        }
-    }
-
-    function localeWeekdaysParse (weekdayName, format, strict) {
-        var i, mom, regex;
-
-        if (this._weekdaysParseExact) {
-            return handleStrictParse$1.call(this, weekdayName, format, strict);
-        }
-
-        if (!this._weekdaysParse) {
-            this._weekdaysParse = [];
-            this._minWeekdaysParse = [];
-            this._shortWeekdaysParse = [];
-            this._fullWeekdaysParse = [];
-        }
-
-        for (i = 0; i < 7; i++) {
-            // make the regex if we don't have it already
-
-            mom = createUTC([2000, 1]).day(i);
-            if (strict && !this._fullWeekdaysParse[i]) {
-                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\\.?') + '$', 'i');
-                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\\.?') + '$', 'i');
-                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\\.?') + '$', 'i');
-            }
-            if (!this._weekdaysParse[i]) {
-                regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
-                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
-            }
-            // test the regex
-            if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (!strict && this._weekdaysParse[i].test(weekdayName)) {
-                return i;
-            }
-        }
-    }
-
-    // MOMENTS
-
-    function getSetDayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
-        if (input != null) {
-            input = parseWeekday(input, this.localeData());
-            return this.add(input - day, 'd');
-        } else {
-            return day;
-        }
-    }
-
-    function getSetLocaleDayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
-        return input == null ? weekday : this.add(input - weekday, 'd');
-    }
-
-    function getSetISODayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-
-        // behaves the same as moment#day except
-        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
-        // as a setter, sunday should belong to the previous week.
-
-        if (input != null) {
-            var weekday = parseIsoWeekday(input, this.localeData());
-            return this.day(this.day() % 7 ? weekday : weekday - 7);
-        } else {
-            return this.day() || 7;
-        }
-    }
-
-    var defaultWeekdaysRegex = matchWord;
-    function weekdaysRegex (isStrict) {
-        if (this._weekdaysParseExact) {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                computeWeekdaysParse.call(this);
-            }
-            if (isStrict) {
-                return this._weekdaysStrictRegex;
-            } else {
-                return this._weekdaysRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                this._weekdaysRegex = defaultWeekdaysRegex;
-            }
-            return this._weekdaysStrictRegex && isStrict ?
-                this._weekdaysStrictRegex : this._weekdaysRegex;
-        }
-    }
-
-    var defaultWeekdaysShortRegex = matchWord;
-    function weekdaysShortRegex (isStrict) {
-        if (this._weekdaysParseExact) {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                computeWeekdaysParse.call(this);
-            }
-            if (isStrict) {
-                return this._weekdaysShortStrictRegex;
-            } else {
-                return this._weekdaysShortRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_weekdaysShortRegex')) {
-                this._weekdaysShortRegex = defaultWeekdaysShortRegex;
-            }
-            return this._weekdaysShortStrictRegex && isStrict ?
-                this._weekdaysShortStrictRegex : this._weekdaysShortRegex;
-        }
-    }
-
-    var defaultWeekdaysMinRegex = matchWord;
-    function weekdaysMinRegex (isStrict) {
-        if (this._weekdaysParseExact) {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                computeWeekdaysParse.call(this);
-            }
-            if (isStrict) {
-                return this._weekdaysMinStrictRegex;
-            } else {
-                return this._weekdaysMinRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_weekdaysMinRegex')) {
-                this._weekdaysMinRegex = defaultWeekdaysMinRegex;
-            }
-            return this._weekdaysMinStrictRegex && isStrict ?
-                this._weekdaysMinStrictRegex : this._weekdaysMinRegex;
-        }
-    }
-
-
-    function computeWeekdaysParse () {
-        function cmpLenRev(a, b) {
-            return b.length - a.length;
-        }
-
-        var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [],
-            i, mom, minp, shortp, longp;
-        for (i = 0; i < 7; i++) {
-            // make the regex if we don't have it already
-            mom = createUTC([2000, 1]).day(i);
-            minp = this.weekdaysMin(mom, '');
-            shortp = this.weekdaysShort(mom, '');
-            longp = this.weekdays(mom, '');
-            minPieces.push(minp);
-            shortPieces.push(shortp);
-            longPieces.push(longp);
-            mixedPieces.push(minp);
-            mixedPieces.push(shortp);
-            mixedPieces.push(longp);
-        }
-        // Sorting makes sure if one weekday (or abbr) is a prefix of another it
-        // will match the longer piece.
-        minPieces.sort(cmpLenRev);
-        shortPieces.sort(cmpLenRev);
-        longPieces.sort(cmpLenRev);
-        mixedPieces.sort(cmpLenRev);
-        for (i = 0; i < 7; i++) {
-            shortPieces[i] = regexEscape(shortPieces[i]);
-            longPieces[i] = regexEscape(longPieces[i]);
-            mixedPieces[i] = regexEscape(mixedPieces[i]);
-        }
-
-        this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
-        this._weekdaysShortRegex = this._weekdaysRegex;
-        this._weekdaysMinRegex = this._weekdaysRegex;
-
-        this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
-        this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
-        this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i');
-    }
-
-    // FORMATTING
-
-    function hFormat() {
-        return this.hours() % 12 || 12;
-    }
-
-    function kFormat() {
-        return this.hours() || 24;
-    }
-
-    addFormatToken('H', ['HH', 2], 0, 'hour');
-    addFormatToken('h', ['hh', 2], 0, hFormat);
-    addFormatToken('k', ['kk', 2], 0, kFormat);
-
-    addFormatToken('hmm', 0, 0, function () {
-        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
-    });
-
-    addFormatToken('hmmss', 0, 0, function () {
-        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) +
-            zeroFill(this.seconds(), 2);
-    });
-
-    addFormatToken('Hmm', 0, 0, function () {
-        return '' + this.hours() + zeroFill(this.minutes(), 2);
-    });
-
-    addFormatToken('Hmmss', 0, 0, function () {
-        return '' + this.hours() + zeroFill(this.minutes(), 2) +
-            zeroFill(this.seconds(), 2);
-    });
-
-    function meridiem (token, lowercase) {
-        addFormatToken(token, 0, 0, function () {
-            return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
-        });
-    }
-
-    meridiem('a', true);
-    meridiem('A', false);
-
-    // ALIASES
-
-    addUnitAlias('hour', 'h');
-
-    // PRIORITY
-    addUnitPriority('hour', 13);
-
-    // PARSING
-
-    function matchMeridiem (isStrict, locale) {
-        return locale._meridiemParse;
-    }
-
-    addRegexToken('a',  matchMeridiem);
-    addRegexToken('A',  matchMeridiem);
-    addRegexToken('H',  match1to2);
-    addRegexToken('h',  match1to2);
-    addRegexToken('k',  match1to2);
-    addRegexToken('HH', match1to2, match2);
-    addRegexToken('hh', match1to2, match2);
-    addRegexToken('kk', match1to2, match2);
-
-    addRegexToken('hmm', match3to4);
-    addRegexToken('hmmss', match5to6);
-    addRegexToken('Hmm', match3to4);
-    addRegexToken('Hmmss', match5to6);
-
-    addParseToken(['H', 'HH'], HOUR);
-    addParseToken(['k', 'kk'], function (input, array, config) {
-        var kInput = toInt(input);
-        array[HOUR] = kInput === 24 ? 0 : kInput;
-    });
-    addParseToken(['a', 'A'], function (input, array, config) {
-        config._isPm = config._locale.isPM(input);
-        config._meridiem = input;
-    });
-    addParseToken(['h', 'hh'], function (input, array, config) {
-        array[HOUR] = toInt(input);
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('hmm', function (input, array, config) {
-        var pos = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos));
-        array[MINUTE] = toInt(input.substr(pos));
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('hmmss', function (input, array, config) {
-        var pos1 = input.length - 4;
-        var pos2 = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos1));
-        array[MINUTE] = toInt(input.substr(pos1, 2));
-        array[SECOND] = toInt(input.substr(pos2));
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('Hmm', function (input, array, config) {
-        var pos = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos));
-        array[MINUTE] = toInt(input.substr(pos));
-    });
-    addParseToken('Hmmss', function (input, array, config) {
-        var pos1 = input.length - 4;
-        var pos2 = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos1));
-        array[MINUTE] = toInt(input.substr(pos1, 2));
-        array[SECOND] = toInt(input.substr(pos2));
-    });
-
-    // LOCALES
-
-    function localeIsPM (input) {
-        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
-        // Using charAt should be more compatible.
-        return ((input + '').toLowerCase().charAt(0) === 'p');
-    }
-
-    var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
-    function localeMeridiem (hours, minutes, isLower) {
-        if (hours > 11) {
-            return isLower ? 'pm' : 'PM';
-        } else {
-            return isLower ? 'am' : 'AM';
-        }
-    }
-
-
-    // MOMENTS
-
-    // Setting the hour should keep the time, because the user explicitly
-    // specified which hour they want. So trying to maintain the same hour (in
-    // a new timezone) makes sense. Adding/subtracting hours does not follow
-    // this rule.
-    var getSetHour = makeGetSet('Hours', true);
-
-    var baseConfig = {
-        calendar: defaultCalendar,
-        longDateFormat: defaultLongDateFormat,
-        invalidDate: defaultInvalidDate,
-        ordinal: defaultOrdinal,
-        dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse,
-        relativeTime: defaultRelativeTime,
-
-        months: defaultLocaleMonths,
-        monthsShort: defaultLocaleMonthsShort,
-
-        week: defaultLocaleWeek,
-
-        weekdays: defaultLocaleWeekdays,
-        weekdaysMin: defaultLocaleWeekdaysMin,
-        weekdaysShort: defaultLocaleWeekdaysShort,
-
-        meridiemParse: defaultLocaleMeridiemParse
-    };
-
-    // internal storage for locale config files
-    var locales = {};
-    var localeFamilies = {};
-    var globalLocale;
-
-    function normalizeLocale(key) {
-        return key ? key.toLowerCase().replace('_', '-') : key;
-    }
-
-    // pick the locale from the array
-    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
-    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
-    function chooseLocale(names) {
-        var i = 0, j, next, locale, split;
-
-        while (i < names.length) {
-            split = normalizeLocale(names[i]).split('-');
-            j = split.length;
-            next = normalizeLocale(names[i + 1]);
-            next = next ? next.split('-') : null;
-            while (j > 0) {
-                locale = loadLocale(split.slice(0, j).join('-'));
-                if (locale) {
-                    return locale;
-                }
-                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
-                    //the next array item is better than a shallower substring of this one
-                    break;
-                }
-                j--;
-            }
-            i++;
-        }
-        return globalLocale;
-    }
-
-    function loadLocale(name) {
-        var oldLocale = null;
-        // TODO: Find a better way to register and load all the locales in Node
-        if (!locales[name] && (typeof module !== 'undefined') &&
-                module && module.exports) {
-            try {
-                oldLocale = globalLocale._abbr;
-                var aliasedRequire = require;
-                aliasedRequire('./locale/' + name);
-                getSetGlobalLocale(oldLocale);
-            } catch (e) {}
-        }
-        return locales[name];
-    }
-
-    // This function will load locale and then set the global locale.  If
-    // no arguments are passed in, it will simply return the current global
-    // locale key.
-    function getSetGlobalLocale (key, values) {
-        var data;
-        if (key) {
-            if (isUndefined(values)) {
-                data = getLocale(key);
-            }
-            else {
-                data = defineLocale(key, values);
-            }
-
-            if (data) {
-                // moment.duration._locale = moment._locale = data;
-                globalLocale = data;
-            }
-            else {
-                if ((typeof console !==  'undefined') && console.warn) {
-                    //warn user if arguments are passed but the locale could not be set
-                    console.warn('Locale ' + key +  ' not found. Did you forget to load it?');
-                }
-            }
-        }
-
-        return globalLocale._abbr;
-    }
-
-    function defineLocale (name, config) {
-        if (config !== null) {
-            var locale, parentConfig = baseConfig;
-            config.abbr = name;
-            if (locales[name] != null) {
-                deprecateSimple('defineLocaleOverride',
-                        'use moment.updateLocale(localeName, config) to change ' +
-                        'an existing locale. moment.defineLocale(localeName, ' +
-                        'config) should only be used for creating a new locale ' +
-                        'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.');
-                parentConfig = locales[name]._config;
-            } else if (config.parentLocale != null) {
-                if (locales[config.parentLocale] != null) {
-                    parentConfig = locales[config.parentLocale]._config;
-                } else {
-                    locale = loadLocale(config.parentLocale);
-                    if (locale != null) {
-                        parentConfig = locale._config;
-                    } else {
-                        if (!localeFamilies[config.parentLocale]) {
-                            localeFamilies[config.parentLocale] = [];
-                        }
-                        localeFamilies[config.parentLocale].push({
-                            name: name,
-                            config: config
-                        });
-                        return null;
-                    }
-                }
-            }
-            locales[name] = new Locale(mergeConfigs(parentConfig, config));
-
-            if (localeFamilies[name]) {
-                localeFamilies[name].forEach(function (x) {
-                    defineLocale(x.name, x.config);
-                });
-            }
-
-            // backwards compat for now: also set the locale
-            // make sure we set the locale AFTER all child locales have been
-            // created, so we won't end up with the child locale set.
-            getSetGlobalLocale(name);
-
-
-            return locales[name];
-        } else {
-            // useful for testing
-            delete locales[name];
-            return null;
-        }
-    }
-
-    function updateLocale(name, config) {
-        if (config != null) {
-            var locale, tmpLocale, parentConfig = baseConfig;
-            // MERGE
-            tmpLocale = loadLocale(name);
-            if (tmpLocale != null) {
-                parentConfig = tmpLocale._config;
-            }
-            config = mergeConfigs(parentConfig, config);
-            locale = new Locale(config);
-            locale.parentLocale = locales[name];
-            locales[name] = locale;
-
-            // backwards compat for now: also set the locale
-            getSetGlobalLocale(name);
-        } else {
-            // pass null for config to unupdate, useful for tests
-            if (locales[name] != null) {
-                if (locales[name].parentLocale != null) {
-                    locales[name] = locales[name].parentLocale;
-                } else if (locales[name] != null) {
-                    delete locales[name];
-                }
-            }
-        }
-        return locales[name];
-    }
-
-    // returns locale data
-    function getLocale (key) {
-        var locale;
-
-        if (key && key._locale && key._locale._abbr) {
-            key = key._locale._abbr;
-        }
-
-        if (!key) {
-            return globalLocale;
-        }
-
-        if (!isArray(key)) {
-            //short-circuit everything else
-            locale = loadLocale(key);
-            if (locale) {
-                return locale;
-            }
-            key = [key];
-        }
-
-        return chooseLocale(key);
-    }
-
-    function listLocales() {
-        return keys(locales);
-    }
-
-    function checkOverflow (m) {
-        var overflow;
-        var a = m._a;
-
-        if (a && getParsingFlags(m).overflow === -2) {
-            overflow =
-                a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
-                a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
-                a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
-                a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
-                a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
-                a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
-                -1;
-
-            if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
-                overflow = DATE;
-            }
-            if (getParsingFlags(m)._overflowWeeks && overflow === -1) {
-                overflow = WEEK;
-            }
-            if (getParsingFlags(m)._overflowWeekday && overflow === -1) {
-                overflow = WEEKDAY;
-            }
-
-            getParsingFlags(m).overflow = overflow;
-        }
-
-        return m;
-    }
-
-    // Pick the first defined of two or three arguments.
-    function defaults(a, b, c) {
-        if (a != null) {
-            return a;
-        }
-        if (b != null) {
-            return b;
-        }
-        return c;
-    }
-
-    function currentDateArray(config) {
-        // hooks is actually the exported moment object
-        var nowValue = new Date(hooks.now());
-        if (config._useUTC) {
-            return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()];
-        }
-        return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];
-    }
-
-    // convert an array to a date.
-    // the array should mirror the parameters below
-    // note: all values past the year are optional and will default to the lowest possible value.
-    // [year, month, day , hour, minute, second, millisecond]
-    function configFromArray (config) {
-        var i, date, input = [], currentDate, expectedWeekday, yearToUse;
-
-        if (config._d) {
-            return;
-        }
-
-        currentDate = currentDateArray(config);
-
-        //compute day of the year from weeks and weekdays
-        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
-            dayOfYearFromWeekInfo(config);
-        }
-
-        //if the day of the year is set, figure out what it is
-        if (config._dayOfYear != null) {
-            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
-
-            if (config._dayOfYear > daysInYear(yearToUse) || config._dayOfYear === 0) {
-                getParsingFlags(config)._overflowDayOfYear = true;
-            }
-
-            date = createUTCDate(yearToUse, 0, config._dayOfYear);
-            config._a[MONTH] = date.getUTCMonth();
-            config._a[DATE] = date.getUTCDate();
-        }
-
-        // Default to current date.
-        // * if no year, month, day of month are given, default to today
-        // * if day of month is given, default month and year
-        // * if month is given, default only year
-        // * if year is given, don't default anything
-        for (i = 0; i < 3 && config._a[i] == null; ++i) {
-            config._a[i] = input[i] = currentDate[i];
-        }
-
-        // Zero out whatever was not defaulted, including time
-        for (; i < 7; i++) {
-            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
-        }
-
-        // Check for 24:00:00.000
-        if (config._a[HOUR] === 24 &&
-                config._a[MINUTE] === 0 &&
-                config._a[SECOND] === 0 &&
-                config._a[MILLISECOND] === 0) {
-            config._nextDay = true;
-            config._a[HOUR] = 0;
-        }
-
-        config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
-        expectedWeekday = config._useUTC ? config._d.getUTCDay() : config._d.getDay();
-
-        // Apply timezone offset from input. The actual utcOffset can be changed
-        // with parseZone.
-        if (config._tzm != null) {
-            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
-        }
-
-        if (config._nextDay) {
-            config._a[HOUR] = 24;
-        }
-
-        // check for mismatching day of week
-        if (config._w && typeof config._w.d !== 'undefined' && config._w.d !== expectedWeekday) {
-            getParsingFlags(config).weekdayMismatch = true;
-        }
-    }
-
-    function dayOfYearFromWeekInfo(config) {
-        var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow;
-
-        w = config._w;
-        if (w.GG != null || w.W != null || w.E != null) {
-            dow = 1;
-            doy = 4;
-
-            // TODO: We need to take the current isoWeekYear, but that depends on
-            // how we interpret now (local, utc, fixed offset). So create
-            // a now version of current config (take local/utc/offset flags, and
-            // create now).
-            weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year);
-            week = defaults(w.W, 1);
-            weekday = defaults(w.E, 1);
-            if (weekday < 1 || weekday > 7) {
-                weekdayOverflow = true;
-            }
-        } else {
-            dow = config._locale._week.dow;
-            doy = config._locale._week.doy;
-
-            var curWeek = weekOfYear(createLocal(), dow, doy);
-
-            weekYear = defaults(w.gg, config._a[YEAR], curWeek.year);
-
-            // Default to current week.
-            week = defaults(w.w, curWeek.week);
-
-            if (w.d != null) {
-                // weekday -- low day numbers are considered next week
-                weekday = w.d;
-                if (weekday < 0 || weekday > 6) {
-                    weekdayOverflow = true;
-                }
-            } else if (w.e != null) {
-                // local weekday -- counting starts from beginning of week
-                weekday = w.e + dow;
-                if (w.e < 0 || w.e > 6) {
-                    weekdayOverflow = true;
-                }
-            } else {
-                // default to beginning of week
-                weekday = dow;
-            }
-        }
-        if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {
-            getParsingFlags(config)._overflowWeeks = true;
-        } else if (weekdayOverflow != null) {
-            getParsingFlags(config)._overflowWeekday = true;
-        } else {
-            temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);
-            config._a[YEAR] = temp.year;
-            config._dayOfYear = temp.dayOfYear;
-        }
-    }
-
-    // iso 8601 regex
-    // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
-    var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-    var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-
-    var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/;
-
-    var isoDates = [
-        ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
-        ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/],
-        ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/],
-        ['GGGG-[W]WW', /\d{4}-W\d\d/, false],
-        ['YYYY-DDD', /\d{4}-\d{3}/],
-        ['YYYY-MM', /\d{4}-\d\d/, false],
-        ['YYYYYYMMDD', /[+-]\d{10}/],
-        ['YYYYMMDD', /\d{8}/],
-        // YYYYMM is NOT allowed by the standard
-        ['GGGG[W]WWE', /\d{4}W\d{3}/],
-        ['GGGG[W]WW', /\d{4}W\d{2}/, false],
-        ['YYYYDDD', /\d{7}/]
-    ];
-
-    // iso time formats and regexes
-    var isoTimes = [
-        ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/],
-        ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/],
-        ['HH:mm:ss', /\d\d:\d\d:\d\d/],
-        ['HH:mm', /\d\d:\d\d/],
-        ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/],
-        ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/],
-        ['HHmmss', /\d\d\d\d\d\d/],
-        ['HHmm', /\d\d\d\d/],
-        ['HH', /\d\d/]
-    ];
-
-    var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
-
-    // date from iso format
-    function configFromISO(config) {
-        var i, l,
-            string = config._i,
-            match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
-            allowTime, dateFormat, timeFormat, tzFormat;
-
-        if (match) {
-            getParsingFlags(config).iso = true;
-
-            for (i = 0, l = isoDates.length; i < l; i++) {
-                if (isoDates[i][1].exec(match[1])) {
-                    dateFormat = isoDates[i][0];
-                    allowTime = isoDates[i][2] !== false;
-                    break;
-                }
-            }
-            if (dateFormat == null) {
-                config._isValid = false;
-                return;
-            }
-            if (match[3]) {
-                for (i = 0, l = isoTimes.length; i < l; i++) {
-                    if (isoTimes[i][1].exec(match[3])) {
-                        // match[2] should be 'T' or space
-                        timeFormat = (match[2] || ' ') + isoTimes[i][0];
-                        break;
-                    }
-                }
-                if (timeFormat == null) {
-                    config._isValid = false;
-                    return;
-                }
-            }
-            if (!allowTime && timeFormat != null) {
-                config._isValid = false;
-                return;
-            }
-            if (match[4]) {
-                if (tzRegex.exec(match[4])) {
-                    tzFormat = 'Z';
-                } else {
-                    config._isValid = false;
-                    return;
-                }
-            }
-            config._f = dateFormat + (timeFormat || '') + (tzFormat || '');
-            configFromStringAndFormat(config);
-        } else {
-            config._isValid = false;
-        }
-    }
-
-    // RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3
-    var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;
-
-    function extractFromRFC2822Strings(yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) {
-        var result = [
-            untruncateYear(yearStr),
-            defaultLocaleMonthsShort.indexOf(monthStr),
-            parseInt(dayStr, 10),
-            parseInt(hourStr, 10),
-            parseInt(minuteStr, 10)
-        ];
-
-        if (secondStr) {
-            result.push(parseInt(secondStr, 10));
-        }
-
-        return result;
-    }
-
-    function untruncateYear(yearStr) {
-        var year = parseInt(yearStr, 10);
-        if (year <= 49) {
-            return 2000 + year;
-        } else if (year <= 999) {
-            return 1900 + year;
-        }
-        return year;
-    }
-
-    function preprocessRFC2822(s) {
-        // Remove comments and folding whitespace and replace multiple-spaces with a single space
-        return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-    }
-
-    function checkWeekday(weekdayStr, parsedInput, config) {
-        if (weekdayStr) {
-            // TODO: Replace the vanilla JS Date object with an indepentent day-of-week check.
-            var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr),
-                weekdayActual = new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay();
-            if (weekdayProvided !== weekdayActual) {
-                getParsingFlags(config).weekdayMismatch = true;
-                config._isValid = false;
-                return false;
-            }
-        }
-        return true;
-    }
-
-    var obsOffsets = {
-        UT: 0,
-        GMT: 0,
-        EDT: -4 * 60,
-        EST: -5 * 60,
-        CDT: -5 * 60,
-        CST: -6 * 60,
-        MDT: -6 * 60,
-        MST: -7 * 60,
-        PDT: -7 * 60,
-        PST: -8 * 60
-    };
-
-    function calculateOffset(obsOffset, militaryOffset, numOffset) {
-        if (obsOffset) {
-            return obsOffsets[obsOffset];
-        } else if (militaryOffset) {
-            // the only allowed military tz is Z
-            return 0;
-        } else {
-            var hm = parseInt(numOffset, 10);
-            var m = hm % 100, h = (hm - m) / 100;
-            return h * 60 + m;
-        }
-    }
-
-    // date and time from ref 2822 format
-    function configFromRFC2822(config) {
-        var match = rfc2822.exec(preprocessRFC2822(config._i));
-        if (match) {
-            var parsedArray = extractFromRFC2822Strings(match[4], match[3], match[2], match[5], match[6], match[7]);
-            if (!checkWeekday(match[1], parsedArray, config)) {
-                return;
-            }
-
-            config._a = parsedArray;
-            config._tzm = calculateOffset(match[8], match[9], match[10]);
-
-            config._d = createUTCDate.apply(null, config._a);
-            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
-
-            getParsingFlags(config).rfc2822 = true;
-        } else {
-            config._isValid = false;
-        }
-    }
-
-    // date from iso format or fallback
-    function configFromString(config) {
-        var matched = aspNetJsonRegex.exec(config._i);
-
-        if (matched !== null) {
-            config._d = new Date(+matched[1]);
-            return;
-        }
-
-        configFromISO(config);
-        if (config._isValid === false) {
-            delete config._isValid;
-        } else {
-            return;
-        }
-
-        configFromRFC2822(config);
-        if (config._isValid === false) {
-            delete config._isValid;
-        } else {
-            return;
-        }
-
-        // Final attempt, use Input Fallback
-        hooks.createFromInputFallback(config);
-    }
-
-    hooks.createFromInputFallback = deprecate(
-        'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' +
-        'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' +
-        'discouraged and will be removed in an upcoming major release. Please refer to ' +
-        'http://momentjs.com/guides/#/warnings/js-date/ for more info.',
-        function (config) {
-            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
-        }
-    );
-
-    // constant that refers to the ISO standard
-    hooks.ISO_8601 = function () {};
-
-    // constant that refers to the RFC 2822 form
-    hooks.RFC_2822 = function () {};
-
-    // date from string and format string
-    function configFromStringAndFormat(config) {
-        // TODO: Move this to another part of the creation flow to prevent circular deps
-        if (config._f === hooks.ISO_8601) {
-            configFromISO(config);
-            return;
-        }
-        if (config._f === hooks.RFC_2822) {
-            configFromRFC2822(config);
-            return;
-        }
-        config._a = [];
-        getParsingFlags(config).empty = true;
-
-        // This array is used to make a Date, either with `new Date` or `Date.UTC`
-        var string = '' + config._i,
-            i, parsedInput, tokens, token, skipped,
-            stringLength = string.length,
-            totalParsedInputLength = 0;
-
-        tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
-
-        for (i = 0; i < tokens.length; i++) {
-            token = tokens[i];
-            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
-            // console.log('token', token, 'parsedInput', parsedInput,
-            //         'regex', getParseRegexForToken(token, config));
-            if (parsedInput) {
-                skipped = string.substr(0, string.indexOf(parsedInput));
-                if (skipped.length > 0) {
-                    getParsingFlags(config).unusedInput.push(skipped);
-                }
-                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
-                totalParsedInputLength += parsedInput.length;
-            }
-            // don't parse if it's not a known token
-            if (formatTokenFunctions[token]) {
-                if (parsedInput) {
-                    getParsingFlags(config).empty = false;
-                }
-                else {
-                    getParsingFlags(config).unusedTokens.push(token);
-                }
-                addTimeToArrayFromToken(token, parsedInput, config);
-            }
-            else if (config._strict && !parsedInput) {
-                getParsingFlags(config).unusedTokens.push(token);
-            }
-        }
-
-        // add remaining unparsed input length to the string
-        getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
-        if (string.length > 0) {
-            getParsingFlags(config).unusedInput.push(string);
-        }
-
-        // clear _12h flag if hour is <= 12
-        if (config._a[HOUR] <= 12 &&
-            getParsingFlags(config).bigHour === true &&
-            config._a[HOUR] > 0) {
-            getParsingFlags(config).bigHour = undefined;
-        }
-
-        getParsingFlags(config).parsedDateParts = config._a.slice(0);
-        getParsingFlags(config).meridiem = config._meridiem;
-        // handle meridiem
-        config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
-
-        configFromArray(config);
-        checkOverflow(config);
-    }
-
-
-    function meridiemFixWrap (locale, hour, meridiem) {
-        var isPm;
-
-        if (meridiem == null) {
-            // nothing to do
-            return hour;
-        }
-        if (locale.meridiemHour != null) {
-            return locale.meridiemHour(hour, meridiem);
-        } else if (locale.isPM != null) {
-            // Fallback
-            isPm = locale.isPM(meridiem);
-            if (isPm && hour < 12) {
-                hour += 12;
-            }
-            if (!isPm && hour === 12) {
-                hour = 0;
-            }
-            return hour;
-        } else {
-            // this is not supposed to happen
-            return hour;
-        }
-    }
-
-    // date from string and array of format strings
-    function configFromStringAndArray(config) {
-        var tempConfig,
-            bestMoment,
-
-            scoreToBeat,
-            i,
-            currentScore;
-
-        if (config._f.length === 0) {
-            getParsingFlags(config).invalidFormat = true;
-            config._d = new Date(NaN);
-            return;
-        }
-
-        for (i = 0; i < config._f.length; i++) {
-            currentScore = 0;
-            tempConfig = copyConfig({}, config);
-            if (config._useUTC != null) {
-                tempConfig._useUTC = config._useUTC;
-            }
-            tempConfig._f = config._f[i];
-            configFromStringAndFormat(tempConfig);
-
-            if (!isValid(tempConfig)) {
-                continue;
-            }
-
-            // if there is any input that was not parsed add a penalty for that format
-            currentScore += getParsingFlags(tempConfig).charsLeftOver;
-
-            //or tokens
-            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
-
-            getParsingFlags(tempConfig).score = currentScore;
-
-            if (scoreToBeat == null || currentScore < scoreToBeat) {
-                scoreToBeat = currentScore;
-                bestMoment = tempConfig;
-            }
-        }
-
-        extend(config, bestMoment || tempConfig);
-    }
-
-    function configFromObject(config) {
-        if (config._d) {
-            return;
-        }
-
-        var i = normalizeObjectUnits(config._i);
-        config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) {
-            return obj && parseInt(obj, 10);
-        });
-
-        configFromArray(config);
-    }
-
-    function createFromConfig (config) {
-        var res = new Moment(checkOverflow(prepareConfig(config)));
-        if (res._nextDay) {
-            // Adding is smart enough around DST
-            res.add(1, 'd');
-            res._nextDay = undefined;
-        }
-
-        return res;
-    }
-
-    function prepareConfig (config) {
-        var input = config._i,
-            format = config._f;
-
-        config._locale = config._locale || getLocale(config._l);
-
-        if (input === null || (format === undefined && input === '')) {
-            return createInvalid({nullInput: true});
-        }
-
-        if (typeof input === 'string') {
-            config._i = input = config._locale.preparse(input);
-        }
-
-        if (isMoment(input)) {
-            return new Moment(checkOverflow(input));
-        } else if (isDate(input)) {
-            config._d = input;
-        } else if (isArray(format)) {
-            configFromStringAndArray(config);
-        } else if (format) {
-            configFromStringAndFormat(config);
-        }  else {
-            configFromInput(config);
-        }
-
-        if (!isValid(config)) {
-            config._d = null;
-        }
-
-        return config;
-    }
-
-    function configFromInput(config) {
-        var input = config._i;
-        if (isUndefined(input)) {
-            config._d = new Date(hooks.now());
-        } else if (isDate(input)) {
-            config._d = new Date(input.valueOf());
-        } else if (typeof input === 'string') {
-            configFromString(config);
-        } else if (isArray(input)) {
-            config._a = map(input.slice(0), function (obj) {
-                return parseInt(obj, 10);
-            });
-            configFromArray(config);
-        } else if (isObject(input)) {
-            configFromObject(config);
-        } else if (isNumber(input)) {
-            // from milliseconds
-            config._d = new Date(input);
-        } else {
-            hooks.createFromInputFallback(config);
-        }
-    }
-
-    function createLocalOrUTC (input, format, locale, strict, isUTC) {
-        var c = {};
-
-        if (locale === true || locale === false) {
-            strict = locale;
-            locale = undefined;
-        }
-
-        if ((isObject(input) && isObjectEmpty(input)) ||
-                (isArray(input) && input.length === 0)) {
-            input = undefined;
-        }
-        // object construction must be done this way.
-        // https://github.com/moment/moment/issues/1423
-        c._isAMomentObject = true;
-        c._useUTC = c._isUTC = isUTC;
-        c._l = locale;
-        c._i = input;
-        c._f = format;
-        c._strict = strict;
-
-        return createFromConfig(c);
-    }
-
-    function createLocal (input, format, locale, strict) {
-        return createLocalOrUTC(input, format, locale, strict, false);
-    }
-
-    var prototypeMin = deprecate(
-        'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/',
-        function () {
-            var other = createLocal.apply(null, arguments);
-            if (this.isValid() && other.isValid()) {
-                return other < this ? this : other;
-            } else {
-                return createInvalid();
-            }
-        }
-    );
-
-    var prototypeMax = deprecate(
-        'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/',
-        function () {
-            var other = createLocal.apply(null, arguments);
-            if (this.isValid() && other.isValid()) {
-                return other > this ? this : other;
-            } else {
-                return createInvalid();
-            }
-        }
-    );
-
-    // Pick a moment m from moments so that m[fn](other) is true for all
-    // other. This relies on the function fn to be transitive.
-    //
-    // moments should either be an array of moment objects or an array, whose
-    // first element is an array of moment objects.
-    function pickBy(fn, moments) {
-        var res, i;
-        if (moments.length === 1 && isArray(moments[0])) {
-            moments = moments[0];
-        }
-        if (!moments.length) {
-            return createLocal();
-        }
-        res = moments[0];
-        for (i = 1; i < moments.length; ++i) {
-            if (!moments[i].isValid() || moments[i][fn](res)) {
-                res = moments[i];
-            }
-        }
-        return res;
-    }
-
-    // TODO: Use [].sort instead?
-    function min () {
-        var args = [].slice.call(arguments, 0);
-
-        return pickBy('isBefore', args);
-    }
-
-    function max () {
-        var args = [].slice.call(arguments, 0);
-
-        return pickBy('isAfter', args);
-    }
-
-    var now = function () {
-        return Date.now ? Date.now() : +(new Date());
-    };
-
-    var ordering = ['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond'];
-
-    function isDurationValid(m) {
-        for (var key in m) {
-            if (!(indexOf.call(ordering, key) !== -1 && (m[key] == null || !isNaN(m[key])))) {
-                return false;
-            }
-        }
-
-        var unitHasDecimal = false;
-        for (var i = 0; i < ordering.length; ++i) {
-            if (m[ordering[i]]) {
-                if (unitHasDecimal) {
-                    return false; // only allow non-integers for smallest unit
-                }
-                if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) {
-                    unitHasDecimal = true;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    function isValid$1() {
-        return this._isValid;
-    }
-
-    function createInvalid$1() {
-        return createDuration(NaN);
-    }
-
-    function Duration (duration) {
-        var normalizedInput = normalizeObjectUnits(duration),
-            years = normalizedInput.year || 0,
-            quarters = normalizedInput.quarter || 0,
-            months = normalizedInput.month || 0,
-            weeks = normalizedInput.week || normalizedInput.isoWeek || 0,
-            days = normalizedInput.day || 0,
-            hours = normalizedInput.hour || 0,
-            minutes = normalizedInput.minute || 0,
-            seconds = normalizedInput.second || 0,
-            milliseconds = normalizedInput.millisecond || 0;
-
-        this._isValid = isDurationValid(normalizedInput);
-
-        // representation for dateAddRemove
-        this._milliseconds = +milliseconds +
-            seconds * 1e3 + // 1000
-            minutes * 6e4 + // 1000 * 60
-            hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978
-        // Because of dateAddRemove treats 24 hours as different from a
-        // day when working around DST, we need to store them separately
-        this._days = +days +
-            weeks * 7;
-        // It is impossible to translate months into days without knowing
-        // which months you are are talking about, so we have to store
-        // it separately.
-        this._months = +months +
-            quarters * 3 +
-            years * 12;
-
-        this._data = {};
-
-        this._locale = getLocale();
-
-        this._bubble();
-    }
-
-    function isDuration (obj) {
-        return obj instanceof Duration;
-    }
-
-    function absRound (number) {
-        if (number < 0) {
-            return Math.round(-1 * number) * -1;
-        } else {
-            return Math.round(number);
-        }
-    }
-
-    // FORMATTING
-
-    function offset (token, separator) {
-        addFormatToken(token, 0, 0, function () {
-            var offset = this.utcOffset();
-            var sign = '+';
-            if (offset < 0) {
-                offset = -offset;
-                sign = '-';
-            }
-            return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
-        });
-    }
-
-    offset('Z', ':');
-    offset('ZZ', '');
-
-    // PARSING
-
-    addRegexToken('Z',  matchShortOffset);
-    addRegexToken('ZZ', matchShortOffset);
-    addParseToken(['Z', 'ZZ'], function (input, array, config) {
-        config._useUTC = true;
-        config._tzm = offsetFromString(matchShortOffset, input);
-    });
-
-    // HELPERS
-
-    // timezone chunker
-    // '+10:00' > ['10',  '00']
-    // '-1530'  > ['-15', '30']
-    var chunkOffset = /([\+\-]|\d\d)/gi;
-
-    function offsetFromString(matcher, string) {
-        var matches = (string || '').match(matcher);
-
-        if (matches === null) {
-            return null;
-        }
-
-        var chunk   = matches[matches.length - 1] || [];
-        var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
-        var minutes = +(parts[1] * 60) + toInt(parts[2]);
-
-        return minutes === 0 ?
-          0 :
-          parts[0] === '+' ? minutes : -minutes;
-    }
-
-    // Return a moment from input, that is local/utc/zone equivalent to model.
-    function cloneWithOffset(input, model) {
-        var res, diff;
-        if (model._isUTC) {
-            res = model.clone();
-            diff = (isMoment(input) || isDate(input) ? input.valueOf() : createLocal(input).valueOf()) - res.valueOf();
-            // Use low-level api, because this fn is low-level api.
-            res._d.setTime(res._d.valueOf() + diff);
-            hooks.updateOffset(res, false);
-            return res;
-        } else {
-            return createLocal(input).local();
-        }
-    }
-
-    function getDateOffset (m) {
-        // On Firefox.24 Date#getTimezoneOffset returns a floating point.
-        // https://github.com/moment/moment/pull/1871
-        return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
-    }
-
-    // HOOKS
-
-    // This function will be called whenever a moment is mutated.
-    // It is intended to keep the offset in sync with the timezone.
-    hooks.updateOffset = function () {};
-
-    // MOMENTS
-
-    // keepLocalTime = true means only change the timezone, without
-    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
-    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
-    // +0200, so we adjust the time as needed, to be valid.
-    //
-    // Keeping the time actually adds/subtracts (one hour)
-    // from the actual represented time. That is why we call updateOffset
-    // a second time. In case it wants us to change the offset again
-    // _changeInProgress == true case, then we have to adjust, because
-    // there is no such time in the given timezone.
-    function getSetOffset (input, keepLocalTime, keepMinutes) {
-        var offset = this._offset || 0,
-            localAdjust;
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        if (input != null) {
-            if (typeof input === 'string') {
-                input = offsetFromString(matchShortOffset, input);
-                if (input === null) {
-                    return this;
-                }
-            } else if (Math.abs(input) < 16 && !keepMinutes) {
-                input = input * 60;
-            }
-            if (!this._isUTC && keepLocalTime) {
-                localAdjust = getDateOffset(this);
-            }
-            this._offset = input;
-            this._isUTC = true;
-            if (localAdjust != null) {
-                this.add(localAdjust, 'm');
-            }
-            if (offset !== input) {
-                if (!keepLocalTime || this._changeInProgress) {
-                    addSubtract(this, createDuration(input - offset, 'm'), 1, false);
-                } else if (!this._changeInProgress) {
-                    this._changeInProgress = true;
-                    hooks.updateOffset(this, true);
-                    this._changeInProgress = null;
-                }
-            }
-            return this;
-        } else {
-            return this._isUTC ? offset : getDateOffset(this);
-        }
-    }
-
-    function getSetZone (input, keepLocalTime) {
-        if (input != null) {
-            if (typeof input !== 'string') {
-                input = -input;
-            }
-
-            this.utcOffset(input, keepLocalTime);
-
-            return this;
-        } else {
-            return -this.utcOffset();
-        }
-    }
-
-    function setOffsetToUTC (keepLocalTime) {
-        return this.utcOffset(0, keepLocalTime);
-    }
-
-    function setOffsetToLocal (keepLocalTime) {
-        if (this._isUTC) {
-            this.utcOffset(0, keepLocalTime);
-            this._isUTC = false;
-
-            if (keepLocalTime) {
-                this.subtract(getDateOffset(this), 'm');
-            }
-        }
-        return this;
-    }
-
-    function setOffsetToParsedOffset () {
-        if (this._tzm != null) {
-            this.utcOffset(this._tzm, false, true);
-        } else if (typeof this._i === 'string') {
-            var tZone = offsetFromString(matchOffset, this._i);
-            if (tZone != null) {
-                this.utcOffset(tZone);
-            }
-            else {
-                this.utcOffset(0, true);
-            }
-        }
-        return this;
-    }
-
-    function hasAlignedHourOffset (input) {
-        if (!this.isValid()) {
-            return false;
-        }
-        input = input ? createLocal(input).utcOffset() : 0;
-
-        return (this.utcOffset() - input) % 60 === 0;
-    }
-
-    function isDaylightSavingTime () {
-        return (
-            this.utcOffset() > this.clone().month(0).utcOffset() ||
-            this.utcOffset() > this.clone().month(5).utcOffset()
-        );
-    }
-
-    function isDaylightSavingTimeShifted () {
-        if (!isUndefined(this._isDSTShifted)) {
-            return this._isDSTShifted;
-        }
-
-        var c = {};
-
-        copyConfig(c, this);
-        c = prepareConfig(c);
-
-        if (c._a) {
-            var other = c._isUTC ? createUTC(c._a) : createLocal(c._a);
-            this._isDSTShifted = this.isValid() &&
-                compareArrays(c._a, other.toArray()) > 0;
-        } else {
-            this._isDSTShifted = false;
-        }
-
-        return this._isDSTShifted;
-    }
-
-    function isLocal () {
-        return this.isValid() ? !this._isUTC : false;
-    }
-
-    function isUtcOffset () {
-        return this.isValid() ? this._isUTC : false;
-    }
-
-    function isUtc () {
-        return this.isValid() ? this._isUTC && this._offset === 0 : false;
-    }
-
-    // ASP.NET json date format regex
-    var aspNetRegex = /^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/;
-
-    // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
-    // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
-    // and further modified to allow for strings containing both week and day
-    var isoRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
-
-    function createDuration (input, key) {
-        var duration = input,
-            // matching against regexp is expensive, do it on demand
-            match = null,
-            sign,
-            ret,
-            diffRes;
-
-        if (isDuration(input)) {
-            duration = {
-                ms : input._milliseconds,
-                d  : input._days,
-                M  : input._months
-            };
-        } else if (isNumber(input)) {
-            duration = {};
-            if (key) {
-                duration[key] = input;
-            } else {
-                duration.milliseconds = input;
-            }
-        } else if (!!(match = aspNetRegex.exec(input))) {
-            sign = (match[1] === '-') ? -1 : 1;
-            duration = {
-                y  : 0,
-                d  : toInt(match[DATE])                         * sign,
-                h  : toInt(match[HOUR])                         * sign,
-                m  : toInt(match[MINUTE])                       * sign,
-                s  : toInt(match[SECOND])                       * sign,
-                ms : toInt(absRound(match[MILLISECOND] * 1000)) * sign // the millisecond decimal point is included in the match
-            };
-        } else if (!!(match = isoRegex.exec(input))) {
-            sign = (match[1] === '-') ? -1 : 1;
-            duration = {
-                y : parseIso(match[2], sign),
-                M : parseIso(match[3], sign),
-                w : parseIso(match[4], sign),
-                d : parseIso(match[5], sign),
-                h : parseIso(match[6], sign),
-                m : parseIso(match[7], sign),
-                s : parseIso(match[8], sign)
-            };
-        } else if (duration == null) {// checks for null or undefined
-            duration = {};
-        } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
-            diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to));
-
-            duration = {};
-            duration.ms = diffRes.milliseconds;
-            duration.M = diffRes.months;
-        }
-
-        ret = new Duration(duration);
-
-        if (isDuration(input) && hasOwnProp(input, '_locale')) {
-            ret._locale = input._locale;
-        }
-
-        return ret;
-    }
-
-    createDuration.fn = Duration.prototype;
-    createDuration.invalid = createInvalid$1;
-
-    function parseIso (inp, sign) {
-        // We'd normally use ~~inp for this, but unfortunately it also
-        // converts floats to ints.
-        // inp may be undefined, so careful calling replace on it.
-        var res = inp && parseFloat(inp.replace(',', '.'));
-        // apply sign while we're at it
-        return (isNaN(res) ? 0 : res) * sign;
-    }
-
-    function positiveMomentsDifference(base, other) {
-        var res = {milliseconds: 0, months: 0};
-
-        res.months = other.month() - base.month() +
-            (other.year() - base.year()) * 12;
-        if (base.clone().add(res.months, 'M').isAfter(other)) {
-            --res.months;
-        }
-
-        res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
-
-        return res;
-    }
-
-    function momentsDifference(base, other) {
-        var res;
-        if (!(base.isValid() && other.isValid())) {
-            return {milliseconds: 0, months: 0};
-        }
-
-        other = cloneWithOffset(other, base);
-        if (base.isBefore(other)) {
-            res = positiveMomentsDifference(base, other);
-        } else {
-            res = positiveMomentsDifference(other, base);
-            res.milliseconds = -res.milliseconds;
-            res.months = -res.months;
-        }
-
-        return res;
-    }
-
-    // TODO: remove 'name' arg after deprecation is removed
-    function createAdder(direction, name) {
-        return function (val, period) {
-            var dur, tmp;
-            //invert the arguments, but complain about it
-            if (period !== null && !isNaN(+period)) {
-                deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period). ' +
-                'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.');
-                tmp = val; val = period; period = tmp;
-            }
-
-            val = typeof val === 'string' ? +val : val;
-            dur = createDuration(val, period);
-            addSubtract(this, dur, direction);
-            return this;
-        };
-    }
-
-    function addSubtract (mom, duration, isAdding, updateOffset) {
-        var milliseconds = duration._milliseconds,
-            days = absRound(duration._days),
-            months = absRound(duration._months);
-
-        if (!mom.isValid()) {
-            // No op
-            return;
-        }
-
-        updateOffset = updateOffset == null ? true : updateOffset;
-
-        if (months) {
-            setMonth(mom, get(mom, 'Month') + months * isAdding);
-        }
-        if (days) {
-            set$1(mom, 'Date', get(mom, 'Date') + days * isAdding);
-        }
-        if (milliseconds) {
-            mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding);
-        }
-        if (updateOffset) {
-            hooks.updateOffset(mom, days || months);
-        }
-    }
-
-    var add      = createAdder(1, 'add');
-    var subtract = createAdder(-1, 'subtract');
-
-    function getCalendarFormat(myMoment, now) {
-        var diff = myMoment.diff(now, 'days', true);
-        return diff < -6 ? 'sameElse' :
-                diff < -1 ? 'lastWeek' :
-                diff < 0 ? 'lastDay' :
-                diff < 1 ? 'sameDay' :
-                diff < 2 ? 'nextDay' :
-                diff < 7 ? 'nextWeek' : 'sameElse';
-    }
-
-    function calendar$1 (time, formats) {
-        // We want to compare the start of today, vs this.
-        // Getting start-of-today depends on whether we're local/utc/offset or not.
-        var now = time || createLocal(),
-            sod = cloneWithOffset(now, this).startOf('day'),
-            format = hooks.calendarFormat(this, sod) || 'sameElse';
-
-        var output = formats && (isFunction(formats[format]) ? formats[format].call(this, now) : formats[format]);
-
-        return this.format(output || this.localeData().calendar(format, this, createLocal(now)));
-    }
-
-    function clone () {
-        return new Moment(this);
-    }
-
-    function isAfter (input, units) {
-        var localInput = isMoment(input) ? input : createLocal(input);
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(units) || 'millisecond';
-        if (units === 'millisecond') {
-            return this.valueOf() > localInput.valueOf();
-        } else {
-            return localInput.valueOf() < this.clone().startOf(units).valueOf();
-        }
-    }
-
-    function isBefore (input, units) {
-        var localInput = isMoment(input) ? input : createLocal(input);
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(units) || 'millisecond';
-        if (units === 'millisecond') {
-            return this.valueOf() < localInput.valueOf();
-        } else {
-            return this.clone().endOf(units).valueOf() < localInput.valueOf();
-        }
-    }
-
-    function isBetween (from, to, units, inclusivity) {
-        var localFrom = isMoment(from) ? from : createLocal(from),
-            localTo = isMoment(to) ? to : createLocal(to);
-        if (!(this.isValid() && localFrom.isValid() && localTo.isValid())) {
-            return false;
-        }
-        inclusivity = inclusivity || '()';
-        return (inclusivity[0] === '(' ? this.isAfter(localFrom, units) : !this.isBefore(localFrom, units)) &&
-            (inclusivity[1] === ')' ? this.isBefore(localTo, units) : !this.isAfter(localTo, units));
-    }
-
-    function isSame (input, units) {
-        var localInput = isMoment(input) ? input : createLocal(input),
-            inputMs;
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(units) || 'millisecond';
-        if (units === 'millisecond') {
-            return this.valueOf() === localInput.valueOf();
-        } else {
-            inputMs = localInput.valueOf();
-            return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf();
-        }
-    }
-
-    function isSameOrAfter (input, units) {
-        return this.isSame(input, units) || this.isAfter(input, units);
-    }
-
-    function isSameOrBefore (input, units) {
-        return this.isSame(input, units) || this.isBefore(input, units);
-    }
-
-    function diff (input, units, asFloat) {
-        var that,
-            zoneDelta,
-            output;
-
-        if (!this.isValid()) {
-            return NaN;
-        }
-
-        that = cloneWithOffset(input, this);
-
-        if (!that.isValid()) {
-            return NaN;
-        }
-
-        zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;
-
-        units = normalizeUnits(units);
-
-        switch (units) {
-            case 'year': output = monthDiff(this, that) / 12; break;
-            case 'month': output = monthDiff(this, that); break;
-            case 'quarter': output = monthDiff(this, that) / 3; break;
-            case 'second': output = (this - that) / 1e3; break; // 1000
-            case 'minute': output = (this - that) / 6e4; break; // 1000 * 60
-            case 'hour': output = (this - that) / 36e5; break; // 1000 * 60 * 60
-            case 'day': output = (this - that - zoneDelta) / 864e5; break; // 1000 * 60 * 60 * 24, negate dst
-            case 'week': output = (this - that - zoneDelta) / 6048e5; break; // 1000 * 60 * 60 * 24 * 7, negate dst
-            default: output = this - that;
-        }
-
-        return asFloat ? output : absFloor(output);
-    }
-
-    function monthDiff (a, b) {
-        // difference in months
-        var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
-            // b is in (anchor - 1 month, anchor + 1 month)
-            anchor = a.clone().add(wholeMonthDiff, 'months'),
-            anchor2, adjust;
-
-        if (b - anchor < 0) {
-            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
-            // linear across the month
-            adjust = (b - anchor) / (anchor - anchor2);
-        } else {
-            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
-            // linear across the month
-            adjust = (b - anchor) / (anchor2 - anchor);
-        }
-
-        //check for negative zero, return zero if negative zero
-        return -(wholeMonthDiff + adjust) || 0;
-    }
-
-    hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
-    hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]';
-
-    function toString () {
-        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
-    }
-
-    function toISOString(keepOffset) {
-        if (!this.isValid()) {
-            return null;
-        }
-        var utc = keepOffset !== true;
-        var m = utc ? this.clone().utc() : this;
-        if (m.year() < 0 || m.year() > 9999) {
-            return formatMoment(m, utc ? 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYYYY-MM-DD[T]HH:mm:ss.SSSZ');
-        }
-        if (isFunction(Date.prototype.toISOString)) {
-            // native implementation is ~50x faster, use it when we can
-            if (utc) {
-                return this.toDate().toISOString();
-            } else {
-                return new Date(this.valueOf() + this.utcOffset() * 60 * 1000).toISOString().replace('Z', formatMoment(m, 'Z'));
-            }
-        }
-        return formatMoment(m, utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ');
-    }
-
-    /**
-     * Return a human readable representation of a moment that can
-     * also be evaluated to get a new moment which is the same
-     *
-     * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects
-     */
-    function inspect () {
-        if (!this.isValid()) {
-            return 'moment.invalid(/* ' + this._i + ' */)';
-        }
-        var func = 'moment';
-        var zone = '';
-        if (!this.isLocal()) {
-            func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone';
-            zone = 'Z';
-        }
-        var prefix = '[' + func + '("]';
-        var year = (0 <= this.year() && this.year() <= 9999) ? 'YYYY' : 'YYYYYY';
-        var datetime = '-MM-DD[T]HH:mm:ss.SSS';
-        var suffix = zone + '[")]';
-
-        return this.format(prefix + year + datetime + suffix);
-    }
-
-    function format (inputString) {
-        if (!inputString) {
-            inputString = this.isUtc() ? hooks.defaultFormatUtc : hooks.defaultFormat;
-        }
-        var output = formatMoment(this, inputString);
-        return this.localeData().postformat(output);
-    }
-
-    function from (time, withoutSuffix) {
-        if (this.isValid() &&
-                ((isMoment(time) && time.isValid()) ||
-                 createLocal(time).isValid())) {
-            return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
-        } else {
-            return this.localeData().invalidDate();
-        }
-    }
-
-    function fromNow (withoutSuffix) {
-        return this.from(createLocal(), withoutSuffix);
-    }
-
-    function to (time, withoutSuffix) {
-        if (this.isValid() &&
-                ((isMoment(time) && time.isValid()) ||
-                 createLocal(time).isValid())) {
-            return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
-        } else {
-            return this.localeData().invalidDate();
-        }
-    }
-
-    function toNow (withoutSuffix) {
-        return this.to(createLocal(), withoutSuffix);
-    }
-
-    // If passed a locale key, it will set the locale for this
-    // instance.  Otherwise, it will return the locale configuration
-    // variables for this instance.
-    function locale (key) {
-        var newLocaleData;
-
-        if (key === undefined) {
-            return this._locale._abbr;
-        } else {
-            newLocaleData = getLocale(key);
-            if (newLocaleData != null) {
-                this._locale = newLocaleData;
-            }
-            return this;
-        }
-    }
-
-    var lang = deprecate(
-        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
-        function (key) {
-            if (key === undefined) {
-                return this.localeData();
-            } else {
-                return this.locale(key);
-            }
-        }
-    );
-
-    function localeData () {
-        return this._locale;
-    }
-
-    function startOf (units) {
-        units = normalizeUnits(units);
-        // the following switch intentionally omits break keywords
-        // to utilize falling through the cases.
-        switch (units) {
-            case 'year':
-                this.month(0);
-                /* falls through */
-            case 'quarter':
-            case 'month':
-                this.date(1);
-                /* falls through */
-            case 'week':
-            case 'isoWeek':
-            case 'day':
-            case 'date':
-                this.hours(0);
-                /* falls through */
-            case 'hour':
-                this.minutes(0);
-                /* falls through */
-            case 'minute':
-                this.seconds(0);
-                /* falls through */
-            case 'second':
-                this.milliseconds(0);
-        }
-
-        // weeks are a special case
-        if (units === 'week') {
-            this.weekday(0);
-        }
-        if (units === 'isoWeek') {
-            this.isoWeekday(1);
-        }
-
-        // quarters are also special
-        if (units === 'quarter') {
-            this.month(Math.floor(this.month() / 3) * 3);
-        }
-
-        return this;
-    }
-
-    function endOf (units) {
-        units = normalizeUnits(units);
-        if (units === undefined || units === 'millisecond') {
-            return this;
-        }
-
-        // 'date' is an alias for 'day', so it should be considered as such.
-        if (units === 'date') {
-            units = 'day';
-        }
-
-        return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms');
-    }
-
-    function valueOf () {
-        return this._d.valueOf() - ((this._offset || 0) * 60000);
-    }
-
-    function unix () {
-        return Math.floor(this.valueOf() / 1000);
-    }
-
-    function toDate () {
-        return new Date(this.valueOf());
-    }
-
-    function toArray () {
-        var m = this;
-        return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
-    }
-
-    function toObject () {
-        var m = this;
-        return {
-            years: m.year(),
-            months: m.month(),
-            date: m.date(),
-            hours: m.hours(),
-            minutes: m.minutes(),
-            seconds: m.seconds(),
-            milliseconds: m.milliseconds()
-        };
-    }
-
-    function toJSON () {
-        // new Date(NaN).toJSON() === null
-        return this.isValid() ? this.toISOString() : null;
-    }
-
-    function isValid$2 () {
-        return isValid(this);
-    }
-
-    function parsingFlags () {
-        return extend({}, getParsingFlags(this));
-    }
-
-    function invalidAt () {
-        return getParsingFlags(this).overflow;
-    }
-
-    function creationData() {
-        return {
-            input: this._i,
-            format: this._f,
-            locale: this._locale,
-            isUTC: this._isUTC,
-            strict: this._strict
-        };
-    }
-
-    // FORMATTING
-
-    addFormatToken(0, ['gg', 2], 0, function () {
-        return this.weekYear() % 100;
-    });
-
-    addFormatToken(0, ['GG', 2], 0, function () {
-        return this.isoWeekYear() % 100;
-    });
-
-    function addWeekYearFormatToken (token, getter) {
-        addFormatToken(0, [token, token.length], 0, getter);
-    }
-
-    addWeekYearFormatToken('gggg',     'weekYear');
-    addWeekYearFormatToken('ggggg',    'weekYear');
-    addWeekYearFormatToken('GGGG',  'isoWeekYear');
-    addWeekYearFormatToken('GGGGG', 'isoWeekYear');
-
-    // ALIASES
-
-    addUnitAlias('weekYear', 'gg');
-    addUnitAlias('isoWeekYear', 'GG');
-
-    // PRIORITY
-
-    addUnitPriority('weekYear', 1);
-    addUnitPriority('isoWeekYear', 1);
-
-
-    // PARSING
-
-    addRegexToken('G',      matchSigned);
-    addRegexToken('g',      matchSigned);
-    addRegexToken('GG',     match1to2, match2);
-    addRegexToken('gg',     match1to2, match2);
-    addRegexToken('GGGG',   match1to4, match4);
-    addRegexToken('gggg',   match1to4, match4);
-    addRegexToken('GGGGG',  match1to6, match6);
-    addRegexToken('ggggg',  match1to6, match6);
-
-    addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
-        week[token.substr(0, 2)] = toInt(input);
-    });
-
-    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
-        week[token] = hooks.parseTwoDigitYear(input);
-    });
-
-    // MOMENTS
-
-    function getSetWeekYear (input) {
-        return getSetWeekYearHelper.call(this,
-                input,
-                this.week(),
-                this.weekday(),
-                this.localeData()._week.dow,
-                this.localeData()._week.doy);
-    }
-
-    function getSetISOWeekYear (input) {
-        return getSetWeekYearHelper.call(this,
-                input, this.isoWeek(), this.isoWeekday(), 1, 4);
-    }
-
-    function getISOWeeksInYear () {
-        return weeksInYear(this.year(), 1, 4);
-    }
-
-    function getWeeksInYear () {
-        var weekInfo = this.localeData()._week;
-        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
-    }
-
-    function getSetWeekYearHelper(input, week, weekday, dow, doy) {
-        var weeksTarget;
-        if (input == null) {
-            return weekOfYear(this, dow, doy).year;
-        } else {
-            weeksTarget = weeksInYear(input, dow, doy);
-            if (week > weeksTarget) {
-                week = weeksTarget;
-            }
-            return setWeekAll.call(this, input, week, weekday, dow, doy);
-        }
-    }
-
-    function setWeekAll(weekYear, week, weekday, dow, doy) {
-        var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),
-            date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);
-
-        this.year(date.getUTCFullYear());
-        this.month(date.getUTCMonth());
-        this.date(date.getUTCDate());
-        return this;
-    }
-
-    // FORMATTING
-
-    addFormatToken('Q', 0, 'Qo', 'quarter');
-
-    // ALIASES
-
-    addUnitAlias('quarter', 'Q');
-
-    // PRIORITY
-
-    addUnitPriority('quarter', 7);
-
-    // PARSING
-
-    addRegexToken('Q', match1);
-    addParseToken('Q', function (input, array) {
-        array[MONTH] = (toInt(input) - 1) * 3;
-    });
-
-    // MOMENTS
-
-    function getSetQuarter (input) {
-        return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
-    }
-
-    // FORMATTING
-
-    addFormatToken('D', ['DD', 2], 'Do', 'date');
-
-    // ALIASES
-
-    addUnitAlias('date', 'D');
-
-    // PRIORITY
-    addUnitPriority('date', 9);
-
-    // PARSING
-
-    addRegexToken('D',  match1to2);
-    addRegexToken('DD', match1to2, match2);
-    addRegexToken('Do', function (isStrict, locale) {
-        // TODO: Remove "ordinalParse" fallback in next major release.
-        return isStrict ?
-          (locale._dayOfMonthOrdinalParse || locale._ordinalParse) :
-          locale._dayOfMonthOrdinalParseLenient;
-    });
-
-    addParseToken(['D', 'DD'], DATE);
-    addParseToken('Do', function (input, array) {
-        array[DATE] = toInt(input.match(match1to2)[0]);
-    });
-
-    // MOMENTS
-
-    var getSetDayOfMonth = makeGetSet('Date', true);
-
-    // FORMATTING
-
-    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
-
-    // ALIASES
-
-    addUnitAlias('dayOfYear', 'DDD');
-
-    // PRIORITY
-    addUnitPriority('dayOfYear', 4);
-
-    // PARSING
-
-    addRegexToken('DDD',  match1to3);
-    addRegexToken('DDDD', match3);
-    addParseToken(['DDD', 'DDDD'], function (input, array, config) {
-        config._dayOfYear = toInt(input);
-    });
-
-    // HELPERS
-
-    // MOMENTS
-
-    function getSetDayOfYear (input) {
-        var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
-        return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
-    }
-
-    // FORMATTING
-
-    addFormatToken('m', ['mm', 2], 0, 'minute');
-
-    // ALIASES
-
-    addUnitAlias('minute', 'm');
-
-    // PRIORITY
-
-    addUnitPriority('minute', 14);
-
-    // PARSING
-
-    addRegexToken('m',  match1to2);
-    addRegexToken('mm', match1to2, match2);
-    addParseToken(['m', 'mm'], MINUTE);
-
-    // MOMENTS
-
-    var getSetMinute = makeGetSet('Minutes', false);
-
-    // FORMATTING
-
-    addFormatToken('s', ['ss', 2], 0, 'second');
-
-    // ALIASES
-
-    addUnitAlias('second', 's');
-
-    // PRIORITY
-
-    addUnitPriority('second', 15);
-
-    // PARSING
-
-    addRegexToken('s',  match1to2);
-    addRegexToken('ss', match1to2, match2);
-    addParseToken(['s', 'ss'], SECOND);
-
-    // MOMENTS
-
-    var getSetSecond = makeGetSet('Seconds', false);
-
-    // FORMATTING
-
-    addFormatToken('S', 0, 0, function () {
-        return ~~(this.millisecond() / 100);
-    });
-
-    addFormatToken(0, ['SS', 2], 0, function () {
-        return ~~(this.millisecond() / 10);
-    });
-
-    addFormatToken(0, ['SSS', 3], 0, 'millisecond');
-    addFormatToken(0, ['SSSS', 4], 0, function () {
-        return this.millisecond() * 10;
-    });
-    addFormatToken(0, ['SSSSS', 5], 0, function () {
-        return this.millisecond() * 100;
-    });
-    addFormatToken(0, ['SSSSSS', 6], 0, function () {
-        return this.millisecond() * 1000;
-    });
-    addFormatToken(0, ['SSSSSSS', 7], 0, function () {
-        return this.millisecond() * 10000;
-    });
-    addFormatToken(0, ['SSSSSSSS', 8], 0, function () {
-        return this.millisecond() * 100000;
-    });
-    addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
-        return this.millisecond() * 1000000;
-    });
-
-
-    // ALIASES
-
-    addUnitAlias('millisecond', 'ms');
-
-    // PRIORITY
-
-    addUnitPriority('millisecond', 16);
-
-    // PARSING
-
-    addRegexToken('S',    match1to3, match1);
-    addRegexToken('SS',   match1to3, match2);
-    addRegexToken('SSS',  match1to3, match3);
-
-    var token;
-    for (token = 'SSSS'; token.length <= 9; token += 'S') {
-        addRegexToken(token, matchUnsigned);
-    }
-
-    function parseMs(input, array) {
-        array[MILLISECOND] = toInt(('0.' + input) * 1000);
-    }
-
-    for (token = 'S'; token.length <= 9; token += 'S') {
-        addParseToken(token, parseMs);
-    }
-    // MOMENTS
-
-    var getSetMillisecond = makeGetSet('Milliseconds', false);
-
-    // FORMATTING
-
-    addFormatToken('z',  0, 0, 'zoneAbbr');
-    addFormatToken('zz', 0, 0, 'zoneName');
-
-    // MOMENTS
-
-    function getZoneAbbr () {
-        return this._isUTC ? 'UTC' : '';
-    }
-
-    function getZoneName () {
-        return this._isUTC ? 'Coordinated Universal Time' : '';
-    }
-
-    var proto = Moment.prototype;
-
-    proto.add               = add;
-    proto.calendar          = calendar$1;
-    proto.clone             = clone;
-    proto.diff              = diff;
-    proto.endOf             = endOf;
-    proto.format            = format;
-    proto.from              = from;
-    proto.fromNow           = fromNow;
-    proto.to                = to;
-    proto.toNow             = toNow;
-    proto.get               = stringGet;
-    proto.invalidAt         = invalidAt;
-    proto.isAfter           = isAfter;
-    proto.isBefore          = isBefore;
-    proto.isBetween         = isBetween;
-    proto.isSame            = isSame;
-    proto.isSameOrAfter     = isSameOrAfter;
-    proto.isSameOrBefore    = isSameOrBefore;
-    proto.isValid           = isValid$2;
-    proto.lang              = lang;
-    proto.locale            = locale;
-    proto.localeData        = localeData;
-    proto.max               = prototypeMax;
-    proto.min               = prototypeMin;
-    proto.parsingFlags      = parsingFlags;
-    proto.set               = stringSet;
-    proto.startOf           = startOf;
-    proto.subtract          = subtract;
-    proto.toArray           = toArray;
-    proto.toObject          = toObject;
-    proto.toDate            = toDate;
-    proto.toISOString       = toISOString;
-    proto.inspect           = inspect;
-    proto.toJSON            = toJSON;
-    proto.toString          = toString;
-    proto.unix              = unix;
-    proto.valueOf           = valueOf;
-    proto.creationData      = creationData;
-    proto.year       = getSetYear;
-    proto.isLeapYear = getIsLeapYear;
-    proto.weekYear    = getSetWeekYear;
-    proto.isoWeekYear = getSetISOWeekYear;
-    proto.quarter = proto.quarters = getSetQuarter;
-    proto.month       = getSetMonth;
-    proto.daysInMonth = getDaysInMonth;
-    proto.week           = proto.weeks        = getSetWeek;
-    proto.isoWeek        = proto.isoWeeks     = getSetISOWeek;
-    proto.weeksInYear    = getWeeksInYear;
-    proto.isoWeeksInYear = getISOWeeksInYear;
-    proto.date       = getSetDayOfMonth;
-    proto.day        = proto.days             = getSetDayOfWeek;
-    proto.weekday    = getSetLocaleDayOfWeek;
-    proto.isoWeekday = getSetISODayOfWeek;
-    proto.dayOfYear  = getSetDayOfYear;
-    proto.hour = proto.hours = getSetHour;
-    proto.minute = proto.minutes = getSetMinute;
-    proto.second = proto.seconds = getSetSecond;
-    proto.millisecond = proto.milliseconds = getSetMillisecond;
-    proto.utcOffset            = getSetOffset;
-    proto.utc                  = setOffsetToUTC;
-    proto.local                = setOffsetToLocal;
-    proto.parseZone            = setOffsetToParsedOffset;
-    proto.hasAlignedHourOffset = hasAlignedHourOffset;
-    proto.isDST                = isDaylightSavingTime;
-    proto.isLocal              = isLocal;
-    proto.isUtcOffset          = isUtcOffset;
-    proto.isUtc                = isUtc;
-    proto.isUTC                = isUtc;
-    proto.zoneAbbr = getZoneAbbr;
-    proto.zoneName = getZoneName;
-    proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
-    proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
-    proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
-    proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/', getSetZone);
-    proto.isDSTShifted = deprecate('isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information', isDaylightSavingTimeShifted);
-
-    function createUnix (input) {
-        return createLocal(input * 1000);
-    }
-
-    function createInZone () {
-        return createLocal.apply(null, arguments).parseZone();
-    }
-
-    function preParsePostFormat (string) {
-        return string;
-    }
-
-    var proto$1 = Locale.prototype;
-
-    proto$1.calendar        = calendar;
-    proto$1.longDateFormat  = longDateFormat;
-    proto$1.invalidDate     = invalidDate;
-    proto$1.ordinal         = ordinal;
-    proto$1.preparse        = preParsePostFormat;
-    proto$1.postformat      = preParsePostFormat;
-    proto$1.relativeTime    = relativeTime;
-    proto$1.pastFuture      = pastFuture;
-    proto$1.set             = set;
-
-    proto$1.months            =        localeMonths;
-    proto$1.monthsShort       =        localeMonthsShort;
-    proto$1.monthsParse       =        localeMonthsParse;
-    proto$1.monthsRegex       = monthsRegex;
-    proto$1.monthsShortRegex  = monthsShortRegex;
-    proto$1.week = localeWeek;
-    proto$1.firstDayOfYear = localeFirstDayOfYear;
-    proto$1.firstDayOfWeek = localeFirstDayOfWeek;
-
-    proto$1.weekdays       =        localeWeekdays;
-    proto$1.weekdaysMin    =        localeWeekdaysMin;
-    proto$1.weekdaysShort  =        localeWeekdaysShort;
-    proto$1.weekdaysParse  =        localeWeekdaysParse;
-
-    proto$1.weekdaysRegex       =        weekdaysRegex;
-    proto$1.weekdaysShortRegex  =        weekdaysShortRegex;
-    proto$1.weekdaysMinRegex    =        weekdaysMinRegex;
-
-    proto$1.isPM = localeIsPM;
-    proto$1.meridiem = localeMeridiem;
-
-    function get$1 (format, index, field, setter) {
-        var locale = getLocale();
-        var utc = createUTC().set(setter, index);
-        return locale[field](utc, format);
-    }
-
-    function listMonthsImpl (format, index, field) {
-        if (isNumber(format)) {
-            index = format;
-            format = undefined;
-        }
-
-        format = format || '';
-
-        if (index != null) {
-            return get$1(format, index, field, 'month');
-        }
-
-        var i;
-        var out = [];
-        for (i = 0; i < 12; i++) {
-            out[i] = get$1(format, i, field, 'month');
-        }
-        return out;
-    }
-
-    // ()
-    // (5)
-    // (fmt, 5)
-    // (fmt)
-    // (true)
-    // (true, 5)
-    // (true, fmt, 5)
-    // (true, fmt)
-    function listWeekdaysImpl (localeSorted, format, index, field) {
-        if (typeof localeSorted === 'boolean') {
-            if (isNumber(format)) {
-                index = format;
-                format = undefined;
-            }
-
-            format = format || '';
-        } else {
-            format = localeSorted;
-            index = format;
-            localeSorted = false;
-
-            if (isNumber(format)) {
-                index = format;
-                format = undefined;
-            }
-
-            format = format || '';
-        }
-
-        var locale = getLocale(),
-            shift = localeSorted ? locale._week.dow : 0;
-
-        if (index != null) {
-            return get$1(format, (index + shift) % 7, field, 'day');
-        }
-
-        var i;
-        var out = [];
-        for (i = 0; i < 7; i++) {
-            out[i] = get$1(format, (i + shift) % 7, field, 'day');
-        }
-        return out;
-    }
-
-    function listMonths (format, index) {
-        return listMonthsImpl(format, index, 'months');
-    }
-
-    function listMonthsShort (format, index) {
-        return listMonthsImpl(format, index, 'monthsShort');
-    }
-
-    function listWeekdays (localeSorted, format, index) {
-        return listWeekdaysImpl(localeSorted, format, index, 'weekdays');
-    }
-
-    function listWeekdaysShort (localeSorted, format, index) {
-        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort');
-    }
-
-    function listWeekdaysMin (localeSorted, format, index) {
-        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin');
-    }
-
-    getSetGlobalLocale('en', {
-        dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (toInt(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        }
-    });
-
-    // Side effect imports
-
-    hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale);
-    hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale);
-
-    var mathAbs = Math.abs;
-
-    function abs () {
-        var data           = this._data;
-
-        this._milliseconds = mathAbs(this._milliseconds);
-        this._days         = mathAbs(this._days);
-        this._months       = mathAbs(this._months);
-
-        data.milliseconds  = mathAbs(data.milliseconds);
-        data.seconds       = mathAbs(data.seconds);
-        data.minutes       = mathAbs(data.minutes);
-        data.hours         = mathAbs(data.hours);
-        data.months        = mathAbs(data.months);
-        data.years         = mathAbs(data.years);
-
-        return this;
-    }
-
-    function addSubtract$1 (duration, input, value, direction) {
-        var other = createDuration(input, value);
-
-        duration._milliseconds += direction * other._milliseconds;
-        duration._days         += direction * other._days;
-        duration._months       += direction * other._months;
-
-        return duration._bubble();
-    }
-
-    // supports only 2.0-style add(1, 's') or add(duration)
-    function add$1 (input, value) {
-        return addSubtract$1(this, input, value, 1);
-    }
-
-    // supports only 2.0-style subtract(1, 's') or subtract(duration)
-    function subtract$1 (input, value) {
-        return addSubtract$1(this, input, value, -1);
-    }
-
-    function absCeil (number) {
-        if (number < 0) {
-            return Math.floor(number);
-        } else {
-            return Math.ceil(number);
-        }
-    }
-
-    function bubble () {
-        var milliseconds = this._milliseconds;
-        var days         = this._days;
-        var months       = this._months;
-        var data         = this._data;
-        var seconds, minutes, hours, years, monthsFromDays;
-
-        // if we have a mix of positive and negative values, bubble down first
-        // check: https://github.com/moment/moment/issues/2166
-        if (!((milliseconds >= 0 && days >= 0 && months >= 0) ||
-                (milliseconds <= 0 && days <= 0 && months <= 0))) {
-            milliseconds += absCeil(monthsToDays(months) + days) * 864e5;
-            days = 0;
-            months = 0;
-        }
-
-        // The following code bubbles up values, see the tests for
-        // examples of what that means.
-        data.milliseconds = milliseconds % 1000;
-
-        seconds           = absFloor(milliseconds / 1000);
-        data.seconds      = seconds % 60;
-
-        minutes           = absFloor(seconds / 60);
-        data.minutes      = minutes % 60;
-
-        hours             = absFloor(minutes / 60);
-        data.hours        = hours % 24;
-
-        days += absFloor(hours / 24);
-
-        // convert days to months
-        monthsFromDays = absFloor(daysToMonths(days));
-        months += monthsFromDays;
-        days -= absCeil(monthsToDays(monthsFromDays));
-
-        // 12 months -> 1 year
-        years = absFloor(months / 12);
-        months %= 12;
-
-        data.days   = days;
-        data.months = months;
-        data.years  = years;
-
-        return this;
-    }
-
-    function daysToMonths (days) {
-        // 400 years have 146097 days (taking into account leap year rules)
-        // 400 years have 12 months === 4800
-        return days * 4800 / 146097;
-    }
-
-    function monthsToDays (months) {
-        // the reverse of daysToMonths
-        return months * 146097 / 4800;
-    }
-
-    function as (units) {
-        if (!this.isValid()) {
-            return NaN;
-        }
-        var days;
-        var months;
-        var milliseconds = this._milliseconds;
-
-        units = normalizeUnits(units);
-
-        if (units === 'month' || units === 'year') {
-            days   = this._days   + milliseconds / 864e5;
-            months = this._months + daysToMonths(days);
-            return units === 'month' ? months : months / 12;
-        } else {
-            // handle milliseconds separately because of floating point math errors (issue #1867)
-            days = this._days + Math.round(monthsToDays(this._months));
-            switch (units) {
-                case 'week'   : return days / 7     + milliseconds / 6048e5;
-                case 'day'    : return days         + milliseconds / 864e5;
-                case 'hour'   : return days * 24    + milliseconds / 36e5;
-                case 'minute' : return days * 1440  + milliseconds / 6e4;
-                case 'second' : return days * 86400 + milliseconds / 1000;
-                // Math.floor prevents floating point math errors here
-                case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
-                default: throw new Error('Unknown unit ' + units);
-            }
-        }
-    }
-
-    // TODO: Use this.as('ms')?
-    function valueOf$1 () {
-        if (!this.isValid()) {
-            return NaN;
-        }
-        return (
-            this._milliseconds +
-            this._days * 864e5 +
-            (this._months % 12) * 2592e6 +
-            toInt(this._months / 12) * 31536e6
-        );
-    }
-
-    function makeAs (alias) {
-        return function () {
-            return this.as(alias);
-        };
-    }
-
-    var asMilliseconds = makeAs('ms');
-    var asSeconds      = makeAs('s');
-    var asMinutes      = makeAs('m');
-    var asHours        = makeAs('h');
-    var asDays         = makeAs('d');
-    var asWeeks        = makeAs('w');
-    var asMonths       = makeAs('M');
-    var asYears        = makeAs('y');
-
-    function clone$1 () {
-        return createDuration(this);
-    }
-
-    function get$2 (units) {
-        units = normalizeUnits(units);
-        return this.isValid() ? this[units + 's']() : NaN;
-    }
-
-    function makeGetter(name) {
-        return function () {
-            return this.isValid() ? this._data[name] : NaN;
-        };
-    }
-
-    var milliseconds = makeGetter('milliseconds');
-    var seconds      = makeGetter('seconds');
-    var minutes      = makeGetter('minutes');
-    var hours        = makeGetter('hours');
-    var days         = makeGetter('days');
-    var months       = makeGetter('months');
-    var years        = makeGetter('years');
-
-    function weeks () {
-        return absFloor(this.days() / 7);
-    }
-
-    var round = Math.round;
-    var thresholds = {
-        ss: 44,         // a few seconds to seconds
-        s : 45,         // seconds to minute
-        m : 45,         // minutes to hour
-        h : 22,         // hours to day
-        d : 26,         // days to month
-        M : 11          // months to year
-    };
-
-    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
-    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
-        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
-    }
-
-    function relativeTime$1 (posNegDuration, withoutSuffix, locale) {
-        var duration = createDuration(posNegDuration).abs();
-        var seconds  = round(duration.as('s'));
-        var minutes  = round(duration.as('m'));
-        var hours    = round(duration.as('h'));
-        var days     = round(duration.as('d'));
-        var months   = round(duration.as('M'));
-        var years    = round(duration.as('y'));
-
-        var a = seconds <= thresholds.ss && ['s', seconds]  ||
-                seconds < thresholds.s   && ['ss', seconds] ||
-                minutes <= 1             && ['m']           ||
-                minutes < thresholds.m   && ['mm', minutes] ||
-                hours   <= 1             && ['h']           ||
-                hours   < thresholds.h   && ['hh', hours]   ||
-                days    <= 1             && ['d']           ||
-                days    < thresholds.d   && ['dd', days]    ||
-                months  <= 1             && ['M']           ||
-                months  < thresholds.M   && ['MM', months]  ||
-                years   <= 1             && ['y']           || ['yy', years];
-
-        a[2] = withoutSuffix;
-        a[3] = +posNegDuration > 0;
-        a[4] = locale;
-        return substituteTimeAgo.apply(null, a);
-    }
-
-    // This function allows you to set the rounding function for relative time strings
-    function getSetRelativeTimeRounding (roundingFunction) {
-        if (roundingFunction === undefined) {
-            return round;
-        }
-        if (typeof(roundingFunction) === 'function') {
-            round = roundingFunction;
-            return true;
-        }
-        return false;
-    }
-
-    // This function allows you to set a threshold for relative time strings
-    function getSetRelativeTimeThreshold (threshold, limit) {
-        if (thresholds[threshold] === undefined) {
-            return false;
-        }
-        if (limit === undefined) {
-            return thresholds[threshold];
-        }
-        thresholds[threshold] = limit;
-        if (threshold === 's') {
-            thresholds.ss = limit - 1;
-        }
-        return true;
-    }
-
-    function humanize (withSuffix) {
-        if (!this.isValid()) {
-            return this.localeData().invalidDate();
-        }
-
-        var locale = this.localeData();
-        var output = relativeTime$1(this, !withSuffix, locale);
-
-        if (withSuffix) {
-            output = locale.pastFuture(+this, output);
-        }
-
-        return locale.postformat(output);
-    }
-
-    var abs$1 = Math.abs;
-
-    function sign(x) {
-        return ((x > 0) - (x < 0)) || +x;
-    }
-
-    function toISOString$1() {
-        // for ISO strings we do not use the normal bubbling rules:
-        //  * milliseconds bubble up until they become hours
-        //  * days do not bubble at all
-        //  * months bubble up until they become years
-        // This is because there is no context-free conversion between hours and days
-        // (think of clock changes)
-        // and also not between days and months (28-31 days per month)
-        if (!this.isValid()) {
-            return this.localeData().invalidDate();
-        }
-
-        var seconds = abs$1(this._milliseconds) / 1000;
-        var days         = abs$1(this._days);
-        var months       = abs$1(this._months);
-        var minutes, hours, years;
-
-        // 3600 seconds -> 60 minutes -> 1 hour
-        minutes           = absFloor(seconds / 60);
-        hours             = absFloor(minutes / 60);
-        seconds %= 60;
-        minutes %= 60;
-
-        // 12 months -> 1 year
-        years  = absFloor(months / 12);
-        months %= 12;
-
-
-        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
-        var Y = years;
-        var M = months;
-        var D = days;
-        var h = hours;
-        var m = minutes;
-        var s = seconds ? seconds.toFixed(3).replace(/\.?0+$/, '') : '';
-        var total = this.asSeconds();
-
-        if (!total) {
-            // this is the same as C#'s (Noda) and python (isodate)...
-            // but not other JS (goog.date)
-            return 'P0D';
-        }
-
-        var totalSign = total < 0 ? '-' : '';
-        var ymSign = sign(this._months) !== sign(total) ? '-' : '';
-        var daysSign = sign(this._days) !== sign(total) ? '-' : '';
-        var hmsSign = sign(this._milliseconds) !== sign(total) ? '-' : '';
-
-        return totalSign + 'P' +
-            (Y ? ymSign + Y + 'Y' : '') +
-            (M ? ymSign + M + 'M' : '') +
-            (D ? daysSign + D + 'D' : '') +
-            ((h || m || s) ? 'T' : '') +
-            (h ? hmsSign + h + 'H' : '') +
-            (m ? hmsSign + m + 'M' : '') +
-            (s ? hmsSign + s + 'S' : '');
-    }
-
-    var proto$2 = Duration.prototype;
-
-    proto$2.isValid        = isValid$1;
-    proto$2.abs            = abs;
-    proto$2.add            = add$1;
-    proto$2.subtract       = subtract$1;
-    proto$2.as             = as;
-    proto$2.asMilliseconds = asMilliseconds;
-    proto$2.asSeconds      = asSeconds;
-    proto$2.asMinutes      = asMinutes;
-    proto$2.asHours        = asHours;
-    proto$2.asDays         = asDays;
-    proto$2.asWeeks        = asWeeks;
-    proto$2.asMonths       = asMonths;
-    proto$2.asYears        = asYears;
-    proto$2.valueOf        = valueOf$1;
-    proto$2._bubble        = bubble;
-    proto$2.clone          = clone$1;
-    proto$2.get            = get$2;
-    proto$2.milliseconds   = milliseconds;
-    proto$2.seconds        = seconds;
-    proto$2.minutes        = minutes;
-    proto$2.hours          = hours;
-    proto$2.days           = days;
-    proto$2.weeks          = weeks;
-    proto$2.months         = months;
-    proto$2.years          = years;
-    proto$2.humanize       = humanize;
-    proto$2.toISOString    = toISOString$1;
-    proto$2.toString       = toISOString$1;
-    proto$2.toJSON         = toISOString$1;
-    proto$2.locale         = locale;
-    proto$2.localeData     = localeData;
-
-    proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1);
-    proto$2.lang = lang;
-
-    // Side effect imports
-
-    // FORMATTING
-
-    addFormatToken('X', 0, 0, 'unix');
-    addFormatToken('x', 0, 0, 'valueOf');
-
-    // PARSING
-
-    addRegexToken('x', matchSigned);
-    addRegexToken('X', matchTimestamp);
-    addParseToken('X', function (input, array, config) {
-        config._d = new Date(parseFloat(input, 10) * 1000);
-    });
-    addParseToken('x', function (input, array, config) {
-        config._d = new Date(toInt(input));
-    });
-
-    // Side effect imports
-
-    //! moment.js
-
-    hooks.version = '2.23.0';
-
-    setHookCallback(createLocal);
-
-    hooks.fn                    = proto;
-    hooks.min                   = min;
-    hooks.max                   = max;
-    hooks.now                   = now;
-    hooks.utc                   = createUTC;
-    hooks.unix                  = createUnix;
-    hooks.months                = listMonths;
-    hooks.isDate                = isDate;
-    hooks.locale                = getSetGlobalLocale;
-    hooks.invalid               = createInvalid;
-    hooks.duration              = createDuration;
-    hooks.isMoment              = isMoment;
-    hooks.weekdays              = listWeekdays;
-    hooks.parseZone             = createInZone;
-    hooks.localeData            = getLocale;
-    hooks.isDuration            = isDuration;
-    hooks.monthsShort           = listMonthsShort;
-    hooks.weekdaysMin           = listWeekdaysMin;
-    hooks.defineLocale          = defineLocale;
-    hooks.updateLocale          = updateLocale;
-    hooks.locales               = listLocales;
-    hooks.weekdaysShort         = listWeekdaysShort;
-    hooks.normalizeUnits        = normalizeUnits;
-    hooks.relativeTimeRounding  = getSetRelativeTimeRounding;
-    hooks.relativeTimeThreshold = getSetRelativeTimeThreshold;
-    hooks.calendarFormat        = getCalendarFormat;
-    hooks.prototype             = proto;
-
-    // currently HTML5 input type only supports 24-hour formats
-    hooks.HTML5_FMT = {
-        DATETIME_LOCAL: 'YYYY-MM-DDTHH:mm',             // <input type="datetime-local" />
-        DATETIME_LOCAL_SECONDS: 'YYYY-MM-DDTHH:mm:ss',  // <input type="datetime-local" step="1" />
-        DATETIME_LOCAL_MS: 'YYYY-MM-DDTHH:mm:ss.SSS',   // <input type="datetime-local" step="0.001" />
-        DATE: 'YYYY-MM-DD',                             // <input type="date" />
-        TIME: 'HH:mm',                                  // <input type="time" />
-        TIME_SECONDS: 'HH:mm:ss',                       // <input type="time" step="1" />
-        TIME_MS: 'HH:mm:ss.SSS',                        // <input type="time" step="0.001" />
-        WEEK: 'GGGG-[W]WW',                             // <input type="week" />
-        MONTH: 'YYYY-MM'                                // <input type="month" />
-    };
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('af', {
-        months : 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'),
-        monthsShort : 'Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'),
-        weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'),
-        weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'),
-        weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'),
-        meridiemParse: /vm|nm/i,
-        isPM : function (input) {
-            return /^nm$/i.test(input);
-        },
-        meridiem : function (hours, minutes, isLower) {
-            if (hours < 12) {
-                return isLower ? 'vm' : 'VM';
-            } else {
-                return isLower ? 'nm' : 'NM';
-            }
-        },
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Vandag om] LT',
-            nextDay : '[Môre om] LT',
-            nextWeek : 'dddd [om] LT',
-            lastDay : '[Gister om] LT',
-            lastWeek : '[Laas] dddd [om] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'oor %s',
-            past : '%s gelede',
-            s : '\'n paar sekondes',
-            ss : '%d sekondes',
-            m : '\'n minuut',
-            mm : '%d minute',
-            h : '\'n uur',
-            hh : '%d ure',
-            d : '\'n dag',
-            dd : '%d dae',
-            M : '\'n maand',
-            MM : '%d maande',
-            y : '\'n jaar',
-            yy : '%d jaar'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-        ordinal : function (number) {
-            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter
-        },
-        week : {
-            dow : 1, // Maandag is die eerste dag van die week.
-            doy : 4  // Die week wat die 4de Januarie bevat is die eerste week van die jaar.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ar-dz', {
-        months : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-        monthsShort : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-        weekdaysShort : 'احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
-        weekdaysMin : 'أح_إث_ثلا_أر_خم_جم_سب'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[اليوم على الساعة] LT',
-            nextDay: '[غدا على الساعة] LT',
-            nextWeek: 'dddd [على الساعة] LT',
-            lastDay: '[أمس على الساعة] LT',
-            lastWeek: 'dddd [على الساعة] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'في %s',
-            past : 'منذ %s',
-            s : 'ثوان',
-            ss : '%d ثانية',
-            m : 'دقيقة',
-            mm : '%d دقائق',
-            h : 'ساعة',
-            hh : '%d ساعات',
-            d : 'يوم',
-            dd : '%d أيام',
-            M : 'شهر',
-            MM : '%d أشهر',
-            y : 'سنة',
-            yy : '%d سنوات'
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ar-kw', {
-        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
-        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[اليوم على الساعة] LT',
-            nextDay: '[غدا على الساعة] LT',
-            nextWeek: 'dddd [على الساعة] LT',
-            lastDay: '[أمس على الساعة] LT',
-            lastWeek: 'dddd [على الساعة] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'في %s',
-            past : 'منذ %s',
-            s : 'ثوان',
-            ss : '%d ثانية',
-            m : 'دقيقة',
-            mm : '%d دقائق',
-            h : 'ساعة',
-            hh : '%d ساعات',
-            d : 'يوم',
-            dd : '%d أيام',
-            M : 'شهر',
-            MM : '%d أشهر',
-            y : 'سنة',
-            yy : '%d سنوات'
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 12  // The week that contains Jan 12th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap = {
-        '1': '1',
-        '2': '2',
-        '3': '3',
-        '4': '4',
-        '5': '5',
-        '6': '6',
-        '7': '7',
-        '8': '8',
-        '9': '9',
-        '0': '0'
-    }, pluralForm = function (n) {
-        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
-    }, plurals = {
-        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
-        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
-        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
-        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
-        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
-        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
-    }, pluralize = function (u) {
-        return function (number, withoutSuffix, string, isFuture) {
-            var f = pluralForm(number),
-                str = plurals[u][pluralForm(number)];
-            if (f === 2) {
-                str = str[withoutSuffix ? 0 : 1];
-            }
-            return str.replace(/%d/i, number);
-        };
-    }, months$1 = [
-        'يناير',
-        'فبراير',
-        'مارس',
-        'أبريل',
-        'مايو',
-        'يونيو',
-        'يوليو',
-        'أغسطس',
-        'سبتمبر',
-        'أكتوبر',
-        'نوفمبر',
-        'ديسمبر'
-    ];
-
-    hooks.defineLocale('ar-ly', {
-        months : months$1,
-        monthsShort : months$1,
-        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'D/\u200FM/\u200FYYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        meridiemParse: /ص|م/,
-        isPM : function (input) {
-            return 'م' === input;
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'ص';
-            } else {
-                return 'م';
-            }
-        },
-        calendar : {
-            sameDay: '[اليوم عند الساعة] LT',
-            nextDay: '[غدًا عند الساعة] LT',
-            nextWeek: 'dddd [عند الساعة] LT',
-            lastDay: '[أمس عند الساعة] LT',
-            lastWeek: 'dddd [عند الساعة] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'بعد %s',
-            past : 'منذ %s',
-            s : pluralize('s'),
-            ss : pluralize('s'),
-            m : pluralize('m'),
-            mm : pluralize('m'),
-            h : pluralize('h'),
-            hh : pluralize('h'),
-            d : pluralize('d'),
-            dd : pluralize('d'),
-            M : pluralize('M'),
-            MM : pluralize('M'),
-            y : pluralize('y'),
-            yy : pluralize('y')
-        },
-        preparse: function (string) {
-            return string.replace(/،/g, ',');
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap[match];
-            }).replace(/,/g, '،');
-        },
-        week : {
-            dow : 6, // Saturday is the first day of the week.
-            doy : 12  // The week that contains Jan 12th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ar-ma', {
-        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
-        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
-        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[اليوم على الساعة] LT',
-            nextDay: '[غدا على الساعة] LT',
-            nextWeek: 'dddd [على الساعة] LT',
-            lastDay: '[أمس على الساعة] LT',
-            lastWeek: 'dddd [على الساعة] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'في %s',
-            past : 'منذ %s',
-            s : 'ثوان',
-            ss : '%d ثانية',
-            m : 'دقيقة',
-            mm : '%d دقائق',
-            h : 'ساعة',
-            hh : '%d ساعات',
-            d : 'يوم',
-            dd : '%d أيام',
-            M : 'شهر',
-            MM : '%d أشهر',
-            y : 'سنة',
-            yy : '%d سنوات'
-        },
-        week : {
-            dow : 6, // Saturday is the first day of the week.
-            doy : 12  // The week that contains Jan 12th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$1 = {
-        '1': '١',
-        '2': '٢',
-        '3': '٣',
-        '4': '٤',
-        '5': '٥',
-        '6': '٦',
-        '7': '٧',
-        '8': '٨',
-        '9': '٩',
-        '0': '٠'
-    }, numberMap = {
-        '١': '1',
-        '٢': '2',
-        '٣': '3',
-        '٤': '4',
-        '٥': '5',
-        '٦': '6',
-        '٧': '7',
-        '٨': '8',
-        '٩': '9',
-        '٠': '0'
-    };
-
-    hooks.defineLocale('ar-sa', {
-        months : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-        monthsShort : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        meridiemParse: /ص|م/,
-        isPM : function (input) {
-            return 'م' === input;
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'ص';
-            } else {
-                return 'م';
-            }
-        },
-        calendar : {
-            sameDay: '[اليوم على الساعة] LT',
-            nextDay: '[غدا على الساعة] LT',
-            nextWeek: 'dddd [على الساعة] LT',
-            lastDay: '[أمس على الساعة] LT',
-            lastWeek: 'dddd [على الساعة] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'في %s',
-            past : 'منذ %s',
-            s : 'ثوان',
-            ss : '%d ثانية',
-            m : 'دقيقة',
-            mm : '%d دقائق',
-            h : 'ساعة',
-            hh : '%d ساعات',
-            d : 'يوم',
-            dd : '%d أيام',
-            M : 'شهر',
-            MM : '%d أشهر',
-            y : 'سنة',
-            yy : '%d سنوات'
-        },
-        preparse: function (string) {
-            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
-                return numberMap[match];
-            }).replace(/،/g, ',');
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$1[match];
-            }).replace(/,/g, '،');
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 6  // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ar-tn', {
-        months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-        monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
-        weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-        weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-        weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat: {
-            LT: 'HH:mm',
-            LTS: 'HH:mm:ss',
-            L: 'DD/MM/YYYY',
-            LL: 'D MMMM YYYY',
-            LLL: 'D MMMM YYYY HH:mm',
-            LLLL: 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar: {
-            sameDay: '[اليوم على الساعة] LT',
-            nextDay: '[غدا على الساعة] LT',
-            nextWeek: 'dddd [على الساعة] LT',
-            lastDay: '[أمس على الساعة] LT',
-            lastWeek: 'dddd [على الساعة] LT',
-            sameElse: 'L'
-        },
-        relativeTime: {
-            future: 'في %s',
-            past: 'منذ %s',
-            s: 'ثوان',
-            ss : '%d ثانية',
-            m: 'دقيقة',
-            mm: '%d دقائق',
-            h: 'ساعة',
-            hh: '%d ساعات',
-            d: 'يوم',
-            dd: '%d أيام',
-            M: 'شهر',
-            MM: '%d أشهر',
-            y: 'سنة',
-            yy: '%d سنوات'
-        },
-        week: {
-            dow: 1, // Monday is the first day of the week.
-            doy: 4 // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$2 = {
-        '1': '١',
-        '2': '٢',
-        '3': '٣',
-        '4': '٤',
-        '5': '٥',
-        '6': '٦',
-        '7': '٧',
-        '8': '٨',
-        '9': '٩',
-        '0': '٠'
-    }, numberMap$1 = {
-        '١': '1',
-        '٢': '2',
-        '٣': '3',
-        '٤': '4',
-        '٥': '5',
-        '٦': '6',
-        '٧': '7',
-        '٨': '8',
-        '٩': '9',
-        '٠': '0'
-    }, pluralForm$1 = function (n) {
-        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
-    }, plurals$1 = {
-        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
-        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
-        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
-        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
-        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
-        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
-    }, pluralize$1 = function (u) {
-        return function (number, withoutSuffix, string, isFuture) {
-            var f = pluralForm$1(number),
-                str = plurals$1[u][pluralForm$1(number)];
-            if (f === 2) {
-                str = str[withoutSuffix ? 0 : 1];
-            }
-            return str.replace(/%d/i, number);
-        };
-    }, months$2 = [
-        'يناير',
-        'فبراير',
-        'مارس',
-        'أبريل',
-        'مايو',
-        'يونيو',
-        'يوليو',
-        'أغسطس',
-        'سبتمبر',
-        'أكتوبر',
-        'نوفمبر',
-        'ديسمبر'
-    ];
-
-    hooks.defineLocale('ar', {
-        months : months$2,
-        monthsShort : months$2,
-        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
-        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
-        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'D/\u200FM/\u200FYYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        meridiemParse: /ص|م/,
-        isPM : function (input) {
-            return 'م' === input;
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'ص';
-            } else {
-                return 'م';
-            }
-        },
-        calendar : {
-            sameDay: '[اليوم عند الساعة] LT',
-            nextDay: '[غدًا عند الساعة] LT',
-            nextWeek: 'dddd [عند الساعة] LT',
-            lastDay: '[أمس عند الساعة] LT',
-            lastWeek: 'dddd [عند الساعة] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'بعد %s',
-            past : 'منذ %s',
-            s : pluralize$1('s'),
-            ss : pluralize$1('s'),
-            m : pluralize$1('m'),
-            mm : pluralize$1('m'),
-            h : pluralize$1('h'),
-            hh : pluralize$1('h'),
-            d : pluralize$1('d'),
-            dd : pluralize$1('d'),
-            M : pluralize$1('M'),
-            MM : pluralize$1('M'),
-            y : pluralize$1('y'),
-            yy : pluralize$1('y')
-        },
-        preparse: function (string) {
-            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
-                return numberMap$1[match];
-            }).replace(/،/g, ',');
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$2[match];
-            }).replace(/,/g, '،');
-        },
-        week : {
-            dow : 6, // Saturday is the first day of the week.
-            doy : 12  // The week that contains Jan 12th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var suffixes = {
-        1: '-inci',
-        5: '-inci',
-        8: '-inci',
-        70: '-inci',
-        80: '-inci',
-        2: '-nci',
-        7: '-nci',
-        20: '-nci',
-        50: '-nci',
-        3: '-üncü',
-        4: '-üncü',
-        100: '-üncü',
-        6: '-ncı',
-        9: '-uncu',
-        10: '-uncu',
-        30: '-uncu',
-        60: '-ıncı',
-        90: '-ıncı'
-    };
-
-    hooks.defineLocale('az', {
-        months : 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'),
-        monthsShort : 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'),
-        weekdays : 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'),
-        weekdaysShort : 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'),
-        weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[bugün saat] LT',
-            nextDay : '[sabah saat] LT',
-            nextWeek : '[gələn həftə] dddd [saat] LT',
-            lastDay : '[dünən] LT',
-            lastWeek : '[keçən həftə] dddd [saat] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s sonra',
-            past : '%s əvvəl',
-            s : 'birneçə saniyə',
-            ss : '%d saniyə',
-            m : 'bir dəqiqə',
-            mm : '%d dəqiqə',
-            h : 'bir saat',
-            hh : '%d saat',
-            d : 'bir gün',
-            dd : '%d gün',
-            M : 'bir ay',
-            MM : '%d ay',
-            y : 'bir il',
-            yy : '%d il'
-        },
-        meridiemParse: /gecə|səhər|gündüz|axşam/,
-        isPM : function (input) {
-            return /^(gündüz|axşam)$/.test(input);
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'gecə';
-            } else if (hour < 12) {
-                return 'səhər';
-            } else if (hour < 17) {
-                return 'gündüz';
-            } else {
-                return 'axşam';
-            }
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,
-        ordinal : function (number) {
-            if (number === 0) {  // special case for zero
-                return number + '-ıncı';
-            }
-            var a = number % 10,
-                b = number % 100 - a,
-                c = number >= 100 ? 100 : null;
-            return number + (suffixes[a] || suffixes[b] || suffixes[c]);
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function plural(word, num) {
-        var forms = word.split('_');
-        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
-    }
-    function relativeTimeWithPlural(number, withoutSuffix, key) {
-        var format = {
-            'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд',
-            'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін',
-            'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін',
-            'dd': 'дзень_дні_дзён',
-            'MM': 'месяц_месяцы_месяцаў',
-            'yy': 'год_гады_гадоў'
-        };
-        if (key === 'm') {
-            return withoutSuffix ? 'хвіліна' : 'хвіліну';
-        }
-        else if (key === 'h') {
-            return withoutSuffix ? 'гадзіна' : 'гадзіну';
-        }
-        else {
-            return number + ' ' + plural(format[key], +number);
-        }
-    }
-
-    hooks.defineLocale('be', {
-        months : {
-            format: 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_'),
-            standalone: 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_')
-        },
-        monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'),
-        weekdays : {
-            format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'),
-            standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
-            isFormat: /\[ ?[Ууў] ?(?:мінулую|наступную)? ?\] ?dddd/
-        },
-        weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
-        weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY г.',
-            LLL : 'D MMMM YYYY г., HH:mm',
-            LLLL : 'dddd, D MMMM YYYY г., HH:mm'
-        },
-        calendar : {
-            sameDay: '[Сёння ў] LT',
-            nextDay: '[Заўтра ў] LT',
-            lastDay: '[Учора ў] LT',
-            nextWeek: function () {
-                return '[У] dddd [ў] LT';
-            },
-            lastWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                    case 3:
-                    case 5:
-                    case 6:
-                        return '[У мінулую] dddd [ў] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                        return '[У мінулы] dddd [ў] LT';
-                }
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'праз %s',
-            past : '%s таму',
-            s : 'некалькі секунд',
-            m : relativeTimeWithPlural,
-            mm : relativeTimeWithPlural,
-            h : relativeTimeWithPlural,
-            hh : relativeTimeWithPlural,
-            d : 'дзень',
-            dd : relativeTimeWithPlural,
-            M : 'месяц',
-            MM : relativeTimeWithPlural,
-            y : 'год',
-            yy : relativeTimeWithPlural
-        },
-        meridiemParse: /ночы|раніцы|дня|вечара/,
-        isPM : function (input) {
-            return /^(дня|вечара)$/.test(input);
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'ночы';
-            } else if (hour < 12) {
-                return 'раніцы';
-            } else if (hour < 17) {
-                return 'дня';
-            } else {
-                return 'вечара';
-            }
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}-(і|ы|га)/,
-        ordinal: function (number, period) {
-            switch (period) {
-                case 'M':
-                case 'd':
-                case 'DDD':
-                case 'w':
-                case 'W':
-                    return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы';
-                case 'D':
-                    return number + '-га';
-                default:
-                    return number;
-            }
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('bg', {
-        months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'),
-        monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'),
-        weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'),
-        weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'),
-        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'D.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY H:mm',
-            LLLL : 'dddd, D MMMM YYYY H:mm'
-        },
-        calendar : {
-            sameDay : '[Днес в] LT',
-            nextDay : '[Утре в] LT',
-            nextWeek : 'dddd [в] LT',
-            lastDay : '[Вчера в] LT',
-            lastWeek : function () {
-                switch (this.day()) {
-                    case 0:
-                    case 3:
-                    case 6:
-                        return '[В изминалата] dddd [в] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                    case 5:
-                        return '[В изминалия] dddd [в] LT';
-                }
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'след %s',
-            past : 'преди %s',
-            s : 'няколко секунди',
-            ss : '%d секунди',
-            m : 'минута',
-            mm : '%d минути',
-            h : 'час',
-            hh : '%d часа',
-            d : 'ден',
-            dd : '%d дни',
-            M : 'месец',
-            MM : '%d месеца',
-            y : 'година',
-            yy : '%d години'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
-        ordinal : function (number) {
-            var lastDigit = number % 10,
-                last2Digits = number % 100;
-            if (number === 0) {
-                return number + '-ев';
-            } else if (last2Digits === 0) {
-                return number + '-ен';
-            } else if (last2Digits > 10 && last2Digits < 20) {
-                return number + '-ти';
-            } else if (lastDigit === 1) {
-                return number + '-ви';
-            } else if (lastDigit === 2) {
-                return number + '-ри';
-            } else if (lastDigit === 7 || lastDigit === 8) {
-                return number + '-ми';
-            } else {
-                return number + '-ти';
-            }
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('bm', {
-        months : 'Zanwuyekalo_Fewuruyekalo_Marisikalo_Awirilikalo_Mɛkalo_Zuwɛnkalo_Zuluyekalo_Utikalo_Sɛtanburukalo_ɔkutɔburukalo_Nowanburukalo_Desanburukalo'.split('_'),
-        monthsShort : 'Zan_Few_Mar_Awi_Mɛ_Zuw_Zul_Uti_Sɛt_ɔku_Now_Des'.split('_'),
-        weekdays : 'Kari_Ntɛnɛn_Tarata_Araba_Alamisa_Juma_Sibiri'.split('_'),
-        weekdaysShort : 'Kar_Ntɛ_Tar_Ara_Ala_Jum_Sib'.split('_'),
-        weekdaysMin : 'Ka_Nt_Ta_Ar_Al_Ju_Si'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'MMMM [tile] D [san] YYYY',
-            LLL : 'MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm',
-            LLLL : 'dddd MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm'
-        },
-        calendar : {
-            sameDay : '[Bi lɛrɛ] LT',
-            nextDay : '[Sini lɛrɛ] LT',
-            nextWeek : 'dddd [don lɛrɛ] LT',
-            lastDay : '[Kunu lɛrɛ] LT',
-            lastWeek : 'dddd [tɛmɛnen lɛrɛ] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s kɔnɔ',
-            past : 'a bɛ %s bɔ',
-            s : 'sanga dama dama',
-            ss : 'sekondi %d',
-            m : 'miniti kelen',
-            mm : 'miniti %d',
-            h : 'lɛrɛ kelen',
-            hh : 'lɛrɛ %d',
-            d : 'tile kelen',
-            dd : 'tile %d',
-            M : 'kalo kelen',
-            MM : 'kalo %d',
-            y : 'san kelen',
-            yy : 'san %d'
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$3 = {
-        '1': '১',
-        '2': '২',
-        '3': '৩',
-        '4': '৪',
-        '5': '৫',
-        '6': '৬',
-        '7': '৭',
-        '8': '৮',
-        '9': '৯',
-        '0': '০'
-    },
-    numberMap$2 = {
-        '১': '1',
-        '২': '2',
-        '৩': '3',
-        '৪': '4',
-        '৫': '5',
-        '৬': '6',
-        '৭': '7',
-        '৮': '8',
-        '৯': '9',
-        '০': '0'
-    };
-
-    hooks.defineLocale('bn', {
-        months : 'জানুয়ারী_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),
-        monthsShort : 'জানু_ফেব_মার্চ_এপ্র_মে_জুন_জুল_আগ_সেপ্ট_অক্টো_নভে_ডিসে'.split('_'),
-        weekdays : 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার'.split('_'),
-        weekdaysShort : 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি'.split('_'),
-        weekdaysMin : 'রবি_সোম_মঙ্গ_বুধ_বৃহঃ_শুক্র_শনি'.split('_'),
-        longDateFormat : {
-            LT : 'A h:mm সময়',
-            LTS : 'A h:mm:ss সময়',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY, A h:mm সময়',
-            LLLL : 'dddd, D MMMM YYYY, A h:mm সময়'
-        },
-        calendar : {
-            sameDay : '[আজ] LT',
-            nextDay : '[আগামীকাল] LT',
-            nextWeek : 'dddd, LT',
-            lastDay : '[গতকাল] LT',
-            lastWeek : '[গত] dddd, LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s পরে',
-            past : '%s আগে',
-            s : 'কয়েক সেকেন্ড',
-            ss : '%d সেকেন্ড',
-            m : 'এক মিনিট',
-            mm : '%d মিনিট',
-            h : 'এক ঘন্টা',
-            hh : '%d ঘন্টা',
-            d : 'এক দিন',
-            dd : '%d দিন',
-            M : 'এক মাস',
-            MM : '%d মাস',
-            y : 'এক বছর',
-            yy : '%d বছর'
-        },
-        preparse: function (string) {
-            return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {
-                return numberMap$2[match];
-            });
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$3[match];
-            });
-        },
-        meridiemParse: /রাত|সকাল|দুপুর|বিকাল|রাত/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if ((meridiem === 'রাত' && hour >= 4) ||
-                    (meridiem === 'দুপুর' && hour < 5) ||
-                    meridiem === 'বিকাল') {
-                return hour + 12;
-            } else {
-                return hour;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'রাত';
-            } else if (hour < 10) {
-                return 'সকাল';
-            } else if (hour < 17) {
-                return 'দুপুর';
-            } else if (hour < 20) {
-                return 'বিকাল';
-            } else {
-                return 'রাত';
-            }
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 6  // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$4 = {
-        '1': '༡',
-        '2': '༢',
-        '3': '༣',
-        '4': '༤',
-        '5': '༥',
-        '6': '༦',
-        '7': '༧',
-        '8': '༨',
-        '9': '༩',
-        '0': '༠'
-    },
-    numberMap$3 = {
-        '༡': '1',
-        '༢': '2',
-        '༣': '3',
-        '༤': '4',
-        '༥': '5',
-        '༦': '6',
-        '༧': '7',
-        '༨': '8',
-        '༩': '9',
-        '༠': '0'
-    };
-
-    hooks.defineLocale('bo', {
-        months : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
-        monthsShort : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
-        weekdays : 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'),
-        weekdaysShort : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
-        weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
-        longDateFormat : {
-            LT : 'A h:mm',
-            LTS : 'A h:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY, A h:mm',
-            LLLL : 'dddd, D MMMM YYYY, A h:mm'
-        },
-        calendar : {
-            sameDay : '[དི་རིང] LT',
-            nextDay : '[སང་ཉིན] LT',
-            nextWeek : '[བདུན་ཕྲག་རྗེས་མ], LT',
-            lastDay : '[ཁ་སང] LT',
-            lastWeek : '[བདུན་ཕྲག་མཐའ་མ] dddd, LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s ལ་',
-            past : '%s སྔན་ལ',
-            s : 'ལམ་སང',
-            ss : '%d སྐར་ཆ།',
-            m : 'སྐར་མ་གཅིག',
-            mm : '%d སྐར་མ',
-            h : 'ཆུ་ཚོད་གཅིག',
-            hh : '%d ཆུ་ཚོད',
-            d : 'ཉིན་གཅིག',
-            dd : '%d ཉིན་',
-            M : 'ཟླ་བ་གཅིག',
-            MM : '%d ཟླ་བ',
-            y : 'ལོ་གཅིག',
-            yy : '%d ལོ'
-        },
-        preparse: function (string) {
-            return string.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (match) {
-                return numberMap$3[match];
-            });
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$4[match];
-            });
-        },
-        meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if ((meridiem === 'མཚན་མོ' && hour >= 4) ||
-                    (meridiem === 'ཉིན་གུང' && hour < 5) ||
-                    meridiem === 'དགོང་དག') {
-                return hour + 12;
-            } else {
-                return hour;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'མཚན་མོ';
-            } else if (hour < 10) {
-                return 'ཞོགས་ཀས';
-            } else if (hour < 17) {
-                return 'ཉིན་གུང';
-            } else if (hour < 20) {
-                return 'དགོང་དག';
-            } else {
-                return 'མཚན་མོ';
-            }
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 6  // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function relativeTimeWithMutation(number, withoutSuffix, key) {
-        var format = {
-            'mm': 'munutenn',
-            'MM': 'miz',
-            'dd': 'devezh'
-        };
-        return number + ' ' + mutation(format[key], number);
-    }
-    function specialMutationForYears(number) {
-        switch (lastNumber(number)) {
-            case 1:
-            case 3:
-            case 4:
-            case 5:
-            case 9:
-                return number + ' bloaz';
-            default:
-                return number + ' vloaz';
-        }
-    }
-    function lastNumber(number) {
-        if (number > 9) {
-            return lastNumber(number % 10);
-        }
-        return number;
-    }
-    function mutation(text, number) {
-        if (number === 2) {
-            return softMutation(text);
-        }
-        return text;
-    }
-    function softMutation(text) {
-        var mutationTable = {
-            'm': 'v',
-            'b': 'v',
-            'd': 'z'
-        };
-        if (mutationTable[text.charAt(0)] === undefined) {
-            return text;
-        }
-        return mutationTable[text.charAt(0)] + text.substring(1);
-    }
-
-    hooks.defineLocale('br', {
-        months : 'Genver_C\'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'),
-        monthsShort : 'Gen_C\'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'),
-        weekdays : 'Sul_Lun_Meurzh_Merc\'her_Yaou_Gwener_Sadorn'.split('_'),
-        weekdaysShort : 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'),
-        weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'h[e]mm A',
-            LTS : 'h[e]mm:ss A',
-            L : 'DD/MM/YYYY',
-            LL : 'D [a viz] MMMM YYYY',
-            LLL : 'D [a viz] MMMM YYYY h[e]mm A',
-            LLLL : 'dddd, D [a viz] MMMM YYYY h[e]mm A'
-        },
-        calendar : {
-            sameDay : '[Hiziv da] LT',
-            nextDay : '[Warc\'hoazh da] LT',
-            nextWeek : 'dddd [da] LT',
-            lastDay : '[Dec\'h da] LT',
-            lastWeek : 'dddd [paset da] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'a-benn %s',
-            past : '%s \'zo',
-            s : 'un nebeud segondennoù',
-            ss : '%d eilenn',
-            m : 'ur vunutenn',
-            mm : relativeTimeWithMutation,
-            h : 'un eur',
-            hh : '%d eur',
-            d : 'un devezh',
-            dd : relativeTimeWithMutation,
-            M : 'ur miz',
-            MM : relativeTimeWithMutation,
-            y : 'ur bloaz',
-            yy : specialMutationForYears
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(añ|vet)/,
-        ordinal : function (number) {
-            var output = (number === 1) ? 'añ' : 'vet';
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function translate(number, withoutSuffix, key) {
-        var result = number + ' ';
-        switch (key) {
-            case 'ss':
-                if (number === 1) {
-                    result += 'sekunda';
-                } else if (number === 2 || number === 3 || number === 4) {
-                    result += 'sekunde';
-                } else {
-                    result += 'sekundi';
-                }
-                return result;
-            case 'm':
-                return withoutSuffix ? 'jedna minuta' : 'jedne minute';
-            case 'mm':
-                if (number === 1) {
-                    result += 'minuta';
-                } else if (number === 2 || number === 3 || number === 4) {
-                    result += 'minute';
-                } else {
-                    result += 'minuta';
-                }
-                return result;
-            case 'h':
-                return withoutSuffix ? 'jedan sat' : 'jednog sata';
-            case 'hh':
-                if (number === 1) {
-                    result += 'sat';
-                } else if (number === 2 || number === 3 || number === 4) {
-                    result += 'sata';
-                } else {
-                    result += 'sati';
-                }
-                return result;
-            case 'dd':
-                if (number === 1) {
-                    result += 'dan';
-                } else {
-                    result += 'dana';
-                }
-                return result;
-            case 'MM':
-                if (number === 1) {
-                    result += 'mjesec';
-                } else if (number === 2 || number === 3 || number === 4) {
-                    result += 'mjeseca';
-                } else {
-                    result += 'mjeseci';
-                }
-                return result;
-            case 'yy':
-                if (number === 1) {
-                    result += 'godina';
-                } else if (number === 2 || number === 3 || number === 4) {
-                    result += 'godine';
-                } else {
-                    result += 'godina';
-                }
-                return result;
-        }
-    }
-
-    hooks.defineLocale('bs', {
-        months : 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'),
-        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'),
-        monthsParseExact: true,
-        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
-        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
-        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY H:mm',
-            LLLL : 'dddd, D. MMMM YYYY H:mm'
-        },
-        calendar : {
-            sameDay  : '[danas u] LT',
-            nextDay  : '[sutra u] LT',
-            nextWeek : function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[u] [nedjelju] [u] LT';
-                    case 3:
-                        return '[u] [srijedu] [u] LT';
-                    case 6:
-                        return '[u] [subotu] [u] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                    case 5:
-                        return '[u] dddd [u] LT';
-                }
-            },
-            lastDay  : '[jučer u] LT',
-            lastWeek : function () {
-                switch (this.day()) {
-                    case 0:
-                    case 3:
-                        return '[prošlu] dddd [u] LT';
-                    case 6:
-                        return '[prošle] [subote] [u] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                    case 5:
-                        return '[prošli] dddd [u] LT';
-                }
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'za %s',
-            past   : 'prije %s',
-            s      : 'par sekundi',
-            ss     : translate,
-            m      : translate,
-            mm     : translate,
-            h      : translate,
-            hh     : translate,
-            d      : 'dan',
-            dd     : translate,
-            M      : 'mjesec',
-            MM     : translate,
-            y      : 'godinu',
-            yy     : translate
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ca', {
-        months : {
-            standalone: 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'),
-            format: 'de gener_de febrer_de març_d\'abril_de maig_de juny_de juliol_d\'agost_de setembre_d\'octubre_de novembre_de desembre'.split('_'),
-            isFormat: /D[oD]?(\s)+MMMM/
-        },
-        monthsShort : 'gen._febr._març_abr._maig_juny_jul._ag._set._oct._nov._des.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'),
-        weekdaysShort : 'dg._dl._dt._dc._dj._dv._ds.'.split('_'),
-        weekdaysMin : 'dg_dl_dt_dc_dj_dv_ds'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM [de] YYYY',
-            ll : 'D MMM YYYY',
-            LLL : 'D MMMM [de] YYYY [a les] H:mm',
-            lll : 'D MMM YYYY, H:mm',
-            LLLL : 'dddd D MMMM [de] YYYY [a les] H:mm',
-            llll : 'ddd D MMM YYYY, H:mm'
-        },
-        calendar : {
-            sameDay : function () {
-                return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
-            },
-            nextDay : function () {
-                return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
-            },
-            nextWeek : function () {
-                return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
-            },
-            lastDay : function () {
-                return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
-            },
-            lastWeek : function () {
-                return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'd\'aquí %s',
-            past : 'fa %s',
-            s : 'uns segons',
-            ss : '%d segons',
-            m : 'un minut',
-            mm : '%d minuts',
-            h : 'una hora',
-            hh : '%d hores',
-            d : 'un dia',
-            dd : '%d dies',
-            M : 'un mes',
-            MM : '%d mesos',
-            y : 'un any',
-            yy : '%d anys'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(r|n|t|è|a)/,
-        ordinal : function (number, period) {
-            var output = (number === 1) ? 'r' :
-                (number === 2) ? 'n' :
-                (number === 3) ? 'r' :
-                (number === 4) ? 't' : 'è';
-            if (period === 'w' || period === 'W') {
-                output = 'a';
-            }
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var months$3 = 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_'),
-        monthsShort = 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_');
-    function plural$1(n) {
-        return (n > 1) && (n < 5) && (~~(n / 10) !== 1);
-    }
-    function translate$1(number, withoutSuffix, key, isFuture) {
-        var result = number + ' ';
-        switch (key) {
-            case 's':  // a few seconds / in a few seconds / a few seconds ago
-                return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami';
-            case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$1(number) ? 'sekundy' : 'sekund');
-                } else {
-                    return result + 'sekundami';
-                }
-                break;
-            case 'm':  // a minute / in a minute / a minute ago
-                return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou');
-            case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$1(number) ? 'minuty' : 'minut');
-                } else {
-                    return result + 'minutami';
-                }
-                break;
-            case 'h':  // an hour / in an hour / an hour ago
-                return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
-            case 'hh': // 9 hours / in 9 hours / 9 hours ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$1(number) ? 'hodiny' : 'hodin');
-                } else {
-                    return result + 'hodinami';
-                }
-                break;
-            case 'd':  // a day / in a day / a day ago
-                return (withoutSuffix || isFuture) ? 'den' : 'dnem';
-            case 'dd': // 9 days / in 9 days / 9 days ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$1(number) ? 'dny' : 'dní');
-                } else {
-                    return result + 'dny';
-                }
-                break;
-            case 'M':  // a month / in a month / a month ago
-                return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem';
-            case 'MM': // 9 months / in 9 months / 9 months ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$1(number) ? 'měsíce' : 'měsíců');
-                } else {
-                    return result + 'měsíci';
-                }
-                break;
-            case 'y':  // a year / in a year / a year ago
-                return (withoutSuffix || isFuture) ? 'rok' : 'rokem';
-            case 'yy': // 9 years / in 9 years / 9 years ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$1(number) ? 'roky' : 'let');
-                } else {
-                    return result + 'lety';
-                }
-                break;
-        }
-    }
-
-    hooks.defineLocale('cs', {
-        months : months$3,
-        monthsShort : monthsShort,
-        monthsParse : (function (months, monthsShort) {
-            var i, _monthsParse = [];
-            for (i = 0; i < 12; i++) {
-                // use custom parser to solve problem with July (červenec)
-                _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
-            }
-            return _monthsParse;
-        }(months$3, monthsShort)),
-        shortMonthsParse : (function (monthsShort) {
-            var i, _shortMonthsParse = [];
-            for (i = 0; i < 12; i++) {
-                _shortMonthsParse[i] = new RegExp('^' + monthsShort[i] + '$', 'i');
-            }
-            return _shortMonthsParse;
-        }(monthsShort)),
-        longMonthsParse : (function (months) {
-            var i, _longMonthsParse = [];
-            for (i = 0; i < 12; i++) {
-                _longMonthsParse[i] = new RegExp('^' + months[i] + '$', 'i');
-            }
-            return _longMonthsParse;
-        }(months$3)),
-        weekdays : 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),
-        weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),
-        weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),
-        longDateFormat : {
-            LT: 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY H:mm',
-            LLLL : 'dddd D. MMMM YYYY H:mm',
-            l : 'D. M. YYYY'
-        },
-        calendar : {
-            sameDay: '[dnes v] LT',
-            nextDay: '[zítra v] LT',
-            nextWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[v neděli v] LT';
-                    case 1:
-                    case 2:
-                        return '[v] dddd [v] LT';
-                    case 3:
-                        return '[ve středu v] LT';
-                    case 4:
-                        return '[ve čtvrtek v] LT';
-                    case 5:
-                        return '[v pátek v] LT';
-                    case 6:
-                        return '[v sobotu v] LT';
-                }
-            },
-            lastDay: '[včera v] LT',
-            lastWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[minulou neděli v] LT';
-                    case 1:
-                    case 2:
-                        return '[minulé] dddd [v] LT';
-                    case 3:
-                        return '[minulou středu v] LT';
-                    case 4:
-                    case 5:
-                        return '[minulý] dddd [v] LT';
-                    case 6:
-                        return '[minulou sobotu v] LT';
-                }
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'za %s',
-            past : 'před %s',
-            s : translate$1,
-            ss : translate$1,
-            m : translate$1,
-            mm : translate$1,
-            h : translate$1,
-            hh : translate$1,
-            d : translate$1,
-            dd : translate$1,
-            M : translate$1,
-            MM : translate$1,
-            y : translate$1,
-            yy : translate$1
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('cv', {
-        months : 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'),
-        monthsShort : 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'),
-        weekdays : 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'),
-        weekdaysShort : 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'),
-        weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD-MM-YYYY',
-            LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]',
-            LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm',
-            LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm'
-        },
-        calendar : {
-            sameDay: '[Паян] LT [сехетре]',
-            nextDay: '[Ыран] LT [сехетре]',
-            lastDay: '[Ӗнер] LT [сехетре]',
-            nextWeek: '[Ҫитес] dddd LT [сехетре]',
-            lastWeek: '[Иртнӗ] dddd LT [сехетре]',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : function (output) {
-                var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) ? 'тан' : 'ран';
-                return output + affix;
-            },
-            past : '%s каялла',
-            s : 'пӗр-ик ҫеккунт',
-            ss : '%d ҫеккунт',
-            m : 'пӗр минут',
-            mm : '%d минут',
-            h : 'пӗр сехет',
-            hh : '%d сехет',
-            d : 'пӗр кун',
-            dd : '%d кун',
-            M : 'пӗр уйӑх',
-            MM : '%d уйӑх',
-            y : 'пӗр ҫул',
-            yy : '%d ҫул'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}-мӗш/,
-        ordinal : '%d-мӗш',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('cy', {
-        months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'),
-        monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'),
-        weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'),
-        weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'),
-        weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'),
-        weekdaysParseExact : true,
-        // time formats are the same as en-gb
-        longDateFormat: {
-            LT: 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L: 'DD/MM/YYYY',
-            LL: 'D MMMM YYYY',
-            LLL: 'D MMMM YYYY HH:mm',
-            LLLL: 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar: {
-            sameDay: '[Heddiw am] LT',
-            nextDay: '[Yfory am] LT',
-            nextWeek: 'dddd [am] LT',
-            lastDay: '[Ddoe am] LT',
-            lastWeek: 'dddd [diwethaf am] LT',
-            sameElse: 'L'
-        },
-        relativeTime: {
-            future: 'mewn %s',
-            past: '%s yn ôl',
-            s: 'ychydig eiliadau',
-            ss: '%d eiliad',
-            m: 'munud',
-            mm: '%d munud',
-            h: 'awr',
-            hh: '%d awr',
-            d: 'diwrnod',
-            dd: '%d diwrnod',
-            M: 'mis',
-            MM: '%d mis',
-            y: 'blwyddyn',
-            yy: '%d flynedd'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,
-        // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh
-        ordinal: function (number) {
-            var b = number,
-                output = '',
-                lookup = [
-                    '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed
-                    'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed
-                ];
-            if (b > 20) {
-                if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) {
-                    output = 'fed'; // not 30ain, 70ain or 90ain
-                } else {
-                    output = 'ain';
-                }
-            } else if (b > 0) {
-                output = lookup[b];
-            }
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('da', {
-        months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
-        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
-        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
-        weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
-        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY HH:mm',
-            LLLL : 'dddd [d.] D. MMMM YYYY [kl.] HH:mm'
-        },
-        calendar : {
-            sameDay : '[i dag kl.] LT',
-            nextDay : '[i morgen kl.] LT',
-            nextWeek : 'på dddd [kl.] LT',
-            lastDay : '[i går kl.] LT',
-            lastWeek : '[i] dddd[s kl.] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'om %s',
-            past : '%s siden',
-            s : 'få sekunder',
-            ss : '%d sekunder',
-            m : 'et minut',
-            mm : '%d minutter',
-            h : 'en time',
-            hh : '%d timer',
-            d : 'en dag',
-            dd : '%d dage',
-            M : 'en måned',
-            MM : '%d måneder',
-            y : 'et år',
-            yy : '%d år'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function processRelativeTime(number, withoutSuffix, key, isFuture) {
-        var format = {
-            'm': ['eine Minute', 'einer Minute'],
-            'h': ['eine Stunde', 'einer Stunde'],
-            'd': ['ein Tag', 'einem Tag'],
-            'dd': [number + ' Tage', number + ' Tagen'],
-            'M': ['ein Monat', 'einem Monat'],
-            'MM': [number + ' Monate', number + ' Monaten'],
-            'y': ['ein Jahr', 'einem Jahr'],
-            'yy': [number + ' Jahre', number + ' Jahren']
-        };
-        return withoutSuffix ? format[key][0] : format[key][1];
-    }
-
-    hooks.defineLocale('de-at', {
-        months : 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-        monthsShort : 'Jän._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
-        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
-        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT: 'HH:mm',
-            LTS: 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY HH:mm',
-            LLLL : 'dddd, D. MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[heute um] LT [Uhr]',
-            sameElse: 'L',
-            nextDay: '[morgen um] LT [Uhr]',
-            nextWeek: 'dddd [um] LT [Uhr]',
-            lastDay: '[gestern um] LT [Uhr]',
-            lastWeek: '[letzten] dddd [um] LT [Uhr]'
-        },
-        relativeTime : {
-            future : 'in %s',
-            past : 'vor %s',
-            s : 'ein paar Sekunden',
-            ss : '%d Sekunden',
-            m : processRelativeTime,
-            mm : '%d Minuten',
-            h : processRelativeTime,
-            hh : '%d Stunden',
-            d : processRelativeTime,
-            dd : processRelativeTime,
-            M : processRelativeTime,
-            MM : processRelativeTime,
-            y : processRelativeTime,
-            yy : processRelativeTime
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function processRelativeTime$1(number, withoutSuffix, key, isFuture) {
-        var format = {
-            'm': ['eine Minute', 'einer Minute'],
-            'h': ['eine Stunde', 'einer Stunde'],
-            'd': ['ein Tag', 'einem Tag'],
-            'dd': [number + ' Tage', number + ' Tagen'],
-            'M': ['ein Monat', 'einem Monat'],
-            'MM': [number + ' Monate', number + ' Monaten'],
-            'y': ['ein Jahr', 'einem Jahr'],
-            'yy': [number + ' Jahre', number + ' Jahren']
-        };
-        return withoutSuffix ? format[key][0] : format[key][1];
-    }
-
-    hooks.defineLocale('de-ch', {
-        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-        monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
-        weekdaysShort : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT: 'HH:mm',
-            LTS: 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY HH:mm',
-            LLLL : 'dddd, D. MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[heute um] LT [Uhr]',
-            sameElse: 'L',
-            nextDay: '[morgen um] LT [Uhr]',
-            nextWeek: 'dddd [um] LT [Uhr]',
-            lastDay: '[gestern um] LT [Uhr]',
-            lastWeek: '[letzten] dddd [um] LT [Uhr]'
-        },
-        relativeTime : {
-            future : 'in %s',
-            past : 'vor %s',
-            s : 'ein paar Sekunden',
-            ss : '%d Sekunden',
-            m : processRelativeTime$1,
-            mm : '%d Minuten',
-            h : processRelativeTime$1,
-            hh : '%d Stunden',
-            d : processRelativeTime$1,
-            dd : processRelativeTime$1,
-            M : processRelativeTime$1,
-            MM : processRelativeTime$1,
-            y : processRelativeTime$1,
-            yy : processRelativeTime$1
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function processRelativeTime$2(number, withoutSuffix, key, isFuture) {
-        var format = {
-            'm': ['eine Minute', 'einer Minute'],
-            'h': ['eine Stunde', 'einer Stunde'],
-            'd': ['ein Tag', 'einem Tag'],
-            'dd': [number + ' Tage', number + ' Tagen'],
-            'M': ['ein Monat', 'einem Monat'],
-            'MM': [number + ' Monate', number + ' Monaten'],
-            'y': ['ein Jahr', 'einem Jahr'],
-            'yy': [number + ' Jahre', number + ' Jahren']
-        };
-        return withoutSuffix ? format[key][0] : format[key][1];
-    }
-
-    hooks.defineLocale('de', {
-        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-        monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
-        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
-        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT: 'HH:mm',
-            LTS: 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY HH:mm',
-            LLLL : 'dddd, D. MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[heute um] LT [Uhr]',
-            sameElse: 'L',
-            nextDay: '[morgen um] LT [Uhr]',
-            nextWeek: 'dddd [um] LT [Uhr]',
-            lastDay: '[gestern um] LT [Uhr]',
-            lastWeek: '[letzten] dddd [um] LT [Uhr]'
-        },
-        relativeTime : {
-            future : 'in %s',
-            past : 'vor %s',
-            s : 'ein paar Sekunden',
-            ss : '%d Sekunden',
-            m : processRelativeTime$2,
-            mm : '%d Minuten',
-            h : processRelativeTime$2,
-            hh : '%d Stunden',
-            d : processRelativeTime$2,
-            dd : processRelativeTime$2,
-            M : processRelativeTime$2,
-            MM : processRelativeTime$2,
-            y : processRelativeTime$2,
-            yy : processRelativeTime$2
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var months$4 = [
-        'ޖެނުއަރީ',
-        'ފެބްރުއަރީ',
-        'މާރިޗު',
-        'އޭޕްރީލު',
-        'މޭ',
-        'ޖޫން',
-        'ޖުލައި',
-        'އޯގަސްޓު',
-        'ސެޕްޓެމްބަރު',
-        'އޮކްޓޯބަރު',
-        'ނޮވެމްބަރު',
-        'ޑިސެމްބަރު'
-    ], weekdays = [
-        'އާދިއްތަ',
-        'ހޯމަ',
-        'އަންގާރަ',
-        'ބުދަ',
-        'ބުރާސްފަތި',
-        'ހުކުރު',
-        'ހޮނިހިރު'
-    ];
-
-    hooks.defineLocale('dv', {
-        months : months$4,
-        monthsShort : months$4,
-        weekdays : weekdays,
-        weekdaysShort : weekdays,
-        weekdaysMin : 'އާދި_ހޯމަ_އަން_ބުދަ_ބުރާ_ހުކު_ހޮނި'.split('_'),
-        longDateFormat : {
-
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'D/M/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        meridiemParse: /މކ|މފ/,
-        isPM : function (input) {
-            return 'މފ' === input;
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'މކ';
-            } else {
-                return 'މފ';
-            }
-        },
-        calendar : {
-            sameDay : '[މިއަދު] LT',
-            nextDay : '[މާދަމާ] LT',
-            nextWeek : 'dddd LT',
-            lastDay : '[އިއްޔެ] LT',
-            lastWeek : '[ފާއިތުވި] dddd LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'ތެރޭގައި %s',
-            past : 'ކުރިން %s',
-            s : 'ސިކުންތުކޮޅެއް',
-            ss : 'd% ސިކުންތު',
-            m : 'މިނިޓެއް',
-            mm : 'މިނިޓު %d',
-            h : 'ގަޑިއިރެއް',
-            hh : 'ގަޑިއިރު %d',
-            d : 'ދުވަހެއް',
-            dd : 'ދުވަސް %d',
-            M : 'މަހެއް',
-            MM : 'މަސް %d',
-            y : 'އަހަރެއް',
-            yy : 'އަހަރު %d'
-        },
-        preparse: function (string) {
-            return string.replace(/،/g, ',');
-        },
-        postformat: function (string) {
-            return string.replace(/,/g, '،');
-        },
-        week : {
-            dow : 7,  // Sunday is the first day of the week.
-            doy : 12  // The week that contains Jan 12th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('el', {
-        monthsNominativeEl : 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'),
-        monthsGenitiveEl : 'Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου'.split('_'),
-        months : function (momentToFormat, format) {
-            if (!momentToFormat) {
-                return this._monthsNominativeEl;
-            } else if (typeof format === 'string' && /D/.test(format.substring(0, format.indexOf('MMMM')))) { // if there is a day number before 'MMMM'
-                return this._monthsGenitiveEl[momentToFormat.month()];
-            } else {
-                return this._monthsNominativeEl[momentToFormat.month()];
-            }
-        },
-        monthsShort : 'Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ'.split('_'),
-        weekdays : 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'),
-        weekdaysShort : 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'),
-        weekdaysMin : 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'),
-        meridiem : function (hours, minutes, isLower) {
-            if (hours > 11) {
-                return isLower ? 'μμ' : 'ΜΜ';
-            } else {
-                return isLower ? 'πμ' : 'ΠΜ';
-            }
-        },
-        isPM : function (input) {
-            return ((input + '').toLowerCase()[0] === 'μ');
-        },
-        meridiemParse : /[ΠΜ]\.?Μ?\.?/i,
-        longDateFormat : {
-            LT : 'h:mm A',
-            LTS : 'h:mm:ss A',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY h:mm A',
-            LLLL : 'dddd, D MMMM YYYY h:mm A'
-        },
-        calendarEl : {
-            sameDay : '[Σήμερα {}] LT',
-            nextDay : '[Αύριο {}] LT',
-            nextWeek : 'dddd [{}] LT',
-            lastDay : '[Χθες {}] LT',
-            lastWeek : function () {
-                switch (this.day()) {
-                    case 6:
-                        return '[το προηγούμενο] dddd [{}] LT';
-                    default:
-                        return '[την προηγούμενη] dddd [{}] LT';
-                }
-            },
-            sameElse : 'L'
-        },
-        calendar : function (key, mom) {
-            var output = this._calendarEl[key],
-                hours = mom && mom.hours();
-            if (isFunction(output)) {
-                output = output.apply(mom);
-            }
-            return output.replace('{}', (hours % 12 === 1 ? 'στη' : 'στις'));
-        },
-        relativeTime : {
-            future : 'σε %s',
-            past : '%s πριν',
-            s : 'λίγα δευτερόλεπτα',
-            ss : '%d δευτερόλεπτα',
-            m : 'ένα λεπτό',
-            mm : '%d λεπτά',
-            h : 'μία ώρα',
-            hh : '%d ώρες',
-            d : 'μία μέρα',
-            dd : '%d μέρες',
-            M : 'ένας μήνας',
-            MM : '%d μήνες',
-            y : 'ένας χρόνος',
-            yy : '%d χρόνια'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}η/,
-        ordinal: '%dη',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4st is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('en-au', {
-        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-        longDateFormat : {
-            LT : 'h:mm A',
-            LTS : 'h:mm:ss A',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY h:mm A',
-            LLLL : 'dddd, D MMMM YYYY h:mm A'
-        },
-        calendar : {
-            sameDay : '[Today at] LT',
-            nextDay : '[Tomorrow at] LT',
-            nextWeek : 'dddd [at] LT',
-            lastDay : '[Yesterday at] LT',
-            lastWeek : '[Last] dddd [at] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'in %s',
-            past : '%s ago',
-            s : 'a few seconds',
-            ss : '%d seconds',
-            m : 'a minute',
-            mm : '%d minutes',
-            h : 'an hour',
-            hh : '%d hours',
-            d : 'a day',
-            dd : '%d days',
-            M : 'a month',
-            MM : '%d months',
-            y : 'a year',
-            yy : '%d years'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (~~(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('en-ca', {
-        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-        longDateFormat : {
-            LT : 'h:mm A',
-            LTS : 'h:mm:ss A',
-            L : 'YYYY-MM-DD',
-            LL : 'MMMM D, YYYY',
-            LLL : 'MMMM D, YYYY h:mm A',
-            LLLL : 'dddd, MMMM D, YYYY h:mm A'
-        },
-        calendar : {
-            sameDay : '[Today at] LT',
-            nextDay : '[Tomorrow at] LT',
-            nextWeek : 'dddd [at] LT',
-            lastDay : '[Yesterday at] LT',
-            lastWeek : '[Last] dddd [at] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'in %s',
-            past : '%s ago',
-            s : 'a few seconds',
-            ss : '%d seconds',
-            m : 'a minute',
-            mm : '%d minutes',
-            h : 'an hour',
-            hh : '%d hours',
-            d : 'a day',
-            dd : '%d days',
-            M : 'a month',
-            MM : '%d months',
-            y : 'a year',
-            yy : '%d years'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (~~(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('en-gb', {
-        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Today at] LT',
-            nextDay : '[Tomorrow at] LT',
-            nextWeek : 'dddd [at] LT',
-            lastDay : '[Yesterday at] LT',
-            lastWeek : '[Last] dddd [at] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'in %s',
-            past : '%s ago',
-            s : 'a few seconds',
-            ss : '%d seconds',
-            m : 'a minute',
-            mm : '%d minutes',
-            h : 'an hour',
-            hh : '%d hours',
-            d : 'a day',
-            dd : '%d days',
-            M : 'a month',
-            MM : '%d months',
-            y : 'a year',
-            yy : '%d years'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (~~(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('en-ie', {
-        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD-MM-YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Today at] LT',
-            nextDay : '[Tomorrow at] LT',
-            nextWeek : 'dddd [at] LT',
-            lastDay : '[Yesterday at] LT',
-            lastWeek : '[Last] dddd [at] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'in %s',
-            past : '%s ago',
-            s : 'a few seconds',
-            ss : '%d seconds',
-            m : 'a minute',
-            mm : '%d minutes',
-            h : 'an hour',
-            hh : '%d hours',
-            d : 'a day',
-            dd : '%d days',
-            M : 'a month',
-            MM : '%d months',
-            y : 'a year',
-            yy : '%d years'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (~~(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('en-il', {
-        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Today at] LT',
-            nextDay : '[Tomorrow at] LT',
-            nextWeek : 'dddd [at] LT',
-            lastDay : '[Yesterday at] LT',
-            lastWeek : '[Last] dddd [at] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'in %s',
-            past : '%s ago',
-            s : 'a few seconds',
-            m : 'a minute',
-            mm : '%d minutes',
-            h : 'an hour',
-            hh : '%d hours',
-            d : 'a day',
-            dd : '%d days',
-            M : 'a month',
-            MM : '%d months',
-            y : 'a year',
-            yy : '%d years'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (~~(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('en-nz', {
-        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
-        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
-        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
-        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
-        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
-        longDateFormat : {
-            LT : 'h:mm A',
-            LTS : 'h:mm:ss A',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY h:mm A',
-            LLLL : 'dddd, D MMMM YYYY h:mm A'
-        },
-        calendar : {
-            sameDay : '[Today at] LT',
-            nextDay : '[Tomorrow at] LT',
-            nextWeek : 'dddd [at] LT',
-            lastDay : '[Yesterday at] LT',
-            lastWeek : '[Last] dddd [at] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'in %s',
-            past : '%s ago',
-            s : 'a few seconds',
-            ss : '%d seconds',
-            m : 'a minute',
-            mm : '%d minutes',
-            h : 'an hour',
-            hh : '%d hours',
-            d : 'a day',
-            dd : '%d days',
-            M : 'a month',
-            MM : '%d months',
-            y : 'a year',
-            yy : '%d years'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (~~(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('eo', {
-        months : 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'),
-        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'),
-        weekdays : 'dimanĉo_lundo_mardo_merkredo_ĵaŭdo_vendredo_sabato'.split('_'),
-        weekdaysShort : 'dim_lun_mard_merk_ĵaŭ_ven_sab'.split('_'),
-        weekdaysMin : 'di_lu_ma_me_ĵa_ve_sa'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'YYYY-MM-DD',
-            LL : 'D[-a de] MMMM, YYYY',
-            LLL : 'D[-a de] MMMM, YYYY HH:mm',
-            LLLL : 'dddd, [la] D[-a de] MMMM, YYYY HH:mm'
-        },
-        meridiemParse: /[ap]\.t\.m/i,
-        isPM: function (input) {
-            return input.charAt(0).toLowerCase() === 'p';
-        },
-        meridiem : function (hours, minutes, isLower) {
-            if (hours > 11) {
-                return isLower ? 'p.t.m.' : 'P.T.M.';
-            } else {
-                return isLower ? 'a.t.m.' : 'A.T.M.';
-            }
-        },
-        calendar : {
-            sameDay : '[Hodiaŭ je] LT',
-            nextDay : '[Morgaŭ je] LT',
-            nextWeek : 'dddd [je] LT',
-            lastDay : '[Hieraŭ je] LT',
-            lastWeek : '[pasinta] dddd [je] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'post %s',
-            past : 'antaŭ %s',
-            s : 'sekundoj',
-            ss : '%d sekundoj',
-            m : 'minuto',
-            mm : '%d minutoj',
-            h : 'horo',
-            hh : '%d horoj',
-            d : 'tago',//ne 'diurno', ĉar estas uzita por proksimumo
-            dd : '%d tagoj',
-            M : 'monato',
-            MM : '%d monatoj',
-            y : 'jaro',
-            yy : '%d jaroj'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}a/,
-        ordinal : '%da',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
-        monthsShort$1 = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
-
-    var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];
-    var monthsRegex$1 = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;
-
-    hooks.defineLocale('es-do', {
-        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
-        monthsShort : function (m, format) {
-            if (!m) {
-                return monthsShortDot;
-            } else if (/-MMM-/.test(format)) {
-                return monthsShort$1[m.month()];
-            } else {
-                return monthsShortDot[m.month()];
-            }
-        },
-        monthsRegex: monthsRegex$1,
-        monthsShortRegex: monthsRegex$1,
-        monthsStrictRegex: /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
-        monthsShortStrictRegex: /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
-        monthsParse: monthsParse,
-        longMonthsParse: monthsParse,
-        shortMonthsParse: monthsParse,
-        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
-        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
-        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'h:mm A',
-            LTS : 'h:mm:ss A',
-            L : 'DD/MM/YYYY',
-            LL : 'D [de] MMMM [de] YYYY',
-            LLL : 'D [de] MMMM [de] YYYY h:mm A',
-            LLLL : 'dddd, D [de] MMMM [de] YYYY h:mm A'
-        },
-        calendar : {
-            sameDay : function () {
-                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            nextDay : function () {
-                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            nextWeek : function () {
-                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            lastDay : function () {
-                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            lastWeek : function () {
-                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'en %s',
-            past : 'hace %s',
-            s : 'unos segundos',
-            ss : '%d segundos',
-            m : 'un minuto',
-            mm : '%d minutos',
-            h : 'una hora',
-            hh : '%d horas',
-            d : 'un día',
-            dd : '%d días',
-            M : 'un mes',
-            MM : '%d meses',
-            y : 'un año',
-            yy : '%d años'
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}º/,
-        ordinal : '%dº',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var monthsShortDot$1 = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
-        monthsShort$2 = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
-
-    hooks.defineLocale('es-us', {
-        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
-        monthsShort : function (m, format) {
-            if (!m) {
-                return monthsShortDot$1;
-            } else if (/-MMM-/.test(format)) {
-                return monthsShort$2[m.month()];
-            } else {
-                return monthsShortDot$1[m.month()];
-            }
-        },
-        monthsParseExact : true,
-        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
-        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
-        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'h:mm A',
-            LTS : 'h:mm:ss A',
-            L : 'MM/DD/YYYY',
-            LL : 'MMMM [de] D [de] YYYY',
-            LLL : 'MMMM [de] D [de] YYYY h:mm A',
-            LLLL : 'dddd, MMMM [de] D [de] YYYY h:mm A'
-        },
-        calendar : {
-            sameDay : function () {
-                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            nextDay : function () {
-                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            nextWeek : function () {
-                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            lastDay : function () {
-                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            lastWeek : function () {
-                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'en %s',
-            past : 'hace %s',
-            s : 'unos segundos',
-            ss : '%d segundos',
-            m : 'un minuto',
-            mm : '%d minutos',
-            h : 'una hora',
-            hh : '%d horas',
-            d : 'un día',
-            dd : '%d días',
-            M : 'un mes',
-            MM : '%d meses',
-            y : 'un año',
-            yy : '%d años'
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}º/,
-        ordinal : '%dº',
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 6  // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var monthsShortDot$2 = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
-        monthsShort$3 = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
-
-    var monthsParse$1 = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];
-    var monthsRegex$2 = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;
-
-    hooks.defineLocale('es', {
-        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
-        monthsShort : function (m, format) {
-            if (!m) {
-                return monthsShortDot$2;
-            } else if (/-MMM-/.test(format)) {
-                return monthsShort$3[m.month()];
-            } else {
-                return monthsShortDot$2[m.month()];
-            }
-        },
-        monthsRegex : monthsRegex$2,
-        monthsShortRegex : monthsRegex$2,
-        monthsStrictRegex : /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
-        monthsShortStrictRegex : /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
-        monthsParse : monthsParse$1,
-        longMonthsParse : monthsParse$1,
-        shortMonthsParse : monthsParse$1,
-        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
-        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
-        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D [de] MMMM [de] YYYY',
-            LLL : 'D [de] MMMM [de] YYYY H:mm',
-            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
-        },
-        calendar : {
-            sameDay : function () {
-                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            nextDay : function () {
-                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            nextWeek : function () {
-                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            lastDay : function () {
-                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            lastWeek : function () {
-                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'en %s',
-            past : 'hace %s',
-            s : 'unos segundos',
-            ss : '%d segundos',
-            m : 'un minuto',
-            mm : '%d minutos',
-            h : 'una hora',
-            hh : '%d horas',
-            d : 'un día',
-            dd : '%d días',
-            M : 'un mes',
-            MM : '%d meses',
-            y : 'un año',
-            yy : '%d años'
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}º/,
-        ordinal : '%dº',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function processRelativeTime$3(number, withoutSuffix, key, isFuture) {
-        var format = {
-            's' : ['mõne sekundi', 'mõni sekund', 'paar sekundit'],
-            'ss': [number + 'sekundi', number + 'sekundit'],
-            'm' : ['ühe minuti', 'üks minut'],
-            'mm': [number + ' minuti', number + ' minutit'],
-            'h' : ['ühe tunni', 'tund aega', 'üks tund'],
-            'hh': [number + ' tunni', number + ' tundi'],
-            'd' : ['ühe päeva', 'üks päev'],
-            'M' : ['kuu aja', 'kuu aega', 'üks kuu'],
-            'MM': [number + ' kuu', number + ' kuud'],
-            'y' : ['ühe aasta', 'aasta', 'üks aasta'],
-            'yy': [number + ' aasta', number + ' aastat']
-        };
-        if (withoutSuffix) {
-            return format[key][2] ? format[key][2] : format[key][1];
-        }
-        return isFuture ? format[key][0] : format[key][1];
-    }
-
-    hooks.defineLocale('et', {
-        months        : 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'),
-        monthsShort   : 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'),
-        weekdays      : 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'),
-        weekdaysShort : 'P_E_T_K_N_R_L'.split('_'),
-        weekdaysMin   : 'P_E_T_K_N_R_L'.split('_'),
-        longDateFormat : {
-            LT   : 'H:mm',
-            LTS : 'H:mm:ss',
-            L    : 'DD.MM.YYYY',
-            LL   : 'D. MMMM YYYY',
-            LLL  : 'D. MMMM YYYY H:mm',
-            LLLL : 'dddd, D. MMMM YYYY H:mm'
-        },
-        calendar : {
-            sameDay  : '[Täna,] LT',
-            nextDay  : '[Homme,] LT',
-            nextWeek : '[Järgmine] dddd LT',
-            lastDay  : '[Eile,] LT',
-            lastWeek : '[Eelmine] dddd LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s pärast',
-            past   : '%s tagasi',
-            s      : processRelativeTime$3,
-            ss     : processRelativeTime$3,
-            m      : processRelativeTime$3,
-            mm     : processRelativeTime$3,
-            h      : processRelativeTime$3,
-            hh     : processRelativeTime$3,
-            d      : processRelativeTime$3,
-            dd     : '%d päeva',
-            M      : processRelativeTime$3,
-            MM     : processRelativeTime$3,
-            y      : processRelativeTime$3,
-            yy     : processRelativeTime$3
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('eu', {
-        months : 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'),
-        monthsShort : 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'),
-        weekdaysShort : 'ig._al._ar._az._og._ol._lr.'.split('_'),
-        weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'YYYY-MM-DD',
-            LL : 'YYYY[ko] MMMM[ren] D[a]',
-            LLL : 'YYYY[ko] MMMM[ren] D[a] HH:mm',
-            LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] HH:mm',
-            l : 'YYYY-M-D',
-            ll : 'YYYY[ko] MMM D[a]',
-            lll : 'YYYY[ko] MMM D[a] HH:mm',
-            llll : 'ddd, YYYY[ko] MMM D[a] HH:mm'
-        },
-        calendar : {
-            sameDay : '[gaur] LT[etan]',
-            nextDay : '[bihar] LT[etan]',
-            nextWeek : 'dddd LT[etan]',
-            lastDay : '[atzo] LT[etan]',
-            lastWeek : '[aurreko] dddd LT[etan]',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s barru',
-            past : 'duela %s',
-            s : 'segundo batzuk',
-            ss : '%d segundo',
-            m : 'minutu bat',
-            mm : '%d minutu',
-            h : 'ordu bat',
-            hh : '%d ordu',
-            d : 'egun bat',
-            dd : '%d egun',
-            M : 'hilabete bat',
-            MM : '%d hilabete',
-            y : 'urte bat',
-            yy : '%d urte'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$5 = {
-        '1': '۱',
-        '2': '۲',
-        '3': '۳',
-        '4': '۴',
-        '5': '۵',
-        '6': '۶',
-        '7': '۷',
-        '8': '۸',
-        '9': '۹',
-        '0': '۰'
-    }, numberMap$4 = {
-        '۱': '1',
-        '۲': '2',
-        '۳': '3',
-        '۴': '4',
-        '۵': '5',
-        '۶': '6',
-        '۷': '7',
-        '۸': '8',
-        '۹': '9',
-        '۰': '0'
-    };
-
-    hooks.defineLocale('fa', {
-        months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
-        monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
-        weekdays : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
-        weekdaysShort : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
-        weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        meridiemParse: /قبل از ظهر|بعد از ظهر/,
-        isPM: function (input) {
-            return /بعد از ظهر/.test(input);
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'قبل از ظهر';
-            } else {
-                return 'بعد از ظهر';
-            }
-        },
-        calendar : {
-            sameDay : '[امروز ساعت] LT',
-            nextDay : '[فردا ساعت] LT',
-            nextWeek : 'dddd [ساعت] LT',
-            lastDay : '[دیروز ساعت] LT',
-            lastWeek : 'dddd [پیش] [ساعت] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'در %s',
-            past : '%s پیش',
-            s : 'چند ثانیه',
-            ss : 'ثانیه d%',
-            m : 'یک دقیقه',
-            mm : '%d دقیقه',
-            h : 'یک ساعت',
-            hh : '%d ساعت',
-            d : 'یک روز',
-            dd : '%d روز',
-            M : 'یک ماه',
-            MM : '%d ماه',
-            y : 'یک سال',
-            yy : '%d سال'
-        },
-        preparse: function (string) {
-            return string.replace(/[۰-۹]/g, function (match) {
-                return numberMap$4[match];
-            }).replace(/،/g, ',');
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$5[match];
-            }).replace(/,/g, '،');
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}م/,
-        ordinal : '%dم',
-        week : {
-            dow : 6, // Saturday is the first day of the week.
-            doy : 12 // The week that contains Jan 12th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
-        numbersFuture = [
-            'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
-            numbersPast[7], numbersPast[8], numbersPast[9]
-        ];
-    function translate$2(number, withoutSuffix, key, isFuture) {
-        var result = '';
-        switch (key) {
-            case 's':
-                return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
-            case 'ss':
-                return isFuture ? 'sekunnin' : 'sekuntia';
-            case 'm':
-                return isFuture ? 'minuutin' : 'minuutti';
-            case 'mm':
-                result = isFuture ? 'minuutin' : 'minuuttia';
-                break;
-            case 'h':
-                return isFuture ? 'tunnin' : 'tunti';
-            case 'hh':
-                result = isFuture ? 'tunnin' : 'tuntia';
-                break;
-            case 'd':
-                return isFuture ? 'päivän' : 'päivä';
-            case 'dd':
-                result = isFuture ? 'päivän' : 'päivää';
-                break;
-            case 'M':
-                return isFuture ? 'kuukauden' : 'kuukausi';
-            case 'MM':
-                result = isFuture ? 'kuukauden' : 'kuukautta';
-                break;
-            case 'y':
-                return isFuture ? 'vuoden' : 'vuosi';
-            case 'yy':
-                result = isFuture ? 'vuoden' : 'vuotta';
-                break;
-        }
-        result = verbalNumber(number, isFuture) + ' ' + result;
-        return result;
-    }
-    function verbalNumber(number, isFuture) {
-        return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
-    }
-
-    hooks.defineLocale('fi', {
-        months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
-        monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
-        weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
-        weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
-        weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
-        longDateFormat : {
-            LT : 'HH.mm',
-            LTS : 'HH.mm.ss',
-            L : 'DD.MM.YYYY',
-            LL : 'Do MMMM[ta] YYYY',
-            LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm',
-            LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm',
-            l : 'D.M.YYYY',
-            ll : 'Do MMM YYYY',
-            lll : 'Do MMM YYYY, [klo] HH.mm',
-            llll : 'ddd, Do MMM YYYY, [klo] HH.mm'
-        },
-        calendar : {
-            sameDay : '[tänään] [klo] LT',
-            nextDay : '[huomenna] [klo] LT',
-            nextWeek : 'dddd [klo] LT',
-            lastDay : '[eilen] [klo] LT',
-            lastWeek : '[viime] dddd[na] [klo] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s päästä',
-            past : '%s sitten',
-            s : translate$2,
-            ss : translate$2,
-            m : translate$2,
-            mm : translate$2,
-            h : translate$2,
-            hh : translate$2,
-            d : translate$2,
-            dd : translate$2,
-            M : translate$2,
-            MM : translate$2,
-            y : translate$2,
-            yy : translate$2
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('fo', {
-        months : 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
-        weekdays : 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),
-        weekdaysShort : 'sun_mán_týs_mik_hós_frí_ley'.split('_'),
-        weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D. MMMM, YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Í dag kl.] LT',
-            nextDay : '[Í morgin kl.] LT',
-            nextWeek : 'dddd [kl.] LT',
-            lastDay : '[Í gjár kl.] LT',
-            lastWeek : '[síðstu] dddd [kl] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'um %s',
-            past : '%s síðani',
-            s : 'fá sekund',
-            ss : '%d sekundir',
-            m : 'ein minutt',
-            mm : '%d minuttir',
-            h : 'ein tími',
-            hh : '%d tímar',
-            d : 'ein dagur',
-            dd : '%d dagar',
-            M : 'ein mánaði',
-            MM : '%d mánaðir',
-            y : 'eitt ár',
-            yy : '%d ár'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('fr-ca', {
-        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
-        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
-        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
-        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'YYYY-MM-DD',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Aujourd’hui à] LT',
-            nextDay : '[Demain à] LT',
-            nextWeek : 'dddd [à] LT',
-            lastDay : '[Hier à] LT',
-            lastWeek : 'dddd [dernier à] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'dans %s',
-            past : 'il y a %s',
-            s : 'quelques secondes',
-            ss : '%d secondes',
-            m : 'une minute',
-            mm : '%d minutes',
-            h : 'une heure',
-            hh : '%d heures',
-            d : 'un jour',
-            dd : '%d jours',
-            M : 'un mois',
-            MM : '%d mois',
-            y : 'un an',
-            yy : '%d ans'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
-        ordinal : function (number, period) {
-            switch (period) {
-                // Words with masculine grammatical gender: mois, trimestre, jour
-                default:
-                case 'M':
-                case 'Q':
-                case 'D':
-                case 'DDD':
-                case 'd':
-                    return number + (number === 1 ? 'er' : 'e');
-
-                // Words with feminine grammatical gender: semaine
-                case 'w':
-                case 'W':
-                    return number + (number === 1 ? 're' : 'e');
-            }
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('fr-ch', {
-        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
-        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
-        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
-        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Aujourd’hui à] LT',
-            nextDay : '[Demain à] LT',
-            nextWeek : 'dddd [à] LT',
-            lastDay : '[Hier à] LT',
-            lastWeek : 'dddd [dernier à] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'dans %s',
-            past : 'il y a %s',
-            s : 'quelques secondes',
-            ss : '%d secondes',
-            m : 'une minute',
-            mm : '%d minutes',
-            h : 'une heure',
-            hh : '%d heures',
-            d : 'un jour',
-            dd : '%d jours',
-            M : 'un mois',
-            MM : '%d mois',
-            y : 'un an',
-            yy : '%d ans'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
-        ordinal : function (number, period) {
-            switch (period) {
-                // Words with masculine grammatical gender: mois, trimestre, jour
-                default:
-                case 'M':
-                case 'Q':
-                case 'D':
-                case 'DDD':
-                case 'd':
-                    return number + (number === 1 ? 'er' : 'e');
-
-                // Words with feminine grammatical gender: semaine
-                case 'w':
-                case 'W':
-                    return number + (number === 1 ? 're' : 'e');
-            }
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('fr', {
-        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
-        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
-        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
-        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Aujourd’hui à] LT',
-            nextDay : '[Demain à] LT',
-            nextWeek : 'dddd [à] LT',
-            lastDay : '[Hier à] LT',
-            lastWeek : 'dddd [dernier à] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'dans %s',
-            past : 'il y a %s',
-            s : 'quelques secondes',
-            ss : '%d secondes',
-            m : 'une minute',
-            mm : '%d minutes',
-            h : 'une heure',
-            hh : '%d heures',
-            d : 'un jour',
-            dd : '%d jours',
-            M : 'un mois',
-            MM : '%d mois',
-            y : 'un an',
-            yy : '%d ans'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(er|)/,
-        ordinal : function (number, period) {
-            switch (period) {
-                // TODO: Return 'e' when day of month > 1. Move this case inside
-                // block for masculine words below.
-                // See https://github.com/moment/moment/issues/3375
-                case 'D':
-                    return number + (number === 1 ? 'er' : '');
-
-                // Words with masculine grammatical gender: mois, trimestre, jour
-                default:
-                case 'M':
-                case 'Q':
-                case 'DDD':
-                case 'd':
-                    return number + (number === 1 ? 'er' : 'e');
-
-                // Words with feminine grammatical gender: semaine
-                case 'w':
-                case 'W':
-                    return number + (number === 1 ? 're' : 'e');
-            }
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'),
-        monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_');
-
-    hooks.defineLocale('fy', {
-        months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'),
-        monthsShort : function (m, format) {
-            if (!m) {
-                return monthsShortWithDots;
-            } else if (/-MMM-/.test(format)) {
-                return monthsShortWithoutDots[m.month()];
-            } else {
-                return monthsShortWithDots[m.month()];
-            }
-        },
-        monthsParseExact : true,
-        weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'),
-        weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'),
-        weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD-MM-YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[hjoed om] LT',
-            nextDay: '[moarn om] LT',
-            nextWeek: 'dddd [om] LT',
-            lastDay: '[juster om] LT',
-            lastWeek: '[ôfrûne] dddd [om] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'oer %s',
-            past : '%s lyn',
-            s : 'in pear sekonden',
-            ss : '%d sekonden',
-            m : 'ien minút',
-            mm : '%d minuten',
-            h : 'ien oere',
-            hh : '%d oeren',
-            d : 'ien dei',
-            dd : '%d dagen',
-            M : 'ien moanne',
-            MM : '%d moannen',
-            y : 'ien jier',
-            yy : '%d jierren'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-        ordinal : function (number) {
-            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var months$5 = [
-        'Am Faoilleach', 'An Gearran', 'Am Màrt', 'An Giblean', 'An Cèitean', 'An t-Ògmhios', 'An t-Iuchar', 'An Lùnastal', 'An t-Sultain', 'An Dàmhair', 'An t-Samhain', 'An Dùbhlachd'
-    ];
-
-    var monthsShort$4 = ['Faoi', 'Gear', 'Màrt', 'Gibl', 'Cèit', 'Ògmh', 'Iuch', 'Lùn', 'Sult', 'Dàmh', 'Samh', 'Dùbh'];
-
-    var weekdays$1 = ['Didòmhnaich', 'Diluain', 'Dimàirt', 'Diciadain', 'Diardaoin', 'Dihaoine', 'Disathairne'];
-
-    var weekdaysShort = ['Did', 'Dil', 'Dim', 'Dic', 'Dia', 'Dih', 'Dis'];
-
-    var weekdaysMin = ['Dò', 'Lu', 'Mà', 'Ci', 'Ar', 'Ha', 'Sa'];
-
-    hooks.defineLocale('gd', {
-        months : months$5,
-        monthsShort : monthsShort$4,
-        monthsParseExact : true,
-        weekdays : weekdays$1,
-        weekdaysShort : weekdaysShort,
-        weekdaysMin : weekdaysMin,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[An-diugh aig] LT',
-            nextDay : '[A-màireach aig] LT',
-            nextWeek : 'dddd [aig] LT',
-            lastDay : '[An-dè aig] LT',
-            lastWeek : 'dddd [seo chaidh] [aig] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'ann an %s',
-            past : 'bho chionn %s',
-            s : 'beagan diogan',
-            ss : '%d diogan',
-            m : 'mionaid',
-            mm : '%d mionaidean',
-            h : 'uair',
-            hh : '%d uairean',
-            d : 'latha',
-            dd : '%d latha',
-            M : 'mìos',
-            MM : '%d mìosan',
-            y : 'bliadhna',
-            yy : '%d bliadhna'
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}(d|na|mh)/,
-        ordinal : function (number) {
-            var output = number === 1 ? 'd' : number % 10 === 2 ? 'na' : 'mh';
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('gl', {
-        months : 'xaneiro_febreiro_marzo_abril_maio_xuño_xullo_agosto_setembro_outubro_novembro_decembro'.split('_'),
-        monthsShort : 'xan._feb._mar._abr._mai._xuñ._xul._ago._set._out._nov._dec.'.split('_'),
-        monthsParseExact: true,
-        weekdays : 'domingo_luns_martes_mércores_xoves_venres_sábado'.split('_'),
-        weekdaysShort : 'dom._lun._mar._mér._xov._ven._sáb.'.split('_'),
-        weekdaysMin : 'do_lu_ma_mé_xo_ve_sá'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D [de] MMMM [de] YYYY',
-            LLL : 'D [de] MMMM [de] YYYY H:mm',
-            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
-        },
-        calendar : {
-            sameDay : function () {
-                return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
-            },
-            nextDay : function () {
-                return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
-            },
-            nextWeek : function () {
-                return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
-            },
-            lastDay : function () {
-                return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT';
-            },
-            lastWeek : function () {
-                return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : function (str) {
-                if (str.indexOf('un') === 0) {
-                    return 'n' + str;
-                }
-                return 'en ' + str;
-            },
-            past : 'hai %s',
-            s : 'uns segundos',
-            ss : '%d segundos',
-            m : 'un minuto',
-            mm : '%d minutos',
-            h : 'unha hora',
-            hh : '%d horas',
-            d : 'un día',
-            dd : '%d días',
-            M : 'un mes',
-            MM : '%d meses',
-            y : 'un ano',
-            yy : '%d anos'
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}º/,
-        ordinal : '%dº',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function processRelativeTime$4(number, withoutSuffix, key, isFuture) {
-        var format = {
-            's': ['thodde secondanim', 'thodde second'],
-            'ss': [number + ' secondanim', number + ' second'],
-            'm': ['eka mintan', 'ek minute'],
-            'mm': [number + ' mintanim', number + ' mintam'],
-            'h': ['eka horan', 'ek hor'],
-            'hh': [number + ' horanim', number + ' horam'],
-            'd': ['eka disan', 'ek dis'],
-            'dd': [number + ' disanim', number + ' dis'],
-            'M': ['eka mhoinean', 'ek mhoino'],
-            'MM': [number + ' mhoineanim', number + ' mhoine'],
-            'y': ['eka vorsan', 'ek voros'],
-            'yy': [number + ' vorsanim', number + ' vorsam']
-        };
-        return withoutSuffix ? format[key][0] : format[key][1];
-    }
-
-    hooks.defineLocale('gom-latn', {
-        months : 'Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr'.split('_'),
-        monthsShort : 'Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'Aitar_Somar_Mongllar_Budvar_Brestar_Sukrar_Son\'var'.split('_'),
-        weekdaysShort : 'Ait._Som._Mon._Bud._Bre._Suk._Son.'.split('_'),
-        weekdaysMin : 'Ai_Sm_Mo_Bu_Br_Su_Sn'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'A h:mm [vazta]',
-            LTS : 'A h:mm:ss [vazta]',
-            L : 'DD-MM-YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY A h:mm [vazta]',
-            LLLL : 'dddd, MMMM[achea] Do, YYYY, A h:mm [vazta]',
-            llll: 'ddd, D MMM YYYY, A h:mm [vazta]'
-        },
-        calendar : {
-            sameDay: '[Aiz] LT',
-            nextDay: '[Faleam] LT',
-            nextWeek: '[Ieta to] dddd[,] LT',
-            lastDay: '[Kal] LT',
-            lastWeek: '[Fatlo] dddd[,] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : '%s',
-            past : '%s adim',
-            s : processRelativeTime$4,
-            ss : processRelativeTime$4,
-            m : processRelativeTime$4,
-            mm : processRelativeTime$4,
-            h : processRelativeTime$4,
-            hh : processRelativeTime$4,
-            d : processRelativeTime$4,
-            dd : processRelativeTime$4,
-            M : processRelativeTime$4,
-            MM : processRelativeTime$4,
-            y : processRelativeTime$4,
-            yy : processRelativeTime$4
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}(er)/,
-        ordinal : function (number, period) {
-            switch (period) {
-                // the ordinal 'er' only applies to day of the month
-                case 'D':
-                    return number + 'er';
-                default:
-                case 'M':
-                case 'Q':
-                case 'DDD':
-                case 'd':
-                case 'w':
-                case 'W':
-                    return number;
-            }
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        },
-        meridiemParse: /rati|sokalli|donparam|sanje/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'rati') {
-                return hour < 4 ? hour : hour + 12;
-            } else if (meridiem === 'sokalli') {
-                return hour;
-            } else if (meridiem === 'donparam') {
-                return hour > 12 ? hour : hour + 12;
-            } else if (meridiem === 'sanje') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'rati';
-            } else if (hour < 12) {
-                return 'sokalli';
-            } else if (hour < 16) {
-                return 'donparam';
-            } else if (hour < 20) {
-                return 'sanje';
-            } else {
-                return 'rati';
-            }
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$6 = {
-            '1': '૧',
-            '2': '૨',
-            '3': '૩',
-            '4': '૪',
-            '5': '૫',
-            '6': '૬',
-            '7': '૭',
-            '8': '૮',
-            '9': '૯',
-            '0': '૦'
-        },
-        numberMap$5 = {
-            '૧': '1',
-            '૨': '2',
-            '૩': '3',
-            '૪': '4',
-            '૫': '5',
-            '૬': '6',
-            '૭': '7',
-            '૮': '8',
-            '૯': '9',
-            '૦': '0'
-        };
-
-    hooks.defineLocale('gu', {
-        months: 'જાન્યુઆરી_ફેબ્રુઆરી_માર્ચ_એપ્રિલ_મે_જૂન_જુલાઈ_ઑગસ્ટ_સપ્ટેમ્બર_ઑક્ટ્બર_નવેમ્બર_ડિસેમ્બર'.split('_'),
-        monthsShort: 'જાન્યુ._ફેબ્રુ._માર્ચ_એપ્રિ._મે_જૂન_જુલા._ઑગ._સપ્ટે._ઑક્ટ્._નવે._ડિસે.'.split('_'),
-        monthsParseExact: true,
-        weekdays: 'રવિવાર_સોમવાર_મંગળવાર_બુધ્વાર_ગુરુવાર_શુક્રવાર_શનિવાર'.split('_'),
-        weekdaysShort: 'રવિ_સોમ_મંગળ_બુધ્_ગુરુ_શુક્ર_શનિ'.split('_'),
-        weekdaysMin: 'ર_સો_મં_બુ_ગુ_શુ_શ'.split('_'),
-        longDateFormat: {
-            LT: 'A h:mm વાગ્યે',
-            LTS: 'A h:mm:ss વાગ્યે',
-            L: 'DD/MM/YYYY',
-            LL: 'D MMMM YYYY',
-            LLL: 'D MMMM YYYY, A h:mm વાગ્યે',
-            LLLL: 'dddd, D MMMM YYYY, A h:mm વાગ્યે'
-        },
-        calendar: {
-            sameDay: '[આજ] LT',
-            nextDay: '[કાલે] LT',
-            nextWeek: 'dddd, LT',
-            lastDay: '[ગઇકાલે] LT',
-            lastWeek: '[પાછલા] dddd, LT',
-            sameElse: 'L'
-        },
-        relativeTime: {
-            future: '%s મા',
-            past: '%s પેહલા',
-            s: 'અમુક પળો',
-            ss: '%d સેકંડ',
-            m: 'એક મિનિટ',
-            mm: '%d મિનિટ',
-            h: 'એક કલાક',
-            hh: '%d કલાક',
-            d: 'એક દિવસ',
-            dd: '%d દિવસ',
-            M: 'એક મહિનો',
-            MM: '%d મહિનો',
-            y: 'એક વર્ષ',
-            yy: '%d વર્ષ'
-        },
-        preparse: function (string) {
-            return string.replace(/[૧૨૩૪૫૬૭૮૯૦]/g, function (match) {
-                return numberMap$5[match];
-            });
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$6[match];
-            });
-        },
-        // Gujarati notation for meridiems are quite fuzzy in practice. While there exists
-        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Gujarati.
-        meridiemParse: /રાત|બપોર|સવાર|સાંજ/,
-        meridiemHour: function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'રાત') {
-                return hour < 4 ? hour : hour + 12;
-            } else if (meridiem === 'સવાર') {
-                return hour;
-            } else if (meridiem === 'બપોર') {
-                return hour >= 10 ? hour : hour + 12;
-            } else if (meridiem === 'સાંજ') {
-                return hour + 12;
-            }
-        },
-        meridiem: function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'રાત';
-            } else if (hour < 10) {
-                return 'સવાર';
-            } else if (hour < 17) {
-                return 'બપોર';
-            } else if (hour < 20) {
-                return 'સાંજ';
-            } else {
-                return 'રાત';
-            }
-        },
-        week: {
-            dow: 0, // Sunday is the first day of the week.
-            doy: 6 // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('he', {
-        months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
-        monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),
-        weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
-        weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
-        weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D [ב]MMMM YYYY',
-            LLL : 'D [ב]MMMM YYYY HH:mm',
-            LLLL : 'dddd, D [ב]MMMM YYYY HH:mm',
-            l : 'D/M/YYYY',
-            ll : 'D MMM YYYY',
-            lll : 'D MMM YYYY HH:mm',
-            llll : 'ddd, D MMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[היום ב־]LT',
-            nextDay : '[מחר ב־]LT',
-            nextWeek : 'dddd [בשעה] LT',
-            lastDay : '[אתמול ב־]LT',
-            lastWeek : '[ביום] dddd [האחרון בשעה] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'בעוד %s',
-            past : 'לפני %s',
-            s : 'מספר שניות',
-            ss : '%d שניות',
-            m : 'דקה',
-            mm : '%d דקות',
-            h : 'שעה',
-            hh : function (number) {
-                if (number === 2) {
-                    return 'שעתיים';
-                }
-                return number + ' שעות';
-            },
-            d : 'יום',
-            dd : function (number) {
-                if (number === 2) {
-                    return 'יומיים';
-                }
-                return number + ' ימים';
-            },
-            M : 'חודש',
-            MM : function (number) {
-                if (number === 2) {
-                    return 'חודשיים';
-                }
-                return number + ' חודשים';
-            },
-            y : 'שנה',
-            yy : function (number) {
-                if (number === 2) {
-                    return 'שנתיים';
-                } else if (number % 10 === 0 && number !== 10) {
-                    return number + ' שנה';
-                }
-                return number + ' שנים';
-            }
-        },
-        meridiemParse: /אחה"צ|לפנה"צ|אחרי הצהריים|לפני הצהריים|לפנות בוקר|בבוקר|בערב/i,
-        isPM : function (input) {
-            return /^(אחה"צ|אחרי הצהריים|בערב)$/.test(input);
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 5) {
-                return 'לפנות בוקר';
-            } else if (hour < 10) {
-                return 'בבוקר';
-            } else if (hour < 12) {
-                return isLower ? 'לפנה"צ' : 'לפני הצהריים';
-            } else if (hour < 18) {
-                return isLower ? 'אחה"צ' : 'אחרי הצהריים';
-            } else {
-                return 'בערב';
-            }
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$7 = {
-        '1': '१',
-        '2': '२',
-        '3': '३',
-        '4': '४',
-        '5': '५',
-        '6': '६',
-        '7': '७',
-        '8': '८',
-        '9': '९',
-        '0': '०'
-    },
-    numberMap$6 = {
-        '१': '1',
-        '२': '2',
-        '३': '3',
-        '४': '4',
-        '५': '5',
-        '६': '6',
-        '७': '7',
-        '८': '8',
-        '९': '9',
-        '०': '0'
-    };
-
-    hooks.defineLocale('hi', {
-        months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'),
-        monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'),
-        monthsParseExact: true,
-        weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
-        weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'),
-        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
-        longDateFormat : {
-            LT : 'A h:mm बजे',
-            LTS : 'A h:mm:ss बजे',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY, A h:mm बजे',
-            LLLL : 'dddd, D MMMM YYYY, A h:mm बजे'
-        },
-        calendar : {
-            sameDay : '[आज] LT',
-            nextDay : '[कल] LT',
-            nextWeek : 'dddd, LT',
-            lastDay : '[कल] LT',
-            lastWeek : '[पिछले] dddd, LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s में',
-            past : '%s पहले',
-            s : 'कुछ ही क्षण',
-            ss : '%d सेकंड',
-            m : 'एक मिनट',
-            mm : '%d मिनट',
-            h : 'एक घंटा',
-            hh : '%d घंटे',
-            d : 'एक दिन',
-            dd : '%d दिन',
-            M : 'एक महीने',
-            MM : '%d महीने',
-            y : 'एक वर्ष',
-            yy : '%d वर्ष'
-        },
-        preparse: function (string) {
-            return string.replace(/[१२३४५६७८९०]/g, function (match) {
-                return numberMap$6[match];
-            });
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$7[match];
-            });
-        },
-        // Hindi notation for meridiems are quite fuzzy in practice. While there exists
-        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi.
-        meridiemParse: /रात|सुबह|दोपहर|शाम/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'रात') {
-                return hour < 4 ? hour : hour + 12;
-            } else if (meridiem === 'सुबह') {
-                return hour;
-            } else if (meridiem === 'दोपहर') {
-                return hour >= 10 ? hour : hour + 12;
-            } else if (meridiem === 'शाम') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'रात';
-            } else if (hour < 10) {
-                return 'सुबह';
-            } else if (hour < 17) {
-                return 'दोपहर';
-            } else if (hour < 20) {
-                return 'शाम';
-            } else {
-                return 'रात';
-            }
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 6  // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function translate$3(number, withoutSuffix, key) {
-        var result = number + ' ';
-        switch (key) {
-            case 'ss':
-                if (number === 1) {
-                    result += 'sekunda';
-                } else if (number === 2 || number === 3 || number === 4) {
-                    result += 'sekunde';
-                } else {
-                    result += 'sekundi';
-                }
-                return result;
-            case 'm':
-                return withoutSuffix ? 'jedna minuta' : 'jedne minute';
-            case 'mm':
-                if (number === 1) {
-                    result += 'minuta';
-                } else if (number === 2 || number === 3 || number === 4) {
-                    result += 'minute';
-                } else {
-                    result += 'minuta';
-                }
-                return result;
-            case 'h':
-                return withoutSuffix ? 'jedan sat' : 'jednog sata';
-            case 'hh':
-                if (number === 1) {
-                    result += 'sat';
-                } else if (number === 2 || number === 3 || number === 4) {
-                    result += 'sata';
-                } else {
-                    result += 'sati';
-                }
-                return result;
-            case 'dd':
-                if (number === 1) {
-                    result += 'dan';
-                } else {
-                    result += 'dana';
-                }
-                return result;
-            case 'MM':
-                if (number === 1) {
-                    result += 'mjesec';
-                } else if (number === 2 || number === 3 || number === 4) {
-                    result += 'mjeseca';
-                } else {
-                    result += 'mjeseci';
-                }
-                return result;
-            case 'yy':
-                if (number === 1) {
-                    result += 'godina';
-                } else if (number === 2 || number === 3 || number === 4) {
-                    result += 'godine';
-                } else {
-                    result += 'godina';
-                }
-                return result;
-        }
-    }
-
-    hooks.defineLocale('hr', {
-        months : {
-            format: 'siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca'.split('_'),
-            standalone: 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_')
-        },
-        monthsShort : 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'),
-        monthsParseExact: true,
-        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
-        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
-        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY H:mm',
-            LLLL : 'dddd, D. MMMM YYYY H:mm'
-        },
-        calendar : {
-            sameDay  : '[danas u] LT',
-            nextDay  : '[sutra u] LT',
-            nextWeek : function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[u] [nedjelju] [u] LT';
-                    case 3:
-                        return '[u] [srijedu] [u] LT';
-                    case 6:
-                        return '[u] [subotu] [u] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                    case 5:
-                        return '[u] dddd [u] LT';
-                }
-            },
-            lastDay  : '[jučer u] LT',
-            lastWeek : function () {
-                switch (this.day()) {
-                    case 0:
-                    case 3:
-                        return '[prošlu] dddd [u] LT';
-                    case 6:
-                        return '[prošle] [subote] [u] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                    case 5:
-                        return '[prošli] dddd [u] LT';
-                }
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'za %s',
-            past   : 'prije %s',
-            s      : 'par sekundi',
-            ss     : translate$3,
-            m      : translate$3,
-            mm     : translate$3,
-            h      : translate$3,
-            hh     : translate$3,
-            d      : 'dan',
-            dd     : translate$3,
-            M      : 'mjesec',
-            MM     : translate$3,
-            y      : 'godinu',
-            yy     : translate$3
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
-    function translate$4(number, withoutSuffix, key, isFuture) {
-        var num = number;
-        switch (key) {
-            case 's':
-                return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
-            case 'ss':
-                return num + (isFuture || withoutSuffix) ? ' másodperc' : ' másodperce';
-            case 'm':
-                return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce');
-            case 'mm':
-                return num + (isFuture || withoutSuffix ? ' perc' : ' perce');
-            case 'h':
-                return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája');
-            case 'hh':
-                return num + (isFuture || withoutSuffix ? ' óra' : ' órája');
-            case 'd':
-                return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja');
-            case 'dd':
-                return num + (isFuture || withoutSuffix ? ' nap' : ' napja');
-            case 'M':
-                return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
-            case 'MM':
-                return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
-            case 'y':
-                return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve');
-            case 'yy':
-                return num + (isFuture || withoutSuffix ? ' év' : ' éve');
-        }
-        return '';
-    }
-    function week(isFuture) {
-        return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]';
-    }
-
-    hooks.defineLocale('hu', {
-        months : 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'),
-        monthsShort : 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'),
-        weekdays : 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'),
-        weekdaysShort : 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'),
-        weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'),
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'YYYY.MM.DD.',
-            LL : 'YYYY. MMMM D.',
-            LLL : 'YYYY. MMMM D. H:mm',
-            LLLL : 'YYYY. MMMM D., dddd H:mm'
-        },
-        meridiemParse: /de|du/i,
-        isPM: function (input) {
-            return input.charAt(1).toLowerCase() === 'u';
-        },
-        meridiem : function (hours, minutes, isLower) {
-            if (hours < 12) {
-                return isLower === true ? 'de' : 'DE';
-            } else {
-                return isLower === true ? 'du' : 'DU';
-            }
-        },
-        calendar : {
-            sameDay : '[ma] LT[-kor]',
-            nextDay : '[holnap] LT[-kor]',
-            nextWeek : function () {
-                return week.call(this, true);
-            },
-            lastDay : '[tegnap] LT[-kor]',
-            lastWeek : function () {
-                return week.call(this, false);
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s múlva',
-            past : '%s',
-            s : translate$4,
-            ss : translate$4,
-            m : translate$4,
-            mm : translate$4,
-            h : translate$4,
-            hh : translate$4,
-            d : translate$4,
-            dd : translate$4,
-            M : translate$4,
-            MM : translate$4,
-            y : translate$4,
-            yy : translate$4
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('hy-am', {
-        months : {
-            format: 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_'),
-            standalone: 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_')
-        },
-        monthsShort : 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'),
-        weekdays : 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_'),
-        weekdaysShort : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
-        weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY թ.',
-            LLL : 'D MMMM YYYY թ., HH:mm',
-            LLLL : 'dddd, D MMMM YYYY թ., HH:mm'
-        },
-        calendar : {
-            sameDay: '[այսօր] LT',
-            nextDay: '[վաղը] LT',
-            lastDay: '[երեկ] LT',
-            nextWeek: function () {
-                return 'dddd [օրը ժամը] LT';
-            },
-            lastWeek: function () {
-                return '[անցած] dddd [օրը ժամը] LT';
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : '%s հետո',
-            past : '%s առաջ',
-            s : 'մի քանի վայրկյան',
-            ss : '%d վայրկյան',
-            m : 'րոպե',
-            mm : '%d րոպե',
-            h : 'ժամ',
-            hh : '%d ժամ',
-            d : 'օր',
-            dd : '%d օր',
-            M : 'ամիս',
-            MM : '%d ամիս',
-            y : 'տարի',
-            yy : '%d տարի'
-        },
-        meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,
-        isPM: function (input) {
-            return /^(ցերեկվա|երեկոյան)$/.test(input);
-        },
-        meridiem : function (hour) {
-            if (hour < 4) {
-                return 'գիշերվա';
-            } else if (hour < 12) {
-                return 'առավոտվա';
-            } else if (hour < 17) {
-                return 'ցերեկվա';
-            } else {
-                return 'երեկոյան';
-            }
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}|\d{1,2}-(ին|րդ)/,
-        ordinal: function (number, period) {
-            switch (period) {
-                case 'DDD':
-                case 'w':
-                case 'W':
-                case 'DDDo':
-                    if (number === 1) {
-                        return number + '-ին';
-                    }
-                    return number + '-րդ';
-                default:
-                    return number;
-            }
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('id', {
-        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'),
-        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Agt_Sep_Okt_Nov_Des'.split('_'),
-        weekdays : 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'),
-        weekdaysShort : 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'),
-        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'),
-        longDateFormat : {
-            LT : 'HH.mm',
-            LTS : 'HH.mm.ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY [pukul] HH.mm',
-            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-        },
-        meridiemParse: /pagi|siang|sore|malam/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'pagi') {
-                return hour;
-            } else if (meridiem === 'siang') {
-                return hour >= 11 ? hour : hour + 12;
-            } else if (meridiem === 'sore' || meridiem === 'malam') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hours, minutes, isLower) {
-            if (hours < 11) {
-                return 'pagi';
-            } else if (hours < 15) {
-                return 'siang';
-            } else if (hours < 19) {
-                return 'sore';
-            } else {
-                return 'malam';
-            }
-        },
-        calendar : {
-            sameDay : '[Hari ini pukul] LT',
-            nextDay : '[Besok pukul] LT',
-            nextWeek : 'dddd [pukul] LT',
-            lastDay : '[Kemarin pukul] LT',
-            lastWeek : 'dddd [lalu pukul] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'dalam %s',
-            past : '%s yang lalu',
-            s : 'beberapa detik',
-            ss : '%d detik',
-            m : 'semenit',
-            mm : '%d menit',
-            h : 'sejam',
-            hh : '%d jam',
-            d : 'sehari',
-            dd : '%d hari',
-            M : 'sebulan',
-            MM : '%d bulan',
-            y : 'setahun',
-            yy : '%d tahun'
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function plural$2(n) {
-        if (n % 100 === 11) {
-            return true;
-        } else if (n % 10 === 1) {
-            return false;
-        }
-        return true;
-    }
-    function translate$5(number, withoutSuffix, key, isFuture) {
-        var result = number + ' ';
-        switch (key) {
-            case 's':
-                return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum';
-            case 'ss':
-                if (plural$2(number)) {
-                    return result + (withoutSuffix || isFuture ? 'sekúndur' : 'sekúndum');
-                }
-                return result + 'sekúnda';
-            case 'm':
-                return withoutSuffix ? 'mínúta' : 'mínútu';
-            case 'mm':
-                if (plural$2(number)) {
-                    return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum');
-                } else if (withoutSuffix) {
-                    return result + 'mínúta';
-                }
-                return result + 'mínútu';
-            case 'hh':
-                if (plural$2(number)) {
-                    return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum');
-                }
-                return result + 'klukkustund';
-            case 'd':
-                if (withoutSuffix) {
-                    return 'dagur';
-                }
-                return isFuture ? 'dag' : 'degi';
-            case 'dd':
-                if (plural$2(number)) {
-                    if (withoutSuffix) {
-                        return result + 'dagar';
-                    }
-                    return result + (isFuture ? 'daga' : 'dögum');
-                } else if (withoutSuffix) {
-                    return result + 'dagur';
-                }
-                return result + (isFuture ? 'dag' : 'degi');
-            case 'M':
-                if (withoutSuffix) {
-                    return 'mánuður';
-                }
-                return isFuture ? 'mánuð' : 'mánuði';
-            case 'MM':
-                if (plural$2(number)) {
-                    if (withoutSuffix) {
-                        return result + 'mánuðir';
-                    }
-                    return result + (isFuture ? 'mánuði' : 'mánuðum');
-                } else if (withoutSuffix) {
-                    return result + 'mánuður';
-                }
-                return result + (isFuture ? 'mánuð' : 'mánuði');
-            case 'y':
-                return withoutSuffix || isFuture ? 'ár' : 'ári';
-            case 'yy':
-                if (plural$2(number)) {
-                    return result + (withoutSuffix || isFuture ? 'ár' : 'árum');
-                }
-                return result + (withoutSuffix || isFuture ? 'ár' : 'ári');
-        }
-    }
-
-    hooks.defineLocale('is', {
-        months : 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'),
-        monthsShort : 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'),
-        weekdays : 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'),
-        weekdaysShort : 'sun_mán_þri_mið_fim_fös_lau'.split('_'),
-        weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'),
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY [kl.] H:mm',
-            LLLL : 'dddd, D. MMMM YYYY [kl.] H:mm'
-        },
-        calendar : {
-            sameDay : '[í dag kl.] LT',
-            nextDay : '[á morgun kl.] LT',
-            nextWeek : 'dddd [kl.] LT',
-            lastDay : '[í gær kl.] LT',
-            lastWeek : '[síðasta] dddd [kl.] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'eftir %s',
-            past : 'fyrir %s síðan',
-            s : translate$5,
-            ss : translate$5,
-            m : translate$5,
-            mm : translate$5,
-            h : 'klukkustund',
-            hh : translate$5,
-            d : translate$5,
-            dd : translate$5,
-            M : translate$5,
-            MM : translate$5,
-            y : translate$5,
-            yy : translate$5
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('it', {
-        months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
-        monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
-        weekdays : 'domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato'.split('_'),
-        weekdaysShort : 'dom_lun_mar_mer_gio_ven_sab'.split('_'),
-        weekdaysMin : 'do_lu_ma_me_gi_ve_sa'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[Oggi alle] LT',
-            nextDay: '[Domani alle] LT',
-            nextWeek: 'dddd [alle] LT',
-            lastDay: '[Ieri alle] LT',
-            lastWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[la scorsa] dddd [alle] LT';
-                    default:
-                        return '[lo scorso] dddd [alle] LT';
-                }
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : function (s) {
-                return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;
-            },
-            past : '%s fa',
-            s : 'alcuni secondi',
-            ss : '%d secondi',
-            m : 'un minuto',
-            mm : '%d minuti',
-            h : 'un\'ora',
-            hh : '%d ore',
-            d : 'un giorno',
-            dd : '%d giorni',
-            M : 'un mese',
-            MM : '%d mesi',
-            y : 'un anno',
-            yy : '%d anni'
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}º/,
-        ordinal: '%dº',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ja', {
-        months : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-        weekdays : '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'),
-        weekdaysShort : '日_月_火_水_木_金_土'.split('_'),
-        weekdaysMin : '日_月_火_水_木_金_土'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'YYYY/MM/DD',
-            LL : 'YYYY年M月D日',
-            LLL : 'YYYY年M月D日 HH:mm',
-            LLLL : 'YYYY年M月D日 dddd HH:mm',
-            l : 'YYYY/MM/DD',
-            ll : 'YYYY年M月D日',
-            lll : 'YYYY年M月D日 HH:mm',
-            llll : 'YYYY年M月D日(ddd) HH:mm'
-        },
-        meridiemParse: /午前|午後/i,
-        isPM : function (input) {
-            return input === '午後';
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return '午前';
-            } else {
-                return '午後';
-            }
-        },
-        calendar : {
-            sameDay : '[今日] LT',
-            nextDay : '[明日] LT',
-            nextWeek : function (now) {
-                if (now.week() < this.week()) {
-                    return '[来週]dddd LT';
-                } else {
-                    return 'dddd LT';
-                }
-            },
-            lastDay : '[昨日] LT',
-            lastWeek : function (now) {
-                if (this.week() < now.week()) {
-                    return '[先週]dddd LT';
-                } else {
-                    return 'dddd LT';
-                }
-            },
-            sameElse : 'L'
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}日/,
-        ordinal : function (number, period) {
-            switch (period) {
-                case 'd':
-                case 'D':
-                case 'DDD':
-                    return number + '日';
-                default:
-                    return number;
-            }
-        },
-        relativeTime : {
-            future : '%s後',
-            past : '%s前',
-            s : '数秒',
-            ss : '%d秒',
-            m : '1分',
-            mm : '%d分',
-            h : '1時間',
-            hh : '%d時間',
-            d : '1日',
-            dd : '%d日',
-            M : '1ヶ月',
-            MM : '%dヶ月',
-            y : '1年',
-            yy : '%d年'
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('jv', {
-        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'),
-        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'),
-        weekdays : 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'),
-        weekdaysShort : 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'),
-        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'),
-        longDateFormat : {
-            LT : 'HH.mm',
-            LTS : 'HH.mm.ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY [pukul] HH.mm',
-            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-        },
-        meridiemParse: /enjing|siyang|sonten|ndalu/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'enjing') {
-                return hour;
-            } else if (meridiem === 'siyang') {
-                return hour >= 11 ? hour : hour + 12;
-            } else if (meridiem === 'sonten' || meridiem === 'ndalu') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hours, minutes, isLower) {
-            if (hours < 11) {
-                return 'enjing';
-            } else if (hours < 15) {
-                return 'siyang';
-            } else if (hours < 19) {
-                return 'sonten';
-            } else {
-                return 'ndalu';
-            }
-        },
-        calendar : {
-            sameDay : '[Dinten puniko pukul] LT',
-            nextDay : '[Mbenjang pukul] LT',
-            nextWeek : 'dddd [pukul] LT',
-            lastDay : '[Kala wingi pukul] LT',
-            lastWeek : 'dddd [kepengker pukul] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'wonten ing %s',
-            past : '%s ingkang kepengker',
-            s : 'sawetawis detik',
-            ss : '%d detik',
-            m : 'setunggal menit',
-            mm : '%d menit',
-            h : 'setunggal jam',
-            hh : '%d jam',
-            d : 'sedinten',
-            dd : '%d dinten',
-            M : 'sewulan',
-            MM : '%d wulan',
-            y : 'setaun',
-            yy : '%d taun'
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ka', {
-        months : {
-            standalone: 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'),
-            format: 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_')
-        },
-        monthsShort : 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'),
-        weekdays : {
-            standalone: 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'),
-            format: 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_'),
-            isFormat: /(წინა|შემდეგ)/
-        },
-        weekdaysShort : 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'),
-        weekdaysMin : 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'),
-        longDateFormat : {
-            LT : 'h:mm A',
-            LTS : 'h:mm:ss A',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY h:mm A',
-            LLLL : 'dddd, D MMMM YYYY h:mm A'
-        },
-        calendar : {
-            sameDay : '[დღეს] LT[-ზე]',
-            nextDay : '[ხვალ] LT[-ზე]',
-            lastDay : '[გუშინ] LT[-ზე]',
-            nextWeek : '[შემდეგ] dddd LT[-ზე]',
-            lastWeek : '[წინა] dddd LT-ზე',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : function (s) {
-                return (/(წამი|წუთი|საათი|წელი)/).test(s) ?
-                    s.replace(/ი$/, 'ში') :
-                    s + 'ში';
-            },
-            past : function (s) {
-                if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) {
-                    return s.replace(/(ი|ე)$/, 'ის წინ');
-                }
-                if ((/წელი/).test(s)) {
-                    return s.replace(/წელი$/, 'წლის წინ');
-                }
-            },
-            s : 'რამდენიმე წამი',
-            ss : '%d წამი',
-            m : 'წუთი',
-            mm : '%d წუთი',
-            h : 'საათი',
-            hh : '%d საათი',
-            d : 'დღე',
-            dd : '%d დღე',
-            M : 'თვე',
-            MM : '%d თვე',
-            y : 'წელი',
-            yy : '%d წელი'
-        },
-        dayOfMonthOrdinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,
-        ordinal : function (number) {
-            if (number === 0) {
-                return number;
-            }
-            if (number === 1) {
-                return number + '-ლი';
-            }
-            if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) {
-                return 'მე-' + number;
-            }
-            return number + '-ე';
-        },
-        week : {
-            dow : 1,
-            doy : 7
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var suffixes$1 = {
-        0: '-ші',
-        1: '-ші',
-        2: '-ші',
-        3: '-ші',
-        4: '-ші',
-        5: '-ші',
-        6: '-шы',
-        7: '-ші',
-        8: '-ші',
-        9: '-шы',
-        10: '-шы',
-        20: '-шы',
-        30: '-шы',
-        40: '-шы',
-        50: '-ші',
-        60: '-шы',
-        70: '-ші',
-        80: '-ші',
-        90: '-шы',
-        100: '-ші'
-    };
-
-    hooks.defineLocale('kk', {
-        months : 'қаңтар_ақпан_наурыз_сәуір_мамыр_маусым_шілде_тамыз_қыркүйек_қазан_қараша_желтоқсан'.split('_'),
-        monthsShort : 'қаң_ақп_нау_сәу_мам_мау_шіл_там_қыр_қаз_қар_жел'.split('_'),
-        weekdays : 'жексенбі_дүйсенбі_сейсенбі_сәрсенбі_бейсенбі_жұма_сенбі'.split('_'),
-        weekdaysShort : 'жек_дүй_сей_сәр_бей_жұм_сен'.split('_'),
-        weekdaysMin : 'жк_дй_сй_ср_бй_жм_сн'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Бүгін сағат] LT',
-            nextDay : '[Ертең сағат] LT',
-            nextWeek : 'dddd [сағат] LT',
-            lastDay : '[Кеше сағат] LT',
-            lastWeek : '[Өткен аптаның] dddd [сағат] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s ішінде',
-            past : '%s бұрын',
-            s : 'бірнеше секунд',
-            ss : '%d секунд',
-            m : 'бір минут',
-            mm : '%d минут',
-            h : 'бір сағат',
-            hh : '%d сағат',
-            d : 'бір күн',
-            dd : '%d күн',
-            M : 'бір ай',
-            MM : '%d ай',
-            y : 'бір жыл',
-            yy : '%d жыл'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}-(ші|шы)/,
-        ordinal : function (number) {
-            var a = number % 10,
-                b = number >= 100 ? 100 : null;
-            return number + (suffixes$1[number] || suffixes$1[a] || suffixes$1[b]);
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$8 = {
-        '1': '១',
-        '2': '២',
-        '3': '៣',
-        '4': '៤',
-        '5': '៥',
-        '6': '៦',
-        '7': '៧',
-        '8': '៨',
-        '9': '៩',
-        '0': '០'
-    }, numberMap$7 = {
-        '១': '1',
-        '២': '2',
-        '៣': '3',
-        '៤': '4',
-        '៥': '5',
-        '៦': '6',
-        '៧': '7',
-        '៨': '8',
-        '៩': '9',
-        '០': '0'
-    };
-
-    hooks.defineLocale('km', {
-        months: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split(
-            '_'
-        ),
-        monthsShort: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split(
-            '_'
-        ),
-        weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
-        weekdaysShort: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),
-        weekdaysMin: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),
-        weekdaysParseExact: true,
-        longDateFormat: {
-            LT: 'HH:mm',
-            LTS: 'HH:mm:ss',
-            L: 'DD/MM/YYYY',
-            LL: 'D MMMM YYYY',
-            LLL: 'D MMMM YYYY HH:mm',
-            LLLL: 'dddd, D MMMM YYYY HH:mm'
-        },
-        meridiemParse: /ព្រឹក|ល្ងាច/,
-        isPM: function (input) {
-            return input === 'ល្ងាច';
-        },
-        meridiem: function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'ព្រឹក';
-            } else {
-                return 'ល្ងាច';
-            }
-        },
-        calendar: {
-            sameDay: '[ថ្ងៃនេះ ម៉ោង] LT',
-            nextDay: '[ស្អែក ម៉ោង] LT',
-            nextWeek: 'dddd [ម៉ោង] LT',
-            lastDay: '[ម្សិលមិញ ម៉ោង] LT',
-            lastWeek: 'dddd [សប្តាហ៍មុន] [ម៉ោង] LT',
-            sameElse: 'L'
-        },
-        relativeTime: {
-            future: '%sទៀត',
-            past: '%sមុន',
-            s: 'ប៉ុន្មានវិនាទី',
-            ss: '%d វិនាទី',
-            m: 'មួយនាទី',
-            mm: '%d នាទី',
-            h: 'មួយម៉ោង',
-            hh: '%d ម៉ោង',
-            d: 'មួយថ្ងៃ',
-            dd: '%d ថ្ងៃ',
-            M: 'មួយខែ',
-            MM: '%d ខែ',
-            y: 'មួយឆ្នាំ',
-            yy: '%d ឆ្នាំ'
-        },
-        dayOfMonthOrdinalParse : /ទី\d{1,2}/,
-        ordinal : 'ទី%d',
-        preparse: function (string) {
-            return string.replace(/[១២៣៤៥៦៧៨៩០]/g, function (match) {
-                return numberMap$7[match];
-            });
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$8[match];
-            });
-        },
-        week: {
-            dow: 1, // Monday is the first day of the week.
-            doy: 4 // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$9 = {
-        '1': '೧',
-        '2': '೨',
-        '3': '೩',
-        '4': '೪',
-        '5': '೫',
-        '6': '೬',
-        '7': '೭',
-        '8': '೮',
-        '9': '೯',
-        '0': '೦'
-    },
-    numberMap$8 = {
-        '೧': '1',
-        '೨': '2',
-        '೩': '3',
-        '೪': '4',
-        '೫': '5',
-        '೬': '6',
-        '೭': '7',
-        '೮': '8',
-        '೯': '9',
-        '೦': '0'
-    };
-
-    hooks.defineLocale('kn', {
-        months : 'ಜನವರಿ_ಫೆಬ್ರವರಿ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬರ್_ಅಕ್ಟೋಬರ್_ನವೆಂಬರ್_ಡಿಸೆಂಬರ್'.split('_'),
-        monthsShort : 'ಜನ_ಫೆಬ್ರ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂ_ಅಕ್ಟೋ_ನವೆಂ_ಡಿಸೆಂ'.split('_'),
-        monthsParseExact: true,
-        weekdays : 'ಭಾನುವಾರ_ಸೋಮವಾರ_ಮಂಗಳವಾರ_ಬುಧವಾರ_ಗುರುವಾರ_ಶುಕ್ರವಾರ_ಶನಿವಾರ'.split('_'),
-        weekdaysShort : 'ಭಾನು_ಸೋಮ_ಮಂಗಳ_ಬುಧ_ಗುರು_ಶುಕ್ರ_ಶನಿ'.split('_'),
-        weekdaysMin : 'ಭಾ_ಸೋ_ಮಂ_ಬು_ಗು_ಶು_ಶ'.split('_'),
-        longDateFormat : {
-            LT : 'A h:mm',
-            LTS : 'A h:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY, A h:mm',
-            LLLL : 'dddd, D MMMM YYYY, A h:mm'
-        },
-        calendar : {
-            sameDay : '[ಇಂದು] LT',
-            nextDay : '[ನಾಳೆ] LT',
-            nextWeek : 'dddd, LT',
-            lastDay : '[ನಿನ್ನೆ] LT',
-            lastWeek : '[ಕೊನೆಯ] dddd, LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s ನಂತರ',
-            past : '%s ಹಿಂದೆ',
-            s : 'ಕೆಲವು ಕ್ಷಣಗಳು',
-            ss : '%d ಸೆಕೆಂಡುಗಳು',
-            m : 'ಒಂದು ನಿಮಿಷ',
-            mm : '%d ನಿಮಿಷ',
-            h : 'ಒಂದು ಗಂಟೆ',
-            hh : '%d ಗಂಟೆ',
-            d : 'ಒಂದು ದಿನ',
-            dd : '%d ದಿನ',
-            M : 'ಒಂದು ತಿಂಗಳು',
-            MM : '%d ತಿಂಗಳು',
-            y : 'ಒಂದು ವರ್ಷ',
-            yy : '%d ವರ್ಷ'
-        },
-        preparse: function (string) {
-            return string.replace(/[೧೨೩೪೫೬೭೮೯೦]/g, function (match) {
-                return numberMap$8[match];
-            });
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$9[match];
-            });
-        },
-        meridiemParse: /ರಾತ್ರಿ|ಬೆಳಿಗ್ಗೆ|ಮಧ್ಯಾಹ್ನ|ಸಂಜೆ/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'ರಾತ್ರಿ') {
-                return hour < 4 ? hour : hour + 12;
-            } else if (meridiem === 'ಬೆಳಿಗ್ಗೆ') {
-                return hour;
-            } else if (meridiem === 'ಮಧ್ಯಾಹ್ನ') {
-                return hour >= 10 ? hour : hour + 12;
-            } else if (meridiem === 'ಸಂಜೆ') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'ರಾತ್ರಿ';
-            } else if (hour < 10) {
-                return 'ಬೆಳಿಗ್ಗೆ';
-            } else if (hour < 17) {
-                return 'ಮಧ್ಯಾಹ್ನ';
-            } else if (hour < 20) {
-                return 'ಸಂಜೆ';
-            } else {
-                return 'ರಾತ್ರಿ';
-            }
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(ನೇ)/,
-        ordinal : function (number) {
-            return number + 'ನೇ';
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 6  // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ko', {
-        months : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
-        monthsShort : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
-        weekdays : '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'),
-        weekdaysShort : '일_월_화_수_목_금_토'.split('_'),
-        weekdaysMin : '일_월_화_수_목_금_토'.split('_'),
-        longDateFormat : {
-            LT : 'A h:mm',
-            LTS : 'A h:mm:ss',
-            L : 'YYYY.MM.DD.',
-            LL : 'YYYY년 MMMM D일',
-            LLL : 'YYYY년 MMMM D일 A h:mm',
-            LLLL : 'YYYY년 MMMM D일 dddd A h:mm',
-            l : 'YYYY.MM.DD.',
-            ll : 'YYYY년 MMMM D일',
-            lll : 'YYYY년 MMMM D일 A h:mm',
-            llll : 'YYYY년 MMMM D일 dddd A h:mm'
-        },
-        calendar : {
-            sameDay : '오늘 LT',
-            nextDay : '내일 LT',
-            nextWeek : 'dddd LT',
-            lastDay : '어제 LT',
-            lastWeek : '지난주 dddd LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s 후',
-            past : '%s 전',
-            s : '몇 초',
-            ss : '%d초',
-            m : '1분',
-            mm : '%d분',
-            h : '한 시간',
-            hh : '%d시간',
-            d : '하루',
-            dd : '%d일',
-            M : '한 달',
-            MM : '%d달',
-            y : '일 년',
-            yy : '%d년'
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}(일|월|주)/,
-        ordinal : function (number, period) {
-            switch (period) {
-                case 'd':
-                case 'D':
-                case 'DDD':
-                    return number + '일';
-                case 'M':
-                    return number + '월';
-                case 'w':
-                case 'W':
-                    return number + '주';
-                default:
-                    return number;
-            }
-        },
-        meridiemParse : /오전|오후/,
-        isPM : function (token) {
-            return token === '오후';
-        },
-        meridiem : function (hour, minute, isUpper) {
-            return hour < 12 ? '오전' : '오후';
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$a = {
-        '1': '١',
-        '2': '٢',
-        '3': '٣',
-        '4': '٤',
-        '5': '٥',
-        '6': '٦',
-        '7': '٧',
-        '8': '٨',
-        '9': '٩',
-        '0': '٠'
-    }, numberMap$9 = {
-        '١': '1',
-        '٢': '2',
-        '٣': '3',
-        '٤': '4',
-        '٥': '5',
-        '٦': '6',
-        '٧': '7',
-        '٨': '8',
-        '٩': '9',
-        '٠': '0'
-    },
-    months$6 = [
-        'کانونی دووەم',
-        'شوبات',
-        'ئازار',
-        'نیسان',
-        'ئایار',
-        'حوزەیران',
-        'تەمموز',
-        'ئاب',
-        'ئەیلوول',
-        'تشرینی یەكەم',
-        'تشرینی دووەم',
-        'كانونی یەکەم'
-    ];
-
-
-    hooks.defineLocale('ku', {
-        months : months$6,
-        monthsShort : months$6,
-        weekdays : 'یه‌كشه‌ممه‌_دووشه‌ممه‌_سێشه‌ممه‌_چوارشه‌ممه‌_پێنجشه‌ممه‌_هه‌ینی_شه‌ممه‌'.split('_'),
-        weekdaysShort : 'یه‌كشه‌م_دووشه‌م_سێشه‌م_چوارشه‌م_پێنجشه‌م_هه‌ینی_شه‌ممه‌'.split('_'),
-        weekdaysMin : 'ی_د_س_چ_پ_ه_ش'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        meridiemParse: /ئێواره‌|به‌یانی/,
-        isPM: function (input) {
-            return /ئێواره‌/.test(input);
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'به‌یانی';
-            } else {
-                return 'ئێواره‌';
-            }
-        },
-        calendar : {
-            sameDay : '[ئه‌مرۆ كاتژمێر] LT',
-            nextDay : '[به‌یانی كاتژمێر] LT',
-            nextWeek : 'dddd [كاتژمێر] LT',
-            lastDay : '[دوێنێ كاتژمێر] LT',
-            lastWeek : 'dddd [كاتژمێر] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'له‌ %s',
-            past : '%s',
-            s : 'چه‌ند چركه‌یه‌ك',
-            ss : 'چركه‌ %d',
-            m : 'یه‌ك خوله‌ك',
-            mm : '%d خوله‌ك',
-            h : 'یه‌ك كاتژمێر',
-            hh : '%d كاتژمێر',
-            d : 'یه‌ك ڕۆژ',
-            dd : '%d ڕۆژ',
-            M : 'یه‌ك مانگ',
-            MM : '%d مانگ',
-            y : 'یه‌ك ساڵ',
-            yy : '%d ساڵ'
-        },
-        preparse: function (string) {
-            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
-                return numberMap$9[match];
-            }).replace(/،/g, ',');
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$a[match];
-            }).replace(/,/g, '،');
-        },
-        week : {
-            dow : 6, // Saturday is the first day of the week.
-            doy : 12 // The week that contains Jan 12th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var suffixes$2 = {
-        0: '-чү',
-        1: '-чи',
-        2: '-чи',
-        3: '-чү',
-        4: '-чү',
-        5: '-чи',
-        6: '-чы',
-        7: '-чи',
-        8: '-чи',
-        9: '-чу',
-        10: '-чу',
-        20: '-чы',
-        30: '-чу',
-        40: '-чы',
-        50: '-чү',
-        60: '-чы',
-        70: '-чи',
-        80: '-чи',
-        90: '-чу',
-        100: '-чү'
-    };
-
-    hooks.defineLocale('ky', {
-        months : 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
-        monthsShort : 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
-        weekdays : 'Жекшемби_Дүйшөмбү_Шейшемби_Шаршемби_Бейшемби_Жума_Ишемби'.split('_'),
-        weekdaysShort : 'Жек_Дүй_Шей_Шар_Бей_Жум_Ише'.split('_'),
-        weekdaysMin : 'Жк_Дй_Шй_Шр_Бй_Жм_Иш'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Бүгүн саат] LT',
-            nextDay : '[Эртең саат] LT',
-            nextWeek : 'dddd [саат] LT',
-            lastDay : '[Кечээ саат] LT',
-            lastWeek : '[Өткөн аптанын] dddd [күнү] [саат] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s ичинде',
-            past : '%s мурун',
-            s : 'бирнече секунд',
-            ss : '%d секунд',
-            m : 'бир мүнөт',
-            mm : '%d мүнөт',
-            h : 'бир саат',
-            hh : '%d саат',
-            d : 'бир күн',
-            dd : '%d күн',
-            M : 'бир ай',
-            MM : '%d ай',
-            y : 'бир жыл',
-            yy : '%d жыл'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}-(чи|чы|чү|чу)/,
-        ordinal : function (number) {
-            var a = number % 10,
-                b = number >= 100 ? 100 : null;
-            return number + (suffixes$2[number] || suffixes$2[a] || suffixes$2[b]);
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function processRelativeTime$5(number, withoutSuffix, key, isFuture) {
-        var format = {
-            'm': ['eng Minutt', 'enger Minutt'],
-            'h': ['eng Stonn', 'enger Stonn'],
-            'd': ['een Dag', 'engem Dag'],
-            'M': ['ee Mount', 'engem Mount'],
-            'y': ['ee Joer', 'engem Joer']
-        };
-        return withoutSuffix ? format[key][0] : format[key][1];
-    }
-    function processFutureTime(string) {
-        var number = string.substr(0, string.indexOf(' '));
-        if (eifelerRegelAppliesToNumber(number)) {
-            return 'a ' + string;
-        }
-        return 'an ' + string;
-    }
-    function processPastTime(string) {
-        var number = string.substr(0, string.indexOf(' '));
-        if (eifelerRegelAppliesToNumber(number)) {
-            return 'viru ' + string;
-        }
-        return 'virun ' + string;
-    }
-    /**
-     * Returns true if the word before the given number loses the '-n' ending.
-     * e.g. 'an 10 Deeg' but 'a 5 Deeg'
-     *
-     * @param number {integer}
-     * @returns {boolean}
-     */
-    function eifelerRegelAppliesToNumber(number) {
-        number = parseInt(number, 10);
-        if (isNaN(number)) {
-            return false;
-        }
-        if (number < 0) {
-            // Negative Number --> always true
-            return true;
-        } else if (number < 10) {
-            // Only 1 digit
-            if (4 <= number && number <= 7) {
-                return true;
-            }
-            return false;
-        } else if (number < 100) {
-            // 2 digits
-            var lastDigit = number % 10, firstDigit = number / 10;
-            if (lastDigit === 0) {
-                return eifelerRegelAppliesToNumber(firstDigit);
-            }
-            return eifelerRegelAppliesToNumber(lastDigit);
-        } else if (number < 10000) {
-            // 3 or 4 digits --> recursively check first digit
-            while (number >= 10) {
-                number = number / 10;
-            }
-            return eifelerRegelAppliesToNumber(number);
-        } else {
-            // Anything larger than 4 digits: recursively check first n-3 digits
-            number = number / 1000;
-            return eifelerRegelAppliesToNumber(number);
-        }
-    }
-
-    hooks.defineLocale('lb', {
-        months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-        monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
-        monthsParseExact : true,
-        weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'),
-        weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'),
-        weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat: {
-            LT: 'H:mm [Auer]',
-            LTS: 'H:mm:ss [Auer]',
-            L: 'DD.MM.YYYY',
-            LL: 'D. MMMM YYYY',
-            LLL: 'D. MMMM YYYY H:mm [Auer]',
-            LLLL: 'dddd, D. MMMM YYYY H:mm [Auer]'
-        },
-        calendar: {
-            sameDay: '[Haut um] LT',
-            sameElse: 'L',
-            nextDay: '[Muer um] LT',
-            nextWeek: 'dddd [um] LT',
-            lastDay: '[Gëschter um] LT',
-            lastWeek: function () {
-                // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday) due to phonological rule
-                switch (this.day()) {
-                    case 2:
-                    case 4:
-                        return '[Leschten] dddd [um] LT';
-                    default:
-                        return '[Leschte] dddd [um] LT';
-                }
-            }
-        },
-        relativeTime : {
-            future : processFutureTime,
-            past : processPastTime,
-            s : 'e puer Sekonnen',
-            ss : '%d Sekonnen',
-            m : processRelativeTime$5,
-            mm : '%d Minutten',
-            h : processRelativeTime$5,
-            hh : '%d Stonnen',
-            d : processRelativeTime$5,
-            dd : '%d Deeg',
-            M : processRelativeTime$5,
-            MM : '%d Méint',
-            y : processRelativeTime$5,
-            yy : '%d Joer'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal: '%d.',
-        week: {
-            dow: 1, // Monday is the first day of the week.
-            doy: 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('lo', {
-        months : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
-        monthsShort : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
-        weekdays : 'ອາທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
-        weekdaysShort : 'ທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
-        weekdaysMin : 'ທ_ຈ_ອຄ_ພ_ພຫ_ສກ_ສ'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'ວັນdddd D MMMM YYYY HH:mm'
-        },
-        meridiemParse: /ຕອນເຊົ້າ|ຕອນແລງ/,
-        isPM: function (input) {
-            return input === 'ຕອນແລງ';
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'ຕອນເຊົ້າ';
-            } else {
-                return 'ຕອນແລງ';
-            }
-        },
-        calendar : {
-            sameDay : '[ມື້ນີ້ເວລາ] LT',
-            nextDay : '[ມື້ອື່ນເວລາ] LT',
-            nextWeek : '[ວັນ]dddd[ໜ້າເວລາ] LT',
-            lastDay : '[ມື້ວານນີ້ເວລາ] LT',
-            lastWeek : '[ວັນ]dddd[ແລ້ວນີ້ເວລາ] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'ອີກ %s',
-            past : '%sຜ່ານມາ',
-            s : 'ບໍ່ເທົ່າໃດວິນາທີ',
-            ss : '%d ວິນາທີ' ,
-            m : '1 ນາທີ',
-            mm : '%d ນາທີ',
-            h : '1 ຊົ່ວໂມງ',
-            hh : '%d ຊົ່ວໂມງ',
-            d : '1 ມື້',
-            dd : '%d ມື້',
-            M : '1 ເດືອນ',
-            MM : '%d ເດືອນ',
-            y : '1 ປີ',
-            yy : '%d ປີ'
-        },
-        dayOfMonthOrdinalParse: /(ທີ່)\d{1,2}/,
-        ordinal : function (number) {
-            return 'ທີ່' + number;
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var units = {
-        'ss' : 'sekundė_sekundžių_sekundes',
-        'm' : 'minutė_minutės_minutę',
-        'mm': 'minutės_minučių_minutes',
-        'h' : 'valanda_valandos_valandą',
-        'hh': 'valandos_valandų_valandas',
-        'd' : 'diena_dienos_dieną',
-        'dd': 'dienos_dienų_dienas',
-        'M' : 'mėnuo_mėnesio_mėnesį',
-        'MM': 'mėnesiai_mėnesių_mėnesius',
-        'y' : 'metai_metų_metus',
-        'yy': 'metai_metų_metus'
-    };
-    function translateSeconds(number, withoutSuffix, key, isFuture) {
-        if (withoutSuffix) {
-            return 'kelios sekundės';
-        } else {
-            return isFuture ? 'kelių sekundžių' : 'kelias sekundes';
-        }
-    }
-    function translateSingular(number, withoutSuffix, key, isFuture) {
-        return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]);
-    }
-    function special(number) {
-        return number % 10 === 0 || (number > 10 && number < 20);
-    }
-    function forms(key) {
-        return units[key].split('_');
-    }
-    function translate$6(number, withoutSuffix, key, isFuture) {
-        var result = number + ' ';
-        if (number === 1) {
-            return result + translateSingular(number, withoutSuffix, key[0], isFuture);
-        } else if (withoutSuffix) {
-            return result + (special(number) ? forms(key)[1] : forms(key)[0]);
-        } else {
-            if (isFuture) {
-                return result + forms(key)[1];
-            } else {
-                return result + (special(number) ? forms(key)[1] : forms(key)[2]);
-            }
-        }
-    }
-    hooks.defineLocale('lt', {
-        months : {
-            format: 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'),
-            standalone: 'sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis'.split('_'),
-            isFormat: /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?|MMMM?(\[[^\[\]]*\]|\s)+D[oD]?/
-        },
-        monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'),
-        weekdays : {
-            format: 'sekmadienį_pirmadienį_antradienį_trečiadienį_ketvirtadienį_penktadienį_šeštadienį'.split('_'),
-            standalone: 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_'),
-            isFormat: /dddd HH:mm/
-        },
-        weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'),
-        weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'YYYY-MM-DD',
-            LL : 'YYYY [m.] MMMM D [d.]',
-            LLL : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
-            LLLL : 'YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]',
-            l : 'YYYY-MM-DD',
-            ll : 'YYYY [m.] MMMM D [d.]',
-            lll : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
-            llll : 'YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]'
-        },
-        calendar : {
-            sameDay : '[Šiandien] LT',
-            nextDay : '[Rytoj] LT',
-            nextWeek : 'dddd LT',
-            lastDay : '[Vakar] LT',
-            lastWeek : '[Praėjusį] dddd LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'po %s',
-            past : 'prieš %s',
-            s : translateSeconds,
-            ss : translate$6,
-            m : translateSingular,
-            mm : translate$6,
-            h : translateSingular,
-            hh : translate$6,
-            d : translateSingular,
-            dd : translate$6,
-            M : translateSingular,
-            MM : translate$6,
-            y : translateSingular,
-            yy : translate$6
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}-oji/,
-        ordinal : function (number) {
-            return number + '-oji';
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var units$1 = {
-        'ss': 'sekundes_sekundēm_sekunde_sekundes'.split('_'),
-        'm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
-        'mm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
-        'h': 'stundas_stundām_stunda_stundas'.split('_'),
-        'hh': 'stundas_stundām_stunda_stundas'.split('_'),
-        'd': 'dienas_dienām_diena_dienas'.split('_'),
-        'dd': 'dienas_dienām_diena_dienas'.split('_'),
-        'M': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
-        'MM': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
-        'y': 'gada_gadiem_gads_gadi'.split('_'),
-        'yy': 'gada_gadiem_gads_gadi'.split('_')
-    };
-    /**
-     * @param withoutSuffix boolean true = a length of time; false = before/after a period of time.
-     */
-    function format$1(forms, number, withoutSuffix) {
-        if (withoutSuffix) {
-            // E.g. "21 minūte", "3 minūtes".
-            return number % 10 === 1 && number % 100 !== 11 ? forms[2] : forms[3];
-        } else {
-            // E.g. "21 minūtes" as in "pēc 21 minūtes".
-            // E.g. "3 minūtēm" as in "pēc 3 minūtēm".
-            return number % 10 === 1 && number % 100 !== 11 ? forms[0] : forms[1];
-        }
-    }
-    function relativeTimeWithPlural$1(number, withoutSuffix, key) {
-        return number + ' ' + format$1(units$1[key], number, withoutSuffix);
-    }
-    function relativeTimeWithSingular(number, withoutSuffix, key) {
-        return format$1(units$1[key], number, withoutSuffix);
-    }
-    function relativeSeconds(number, withoutSuffix) {
-        return withoutSuffix ? 'dažas sekundes' : 'dažām sekundēm';
-    }
-
-    hooks.defineLocale('lv', {
-        months : 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'),
-        monthsShort : 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'),
-        weekdays : 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'),
-        weekdaysShort : 'Sv_P_O_T_C_Pk_S'.split('_'),
-        weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY.',
-            LL : 'YYYY. [gada] D. MMMM',
-            LLL : 'YYYY. [gada] D. MMMM, HH:mm',
-            LLLL : 'YYYY. [gada] D. MMMM, dddd, HH:mm'
-        },
-        calendar : {
-            sameDay : '[Šodien pulksten] LT',
-            nextDay : '[Rīt pulksten] LT',
-            nextWeek : 'dddd [pulksten] LT',
-            lastDay : '[Vakar pulksten] LT',
-            lastWeek : '[Pagājušā] dddd [pulksten] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'pēc %s',
-            past : 'pirms %s',
-            s : relativeSeconds,
-            ss : relativeTimeWithPlural$1,
-            m : relativeTimeWithSingular,
-            mm : relativeTimeWithPlural$1,
-            h : relativeTimeWithSingular,
-            hh : relativeTimeWithPlural$1,
-            d : relativeTimeWithSingular,
-            dd : relativeTimeWithPlural$1,
-            M : relativeTimeWithSingular,
-            MM : relativeTimeWithPlural$1,
-            y : relativeTimeWithSingular,
-            yy : relativeTimeWithPlural$1
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var translator = {
-        words: { //Different grammatical cases
-            ss: ['sekund', 'sekunda', 'sekundi'],
-            m: ['jedan minut', 'jednog minuta'],
-            mm: ['minut', 'minuta', 'minuta'],
-            h: ['jedan sat', 'jednog sata'],
-            hh: ['sat', 'sata', 'sati'],
-            dd: ['dan', 'dana', 'dana'],
-            MM: ['mjesec', 'mjeseca', 'mjeseci'],
-            yy: ['godina', 'godine', 'godina']
-        },
-        correctGrammaticalCase: function (number, wordKey) {
-            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
-        },
-        translate: function (number, withoutSuffix, key) {
-            var wordKey = translator.words[key];
-            if (key.length === 1) {
-                return withoutSuffix ? wordKey[0] : wordKey[1];
-            } else {
-                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
-            }
-        }
-    };
-
-    hooks.defineLocale('me', {
-        months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
-        monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
-        monthsParseExact : true,
-        weekdays: 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
-        weekdaysShort: 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
-        weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat: {
-            LT: 'H:mm',
-            LTS : 'H:mm:ss',
-            L: 'DD.MM.YYYY',
-            LL: 'D. MMMM YYYY',
-            LLL: 'D. MMMM YYYY H:mm',
-            LLLL: 'dddd, D. MMMM YYYY H:mm'
-        },
-        calendar: {
-            sameDay: '[danas u] LT',
-            nextDay: '[sjutra u] LT',
-
-            nextWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[u] [nedjelju] [u] LT';
-                    case 3:
-                        return '[u] [srijedu] [u] LT';
-                    case 6:
-                        return '[u] [subotu] [u] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                    case 5:
-                        return '[u] dddd [u] LT';
-                }
-            },
-            lastDay  : '[juče u] LT',
-            lastWeek : function () {
-                var lastWeekDays = [
-                    '[prošle] [nedjelje] [u] LT',
-                    '[prošlog] [ponedjeljka] [u] LT',
-                    '[prošlog] [utorka] [u] LT',
-                    '[prošle] [srijede] [u] LT',
-                    '[prošlog] [četvrtka] [u] LT',
-                    '[prošlog] [petka] [u] LT',
-                    '[prošle] [subote] [u] LT'
-                ];
-                return lastWeekDays[this.day()];
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'za %s',
-            past   : 'prije %s',
-            s      : 'nekoliko sekundi',
-            ss     : translator.translate,
-            m      : translator.translate,
-            mm     : translator.translate,
-            h      : translator.translate,
-            hh     : translator.translate,
-            d      : 'dan',
-            dd     : translator.translate,
-            M      : 'mjesec',
-            MM     : translator.translate,
-            y      : 'godinu',
-            yy     : translator.translate
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('mi', {
-        months: 'Kohi-tāte_Hui-tanguru_Poutū-te-rangi_Paenga-whāwhā_Haratua_Pipiri_Hōngoingoi_Here-turi-kōkā_Mahuru_Whiringa-ā-nuku_Whiringa-ā-rangi_Hakihea'.split('_'),
-        monthsShort: 'Kohi_Hui_Pou_Pae_Hara_Pipi_Hōngoi_Here_Mahu_Whi-nu_Whi-ra_Haki'.split('_'),
-        monthsRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
-        monthsStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
-        monthsShortRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
-        monthsShortStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,2}/i,
-        weekdays: 'Rātapu_Mane_Tūrei_Wenerei_Tāite_Paraire_Hātarei'.split('_'),
-        weekdaysShort: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
-        weekdaysMin: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
-        longDateFormat: {
-            LT: 'HH:mm',
-            LTS: 'HH:mm:ss',
-            L: 'DD/MM/YYYY',
-            LL: 'D MMMM YYYY',
-            LLL: 'D MMMM YYYY [i] HH:mm',
-            LLLL: 'dddd, D MMMM YYYY [i] HH:mm'
-        },
-        calendar: {
-            sameDay: '[i teie mahana, i] LT',
-            nextDay: '[apopo i] LT',
-            nextWeek: 'dddd [i] LT',
-            lastDay: '[inanahi i] LT',
-            lastWeek: 'dddd [whakamutunga i] LT',
-            sameElse: 'L'
-        },
-        relativeTime: {
-            future: 'i roto i %s',
-            past: '%s i mua',
-            s: 'te hēkona ruarua',
-            ss: '%d hēkona',
-            m: 'he meneti',
-            mm: '%d meneti',
-            h: 'te haora',
-            hh: '%d haora',
-            d: 'he ra',
-            dd: '%d ra',
-            M: 'he marama',
-            MM: '%d marama',
-            y: 'he tau',
-            yy: '%d tau'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}º/,
-        ordinal: '%dº',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('mk', {
-        months : 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'),
-        monthsShort : 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'),
-        weekdays : 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'),
-        weekdaysShort : 'нед_пон_вто_сре_чет_пет_саб'.split('_'),
-        weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'),
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'D.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY H:mm',
-            LLLL : 'dddd, D MMMM YYYY H:mm'
-        },
-        calendar : {
-            sameDay : '[Денес во] LT',
-            nextDay : '[Утре во] LT',
-            nextWeek : '[Во] dddd [во] LT',
-            lastDay : '[Вчера во] LT',
-            lastWeek : function () {
-                switch (this.day()) {
-                    case 0:
-                    case 3:
-                    case 6:
-                        return '[Изминатата] dddd [во] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                    case 5:
-                        return '[Изминатиот] dddd [во] LT';
-                }
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'после %s',
-            past : 'пред %s',
-            s : 'неколку секунди',
-            ss : '%d секунди',
-            m : 'минута',
-            mm : '%d минути',
-            h : 'час',
-            hh : '%d часа',
-            d : 'ден',
-            dd : '%d дена',
-            M : 'месец',
-            MM : '%d месеци',
-            y : 'година',
-            yy : '%d години'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
-        ordinal : function (number) {
-            var lastDigit = number % 10,
-                last2Digits = number % 100;
-            if (number === 0) {
-                return number + '-ев';
-            } else if (last2Digits === 0) {
-                return number + '-ен';
-            } else if (last2Digits > 10 && last2Digits < 20) {
-                return number + '-ти';
-            } else if (lastDigit === 1) {
-                return number + '-ви';
-            } else if (lastDigit === 2) {
-                return number + '-ри';
-            } else if (lastDigit === 7 || lastDigit === 8) {
-                return number + '-ми';
-            } else {
-                return number + '-ти';
-            }
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ml', {
-        months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'),
-        monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'),
-        weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'),
-        weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'),
-        longDateFormat : {
-            LT : 'A h:mm -നു',
-            LTS : 'A h:mm:ss -നു',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY, A h:mm -നു',
-            LLLL : 'dddd, D MMMM YYYY, A h:mm -നു'
-        },
-        calendar : {
-            sameDay : '[ഇന്ന്] LT',
-            nextDay : '[നാളെ] LT',
-            nextWeek : 'dddd, LT',
-            lastDay : '[ഇന്നലെ] LT',
-            lastWeek : '[കഴിഞ്ഞ] dddd, LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s കഴിഞ്ഞ്',
-            past : '%s മുൻപ്',
-            s : 'അൽപ നിമിഷങ്ങൾ',
-            ss : '%d സെക്കൻഡ്',
-            m : 'ഒരു മിനിറ്റ്',
-            mm : '%d മിനിറ്റ്',
-            h : 'ഒരു മണിക്കൂർ',
-            hh : '%d മണിക്കൂർ',
-            d : 'ഒരു ദിവസം',
-            dd : '%d ദിവസം',
-            M : 'ഒരു മാസം',
-            MM : '%d മാസം',
-            y : 'ഒരു വർഷം',
-            yy : '%d വർഷം'
-        },
-        meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if ((meridiem === 'രാത്രി' && hour >= 4) ||
-                    meridiem === 'ഉച്ച കഴിഞ്ഞ്' ||
-                    meridiem === 'വൈകുന്നേരം') {
-                return hour + 12;
-            } else {
-                return hour;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'രാത്രി';
-            } else if (hour < 12) {
-                return 'രാവിലെ';
-            } else if (hour < 17) {
-                return 'ഉച്ച കഴിഞ്ഞ്';
-            } else if (hour < 20) {
-                return 'വൈകുന്നേരം';
-            } else {
-                return 'രാത്രി';
-            }
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function translate$7(number, withoutSuffix, key, isFuture) {
-        switch (key) {
-            case 's':
-                return withoutSuffix ? 'хэдхэн секунд' : 'хэдхэн секундын';
-            case 'ss':
-                return number + (withoutSuffix ? ' секунд' : ' секундын');
-            case 'm':
-            case 'mm':
-                return number + (withoutSuffix ? ' минут' : ' минутын');
-            case 'h':
-            case 'hh':
-                return number + (withoutSuffix ? ' цаг' : ' цагийн');
-            case 'd':
-            case 'dd':
-                return number + (withoutSuffix ? ' өдөр' : ' өдрийн');
-            case 'M':
-            case 'MM':
-                return number + (withoutSuffix ? ' сар' : ' сарын');
-            case 'y':
-            case 'yy':
-                return number + (withoutSuffix ? ' жил' : ' жилийн');
-            default:
-                return number;
-        }
-    }
-
-    hooks.defineLocale('mn', {
-        months : 'Нэгдүгээр сар_Хоёрдугаар сар_Гуравдугаар сар_Дөрөвдүгээр сар_Тавдугаар сар_Зургадугаар сар_Долдугаар сар_Наймдугаар сар_Есдүгээр сар_Аравдугаар сар_Арван нэгдүгээр сар_Арван хоёрдугаар сар'.split('_'),
-        monthsShort : '1 сар_2 сар_3 сар_4 сар_5 сар_6 сар_7 сар_8 сар_9 сар_10 сар_11 сар_12 сар'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'Ням_Даваа_Мягмар_Лхагва_Пүрэв_Баасан_Бямба'.split('_'),
-        weekdaysShort : 'Ням_Дав_Мяг_Лха_Пүр_Баа_Бям'.split('_'),
-        weekdaysMin : 'Ня_Да_Мя_Лх_Пү_Ба_Бя'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'YYYY-MM-DD',
-            LL : 'YYYY оны MMMMын D',
-            LLL : 'YYYY оны MMMMын D HH:mm',
-            LLLL : 'dddd, YYYY оны MMMMын D HH:mm'
-        },
-        meridiemParse: /ҮӨ|ҮХ/i,
-        isPM : function (input) {
-            return input === 'ҮХ';
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'ҮӨ';
-            } else {
-                return 'ҮХ';
-            }
-        },
-        calendar : {
-            sameDay : '[Өнөөдөр] LT',
-            nextDay : '[Маргааш] LT',
-            nextWeek : '[Ирэх] dddd LT',
-            lastDay : '[Өчигдөр] LT',
-            lastWeek : '[Өнгөрсөн] dddd LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s дараа',
-            past : '%s өмнө',
-            s : translate$7,
-            ss : translate$7,
-            m : translate$7,
-            mm : translate$7,
-            h : translate$7,
-            hh : translate$7,
-            d : translate$7,
-            dd : translate$7,
-            M : translate$7,
-            MM : translate$7,
-            y : translate$7,
-            yy : translate$7
-        },
-        dayOfMonthOrdinalParse: /\d{1,2} өдөр/,
-        ordinal : function (number, period) {
-            switch (period) {
-                case 'd':
-                case 'D':
-                case 'DDD':
-                    return number + ' өдөр';
-                default:
-                    return number;
-            }
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$b = {
-        '1': '१',
-        '2': '२',
-        '3': '३',
-        '4': '४',
-        '5': '५',
-        '6': '६',
-        '7': '७',
-        '8': '८',
-        '9': '९',
-        '0': '०'
-    },
-    numberMap$a = {
-        '१': '1',
-        '२': '2',
-        '३': '3',
-        '४': '4',
-        '५': '5',
-        '६': '6',
-        '७': '7',
-        '८': '8',
-        '९': '9',
-        '०': '0'
-    };
-
-    function relativeTimeMr(number, withoutSuffix, string, isFuture)
-    {
-        var output = '';
-        if (withoutSuffix) {
-            switch (string) {
-                case 's': output = 'काही सेकंद'; break;
-                case 'ss': output = '%d सेकंद'; break;
-                case 'm': output = 'एक मिनिट'; break;
-                case 'mm': output = '%d मिनिटे'; break;
-                case 'h': output = 'एक तास'; break;
-                case 'hh': output = '%d तास'; break;
-                case 'd': output = 'एक दिवस'; break;
-                case 'dd': output = '%d दिवस'; break;
-                case 'M': output = 'एक महिना'; break;
-                case 'MM': output = '%d महिने'; break;
-                case 'y': output = 'एक वर्ष'; break;
-                case 'yy': output = '%d वर्षे'; break;
-            }
-        }
-        else {
-            switch (string) {
-                case 's': output = 'काही सेकंदां'; break;
-                case 'ss': output = '%d सेकंदां'; break;
-                case 'm': output = 'एका मिनिटा'; break;
-                case 'mm': output = '%d मिनिटां'; break;
-                case 'h': output = 'एका तासा'; break;
-                case 'hh': output = '%d तासां'; break;
-                case 'd': output = 'एका दिवसा'; break;
-                case 'dd': output = '%d दिवसां'; break;
-                case 'M': output = 'एका महिन्या'; break;
-                case 'MM': output = '%d महिन्यां'; break;
-                case 'y': output = 'एका वर्षा'; break;
-                case 'yy': output = '%d वर्षां'; break;
-            }
-        }
-        return output.replace(/%d/i, number);
-    }
-
-    hooks.defineLocale('mr', {
-        months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),
-        monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
-        weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'),
-        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
-        longDateFormat : {
-            LT : 'A h:mm वाजता',
-            LTS : 'A h:mm:ss वाजता',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY, A h:mm वाजता',
-            LLLL : 'dddd, D MMMM YYYY, A h:mm वाजता'
-        },
-        calendar : {
-            sameDay : '[आज] LT',
-            nextDay : '[उद्या] LT',
-            nextWeek : 'dddd, LT',
-            lastDay : '[काल] LT',
-            lastWeek: '[मागील] dddd, LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future: '%sमध्ये',
-            past: '%sपूर्वी',
-            s: relativeTimeMr,
-            ss: relativeTimeMr,
-            m: relativeTimeMr,
-            mm: relativeTimeMr,
-            h: relativeTimeMr,
-            hh: relativeTimeMr,
-            d: relativeTimeMr,
-            dd: relativeTimeMr,
-            M: relativeTimeMr,
-            MM: relativeTimeMr,
-            y: relativeTimeMr,
-            yy: relativeTimeMr
-        },
-        preparse: function (string) {
-            return string.replace(/[१२३४५६७८९०]/g, function (match) {
-                return numberMap$a[match];
-            });
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$b[match];
-            });
-        },
-        meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'रात्री') {
-                return hour < 4 ? hour : hour + 12;
-            } else if (meridiem === 'सकाळी') {
-                return hour;
-            } else if (meridiem === 'दुपारी') {
-                return hour >= 10 ? hour : hour + 12;
-            } else if (meridiem === 'सायंकाळी') {
-                return hour + 12;
-            }
-        },
-        meridiem: function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'रात्री';
-            } else if (hour < 10) {
-                return 'सकाळी';
-            } else if (hour < 17) {
-                return 'दुपारी';
-            } else if (hour < 20) {
-                return 'सायंकाळी';
-            } else {
-                return 'रात्री';
-            }
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 6  // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ms-my', {
-        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
-        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
-        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
-        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
-        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
-        longDateFormat : {
-            LT : 'HH.mm',
-            LTS : 'HH.mm.ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY [pukul] HH.mm',
-            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-        },
-        meridiemParse: /pagi|tengahari|petang|malam/,
-        meridiemHour: function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'pagi') {
-                return hour;
-            } else if (meridiem === 'tengahari') {
-                return hour >= 11 ? hour : hour + 12;
-            } else if (meridiem === 'petang' || meridiem === 'malam') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hours, minutes, isLower) {
-            if (hours < 11) {
-                return 'pagi';
-            } else if (hours < 15) {
-                return 'tengahari';
-            } else if (hours < 19) {
-                return 'petang';
-            } else {
-                return 'malam';
-            }
-        },
-        calendar : {
-            sameDay : '[Hari ini pukul] LT',
-            nextDay : '[Esok pukul] LT',
-            nextWeek : 'dddd [pukul] LT',
-            lastDay : '[Kelmarin pukul] LT',
-            lastWeek : 'dddd [lepas pukul] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'dalam %s',
-            past : '%s yang lepas',
-            s : 'beberapa saat',
-            ss : '%d saat',
-            m : 'seminit',
-            mm : '%d minit',
-            h : 'sejam',
-            hh : '%d jam',
-            d : 'sehari',
-            dd : '%d hari',
-            M : 'sebulan',
-            MM : '%d bulan',
-            y : 'setahun',
-            yy : '%d tahun'
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ms', {
-        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
-        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
-        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
-        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
-        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
-        longDateFormat : {
-            LT : 'HH.mm',
-            LTS : 'HH.mm.ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY [pukul] HH.mm',
-            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
-        },
-        meridiemParse: /pagi|tengahari|petang|malam/,
-        meridiemHour: function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'pagi') {
-                return hour;
-            } else if (meridiem === 'tengahari') {
-                return hour >= 11 ? hour : hour + 12;
-            } else if (meridiem === 'petang' || meridiem === 'malam') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hours, minutes, isLower) {
-            if (hours < 11) {
-                return 'pagi';
-            } else if (hours < 15) {
-                return 'tengahari';
-            } else if (hours < 19) {
-                return 'petang';
-            } else {
-                return 'malam';
-            }
-        },
-        calendar : {
-            sameDay : '[Hari ini pukul] LT',
-            nextDay : '[Esok pukul] LT',
-            nextWeek : 'dddd [pukul] LT',
-            lastDay : '[Kelmarin pukul] LT',
-            lastWeek : 'dddd [lepas pukul] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'dalam %s',
-            past : '%s yang lepas',
-            s : 'beberapa saat',
-            ss : '%d saat',
-            m : 'seminit',
-            mm : '%d minit',
-            h : 'sejam',
-            hh : '%d jam',
-            d : 'sehari',
-            dd : '%d hari',
-            M : 'sebulan',
-            MM : '%d bulan',
-            y : 'setahun',
-            yy : '%d tahun'
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('mt', {
-        months : 'Jannar_Frar_Marzu_April_Mejju_Ġunju_Lulju_Awwissu_Settembru_Ottubru_Novembru_Diċembru'.split('_'),
-        monthsShort : 'Jan_Fra_Mar_Apr_Mej_Ġun_Lul_Aww_Set_Ott_Nov_Diċ'.split('_'),
-        weekdays : 'Il-Ħadd_It-Tnejn_It-Tlieta_L-Erbgħa_Il-Ħamis_Il-Ġimgħa_Is-Sibt'.split('_'),
-        weekdaysShort : 'Ħad_Tne_Tli_Erb_Ħam_Ġim_Sib'.split('_'),
-        weekdaysMin : 'Ħa_Tn_Tl_Er_Ħa_Ġi_Si'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Illum fil-]LT',
-            nextDay : '[Għada fil-]LT',
-            nextWeek : 'dddd [fil-]LT',
-            lastDay : '[Il-bieraħ fil-]LT',
-            lastWeek : 'dddd [li għadda] [fil-]LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'f’ %s',
-            past : '%s ilu',
-            s : 'ftit sekondi',
-            ss : '%d sekondi',
-            m : 'minuta',
-            mm : '%d minuti',
-            h : 'siegħa',
-            hh : '%d siegħat',
-            d : 'ġurnata',
-            dd : '%d ġranet',
-            M : 'xahar',
-            MM : '%d xhur',
-            y : 'sena',
-            yy : '%d sni'
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}º/,
-        ordinal: '%dº',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$c = {
-        '1': '၁',
-        '2': '၂',
-        '3': '၃',
-        '4': '၄',
-        '5': '၅',
-        '6': '၆',
-        '7': '၇',
-        '8': '၈',
-        '9': '၉',
-        '0': '၀'
-    }, numberMap$b = {
-        '၁': '1',
-        '၂': '2',
-        '၃': '3',
-        '၄': '4',
-        '၅': '5',
-        '၆': '6',
-        '၇': '7',
-        '၈': '8',
-        '၉': '9',
-        '၀': '0'
-    };
-
-    hooks.defineLocale('my', {
-        months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'),
-        monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'),
-        weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'),
-        weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
-        weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
-
-        longDateFormat: {
-            LT: 'HH:mm',
-            LTS: 'HH:mm:ss',
-            L: 'DD/MM/YYYY',
-            LL: 'D MMMM YYYY',
-            LLL: 'D MMMM YYYY HH:mm',
-            LLLL: 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar: {
-            sameDay: '[ယနေ.] LT [မှာ]',
-            nextDay: '[မနက်ဖြန်] LT [မှာ]',
-            nextWeek: 'dddd LT [မှာ]',
-            lastDay: '[မနေ.က] LT [မှာ]',
-            lastWeek: '[ပြီးခဲ့သော] dddd LT [မှာ]',
-            sameElse: 'L'
-        },
-        relativeTime: {
-            future: 'လာမည့် %s မှာ',
-            past: 'လွန်ခဲ့သော %s က',
-            s: 'စက္ကန်.အနည်းငယ်',
-            ss : '%d စက္ကန့်',
-            m: 'တစ်မိနစ်',
-            mm: '%d မိနစ်',
-            h: 'တစ်နာရီ',
-            hh: '%d နာရီ',
-            d: 'တစ်ရက်',
-            dd: '%d ရက်',
-            M: 'တစ်လ',
-            MM: '%d လ',
-            y: 'တစ်နှစ်',
-            yy: '%d နှစ်'
-        },
-        preparse: function (string) {
-            return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {
-                return numberMap$b[match];
-            });
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$c[match];
-            });
-        },
-        week: {
-            dow: 1, // Monday is the first day of the week.
-            doy: 4 // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('nb', {
-        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-        monthsShort : 'jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
-        weekdaysShort : 'sø._ma._ti._on._to._fr._lø.'.split('_'),
-        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY [kl.] HH:mm',
-            LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
-        },
-        calendar : {
-            sameDay: '[i dag kl.] LT',
-            nextDay: '[i morgen kl.] LT',
-            nextWeek: 'dddd [kl.] LT',
-            lastDay: '[i går kl.] LT',
-            lastWeek: '[forrige] dddd [kl.] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'om %s',
-            past : '%s siden',
-            s : 'noen sekunder',
-            ss : '%d sekunder',
-            m : 'ett minutt',
-            mm : '%d minutter',
-            h : 'en time',
-            hh : '%d timer',
-            d : 'en dag',
-            dd : '%d dager',
-            M : 'en måned',
-            MM : '%d måneder',
-            y : 'ett år',
-            yy : '%d år'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$d = {
-        '1': '१',
-        '2': '२',
-        '3': '३',
-        '4': '४',
-        '5': '५',
-        '6': '६',
-        '7': '७',
-        '8': '८',
-        '9': '९',
-        '0': '०'
-    },
-    numberMap$c = {
-        '१': '1',
-        '२': '2',
-        '३': '3',
-        '४': '4',
-        '५': '5',
-        '६': '6',
-        '७': '7',
-        '८': '8',
-        '९': '9',
-        '०': '0'
-    };
-
-    hooks.defineLocale('ne', {
-        months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'),
-        monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'),
-        weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'),
-        weekdaysMin : 'आ._सो._मं._बु._बि._शु._श.'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'Aको h:mm बजे',
-            LTS : 'Aको h:mm:ss बजे',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY, Aको h:mm बजे',
-            LLLL : 'dddd, D MMMM YYYY, Aको h:mm बजे'
-        },
-        preparse: function (string) {
-            return string.replace(/[१२३४५६७८९०]/g, function (match) {
-                return numberMap$c[match];
-            });
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$d[match];
-            });
-        },
-        meridiemParse: /राति|बिहान|दिउँसो|साँझ/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'राति') {
-                return hour < 4 ? hour : hour + 12;
-            } else if (meridiem === 'बिहान') {
-                return hour;
-            } else if (meridiem === 'दिउँसो') {
-                return hour >= 10 ? hour : hour + 12;
-            } else if (meridiem === 'साँझ') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 3) {
-                return 'राति';
-            } else if (hour < 12) {
-                return 'बिहान';
-            } else if (hour < 16) {
-                return 'दिउँसो';
-            } else if (hour < 20) {
-                return 'साँझ';
-            } else {
-                return 'राति';
-            }
-        },
-        calendar : {
-            sameDay : '[आज] LT',
-            nextDay : '[भोलि] LT',
-            nextWeek : '[आउँदो] dddd[,] LT',
-            lastDay : '[हिजो] LT',
-            lastWeek : '[गएको] dddd[,] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%sमा',
-            past : '%s अगाडि',
-            s : 'केही क्षण',
-            ss : '%d सेकेण्ड',
-            m : 'एक मिनेट',
-            mm : '%d मिनेट',
-            h : 'एक घण्टा',
-            hh : '%d घण्टा',
-            d : 'एक दिन',
-            dd : '%d दिन',
-            M : 'एक महिना',
-            MM : '%d महिना',
-            y : 'एक बर्ष',
-            yy : '%d बर्ष'
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 6  // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var monthsShortWithDots$1 = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
-        monthsShortWithoutDots$1 = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
-
-    var monthsParse$2 = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
-    var monthsRegex$3 = /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
-
-    hooks.defineLocale('nl-be', {
-        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
-        monthsShort : function (m, format) {
-            if (!m) {
-                return monthsShortWithDots$1;
-            } else if (/-MMM-/.test(format)) {
-                return monthsShortWithoutDots$1[m.month()];
-            } else {
-                return monthsShortWithDots$1[m.month()];
-            }
-        },
-
-        monthsRegex: monthsRegex$3,
-        monthsShortRegex: monthsRegex$3,
-        monthsStrictRegex: /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december)/i,
-        monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
-
-        monthsParse : monthsParse$2,
-        longMonthsParse : monthsParse$2,
-        shortMonthsParse : monthsParse$2,
-
-        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
-        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
-        weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[vandaag om] LT',
-            nextDay: '[morgen om] LT',
-            nextWeek: 'dddd [om] LT',
-            lastDay: '[gisteren om] LT',
-            lastWeek: '[afgelopen] dddd [om] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'over %s',
-            past : '%s geleden',
-            s : 'een paar seconden',
-            ss : '%d seconden',
-            m : 'één minuut',
-            mm : '%d minuten',
-            h : 'één uur',
-            hh : '%d uur',
-            d : 'één dag',
-            dd : '%d dagen',
-            M : 'één maand',
-            MM : '%d maanden',
-            y : 'één jaar',
-            yy : '%d jaar'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-        ordinal : function (number) {
-            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var monthsShortWithDots$2 = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
-        monthsShortWithoutDots$2 = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
-
-    var monthsParse$3 = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
-    var monthsRegex$4 = /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
-
-    hooks.defineLocale('nl', {
-        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
-        monthsShort : function (m, format) {
-            if (!m) {
-                return monthsShortWithDots$2;
-            } else if (/-MMM-/.test(format)) {
-                return monthsShortWithoutDots$2[m.month()];
-            } else {
-                return monthsShortWithDots$2[m.month()];
-            }
-        },
-
-        monthsRegex: monthsRegex$4,
-        monthsShortRegex: monthsRegex$4,
-        monthsStrictRegex: /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december)/i,
-        monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
-
-        monthsParse : monthsParse$3,
-        longMonthsParse : monthsParse$3,
-        shortMonthsParse : monthsParse$3,
-
-        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
-        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
-        weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD-MM-YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[vandaag om] LT',
-            nextDay: '[morgen om] LT',
-            nextWeek: 'dddd [om] LT',
-            lastDay: '[gisteren om] LT',
-            lastWeek: '[afgelopen] dddd [om] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'over %s',
-            past : '%s geleden',
-            s : 'een paar seconden',
-            ss : '%d seconden',
-            m : 'één minuut',
-            mm : '%d minuten',
-            h : 'één uur',
-            hh : '%d uur',
-            d : 'één dag',
-            dd : '%d dagen',
-            M : 'één maand',
-            MM : '%d maanden',
-            y : 'één jaar',
-            yy : '%d jaar'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-        ordinal : function (number) {
-            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('nn', {
-        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
-        weekdays : 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'),
-        weekdaysShort : 'sun_mån_tys_ons_tor_fre_lau'.split('_'),
-        weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY [kl.] H:mm',
-            LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
-        },
-        calendar : {
-            sameDay: '[I dag klokka] LT',
-            nextDay: '[I morgon klokka] LT',
-            nextWeek: 'dddd [klokka] LT',
-            lastDay: '[I går klokka] LT',
-            lastWeek: '[Føregåande] dddd [klokka] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'om %s',
-            past : '%s sidan',
-            s : 'nokre sekund',
-            ss : '%d sekund',
-            m : 'eit minutt',
-            mm : '%d minutt',
-            h : 'ein time',
-            hh : '%d timar',
-            d : 'ein dag',
-            dd : '%d dagar',
-            M : 'ein månad',
-            MM : '%d månader',
-            y : 'eit år',
-            yy : '%d år'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$e = {
-        '1': '੧',
-        '2': '੨',
-        '3': '੩',
-        '4': '੪',
-        '5': '੫',
-        '6': '੬',
-        '7': '੭',
-        '8': '੮',
-        '9': '੯',
-        '0': '੦'
-    },
-    numberMap$d = {
-        '੧': '1',
-        '੨': '2',
-        '੩': '3',
-        '੪': '4',
-        '੫': '5',
-        '੬': '6',
-        '੭': '7',
-        '੮': '8',
-        '੯': '9',
-        '੦': '0'
-    };
-
-    hooks.defineLocale('pa-in', {
-        // There are months name as per Nanakshahi Calendar but they are not used as rigidly in modern Punjabi.
-        months : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
-        monthsShort : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
-        weekdays : 'ਐਤਵਾਰ_ਸੋਮਵਾਰ_ਮੰਗਲਵਾਰ_ਬੁਧਵਾਰ_ਵੀਰਵਾਰ_ਸ਼ੁੱਕਰਵਾਰ_ਸ਼ਨੀਚਰਵਾਰ'.split('_'),
-        weekdaysShort : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
-        weekdaysMin : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
-        longDateFormat : {
-            LT : 'A h:mm ਵਜੇ',
-            LTS : 'A h:mm:ss ਵਜੇ',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY, A h:mm ਵਜੇ',
-            LLLL : 'dddd, D MMMM YYYY, A h:mm ਵਜੇ'
-        },
-        calendar : {
-            sameDay : '[ਅਜ] LT',
-            nextDay : '[ਕਲ] LT',
-            nextWeek : '[ਅਗਲਾ] dddd, LT',
-            lastDay : '[ਕਲ] LT',
-            lastWeek : '[ਪਿਛਲੇ] dddd, LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s ਵਿੱਚ',
-            past : '%s ਪਿਛਲੇ',
-            s : 'ਕੁਝ ਸਕਿੰਟ',
-            ss : '%d ਸਕਿੰਟ',
-            m : 'ਇਕ ਮਿੰਟ',
-            mm : '%d ਮਿੰਟ',
-            h : 'ਇੱਕ ਘੰਟਾ',
-            hh : '%d ਘੰਟੇ',
-            d : 'ਇੱਕ ਦਿਨ',
-            dd : '%d ਦਿਨ',
-            M : 'ਇੱਕ ਮਹੀਨਾ',
-            MM : '%d ਮਹੀਨੇ',
-            y : 'ਇੱਕ ਸਾਲ',
-            yy : '%d ਸਾਲ'
-        },
-        preparse: function (string) {
-            return string.replace(/[੧੨੩੪੫੬੭੮੯੦]/g, function (match) {
-                return numberMap$d[match];
-            });
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$e[match];
-            });
-        },
-        // Punjabi notation for meridiems are quite fuzzy in practice. While there exists
-        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Punjabi.
-        meridiemParse: /ਰਾਤ|ਸਵੇਰ|ਦੁਪਹਿਰ|ਸ਼ਾਮ/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'ਰਾਤ') {
-                return hour < 4 ? hour : hour + 12;
-            } else if (meridiem === 'ਸਵੇਰ') {
-                return hour;
-            } else if (meridiem === 'ਦੁਪਹਿਰ') {
-                return hour >= 10 ? hour : hour + 12;
-            } else if (meridiem === 'ਸ਼ਾਮ') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'ਰਾਤ';
-            } else if (hour < 10) {
-                return 'ਸਵੇਰ';
-            } else if (hour < 17) {
-                return 'ਦੁਪਹਿਰ';
-            } else if (hour < 20) {
-                return 'ਸ਼ਾਮ';
-            } else {
-                return 'ਰਾਤ';
-            }
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 6  // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'),
-        monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
-    function plural$3(n) {
-        return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
-    }
-    function translate$8(number, withoutSuffix, key) {
-        var result = number + ' ';
-        switch (key) {
-            case 'ss':
-                return result + (plural$3(number) ? 'sekundy' : 'sekund');
-            case 'm':
-                return withoutSuffix ? 'minuta' : 'minutę';
-            case 'mm':
-                return result + (plural$3(number) ? 'minuty' : 'minut');
-            case 'h':
-                return withoutSuffix  ? 'godzina'  : 'godzinę';
-            case 'hh':
-                return result + (plural$3(number) ? 'godziny' : 'godzin');
-            case 'MM':
-                return result + (plural$3(number) ? 'miesiące' : 'miesięcy');
-            case 'yy':
-                return result + (plural$3(number) ? 'lata' : 'lat');
-        }
-    }
-
-    hooks.defineLocale('pl', {
-        months : function (momentToFormat, format) {
-            if (!momentToFormat) {
-                return monthsNominative;
-            } else if (format === '') {
-                // Hack: if format empty we know this is used to generate
-                // RegExp by moment. Give then back both valid forms of months
-                // in RegExp ready format.
-                return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
-            } else if (/D MMMM/.test(format)) {
-                return monthsSubjective[momentToFormat.month()];
-            } else {
-                return monthsNominative[momentToFormat.month()];
-            }
-        },
-        monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
-        weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
-        weekdaysShort : 'ndz_pon_wt_śr_czw_pt_sob'.split('_'),
-        weekdaysMin : 'Nd_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[Dziś o] LT',
-            nextDay: '[Jutro o] LT',
-            nextWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[W niedzielę o] LT';
-
-                    case 2:
-                        return '[We wtorek o] LT';
-
-                    case 3:
-                        return '[W środę o] LT';
-
-                    case 6:
-                        return '[W sobotę o] LT';
-
-                    default:
-                        return '[W] dddd [o] LT';
-                }
-            },
-            lastDay: '[Wczoraj o] LT',
-            lastWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[W zeszłą niedzielę o] LT';
-                    case 3:
-                        return '[W zeszłą środę o] LT';
-                    case 6:
-                        return '[W zeszłą sobotę o] LT';
-                    default:
-                        return '[W zeszły] dddd [o] LT';
-                }
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'za %s',
-            past : '%s temu',
-            s : 'kilka sekund',
-            ss : translate$8,
-            m : translate$8,
-            mm : translate$8,
-            h : translate$8,
-            hh : translate$8,
-            d : '1 dzień',
-            dd : '%d dni',
-            M : 'miesiąc',
-            MM : translate$8,
-            y : 'rok',
-            yy : translate$8
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('pt-br', {
-        months : 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'),
-        monthsShort : 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'),
-        weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
-        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
-        weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D [de] MMMM [de] YYYY',
-            LLL : 'D [de] MMMM [de] YYYY [às] HH:mm',
-            LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'
-        },
-        calendar : {
-            sameDay: '[Hoje às] LT',
-            nextDay: '[Amanhã às] LT',
-            nextWeek: 'dddd [às] LT',
-            lastDay: '[Ontem às] LT',
-            lastWeek: function () {
-                return (this.day() === 0 || this.day() === 6) ?
-                    '[Último] dddd [às] LT' : // Saturday + Sunday
-                    '[Última] dddd [às] LT'; // Monday - Friday
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'em %s',
-            past : 'há %s',
-            s : 'poucos segundos',
-            ss : '%d segundos',
-            m : 'um minuto',
-            mm : '%d minutos',
-            h : 'uma hora',
-            hh : '%d horas',
-            d : 'um dia',
-            dd : '%d dias',
-            M : 'um mês',
-            MM : '%d meses',
-            y : 'um ano',
-            yy : '%d anos'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}º/,
-        ordinal : '%dº'
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('pt', {
-        months : 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'),
-        monthsShort : 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'),
-        weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
-        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
-        weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D [de] MMMM [de] YYYY',
-            LLL : 'D [de] MMMM [de] YYYY HH:mm',
-            LLLL : 'dddd, D [de] MMMM [de] YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[Hoje às] LT',
-            nextDay: '[Amanhã às] LT',
-            nextWeek: 'dddd [às] LT',
-            lastDay: '[Ontem às] LT',
-            lastWeek: function () {
-                return (this.day() === 0 || this.day() === 6) ?
-                    '[Último] dddd [às] LT' : // Saturday + Sunday
-                    '[Última] dddd [às] LT'; // Monday - Friday
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'em %s',
-            past : 'há %s',
-            s : 'segundos',
-            ss : '%d segundos',
-            m : 'um minuto',
-            mm : '%d minutos',
-            h : 'uma hora',
-            hh : '%d horas',
-            d : 'um dia',
-            dd : '%d dias',
-            M : 'um mês',
-            MM : '%d meses',
-            y : 'um ano',
-            yy : '%d anos'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}º/,
-        ordinal : '%dº',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function relativeTimeWithPlural$2(number, withoutSuffix, key) {
-        var format = {
-                'ss': 'secunde',
-                'mm': 'minute',
-                'hh': 'ore',
-                'dd': 'zile',
-                'MM': 'luni',
-                'yy': 'ani'
-            },
-            separator = ' ';
-        if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
-            separator = ' de ';
-        }
-        return number + separator + format[key];
-    }
-
-    hooks.defineLocale('ro', {
-        months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
-        monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
-        monthsParseExact: true,
-        weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
-        weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
-        weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY H:mm',
-            LLLL : 'dddd, D MMMM YYYY H:mm'
-        },
-        calendar : {
-            sameDay: '[azi la] LT',
-            nextDay: '[mâine la] LT',
-            nextWeek: 'dddd [la] LT',
-            lastDay: '[ieri la] LT',
-            lastWeek: '[fosta] dddd [la] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'peste %s',
-            past : '%s în urmă',
-            s : 'câteva secunde',
-            ss : relativeTimeWithPlural$2,
-            m : 'un minut',
-            mm : relativeTimeWithPlural$2,
-            h : 'o oră',
-            hh : relativeTimeWithPlural$2,
-            d : 'o zi',
-            dd : relativeTimeWithPlural$2,
-            M : 'o lună',
-            MM : relativeTimeWithPlural$2,
-            y : 'un an',
-            yy : relativeTimeWithPlural$2
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function plural$4(word, num) {
-        var forms = word.split('_');
-        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
-    }
-    function relativeTimeWithPlural$3(number, withoutSuffix, key) {
-        var format = {
-            'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд',
-            'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
-            'hh': 'час_часа_часов',
-            'dd': 'день_дня_дней',
-            'MM': 'месяц_месяца_месяцев',
-            'yy': 'год_года_лет'
-        };
-        if (key === 'm') {
-            return withoutSuffix ? 'минута' : 'минуту';
-        }
-        else {
-            return number + ' ' + plural$4(format[key], +number);
-        }
-    }
-    var monthsParse$4 = [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[йя]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i];
-
-    // http://new.gramota.ru/spravka/rules/139-prop : § 103
-    // Сокращения месяцев: http://new.gramota.ru/spravka/buro/search-answer?s=242637
-    // CLDR data:          http://www.unicode.org/cldr/charts/28/summary/ru.html#1753
-    hooks.defineLocale('ru', {
-        months : {
-            format: 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_'),
-            standalone: 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_')
-        },
-        monthsShort : {
-            // по CLDR именно "июл." и "июн.", но какой смысл менять букву на точку ?
-            format: 'янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.'.split('_'),
-            standalone: 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_')
-        },
-        weekdays : {
-            standalone: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
-            format: 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_'),
-            isFormat: /\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/
-        },
-        weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
-        weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
-        monthsParse : monthsParse$4,
-        longMonthsParse : monthsParse$4,
-        shortMonthsParse : monthsParse$4,
-
-        // полные названия с падежами, по три буквы, для некоторых, по 4 буквы, сокращения с точкой и без точки
-        monthsRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
-
-        // копия предыдущего
-        monthsShortRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
-
-        // полные названия с падежами
-        monthsStrictRegex: /^(январ[яь]|феврал[яь]|марта?|апрел[яь]|ма[яй]|июн[яь]|июл[яь]|августа?|сентябр[яь]|октябр[яь]|ноябр[яь]|декабр[яь])/i,
-
-        // Выражение, которое соотвествует только сокращённым формам
-        monthsShortStrictRegex: /^(янв\.|февр?\.|мар[т.]|апр\.|ма[яй]|июн[ья.]|июл[ья.]|авг\.|сент?\.|окт\.|нояб?\.|дек\.)/i,
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY г.',
-            LLL : 'D MMMM YYYY г., H:mm',
-            LLLL : 'dddd, D MMMM YYYY г., H:mm'
-        },
-        calendar : {
-            sameDay: '[Сегодня, в] LT',
-            nextDay: '[Завтра, в] LT',
-            lastDay: '[Вчера, в] LT',
-            nextWeek: function (now) {
-                if (now.week() !== this.week()) {
-                    switch (this.day()) {
-                        case 0:
-                            return '[В следующее] dddd, [в] LT';
-                        case 1:
-                        case 2:
-                        case 4:
-                            return '[В следующий] dddd, [в] LT';
-                        case 3:
-                        case 5:
-                        case 6:
-                            return '[В следующую] dddd, [в] LT';
-                    }
-                } else {
-                    if (this.day() === 2) {
-                        return '[Во] dddd, [в] LT';
-                    } else {
-                        return '[В] dddd, [в] LT';
-                    }
-                }
-            },
-            lastWeek: function (now) {
-                if (now.week() !== this.week()) {
-                    switch (this.day()) {
-                        case 0:
-                            return '[В прошлое] dddd, [в] LT';
-                        case 1:
-                        case 2:
-                        case 4:
-                            return '[В прошлый] dddd, [в] LT';
-                        case 3:
-                        case 5:
-                        case 6:
-                            return '[В прошлую] dddd, [в] LT';
-                    }
-                } else {
-                    if (this.day() === 2) {
-                        return '[Во] dddd, [в] LT';
-                    } else {
-                        return '[В] dddd, [в] LT';
-                    }
-                }
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'через %s',
-            past : '%s назад',
-            s : 'несколько секунд',
-            ss : relativeTimeWithPlural$3,
-            m : relativeTimeWithPlural$3,
-            mm : relativeTimeWithPlural$3,
-            h : 'час',
-            hh : relativeTimeWithPlural$3,
-            d : 'день',
-            dd : relativeTimeWithPlural$3,
-            M : 'месяц',
-            MM : relativeTimeWithPlural$3,
-            y : 'год',
-            yy : relativeTimeWithPlural$3
-        },
-        meridiemParse: /ночи|утра|дня|вечера/i,
-        isPM : function (input) {
-            return /^(дня|вечера)$/.test(input);
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'ночи';
-            } else if (hour < 12) {
-                return 'утра';
-            } else if (hour < 17) {
-                return 'дня';
-            } else {
-                return 'вечера';
-            }
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}-(й|го|я)/,
-        ordinal: function (number, period) {
-            switch (period) {
-                case 'M':
-                case 'd':
-                case 'DDD':
-                    return number + '-й';
-                case 'D':
-                    return number + '-го';
-                case 'w':
-                case 'W':
-                    return number + '-я';
-                default:
-                    return number;
-            }
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var months$7 = [
-        'جنوري',
-        'فيبروري',
-        'مارچ',
-        'اپريل',
-        'مئي',
-        'جون',
-        'جولاءِ',
-        'آگسٽ',
-        'سيپٽمبر',
-        'آڪٽوبر',
-        'نومبر',
-        'ڊسمبر'
-    ];
-    var days$1 = [
-        'آچر',
-        'سومر',
-        'اڱارو',
-        'اربع',
-        'خميس',
-        'جمع',
-        'ڇنڇر'
-    ];
-
-    hooks.defineLocale('sd', {
-        months : months$7,
-        monthsShort : months$7,
-        weekdays : days$1,
-        weekdaysShort : days$1,
-        weekdaysMin : days$1,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd، D MMMM YYYY HH:mm'
-        },
-        meridiemParse: /صبح|شام/,
-        isPM : function (input) {
-            return 'شام' === input;
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'صبح';
-            }
-            return 'شام';
-        },
-        calendar : {
-            sameDay : '[اڄ] LT',
-            nextDay : '[سڀاڻي] LT',
-            nextWeek : 'dddd [اڳين هفتي تي] LT',
-            lastDay : '[ڪالهه] LT',
-            lastWeek : '[گزريل هفتي] dddd [تي] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s پوء',
-            past : '%s اڳ',
-            s : 'چند سيڪنڊ',
-            ss : '%d سيڪنڊ',
-            m : 'هڪ منٽ',
-            mm : '%d منٽ',
-            h : 'هڪ ڪلاڪ',
-            hh : '%d ڪلاڪ',
-            d : 'هڪ ڏينهن',
-            dd : '%d ڏينهن',
-            M : 'هڪ مهينو',
-            MM : '%d مهينا',
-            y : 'هڪ سال',
-            yy : '%d سال'
-        },
-        preparse: function (string) {
-            return string.replace(/،/g, ',');
-        },
-        postformat: function (string) {
-            return string.replace(/,/g, '،');
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('se', {
-        months : 'ođđajagemánnu_guovvamánnu_njukčamánnu_cuoŋománnu_miessemánnu_geassemánnu_suoidnemánnu_borgemánnu_čakčamánnu_golggotmánnu_skábmamánnu_juovlamánnu'.split('_'),
-        monthsShort : 'ođđj_guov_njuk_cuo_mies_geas_suoi_borg_čakč_golg_skáb_juov'.split('_'),
-        weekdays : 'sotnabeaivi_vuossárga_maŋŋebárga_gaskavahkku_duorastat_bearjadat_lávvardat'.split('_'),
-        weekdaysShort : 'sotn_vuos_maŋ_gask_duor_bear_láv'.split('_'),
-        weekdaysMin : 's_v_m_g_d_b_L'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'MMMM D. [b.] YYYY',
-            LLL : 'MMMM D. [b.] YYYY [ti.] HH:mm',
-            LLLL : 'dddd, MMMM D. [b.] YYYY [ti.] HH:mm'
-        },
-        calendar : {
-            sameDay: '[otne ti] LT',
-            nextDay: '[ihttin ti] LT',
-            nextWeek: 'dddd [ti] LT',
-            lastDay: '[ikte ti] LT',
-            lastWeek: '[ovddit] dddd [ti] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : '%s geažes',
-            past : 'maŋit %s',
-            s : 'moadde sekunddat',
-            ss: '%d sekunddat',
-            m : 'okta minuhta',
-            mm : '%d minuhtat',
-            h : 'okta diimmu',
-            hh : '%d diimmut',
-            d : 'okta beaivi',
-            dd : '%d beaivvit',
-            M : 'okta mánnu',
-            MM : '%d mánut',
-            y : 'okta jahki',
-            yy : '%d jagit'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    /*jshint -W100*/
-    hooks.defineLocale('si', {
-        months : 'ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්'.split('_'),
-        monthsShort : 'ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ'.split('_'),
-        weekdays : 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'),
-        weekdaysShort : 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'),
-        weekdaysMin : 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'a h:mm',
-            LTS : 'a h:mm:ss',
-            L : 'YYYY/MM/DD',
-            LL : 'YYYY MMMM D',
-            LLL : 'YYYY MMMM D, a h:mm',
-            LLLL : 'YYYY MMMM D [වැනි] dddd, a h:mm:ss'
-        },
-        calendar : {
-            sameDay : '[අද] LT[ට]',
-            nextDay : '[හෙට] LT[ට]',
-            nextWeek : 'dddd LT[ට]',
-            lastDay : '[ඊයේ] LT[ට]',
-            lastWeek : '[පසුගිය] dddd LT[ට]',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%sකින්',
-            past : '%sකට පෙර',
-            s : 'තත්පර කිහිපය',
-            ss : 'තත්පර %d',
-            m : 'මිනිත්තුව',
-            mm : 'මිනිත්තු %d',
-            h : 'පැය',
-            hh : 'පැය %d',
-            d : 'දිනය',
-            dd : 'දින %d',
-            M : 'මාසය',
-            MM : 'මාස %d',
-            y : 'වසර',
-            yy : 'වසර %d'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2} වැනි/,
-        ordinal : function (number) {
-            return number + ' වැනි';
-        },
-        meridiemParse : /පෙර වරු|පස් වරු|පෙ.ව|ප.ව./,
-        isPM : function (input) {
-            return input === 'ප.ව.' || input === 'පස් වරු';
-        },
-        meridiem : function (hours, minutes, isLower) {
-            if (hours > 11) {
-                return isLower ? 'ප.ව.' : 'පස් වරු';
-            } else {
-                return isLower ? 'පෙ.ව.' : 'පෙර වරු';
-            }
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var months$8 = 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_'),
-        monthsShort$5 = 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_');
-    function plural$5(n) {
-        return (n > 1) && (n < 5);
-    }
-    function translate$9(number, withoutSuffix, key, isFuture) {
-        var result = number + ' ';
-        switch (key) {
-            case 's':  // a few seconds / in a few seconds / a few seconds ago
-                return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami';
-            case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$5(number) ? 'sekundy' : 'sekúnd');
-                } else {
-                    return result + 'sekundami';
-                }
-                break;
-            case 'm':  // a minute / in a minute / a minute ago
-                return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou');
-            case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$5(number) ? 'minúty' : 'minút');
-                } else {
-                    return result + 'minútami';
-                }
-                break;
-            case 'h':  // an hour / in an hour / an hour ago
-                return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
-            case 'hh': // 9 hours / in 9 hours / 9 hours ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$5(number) ? 'hodiny' : 'hodín');
-                } else {
-                    return result + 'hodinami';
-                }
-                break;
-            case 'd':  // a day / in a day / a day ago
-                return (withoutSuffix || isFuture) ? 'deň' : 'dňom';
-            case 'dd': // 9 days / in 9 days / 9 days ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$5(number) ? 'dni' : 'dní');
-                } else {
-                    return result + 'dňami';
-                }
-                break;
-            case 'M':  // a month / in a month / a month ago
-                return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom';
-            case 'MM': // 9 months / in 9 months / 9 months ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$5(number) ? 'mesiace' : 'mesiacov');
-                } else {
-                    return result + 'mesiacmi';
-                }
-                break;
-            case 'y':  // a year / in a year / a year ago
-                return (withoutSuffix || isFuture) ? 'rok' : 'rokom';
-            case 'yy': // 9 years / in 9 years / 9 years ago
-                if (withoutSuffix || isFuture) {
-                    return result + (plural$5(number) ? 'roky' : 'rokov');
-                } else {
-                    return result + 'rokmi';
-                }
-                break;
-        }
-    }
-
-    hooks.defineLocale('sk', {
-        months : months$8,
-        monthsShort : monthsShort$5,
-        weekdays : 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'),
-        weekdaysShort : 'ne_po_ut_st_št_pi_so'.split('_'),
-        weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'),
-        longDateFormat : {
-            LT: 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY H:mm',
-            LLLL : 'dddd D. MMMM YYYY H:mm'
-        },
-        calendar : {
-            sameDay: '[dnes o] LT',
-            nextDay: '[zajtra o] LT',
-            nextWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[v nedeľu o] LT';
-                    case 1:
-                    case 2:
-                        return '[v] dddd [o] LT';
-                    case 3:
-                        return '[v stredu o] LT';
-                    case 4:
-                        return '[vo štvrtok o] LT';
-                    case 5:
-                        return '[v piatok o] LT';
-                    case 6:
-                        return '[v sobotu o] LT';
-                }
-            },
-            lastDay: '[včera o] LT',
-            lastWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[minulú nedeľu o] LT';
-                    case 1:
-                    case 2:
-                        return '[minulý] dddd [o] LT';
-                    case 3:
-                        return '[minulú stredu o] LT';
-                    case 4:
-                    case 5:
-                        return '[minulý] dddd [o] LT';
-                    case 6:
-                        return '[minulú sobotu o] LT';
-                }
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'za %s',
-            past : 'pred %s',
-            s : translate$9,
-            ss : translate$9,
-            m : translate$9,
-            mm : translate$9,
-            h : translate$9,
-            hh : translate$9,
-            d : translate$9,
-            dd : translate$9,
-            M : translate$9,
-            MM : translate$9,
-            y : translate$9,
-            yy : translate$9
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function processRelativeTime$6(number, withoutSuffix, key, isFuture) {
-        var result = number + ' ';
-        switch (key) {
-            case 's':
-                return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';
-            case 'ss':
-                if (number === 1) {
-                    result += withoutSuffix ? 'sekundo' : 'sekundi';
-                } else if (number === 2) {
-                    result += withoutSuffix || isFuture ? 'sekundi' : 'sekundah';
-                } else if (number < 5) {
-                    result += withoutSuffix || isFuture ? 'sekunde' : 'sekundah';
-                } else {
-                    result += 'sekund';
-                }
-                return result;
-            case 'm':
-                return withoutSuffix ? 'ena minuta' : 'eno minuto';
-            case 'mm':
-                if (number === 1) {
-                    result += withoutSuffix ? 'minuta' : 'minuto';
-                } else if (number === 2) {
-                    result += withoutSuffix || isFuture ? 'minuti' : 'minutama';
-                } else if (number < 5) {
-                    result += withoutSuffix || isFuture ? 'minute' : 'minutami';
-                } else {
-                    result += withoutSuffix || isFuture ? 'minut' : 'minutami';
-                }
-                return result;
-            case 'h':
-                return withoutSuffix ? 'ena ura' : 'eno uro';
-            case 'hh':
-                if (number === 1) {
-                    result += withoutSuffix ? 'ura' : 'uro';
-                } else if (number === 2) {
-                    result += withoutSuffix || isFuture ? 'uri' : 'urama';
-                } else if (number < 5) {
-                    result += withoutSuffix || isFuture ? 'ure' : 'urami';
-                } else {
-                    result += withoutSuffix || isFuture ? 'ur' : 'urami';
-                }
-                return result;
-            case 'd':
-                return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';
-            case 'dd':
-                if (number === 1) {
-                    result += withoutSuffix || isFuture ? 'dan' : 'dnem';
-                } else if (number === 2) {
-                    result += withoutSuffix || isFuture ? 'dni' : 'dnevoma';
-                } else {
-                    result += withoutSuffix || isFuture ? 'dni' : 'dnevi';
-                }
-                return result;
-            case 'M':
-                return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';
-            case 'MM':
-                if (number === 1) {
-                    result += withoutSuffix || isFuture ? 'mesec' : 'mesecem';
-                } else if (number === 2) {
-                    result += withoutSuffix || isFuture ? 'meseca' : 'mesecema';
-                } else if (number < 5) {
-                    result += withoutSuffix || isFuture ? 'mesece' : 'meseci';
-                } else {
-                    result += withoutSuffix || isFuture ? 'mesecev' : 'meseci';
-                }
-                return result;
-            case 'y':
-                return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';
-            case 'yy':
-                if (number === 1) {
-                    result += withoutSuffix || isFuture ? 'leto' : 'letom';
-                } else if (number === 2) {
-                    result += withoutSuffix || isFuture ? 'leti' : 'letoma';
-                } else if (number < 5) {
-                    result += withoutSuffix || isFuture ? 'leta' : 'leti';
-                } else {
-                    result += withoutSuffix || isFuture ? 'let' : 'leti';
-                }
-                return result;
-        }
-    }
-
-    hooks.defineLocale('sl', {
-        months : 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),
-        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),
-        monthsParseExact: true,
-        weekdays : 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),
-        weekdaysShort : 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),
-        weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM YYYY',
-            LLL : 'D. MMMM YYYY H:mm',
-            LLLL : 'dddd, D. MMMM YYYY H:mm'
-        },
-        calendar : {
-            sameDay  : '[danes ob] LT',
-            nextDay  : '[jutri ob] LT',
-
-            nextWeek : function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[v] [nedeljo] [ob] LT';
-                    case 3:
-                        return '[v] [sredo] [ob] LT';
-                    case 6:
-                        return '[v] [soboto] [ob] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                    case 5:
-                        return '[v] dddd [ob] LT';
-                }
-            },
-            lastDay  : '[včeraj ob] LT',
-            lastWeek : function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[prejšnjo] [nedeljo] [ob] LT';
-                    case 3:
-                        return '[prejšnjo] [sredo] [ob] LT';
-                    case 6:
-                        return '[prejšnjo] [soboto] [ob] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                    case 5:
-                        return '[prejšnji] dddd [ob] LT';
-                }
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'čez %s',
-            past   : 'pred %s',
-            s      : processRelativeTime$6,
-            ss     : processRelativeTime$6,
-            m      : processRelativeTime$6,
-            mm     : processRelativeTime$6,
-            h      : processRelativeTime$6,
-            hh     : processRelativeTime$6,
-            d      : processRelativeTime$6,
-            dd     : processRelativeTime$6,
-            M      : processRelativeTime$6,
-            MM     : processRelativeTime$6,
-            y      : processRelativeTime$6,
-            yy     : processRelativeTime$6
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('sq', {
-        months : 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'),
-        monthsShort : 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'),
-        weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'),
-        weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'),
-        weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'),
-        weekdaysParseExact : true,
-        meridiemParse: /PD|MD/,
-        isPM: function (input) {
-            return input.charAt(0) === 'M';
-        },
-        meridiem : function (hours, minutes, isLower) {
-            return hours < 12 ? 'PD' : 'MD';
-        },
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Sot në] LT',
-            nextDay : '[Nesër në] LT',
-            nextWeek : 'dddd [në] LT',
-            lastDay : '[Dje në] LT',
-            lastWeek : 'dddd [e kaluar në] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'në %s',
-            past : '%s më parë',
-            s : 'disa sekonda',
-            ss : '%d sekonda',
-            m : 'një minutë',
-            mm : '%d minuta',
-            h : 'një orë',
-            hh : '%d orë',
-            d : 'një ditë',
-            dd : '%d ditë',
-            M : 'një muaj',
-            MM : '%d muaj',
-            y : 'një vit',
-            yy : '%d vite'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var translator$1 = {
-        words: { //Different grammatical cases
-            ss: ['секунда', 'секунде', 'секунди'],
-            m: ['један минут', 'једне минуте'],
-            mm: ['минут', 'минуте', 'минута'],
-            h: ['један сат', 'једног сата'],
-            hh: ['сат', 'сата', 'сати'],
-            dd: ['дан', 'дана', 'дана'],
-            MM: ['месец', 'месеца', 'месеци'],
-            yy: ['година', 'године', 'година']
-        },
-        correctGrammaticalCase: function (number, wordKey) {
-            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
-        },
-        translate: function (number, withoutSuffix, key) {
-            var wordKey = translator$1.words[key];
-            if (key.length === 1) {
-                return withoutSuffix ? wordKey[0] : wordKey[1];
-            } else {
-                return number + ' ' + translator$1.correctGrammaticalCase(number, wordKey);
-            }
-        }
-    };
-
-    hooks.defineLocale('sr-cyrl', {
-        months: 'јануар_фебруар_март_април_мај_јун_јул_август_септембар_октобар_новембар_децембар'.split('_'),
-        monthsShort: 'јан._феб._мар._апр._мај_јун_јул_авг._сеп._окт._нов._дец.'.split('_'),
-        monthsParseExact: true,
-        weekdays: 'недеља_понедељак_уторак_среда_четвртак_петак_субота'.split('_'),
-        weekdaysShort: 'нед._пон._уто._сре._чет._пет._суб.'.split('_'),
-        weekdaysMin: 'не_по_ут_ср_че_пе_су'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat: {
-            LT: 'H:mm',
-            LTS : 'H:mm:ss',
-            L: 'DD.MM.YYYY',
-            LL: 'D. MMMM YYYY',
-            LLL: 'D. MMMM YYYY H:mm',
-            LLLL: 'dddd, D. MMMM YYYY H:mm'
-        },
-        calendar: {
-            sameDay: '[данас у] LT',
-            nextDay: '[сутра у] LT',
-            nextWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[у] [недељу] [у] LT';
-                    case 3:
-                        return '[у] [среду] [у] LT';
-                    case 6:
-                        return '[у] [суботу] [у] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                    case 5:
-                        return '[у] dddd [у] LT';
-                }
-            },
-            lastDay  : '[јуче у] LT',
-            lastWeek : function () {
-                var lastWeekDays = [
-                    '[прошле] [недеље] [у] LT',
-                    '[прошлог] [понедељка] [у] LT',
-                    '[прошлог] [уторка] [у] LT',
-                    '[прошле] [среде] [у] LT',
-                    '[прошлог] [четвртка] [у] LT',
-                    '[прошлог] [петка] [у] LT',
-                    '[прошле] [суботе] [у] LT'
-                ];
-                return lastWeekDays[this.day()];
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'за %s',
-            past   : 'пре %s',
-            s      : 'неколико секунди',
-            ss     : translator$1.translate,
-            m      : translator$1.translate,
-            mm     : translator$1.translate,
-            h      : translator$1.translate,
-            hh     : translator$1.translate,
-            d      : 'дан',
-            dd     : translator$1.translate,
-            M      : 'месец',
-            MM     : translator$1.translate,
-            y      : 'годину',
-            yy     : translator$1.translate
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var translator$2 = {
-        words: { //Different grammatical cases
-            ss: ['sekunda', 'sekunde', 'sekundi'],
-            m: ['jedan minut', 'jedne minute'],
-            mm: ['minut', 'minute', 'minuta'],
-            h: ['jedan sat', 'jednog sata'],
-            hh: ['sat', 'sata', 'sati'],
-            dd: ['dan', 'dana', 'dana'],
-            MM: ['mesec', 'meseca', 'meseci'],
-            yy: ['godina', 'godine', 'godina']
-        },
-        correctGrammaticalCase: function (number, wordKey) {
-            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
-        },
-        translate: function (number, withoutSuffix, key) {
-            var wordKey = translator$2.words[key];
-            if (key.length === 1) {
-                return withoutSuffix ? wordKey[0] : wordKey[1];
-            } else {
-                return number + ' ' + translator$2.correctGrammaticalCase(number, wordKey);
-            }
-        }
-    };
-
-    hooks.defineLocale('sr', {
-        months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
-        monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
-        monthsParseExact: true,
-        weekdays: 'nedelja_ponedeljak_utorak_sreda_četvrtak_petak_subota'.split('_'),
-        weekdaysShort: 'ned._pon._uto._sre._čet._pet._sub.'.split('_'),
-        weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat: {
-            LT: 'H:mm',
-            LTS : 'H:mm:ss',
-            L: 'DD.MM.YYYY',
-            LL: 'D. MMMM YYYY',
-            LLL: 'D. MMMM YYYY H:mm',
-            LLLL: 'dddd, D. MMMM YYYY H:mm'
-        },
-        calendar: {
-            sameDay: '[danas u] LT',
-            nextDay: '[sutra u] LT',
-            nextWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                        return '[u] [nedelju] [u] LT';
-                    case 3:
-                        return '[u] [sredu] [u] LT';
-                    case 6:
-                        return '[u] [subotu] [u] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                    case 5:
-                        return '[u] dddd [u] LT';
-                }
-            },
-            lastDay  : '[juče u] LT',
-            lastWeek : function () {
-                var lastWeekDays = [
-                    '[prošle] [nedelje] [u] LT',
-                    '[prošlog] [ponedeljka] [u] LT',
-                    '[prošlog] [utorka] [u] LT',
-                    '[prošle] [srede] [u] LT',
-                    '[prošlog] [četvrtka] [u] LT',
-                    '[prošlog] [petka] [u] LT',
-                    '[prošle] [subote] [u] LT'
-                ];
-                return lastWeekDays[this.day()];
-            },
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'za %s',
-            past   : 'pre %s',
-            s      : 'nekoliko sekundi',
-            ss     : translator$2.translate,
-            m      : translator$2.translate,
-            mm     : translator$2.translate,
-            h      : translator$2.translate,
-            hh     : translator$2.translate,
-            d      : 'dan',
-            dd     : translator$2.translate,
-            M      : 'mesec',
-            MM     : translator$2.translate,
-            y      : 'godinu',
-            yy     : translator$2.translate
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('ss', {
-        months : "Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni".split('_'),
-        monthsShort : 'Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo'.split('_'),
-        weekdays : 'Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo'.split('_'),
-        weekdaysShort : 'Lis_Umb_Lsb_Les_Lsi_Lsh_Umg'.split('_'),
-        weekdaysMin : 'Li_Us_Lb_Lt_Ls_Lh_Ug'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'h:mm A',
-            LTS : 'h:mm:ss A',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY h:mm A',
-            LLLL : 'dddd, D MMMM YYYY h:mm A'
-        },
-        calendar : {
-            sameDay : '[Namuhla nga] LT',
-            nextDay : '[Kusasa nga] LT',
-            nextWeek : 'dddd [nga] LT',
-            lastDay : '[Itolo nga] LT',
-            lastWeek : 'dddd [leliphelile] [nga] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'nga %s',
-            past : 'wenteka nga %s',
-            s : 'emizuzwana lomcane',
-            ss : '%d mzuzwana',
-            m : 'umzuzu',
-            mm : '%d emizuzu',
-            h : 'lihora',
-            hh : '%d emahora',
-            d : 'lilanga',
-            dd : '%d emalanga',
-            M : 'inyanga',
-            MM : '%d tinyanga',
-            y : 'umnyaka',
-            yy : '%d iminyaka'
-        },
-        meridiemParse: /ekuseni|emini|entsambama|ebusuku/,
-        meridiem : function (hours, minutes, isLower) {
-            if (hours < 11) {
-                return 'ekuseni';
-            } else if (hours < 15) {
-                return 'emini';
-            } else if (hours < 19) {
-                return 'entsambama';
-            } else {
-                return 'ebusuku';
-            }
-        },
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'ekuseni') {
-                return hour;
-            } else if (meridiem === 'emini') {
-                return hour >= 11 ? hour : hour + 12;
-            } else if (meridiem === 'entsambama' || meridiem === 'ebusuku') {
-                if (hour === 0) {
-                    return 0;
-                }
-                return hour + 12;
-            }
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}/,
-        ordinal : '%d',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('sv', {
-        months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
-        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
-        weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
-        weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
-        weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'YYYY-MM-DD',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY [kl.] HH:mm',
-            LLLL : 'dddd D MMMM YYYY [kl.] HH:mm',
-            lll : 'D MMM YYYY HH:mm',
-            llll : 'ddd D MMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[Idag] LT',
-            nextDay: '[Imorgon] LT',
-            lastDay: '[Igår] LT',
-            nextWeek: '[På] dddd LT',
-            lastWeek: '[I] dddd[s] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'om %s',
-            past : 'för %s sedan',
-            s : 'några sekunder',
-            ss : '%d sekunder',
-            m : 'en minut',
-            mm : '%d minuter',
-            h : 'en timme',
-            hh : '%d timmar',
-            d : 'en dag',
-            dd : '%d dagar',
-            M : 'en månad',
-            MM : '%d månader',
-            y : 'ett år',
-            yy : '%d år'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(e|a)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (~~(number % 100 / 10) === 1) ? 'e' :
-                (b === 1) ? 'a' :
-                (b === 2) ? 'a' :
-                (b === 3) ? 'e' : 'e';
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('sw', {
-        months : 'Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba'.split('_'),
-        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des'.split('_'),
-        weekdays : 'Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi'.split('_'),
-        weekdaysShort : 'Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos'.split('_'),
-        weekdaysMin : 'J2_J3_J4_J5_Al_Ij_J1'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[leo saa] LT',
-            nextDay : '[kesho saa] LT',
-            nextWeek : '[wiki ijayo] dddd [saat] LT',
-            lastDay : '[jana] LT',
-            lastWeek : '[wiki iliyopita] dddd [saat] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s baadaye',
-            past : 'tokea %s',
-            s : 'hivi punde',
-            ss : 'sekunde %d',
-            m : 'dakika moja',
-            mm : 'dakika %d',
-            h : 'saa limoja',
-            hh : 'masaa %d',
-            d : 'siku moja',
-            dd : 'masiku %d',
-            M : 'mwezi mmoja',
-            MM : 'miezi %d',
-            y : 'mwaka mmoja',
-            yy : 'miaka %d'
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var symbolMap$f = {
-        '1': '௧',
-        '2': '௨',
-        '3': '௩',
-        '4': '௪',
-        '5': '௫',
-        '6': '௬',
-        '7': '௭',
-        '8': '௮',
-        '9': '௯',
-        '0': '௦'
-    }, numberMap$e = {
-        '௧': '1',
-        '௨': '2',
-        '௩': '3',
-        '௪': '4',
-        '௫': '5',
-        '௬': '6',
-        '௭': '7',
-        '௮': '8',
-        '௯': '9',
-        '௦': '0'
-    };
-
-    hooks.defineLocale('ta', {
-        months : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
-        monthsShort : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
-        weekdays : 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'),
-        weekdaysShort : 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'),
-        weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY, HH:mm',
-            LLLL : 'dddd, D MMMM YYYY, HH:mm'
-        },
-        calendar : {
-            sameDay : '[இன்று] LT',
-            nextDay : '[நாளை] LT',
-            nextWeek : 'dddd, LT',
-            lastDay : '[நேற்று] LT',
-            lastWeek : '[கடந்த வாரம்] dddd, LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s இல்',
-            past : '%s முன்',
-            s : 'ஒரு சில விநாடிகள்',
-            ss : '%d விநாடிகள்',
-            m : 'ஒரு நிமிடம்',
-            mm : '%d நிமிடங்கள்',
-            h : 'ஒரு மணி நேரம்',
-            hh : '%d மணி நேரம்',
-            d : 'ஒரு நாள்',
-            dd : '%d நாட்கள்',
-            M : 'ஒரு மாதம்',
-            MM : '%d மாதங்கள்',
-            y : 'ஒரு வருடம்',
-            yy : '%d ஆண்டுகள்'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}வது/,
-        ordinal : function (number) {
-            return number + 'வது';
-        },
-        preparse: function (string) {
-            return string.replace(/[௧௨௩௪௫௬௭௮௯௦]/g, function (match) {
-                return numberMap$e[match];
-            });
-        },
-        postformat: function (string) {
-            return string.replace(/\d/g, function (match) {
-                return symbolMap$f[match];
-            });
-        },
-        // refer http://ta.wikipedia.org/s/1er1
-        meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 2) {
-                return ' யாமம்';
-            } else if (hour < 6) {
-                return ' வைகறை';  // வைகறை
-            } else if (hour < 10) {
-                return ' காலை'; // காலை
-            } else if (hour < 14) {
-                return ' நண்பகல்'; // நண்பகல்
-            } else if (hour < 18) {
-                return ' எற்பாடு'; // எற்பாடு
-            } else if (hour < 22) {
-                return ' மாலை'; // மாலை
-            } else {
-                return ' யாமம்';
-            }
-        },
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'யாமம்') {
-                return hour < 2 ? hour : hour + 12;
-            } else if (meridiem === 'வைகறை' || meridiem === 'காலை') {
-                return hour;
-            } else if (meridiem === 'நண்பகல்') {
-                return hour >= 10 ? hour : hour + 12;
-            } else {
-                return hour + 12;
-            }
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 6  // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('te', {
-        months : 'జనవరి_ఫిబ్రవరి_మార్చి_ఏప్రిల్_మే_జూన్_జూలై_ఆగస్టు_సెప్టెంబర్_అక్టోబర్_నవంబర్_డిసెంబర్'.split('_'),
-        monthsShort : 'జన._ఫిబ్ర._మార్చి_ఏప్రి._మే_జూన్_జూలై_ఆగ._సెప్._అక్టో._నవ._డిసె.'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'ఆదివారం_సోమవారం_మంగళవారం_బుధవారం_గురువారం_శుక్రవారం_శనివారం'.split('_'),
-        weekdaysShort : 'ఆది_సోమ_మంగళ_బుధ_గురు_శుక్ర_శని'.split('_'),
-        weekdaysMin : 'ఆ_సో_మం_బు_గు_శు_శ'.split('_'),
-        longDateFormat : {
-            LT : 'A h:mm',
-            LTS : 'A h:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY, A h:mm',
-            LLLL : 'dddd, D MMMM YYYY, A h:mm'
-        },
-        calendar : {
-            sameDay : '[నేడు] LT',
-            nextDay : '[రేపు] LT',
-            nextWeek : 'dddd, LT',
-            lastDay : '[నిన్న] LT',
-            lastWeek : '[గత] dddd, LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s లో',
-            past : '%s క్రితం',
-            s : 'కొన్ని క్షణాలు',
-            ss : '%d సెకన్లు',
-            m : 'ఒక నిమిషం',
-            mm : '%d నిమిషాలు',
-            h : 'ఒక గంట',
-            hh : '%d గంటలు',
-            d : 'ఒక రోజు',
-            dd : '%d రోజులు',
-            M : 'ఒక నెల',
-            MM : '%d నెలలు',
-            y : 'ఒక సంవత్సరం',
-            yy : '%d సంవత్సరాలు'
-        },
-        dayOfMonthOrdinalParse : /\d{1,2}వ/,
-        ordinal : '%dవ',
-        meridiemParse: /రాత్రి|ఉదయం|మధ్యాహ్నం|సాయంత్రం/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'రాత్రి') {
-                return hour < 4 ? hour : hour + 12;
-            } else if (meridiem === 'ఉదయం') {
-                return hour;
-            } else if (meridiem === 'మధ్యాహ్నం') {
-                return hour >= 10 ? hour : hour + 12;
-            } else if (meridiem === 'సాయంత్రం') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'రాత్రి';
-            } else if (hour < 10) {
-                return 'ఉదయం';
-            } else if (hour < 17) {
-                return 'మధ్యాహ్నం';
-            } else if (hour < 20) {
-                return 'సాయంత్రం';
-            } else {
-                return 'రాత్రి';
-            }
-        },
-        week : {
-            dow : 0, // Sunday is the first day of the week.
-            doy : 6  // The week that contains Jan 6th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('tet', {
-        months : 'Janeiru_Fevereiru_Marsu_Abril_Maiu_Juñu_Jullu_Agustu_Setembru_Outubru_Novembru_Dezembru'.split('_'),
-        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
-        weekdays : 'Domingu_Segunda_Tersa_Kuarta_Kinta_Sesta_Sabadu'.split('_'),
-        weekdaysShort : 'Dom_Seg_Ters_Kua_Kint_Sest_Sab'.split('_'),
-        weekdaysMin : 'Do_Seg_Te_Ku_Ki_Ses_Sa'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[Ohin iha] LT',
-            nextDay: '[Aban iha] LT',
-            nextWeek: 'dddd [iha] LT',
-            lastDay: '[Horiseik iha] LT',
-            lastWeek: 'dddd [semana kotuk] [iha] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'iha %s',
-            past : '%s liuba',
-            s : 'minutu balun',
-            ss : 'minutu %d',
-            m : 'minutu ida',
-            mm : 'minutu %d',
-            h : 'oras ida',
-            hh : 'oras %d',
-            d : 'loron ida',
-            dd : 'loron %d',
-            M : 'fulan ida',
-            MM : 'fulan %d',
-            y : 'tinan ida',
-            yy : 'tinan %d'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (~~(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var suffixes$3 = {
-        0: '-ум',
-        1: '-ум',
-        2: '-юм',
-        3: '-юм',
-        4: '-ум',
-        5: '-ум',
-        6: '-ум',
-        7: '-ум',
-        8: '-ум',
-        9: '-ум',
-        10: '-ум',
-        12: '-ум',
-        13: '-ум',
-        20: '-ум',
-        30: '-юм',
-        40: '-ум',
-        50: '-ум',
-        60: '-ум',
-        70: '-ум',
-        80: '-ум',
-        90: '-ум',
-        100: '-ум'
-    };
-
-    hooks.defineLocale('tg', {
-        months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),
-        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
-        weekdays : 'якшанбе_душанбе_сешанбе_чоршанбе_панҷшанбе_ҷумъа_шанбе'.split('_'),
-        weekdaysShort : 'яшб_дшб_сшб_чшб_пшб_ҷум_шнб'.split('_'),
-        weekdaysMin : 'яш_дш_сш_чш_пш_ҷм_шб'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[Имрӯз соати] LT',
-            nextDay : '[Пагоҳ соати] LT',
-            lastDay : '[Дирӯз соати] LT',
-            nextWeek : 'dddd[и] [ҳафтаи оянда соати] LT',
-            lastWeek : 'dddd[и] [ҳафтаи гузашта соати] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'баъди %s',
-            past : '%s пеш',
-            s : 'якчанд сония',
-            m : 'як дақиқа',
-            mm : '%d дақиқа',
-            h : 'як соат',
-            hh : '%d соат',
-            d : 'як рӯз',
-            dd : '%d рӯз',
-            M : 'як моҳ',
-            MM : '%d моҳ',
-            y : 'як сол',
-            yy : '%d сол'
-        },
-        meridiemParse: /шаб|субҳ|рӯз|бегоҳ/,
-        meridiemHour: function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === 'шаб') {
-                return hour < 4 ? hour : hour + 12;
-            } else if (meridiem === 'субҳ') {
-                return hour;
-            } else if (meridiem === 'рӯз') {
-                return hour >= 11 ? hour : hour + 12;
-            } else if (meridiem === 'бегоҳ') {
-                return hour + 12;
-            }
-        },
-        meridiem: function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'шаб';
-            } else if (hour < 11) {
-                return 'субҳ';
-            } else if (hour < 16) {
-                return 'рӯз';
-            } else if (hour < 19) {
-                return 'бегоҳ';
-            } else {
-                return 'шаб';
-            }
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}-(ум|юм)/,
-        ordinal: function (number) {
-            var a = number % 10,
-                b = number >= 100 ? 100 : null;
-            return number + (suffixes$3[number] || suffixes$3[a] || suffixes$3[b]);
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 1th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('th', {
-        months : 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'),
-        monthsShort : 'ม.ค._ก.พ._มี.ค._เม.ย._พ.ค._มิ.ย._ก.ค._ส.ค._ก.ย._ต.ค._พ.ย._ธ.ค.'.split('_'),
-        monthsParseExact: true,
-        weekdays : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'),
-        weekdaysShort : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'), // yes, three characters difference
-        weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'H:mm',
-            LTS : 'H:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY เวลา H:mm',
-            LLLL : 'วันddddที่ D MMMM YYYY เวลา H:mm'
-        },
-        meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,
-        isPM: function (input) {
-            return input === 'หลังเที่ยง';
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'ก่อนเที่ยง';
-            } else {
-                return 'หลังเที่ยง';
-            }
-        },
-        calendar : {
-            sameDay : '[วันนี้ เวลา] LT',
-            nextDay : '[พรุ่งนี้ เวลา] LT',
-            nextWeek : 'dddd[หน้า เวลา] LT',
-            lastDay : '[เมื่อวานนี้ เวลา] LT',
-            lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'อีก %s',
-            past : '%sที่แล้ว',
-            s : 'ไม่กี่วินาที',
-            ss : '%d วินาที',
-            m : '1 นาที',
-            mm : '%d นาที',
-            h : '1 ชั่วโมง',
-            hh : '%d ชั่วโมง',
-            d : '1 วัน',
-            dd : '%d วัน',
-            M : '1 เดือน',
-            MM : '%d เดือน',
-            y : '1 ปี',
-            yy : '%d ปี'
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('tl-ph', {
-        months : 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'),
-        monthsShort : 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'),
-        weekdays : 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'),
-        weekdaysShort : 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'),
-        weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'MM/D/YYYY',
-            LL : 'MMMM D, YYYY',
-            LLL : 'MMMM D, YYYY HH:mm',
-            LLLL : 'dddd, MMMM DD, YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: 'LT [ngayong araw]',
-            nextDay: '[Bukas ng] LT',
-            nextWeek: 'LT [sa susunod na] dddd',
-            lastDay: 'LT [kahapon]',
-            lastWeek: 'LT [noong nakaraang] dddd',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'sa loob ng %s',
-            past : '%s ang nakalipas',
-            s : 'ilang segundo',
-            ss : '%d segundo',
-            m : 'isang minuto',
-            mm : '%d minuto',
-            h : 'isang oras',
-            hh : '%d oras',
-            d : 'isang araw',
-            dd : '%d araw',
-            M : 'isang buwan',
-            MM : '%d buwan',
-            y : 'isang taon',
-            yy : '%d taon'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}/,
-        ordinal : function (number) {
-            return number;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var numbersNouns = 'pagh_wa’_cha’_wej_loS_vagh_jav_Soch_chorgh_Hut'.split('_');
-
-    function translateFuture(output) {
-        var time = output;
-        time = (output.indexOf('jaj') !== -1) ?
-        time.slice(0, -3) + 'leS' :
-        (output.indexOf('jar') !== -1) ?
-        time.slice(0, -3) + 'waQ' :
-        (output.indexOf('DIS') !== -1) ?
-        time.slice(0, -3) + 'nem' :
-        time + ' pIq';
-        return time;
-    }
-
-    function translatePast(output) {
-        var time = output;
-        time = (output.indexOf('jaj') !== -1) ?
-        time.slice(0, -3) + 'Hu’' :
-        (output.indexOf('jar') !== -1) ?
-        time.slice(0, -3) + 'wen' :
-        (output.indexOf('DIS') !== -1) ?
-        time.slice(0, -3) + 'ben' :
-        time + ' ret';
-        return time;
-    }
-
-    function translate$a(number, withoutSuffix, string, isFuture) {
-        var numberNoun = numberAsNoun(number);
-        switch (string) {
-            case 'ss':
-                return numberNoun + ' lup';
-            case 'mm':
-                return numberNoun + ' tup';
-            case 'hh':
-                return numberNoun + ' rep';
-            case 'dd':
-                return numberNoun + ' jaj';
-            case 'MM':
-                return numberNoun + ' jar';
-            case 'yy':
-                return numberNoun + ' DIS';
-        }
-    }
-
-    function numberAsNoun(number) {
-        var hundred = Math.floor((number % 1000) / 100),
-        ten = Math.floor((number % 100) / 10),
-        one = number % 10,
-        word = '';
-        if (hundred > 0) {
-            word += numbersNouns[hundred] + 'vatlh';
-        }
-        if (ten > 0) {
-            word += ((word !== '') ? ' ' : '') + numbersNouns[ten] + 'maH';
-        }
-        if (one > 0) {
-            word += ((word !== '') ? ' ' : '') + numbersNouns[one];
-        }
-        return (word === '') ? 'pagh' : word;
-    }
-
-    hooks.defineLocale('tlh', {
-        months : 'tera’ jar wa’_tera’ jar cha’_tera’ jar wej_tera’ jar loS_tera’ jar vagh_tera’ jar jav_tera’ jar Soch_tera’ jar chorgh_tera’ jar Hut_tera’ jar wa’maH_tera’ jar wa’maH wa’_tera’ jar wa’maH cha’'.split('_'),
-        monthsShort : 'jar wa’_jar cha’_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa’maH_jar wa’maH wa’_jar wa’maH cha’'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
-        weekdaysShort : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
-        weekdaysMin : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[DaHjaj] LT',
-            nextDay: '[wa’leS] LT',
-            nextWeek: 'LLL',
-            lastDay: '[wa’Hu’] LT',
-            lastWeek: 'LLL',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : translateFuture,
-            past : translatePast,
-            s : 'puS lup',
-            ss : translate$a,
-            m : 'wa’ tup',
-            mm : translate$a,
-            h : 'wa’ rep',
-            hh : translate$a,
-            d : 'wa’ jaj',
-            dd : translate$a,
-            M : 'wa’ jar',
-            MM : translate$a,
-            y : 'wa’ DIS',
-            yy : translate$a
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    var suffixes$4 = {
-        1: '\'inci',
-        5: '\'inci',
-        8: '\'inci',
-        70: '\'inci',
-        80: '\'inci',
-        2: '\'nci',
-        7: '\'nci',
-        20: '\'nci',
-        50: '\'nci',
-        3: '\'üncü',
-        4: '\'üncü',
-        100: '\'üncü',
-        6: '\'ncı',
-        9: '\'uncu',
-        10: '\'uncu',
-        30: '\'uncu',
-        60: '\'ıncı',
-        90: '\'ıncı'
-    };
-
-    hooks.defineLocale('tr', {
-        months : 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'),
-        monthsShort : 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'),
-        weekdays : 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'),
-        weekdaysShort : 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),
-        weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[bugün saat] LT',
-            nextDay : '[yarın saat] LT',
-            nextWeek : '[gelecek] dddd [saat] LT',
-            lastDay : '[dün] LT',
-            lastWeek : '[geçen] dddd [saat] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s sonra',
-            past : '%s önce',
-            s : 'birkaç saniye',
-            ss : '%d saniye',
-            m : 'bir dakika',
-            mm : '%d dakika',
-            h : 'bir saat',
-            hh : '%d saat',
-            d : 'bir gün',
-            dd : '%d gün',
-            M : 'bir ay',
-            MM : '%d ay',
-            y : 'bir yıl',
-            yy : '%d yıl'
-        },
-        ordinal: function (number, period) {
-            switch (period) {
-                case 'd':
-                case 'D':
-                case 'Do':
-                case 'DD':
-                    return number;
-                default:
-                    if (number === 0) {  // special case for zero
-                        return number + '\'ıncı';
-                    }
-                    var a = number % 10,
-                        b = number % 100 - a,
-                        c = number >= 100 ? 100 : null;
-                    return number + (suffixes$4[a] || suffixes$4[b] || suffixes$4[c]);
-            }
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    // After the year there should be a slash and the amount of years since December 26, 1979 in Roman numerals.
-    // This is currently too difficult (maybe even impossible) to add.
-    hooks.defineLocale('tzl', {
-        months : 'Januar_Fevraglh_Març_Avrïu_Mai_Gün_Julia_Guscht_Setemvar_Listopäts_Noemvar_Zecemvar'.split('_'),
-        monthsShort : 'Jan_Fev_Mar_Avr_Mai_Gün_Jul_Gus_Set_Lis_Noe_Zec'.split('_'),
-        weekdays : 'Súladi_Lúneçi_Maitzi_Márcuri_Xhúadi_Viénerçi_Sáturi'.split('_'),
-        weekdaysShort : 'Súl_Lún_Mai_Már_Xhú_Vié_Sát'.split('_'),
-        weekdaysMin : 'Sú_Lú_Ma_Má_Xh_Vi_Sá'.split('_'),
-        longDateFormat : {
-            LT : 'HH.mm',
-            LTS : 'HH.mm.ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D. MMMM [dallas] YYYY',
-            LLL : 'D. MMMM [dallas] YYYY HH.mm',
-            LLLL : 'dddd, [li] D. MMMM [dallas] YYYY HH.mm'
-        },
-        meridiemParse: /d\'o|d\'a/i,
-        isPM : function (input) {
-            return 'd\'o' === input.toLowerCase();
-        },
-        meridiem : function (hours, minutes, isLower) {
-            if (hours > 11) {
-                return isLower ? 'd\'o' : 'D\'O';
-            } else {
-                return isLower ? 'd\'a' : 'D\'A';
-            }
-        },
-        calendar : {
-            sameDay : '[oxhi à] LT',
-            nextDay : '[demà à] LT',
-            nextWeek : 'dddd [à] LT',
-            lastDay : '[ieiri à] LT',
-            lastWeek : '[sür el] dddd [lasteu à] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'osprei %s',
-            past : 'ja%s',
-            s : processRelativeTime$7,
-            ss : processRelativeTime$7,
-            m : processRelativeTime$7,
-            mm : processRelativeTime$7,
-            h : processRelativeTime$7,
-            hh : processRelativeTime$7,
-            d : processRelativeTime$7,
-            dd : processRelativeTime$7,
-            M : processRelativeTime$7,
-            MM : processRelativeTime$7,
-            y : processRelativeTime$7,
-            yy : processRelativeTime$7
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}\./,
-        ordinal : '%d.',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    function processRelativeTime$7(number, withoutSuffix, key, isFuture) {
-        var format = {
-            's': ['viensas secunds', '\'iensas secunds'],
-            'ss': [number + ' secunds', '' + number + ' secunds'],
-            'm': ['\'n míut', '\'iens míut'],
-            'mm': [number + ' míuts', '' + number + ' míuts'],
-            'h': ['\'n þora', '\'iensa þora'],
-            'hh': [number + ' þoras', '' + number + ' þoras'],
-            'd': ['\'n ziua', '\'iensa ziua'],
-            'dd': [number + ' ziuas', '' + number + ' ziuas'],
-            'M': ['\'n mes', '\'iens mes'],
-            'MM': [number + ' mesen', '' + number + ' mesen'],
-            'y': ['\'n ar', '\'iens ar'],
-            'yy': [number + ' ars', '' + number + ' ars']
-        };
-        return isFuture ? format[key][0] : (withoutSuffix ? format[key][0] : format[key][1]);
-    }
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('tzm-latn', {
-        months : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
-        monthsShort : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
-        weekdays : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
-        weekdaysShort : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
-        weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[asdkh g] LT',
-            nextDay: '[aska g] LT',
-            nextWeek: 'dddd [g] LT',
-            lastDay: '[assant g] LT',
-            lastWeek: 'dddd [g] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'dadkh s yan %s',
-            past : 'yan %s',
-            s : 'imik',
-            ss : '%d imik',
-            m : 'minuḍ',
-            mm : '%d minuḍ',
-            h : 'saɛa',
-            hh : '%d tassaɛin',
-            d : 'ass',
-            dd : '%d ossan',
-            M : 'ayowr',
-            MM : '%d iyyirn',
-            y : 'asgas',
-            yy : '%d isgasn'
-        },
-        week : {
-            dow : 6, // Saturday is the first day of the week.
-            doy : 12  // The week that contains Jan 12th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('tzm', {
-        months : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
-        monthsShort : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
-        weekdays : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
-        weekdaysShort : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
-        weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS: 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[ⴰⵙⴷⵅ ⴴ] LT',
-            nextDay: '[ⴰⵙⴽⴰ ⴴ] LT',
-            nextWeek: 'dddd [ⴴ] LT',
-            lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT',
-            lastWeek: 'dddd [ⴴ] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s',
-            past : 'ⵢⴰⵏ %s',
-            s : 'ⵉⵎⵉⴽ',
-            ss : '%d ⵉⵎⵉⴽ',
-            m : 'ⵎⵉⵏⵓⴺ',
-            mm : '%d ⵎⵉⵏⵓⴺ',
-            h : 'ⵙⴰⵄⴰ',
-            hh : '%d ⵜⴰⵙⵙⴰⵄⵉⵏ',
-            d : 'ⴰⵙⵙ',
-            dd : '%d oⵙⵙⴰⵏ',
-            M : 'ⴰⵢoⵓⵔ',
-            MM : '%d ⵉⵢⵢⵉⵔⵏ',
-            y : 'ⴰⵙⴳⴰⵙ',
-            yy : '%d ⵉⵙⴳⴰⵙⵏ'
-        },
-        week : {
-            dow : 6, // Saturday is the first day of the week.
-            doy : 12  // The week that contains Jan 12th is the first week of the year.
-        }
-    });
-
-    //! moment.js language configuration
-
-    hooks.defineLocale('ug-cn', {
-        months: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split(
-            '_'
-        ),
-        monthsShort: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split(
-            '_'
-        ),
-        weekdays: 'يەكشەنبە_دۈشەنبە_سەيشەنبە_چارشەنبە_پەيشەنبە_جۈمە_شەنبە'.split(
-            '_'
-        ),
-        weekdaysShort: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),
-        weekdaysMin: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),
-        longDateFormat: {
-            LT: 'HH:mm',
-            LTS: 'HH:mm:ss',
-            L: 'YYYY-MM-DD',
-            LL: 'YYYY-يىلىM-ئاينىڭD-كۈنى',
-            LLL: 'YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm',
-            LLLL: 'dddd، YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm'
-        },
-        meridiemParse: /يېرىم كېچە|سەھەر|چۈشتىن بۇرۇن|چۈش|چۈشتىن كېيىن|كەچ/,
-        meridiemHour: function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (
-                meridiem === 'يېرىم كېچە' ||
-                meridiem === 'سەھەر' ||
-                meridiem === 'چۈشتىن بۇرۇن'
-            ) {
-                return hour;
-            } else if (meridiem === 'چۈشتىن كېيىن' || meridiem === 'كەچ') {
-                return hour + 12;
-            } else {
-                return hour >= 11 ? hour : hour + 12;
-            }
-        },
-        meridiem: function (hour, minute, isLower) {
-            var hm = hour * 100 + minute;
-            if (hm < 600) {
-                return 'يېرىم كېچە';
-            } else if (hm < 900) {
-                return 'سەھەر';
-            } else if (hm < 1130) {
-                return 'چۈشتىن بۇرۇن';
-            } else if (hm < 1230) {
-                return 'چۈش';
-            } else if (hm < 1800) {
-                return 'چۈشتىن كېيىن';
-            } else {
-                return 'كەچ';
-            }
-        },
-        calendar: {
-            sameDay: '[بۈگۈن سائەت] LT',
-            nextDay: '[ئەتە سائەت] LT',
-            nextWeek: '[كېلەركى] dddd [سائەت] LT',
-            lastDay: '[تۆنۈگۈن] LT',
-            lastWeek: '[ئالدىنقى] dddd [سائەت] LT',
-            sameElse: 'L'
-        },
-        relativeTime: {
-            future: '%s كېيىن',
-            past: '%s بۇرۇن',
-            s: 'نەچچە سېكونت',
-            ss: '%d سېكونت',
-            m: 'بىر مىنۇت',
-            mm: '%d مىنۇت',
-            h: 'بىر سائەت',
-            hh: '%d سائەت',
-            d: 'بىر كۈن',
-            dd: '%d كۈن',
-            M: 'بىر ئاي',
-            MM: '%d ئاي',
-            y: 'بىر يىل',
-            yy: '%d يىل'
-        },
-
-        dayOfMonthOrdinalParse: /\d{1,2}(-كۈنى|-ئاي|-ھەپتە)/,
-        ordinal: function (number, period) {
-            switch (period) {
-                case 'd':
-                case 'D':
-                case 'DDD':
-                    return number + '-كۈنى';
-                case 'w':
-                case 'W':
-                    return number + '-ھەپتە';
-                default:
-                    return number;
-            }
-        },
-        preparse: function (string) {
-            return string.replace(/،/g, ',');
-        },
-        postformat: function (string) {
-            return string.replace(/,/g, '،');
-        },
-        week: {
-            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
-            dow: 1, // Monday is the first day of the week.
-            doy: 7 // The week that contains Jan 1st is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    function plural$6(word, num) {
-        var forms = word.split('_');
-        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
-    }
-    function relativeTimeWithPlural$4(number, withoutSuffix, key) {
-        var format = {
-            'ss': withoutSuffix ? 'секунда_секунди_секунд' : 'секунду_секунди_секунд',
-            'mm': withoutSuffix ? 'хвилина_хвилини_хвилин' : 'хвилину_хвилини_хвилин',
-            'hh': withoutSuffix ? 'година_години_годин' : 'годину_години_годин',
-            'dd': 'день_дні_днів',
-            'MM': 'місяць_місяці_місяців',
-            'yy': 'рік_роки_років'
-        };
-        if (key === 'm') {
-            return withoutSuffix ? 'хвилина' : 'хвилину';
-        }
-        else if (key === 'h') {
-            return withoutSuffix ? 'година' : 'годину';
-        }
-        else {
-            return number + ' ' + plural$6(format[key], +number);
-        }
-    }
-    function weekdaysCaseReplace(m, format) {
-        var weekdays = {
-            'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'),
-            'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'),
-            'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_')
-        };
-
-        if (!m) {
-            return weekdays['nominative'];
-        }
-
-        var nounCase = (/(\[[ВвУу]\]) ?dddd/).test(format) ?
-            'accusative' :
-            ((/\[?(?:минулої|наступної)? ?\] ?dddd/).test(format) ?
-                'genitive' :
-                'nominative');
-        return weekdays[nounCase][m.day()];
-    }
-    function processHoursFunction(str) {
-        return function () {
-            return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT';
-        };
-    }
-
-    hooks.defineLocale('uk', {
-        months : {
-            'format': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_'),
-            'standalone': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_')
-        },
-        monthsShort : 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'),
-        weekdays : weekdaysCaseReplace,
-        weekdaysShort : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
-        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD.MM.YYYY',
-            LL : 'D MMMM YYYY р.',
-            LLL : 'D MMMM YYYY р., HH:mm',
-            LLLL : 'dddd, D MMMM YYYY р., HH:mm'
-        },
-        calendar : {
-            sameDay: processHoursFunction('[Сьогодні '),
-            nextDay: processHoursFunction('[Завтра '),
-            lastDay: processHoursFunction('[Вчора '),
-            nextWeek: processHoursFunction('[У] dddd ['),
-            lastWeek: function () {
-                switch (this.day()) {
-                    case 0:
-                    case 3:
-                    case 5:
-                    case 6:
-                        return processHoursFunction('[Минулої] dddd [').call(this);
-                    case 1:
-                    case 2:
-                    case 4:
-                        return processHoursFunction('[Минулого] dddd [').call(this);
-                }
-            },
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : 'за %s',
-            past : '%s тому',
-            s : 'декілька секунд',
-            ss : relativeTimeWithPlural$4,
-            m : relativeTimeWithPlural$4,
-            mm : relativeTimeWithPlural$4,
-            h : 'годину',
-            hh : relativeTimeWithPlural$4,
-            d : 'день',
-            dd : relativeTimeWithPlural$4,
-            M : 'місяць',
-            MM : relativeTimeWithPlural$4,
-            y : 'рік',
-            yy : relativeTimeWithPlural$4
-        },
-        // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason
-        meridiemParse: /ночі|ранку|дня|вечора/,
-        isPM: function (input) {
-            return /^(дня|вечора)$/.test(input);
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 4) {
-                return 'ночі';
-            } else if (hour < 12) {
-                return 'ранку';
-            } else if (hour < 17) {
-                return 'дня';
-            } else {
-                return 'вечора';
-            }
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}-(й|го)/,
-        ordinal: function (number, period) {
-            switch (period) {
-                case 'M':
-                case 'd':
-                case 'DDD':
-                case 'w':
-                case 'W':
-                    return number + '-й';
-                case 'D':
-                    return number + '-го';
-                default:
-                    return number;
-            }
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    var months$9 = [
-        'جنوری',
-        'فروری',
-        'مارچ',
-        'اپریل',
-        'مئی',
-        'جون',
-        'جولائی',
-        'اگست',
-        'ستمبر',
-        'اکتوبر',
-        'نومبر',
-        'دسمبر'
-    ];
-    var days$2 = [
-        'اتوار',
-        'پیر',
-        'منگل',
-        'بدھ',
-        'جمعرات',
-        'جمعہ',
-        'ہفتہ'
-    ];
-
-    hooks.defineLocale('ur', {
-        months : months$9,
-        monthsShort : months$9,
-        weekdays : days$2,
-        weekdaysShort : days$2,
-        weekdaysMin : days$2,
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd، D MMMM YYYY HH:mm'
-        },
-        meridiemParse: /صبح|شام/,
-        isPM : function (input) {
-            return 'شام' === input;
-        },
-        meridiem : function (hour, minute, isLower) {
-            if (hour < 12) {
-                return 'صبح';
-            }
-            return 'شام';
-        },
-        calendar : {
-            sameDay : '[آج بوقت] LT',
-            nextDay : '[کل بوقت] LT',
-            nextWeek : 'dddd [بوقت] LT',
-            lastDay : '[گذشتہ روز بوقت] LT',
-            lastWeek : '[گذشتہ] dddd [بوقت] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : '%s بعد',
-            past : '%s قبل',
-            s : 'چند سیکنڈ',
-            ss : '%d سیکنڈ',
-            m : 'ایک منٹ',
-            mm : '%d منٹ',
-            h : 'ایک گھنٹہ',
-            hh : '%d گھنٹے',
-            d : 'ایک دن',
-            dd : '%d دن',
-            M : 'ایک ماہ',
-            MM : '%d ماہ',
-            y : 'ایک سال',
-            yy : '%d سال'
-        },
-        preparse: function (string) {
-            return string.replace(/،/g, ',');
-        },
-        postformat: function (string) {
-            return string.replace(/,/g, '،');
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('uz-latn', {
-        months : 'Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr'.split('_'),
-        monthsShort : 'Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek'.split('_'),
-        weekdays : 'Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba'.split('_'),
-        weekdaysShort : 'Yak_Dush_Sesh_Chor_Pay_Jum_Shan'.split('_'),
-        weekdaysMin : 'Ya_Du_Se_Cho_Pa_Ju_Sha'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'D MMMM YYYY, dddd HH:mm'
-        },
-        calendar : {
-            sameDay : '[Bugun soat] LT [da]',
-            nextDay : '[Ertaga] LT [da]',
-            nextWeek : 'dddd [kuni soat] LT [da]',
-            lastDay : '[Kecha soat] LT [da]',
-            lastWeek : '[O\'tgan] dddd [kuni soat] LT [da]',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'Yaqin %s ichida',
-            past : 'Bir necha %s oldin',
-            s : 'soniya',
-            ss : '%d soniya',
-            m : 'bir daqiqa',
-            mm : '%d daqiqa',
-            h : 'bir soat',
-            hh : '%d soat',
-            d : 'bir kun',
-            dd : '%d kun',
-            M : 'bir oy',
-            MM : '%d oy',
-            y : 'bir yil',
-            yy : '%d yil'
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 7th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('uz', {
-        months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),
-        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
-        weekdays : 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'),
-        weekdaysShort : 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'),
-        weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'D MMMM YYYY, dddd HH:mm'
-        },
-        calendar : {
-            sameDay : '[Бугун соат] LT [да]',
-            nextDay : '[Эртага] LT [да]',
-            nextWeek : 'dddd [куни соат] LT [да]',
-            lastDay : '[Кеча соат] LT [да]',
-            lastWeek : '[Утган] dddd [куни соат] LT [да]',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'Якин %s ичида',
-            past : 'Бир неча %s олдин',
-            s : 'фурсат',
-            ss : '%d фурсат',
-            m : 'бир дакика',
-            mm : '%d дакика',
-            h : 'бир соат',
-            hh : '%d соат',
-            d : 'бир кун',
-            dd : '%d кун',
-            M : 'бир ой',
-            MM : '%d ой',
-            y : 'бир йил',
-            yy : '%d йил'
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 7  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('vi', {
-        months : 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'),
-        monthsShort : 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'),
-        weekdaysShort : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
-        weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
-        weekdaysParseExact : true,
-        meridiemParse: /sa|ch/i,
-        isPM : function (input) {
-            return /^ch$/i.test(input);
-        },
-        meridiem : function (hours, minutes, isLower) {
-            if (hours < 12) {
-                return isLower ? 'sa' : 'SA';
-            } else {
-                return isLower ? 'ch' : 'CH';
-            }
-        },
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM [năm] YYYY',
-            LLL : 'D MMMM [năm] YYYY HH:mm',
-            LLLL : 'dddd, D MMMM [năm] YYYY HH:mm',
-            l : 'DD/M/YYYY',
-            ll : 'D MMM YYYY',
-            lll : 'D MMM YYYY HH:mm',
-            llll : 'ddd, D MMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay: '[Hôm nay lúc] LT',
-            nextDay: '[Ngày mai lúc] LT',
-            nextWeek: 'dddd [tuần tới lúc] LT',
-            lastDay: '[Hôm qua lúc] LT',
-            lastWeek: 'dddd [tuần rồi lúc] LT',
-            sameElse: 'L'
-        },
-        relativeTime : {
-            future : '%s tới',
-            past : '%s trước',
-            s : 'vài giây',
-            ss : '%d giây' ,
-            m : 'một phút',
-            mm : '%d phút',
-            h : 'một giờ',
-            hh : '%d giờ',
-            d : 'một ngày',
-            dd : '%d ngày',
-            M : 'một tháng',
-            MM : '%d tháng',
-            y : 'một năm',
-            yy : '%d năm'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}/,
-        ordinal : function (number) {
-            return number;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('x-pseudo', {
-        months : 'J~áñúá~rý_F~ébrú~árý_~Márc~h_Áp~ríl_~Máý_~Júñé~_Júl~ý_Áú~gúst~_Sép~témb~ér_Ó~ctób~ér_Ñ~óvém~bér_~Décé~mbér'.split('_'),
-        monthsShort : 'J~áñ_~Féb_~Már_~Ápr_~Máý_~Júñ_~Júl_~Áúg_~Sép_~Óct_~Ñóv_~Déc'.split('_'),
-        monthsParseExact : true,
-        weekdays : 'S~úñdá~ý_Mó~ñdáý~_Túé~sdáý~_Wéd~ñésd~áý_T~húrs~dáý_~Fríd~áý_S~átúr~dáý'.split('_'),
-        weekdaysShort : 'S~úñ_~Móñ_~Túé_~Wéd_~Thú_~Frí_~Sát'.split('_'),
-        weekdaysMin : 'S~ú_Mó~_Tú_~Wé_T~h_Fr~_Sá'.split('_'),
-        weekdaysParseExact : true,
-        longDateFormat : {
-            LT : 'HH:mm',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY HH:mm',
-            LLLL : 'dddd, D MMMM YYYY HH:mm'
-        },
-        calendar : {
-            sameDay : '[T~ódá~ý át] LT',
-            nextDay : '[T~ómó~rró~w át] LT',
-            nextWeek : 'dddd [át] LT',
-            lastDay : '[Ý~ést~érdá~ý át] LT',
-            lastWeek : '[L~ást] dddd [át] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'í~ñ %s',
-            past : '%s á~gó',
-            s : 'á ~féw ~sécó~ñds',
-            ss : '%d s~écóñ~ds',
-            m : 'á ~míñ~úté',
-            mm : '%d m~íñú~tés',
-            h : 'á~ñ hó~úr',
-            hh : '%d h~óúrs',
-            d : 'á ~dáý',
-            dd : '%d d~áýs',
-            M : 'á ~móñ~th',
-            MM : '%d m~óñt~hs',
-            y : 'á ~ýéár',
-            yy : '%d ý~éárs'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (~~(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        },
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('yo', {
-        months : 'Sẹ́rẹ́_Èrèlè_Ẹrẹ̀nà_Ìgbé_Èbibi_Òkùdu_Agẹmo_Ògún_Owewe_Ọ̀wàrà_Bélú_Ọ̀pẹ̀̀'.split('_'),
-        monthsShort : 'Sẹ́r_Èrl_Ẹrn_Ìgb_Èbi_Òkù_Agẹ_Ògú_Owe_Ọ̀wà_Bél_Ọ̀pẹ̀̀'.split('_'),
-        weekdays : 'Àìkú_Ajé_Ìsẹ́gun_Ọjọ́rú_Ọjọ́bọ_Ẹtì_Àbámẹ́ta'.split('_'),
-        weekdaysShort : 'Àìk_Ajé_Ìsẹ́_Ọjr_Ọjb_Ẹtì_Àbá'.split('_'),
-        weekdaysMin : 'Àì_Aj_Ìs_Ọr_Ọb_Ẹt_Àb'.split('_'),
-        longDateFormat : {
-            LT : 'h:mm A',
-            LTS : 'h:mm:ss A',
-            L : 'DD/MM/YYYY',
-            LL : 'D MMMM YYYY',
-            LLL : 'D MMMM YYYY h:mm A',
-            LLLL : 'dddd, D MMMM YYYY h:mm A'
-        },
-        calendar : {
-            sameDay : '[Ònì ni] LT',
-            nextDay : '[Ọ̀la ni] LT',
-            nextWeek : 'dddd [Ọsẹ̀ tón\'bọ] [ni] LT',
-            lastDay : '[Àna ni] LT',
-            lastWeek : 'dddd [Ọsẹ̀ tólọ́] [ni] LT',
-            sameElse : 'L'
-        },
-        relativeTime : {
-            future : 'ní %s',
-            past : '%s kọjá',
-            s : 'ìsẹjú aayá die',
-            ss :'aayá %d',
-            m : 'ìsẹjú kan',
-            mm : 'ìsẹjú %d',
-            h : 'wákati kan',
-            hh : 'wákati %d',
-            d : 'ọjọ́ kan',
-            dd : 'ọjọ́ %d',
-            M : 'osù kan',
-            MM : 'osù %d',
-            y : 'ọdún kan',
-            yy : 'ọdún %d'
-        },
-        dayOfMonthOrdinalParse : /ọjọ́\s\d{1,2}/,
-        ordinal : 'ọjọ́ %d',
-        week : {
-            dow : 1, // Monday is the first day of the week.
-            doy : 4 // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('zh-cn', {
-        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-        weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
-        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'YYYY/MM/DD',
-            LL : 'YYYY年M月D日',
-            LLL : 'YYYY年M月D日Ah点mm分',
-            LLLL : 'YYYY年M月D日ddddAh点mm分',
-            l : 'YYYY/M/D',
-            ll : 'YYYY年M月D日',
-            lll : 'YYYY年M月D日 HH:mm',
-            llll : 'YYYY年M月D日dddd HH:mm'
-        },
-        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-        meridiemHour: function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === '凌晨' || meridiem === '早上' ||
-                    meridiem === '上午') {
-                return hour;
-            } else if (meridiem === '下午' || meridiem === '晚上') {
-                return hour + 12;
-            } else {
-                // '中午'
-                return hour >= 11 ? hour : hour + 12;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            var hm = hour * 100 + minute;
-            if (hm < 600) {
-                return '凌晨';
-            } else if (hm < 900) {
-                return '早上';
-            } else if (hm < 1130) {
-                return '上午';
-            } else if (hm < 1230) {
-                return '中午';
-            } else if (hm < 1800) {
-                return '下午';
-            } else {
-                return '晚上';
-            }
-        },
-        calendar : {
-            sameDay : '[今天]LT',
-            nextDay : '[明天]LT',
-            nextWeek : '[下]ddddLT',
-            lastDay : '[昨天]LT',
-            lastWeek : '[上]ddddLT',
-            sameElse : 'L'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(日|月|周)/,
-        ordinal : function (number, period) {
-            switch (period) {
-                case 'd':
-                case 'D':
-                case 'DDD':
-                    return number + '日';
-                case 'M':
-                    return number + '月';
-                case 'w':
-                case 'W':
-                    return number + '周';
-                default:
-                    return number;
-            }
-        },
-        relativeTime : {
-            future : '%s内',
-            past : '%s前',
-            s : '几秒',
-            ss : '%d 秒',
-            m : '1 分钟',
-            mm : '%d 分钟',
-            h : '1 小时',
-            hh : '%d 小时',
-            d : '1 天',
-            dd : '%d 天',
-            M : '1 个月',
-            MM : '%d 个月',
-            y : '1 年',
-            yy : '%d 年'
-        },
-        week : {
-            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
-            dow : 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('zh-hk', {
-        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
-        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'YYYY/MM/DD',
-            LL : 'YYYY年M月D日',
-            LLL : 'YYYY年M月D日 HH:mm',
-            LLLL : 'YYYY年M月D日dddd HH:mm',
-            l : 'YYYY/M/D',
-            ll : 'YYYY年M月D日',
-            lll : 'YYYY年M月D日 HH:mm',
-            llll : 'YYYY年M月D日dddd HH:mm'
-        },
-        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {
-                return hour;
-            } else if (meridiem === '中午') {
-                return hour >= 11 ? hour : hour + 12;
-            } else if (meridiem === '下午' || meridiem === '晚上') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            var hm = hour * 100 + minute;
-            if (hm < 600) {
-                return '凌晨';
-            } else if (hm < 900) {
-                return '早上';
-            } else if (hm < 1130) {
-                return '上午';
-            } else if (hm < 1230) {
-                return '中午';
-            } else if (hm < 1800) {
-                return '下午';
-            } else {
-                return '晚上';
-            }
-        },
-        calendar : {
-            sameDay : '[今天]LT',
-            nextDay : '[明天]LT',
-            nextWeek : '[下]ddddLT',
-            lastDay : '[昨天]LT',
-            lastWeek : '[上]ddddLT',
-            sameElse : 'L'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
-        ordinal : function (number, period) {
-            switch (period) {
-                case 'd' :
-                case 'D' :
-                case 'DDD' :
-                    return number + '日';
-                case 'M' :
-                    return number + '月';
-                case 'w' :
-                case 'W' :
-                    return number + '週';
-                default :
-                    return number;
-            }
-        },
-        relativeTime : {
-            future : '%s內',
-            past : '%s前',
-            s : '幾秒',
-            ss : '%d 秒',
-            m : '1 分鐘',
-            mm : '%d 分鐘',
-            h : '1 小時',
-            hh : '%d 小時',
-            d : '1 天',
-            dd : '%d 天',
-            M : '1 個月',
-            MM : '%d 個月',
-            y : '1 年',
-            yy : '%d 年'
-        }
-    });
-
-    //! moment.js locale configuration
-
-    hooks.defineLocale('zh-tw', {
-        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
-        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
-        longDateFormat : {
-            LT : 'HH:mm',
-            LTS : 'HH:mm:ss',
-            L : 'YYYY/MM/DD',
-            LL : 'YYYY年M月D日',
-            LLL : 'YYYY年M月D日 HH:mm',
-            LLLL : 'YYYY年M月D日dddd HH:mm',
-            l : 'YYYY/M/D',
-            ll : 'YYYY年M月D日',
-            lll : 'YYYY年M月D日 HH:mm',
-            llll : 'YYYY年M月D日dddd HH:mm'
-        },
-        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-        meridiemHour : function (hour, meridiem) {
-            if (hour === 12) {
-                hour = 0;
-            }
-            if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {
-                return hour;
-            } else if (meridiem === '中午') {
-                return hour >= 11 ? hour : hour + 12;
-            } else if (meridiem === '下午' || meridiem === '晚上') {
-                return hour + 12;
-            }
-        },
-        meridiem : function (hour, minute, isLower) {
-            var hm = hour * 100 + minute;
-            if (hm < 600) {
-                return '凌晨';
-            } else if (hm < 900) {
-                return '早上';
-            } else if (hm < 1130) {
-                return '上午';
-            } else if (hm < 1230) {
-                return '中午';
-            } else if (hm < 1800) {
-                return '下午';
-            } else {
-                return '晚上';
-            }
-        },
-        calendar : {
-            sameDay : '[今天] LT',
-            nextDay : '[明天] LT',
-            nextWeek : '[下]dddd LT',
-            lastDay : '[昨天] LT',
-            lastWeek : '[上]dddd LT',
-            sameElse : 'L'
-        },
-        dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
-        ordinal : function (number, period) {
-            switch (period) {
-                case 'd' :
-                case 'D' :
-                case 'DDD' :
-                    return number + '日';
-                case 'M' :
-                    return number + '月';
-                case 'w' :
-                case 'W' :
-                    return number + '週';
-                default :
-                    return number;
-            }
-        },
-        relativeTime : {
-            future : '%s內',
-            past : '%s前',
-            s : '幾秒',
-            ss : '%d 秒',
-            m : '1 分鐘',
-            mm : '%d 分鐘',
-            h : '1 小時',
-            hh : '%d 小時',
-            d : '1 天',
-            dd : '%d 天',
-            M : '1 個月',
-            MM : '%d 個月',
-            y : '1 年',
-            yy : '%d 年'
-        }
-    });
-
-    hooks.locale('en');
-
-    return hooks;
-
-})));
diff --git a/app/webroot/js/moment.min.js b/app/webroot/js/moment.min.js
new file mode 100644
index 000000000..57cd2d4f3
--- /dev/null
+++ b/app/webroot/js/moment.min.js
@@ -0,0 +1,2 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.moment=t()}(this,function(){"use strict";var e,i;function f(){return e.apply(null,arguments)}function o(e){return e instanceof Array||"[object Array]"===Object.prototype.toString.call(e)}function u(e){return null!=e&&"[object Object]"===Object.prototype.toString.call(e)}function m(e,t){return Object.prototype.hasOwnProperty.call(e,t)}function l(e){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(e).length;for(var t in e)if(m(e,t))return;return 1}function r(e){return void 0===e}function h(e){return"number"==typeof e||"[object Number]"===Object.prototype.toString.call(e)}function a(e){return e instanceof Date||"[object Date]"===Object.prototype.toString.call(e)}function d(e,t){for(var n=[],s=0;s<e.length;++s)n.push(t(e[s],s));return n}function c(e,t){for(var n in t)m(t,n)&&(e[n]=t[n]);return m(t,"toString")&&(e.toString=t.toString),m(t,"valueOf")&&(e.valueOf=t.valueOf),e}function _(e,t,n,s){return xt(e,t,n,s,!0).utc()}function y(e){return null==e._pf&&(e._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidEra:null,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],era:null,meridiem:null,rfc2822:!1,weekdayMismatch:!1}),e._pf}function g(e){if(null==e._isValid){var t=y(e),n=i.call(t.parsedDateParts,function(e){return null!=e}),s=!isNaN(e._d.getTime())&&t.overflow<0&&!t.empty&&!t.invalidEra&&!t.invalidMonth&&!t.invalidWeekday&&!t.weekdayMismatch&&!t.nullInput&&!t.invalidFormat&&!t.userInvalidated&&(!t.meridiem||t.meridiem&&n);if(e._strict&&(s=s&&0===t.charsLeftOver&&0===t.unusedTokens.length&&void 0===t.bigHour),null!=Object.isFrozen&&Object.isFrozen(e))return s;e._isValid=s}return e._isValid}function w(e){var t=_(NaN);return null!=e?c(y(t),e):y(t).userInvalidated=!0,t}i=Array.prototype.some?Array.prototype.some:function(e){for(var t=Object(this),n=t.length>>>0,s=0;s<n;s++)if(s in t&&e.call(this,t[s],s,t))return!0;return!1};var p=f.momentProperties=[],t=!1;function v(e,t){var n,s,i;if(r(t._isAMomentObject)||(e._isAMomentObject=t._isAMomentObject),r(t._i)||(e._i=t._i),r(t._f)||(e._f=t._f),r(t._l)||(e._l=t._l),r(t._strict)||(e._strict=t._strict),r(t._tzm)||(e._tzm=t._tzm),r(t._isUTC)||(e._isUTC=t._isUTC),r(t._offset)||(e._offset=t._offset),r(t._pf)||(e._pf=y(t)),r(t._locale)||(e._locale=t._locale),0<p.length)for(n=0;n<p.length;n++)r(i=t[s=p[n]])||(e[s]=i);return e}function k(e){v(this,e),this._d=new Date(null!=e._d?e._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)),!1===t&&(t=!0,f.updateOffset(this),t=!1)}function M(e){return e instanceof k||null!=e&&null!=e._isAMomentObject}function D(e){!1===f.suppressDeprecationWarnings&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+e)}function n(i,r){var a=!0;return c(function(){if(null!=f.deprecationHandler&&f.deprecationHandler(null,i),a){for(var e,t,n=[],s=0;s<arguments.length;s++){if(e="","object"==typeof arguments[s]){for(t in e+="\n["+s+"] ",arguments[0])m(arguments[0],t)&&(e+=t+": "+arguments[0][t]+", ");e=e.slice(0,-2)}else e=arguments[s];n.push(e)}D(i+"\nArguments: "+Array.prototype.slice.call(n).join("")+"\n"+(new Error).stack),a=!1}return r.apply(this,arguments)},r)}var s,S={};function Y(e,t){null!=f.deprecationHandler&&f.deprecationHandler(e,t),S[e]||(D(t),S[e]=!0)}function O(e){return"undefined"!=typeof Function&&e instanceof Function||"[object Function]"===Object.prototype.toString.call(e)}function b(e,t){var n,s=c({},e);for(n in t)m(t,n)&&(u(e[n])&&u(t[n])?(s[n]={},c(s[n],e[n]),c(s[n],t[n])):null!=t[n]?s[n]=t[n]:delete s[n]);for(n in e)m(e,n)&&!m(t,n)&&u(e[n])&&(s[n]=c({},s[n]));return s}function x(e){null!=e&&this.set(e)}f.suppressDeprecationWarnings=!1,f.deprecationHandler=null,s=Object.keys?Object.keys:function(e){var t,n=[];for(t in e)m(e,t)&&n.push(t);return n};function T(e,t,n){var s=""+Math.abs(e),i=t-s.length;return(0<=e?n?"+":"":"-")+Math.pow(10,Math.max(0,i)).toString().substr(1)+s}var N=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|N{1,5}|YYYYYY|YYYYY|YYYY|YY|y{2,4}|yo?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,P=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,R={},W={};function C(e,t,n,s){var i="string"==typeof s?function(){return this[s]()}:s;e&&(W[e]=i),t&&(W[t[0]]=function(){return T(i.apply(this,arguments),t[1],t[2])}),n&&(W[n]=function(){return this.localeData().ordinal(i.apply(this,arguments),e)})}function U(e,t){return e.isValid()?(t=H(t,e.localeData()),R[t]=R[t]||function(s){for(var e,i=s.match(N),t=0,r=i.length;t<r;t++)W[i[t]]?i[t]=W[i[t]]:i[t]=(e=i[t]).match(/\[[\s\S]/)?e.replace(/^\[|\]$/g,""):e.replace(/\\/g,"");return function(e){for(var t="",n=0;n<r;n++)t+=O(i[n])?i[n].call(e,s):i[n];return t}}(t),R[t](e)):e.localeData().invalidDate()}function H(e,t){var n=5;function s(e){return t.longDateFormat(e)||e}for(P.lastIndex=0;0<=n&&P.test(e);)e=e.replace(P,s),P.lastIndex=0,--n;return e}var F={};function L(e,t){var n=e.toLowerCase();F[n]=F[n+"s"]=F[t]=e}function V(e){return"string"==typeof e?F[e]||F[e.toLowerCase()]:void 0}function G(e){var t,n,s={};for(n in e)m(e,n)&&(t=V(n))&&(s[t]=e[n]);return s}var E={};function A(e,t){E[e]=t}function j(e){return e%4==0&&e%100!=0||e%400==0}function I(e){return e<0?Math.ceil(e)||0:Math.floor(e)}function Z(e){var t=+e,n=0;return 0!=t&&isFinite(t)&&(n=I(t)),n}function z(t,n){return function(e){return null!=e?(q(this,t,e),f.updateOffset(this,n),this):$(this,t)}}function $(e,t){return e.isValid()?e._d["get"+(e._isUTC?"UTC":"")+t]():NaN}function q(e,t,n){e.isValid()&&!isNaN(n)&&("FullYear"===t&&j(e.year())&&1===e.month()&&29===e.date()?(n=Z(n),e._d["set"+(e._isUTC?"UTC":"")+t](n,e.month(),xe(n,e.month()))):e._d["set"+(e._isUTC?"UTC":"")+t](n))}var B,J=/\d/,Q=/\d\d/,X=/\d{3}/,K=/\d{4}/,ee=/[+-]?\d{6}/,te=/\d\d?/,ne=/\d\d\d\d?/,se=/\d\d\d\d\d\d?/,ie=/\d{1,3}/,re=/\d{1,4}/,ae=/[+-]?\d{1,6}/,oe=/\d+/,ue=/[+-]?\d+/,le=/Z|[+-]\d\d:?\d\d/gi,he=/Z|[+-]\d\d(?::?\d\d)?/gi,de=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;function ce(e,n,s){B[e]=O(n)?n:function(e,t){return e&&s?s:n}}function fe(e,t){return m(B,e)?B[e](t._strict,t._locale):new RegExp(me(e.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(e,t,n,s,i){return t||n||s||i})))}function me(e){return e.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}B={};var _e={};function ye(e,n){var t,s=n;for("string"==typeof e&&(e=[e]),h(n)&&(s=function(e,t){t[n]=Z(e)}),t=0;t<e.length;t++)_e[e[t]]=s}function ge(e,i){ye(e,function(e,t,n,s){n._w=n._w||{},i(e,n._w,n,s)})}var we,pe=0,ve=1,ke=2,Me=3,De=4,Se=5,Ye=6,Oe=7,be=8;function xe(e,t){if(isNaN(e)||isNaN(t))return NaN;var n,s=(t%(n=12)+n)%n;return e+=(t-s)/12,1==s?j(e)?29:28:31-s%7%2}we=Array.prototype.indexOf?Array.prototype.indexOf:function(e){for(var t=0;t<this.length;++t)if(this[t]===e)return t;return-1},C("M",["MM",2],"Mo",function(){return this.month()+1}),C("MMM",0,0,function(e){return this.localeData().monthsShort(this,e)}),C("MMMM",0,0,function(e){return this.localeData().months(this,e)}),L("month","M"),A("month",8),ce("M",te),ce("MM",te,Q),ce("MMM",function(e,t){return t.monthsShortRegex(e)}),ce("MMMM",function(e,t){return t.monthsRegex(e)}),ye(["M","MM"],function(e,t){t[ve]=Z(e)-1}),ye(["MMM","MMMM"],function(e,t,n,s){var i=n._locale.monthsParse(e,s,n._strict);null!=i?t[ve]=i:y(n).invalidMonth=e});var Te="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),Ne="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),Pe=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,Re=de,We=de;function Ce(e,t){var n;if(!e.isValid())return e;if("string"==typeof t)if(/^\d+$/.test(t))t=Z(t);else if(!h(t=e.localeData().monthsParse(t)))return e;return n=Math.min(e.date(),xe(e.year(),t)),e._d["set"+(e._isUTC?"UTC":"")+"Month"](t,n),e}function Ue(e){return null!=e?(Ce(this,e),f.updateOffset(this,!0),this):$(this,"Month")}function He(){function e(e,t){return t.length-e.length}for(var t,n=[],s=[],i=[],r=0;r<12;r++)t=_([2e3,r]),n.push(this.monthsShort(t,"")),s.push(this.months(t,"")),i.push(this.months(t,"")),i.push(this.monthsShort(t,""));for(n.sort(e),s.sort(e),i.sort(e),r=0;r<12;r++)n[r]=me(n[r]),s[r]=me(s[r]);for(r=0;r<24;r++)i[r]=me(i[r]);this._monthsRegex=new RegExp("^("+i.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+s.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+n.join("|")+")","i")}function Fe(e){return j(e)?366:365}C("Y",0,0,function(){var e=this.year();return e<=9999?T(e,4):"+"+e}),C(0,["YY",2],0,function(){return this.year()%100}),C(0,["YYYY",4],0,"year"),C(0,["YYYYY",5],0,"year"),C(0,["YYYYYY",6,!0],0,"year"),L("year","y"),A("year",1),ce("Y",ue),ce("YY",te,Q),ce("YYYY",re,K),ce("YYYYY",ae,ee),ce("YYYYYY",ae,ee),ye(["YYYYY","YYYYYY"],pe),ye("YYYY",function(e,t){t[pe]=2===e.length?f.parseTwoDigitYear(e):Z(e)}),ye("YY",function(e,t){t[pe]=f.parseTwoDigitYear(e)}),ye("Y",function(e,t){t[pe]=parseInt(e,10)}),f.parseTwoDigitYear=function(e){return Z(e)+(68<Z(e)?1900:2e3)};var Le=z("FullYear",!0);function Ve(e){var t,n;return e<100&&0<=e?((n=Array.prototype.slice.call(arguments))[0]=e+400,t=new Date(Date.UTC.apply(null,n)),isFinite(t.getUTCFullYear())&&t.setUTCFullYear(e)):t=new Date(Date.UTC.apply(null,arguments)),t}function Ge(e,t,n){var s=7+t-n;return s-(7+Ve(e,0,s).getUTCDay()-t)%7-1}function Ee(e,t,n,s,i){var r,a=1+7*(t-1)+(7+n-s)%7+Ge(e,s,i),o=a<=0?Fe(r=e-1)+a:a>Fe(e)?(r=e+1,a-Fe(e)):(r=e,a);return{year:r,dayOfYear:o}}function Ae(e,t,n){var s,i,r=Ge(e.year(),t,n),a=Math.floor((e.dayOfYear()-r-1)/7)+1;return a<1?s=a+je(i=e.year()-1,t,n):a>je(e.year(),t,n)?(s=a-je(e.year(),t,n),i=e.year()+1):(i=e.year(),s=a),{week:s,year:i}}function je(e,t,n){var s=Ge(e,t,n),i=Ge(e+1,t,n);return(Fe(e)-s+i)/7}C("w",["ww",2],"wo","week"),C("W",["WW",2],"Wo","isoWeek"),L("week","w"),L("isoWeek","W"),A("week",5),A("isoWeek",5),ce("w",te),ce("ww",te,Q),ce("W",te),ce("WW",te,Q),ge(["w","ww","W","WW"],function(e,t,n,s){t[s.substr(0,1)]=Z(e)});function Ie(e,t){return e.slice(t,7).concat(e.slice(0,t))}C("d",0,"do","day"),C("dd",0,0,function(e){return this.localeData().weekdaysMin(this,e)}),C("ddd",0,0,function(e){return this.localeData().weekdaysShort(this,e)}),C("dddd",0,0,function(e){return this.localeData().weekdays(this,e)}),C("e",0,0,"weekday"),C("E",0,0,"isoWeekday"),L("day","d"),L("weekday","e"),L("isoWeekday","E"),A("day",11),A("weekday",11),A("isoWeekday",11),ce("d",te),ce("e",te),ce("E",te),ce("dd",function(e,t){return t.weekdaysMinRegex(e)}),ce("ddd",function(e,t){return t.weekdaysShortRegex(e)}),ce("dddd",function(e,t){return t.weekdaysRegex(e)}),ge(["dd","ddd","dddd"],function(e,t,n,s){var i=n._locale.weekdaysParse(e,s,n._strict);null!=i?t.d=i:y(n).invalidWeekday=e}),ge(["d","e","E"],function(e,t,n,s){t[s]=Z(e)});var Ze="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),ze="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),$e="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),qe=de,Be=de,Je=de;function Qe(){function e(e,t){return t.length-e.length}for(var t,n,s,i,r=[],a=[],o=[],u=[],l=0;l<7;l++)t=_([2e3,1]).day(l),n=me(this.weekdaysMin(t,"")),s=me(this.weekdaysShort(t,"")),i=me(this.weekdays(t,"")),r.push(n),a.push(s),o.push(i),u.push(n),u.push(s),u.push(i);r.sort(e),a.sort(e),o.sort(e),u.sort(e),this._weekdaysRegex=new RegExp("^("+u.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+o.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+a.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+r.join("|")+")","i")}function Xe(){return this.hours()%12||12}function Ke(e,t){C(e,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),t)})}function et(e,t){return t._meridiemParse}C("H",["HH",2],0,"hour"),C("h",["hh",2],0,Xe),C("k",["kk",2],0,function(){return this.hours()||24}),C("hmm",0,0,function(){return""+Xe.apply(this)+T(this.minutes(),2)}),C("hmmss",0,0,function(){return""+Xe.apply(this)+T(this.minutes(),2)+T(this.seconds(),2)}),C("Hmm",0,0,function(){return""+this.hours()+T(this.minutes(),2)}),C("Hmmss",0,0,function(){return""+this.hours()+T(this.minutes(),2)+T(this.seconds(),2)}),Ke("a",!0),Ke("A",!1),L("hour","h"),A("hour",13),ce("a",et),ce("A",et),ce("H",te),ce("h",te),ce("k",te),ce("HH",te,Q),ce("hh",te,Q),ce("kk",te,Q),ce("hmm",ne),ce("hmmss",se),ce("Hmm",ne),ce("Hmmss",se),ye(["H","HH"],Me),ye(["k","kk"],function(e,t,n){var s=Z(e);t[Me]=24===s?0:s}),ye(["a","A"],function(e,t,n){n._isPm=n._locale.isPM(e),n._meridiem=e}),ye(["h","hh"],function(e,t,n){t[Me]=Z(e),y(n).bigHour=!0}),ye("hmm",function(e,t,n){var s=e.length-2;t[Me]=Z(e.substr(0,s)),t[De]=Z(e.substr(s)),y(n).bigHour=!0}),ye("hmmss",function(e,t,n){var s=e.length-4,i=e.length-2;t[Me]=Z(e.substr(0,s)),t[De]=Z(e.substr(s,2)),t[Se]=Z(e.substr(i)),y(n).bigHour=!0}),ye("Hmm",function(e,t,n){var s=e.length-2;t[Me]=Z(e.substr(0,s)),t[De]=Z(e.substr(s))}),ye("Hmmss",function(e,t,n){var s=e.length-4,i=e.length-2;t[Me]=Z(e.substr(0,s)),t[De]=Z(e.substr(s,2)),t[Se]=Z(e.substr(i))});var tt=z("Hours",!0);var nt,st={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",w:"a week",ww:"%d weeks",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Te,monthsShort:Ne,week:{dow:0,doy:6},weekdays:Ze,weekdaysMin:$e,weekdaysShort:ze,meridiemParse:/[ap]\.?m?\.?/i},it={},rt={};function at(e){return e?e.toLowerCase().replace("_","-"):e}function ot(e){for(var t,n,s,i,r=0;r<e.length;){for(t=(i=at(e[r]).split("-")).length,n=(n=at(e[r+1]))?n.split("-"):null;0<t;){if(s=ut(i.slice(0,t).join("-")))return s;if(n&&n.length>=t&&function(e,t){for(var n=Math.min(e.length,t.length),s=0;s<n;s+=1)if(e[s]!==t[s])return s;return n}(i,n)>=t-1)break;t--}r++}return nt}function ut(t){var e;if(void 0===it[t]&&"undefined"!=typeof module&&module&&module.exports)try{e=nt._abbr,require("./locale/"+t),lt(e)}catch(e){it[t]=null}return it[t]}function lt(e,t){var n;return e&&((n=r(t)?dt(e):ht(e,t))?nt=n:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+e+" not found. Did you forget to load it?")),nt._abbr}function ht(e,t){if(null===t)return delete it[e],null;var n,s=st;if(t.abbr=e,null!=it[e])Y("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),s=it[e]._config;else if(null!=t.parentLocale)if(null!=it[t.parentLocale])s=it[t.parentLocale]._config;else{if(null==(n=ut(t.parentLocale)))return rt[t.parentLocale]||(rt[t.parentLocale]=[]),rt[t.parentLocale].push({name:e,config:t}),null;s=n._config}return it[e]=new x(b(s,t)),rt[e]&&rt[e].forEach(function(e){ht(e.name,e.config)}),lt(e),it[e]}function dt(e){var t;if(e&&e._locale&&e._locale._abbr&&(e=e._locale._abbr),!e)return nt;if(!o(e)){if(t=ut(e))return t;e=[e]}return ot(e)}function ct(e){var t,n=e._a;return n&&-2===y(e).overflow&&(t=n[ve]<0||11<n[ve]?ve:n[ke]<1||n[ke]>xe(n[pe],n[ve])?ke:n[Me]<0||24<n[Me]||24===n[Me]&&(0!==n[De]||0!==n[Se]||0!==n[Ye])?Me:n[De]<0||59<n[De]?De:n[Se]<0||59<n[Se]?Se:n[Ye]<0||999<n[Ye]?Ye:-1,y(e)._overflowDayOfYear&&(t<pe||ke<t)&&(t=ke),y(e)._overflowWeeks&&-1===t&&(t=Oe),y(e)._overflowWeekday&&-1===t&&(t=be),y(e).overflow=t),e}var ft=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,mt=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d|))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,_t=/Z|[+-]\d\d(?::?\d\d)?/,yt=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/],["YYYYMM",/\d{6}/,!1],["YYYY",/\d{4}/,!1]],gt=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],wt=/^\/?Date\((-?\d+)/i,pt=/^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/,vt={UT:0,GMT:0,EDT:-240,EST:-300,CDT:-300,CST:-360,MDT:-360,MST:-420,PDT:-420,PST:-480};function kt(e){var t,n,s,i,r,a,o=e._i,u=ft.exec(o)||mt.exec(o);if(u){for(y(e).iso=!0,t=0,n=yt.length;t<n;t++)if(yt[t][1].exec(u[1])){i=yt[t][0],s=!1!==yt[t][2];break}if(null==i)return void(e._isValid=!1);if(u[3]){for(t=0,n=gt.length;t<n;t++)if(gt[t][1].exec(u[3])){r=(u[2]||" ")+gt[t][0];break}if(null==r)return void(e._isValid=!1)}if(!s&&null!=r)return void(e._isValid=!1);if(u[4]){if(!_t.exec(u[4]))return void(e._isValid=!1);a="Z"}e._f=i+(r||"")+(a||""),Ot(e)}else e._isValid=!1}function Mt(e,t,n,s,i,r){var a=[function(e){var t=parseInt(e,10);{if(t<=49)return 2e3+t;if(t<=999)return 1900+t}return t}(e),Ne.indexOf(t),parseInt(n,10),parseInt(s,10),parseInt(i,10)];return r&&a.push(parseInt(r,10)),a}function Dt(e){var t,n,s,i,r=pt.exec(e._i.replace(/\([^)]*\)|[\n\t]/g," ").replace(/(\s\s+)/g," ").replace(/^\s\s*/,"").replace(/\s\s*$/,""));if(r){if(t=Mt(r[4],r[3],r[2],r[5],r[6],r[7]),n=r[1],s=t,i=e,n&&ze.indexOf(n)!==new Date(s[0],s[1],s[2]).getDay()&&(y(i).weekdayMismatch=!0,!void(i._isValid=!1)))return;e._a=t,e._tzm=function(e,t,n){if(e)return vt[e];if(t)return 0;var s=parseInt(n,10),i=s%100;return 60*((s-i)/100)+i}(r[8],r[9],r[10]),e._d=Ve.apply(null,e._a),e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),y(e).rfc2822=!0}else e._isValid=!1}function St(e,t,n){return null!=e?e:null!=t?t:n}function Yt(e){var t,n,s,i,r,a,o,u=[];if(!e._d){for(a=e,o=new Date(f.now()),s=a._useUTC?[o.getUTCFullYear(),o.getUTCMonth(),o.getUTCDate()]:[o.getFullYear(),o.getMonth(),o.getDate()],e._w&&null==e._a[ke]&&null==e._a[ve]&&function(e){var t,n,s,i,r,a,o,u,l;null!=(t=e._w).GG||null!=t.W||null!=t.E?(r=1,a=4,n=St(t.GG,e._a[pe],Ae(Tt(),1,4).year),s=St(t.W,1),((i=St(t.E,1))<1||7<i)&&(u=!0)):(r=e._locale._week.dow,a=e._locale._week.doy,l=Ae(Tt(),r,a),n=St(t.gg,e._a[pe],l.year),s=St(t.w,l.week),null!=t.d?((i=t.d)<0||6<i)&&(u=!0):null!=t.e?(i=t.e+r,(t.e<0||6<t.e)&&(u=!0)):i=r);s<1||s>je(n,r,a)?y(e)._overflowWeeks=!0:null!=u?y(e)._overflowWeekday=!0:(o=Ee(n,s,i,r,a),e._a[pe]=o.year,e._dayOfYear=o.dayOfYear)}(e),null!=e._dayOfYear&&(r=St(e._a[pe],s[pe]),(e._dayOfYear>Fe(r)||0===e._dayOfYear)&&(y(e)._overflowDayOfYear=!0),n=Ve(r,0,e._dayOfYear),e._a[ve]=n.getUTCMonth(),e._a[ke]=n.getUTCDate()),t=0;t<3&&null==e._a[t];++t)e._a[t]=u[t]=s[t];for(;t<7;t++)e._a[t]=u[t]=null==e._a[t]?2===t?1:0:e._a[t];24===e._a[Me]&&0===e._a[De]&&0===e._a[Se]&&0===e._a[Ye]&&(e._nextDay=!0,e._a[Me]=0),e._d=(e._useUTC?Ve:function(e,t,n,s,i,r,a){var o;return e<100&&0<=e?(o=new Date(e+400,t,n,s,i,r,a),isFinite(o.getFullYear())&&o.setFullYear(e)):o=new Date(e,t,n,s,i,r,a),o}).apply(null,u),i=e._useUTC?e._d.getUTCDay():e._d.getDay(),null!=e._tzm&&e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),e._nextDay&&(e._a[Me]=24),e._w&&void 0!==e._w.d&&e._w.d!==i&&(y(e).weekdayMismatch=!0)}}function Ot(e){if(e._f!==f.ISO_8601)if(e._f!==f.RFC_2822){e._a=[],y(e).empty=!0;for(var t,n,s,i,r,a,o,u=""+e._i,l=u.length,h=0,d=H(e._f,e._locale).match(N)||[],c=0;c<d.length;c++)n=d[c],(t=(u.match(fe(n,e))||[])[0])&&(0<(s=u.substr(0,u.indexOf(t))).length&&y(e).unusedInput.push(s),u=u.slice(u.indexOf(t)+t.length),h+=t.length),W[n]?(t?y(e).empty=!1:y(e).unusedTokens.push(n),r=n,o=e,null!=(a=t)&&m(_e,r)&&_e[r](a,o._a,o,r)):e._strict&&!t&&y(e).unusedTokens.push(n);y(e).charsLeftOver=l-h,0<u.length&&y(e).unusedInput.push(u),e._a[Me]<=12&&!0===y(e).bigHour&&0<e._a[Me]&&(y(e).bigHour=void 0),y(e).parsedDateParts=e._a.slice(0),y(e).meridiem=e._meridiem,e._a[Me]=function(e,t,n){var s;if(null==n)return t;return null!=e.meridiemHour?e.meridiemHour(t,n):(null!=e.isPM&&((s=e.isPM(n))&&t<12&&(t+=12),s||12!==t||(t=0)),t)}(e._locale,e._a[Me],e._meridiem),null!==(i=y(e).era)&&(e._a[pe]=e._locale.erasConvertYear(i,e._a[pe])),Yt(e),ct(e)}else Dt(e);else kt(e)}function bt(e){var t,n,s=e._i,i=e._f;return e._locale=e._locale||dt(e._l),null===s||void 0===i&&""===s?w({nullInput:!0}):("string"==typeof s&&(e._i=s=e._locale.preparse(s)),M(s)?new k(ct(s)):(a(s)?e._d=s:o(i)?function(e){var t,n,s,i,r,a,o=!1;if(0===e._f.length)return y(e).invalidFormat=!0,e._d=new Date(NaN);for(i=0;i<e._f.length;i++)r=0,a=!1,t=v({},e),null!=e._useUTC&&(t._useUTC=e._useUTC),t._f=e._f[i],Ot(t),g(t)&&(a=!0),r+=y(t).charsLeftOver,r+=10*y(t).unusedTokens.length,y(t).score=r,o?r<s&&(s=r,n=t):(null==s||r<s||a)&&(s=r,n=t,a&&(o=!0));c(e,n||t)}(e):i?Ot(e):r(n=(t=e)._i)?t._d=new Date(f.now()):a(n)?t._d=new Date(n.valueOf()):"string"==typeof n?function(e){var t=wt.exec(e._i);null===t?(kt(e),!1===e._isValid&&(delete e._isValid,Dt(e),!1===e._isValid&&(delete e._isValid,e._strict?e._isValid=!1:f.createFromInputFallback(e)))):e._d=new Date(+t[1])}(t):o(n)?(t._a=d(n.slice(0),function(e){return parseInt(e,10)}),Yt(t)):u(n)?function(e){var t,n;e._d||(n=void 0===(t=G(e._i)).day?t.date:t.day,e._a=d([t.year,t.month,n,t.hour,t.minute,t.second,t.millisecond],function(e){return e&&parseInt(e,10)}),Yt(e))}(t):h(n)?t._d=new Date(n):f.createFromInputFallback(t),g(e)||(e._d=null),e))}function xt(e,t,n,s,i){var r,a={};return!0!==t&&!1!==t||(s=t,t=void 0),!0!==n&&!1!==n||(s=n,n=void 0),(u(e)&&l(e)||o(e)&&0===e.length)&&(e=void 0),a._isAMomentObject=!0,a._useUTC=a._isUTC=i,a._l=n,a._i=e,a._f=t,a._strict=s,(r=new k(ct(bt(a))))._nextDay&&(r.add(1,"d"),r._nextDay=void 0),r}function Tt(e,t,n,s){return xt(e,t,n,s,!1)}f.createFromInputFallback=n("value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",function(e){e._d=new Date(e._i+(e._useUTC?" UTC":""))}),f.ISO_8601=function(){},f.RFC_2822=function(){};var Nt=n("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var e=Tt.apply(null,arguments);return this.isValid()&&e.isValid()?e<this?this:e:w()}),Pt=n("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var e=Tt.apply(null,arguments);return this.isValid()&&e.isValid()?this<e?this:e:w()});function Rt(e,t){var n,s;if(1===t.length&&o(t[0])&&(t=t[0]),!t.length)return Tt();for(n=t[0],s=1;s<t.length;++s)t[s].isValid()&&!t[s][e](n)||(n=t[s]);return n}var Wt=["year","quarter","month","week","day","hour","minute","second","millisecond"];function Ct(e){var t=G(e),n=t.year||0,s=t.quarter||0,i=t.month||0,r=t.week||t.isoWeek||0,a=t.day||0,o=t.hour||0,u=t.minute||0,l=t.second||0,h=t.millisecond||0;this._isValid=function(e){var t,n,s=!1;for(t in e)if(m(e,t)&&(-1===we.call(Wt,t)||null!=e[t]&&isNaN(e[t])))return!1;for(n=0;n<Wt.length;++n)if(e[Wt[n]]){if(s)return!1;parseFloat(e[Wt[n]])!==Z(e[Wt[n]])&&(s=!0)}return!0}(t),this._milliseconds=+h+1e3*l+6e4*u+1e3*o*60*60,this._days=+a+7*r,this._months=+i+3*s+12*n,this._data={},this._locale=dt(),this._bubble()}function Ut(e){return e instanceof Ct}function Ht(e){return e<0?-1*Math.round(-1*e):Math.round(e)}function Ft(e,n){C(e,0,0,function(){var e=this.utcOffset(),t="+";return e<0&&(e=-e,t="-"),t+T(~~(e/60),2)+n+T(~~e%60,2)})}Ft("Z",":"),Ft("ZZ",""),ce("Z",he),ce("ZZ",he),ye(["Z","ZZ"],function(e,t,n){n._useUTC=!0,n._tzm=Vt(he,e)});var Lt=/([\+\-]|\d\d)/gi;function Vt(e,t){var n,s,i=(t||"").match(e);return null===i?null:0===(s=60*(n=((i[i.length-1]||[])+"").match(Lt)||["-",0,0])[1]+Z(n[2]))?0:"+"===n[0]?s:-s}function Gt(e,t){var n,s;return t._isUTC?(n=t.clone(),s=(M(e)||a(e)?e.valueOf():Tt(e).valueOf())-n.valueOf(),n._d.setTime(n._d.valueOf()+s),f.updateOffset(n,!1),n):Tt(e).local()}function Et(e){return-Math.round(e._d.getTimezoneOffset())}function At(){return!!this.isValid()&&(this._isUTC&&0===this._offset)}f.updateOffset=function(){};var jt=/^(-|\+)?(?:(\d*)[. ])?(\d+):(\d+)(?::(\d+)(\.\d*)?)?$/,It=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;function Zt(e,t){var n,s,i,r=e,a=null;return Ut(e)?r={ms:e._milliseconds,d:e._days,M:e._months}:h(e)||!isNaN(+e)?(r={},t?r[t]=+e:r.milliseconds=+e):(a=jt.exec(e))?(n="-"===a[1]?-1:1,r={y:0,d:Z(a[ke])*n,h:Z(a[Me])*n,m:Z(a[De])*n,s:Z(a[Se])*n,ms:Z(Ht(1e3*a[Ye]))*n}):(a=It.exec(e))?(n="-"===a[1]?-1:1,r={y:zt(a[2],n),M:zt(a[3],n),w:zt(a[4],n),d:zt(a[5],n),h:zt(a[6],n),m:zt(a[7],n),s:zt(a[8],n)}):null==r?r={}:"object"==typeof r&&("from"in r||"to"in r)&&(i=function(e,t){var n;if(!e.isValid()||!t.isValid())return{milliseconds:0,months:0};t=Gt(t,e),e.isBefore(t)?n=$t(e,t):((n=$t(t,e)).milliseconds=-n.milliseconds,n.months=-n.months);return n}(Tt(r.from),Tt(r.to)),(r={}).ms=i.milliseconds,r.M=i.months),s=new Ct(r),Ut(e)&&m(e,"_locale")&&(s._locale=e._locale),Ut(e)&&m(e,"_isValid")&&(s._isValid=e._isValid),s}function zt(e,t){var n=e&&parseFloat(e.replace(",","."));return(isNaN(n)?0:n)*t}function $t(e,t){var n={};return n.months=t.month()-e.month()+12*(t.year()-e.year()),e.clone().add(n.months,"M").isAfter(t)&&--n.months,n.milliseconds=t-e.clone().add(n.months,"M"),n}function qt(s,i){return function(e,t){var n;return null===t||isNaN(+t)||(Y(i,"moment()."+i+"(period, number) is deprecated. Please use moment()."+i+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),n=e,e=t,t=n),Bt(this,Zt(e,t),s),this}}function Bt(e,t,n,s){var i=t._milliseconds,r=Ht(t._days),a=Ht(t._months);e.isValid()&&(s=null==s||s,a&&Ce(e,$(e,"Month")+a*n),r&&q(e,"Date",$(e,"Date")+r*n),i&&e._d.setTime(e._d.valueOf()+i*n),s&&f.updateOffset(e,r||a))}Zt.fn=Ct.prototype,Zt.invalid=function(){return Zt(NaN)};var Jt=qt(1,"add"),Qt=qt(-1,"subtract");function Xt(e){return"string"==typeof e||e instanceof String}function Kt(e){return M(e)||a(e)||Xt(e)||h(e)||function(t){var e=o(t),n=!1;e&&(n=0===t.filter(function(e){return!h(e)&&Xt(t)}).length);return e&&n}(e)||function(e){var t,n,s=u(e)&&!l(e),i=!1,r=["years","year","y","months","month","M","days","day","d","dates","date","D","hours","hour","h","minutes","minute","m","seconds","second","s","milliseconds","millisecond","ms"];for(t=0;t<r.length;t+=1)n=r[t],i=i||m(e,n);return s&&i}(e)||null==e}function en(e,t){if(e.date()<t.date())return-en(t,e);var n=12*(t.year()-e.year())+(t.month()-e.month()),s=e.clone().add(n,"months"),i=t-s<0?(t-s)/(s-e.clone().add(n-1,"months")):(t-s)/(e.clone().add(1+n,"months")-s);return-(n+i)||0}function tn(e){var t;return void 0===e?this._locale._abbr:(null!=(t=dt(e))&&(this._locale=t),this)}f.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",f.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var nn=n("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(e){return void 0===e?this.localeData():this.locale(e)});function sn(){return this._locale}var rn=126227808e5;function an(e,t){return(e%t+t)%t}function on(e,t,n){return e<100&&0<=e?new Date(e+400,t,n)-rn:new Date(e,t,n).valueOf()}function un(e,t,n){return e<100&&0<=e?Date.UTC(e+400,t,n)-rn:Date.UTC(e,t,n)}function ln(e,t){return t.erasAbbrRegex(e)}function hn(){for(var e=[],t=[],n=[],s=[],i=this.eras(),r=0,a=i.length;r<a;++r)t.push(me(i[r].name)),e.push(me(i[r].abbr)),n.push(me(i[r].narrow)),s.push(me(i[r].name)),s.push(me(i[r].abbr)),s.push(me(i[r].narrow));this._erasRegex=new RegExp("^("+s.join("|")+")","i"),this._erasNameRegex=new RegExp("^("+t.join("|")+")","i"),this._erasAbbrRegex=new RegExp("^("+e.join("|")+")","i"),this._erasNarrowRegex=new RegExp("^("+n.join("|")+")","i")}function dn(e,t){C(0,[e,e.length],0,t)}function cn(e,t,n,s,i){var r;return null==e?Ae(this,s,i).year:((r=je(e,s,i))<t&&(t=r),function(e,t,n,s,i){var r=Ee(e,t,n,s,i),a=Ve(r.year,0,r.dayOfYear);return this.year(a.getUTCFullYear()),this.month(a.getUTCMonth()),this.date(a.getUTCDate()),this}.call(this,e,t,n,s,i))}C("N",0,0,"eraAbbr"),C("NN",0,0,"eraAbbr"),C("NNN",0,0,"eraAbbr"),C("NNNN",0,0,"eraName"),C("NNNNN",0,0,"eraNarrow"),C("y",["y",1],"yo","eraYear"),C("y",["yy",2],0,"eraYear"),C("y",["yyy",3],0,"eraYear"),C("y",["yyyy",4],0,"eraYear"),ce("N",ln),ce("NN",ln),ce("NNN",ln),ce("NNNN",function(e,t){return t.erasNameRegex(e)}),ce("NNNNN",function(e,t){return t.erasNarrowRegex(e)}),ye(["N","NN","NNN","NNNN","NNNNN"],function(e,t,n,s){var i=n._locale.erasParse(e,s,n._strict);i?y(n).era=i:y(n).invalidEra=e}),ce("y",oe),ce("yy",oe),ce("yyy",oe),ce("yyyy",oe),ce("yo",function(e,t){return t._eraYearOrdinalRegex||oe}),ye(["y","yy","yyy","yyyy"],pe),ye(["yo"],function(e,t,n,s){var i;n._locale._eraYearOrdinalRegex&&(i=e.match(n._locale._eraYearOrdinalRegex)),n._locale.eraYearOrdinalParse?t[pe]=n._locale.eraYearOrdinalParse(e,i):t[pe]=parseInt(e,10)}),C(0,["gg",2],0,function(){return this.weekYear()%100}),C(0,["GG",2],0,function(){return this.isoWeekYear()%100}),dn("gggg","weekYear"),dn("ggggg","weekYear"),dn("GGGG","isoWeekYear"),dn("GGGGG","isoWeekYear"),L("weekYear","gg"),L("isoWeekYear","GG"),A("weekYear",1),A("isoWeekYear",1),ce("G",ue),ce("g",ue),ce("GG",te,Q),ce("gg",te,Q),ce("GGGG",re,K),ce("gggg",re,K),ce("GGGGG",ae,ee),ce("ggggg",ae,ee),ge(["gggg","ggggg","GGGG","GGGGG"],function(e,t,n,s){t[s.substr(0,2)]=Z(e)}),ge(["gg","GG"],function(e,t,n,s){t[s]=f.parseTwoDigitYear(e)}),C("Q",0,"Qo","quarter"),L("quarter","Q"),A("quarter",7),ce("Q",J),ye("Q",function(e,t){t[ve]=3*(Z(e)-1)}),C("D",["DD",2],"Do","date"),L("date","D"),A("date",9),ce("D",te),ce("DD",te,Q),ce("Do",function(e,t){return e?t._dayOfMonthOrdinalParse||t._ordinalParse:t._dayOfMonthOrdinalParseLenient}),ye(["D","DD"],ke),ye("Do",function(e,t){t[ke]=Z(e.match(te)[0])});var fn=z("Date",!0);C("DDD",["DDDD",3],"DDDo","dayOfYear"),L("dayOfYear","DDD"),A("dayOfYear",4),ce("DDD",ie),ce("DDDD",X),ye(["DDD","DDDD"],function(e,t,n){n._dayOfYear=Z(e)}),C("m",["mm",2],0,"minute"),L("minute","m"),A("minute",14),ce("m",te),ce("mm",te,Q),ye(["m","mm"],De);var mn=z("Minutes",!1);C("s",["ss",2],0,"second"),L("second","s"),A("second",15),ce("s",te),ce("ss",te,Q),ye(["s","ss"],Se);var _n,yn,gn=z("Seconds",!1);for(C("S",0,0,function(){return~~(this.millisecond()/100)}),C(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),C(0,["SSS",3],0,"millisecond"),C(0,["SSSS",4],0,function(){return 10*this.millisecond()}),C(0,["SSSSS",5],0,function(){return 100*this.millisecond()}),C(0,["SSSSSS",6],0,function(){return 1e3*this.millisecond()}),C(0,["SSSSSSS",7],0,function(){return 1e4*this.millisecond()}),C(0,["SSSSSSSS",8],0,function(){return 1e5*this.millisecond()}),C(0,["SSSSSSSSS",9],0,function(){return 1e6*this.millisecond()}),L("millisecond","ms"),A("millisecond",16),ce("S",ie,J),ce("SS",ie,Q),ce("SSS",ie,X),_n="SSSS";_n.length<=9;_n+="S")ce(_n,oe);function wn(e,t){t[Ye]=Z(1e3*("0."+e))}for(_n="S";_n.length<=9;_n+="S")ye(_n,wn);yn=z("Milliseconds",!1),C("z",0,0,"zoneAbbr"),C("zz",0,0,"zoneName");var pn=k.prototype;function vn(e){return e}pn.add=Jt,pn.calendar=function(e,t){1===arguments.length&&(arguments[0]?Kt(arguments[0])?(e=arguments[0],t=void 0):function(e){for(var t=u(e)&&!l(e),n=!1,s=["sameDay","nextDay","lastDay","nextWeek","lastWeek","sameElse"],i=0;i<s.length;i+=1)n=n||m(e,s[i]);return t&&n}(arguments[0])&&(t=arguments[0],e=void 0):t=e=void 0);var n=e||Tt(),s=Gt(n,this).startOf("day"),i=f.calendarFormat(this,s)||"sameElse",r=t&&(O(t[i])?t[i].call(this,n):t[i]);return this.format(r||this.localeData().calendar(i,this,Tt(n)))},pn.clone=function(){return new k(this)},pn.diff=function(e,t,n){var s,i,r;if(!this.isValid())return NaN;if(!(s=Gt(e,this)).isValid())return NaN;switch(i=6e4*(s.utcOffset()-this.utcOffset()),t=V(t)){case"year":r=en(this,s)/12;break;case"month":r=en(this,s);break;case"quarter":r=en(this,s)/3;break;case"second":r=(this-s)/1e3;break;case"minute":r=(this-s)/6e4;break;case"hour":r=(this-s)/36e5;break;case"day":r=(this-s-i)/864e5;break;case"week":r=(this-s-i)/6048e5;break;default:r=this-s}return n?r:I(r)},pn.endOf=function(e){var t,n;if(void 0===(e=V(e))||"millisecond"===e||!this.isValid())return this;switch(n=this._isUTC?un:on,e){case"year":t=n(this.year()+1,0,1)-1;break;case"quarter":t=n(this.year(),this.month()-this.month()%3+3,1)-1;break;case"month":t=n(this.year(),this.month()+1,1)-1;break;case"week":t=n(this.year(),this.month(),this.date()-this.weekday()+7)-1;break;case"isoWeek":t=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1)+7)-1;break;case"day":case"date":t=n(this.year(),this.month(),this.date()+1)-1;break;case"hour":t=this._d.valueOf(),t+=36e5-an(t+(this._isUTC?0:6e4*this.utcOffset()),36e5)-1;break;case"minute":t=this._d.valueOf(),t+=6e4-an(t,6e4)-1;break;case"second":t=this._d.valueOf(),t+=1e3-an(t,1e3)-1;break}return this._d.setTime(t),f.updateOffset(this,!0),this},pn.format=function(e){e=e||(this.isUtc()?f.defaultFormatUtc:f.defaultFormat);var t=U(this,e);return this.localeData().postformat(t)},pn.from=function(e,t){return this.isValid()&&(M(e)&&e.isValid()||Tt(e).isValid())?Zt({to:this,from:e}).locale(this.locale()).humanize(!t):this.localeData().invalidDate()},pn.fromNow=function(e){return this.from(Tt(),e)},pn.to=function(e,t){return this.isValid()&&(M(e)&&e.isValid()||Tt(e).isValid())?Zt({from:this,to:e}).locale(this.locale()).humanize(!t):this.localeData().invalidDate()},pn.toNow=function(e){return this.to(Tt(),e)},pn.get=function(e){return O(this[e=V(e)])?this[e]():this},pn.invalidAt=function(){return y(this).overflow},pn.isAfter=function(e,t){var n=M(e)?e:Tt(e);return!(!this.isValid()||!n.isValid())&&("millisecond"===(t=V(t)||"millisecond")?this.valueOf()>n.valueOf():n.valueOf()<this.clone().startOf(t).valueOf())},pn.isBefore=function(e,t){var n=M(e)?e:Tt(e);return!(!this.isValid()||!n.isValid())&&("millisecond"===(t=V(t)||"millisecond")?this.valueOf()<n.valueOf():this.clone().endOf(t).valueOf()<n.valueOf())},pn.isBetween=function(e,t,n,s){var i=M(e)?e:Tt(e),r=M(t)?t:Tt(t);return!!(this.isValid()&&i.isValid()&&r.isValid())&&(("("===(s=s||"()")[0]?this.isAfter(i,n):!this.isBefore(i,n))&&(")"===s[1]?this.isBefore(r,n):!this.isAfter(r,n)))},pn.isSame=function(e,t){var n,s=M(e)?e:Tt(e);return!(!this.isValid()||!s.isValid())&&("millisecond"===(t=V(t)||"millisecond")?this.valueOf()===s.valueOf():(n=s.valueOf(),this.clone().startOf(t).valueOf()<=n&&n<=this.clone().endOf(t).valueOf()))},pn.isSameOrAfter=function(e,t){return this.isSame(e,t)||this.isAfter(e,t)},pn.isSameOrBefore=function(e,t){return this.isSame(e,t)||this.isBefore(e,t)},pn.isValid=function(){return g(this)},pn.lang=nn,pn.locale=tn,pn.localeData=sn,pn.max=Pt,pn.min=Nt,pn.parsingFlags=function(){return c({},y(this))},pn.set=function(e,t){if("object"==typeof e)for(var n=function(e){var t,n=[];for(t in e)m(e,t)&&n.push({unit:t,priority:E[t]});return n.sort(function(e,t){return e.priority-t.priority}),n}(e=G(e)),s=0;s<n.length;s++)this[n[s].unit](e[n[s].unit]);else if(O(this[e=V(e)]))return this[e](t);return this},pn.startOf=function(e){var t,n;if(void 0===(e=V(e))||"millisecond"===e||!this.isValid())return this;switch(n=this._isUTC?un:on,e){case"year":t=n(this.year(),0,1);break;case"quarter":t=n(this.year(),this.month()-this.month()%3,1);break;case"month":t=n(this.year(),this.month(),1);break;case"week":t=n(this.year(),this.month(),this.date()-this.weekday());break;case"isoWeek":t=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1));break;case"day":case"date":t=n(this.year(),this.month(),this.date());break;case"hour":t=this._d.valueOf(),t-=an(t+(this._isUTC?0:6e4*this.utcOffset()),36e5);break;case"minute":t=this._d.valueOf(),t-=an(t,6e4);break;case"second":t=this._d.valueOf(),t-=an(t,1e3);break}return this._d.setTime(t),f.updateOffset(this,!0),this},pn.subtract=Qt,pn.toArray=function(){var e=this;return[e.year(),e.month(),e.date(),e.hour(),e.minute(),e.second(),e.millisecond()]},pn.toObject=function(){var e=this;return{years:e.year(),months:e.month(),date:e.date(),hours:e.hours(),minutes:e.minutes(),seconds:e.seconds(),milliseconds:e.milliseconds()}},pn.toDate=function(){return new Date(this.valueOf())},pn.toISOString=function(e){if(!this.isValid())return null;var t=!0!==e,n=t?this.clone().utc():this;return n.year()<0||9999<n.year()?U(n,t?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):O(Date.prototype.toISOString)?t?this.toDate().toISOString():new Date(this.valueOf()+60*this.utcOffset()*1e3).toISOString().replace("Z",U(n,"Z")):U(n,t?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")},pn.inspect=function(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var e,t,n,s="moment",i="";return this.isLocal()||(s=0===this.utcOffset()?"moment.utc":"moment.parseZone",i="Z"),e="["+s+'("]',t=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",n=i+'[")]',this.format(e+t+"-MM-DD[T]HH:mm:ss.SSS"+n)},"undefined"!=typeof Symbol&&null!=Symbol.for&&(pn[Symbol.for("nodejs.util.inspect.custom")]=function(){return"Moment<"+this.format()+">"}),pn.toJSON=function(){return this.isValid()?this.toISOString():null},pn.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},pn.unix=function(){return Math.floor(this.valueOf()/1e3)},pn.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},pn.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},pn.eraName=function(){for(var e,t=this.localeData().eras(),n=0,s=t.length;n<s;++n){if(e=this.clone().startOf("day").valueOf(),t[n].since<=e&&e<=t[n].until)return t[n].name;if(t[n].until<=e&&e<=t[n].since)return t[n].name}return""},pn.eraNarrow=function(){for(var e,t=this.localeData().eras(),n=0,s=t.length;n<s;++n){if(e=this.clone().startOf("day").valueOf(),t[n].since<=e&&e<=t[n].until)return t[n].narrow;if(t[n].until<=e&&e<=t[n].since)return t[n].narrow}return""},pn.eraAbbr=function(){for(var e,t=this.localeData().eras(),n=0,s=t.length;n<s;++n){if(e=this.clone().startOf("day").valueOf(),t[n].since<=e&&e<=t[n].until)return t[n].abbr;if(t[n].until<=e&&e<=t[n].since)return t[n].abbr}return""},pn.eraYear=function(){for(var e,t,n=this.localeData().eras(),s=0,i=n.length;s<i;++s)if(e=n[s].since<=n[s].until?1:-1,t=this.clone().startOf("day").valueOf(),n[s].since<=t&&t<=n[s].until||n[s].until<=t&&t<=n[s].since)return(this.year()-f(n[s].since).year())*e+n[s].offset;return this.year()},pn.year=Le,pn.isLeapYear=function(){return j(this.year())},pn.weekYear=function(e){return cn.call(this,e,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)},pn.isoWeekYear=function(e){return cn.call(this,e,this.isoWeek(),this.isoWeekday(),1,4)},pn.quarter=pn.quarters=function(e){return null==e?Math.ceil((this.month()+1)/3):this.month(3*(e-1)+this.month()%3)},pn.month=Ue,pn.daysInMonth=function(){return xe(this.year(),this.month())},pn.week=pn.weeks=function(e){var t=this.localeData().week(this);return null==e?t:this.add(7*(e-t),"d")},pn.isoWeek=pn.isoWeeks=function(e){var t=Ae(this,1,4).week;return null==e?t:this.add(7*(e-t),"d")},pn.weeksInYear=function(){var e=this.localeData()._week;return je(this.year(),e.dow,e.doy)},pn.weeksInWeekYear=function(){var e=this.localeData()._week;return je(this.weekYear(),e.dow,e.doy)},pn.isoWeeksInYear=function(){return je(this.year(),1,4)},pn.isoWeeksInISOWeekYear=function(){return je(this.isoWeekYear(),1,4)},pn.date=fn,pn.day=pn.days=function(e){if(!this.isValid())return null!=e?this:NaN;var t,n,s=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=e?(t=e,n=this.localeData(),e="string"!=typeof t?t:isNaN(t)?"number"==typeof(t=n.weekdaysParse(t))?t:null:parseInt(t,10),this.add(e-s,"d")):s},pn.weekday=function(e){if(!this.isValid())return null!=e?this:NaN;var t=(this.day()+7-this.localeData()._week.dow)%7;return null==e?t:this.add(e-t,"d")},pn.isoWeekday=function(e){if(!this.isValid())return null!=e?this:NaN;if(null==e)return this.day()||7;var t,n,s=(t=e,n=this.localeData(),"string"==typeof t?n.weekdaysParse(t)%7||7:isNaN(t)?null:t);return this.day(this.day()%7?s:s-7)},pn.dayOfYear=function(e){var t=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==e?t:this.add(e-t,"d")},pn.hour=pn.hours=tt,pn.minute=pn.minutes=mn,pn.second=pn.seconds=gn,pn.millisecond=pn.milliseconds=yn,pn.utcOffset=function(e,t,n){var s,i=this._offset||0;if(!this.isValid())return null!=e?this:NaN;if(null==e)return this._isUTC?i:Et(this);if("string"==typeof e){if(null===(e=Vt(he,e)))return this}else Math.abs(e)<16&&!n&&(e*=60);return!this._isUTC&&t&&(s=Et(this)),this._offset=e,this._isUTC=!0,null!=s&&this.add(s,"m"),i!==e&&(!t||this._changeInProgress?Bt(this,Zt(e-i,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,f.updateOffset(this,!0),this._changeInProgress=null)),this},pn.utc=function(e){return this.utcOffset(0,e)},pn.local=function(e){return this._isUTC&&(this.utcOffset(0,e),this._isUTC=!1,e&&this.subtract(Et(this),"m")),this},pn.parseZone=function(){var e;return null!=this._tzm?this.utcOffset(this._tzm,!1,!0):"string"==typeof this._i&&(null!=(e=Vt(le,this._i))?this.utcOffset(e):this.utcOffset(0,!0)),this},pn.hasAlignedHourOffset=function(e){return!!this.isValid()&&(e=e?Tt(e).utcOffset():0,(this.utcOffset()-e)%60==0)},pn.isDST=function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},pn.isLocal=function(){return!!this.isValid()&&!this._isUTC},pn.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},pn.isUtc=At,pn.isUTC=At,pn.zoneAbbr=function(){return this._isUTC?"UTC":""},pn.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},pn.dates=n("dates accessor is deprecated. Use date instead.",fn),pn.months=n("months accessor is deprecated. Use month instead",Ue),pn.years=n("years accessor is deprecated. Use year instead",Le),pn.zone=n("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",function(e,t){return null!=e?("string"!=typeof e&&(e=-e),this.utcOffset(e,t),this):-this.utcOffset()}),pn.isDSTShifted=n("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",function(){if(!r(this._isDSTShifted))return this._isDSTShifted;var e,t={};return v(t,this),(t=bt(t))._a?(e=(t._isUTC?_:Tt)(t._a),this._isDSTShifted=this.isValid()&&0<function(e,t,n){for(var s=Math.min(e.length,t.length),i=Math.abs(e.length-t.length),r=0,a=0;a<s;a++)(n&&e[a]!==t[a]||!n&&Z(e[a])!==Z(t[a]))&&r++;return r+i}(t._a,e.toArray())):this._isDSTShifted=!1,this._isDSTShifted});var kn=x.prototype;function Mn(e,t,n,s){var i=dt(),r=_().set(s,t);return i[n](r,e)}function Dn(e,t,n){if(h(e)&&(t=e,e=void 0),e=e||"",null!=t)return Mn(e,t,n,"month");for(var s=[],i=0;i<12;i++)s[i]=Mn(e,i,n,"month");return s}function Sn(e,t,n,s){t=("boolean"==typeof e?h(t)&&(n=t,t=void 0):(t=e,e=!1,h(n=t)&&(n=t,t=void 0)),t||"");var i,r=dt(),a=e?r._week.dow:0,o=[];if(null!=n)return Mn(t,(n+a)%7,s,"day");for(i=0;i<7;i++)o[i]=Mn(t,(i+a)%7,s,"day");return o}kn.calendar=function(e,t,n){var s=this._calendar[e]||this._calendar.sameElse;return O(s)?s.call(t,n):s},kn.longDateFormat=function(e){var t=this._longDateFormat[e],n=this._longDateFormat[e.toUpperCase()];return t||!n?t:(this._longDateFormat[e]=n.match(N).map(function(e){return"MMMM"===e||"MM"===e||"DD"===e||"dddd"===e?e.slice(1):e}).join(""),this._longDateFormat[e])},kn.invalidDate=function(){return this._invalidDate},kn.ordinal=function(e){return this._ordinal.replace("%d",e)},kn.preparse=vn,kn.postformat=vn,kn.relativeTime=function(e,t,n,s){var i=this._relativeTime[n];return O(i)?i(e,t,n,s):i.replace(/%d/i,e)},kn.pastFuture=function(e,t){var n=this._relativeTime[0<e?"future":"past"];return O(n)?n(t):n.replace(/%s/i,t)},kn.set=function(e){var t,n;for(n in e)m(e,n)&&(O(t=e[n])?this[n]=t:this["_"+n]=t);this._config=e,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)},kn.eras=function(e,t){for(var n,s=this._eras||dt("en")._eras,i=0,r=s.length;i<r;++i){switch(typeof s[i].since){case"string":n=f(s[i].since).startOf("day"),s[i].since=n.valueOf();break}switch(typeof s[i].until){case"undefined":s[i].until=1/0;break;case"string":n=f(s[i].until).startOf("day").valueOf(),s[i].until=n.valueOf();break}}return s},kn.erasParse=function(e,t,n){var s,i,r,a,o,u=this.eras();for(e=e.toUpperCase(),s=0,i=u.length;s<i;++s)if(r=u[s].name.toUpperCase(),a=u[s].abbr.toUpperCase(),o=u[s].narrow.toUpperCase(),n)switch(t){case"N":case"NN":case"NNN":if(a===e)return u[s];break;case"NNNN":if(r===e)return u[s];break;case"NNNNN":if(o===e)return u[s];break}else if(0<=[r,a,o].indexOf(e))return u[s]},kn.erasConvertYear=function(e,t){var n=e.since<=e.until?1:-1;return void 0===t?f(e.since).year():f(e.since).year()+(t-e.offset)*n},kn.erasAbbrRegex=function(e){return m(this,"_erasAbbrRegex")||hn.call(this),e?this._erasAbbrRegex:this._erasRegex},kn.erasNameRegex=function(e){return m(this,"_erasNameRegex")||hn.call(this),e?this._erasNameRegex:this._erasRegex},kn.erasNarrowRegex=function(e){return m(this,"_erasNarrowRegex")||hn.call(this),e?this._erasNarrowRegex:this._erasRegex},kn.months=function(e,t){return e?o(this._months)?this._months[e.month()]:this._months[(this._months.isFormat||Pe).test(t)?"format":"standalone"][e.month()]:o(this._months)?this._months:this._months.standalone},kn.monthsShort=function(e,t){return e?o(this._monthsShort)?this._monthsShort[e.month()]:this._monthsShort[Pe.test(t)?"format":"standalone"][e.month()]:o(this._monthsShort)?this._monthsShort:this._monthsShort.standalone},kn.monthsParse=function(e,t,n){var s,i,r;if(this._monthsParseExact)return function(e,t,n){var s,i,r,a=e.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],s=0;s<12;++s)r=_([2e3,s]),this._shortMonthsParse[s]=this.monthsShort(r,"").toLocaleLowerCase(),this._longMonthsParse[s]=this.months(r,"").toLocaleLowerCase();return n?"MMM"===t?-1!==(i=we.call(this._shortMonthsParse,a))?i:null:-1!==(i=we.call(this._longMonthsParse,a))?i:null:"MMM"===t?-1!==(i=we.call(this._shortMonthsParse,a))||-1!==(i=we.call(this._longMonthsParse,a))?i:null:-1!==(i=we.call(this._longMonthsParse,a))||-1!==(i=we.call(this._shortMonthsParse,a))?i:null}.call(this,e,t,n);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),s=0;s<12;s++){if(i=_([2e3,s]),n&&!this._longMonthsParse[s]&&(this._longMonthsParse[s]=new RegExp("^"+this.months(i,"").replace(".","")+"$","i"),this._shortMonthsParse[s]=new RegExp("^"+this.monthsShort(i,"").replace(".","")+"$","i")),n||this._monthsParse[s]||(r="^"+this.months(i,"")+"|^"+this.monthsShort(i,""),this._monthsParse[s]=new RegExp(r.replace(".",""),"i")),n&&"MMMM"===t&&this._longMonthsParse[s].test(e))return s;if(n&&"MMM"===t&&this._shortMonthsParse[s].test(e))return s;if(!n&&this._monthsParse[s].test(e))return s}},kn.monthsRegex=function(e){return this._monthsParseExact?(m(this,"_monthsRegex")||He.call(this),e?this._monthsStrictRegex:this._monthsRegex):(m(this,"_monthsRegex")||(this._monthsRegex=We),this._monthsStrictRegex&&e?this._monthsStrictRegex:this._monthsRegex)},kn.monthsShortRegex=function(e){return this._monthsParseExact?(m(this,"_monthsRegex")||He.call(this),e?this._monthsShortStrictRegex:this._monthsShortRegex):(m(this,"_monthsShortRegex")||(this._monthsShortRegex=Re),this._monthsShortStrictRegex&&e?this._monthsShortStrictRegex:this._monthsShortRegex)},kn.week=function(e){return Ae(e,this._week.dow,this._week.doy).week},kn.firstDayOfYear=function(){return this._week.doy},kn.firstDayOfWeek=function(){return this._week.dow},kn.weekdays=function(e,t){var n=o(this._weekdays)?this._weekdays:this._weekdays[e&&!0!==e&&this._weekdays.isFormat.test(t)?"format":"standalone"];return!0===e?Ie(n,this._week.dow):e?n[e.day()]:n},kn.weekdaysMin=function(e){return!0===e?Ie(this._weekdaysMin,this._week.dow):e?this._weekdaysMin[e.day()]:this._weekdaysMin},kn.weekdaysShort=function(e){return!0===e?Ie(this._weekdaysShort,this._week.dow):e?this._weekdaysShort[e.day()]:this._weekdaysShort},kn.weekdaysParse=function(e,t,n){var s,i,r;if(this._weekdaysParseExact)return function(e,t,n){var s,i,r,a=e.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],s=0;s<7;++s)r=_([2e3,1]).day(s),this._minWeekdaysParse[s]=this.weekdaysMin(r,"").toLocaleLowerCase(),this._shortWeekdaysParse[s]=this.weekdaysShort(r,"").toLocaleLowerCase(),this._weekdaysParse[s]=this.weekdays(r,"").toLocaleLowerCase();return n?"dddd"===t?-1!==(i=we.call(this._weekdaysParse,a))?i:null:"ddd"===t?-1!==(i=we.call(this._shortWeekdaysParse,a))?i:null:-1!==(i=we.call(this._minWeekdaysParse,a))?i:null:"dddd"===t?-1!==(i=we.call(this._weekdaysParse,a))||-1!==(i=we.call(this._shortWeekdaysParse,a))||-1!==(i=we.call(this._minWeekdaysParse,a))?i:null:"ddd"===t?-1!==(i=we.call(this._shortWeekdaysParse,a))||-1!==(i=we.call(this._weekdaysParse,a))||-1!==(i=we.call(this._minWeekdaysParse,a))?i:null:-1!==(i=we.call(this._minWeekdaysParse,a))||-1!==(i=we.call(this._weekdaysParse,a))||-1!==(i=we.call(this._shortWeekdaysParse,a))?i:null}.call(this,e,t,n);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),s=0;s<7;s++){if(i=_([2e3,1]).day(s),n&&!this._fullWeekdaysParse[s]&&(this._fullWeekdaysParse[s]=new RegExp("^"+this.weekdays(i,"").replace(".","\\.?")+"$","i"),this._shortWeekdaysParse[s]=new RegExp("^"+this.weekdaysShort(i,"").replace(".","\\.?")+"$","i"),this._minWeekdaysParse[s]=new RegExp("^"+this.weekdaysMin(i,"").replace(".","\\.?")+"$","i")),this._weekdaysParse[s]||(r="^"+this.weekdays(i,"")+"|^"+this.weekdaysShort(i,"")+"|^"+this.weekdaysMin(i,""),this._weekdaysParse[s]=new RegExp(r.replace(".",""),"i")),n&&"dddd"===t&&this._fullWeekdaysParse[s].test(e))return s;if(n&&"ddd"===t&&this._shortWeekdaysParse[s].test(e))return s;if(n&&"dd"===t&&this._minWeekdaysParse[s].test(e))return s;if(!n&&this._weekdaysParse[s].test(e))return s}},kn.weekdaysRegex=function(e){return this._weekdaysParseExact?(m(this,"_weekdaysRegex")||Qe.call(this),e?this._weekdaysStrictRegex:this._weekdaysRegex):(m(this,"_weekdaysRegex")||(this._weekdaysRegex=qe),this._weekdaysStrictRegex&&e?this._weekdaysStrictRegex:this._weekdaysRegex)},kn.weekdaysShortRegex=function(e){return this._weekdaysParseExact?(m(this,"_weekdaysRegex")||Qe.call(this),e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(m(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=Be),this._weekdaysShortStrictRegex&&e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)},kn.weekdaysMinRegex=function(e){return this._weekdaysParseExact?(m(this,"_weekdaysRegex")||Qe.call(this),e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(m(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=Je),this._weekdaysMinStrictRegex&&e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)},kn.isPM=function(e){return"p"===(e+"").toLowerCase().charAt(0)},kn.meridiem=function(e,t,n){return 11<e?n?"pm":"PM":n?"am":"AM"},lt("en",{eras:[{since:"0001-01-01",until:1/0,offset:1,name:"Anno Domini",narrow:"AD",abbr:"AD"},{since:"0000-12-31",until:-1/0,offset:1,name:"Before Christ",narrow:"BC",abbr:"BC"}],dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(e){var t=e%10;return e+(1===Z(e%100/10)?"th":1==t?"st":2==t?"nd":3==t?"rd":"th")}}),f.lang=n("moment.lang is deprecated. Use moment.locale instead.",lt),f.langData=n("moment.langData is deprecated. Use moment.localeData instead.",dt);var Yn=Math.abs;function On(e,t,n,s){var i=Zt(t,n);return e._milliseconds+=s*i._milliseconds,e._days+=s*i._days,e._months+=s*i._months,e._bubble()}function bn(e){return e<0?Math.floor(e):Math.ceil(e)}function xn(e){return 4800*e/146097}function Tn(e){return 146097*e/4800}function Nn(e){return function(){return this.as(e)}}var Pn=Nn("ms"),Rn=Nn("s"),Wn=Nn("m"),Cn=Nn("h"),Un=Nn("d"),Hn=Nn("w"),Fn=Nn("M"),Ln=Nn("Q"),Vn=Nn("y");function Gn(e){return function(){return this.isValid()?this._data[e]:NaN}}var En=Gn("milliseconds"),An=Gn("seconds"),jn=Gn("minutes"),In=Gn("hours"),Zn=Gn("days"),zn=Gn("months"),$n=Gn("years");var qn=Math.round,Bn={ss:44,s:45,m:45,h:22,d:26,w:null,M:11};function Jn(e,t,n,s){var i=Zt(e).abs(),r=qn(i.as("s")),a=qn(i.as("m")),o=qn(i.as("h")),u=qn(i.as("d")),l=qn(i.as("M")),h=qn(i.as("w")),d=qn(i.as("y")),c=(r<=n.ss?["s",r]:r<n.s&&["ss",r])||a<=1&&["m"]||a<n.m&&["mm",a]||o<=1&&["h"]||o<n.h&&["hh",o]||u<=1&&["d"]||u<n.d&&["dd",u];return null!=n.w&&(c=c||h<=1&&["w"]||h<n.w&&["ww",h]),(c=c||l<=1&&["M"]||l<n.M&&["MM",l]||d<=1&&["y"]||["yy",d])[2]=t,c[3]=0<+e,c[4]=s,function(e,t,n,s,i){return i.relativeTime(t||1,!!n,e,s)}.apply(null,c)}var Qn=Math.abs;function Xn(e){return(0<e)-(e<0)||+e}function Kn(){if(!this.isValid())return this.localeData().invalidDate();var e,t,n,s,i,r,a,o,u=Qn(this._milliseconds)/1e3,l=Qn(this._days),h=Qn(this._months),d=this.asSeconds();return d?(e=I(u/60),t=I(e/60),u%=60,e%=60,n=I(h/12),h%=12,s=u?u.toFixed(3).replace(/\.?0+$/,""):"",i=d<0?"-":"",r=Xn(this._months)!==Xn(d)?"-":"",a=Xn(this._days)!==Xn(d)?"-":"",o=Xn(this._milliseconds)!==Xn(d)?"-":"",i+"P"+(n?r+n+"Y":"")+(h?r+h+"M":"")+(l?a+l+"D":"")+(t||e||u?"T":"")+(t?o+t+"H":"")+(e?o+e+"M":"")+(u?o+s+"S":"")):"P0D"}var es=Ct.prototype;return es.isValid=function(){return this._isValid},es.abs=function(){var e=this._data;return this._milliseconds=Yn(this._milliseconds),this._days=Yn(this._days),this._months=Yn(this._months),e.milliseconds=Yn(e.milliseconds),e.seconds=Yn(e.seconds),e.minutes=Yn(e.minutes),e.hours=Yn(e.hours),e.months=Yn(e.months),e.years=Yn(e.years),this},es.add=function(e,t){return On(this,e,t,1)},es.subtract=function(e,t){return On(this,e,t,-1)},es.as=function(e){if(!this.isValid())return NaN;var t,n,s=this._milliseconds;if("month"===(e=V(e))||"quarter"===e||"year"===e)switch(t=this._days+s/864e5,n=this._months+xn(t),e){case"month":return n;case"quarter":return n/3;case"year":return n/12}else switch(t=this._days+Math.round(Tn(this._months)),e){case"week":return t/7+s/6048e5;case"day":return t+s/864e5;case"hour":return 24*t+s/36e5;case"minute":return 1440*t+s/6e4;case"second":return 86400*t+s/1e3;case"millisecond":return Math.floor(864e5*t)+s;default:throw new Error("Unknown unit "+e)}},es.asMilliseconds=Pn,es.asSeconds=Rn,es.asMinutes=Wn,es.asHours=Cn,es.asDays=Un,es.asWeeks=Hn,es.asMonths=Fn,es.asQuarters=Ln,es.asYears=Vn,es.valueOf=function(){return this.isValid()?this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*Z(this._months/12):NaN},es._bubble=function(){var e,t,n,s,i,r=this._milliseconds,a=this._days,o=this._months,u=this._data;return 0<=r&&0<=a&&0<=o||r<=0&&a<=0&&o<=0||(r+=864e5*bn(Tn(o)+a),o=a=0),u.milliseconds=r%1e3,e=I(r/1e3),u.seconds=e%60,t=I(e/60),u.minutes=t%60,n=I(t/60),u.hours=n%24,a+=I(n/24),o+=i=I(xn(a)),a-=bn(Tn(i)),s=I(o/12),o%=12,u.days=a,u.months=o,u.years=s,this},es.clone=function(){return Zt(this)},es.get=function(e){return e=V(e),this.isValid()?this[e+"s"]():NaN},es.milliseconds=En,es.seconds=An,es.minutes=jn,es.hours=In,es.days=Zn,es.weeks=function(){return I(this.days()/7)},es.months=zn,es.years=$n,es.humanize=function(e,t){if(!this.isValid())return this.localeData().invalidDate();var n,s,i=!1,r=Bn;return"object"==typeof e&&(t=e,e=!1),"boolean"==typeof e&&(i=e),"object"==typeof t&&(r=Object.assign({},Bn,t),null!=t.s&&null==t.ss&&(r.ss=t.s-1)),n=this.localeData(),s=Jn(this,!i,r,n),i&&(s=n.pastFuture(+this,s)),n.postformat(s)},es.toISOString=Kn,es.toString=Kn,es.toJSON=Kn,es.locale=tn,es.localeData=sn,es.toIsoString=n("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",Kn),es.lang=nn,C("X",0,0,"unix"),C("x",0,0,"valueOf"),ce("x",ue),ce("X",/[+-]?\d+(\.\d{1,3})?/),ye("X",function(e,t,n){n._d=new Date(1e3*parseFloat(e))}),ye("x",function(e,t,n){n._d=new Date(Z(e))}),f.version="2.29.1",e=Tt,f.fn=pn,f.min=function(){return Rt("isBefore",[].slice.call(arguments,0))},f.max=function(){return Rt("isAfter",[].slice.call(arguments,0))},f.now=function(){return Date.now?Date.now():+new Date},f.utc=_,f.unix=function(e){return Tt(1e3*e)},f.months=function(e,t){return Dn(e,t,"months")},f.isDate=a,f.locale=lt,f.invalid=w,f.duration=Zt,f.isMoment=M,f.weekdays=function(e,t,n){return Sn(e,t,n,"weekdays")},f.parseZone=function(){return Tt.apply(null,arguments).parseZone()},f.localeData=dt,f.isDuration=Ut,f.monthsShort=function(e,t){return Dn(e,t,"monthsShort")},f.weekdaysMin=function(e,t,n){return Sn(e,t,n,"weekdaysMin")},f.defineLocale=ht,f.updateLocale=function(e,t){var n,s,i;return null!=t?(i=st,null!=it[e]&&null!=it[e].parentLocale?it[e].set(b(it[e]._config,t)):(null!=(s=ut(e))&&(i=s._config),t=b(i,t),null==s&&(t.abbr=e),(n=new x(t)).parentLocale=it[e],it[e]=n),lt(e)):null!=it[e]&&(null!=it[e].parentLocale?(it[e]=it[e].parentLocale,e===lt()&&lt(e)):null!=it[e]&&delete it[e]),it[e]},f.locales=function(){return s(it)},f.weekdaysShort=function(e,t,n){return Sn(e,t,n,"weekdaysShort")},f.normalizeUnits=V,f.relativeTimeRounding=function(e){return void 0===e?qn:"function"==typeof e&&(qn=e,!0)},f.relativeTimeThreshold=function(e,t){return void 0!==Bn[e]&&(void 0===t?Bn[e]:(Bn[e]=t,"s"===e&&(Bn.ss=t-1),!0))},f.calendarFormat=function(e,t){var n=e.diff(t,"days",!0);return n<-6?"sameElse":n<-1?"lastWeek":n<0?"lastDay":n<1?"sameDay":n<2?"nextDay":n<7?"nextWeek":"sameElse"},f.prototype=pn,f.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"GGGG-[W]WW",MONTH:"YYYY-MM"},f});
+//# sourceMappingURL=moment.min.js.map
\ No newline at end of file
diff --git a/app/webroot/js/moment.min.js.map b/app/webroot/js/moment.min.js.map
new file mode 100644
index 000000000..63a72d8f8
--- /dev/null
+++ b/app/webroot/js/moment.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"moment.min.js","sources":["../moment.js"],"names":["global","factory","exports","module","define","amd","moment","this","hookCallback","some","hooks","apply","arguments","isArray","input","Array","Object","prototype","toString","call","isObject","hasOwnProp","a","b","hasOwnProperty","isObjectEmpty","obj","getOwnPropertyNames","length","k","isUndefined","isNumber","isDate","Date","map","arr","fn","res","i","push","extend","valueOf","createUTC","format","locale","strict","createLocalOrUTC","utc","getParsingFlags","m","_pf","empty","unusedTokens","unusedInput","overflow","charsLeftOver","nullInput","invalidEra","invalidMonth","invalidFormat","userInvalidated","iso","parsedDateParts","era","meridiem","rfc2822","weekdayMismatch","isValid","_isValid","flags","parsedParts","isNowValid","isNaN","_d","getTime","invalidWeekday","_strict","undefined","bigHour","isFrozen","createInvalid","NaN","fun","t","len","momentProperties","updateInProgress","copyConfig","to","from","prop","val","_isAMomentObject","_i","_f","_l","_tzm","_isUTC","_offset","_locale","Moment","config","updateOffset","isMoment","warn","msg","suppressDeprecationWarnings","console","deprecate","firstTime","deprecationHandler","arg","key","args","slice","join","Error","stack","keys","deprecations","deprecateSimple","name","isFunction","Function","mergeConfigs","parentConfig","childConfig","Locale","set","zeroFill","number","targetLength","forceSign","absNumber","Math","abs","zerosToFill","pow","max","substr","formattingTokens","localFormattingTokens","formatFunctions","formatTokenFunctions","addFormatToken","token","padded","ordinal","callback","func","localeData","formatMoment","expandFormat","array","match","replace","mom","output","makeFormatFunction","invalidDate","replaceLongDateFormatTokens","longDateFormat","lastIndex","test","aliases","addUnitAlias","unit","shorthand","lowerCase","toLowerCase","normalizeUnits","units","normalizeObjectUnits","inputObject","normalizedProp","normalizedInput","priorities","addUnitPriority","priority","isLeapYear","year","absFloor","ceil","floor","toInt","argumentForCoercion","coercedNumber","value","isFinite","makeGetSet","keepTime","set$1","get","month","date","daysInMonth","regexes","match1","match2","match3","match4","match6","match1to2","match3to4","match5to6","match1to3","match1to4","match1to6","matchUnsigned","matchSigned","matchOffset","matchShortOffset","matchWord","addRegexToken","regex","strictRegex","isStrict","getParseRegexForToken","RegExp","regexEscape","matched","p1","p2","p3","p4","s","tokens","addParseToken","addWeekParseToken","_w","indexOf","YEAR","MONTH","DATE","HOUR","MINUTE","SECOND","MILLISECOND","WEEK","WEEKDAY","x","modMonth","o","monthsShort","months","monthsShortRegex","monthsRegex","monthsParse","defaultLocaleMonths","split","defaultLocaleMonthsShort","MONTHS_IN_FORMAT","defaultMonthsShortRegex","defaultMonthsRegex","setMonth","dayOfMonth","min","getSetMonth","computeMonthsParse","cmpLenRev","shortPieces","longPieces","mixedPieces","sort","_monthsRegex","_monthsShortRegex","_monthsStrictRegex","_monthsShortStrictRegex","daysInYear","y","parseTwoDigitYear","parseInt","getSetYear","createUTCDate","UTC","getUTCFullYear","setUTCFullYear","firstWeekOffset","dow","doy","fwd","getUTCDay","dayOfYearFromWeeks","week","weekday","resYear","dayOfYear","resDayOfYear","weekOfYear","resWeek","weekOffset","weeksInYear","weekOffsetNext","shiftWeekdays","ws","n","concat","weekdaysMin","weekdaysShort","weekdays","weekdaysMinRegex","weekdaysShortRegex","weekdaysRegex","weekdaysParse","d","defaultLocaleWeekdays","defaultLocaleWeekdaysShort","defaultLocaleWeekdaysMin","defaultWeekdaysRegex","defaultWeekdaysShortRegex","defaultWeekdaysMinRegex","computeWeekdaysParse","minp","shortp","longp","minPieces","day","_weekdaysRegex","_weekdaysShortRegex","_weekdaysMinRegex","_weekdaysStrictRegex","_weekdaysShortStrictRegex","_weekdaysMinStrictRegex","hFormat","hours","lowercase","minutes","matchMeridiem","_meridiemParse","seconds","kInput","_isPm","isPM","_meridiem","pos","pos1","pos2","getSetHour","globalLocale","baseConfig","calendar","sameDay","nextDay","nextWeek","lastDay","lastWeek","sameElse","LTS","LT","L","LL","LLL","LLLL","dayOfMonthOrdinalParse","relativeTime","future","past","ss","mm","h","hh","dd","w","ww","M","MM","yy","meridiemParse","locales","localeFamilies","normalizeLocale","chooseLocale","names","j","next","loadLocale","arr1","arr2","minl","commonPrefix","oldLocale","_abbr","require","getSetGlobalLocale","e","values","data","getLocale","defineLocale","abbr","_config","parentLocale","forEach","checkOverflow","_a","_overflowDayOfYear","_overflowWeeks","_overflowWeekday","extendedIsoRegex","basicIsoRegex","tzRegex","isoDates","isoTimes","aspNetJsonRegex","obsOffsets","UT","GMT","EDT","EST","CDT","CST","MDT","MST","PDT","PST","configFromISO","l","allowTime","dateFormat","timeFormat","tzFormat","string","exec","configFromStringAndFormat","extractFromRFC2822Strings","yearStr","monthStr","dayStr","hourStr","minuteStr","secondStr","result","untruncateYear","configFromRFC2822","parsedArray","weekdayStr","parsedInput","getDay","obsOffset","militaryOffset","numOffset","hm","calculateOffset","setUTCMinutes","getUTCMinutes","defaults","c","configFromArray","currentDate","expectedWeekday","yearToUse","nowValue","now","_useUTC","getUTCMonth","getUTCDate","getFullYear","getMonth","getDate","weekYear","temp","weekdayOverflow","curWeek","GG","W","E","createLocal","_week","gg","_dayOfYear","dayOfYearFromWeekInfo","_nextDay","ms","setFullYear","ISO_8601","RFC_2822","skipped","stringLength","totalParsedInputLength","hour","isPm","meridiemHour","meridiemFixWrap","erasConvertYear","prepareConfig","preparse","tempConfig","bestMoment","scoreToBeat","currentScore","validFormatFound","bestFormatIsValid","score","configFromStringAndArray","createFromInputFallback","configFromString","dayOrDate","minute","second","millisecond","configFromObject","isUTC","add","prototypeMin","other","prototypeMax","pickBy","moments","ordering","Duration","duration","years","quarters","quarter","weeks","isoWeek","days","milliseconds","unitHasDecimal","parseFloat","isDurationValid","_milliseconds","_days","_months","_data","_bubble","isDuration","absRound","round","offset","separator","utcOffset","sign","offsetFromString","chunkOffset","matcher","parts","matches","cloneWithOffset","model","diff","clone","setTime","local","getDateOffset","getTimezoneOffset","isUtc","aspNetRegex","isoRegex","createDuration","ret","diffRes","parseIso","base","isBefore","positiveMomentsDifference","momentsDifference","inp","isAfter","createAdder","direction","period","tmp","addSubtract","isAdding","invalid","subtract","isString","String","isMomentInput","arrayTest","dataTypeTest","filter","item","isNumberOrStringArray","property","objectTest","propertyTest","properties","isMomentInputObject","monthDiff","wholeMonthDiff","anchor","adjust","newLocaleData","defaultFormat","defaultFormatUtc","lang","MS_PER_400_YEARS","mod$1","dividend","divisor","localStartOfDate","utcStartOfDate","matchEraAbbr","erasAbbrRegex","computeErasParse","abbrPieces","namePieces","narrowPieces","eras","narrow","_erasRegex","_erasNameRegex","_erasAbbrRegex","_erasNarrowRegex","addWeekYearFormatToken","getter","getSetWeekYearHelper","weeksTarget","dayOfYearData","erasNameRegex","erasNarrowRegex","erasParse","_eraYearOrdinalRegex","eraYearOrdinalParse","isoWeekYear","_dayOfMonthOrdinalParse","_ordinalParse","_dayOfMonthOrdinalParseLenient","getSetDayOfMonth","getSetMinute","getSetMillisecond","getSetSecond","parseMs","proto","preParsePostFormat","time","formats","isCalendarSpec","sod","startOf","calendarFormat","asFloat","that","zoneDelta","endOf","startOfDate","isoWeekday","inputString","postformat","withoutSuffix","humanize","fromNow","toNow","invalidAt","localInput","isBetween","inclusivity","localFrom","localTo","isSame","inputMs","isSameOrAfter","isSameOrBefore","parsingFlags","prioritized","unitsObj","u","getPrioritizedUnits","toArray","toObject","toDate","toISOString","keepOffset","inspect","prefix","suffix","zone","isLocal","Symbol","for","toJSON","unix","creationData","eraName","since","until","eraNarrow","eraAbbr","eraYear","dir","isoWeeks","weekInfo","weeksInWeekYear","isoWeeksInYear","isoWeeksInISOWeekYear","keepLocalTime","keepMinutes","localAdjust","_changeInProgress","parseZone","tZone","hasAlignedHourOffset","isDST","isUtcOffset","zoneAbbr","zoneName","dates","isDSTShifted","_isDSTShifted","array1","array2","dontConvert","lengthDiff","diffs","compareArrays","proto$1","get$1","index","field","setter","listMonthsImpl","out","listWeekdaysImpl","localeSorted","shift","_calendar","_longDateFormat","formatUpper","toUpperCase","tok","_invalidDate","_ordinal","isFuture","_relativeTime","pastFuture","source","_eras","Infinity","isFormat","_monthsShort","monthName","_monthsParseExact","ii","llc","toLocaleLowerCase","_monthsParse","_longMonthsParse","_shortMonthsParse","firstDayOfYear","firstDayOfWeek","_weekdays","_weekdaysMin","_weekdaysShort","weekdayName","_weekdaysParseExact","_weekdaysParse","_shortWeekdaysParse","_minWeekdaysParse","_fullWeekdaysParse","charAt","isLower","langData","mathAbs","addSubtract$1","absCeil","daysToMonths","monthsToDays","makeAs","alias","as","asMilliseconds","asSeconds","asMinutes","asHours","asDays","asWeeks","asMonths","asQuarters","asYears","makeGetter","thresholds","relativeTime$1","posNegDuration","abs$1","toISOString$1","totalSign","ymSign","daysSign","hmsSign","total","toFixed","proto$2","monthsFromDays","argWithSuffix","argThresholds","withSuffix","th","assign","toIsoString","version","updateLocale","tmpLocale","relativeTimeRounding","roundingFunction","relativeTimeThreshold","threshold","limit","myMoment","HTML5_FMT","DATETIME_LOCAL","DATETIME_LOCAL_SECONDS","DATETIME_LOCAL_MS","TIME","TIME_SECONDS","TIME_MS"],"mappings":"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"}
\ No newline at end of file

From c71413451c0b61ae25f8cfd2808886ab02dc6010 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 10 Feb 2021 16:10:00 +0100
Subject: [PATCH 095/437] fix: [UI] Attach correct count of enabled taxonomy
 tags

---
 app/Controller/TaxonomiesController.php | 91 +++++++++++++++++--------
 1 file changed, 64 insertions(+), 27 deletions(-)

diff --git a/app/Controller/TaxonomiesController.php b/app/Controller/TaxonomiesController.php
index e1385b869..6b9be18d8 100644
--- a/app/Controller/TaxonomiesController.php
+++ b/app/Controller/TaxonomiesController.php
@@ -9,17 +9,17 @@ class TaxonomiesController extends AppController
     public $components = array('Session', 'RequestHandler');
 
     public $paginate = array(
-            'limit' => 60,
-            'maxLimit' => 9999, // LATER we will bump here on a problem once we have more than 9999 events <- no we won't, this is the max a user van view/page.
-            'contain' => array(
-                'TaxonomyPredicate' => array(
-                    'fields' => array('TaxonomyPredicate.id'),
-                    'TaxonomyEntry' => array('fields' => array('TaxonomyEntry.id'))
-                )
-            ),
-            'order' => array(
-                    'Taxonomy.id' => 'DESC'
-            ),
+        'limit' => 60,
+        'maxLimit' => 9999, // LATER we will bump here on a problem once we have more than 9999 events <- no we won't, this is the max a user van view/page.
+        'contain' => array(
+            'TaxonomyPredicate' => array(
+                'fields' => array('TaxonomyPredicate.id', 'TaxonomyPredicate.value'),
+                'TaxonomyEntry' => array('fields' => array('TaxonomyEntry.id', 'TaxonomyEntry.value'))
+            )
+        ),
+        'order' => array(
+                'Taxonomy.id' => 'DESC'
+        ),
     );
 
     public function index()
@@ -46,25 +46,15 @@ class TaxonomiesController extends AppController
         } else {
             $taxonomies = $this->paginate();
         }
-        $this->loadModel('Tag');
-        foreach ($taxonomies as $key => $taxonomy) {
-            $total = 0;
-            foreach ($taxonomy['TaxonomyPredicate'] as $predicate) {
-                $total += empty($predicate['TaxonomyEntry']) ? 1 : count($predicate['TaxonomyEntry']);
-            }
-            $taxonomies[$key]['total_count'] = $total;
-            $taxonomies[$key]['current_count'] = $this->Tag->find('count', array(
-                'conditions' => array('lower(Tag.name) LIKE ' => strtolower($taxonomy['Taxonomy']['namespace']) . ':%', 'hide_tag' => 0),
-                'recursive' => -1,
-            ));
-            unset($taxonomies[$key]['TaxonomyPredicate']);
-        }
+
+        $taxonomies = $this->__tagCount($taxonomies);
+
         if ($this->_isRest()) {
             return $this->RestResponse->viewData($taxonomies, $this->response->type());
-        } else {
-            $this->set('taxonomies', $taxonomies);
-            $this->set('passedArgsArray', $this->passedArgs);
         }
+
+        $this->set('taxonomies', $taxonomies);
+        $this->set('passedArgsArray', $this->passedArgs);
     }
 
     public function view($id)
@@ -469,6 +459,53 @@ class TaxonomiesController extends AppController
         $this->render('ajax/toggle_required');
     }
 
+    /**
+     * Attach tag counts.
+     * @param array $taxonomies
+     * @return array
+     */
+    private function __tagCount(array $taxonomies)
+    {
+        $tags = [];
+        foreach ($taxonomies as $taxonomyPos => $taxonomy) {
+            $total = 0;
+            foreach ($taxonomy['TaxonomyPredicate'] as $predicate) {
+                if (isset($predicate['TaxonomyEntry']) && !empty($predicate['TaxonomyEntry'])) {
+                    foreach ($predicate['TaxonomyEntry'] as $entry) {
+                        $tag = mb_strtolower($taxonomy['Taxonomy']['namespace'] . ':' . $predicate['value'] . '="' . $entry['value'] . '"');
+                        $tags[$tag] = $taxonomyPos;
+                        $total++;
+                    }
+                } else {
+                    $tag = mb_strtolower($taxonomy['Taxonomy']['namespace'] . ':' . $predicate['value']);
+                    $tags[$tag] = $taxonomyPos;
+                    $total++;
+                }
+            }
+            $taxonomies[$taxonomyPos]['total_count'] = $total;
+            $taxonomies[$taxonomyPos]['current_count'] = 0;
+            unset($taxonomies[$taxonomyPos]['TaxonomyPredicate']);
+        }
+
+        $this->loadModel('Tag');
+        $existingTags = $this->Tag->find('column', [
+            'fields' => ['Tag.name'],
+            'conditions' => [
+                'lower(Tag.name)' => array_keys($tags),
+                'hide_tag' => 0
+            ],
+        ]);
+
+        foreach ($existingTags as $existingTag) {
+            $existingTag = mb_strtolower($existingTag);
+            if (isset($tags[$existingTag])) {
+                $taxonomies[$tags[$existingTag]]['current_count']++;
+            }
+        }
+
+        return $taxonomies;
+    }
+
     private function __search($value)
     {
         $value = mb_strtolower(trim($value));

From bd98ea937de43b8a311b1f71912ba71d3e674746 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 10 Feb 2021 17:03:30 +0100
Subject: [PATCH 096/437] fix: [galaxyClusters:view_relation_tree] Fix inital
 draw of the tree

- Declare variables before assigning value
---
 .../Elements/GalaxyClusters/view_relation_tree.ctp     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/View/Elements/GalaxyClusters/view_relation_tree.ctp b/app/View/Elements/GalaxyClusters/view_relation_tree.ctp
index f9b4b0459..7a24a2bf8 100644
--- a/app/View/Elements/GalaxyClusters/view_relation_tree.ctp
+++ b/app/View/Elements/GalaxyClusters/view_relation_tree.ctp
@@ -22,6 +22,11 @@ echo $this->element('genericElements/assetLoader', array(
             return;
         }
         hasBeenBuilt = true;
+        var $tree = $('#treeSVG');
+        treeWidth = $tree.width() - margin.right - margin.left;
+        treeHeight = $tree.height() - margin.top - margin.bottom;
+        var leftShift;
+        var childrenBothSides, side;
         if (treeData.left[0].children === undefined || treeData.left[0].children.length == 0) {
             leftShift = 0;
             childrenBothSides = false;
@@ -38,11 +43,6 @@ echo $this->element('genericElements/assetLoader', array(
             }
         }
         adaptContainerHeightIfNeeded(side);
-        var $tree = $('#treeSVG');
-        treeWidth = $tree.width() - margin.right - margin.left;
-        treeHeight = $tree.height() - margin.top - margin.bottom;
-        var leftShift;
-        var childrenBothSides, side;
 
         var data = genHierarchy(treeData, leftShift, childrenBothSides, side);
         drawTree(data, leftShift, childrenBothSides);

From 26d55557e771a99e3fd29f8bb245197ffc123063 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 10 Feb 2021 21:04:06 +0100
Subject: [PATCH 097/437] chg: [UI] Allow filter enabled/disabled warninglists

---
 app/Controller/WarninglistsController.php | 34 +++++++++++------------
 app/View/Warninglists/index.ctp           | 28 ++++++++++++++-----
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/app/Controller/WarninglistsController.php b/app/Controller/WarninglistsController.php
index b09d3fb35..3a93ab5df 100644
--- a/app/Controller/WarninglistsController.php
+++ b/app/Controller/WarninglistsController.php
@@ -9,20 +9,20 @@ class WarninglistsController extends AppController
     public $components = array('Session', 'RequestHandler');
 
     public $paginate = array(
-            'limit' => 60,
-            'maxLimit' => 9999, // LATER we will bump here on a problem once we have more than 9999 events <- no we won't, this is the max a user can view/page.
-            'contain' => array(
-                'WarninglistType'
-            ),
-            'order' => array(
-                'Warninglist.id' => 'DESC'
-            ),
+        'limit' => 60,
+        'maxLimit' => 9999, // LATER we will bump here on a problem once we have more than 9999 events <- no we won't, this is the max a user can view/page.
+        'contain' => array(
+            'WarninglistType'
+        ),
+        'order' => array(
+            'Warninglist.id' => 'DESC'
+        ),
+        'recursive' => -1,
     );
 
     public function index()
     {
-        $filters = $this->IndexFilter->harvestParameters(['value']);
-        $this->paginate['recursive'] = -1;
+        $filters = $this->IndexFilter->harvestParameters(['value', 'enabled']);
         if (!empty($filters['value'])) {
             $this->paginate['conditions'] = [
                 'OR' => [
@@ -32,20 +32,20 @@ class WarninglistsController extends AppController
                     ]
                 ];
         }
+        if (isset($filters['enabled'])) {
+            $this->paginate['conditions'][] = ['Warninglist.enabled' => $filters['enabled']];
+        }
         $warninglists = $this->paginate();
         foreach ($warninglists as &$warninglist) {
-            $warninglist['Warninglist']['valid_attributes'] = array();
-            foreach ($warninglist['WarninglistType'] as $type) {
-                $warninglist['Warninglist']['valid_attributes'][] = $type['type'];
-            }
-            $warninglist['Warninglist']['valid_attributes'] = implode(', ', $warninglist['Warninglist']['valid_attributes']);
+            $validAttributes = array_column($warninglist['WarninglistType'], 'type');
+            $warninglist['Warninglist']['valid_attributes'] = implode(', ', $validAttributes);
             unset($warninglist['WarninglistType']);
         }
         if ($this->_isRest()) {
-            $this->set('Warninglists', $warninglists);
-            $this->set('_serialize', array('Warninglists'));
+            return $this->RestResponse->viewData(['Warninglists' => $warninglists], $this->response->type());
         } else {
             $this->set('warninglists', $warninglists);
+            $this->set('passedArgsArray', $filters);
         }
     }
 
diff --git a/app/View/Warninglists/index.ctp b/app/View/Warninglists/index.ctp
index 4bcb52329..6652cefa5 100644
--- a/app/View/Warninglists/index.ctp
+++ b/app/View/Warninglists/index.ctp
@@ -12,6 +12,26 @@
             'data' => $warninglists,
             'top_bar' => array(
                 'children' => array(
+                    array(
+                        'type' => 'simple',
+                        'children' => array(
+                            array(
+                                'url' => $baseurl . '/warninglists/index',
+                                'text' => __('All'),
+                                'active' => !isset($passedArgsArray['enabled']),
+                            ),
+                            array(
+                                'url' => $baseurl . '/warninglists/index/enabled:1',
+                                'text' => __('Enabled'),
+                                'active' => isset($passedArgsArray['enabled']) && $passedArgsArray['enabled'] === "1",
+                            ),
+                            array(
+                                'url' => $baseurl . '/warninglists/index/enabled:0',
+                                'text' => __('Disabled'),
+                                'active' => isset($passedArgsArray['enabled']) && $passedArgsArray['enabled'] === "0",
+                            )
+                        )
+                    ),
                     array(
                         'type' => 'search',
                         'button' => __('Filter'),
@@ -55,7 +75,6 @@
                 ),
                 array(
                     'name' => __('Valid attributes'),
-                    'class' => 'short',
                     'data_path' => 'Warninglist.valid_attributes',
                 ),
                 array(
@@ -130,14 +149,9 @@
 ?>
 
 <script type="text/javascript">
-    $(document).ready(function() {
+    $(function() {
         $('#quickFilterButton').click(function() {
             runIndexQuickFilter();
         });
-        $('#quickFilterField').on('keypress', function (e) {
-            if(e.which === 13) {
-                runIndexQuickFilter();
-            }
-        });
     });
 </script>

From 0cf1bf5e78a9595bf7926ad12c7ad391c655655c Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 10 Feb 2021 21:31:39 +0100
Subject: [PATCH 098/437] chg: [internal] Faster updating warninglist

---
 app/Model/Warninglist.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/Model/Warninglist.php b/app/Model/Warninglist.php
index 115a31887..91006a3f0 100644
--- a/app/Model/Warninglist.php
+++ b/app/Model/Warninglist.php
@@ -165,6 +165,12 @@ class Warninglist extends AppModel
 
     public function update()
     {
+        $existingWarninglist = $this->find('all', [
+            'fields' => ['id', 'name', 'version', 'enabled'],
+            'recursive' => -1,
+        ]);
+        $existingWarninglist = array_column(array_column($existingWarninglist, 'Warninglist'), null, 'name');
+
         $directories = glob(APP . 'files' . DS . 'warninglists' . DS . 'lists' . DS . '*', GLOB_ONLYDIR);
         $updated = array('success' => [], 'fails' => []);
         foreach ($directories as $dir) {
@@ -180,17 +186,13 @@ class Warninglist extends AppModel
             } elseif (is_array($list['type'])) {
                 $list['type'] = $list['type'][0];
             }
-            $current = $this->find('first', array(
-                'conditions' => array('name' => $list['name']),
-                'recursive' => -1,
-                'fields' => array('*')
-            ));
-            if (empty($current) || $list['version'] > $current['Warninglist']['version']) {
+            if (!isset($existingWarninglist[$list['name']]) || $list['version'] > $existingWarninglist[$list['name']]['version']) {
+                $current = isset($existingWarninglist[$list['name']]) ? $existingWarninglist[$list['name']] : [];
                 $result = $this->__updateList($list, $current);
                 if (is_numeric($result)) {
                     $updated['success'][$result] = array('name' => $list['name'], 'new' => $list['version']);
                     if (!empty($current)) {
-                        $updated['success'][$result]['old'] = $current['Warninglist']['version'];
+                        $updated['success'][$result]['old'] = $current['version'];
                     }
                 } else {
                     $updated['fails'][] = array('name' => $list['name'], 'fail' => json_encode($result));
@@ -222,10 +224,10 @@ class Warninglist extends AppModel
         $list['enabled'] = 0;
         $warninglist = array();
         if (!empty($current)) {
-            if ($current['Warninglist']['enabled']) {
+            if ($current['enabled']) {
                 $list['enabled'] = 1;
             }
-            $this->quickDelete($current['Warninglist']['id']);
+            $this->quickDelete($current['id']);
         }
         $fieldsToSave = array('name', 'version', 'description', 'type', 'enabled');
         foreach ($fieldsToSave as $fieldToSave) {

From 3bdfd0db0dabe907acffd66cee599eb8c557cfcc Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 11 Feb 2021 09:39:45 +0100
Subject: [PATCH 099/437] fix: [internal] GalaxyCluster::getCluster also
 accepts ID

---
 app/Model/GalaxyCluster.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 26df51ec8..b6ce931d2 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -870,25 +870,23 @@ class GalaxyCluster extends AppModel
     }
 
     /**
-     * @param string $name
+     * @param string|int $name Cluster name or ID
      * @param array $user
      * @return array|mixed
      */
     public function getCluster($name, $user)
     {
-        $isGalaxyTag = strpos($name, 'misp-galaxy:') === 0;
-        if (!$isGalaxyTag) {
-            return null;
-        }
-
         if (isset($this->__clusterCache[$name])) {
             return $this->__clusterCache[$name];
         }
-        $conditions = array();
         if (is_numeric($name)) {
-            $conditions[] = array('GalaxyCluster.id' => $name);
+            $conditions = array('GalaxyCluster.id' => $name);
         } else {
-            $conditions[] = array('LOWER(GalaxyCluster.tag_name)' => strtolower($name));
+            $isGalaxyTag = strpos($name, 'misp-galaxy:') === 0;
+            if (!$isGalaxyTag) {
+                return null;
+            }
+            $conditions = array('LOWER(GalaxyCluster.tag_name)' => strtolower($name));
         }
         $cluster = $this->fetchGalaxyClusters($user, array(
             'conditions' => $conditions,

From 014792d6d9eecf2487e0ee5a90a2391c8d074583 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Thu, 11 Feb 2021 10:42:39 +0100
Subject: [PATCH 100/437] fix: [tag collections] typo causing tag collections
 to break completely fixed

---
 app/Model/TagCollection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/TagCollection.php b/app/Model/TagCollection.php
index e97135fe0..6b57e9085 100644
--- a/app/Model/TagCollection.php
+++ b/app/Model/TagCollection.php
@@ -111,7 +111,7 @@ class TagCollection extends AppModel
      */
     public function cullBlockedTags(array $user, array $tagCollections)
     {
-        if (empty($tagCollection)) {
+        if (empty($tagCollections)) {
             return [];
         }
 

From 757cf457152460637f9ea771a20f333f2de661ae Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 11 Feb 2021 11:00:06 +0100
Subject: [PATCH 101/437] fix: [UI] Broken checkboxes for role permissions

---
 app/View/Roles/admin_edit.ctp | 21 ++++++---------------
 app/webroot/css/main.css      | 13 +++++++++++++
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/View/Roles/admin_edit.ctp b/app/View/Roles/admin_edit.ctp
index 75d343288..36bb3fa5d 100644
--- a/app/View/Roles/admin_edit.ctp
+++ b/app/View/Roles/admin_edit.ctp
@@ -33,10 +33,8 @@
             ?>
         </div>
         <div class="input clear"></div>
-        <?php
-            $counter = 1;
-            foreach ($permFlags as $k => $flag):
-        ?>
+        <div class="role-permissions">
+        <?php foreach ($permFlags as $k => $flag): ?>
                 <div class="permFlags<?php echo ' ' . ($flag['readonlyenabled'] ? 'readonlyenabled' : 'readonlydisabled'); ?>">
         <?php
                     echo $this->Form->input($k, array(
@@ -48,23 +46,17 @@
                         ),
                         'label' => $flag['text'],
                     ));
-                    if ($counter%3 == 0) echo "<div class='input clear'></div>";
-                    $counter++;
-        ?>
+                    ?>
                 </div>
-        <?php
-            endforeach;
-        ?>
+        <?php endforeach; ?>
+        </div>
     </fieldset>
 <?php
     echo $this->Form->button(__('Edit'), array('class' => 'btn btn-primary'));
     echo $this->Form->end();
 ?>
 </div>
-<?php
-    echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'editRole'));
-?>
-
+<?= $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'editRole')); ?>
 <script type="text/javascript">
     $(function() {
         checkRolePerms();
@@ -77,4 +69,3 @@
         });
     });
 </script>
-<?php echo $this->Js->writeBuffer();
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 1f76cfe85..b5e0fc2ec 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -2729,3 +2729,16 @@ td.rotate + td:not(.rotate) {
 #eventToggleButtons button span {
     margin-right: 2px;
 }
+
+#RoleAdminEditForm fieldset {
+    margin-bottom: 1em;
+}
+
+#RoleAdminEditForm .role-permissions {
+    clear: both;
+    width: 570px;
+}
+
+#RoleAdminEditForm .role-permissions div.input {
+   width: 160px;
+}

From 2c785783c48272877f9da982a75c0e185b6d6f60 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 11 Feb 2021 12:41:03 +0100
Subject: [PATCH 102/437] chg: [UI] Highlight column for roles table

---
 app/webroot/js/misp.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 1bf842cfd..62f4a3397 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -5655,3 +5655,14 @@ $('body').on('click', '.hex-value-convert', function() {
         }
     }, 'a.tag[data-tag-id]');
 })();
+
+// Highlight column for roles table
+$('td.rotate').hover(function() {
+    var $table = $(this).closest('table');
+    var t = parseInt($(this).index()) + 1;
+    $table.find('td:nth-child(' + t + ')').css('background-color', '#CFEFFF');
+}, function() {
+    var $table = $(this).closest('table');
+    var t = parseInt($(this).index()) + 1;
+    $table.find('td:nth-child(' + t + ')').css('background-color', '');
+});

From ab1808a1edd3e6151f684c3e205a9c304e1a08cf Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 11 Feb 2021 13:44:56 +0100
Subject: [PATCH 103/437] fix: [idTranslator] Distinguish between not found and
 unreachable

---
 app/Controller/ServersController.php | 5 ++++-
 app/View/Servers/id_translator.ctp   | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 0503a9fc0..8609a3b00 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -1342,17 +1342,20 @@ class ServersController extends AppController
                     continue;
                 }
 
+                $exception = null;
                 try {
                     $remoteEvent = $this->Event->downloadEventFromServer($local_event['Event']['uuid'], $server, null, true);
                 } catch (Exception $e) {
                     $remoteEvent = null;
+                    $exception = $e->getMessage();
                 }
                 $remoteEventId = isset($remoteEvent[0]['id']) ? $remoteEvent[0]['id'] : null;
                 $remote_events[] = array(
                     "server_id" => $server['Server']['id'],
                     "server_name" => $server['Server']['name'],
                     "url" => isset($remoteEventId) ? $server['Server']['url'] . "/events/view/" . $remoteEventId : $server['Server']['url'],
-                    "remote_id" => isset($remoteEventId) ? $remoteEventId : false
+                    "remote_id" => isset($remoteEventId) ? $remoteEventId : false,
+                    "exception" => $exception,
                 );
             }
 
diff --git a/app/View/Servers/id_translator.ctp b/app/View/Servers/id_translator.ctp
index f8e213137..36e1bd56c 100644
--- a/app/View/Servers/id_translator.ctp
+++ b/app/View/Servers/id_translator.ctp
@@ -13,6 +13,7 @@ echo $this->element('/genericElements/Form/genericForm', array(
                 "type" => "text",
                 "placeholder" => __("1234"),
                 "stayInLine" => true,
+                'class' => 'span4',
             ),
             array(
                 "field" => "local",
@@ -21,6 +22,7 @@ echo $this->element('/genericElements/Form/genericForm', array(
                 "options" => array("local" => __("local"), "remote" => __("remote")),
                 "type" => "select",
                 "stayInLine" => true,
+                'class' => 'span3',
             ),
             array(
                 "field" => "Server.id",
@@ -28,6 +30,7 @@ echo $this->element('/genericElements/Form/genericForm', array(
                 "options" => $servers,
                 "label" => __("ID referenced on server"),
                 "type" => "select",
+                'class' => 'span3',
             )
         ),
         "submit" => array(
@@ -50,8 +53,10 @@ if (isset($remote_events) && isset($local_event)) {
                 $value .= ' (<a href="' . $baseurl . '/servers/previewEvent/' . $remote_event['server_id'] . '/' . $remote_event['remote_id'] . '">' . __('preview') .  '</a>)';
             }
             $table_data[] = array('key' => h($remote_event['server_name']), 'html' => $value);
+        } elseif ($remote_event['exception']) {
+            $table_data[] = array('key' => h($remote_event['server_name']), 'value' => __('Remote server unreachable: %s', $remote_event['exception']));
         } else {
-            $table_data[] = array('key' => h($remote_event['server_name']), 'value' => __('Not found or server unreachable'));
+            $table_data[] = array('key' => h($remote_event['server_name']), 'value' => __('Not found'));
         }
     }
     echo $this->element('genericElements/viewMetaTable', array('table_data' => $table_data));

From 640e9ef330030536ea6bb8576a9fefaa69d40223 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 11 Feb 2021 15:35:10 +0100
Subject: [PATCH 104/437] fix: [UI] Undefined variables in authkeys view

---
 app/View/AuthKeys/view.ctp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/View/AuthKeys/view.ctp b/app/View/AuthKeys/view.ctp
index 4ef265df9..37f786371 100644
--- a/app/View/AuthKeys/view.ctp
+++ b/app/View/AuthKeys/view.ctp
@@ -10,6 +10,9 @@ if (isset($keyUsage)) {
         $dateAsString = date('Y-m-d', $date);
         $keyUsageCsv .= $dateAsString . ',' . (isset($keyUsage[$dateAsString]) ? $keyUsage[$dateAsString] : 0) . '\n';
     }
+} else {
+    $lastUsed = null;
+    $uniqueIps = null;
 }
 
 echo $this->element(

From e3313ccb5bff95931e7c54f26e2586751a57a33f Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 11 Feb 2021 15:35:10 +0100
Subject: [PATCH 105/437] fix: [UI] Undefined variables in authkeys view

---
 app/View/AuthKeys/view.ctp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/View/AuthKeys/view.ctp b/app/View/AuthKeys/view.ctp
index b2ccacc4e..35e980b8c 100644
--- a/app/View/AuthKeys/view.ctp
+++ b/app/View/AuthKeys/view.ctp
@@ -10,6 +10,9 @@ if (isset($keyUsage)) {
         $dateAsString = date('Y-m-d', $date);
         $keyUsageCsv .= $dateAsString . ',' . (isset($keyUsage[$dateAsString]) ? $keyUsage[$dateAsString] : 0) . '\n';
     }
+} else {
+    $lastUsed = null;
+    $uniqueIps = null;
 }
 
 echo $this->element(

From 626443af474b0878d372f45b6afa87e9c0a04761 Mon Sep 17 00:00:00 2001
From: Tom King <tom.king2@baesystems.com>
Date: Thu, 11 Feb 2021 16:31:51 +0000
Subject: [PATCH 106/437] chg: Use a more suitable Sighting creation function
 as recommended, grab the Org ID from the user if present

---
 app/Model/Attribute.php | 4 +---
 app/Model/Sighting.php  | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index e2738e462..bf273a497 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -4079,9 +4079,7 @@ class Attribute extends AppModel
         }
         if (isset($attribute['Sighting']) && !empty($attribute['Sighting'])) {
             $this->Sighting = ClassRegistry::init('Sighting');
-            foreach ($attribute['Sighting'] as $s) {
-                $result = $this->Sighting->saveSightings($attribute['uuid'], false, $s['date_sighting'], $user, $s['type'], $s['source'], isset($s['uuid']) ? $s['uuid']: false);
-            }
+            $this->Sighting->captureSightings($attribute['Sighting'], $attribute['id'], $eventId, $user);
         }
         $fieldList = $this->editableFields;
         if (empty($existingAttribute)) {
diff --git a/app/Model/Sighting.php b/app/Model/Sighting.php
index 03c833c55..534cbda92 100644
--- a/app/Model/Sighting.php
+++ b/app/Model/Sighting.php
@@ -154,6 +154,8 @@ class Sighting extends AppModel
                 } else {
                     $orgId = $this->Organisation->captureOrg($sighting['Organisation'], $user);
                 }
+            } else if (isset($user['org_id'])) {
+                $orgId = $user['org_id'];
             }
             unset($sighting['id']);
 

From bf8bd21a35e110457f9deb0bc2abc2c6ab22c35f Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Thu, 11 Feb 2021 17:46:32 +0100
Subject: [PATCH 107/437] chg: [connection test] clarified that read only users
 can pull.

- Reduced error level to "orange"
- Added a clarification that they can still pull
---
 app/Controller/AppController.php | 2 +-
 app/webroot/js/misp.js           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 5a1e21e09..7fa452766 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -25,7 +25,7 @@ class AppController extends Controller
 
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
 
-    private $__queryVersion = '122';
+    private $__queryVersion = '123';
     public $pyMispVersion = '2.4.138';
     public $phpmin = '7.2';
     public $phprec = '7.4';
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 1bf842cfd..87784da84 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -3572,10 +3572,10 @@ function testConnection(id) {
                 html += '<span class="red bold" title="Authentication failed because the sync user on the remote has not accepted the terms of use. Log into the remote MISP to rectify this.">Terms not accepted</span>';
                 break;
             case 7:
-                html += '<span class="red bold" title="The user account on the remote instance is not a sync user.">Remote user not a sync user</span>';
+                html += '<span class="orange bold" title="The user account on the remote instance is not a sync user.">Remote user not a sync user, only pulling events is available.</span>';
                 break;
             case 8:
-                html += '<span class="orange bold" title="The user account on the remote instance is only a sightings user.">Remote user not a sync user, syncing sightings only</span>';
+                html += '<span class="orange bold" title="The user account on the remote instance is only a sightings user.">Remote user not a sync user, only pulling events is available. Pushing availale for sightings only</span>';
                 break;
             }
 

From 2c90523dc3ffa8c5b58a36ef0dfd6fc6ccbd87f5 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 11 Feb 2021 21:18:13 +0100
Subject: [PATCH 108/437] chg: [UI] Make event preview nicer

---
 app/View/Servers/preview_event.ctp | 141 ++++++++++++-----------------
 app/webroot/css/main.css           |   1 +
 2 files changed, 57 insertions(+), 85 deletions(-)

diff --git a/app/View/Servers/preview_event.ctp b/app/View/Servers/preview_event.ctp
index 47d4390a2..b22e00159 100644
--- a/app/View/Servers/preview_event.ctp
+++ b/app/View/Servers/preview_event.ctp
@@ -1,3 +1,56 @@
+<?php
+$tableData = [
+    ['key' => __('Event ID'), 'value' => $event['Event']['id']],
+    ['key' => __('UUID'), 'value' => $event['Event']['uuid'], 'class' => 'quickSelect'],
+    ['key' => Configure::read('MISP.showorgalternate') ? __('Source Organisation') : __('Org'), 'value' => $event['Orgc']['name']],
+    ['key' => Configure::read('MISP.showorgalternate') ? __('Member Organisation') : __('Owner Org'), 'value' => $event['Org']['name']],
+];
+
+if (Configure::read('MISP.tagging')) {
+    ob_start();
+    if (!empty($event['Tag'])): foreach ($event['Tag'] as $tag): ?>
+    <span style="padding-right:0;">
+        <span role="button" tabindex="0" aria-label="<?= __('Filter the remote instance by tag: %s', h($tag['name']));?>" title="<?= __('Filter the remote instance on the tag: %s', h($tag['name'])); ?>" onclick="document.location.href='<?= $baseurl . "/servers/previewIndex/" . h($server['Server']['id']); ?>/searchtag:<?= h($tag['id']); ?>';" class="tagFirstHalf" style="background-color:<?= h($tag['colour']);?>;color:<?= $this->TextColour->getTextColour($tag['colour']);?>"><?= h($tag['name']); ?></span>
+    </span>
+    <?php endforeach; endif;
+    $tags = ob_get_clean();
+
+    $tableData[] = ['key' => __('Tags'), 'html' => $tags];
+}
+$tableData[] = ['key' => __('Date'), 'html' => $this->Time->time($event['Event']['date'])];
+$tableData[] = [
+    'key' => __('Threat Level'),
+    'key_title' => $eventDescriptions['threat_level_id']['desc'],
+    'value' => $threatLevels[$event['Event']['threat_level_id']],
+    'value_class' => 'threat-level-' . strtolower($threatLevels[$event['Event']['threat_level_id']]),
+];
+$tableData[] = [
+    'key' => __('Analysis'),
+    'key_title' => $eventDescriptions['analysis']['desc'],
+    'value' => $analysisLevels[$event['Event']['analysis']],
+];
+$tableData[] = [
+    'key' => __('Distribution'),
+    'value_class' => $event['Event']['distribution'] == 0 ? 'privateRedText' : '',
+    'html' => $event['Event']['distribution'] == 4 ?
+            h($event['SharingGroup']['name']) :
+            h($distributionLevels[$event['Event']['distribution']]),
+];
+$tableData[] = [
+    'key' => __('Info'),
+    'value' => $event['Event']['info']
+];
+$tableData[] = [
+    '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') : sprintf('<span class="green bold">%s</span>', __('Yes')) . ((empty($event['Event']['publish_timestamp'])) ? __('N/A') :  ' (' . $this->Time->time($event['Event']['publish_timestamp'])) . ')',
+];
+$tableData[] = [
+    'key' => __('Last change'),
+    'html' => $this->Time->time($event['Event']['timestamp']),
+];
+?>
 <div class="events view">
     <?php
         $title = $event['Event']['info'];
@@ -8,87 +61,7 @@
     <div class="row-fluid">
         <div class="span8">
             <h2><?php echo nl2br(h($title)); ?></h2>
-            <dl>
-                <dt><?php echo __('Event ID');?></dt>
-                <dd>
-                    <?php echo h($event['Event']['id']); ?>
-                    &nbsp;
-                </dd>
-                <dt><?php echo __('UUID');?></dt>
-                <dd>
-                    <?php echo h($event['Event']['uuid']); ?>
-                    &nbsp;
-                </dd>
-                <dt><?php echo Configure::read('MISP.showorgalternate') ? 'Source Organisation' : 'Org'?></dt>
-                <dd><?php echo h($event['Orgc']['name']); ?></dd>
-                <dt><?php echo Configure::read('MISP.showorgalternate') ? 'Member Organisation' : 'Owner Org'?></dt>
-                <dd><?php echo h($event['Org']['name']); ?></dd>
-                <?php if (Configure::read('MISP.tagging')): ?>
-                    <dt><?php echo __('Tags');?></dt>
-                    <dd class="eventTagContainer">
-                    <?php if (!empty($event['Tag'])) foreach ($event['Tag'] as $tag): ?>
-                        <span style="padding-right:0;">
-                            <span role="button" tabindex="0" aria-label="<?php echo __('Filter the remote instance by tag: %s', h($tag['name']));?>" title="<?php echo __('Filter the remote instance on the tag: %s', h($tag['name'])); ?>" onclick="document.location.href='<?php echo $baseurl . "/servers/previewIndex/" . h($server['Server']['id']); ?>/searchtag:<?php echo h($tag['id']); ?>';" class="tagFirstHalf" style="background-color:<?php echo h($tag['colour']);?>;color:<?php echo $this->TextColour->getTextColour($tag['colour']);?>"><?php echo h($tag['name']); ?></span>
-                        </span>
-                    <?php endforeach; ?>&nbsp;
-                    </dd>
-                <?php endif; ?>
-                <dt><?php echo __('Date');?></dt>
-                <dd>
-                    <?php echo h($event['Event']['date']); ?>
-                    &nbsp;
-                </dd>
-                <dt title="<?php echo $eventDescriptions['threat_level_id']['desc'];?>"><?php echo __('Threat Level');?></dt>
-                <dd>
-                    <?php
-                        echo h($threatLevels[$event['Event']['threat_level_id']]);
-                    ?>
-                    &nbsp;
-                </dd>
-                <dt title="<?php echo $eventDescriptions['analysis']['desc'];?>"><?php echo __('Analysis');?></dt>
-                <dd>
-                    <?php echo h($analysisLevels[$event['Event']['analysis']]); ?>
-                    &nbsp;
-                </dd>
-                <dt><?php echo __('Distribution');?></dt>
-                <dd <?php if ($event['Event']['distribution'] == 0) echo 'class = "privateRedText"';?> title = "<?php echo h($distributionDescriptions[$event['Event']['distribution']]['formdesc'])?>">
-                    <?php
-                        if ($event['Event']['distribution'] == 4):
-                    ?>
-                            <?php echo h($event['SharingGroup']['name']); ?>
-                    <?php
-                        else:
-                            echo h($distributionLevels[$event['Event']['distribution']]);
-                        endif;
-                    ?>
-                </dd>
-                <dt><?php echo __('Description');?></dt>
-                <dd style="word-wrap: break-word;">
-                    <?php echo nl2br(h($event['Event']['info'])); ?>
-                    &nbsp;
-                </dd>
-                <?php
-                    $published = '';
-                    $notPublished = 'style="display:none;"';
-                    if ($event['Event']['published'] == 0) {
-                        $published = 'style="display:none;"';
-                        $notPublished = '';
-                    }
-                ?>
-                        <dt class="published" <?php echo $published;?>><?php echo __('Published');?></dt>
-                        <dd class="published green" <?php echo $published;?>><?php echo __('Yes');?></dd>
-                <?php
-                    if ($isAclPublish) :
-                ?>
-                        <dt class="visibleDL notPublished" <?php echo $notPublished;?>>Published</dt>
-                        <dd class="visibleDL notPublished" <?php echo $notPublished;?>>No</dd>
-                <?php
-                    else:
-                ?>
-                        <dt class="notPublished" <?php echo $notPublished;?>><?php echo __('Published');?></dt>
-                        <dd class="notPublished red" <?php echo $notPublished;?>><?php echo __('No');?></dd>
-                <?php endif; ?>
-            </dl>
+            <?= $this->element('genericElements/viewMetaTable', array('table_data' => $tableData)); ?>
         </div>
     <?php if (!empty($event['RelatedEvent'])):?>
     <div class="related span4">
@@ -124,9 +97,7 @@
         <?php echo $this->element('Servers/eventattribute'); ?>
     </div>
 </div>
-<?php
-    echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'sync', 'menuItem' => 'previewEvent', 'id' => $event['Event']['id']));
-?>
+<?= $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'sync', 'menuItem' => 'previewEvent', 'id' => $event['Event']['id'])); ?>
 <script type="text/javascript">
 // tooltips
 $(function () {
@@ -135,6 +106,6 @@ $(function () {
         'placement': 'top',
         'container' : 'body',
         delay: { show: 500, hide: 100 }
-        });
+    });
 });
 </script>
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 1f76cfe85..002488cdc 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -1883,6 +1883,7 @@ span.success {
     background-color: red !important;
     color: white;
     font-weight: bold;
+    padding: 3px 5px;
 }
 
 .red {

From 335b916d2001788249f57756e89d86cbbae5eb6a Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 12 Feb 2021 10:10:18 +0100
Subject: [PATCH 109/437] fix: [internal] Bad variable

---
 app/Controller/SharingGroupsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/SharingGroupsController.php b/app/Controller/SharingGroupsController.php
index e9c50caae..9a06c4583 100644
--- a/app/Controller/SharingGroupsController.php
+++ b/app/Controller/SharingGroupsController.php
@@ -608,7 +608,7 @@ class SharingGroupsController extends AppController
                 }
             }
         }
-        if (false === $addServer) {
+        if (false === $removeServer) {
             return $this->RestResponse->saveFailResponse('SharingGroup', $this->action, false, 'Server is not in the sharing group.', $this->response->type());
         }
         $result = $this->SharingGroup->SharingGroupServer->delete($removeServer);

From 073c2530db11df676258f5abdfd2e86622e041a8 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 12 Feb 2021 15:05:11 +0100
Subject: [PATCH 110/437] fix: [logs] aded eventgraph to log search

---
 app/Controller/LogsController.php | 1 +
 app/View/Warninglists/index.ctp   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/Controller/LogsController.php b/app/Controller/LogsController.php
index ed5370ee3..94ea84c70 100644
--- a/app/Controller/LogsController.php
+++ b/app/Controller/LogsController.php
@@ -371,6 +371,7 @@ class LogsController extends AppController
                 'EventTag',
                 'Feed',
                 'DecayingModel',
+                'EventGraph',
                 'MispObject',
                 'Organisation',
                 'Post',
diff --git a/app/View/Warninglists/index.ctp b/app/View/Warninglists/index.ctp
index 4bcb52329..92c961158 100644
--- a/app/View/Warninglists/index.ctp
+++ b/app/View/Warninglists/index.ctp
@@ -56,6 +56,7 @@
                 array(
                     'name' => __('Valid attributes'),
                     'class' => 'short',
+                    'sort' => 'Warninglist.valid_attributes',
                     'data_path' => 'Warninglist.valid_attributes',
                 ),
                 array(

From 9e21aced1182126a20b66c65a91c20294a9b24c6 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Fri, 12 Feb 2021 15:13:16 +0100
Subject: [PATCH 111/437] chg: [LogsController] add missing EventReport in log
 search

---
 app/Controller/LogsController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Controller/LogsController.php b/app/Controller/LogsController.php
index 94ea84c70..8df9b7d10 100644
--- a/app/Controller/LogsController.php
+++ b/app/Controller/LogsController.php
@@ -372,6 +372,7 @@ class LogsController extends AppController
                 'Feed',
                 'DecayingModel',
                 'EventGraph',
+                'EventReport',
                 'MispObject',
                 'Organisation',
                 'Post',

From 6147f4061a15caa7d11e0b119cb70e41ed739340 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 14 Feb 2021 14:15:55 +0100
Subject: [PATCH 112/437] chg: [internal] Faster updating taxonomies

---
 app/Model/Taxonomy.php | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/Model/Taxonomy.php b/app/Model/Taxonomy.php
index f726db4df..a578e7d5c 100644
--- a/app/Model/Taxonomy.php
+++ b/app/Model/Taxonomy.php
@@ -27,19 +27,19 @@ class Taxonomy extends AppModel
     );
 
     public $hasMany = array(
-            'TaxonomyPredicate' => array(
-                'dependent' => true
-            )
+        'TaxonomyPredicate' => array(
+            'dependent' => true
+        )
     );
 
-    public function beforeValidate($options = array())
-    {
-        parent::beforeValidate();
-        return true;
-    }
-
     public function update()
     {
+        $existing = $this->find('all', array(
+            'recursive' => -1,
+            'fields' => array('version', 'enabled', 'namespace')
+        ));
+        $existing = array_column(array_column($existing, 'Taxonomy'), null, 'namespace');
+
         $directories = glob(APP . 'files' . DS . 'taxonomies' . DS . '*', GLOB_ONLYDIR);
         $updated = array();
         foreach ($directories as $dir) {
@@ -74,17 +74,13 @@ class Taxonomy extends AppModel
             if (!isset($vocab['version'])) {
                 $vocab['version'] = 1;
             }
-            $current = $this->find('first', array(
-                'conditions' => array('namespace' => $vocab['namespace']),
-                'recursive' => -1,
-                'fields' => array('version', 'enabled', 'namespace')
-            ));
-            if (empty($current) || $vocab['version'] > $current['Taxonomy']['version']) {
+            if (!isset($existing[$vocab['namespace']]) || $vocab['version'] > $existing[$vocab['namespace']]['version']) {
+                $current = isset($existing[$vocab['namespace']]) ? $existing[$vocab['namespace']] : [];
                 $result = $this->__updateVocab($vocab, $current);
                 if (is_numeric($result)) {
                     $updated['success'][$result] = array('namespace' => $vocab['namespace'], 'new' => $vocab['version']);
                     if (!empty($current)) {
-                        $updated['success'][$result]['old'] = $current['Taxonomy']['version'];
+                        $updated['success'][$result]['old'] = $current['version'];
                     }
                 } else {
                     $updated['fails'][] = array('namespace' => $vocab['namespace'], 'fail' => json_encode($result));
@@ -120,6 +116,7 @@ class Taxonomy extends AppModel
             'recursive' => -1,
             'fields' => array('version', 'enabled', 'namespace')
         ));
+        $current = empty($current) ? [] : $current['Taxonomy'];
         $result = $this->__updateVocab($vocab, $current);
         if (is_array($result)) {
             throw new Exception('Could not save taxonomy because of validation errors: ' . json_encode($result));
@@ -127,14 +124,14 @@ class Taxonomy extends AppModel
         return (int)$result;
     }
 
-    private function __updateVocab(array $vocab, $current, array $skipUpdateFields = [])
+    private function __updateVocab(array $vocab, array $current)
     {
         $enabled = 0;
         if (!empty($current)) {
-            if ($current['Taxonomy']['enabled']) {
+            if ($current['enabled']) {
                 $enabled = 1;
             }
-            $this->deleteAll(['Taxonomy.namespace' => $current['Taxonomy']['namespace']]);
+            $this->deleteAll(['Taxonomy.namespace' => $current['namespace']]);
         }
         $taxonomy = ['Taxonomy' => [
             'namespace' => $vocab['namespace'],
@@ -160,7 +157,7 @@ class Taxonomy extends AppModel
         }
         $result = $this->saveAssociated($taxonomy, ['deep' => true]);
         if ($result) {
-            $this->__updateTags($this->id, $skipUpdateFields);
+            $this->__updateTags($this->id);
             return $this->id;
         }
         return $this->validationErrors;

From 63f6a34684a9d422fd801898dd9f408b71de117e Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Mon, 15 Feb 2021 11:59:34 +0900
Subject: [PATCH 113/437] chg: [installer] The installer is compatible with
 Ubuntu 21.04 LTS

---
 INSTALL/INSTALL.tpl.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/INSTALL/INSTALL.tpl.sh b/INSTALL/INSTALL.tpl.sh
index ace8d0fc3..0832d2c9d 100755
--- a/INSTALL/INSTALL.tpl.sh
+++ b/INSTALL/INSTALL.tpl.sh
@@ -787,6 +787,7 @@ x86_64-debian-stretch
 x86_64-debian-buster
 x86_64-ubuntu-bionic
 x86_64-ubuntu-focal
+x86_64-ubuntu-hirsute
 x86_64-kali-2020.4
 armv6l-raspbian-stretch
 armv7l-raspbian-stretch
@@ -821,6 +822,11 @@ if [[ "${FLAVOUR}" == "ubuntu" ]]; then
     echo "Please report bugs/issues here: https://github.com/MISP/MISP/issues"
     installSupported PHP="7.4" && exit || exit
   fi
+  if [[ "${RELEASE}" == "21.04" ]]; then
+    echo "Install on Ubuntu 21.04 LTS fully supported."
+    echo "Please report bugs/issues here: https://github.com/MISP/MISP/issues"
+    installSupported PHP="7.4" && exit || exit
+  fi
   if [[ "${RELEASE}" == "18.10" ]]; then
     echo "Install on Ubuntu 18.10 partially supported, bye."
     echo "Please report bugs/issues here: https://github.com/MISP/MISP/issues"

From dee302640a31f3f3b41b60b7c77d1ce4ea2d164e Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Mon, 15 Feb 2021 12:02:04 +0900
Subject: [PATCH 114/437] chg: [installer] Updated installer Checksums

---
 INSTALL/INSTALL.sh        | 6 ++++++
 INSTALL/INSTALL.sh.sfv    | 6 +++---
 INSTALL/INSTALL.sh.sha1   | 2 +-
 INSTALL/INSTALL.sh.sha256 | 2 +-
 INSTALL/INSTALL.sh.sha384 | 2 +-
 INSTALL/INSTALL.sh.sha512 | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh
index 5c5eca35a..e2f965901 100755
--- a/INSTALL/INSTALL.sh
+++ b/INSTALL/INSTALL.sh
@@ -3288,6 +3288,7 @@ x86_64-debian-stretch
 x86_64-debian-buster
 x86_64-ubuntu-bionic
 x86_64-ubuntu-focal
+x86_64-ubuntu-hirsute
 x86_64-kali-2020.4
 armv6l-raspbian-stretch
 armv7l-raspbian-stretch
@@ -3322,6 +3323,11 @@ if [[ "${FLAVOUR}" == "ubuntu" ]]; then
     echo "Please report bugs/issues here: https://github.com/MISP/MISP/issues"
     installSupported PHP="7.4" && exit || exit
   fi
+  if [[ "${RELEASE}" == "21.04" ]]; then
+    echo "Install on Ubuntu 21.04 LTS fully supported."
+    echo "Please report bugs/issues here: https://github.com/MISP/MISP/issues"
+    installSupported PHP="7.4" && exit || exit
+  fi
   if [[ "${RELEASE}" == "18.10" ]]; then
     echo "Install on Ubuntu 18.10 partially supported, bye."
     echo "Please report bugs/issues here: https://github.com/MISP/MISP/issues"
diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv
index 632ff3b5b..9a94998a7 100644
--- a/INSTALL/INSTALL.sh.sfv
+++ b/INSTALL/INSTALL.sh.sfv
@@ -1,5 +1,5 @@
-; Generated by RHash v1.3.9 on 2021-02-03 at 15:13.46
+; Generated by RHash v1.3.9 on 2021-02-15 at 12:01.57
 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
 ;
-;       137499  15:13.46 2021-02-03 INSTALL.sh
-INSTALL.sh 5645164D7C2701EC0E0FF7D33CD8263D41B27947 803115D518C0EF187B041B942B0298CEAF329F4ADD07DB405B508D6E7ABB5D45 6B8019972E761EDC6E8CD1335E8B280376315DD762F6C98AE36C149D7960A0FC5D3C6E3F228DCB2949BDCB747942B557 ABE5D6541D23895E863BAB8BE306E54058897823EA703E6A8A225097ED8CA24F365441E8E98851576E5289B34D81C351C1A1A2520A0865BFE0D37AD77D018282
+;       137749  12:01.57 2021-02-15 INSTALL.sh
+INSTALL.sh 5C4651E28DAD85AFCB59E6914D8ACAB6E447BEB7 506B3B399D5B8EC140538054D9E78ABFA11A8AD45CE5E42AC77A72FB71762FDE 400AFBF6ACA765F314F4D044ABC28D3D94E38D6223F642E1BED3F8C7884CAA64BAA10647352E5BF94411DA8A6753D549 3AC6B5A002645E7F29547F1134BE3C744BFD3D1B253473702B9132E7CEC271474333407F7AA375996EAF9A9877E8E73A7D3C655DDC6E9C7A83F5DF37FA418FB6
diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1
index 00583f353..186be4f2b 100644
--- a/INSTALL/INSTALL.sh.sha1
+++ b/INSTALL/INSTALL.sh.sha1
@@ -1 +1 @@
-5645164d7c2701ec0e0ff7d33cd8263d41b27947  INSTALL.sh
+5c4651e28dad85afcb59e6914d8acab6e447beb7  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256
index 0a6813d13..09585260d 100644
--- a/INSTALL/INSTALL.sh.sha256
+++ b/INSTALL/INSTALL.sh.sha256
@@ -1 +1 @@
-803115d518c0ef187b041b942b0298ceaf329f4add07db405b508d6e7abb5d45  INSTALL.sh
+506b3b399d5b8ec140538054d9e78abfa11a8ad45ce5e42ac77a72fb71762fde  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384
index a79546494..65d56ae61 100644
--- a/INSTALL/INSTALL.sh.sha384
+++ b/INSTALL/INSTALL.sh.sha384
@@ -1 +1 @@
-6b8019972e761edc6e8cd1335e8b280376315dd762f6c98ae36c149d7960a0fc5d3c6e3f228dcb2949bdcb747942b557  INSTALL.sh
+400afbf6aca765f314f4d044abc28d3d94e38d6223f642e1bed3f8c7884caa64baa10647352e5bf94411da8a6753d549  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512
index 7ddd6a4bb..0ea3da889 100644
--- a/INSTALL/INSTALL.sh.sha512
+++ b/INSTALL/INSTALL.sh.sha512
@@ -1 +1 @@
-abe5d6541d23895e863bab8be306e54058897823ea703e6a8a225097ed8ca24f365441e8e98851576e5289b34d81c351c1a1a2520a0865bfe0d37ad77d018282  INSTALL.sh
+3ac6b5a002645e7f29547f1134be3c744bfd3d1b253473702b9132e7cec271474333407f7aa375996eaf9a9877e8e73a7d3c655ddc6e9c7a83f5df37fa418fb6  INSTALL.sh

From 404a96ebc2b3197b0d4c9957ae8286c1fe42c45c Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Mon, 15 Feb 2021 11:01:44 +0100
Subject: [PATCH 115/437] chg: [organisation] "International" typo fixed +
 Europe added

Notes TODO: Improve the selection using the region galaxy in addition to
country galaxy
---
 app/Model/Organisation.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Model/Organisation.php b/app/Model/Organisation.php
index 738e26bfa..f125049bc 100644
--- a/app/Model/Organisation.php
+++ b/app/Model/Organisation.php
@@ -596,7 +596,8 @@ class Organisation extends AppModel
     {
         $countries = array_column($this->getCountryGalaxyCluster(), 'description');
         sort($countries);
-        array_unshift($countries, 'Internation');
+        array_unshift($countries, 'International');
+        array_unshift($countries, 'Europe');
         return $countries;
     }
 }

From 5d5c77a0df5597f61122018be354102131a73863 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Mon, 15 Feb 2021 11:01:44 +0100
Subject: [PATCH 116/437] chg: [organisation] "International" typo fixed +
 Europe added

Notes TODO: Improve the selection using the region galaxy in addition to
country galaxy
---
 app/Model/Organisation.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Model/Organisation.php b/app/Model/Organisation.php
index 738e26bfa..f125049bc 100644
--- a/app/Model/Organisation.php
+++ b/app/Model/Organisation.php
@@ -596,7 +596,8 @@ class Organisation extends AppModel
     {
         $countries = array_column($this->getCountryGalaxyCluster(), 'description');
         sort($countries);
-        array_unshift($countries, 'Internation');
+        array_unshift($countries, 'International');
+        array_unshift($countries, 'Europe');
         return $countries;
     }
 }

From 9b706c8837ac34fb058577d1e8d593f8827c0577 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 15 Feb 2021 11:09:33 +0100
Subject: [PATCH 117/437] fix: [event] Publishing to pub/sub queues includes
 all tags

---
 app/Controller/EventsController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index f7e871e3a..49c4081b1 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -5137,7 +5137,7 @@ class EventsController extends AppController
         if ($this->request->is('Post')) {
             if (Configure::read('Plugin.ZeroMQ_enable')) {
                 $pubSubTool = $this->Event->getPubSubTool();
-                $event = $this->Event->fetchEvent($this->Auth->user(), array('eventid' => $id));
+                $event = $this->Event->fetchEvent($this->Auth->user(), array('eventid' => $id, 'includeAllTags' => true));
                 if (!empty($event)) {
                     $pubSubTool->publishEvent($event[0]);
                     $success = 1;
@@ -5184,7 +5184,7 @@ class EventsController extends AppController
                 $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);
+                    $params = array('eventid' => $id, 'includeAllTags' => true);
                     if (Configure::read('Plugin.Kafka_include_attachments')) {
                         $params['includeAttachments'] = 1;
                     }

From 77fa288755d516721fd4c69d9bcef8d0332eeb06 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 15 Feb 2021 11:41:55 +0100
Subject: [PATCH 118/437] chg: [event fetcher] add limit and page parameters to
 the event fetcher

---
 app/Model/Event.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 2596c4f82..c94f93a3c 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -1325,7 +1325,7 @@ class Event extends AppModel
         if (!$eventReportSupportedByRemote) {
             return [];
         }
-        
+
         // Downgrade the object from connected communities to community only
         if (!$server['Server']['internal'] && $report['distribution'] == 2) {
             $report['distribution'] = 1;
@@ -1846,6 +1846,8 @@ class Event extends AppModel
             'includeWarninglistHits',
             'noEventReports', // do not include event report in event data
             'noShadowAttributes', // do not fetch proposals
+            'limit',
+            'page'
         );
         if (!isset($options['excludeLocalTags']) && !empty($user['Role']['perm_sync']) && empty($user['Role']['perm_site_admin'])) {
             $options['excludeLocalTags'] = 1;
@@ -7120,7 +7122,7 @@ class Event extends AppModel
             }
         }
     }
-    
+
     /**
      * extractAllTagNames Returns all tag names attached to any elements in an event
      *

From d76c0559fb4af32c08770f1162a816ba1e097e72 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Mon, 15 Feb 2021 11:49:17 +0100
Subject: [PATCH 119/437] fix: [STIX] fix typo in message

---
 app/Locale/default.pot | 4 ++--
 app/Model/Event.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Locale/default.pot b/app/Locale/default.pot
index eee01068f..3744326ff 100755
--- a/app/Locale/default.pot
+++ b/app/Locale/default.pot
@@ -4100,11 +4100,11 @@ msgid "Click this to download all network related attributes that you have acces
 msgstr ""
 
 #: Model/Event.php:446
-msgid "Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to."
+msgid "Click this to download a STIX document containing the STIX version of all events and attributes that you have access to."
 msgstr ""
 
 #: Model/Event.php:454
-msgid "Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
+msgid "Click this to download a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
 msgstr ""
 
 #: Model/Event.php:462
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 087f7d045..8b0afefa3 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -340,7 +340,7 @@ class Event extends AppModel
                     'scope' => 'Event',
                     'requiresPublished' => 1,
                     'params' => array('returnFormat' => 'stix', 'includeAttachments' => 1),
-                    'description' => __('Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to.')
+                    'description' => __('Click this to download a STIX document containing the STIX version of all events and attributes that you have access to.')
             ),
             'stix2' => array(
                     'extension' => '.json',
@@ -348,7 +348,7 @@ class Event extends AppModel
                     'scope' => 'Event',
                     'requiresPublished' => 1,
                     'params' => array('returnFormat' => 'stix2', 'includeAttachments' => 1),
-                    'description' => __('Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to.')
+                    'description' => __('Click this to download a STIX2 document containing the STIX2 version of all events and attributes that you have access to.')
             ),
             'rpz' => array(
                     'extension' => '.txt',

From 28ccbc9426fa83c98819be0c0b8b49255f46cbdb Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Mon, 15 Feb 2021 11:49:17 +0100
Subject: [PATCH 120/437] fix: [STIX] fix typo in message

---
 app/Locale/default.pot | 4 ++--
 app/Model/Event.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Locale/default.pot b/app/Locale/default.pot
index eee01068f..3744326ff 100755
--- a/app/Locale/default.pot
+++ b/app/Locale/default.pot
@@ -4100,11 +4100,11 @@ msgid "Click this to download all network related attributes that you have acces
 msgstr ""
 
 #: Model/Event.php:446
-msgid "Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to."
+msgid "Click this to download a STIX document containing the STIX version of all events and attributes that you have access to."
 msgstr ""
 
 #: Model/Event.php:454
-msgid "Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
+msgid "Click this to download a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
 msgstr ""
 
 #: Model/Event.php:462
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 2596c4f82..4abd33567 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -340,7 +340,7 @@ class Event extends AppModel
                     'scope' => 'Event',
                     'requiresPublished' => 1,
                     'params' => array('returnFormat' => 'stix', 'includeAttachments' => 1),
-                    'description' => __('Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to.')
+                    'description' => __('Click this to download a STIX document containing the STIX version of all events and attributes that you have access to.')
             ),
             'stix2' => array(
                     'extension' => '.json',
@@ -348,7 +348,7 @@ class Event extends AppModel
                     'scope' => 'Event',
                     'requiresPublished' => 1,
                     'params' => array('returnFormat' => 'stix2', 'includeAttachments' => 1),
-                    'description' => __('Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to.')
+                    'description' => __('Click this to download a STIX2 document containing the STIX2 version of all events and attributes that you have access to.')
             ),
             'rpz' => array(
                     'extension' => '.txt',

From 0b8055c260313e93704bd35840fdf84cdbc474af Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 15 Feb 2021 13:54:03 +0100
Subject: [PATCH 121/437] fix: [taxonomy] Hide unselectable tags by default.
 Fix #6912

---
 app/Model/Taxonomy.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Model/Taxonomy.php b/app/Model/Taxonomy.php
index f726db4df..90378d351 100644
--- a/app/Model/Taxonomy.php
+++ b/app/Model/Taxonomy.php
@@ -228,7 +228,7 @@ class Taxonomy extends AppModel
 
     // returns all tags associated to a taxonomy
     // returns all tags not associated to a taxonomy if $inverse is true
-    public function getAllTaxonomyTags($inverse = false, $user = false, $full = false)
+    public function getAllTaxonomyTags($inverse = false, $user = false, $full = false, $hideUnselectable = true)
     {
         $this->Tag = ClassRegistry::init('Tag');
         $taxonomyIdList = $this->find('column', array('fields' => array('Taxonomy.id')));
@@ -243,7 +243,7 @@ class Taxonomy extends AppModel
                 $conditions[] = array('Tag.user_id' => array(0, $user['id']));
             }
         }
-        if (Configure::read('MISP.incoming_tags_disabled_by_default')) {
+        if (Configure::read('MISP.incoming_tags_disabled_by_default') || $hideUnselectable) {
             $conditions['Tag.hide_tag'] = 0;
         }
         if ($full) {

From 43db6029dbabeb0970d0b36345ad8cabb056e9f7 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 15 Feb 2021 14:21:32 +0100
Subject: [PATCH 122/437] fix: [eventTimeline] Refrsh attribute index when
 dragging. Fix #6958

---
 app/Controller/AppController.php |  2 +-
 app/webroot/js/event-timeline.js | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 7fa452766..af9f9b4b0 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -25,7 +25,7 @@ class AppController extends Controller
 
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
 
-    private $__queryVersion = '123';
+    private $__queryVersion = '124';
     public $pyMispVersion = '2.4.138';
     public $phpmin = '7.2';
     public $phprec = '7.4';
diff --git a/app/webroot/js/event-timeline.js b/app/webroot/js/event-timeline.js
index eae7fc782..2978ba84b 100644
--- a/app/webroot/js/event-timeline.js
+++ b/app/webroot/js/event-timeline.js
@@ -66,11 +66,11 @@ var options = {
     onMove: function(item, callback) {
         var newStart = moment(item.start.toISOString());
         var newEnd = (item.end !== undefined && item.end !== null) ? moment(item.end.toISOString()) : null;
-        var c1 = item.first_seen !== null ? !item.first_seen.isSame(newStart) : true;
-        var c2 = item.last_seen !== null ? !item.last_seen.isSame(newEnd) && item.seen_enabled : true;
-        if (c1) {
+        var fsChanged = item.first_seen !== null ? !item.first_seen.isSame(newStart) : true;
+        var lsChanged = item.last_seen !== null ? !item.last_seen.isSame(newEnd) && item.seen_enabled : false;
+        if (fsChanged) {
             if (item.first_seen === null) {
-                if (!c2) {
+                if (!lsChanged) {
                     update_seen(item, 'first', newStart, true, undefined);
                 } else {
                     update_seen(
@@ -92,14 +92,14 @@ var options = {
                     );
                 }
             } else {
-                update_seen(item, 'first', newStart, false, function() {
-                    if (c2) {
+                update_seen(item, 'first', newStart, !lsChanged, function() {
+                    if (lsChanged) {
                         update_seen(item, 'last', newEnd, true, undefined);
                     }
                 });
             }
         }
-        if (c2 && !c1) {
+        if (lsChanged && !fsChanged) {
           update_seen(item, 'last', newEnd, true, undefined);
         }
     }
@@ -304,7 +304,7 @@ function fetch_form_and_submit(itemType, item, seenType, value, reflect, callbac
                         if (contain_seen_attribute(item)) {
                             reflect_change(true, itemType, item.id, item);
                         } else {
-                            reflect_change(false, itemType, item.id, item);
+                            reflect_change(true, itemType, item.id, item);
                         }
                     }
                     form.remove()

From 37a724ddf37e8a947e532ed5df0bc5f007f1adf2 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 15 Feb 2021 15:05:23 +0100
Subject: [PATCH 123/437] fix: [events] Attach cluster from matrix in
 multiselect. Fix #6956

---
 app/Controller/AppController.php            |  2 +-
 app/Controller/EventsController.php         | 25 +++++++++++++--------
 app/Controller/GalaxiesController.php       | 16 ++++++++-----
 app/View/Elements/eventattributetoolbar.ctp |  2 +-
 app/View/Elements/view_galaxy_matrix.ctp    |  1 +
 app/webroot/js/attack_matrix.js             |  3 +++
 6 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index af9f9b4b0..4e1526cbe 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -25,7 +25,7 @@ class AppController extends Controller
 
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
 
-    private $__queryVersion = '124';
+    private $__queryVersion = '125';
     public $pyMispVersion = '2.4.138';
     public $phpmin = '7.2';
     public $phprec = '7.4';
diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 182ba2d0d..73ca936c3 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -4499,16 +4499,23 @@ class EventsController extends AppController
         if ($scope == 'event') {
             $eventId = $scope_id;
         } elseif ($scope == 'attribute') {
-            $attribute = $this->Event->Attribute->fetchAttributes($this->Auth->user(), array(
-                'conditions' => array('Attribute.id' => $scope_id),
-                'fields' => array('event_id'),
-                'flatten' => 1,
-            ));
-            if (empty($attribute)) {
-                throw new Exception("Invalid Attribute.");
+            if ($scope_id == 'selected') {
+                if (empty($this->params['named']['eventid'])) {
+                    throw new Exception("Invalid Event.");
+                }
+                $eventId = $this->params['named']['eventid'];
+            } else {
+                $attribute = $this->Event->Attribute->fetchAttributes($this->Auth->user(), array(
+                    'conditions' => array('Attribute.id' => $scope_id),
+                    'fields' => array('event_id'),
+                    'flatten' => 1,
+                ));
+                if (empty($attribute)) {
+                    throw new Exception("Invalid Attribute.");
+                }
+                $attribute = $attribute[0];
+                $eventId = $attribute['Attribute']['event_id'];
             }
-            $attribute = $attribute[0];
-            $eventId = $attribute['Attribute']['event_id'];
         } elseif ($scope == 'tag_collection') {
             $eventId = 0; // no event_id for tag_collection, consider all events
         } else {
diff --git a/app/Controller/GalaxiesController.php b/app/Controller/GalaxiesController.php
index 630cde267..a3e38fcad 100644
--- a/app/Controller/GalaxiesController.php
+++ b/app/Controller/GalaxiesController.php
@@ -267,6 +267,7 @@ class GalaxiesController extends AppController
     {
         $mitreAttackGalaxyId = $this->Galaxy->getMitreAttackGalaxyId();
         $local = !empty($this->params['named']['local']) ? $this->params['named']['local'] : '0';
+        $eventid = !empty($this->params['named']['eventid']) ? $this->params['named']['eventid'] : '0';
         $conditions = $namespace === '0' ? array() : array('namespace' => $namespace);
         $galaxies = $this->Galaxy->find('all', array(
             'recursive' => -1,
@@ -278,14 +279,14 @@ class GalaxiesController extends AppController
         $items = array(
             array(
                 'name' => __('All clusters'),
-                'value' => $this->baseurl . "/galaxies/selectCluster/" . h($target_id) . '/' . h($target_type) . '/0'. '/local:' . $local
+                'value' => $this->baseurl . "/galaxies/selectCluster/" . h($target_id) . '/' . h($target_type) . '/0'. '/local:' . $local . '/eventid:' . $eventid
             )
         );
         foreach ($galaxies as $galaxy) {
             if (!isset($galaxy['Galaxy']['kill_chain_order']) || $noGalaxyMatrix) {
                 $items[] = array(
                     'name' => h($galaxy['Galaxy']['name']),
-                    'value' => $this->baseurl . "/galaxies/selectCluster/" . $target_id . '/' . $target_type . '/' . $galaxy['Galaxy']['id'] . '/local:' . $local,
+                    'value' => $this->baseurl . "/galaxies/selectCluster/" . $target_id . '/' . $target_type . '/' . $galaxy['Galaxy']['id'] . '/local:' . $local . '/eventid:' . $eventid,
                     'template' => array(
                         'preIcon' => 'fa-' . $galaxy['Galaxy']['icon'],
                         'name' => $galaxy['Galaxy']['name'],
@@ -296,11 +297,12 @@ class GalaxiesController extends AppController
                 $param = array(
                     'name' => $galaxy['Galaxy']['name'],
                     'functionName' => sprintf(
-                        "getMatrixPopup('%s', '%s', '%s/local:%s')",
+                        "getMatrixPopup('%s', '%s', '%s/local:%s/eventid:%s')",
                         $target_type,
                         $target_id,
                         $galaxy['Galaxy']['id'],
-                        $local
+                        $local,
+                        $eventid
                     ),
                     'isPill' => true,
                     'isMatrix' => true
@@ -325,15 +327,17 @@ class GalaxiesController extends AppController
             'order' => array('namespace asc')
         ));
         $local = !empty($this->params['named']['local']) ? '1' : '0';
+        $eventid = !empty($this->params['named']['eventid']) ? $this->params['named']['eventid'] : '0';
         $items = array();
+        $noGalaxyMatrix = $noGalaxyMatrix ? '1' : '0';
         $items[] = array(
             'name' => __('All namespaces'),
-            'value' => $this->baseurl . "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/0' . '/' . $noGalaxyMatrix . '/local:' . $local
+            'value' => $this->baseurl . "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/0' . '/' . $noGalaxyMatrix . '/local:' . $local . '/eventid:' . $eventid
         );
         foreach ($namespaces as $namespace) {
             $items[] = array(
                 'name' => $namespace,
-                'value' => $this->baseurl . "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/' . $namespace . '/' . $noGalaxyMatrix . '/local:' . $local
+                'value' => $this->baseurl . "/galaxies/selectGalaxy/" . $target_id . '/' . $target_type . '/' . $namespace . '/' . $noGalaxyMatrix . '/local:' . $local . '/eventid:' . $eventid
             );
         }
 
diff --git a/app/View/Elements/eventattributetoolbar.ctp b/app/View/Elements/eventattributetoolbar.ctp
index 025f3d576..22e8c5552 100644
--- a/app/View/Elements/eventattributetoolbar.ctp
+++ b/app/View/Elements/eventattributetoolbar.ctp
@@ -78,7 +78,7 @@
                         'fa-icon' => 'rebel',
                         'fa-source' => 'fab',
                         'onClick' => 'popoverPopup',
-                        'onClickParams' => array('this', 'selected/attribute', 'galaxies', 'selectGalaxyNamespace')
+                        'onClickParams' => array('this', 'selected/attribute/eventid:' . h($event['Event']['id']), 'galaxies', 'selectGalaxyNamespace')
                     ),
                     array(
                         'id' => 'group-into-object-button',
diff --git a/app/View/Elements/view_galaxy_matrix.ctp b/app/View/Elements/view_galaxy_matrix.ctp
index 53b4dacf4..f051a438d 100644
--- a/app/View/Elements/view_galaxy_matrix.ctp
+++ b/app/View/Elements/view_galaxy_matrix.ctp
@@ -101,6 +101,7 @@ foreach($tabs as $tabName => $column):
 
         echo $this->Form->create('Galaxy', array('url' => $url, '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>
diff --git a/app/webroot/js/attack_matrix.js b/app/webroot/js/attack_matrix.js
index 0e0956876..93ddf619e 100644
--- a/app/webroot/js/attack_matrix.js
+++ b/app/webroot/js/attack_matrix.js
@@ -244,6 +244,9 @@
 
 	function makeTagging(tagIds) {
 		$('#GalaxyViewGalaxyMatrixForm #GalaxyTargetIds').val(JSON.stringify(tagIds));
+		if ($('#GalaxyAttributeIds').length > 0) {
+			$('#GalaxyAttributeIds').val(getSelected());
+		}
 		$('#GalaxyViewGalaxyMatrixForm').submit();
 	}
 

From d54afd12d605169dc561d6c213ccc3764d6828b1 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 15 Feb 2021 15:17:00 +0100
Subject: [PATCH 124/437] chg: [events] Enables index search for object. Fix
 #6961

---
 app/Controller/EventsController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 73ca936c3..7a1c167a9 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -1741,6 +1741,9 @@ class EventsController extends AppController
 
         // search for all attributes in object
         foreach ($event['Object'] as $k => $object) {
+            if ($this->__valueInFieldAttribute($object, ['id', 'uuid', 'name', 'comment'], $searchFor)) {
+                continue;
+            }
             foreach ($object['Attribute'] as $k2 => $attribute) {
                 if (!$this->__valueInFieldAttribute($attribute, $filterValue, $searchFor)) {
                     unset($event['Object'][$k]['Attribute'][$k2]);

From 54bd6e0951e6985342cacc5770628f762e602f99 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Mon, 15 Feb 2021 15:17:58 +0100
Subject: [PATCH 125/437] chg: [misp-objects] updated to the latest version

---
 app/files/misp-objects | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/misp-objects b/app/files/misp-objects
index 2b1c3532d..36994fda1 160000
--- a/app/files/misp-objects
+++ b/app/files/misp-objects
@@ -1 +1 @@
-Subproject commit 2b1c3532dccad651f960ff71defdbc422c40ef0c
+Subproject commit 36994fda1ef423e6141d2a3582fed3e6219dbf59

From 08e556e1984eca477ce73f4f6259f95ffa8284a2 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 15 Feb 2021 16:32:47 +0100
Subject: [PATCH 126/437] new: [event] Added supports of eventReport coming
 from modules

---
 app/Model/Event.php                      | 44 +++++++++++++++++---
 app/View/Events/resolved_misp_format.ctp | 52 +++++++++++++++++++++++-
 app/webroot/js/misp.js                   | 17 ++++++++
 3 files changed, 107 insertions(+), 6 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 8b0afefa3..0c61be43d 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -5592,6 +5592,9 @@ class Event extends AppModel
             }
             $event['Object'] = $objects;
         }
+        if (!empty($result['results']['EventReport'])) {
+            $event['EventReport'] = $result['results']['EventReport'];
+        }
         foreach (array('Tag', 'Galaxy') as $field) {
             if (!empty($result['results'][$field])) {
                 $event[$field] = $result['results'][$field];
@@ -6226,12 +6229,12 @@ class Event extends AppModel
             $this->Job->id = $jobId;
 
         }
-        $failed_attributes = $failed_objects = $failed_object_attributes = 0;
-        $saved_attributes = $saved_objects = $saved_object_attributes = 0;
+        $failed_attributes = $failed_objects = $failed_object_attributes = $failed_reports = 0;
+        $saved_attributes = $saved_objects = $saved_object_attributes = $saved_reports = 0;
         $items_count = 0;
         $failed = array();
         $recovered_uuids = array();
-        foreach (array('Attribute', 'Object') as $feature) {
+        foreach (array('Attribute', 'Object', 'EventReport') as $feature) {
             if (isset($resolved_data[$feature])) {
                 $items_count += count($resolved_data[$feature]);
             }
@@ -6447,7 +6450,27 @@ class Event extends AppModel
                 }
             }
         }
-        if ($saved_attributes > 0 || $saved_objects > 0) {
+        if (!empty($resolved_data['EventReport'])) {
+            $total_reports = count($resolved_data['EventReport']);
+            foreach ($resolved_data['EventReport'] as $i => $report) {
+                $this->EventReport->create();
+                $report['event_id'] = $id;
+                if ($this->EventReport->save($report)) {
+                    $saved_reports++;
+                } else {
+                    $failed_reports++;
+                    $lastReportError = $this->EventReport->validationErrors;
+                }
+                if ($jobId) {
+                    $current = ($i + 1);
+                    $this->Job->saveField('message', 'EventReport ' . $current . '/' . $total_reports);
+                    $this->Job->saveField('progress', ($current * 100 / $items_count));
+                }
+            }
+        } else {
+            $total_reports = 0;
+        }
+        if ($saved_attributes > 0 || $saved_objects > 0 || $saved_reports > 0) {
             $event = $this->find('first', array(
                     'conditions' => array('Event.id' => $id),
                     'recursive' => -1
@@ -6460,7 +6483,7 @@ class Event extends AppModel
             $this->save($event);
         }
         if ($event_level) {
-            return $saved_attributes + $saved_object_attributes;
+            return $saved_attributes + $saved_object_attributes + $saved_reports;
         }
         $message = '';
         if ($saved_attributes > 0) {
@@ -6506,6 +6529,17 @@ class Event extends AppModel
             }
             $message .= 'you can have a look at the module results view you just left, to compare.';
         }
+        if ($saved_reports > 0) {
+            $message .= $saved_reports . ' ' . $this->__apply_inflector($saved_reports, 'eventReport') . ' created. ';
+        }
+        if ($failed_reports > 0) {
+            if ($failed_reports == 1) {
+                $reason = ' eventReport could not be saved. Reason for the failure: ' . json_encode($lastReportError) . ' ';
+            } else {
+                $reason = ' eventReport could not be saved. ';
+            }
+            $message .= $failed_reports . $reason;
+        }
         if ($jobId) {
             $this->Job->saveField('message', 'Processing complete. ' . $message);
             $this->Job->saveField('progress', 100);
diff --git a/app/View/Events/resolved_misp_format.ctp b/app/View/Events/resolved_misp_format.ctp
index 67b813add..58ab1ba7d 100644
--- a/app/View/Events/resolved_misp_format.ctp
+++ b/app/View/Events/resolved_misp_format.ctp
@@ -54,6 +54,7 @@
             }
             $attributes_count = isset($event['Attribute']) ? count($event['Attribute']) : 0;
             $objects_count = isset($event['Object']) ? count($event['Object']) : 0;
+            $report_count = isset($event['EventReport']) ? count($event['EventReport']) : 0;
             if (!empty($event['Object'])) {
                 foreach ($event['Object'] as $object) {
                     if (!empty($object['Attribute'])) {
@@ -77,11 +78,60 @@
                 );
             }
             $table_data[] = array('key' => __('#Resolved Attributes'), 'value' => $count);
+            $table_data[] = array('key' => __('#Resolved Reports'), 'value' => $report_count);
             echo $this->element('genericElements/viewMetaTable', array('table_data' => $table_data));
         }
         $attributeFields = array('category', 'type', 'value', 'uuid');
         $header_present = false;
         $typesWithData = array('attachment', 'malware-sample');
+    ?>
+    <?php if (!empty($event['EventReport'])): ?>
+      <table class="table table-striped table-condensed">
+      <thead>
+        <tr>
+          <th><?= __('Import') ?></th>
+          <th><?= __('Name') ?></th>
+          <th class="hidden"><?php echo __('UUID');?></th>
+          <th><?= __('Content') ?></th>
+          <th><?= __('Distribution') ?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach($event['EventReport'] as $report): ?>
+          <tr class="MISPEventReport">
+              <td class="short" style="width:40px;text-align:center;">
+                <input type="checkbox" class="ImportMISPEventReport" checked />
+              </td>
+            <td class="EventReportName"><?= h($report['name']); ?></td>
+            <td class="EventReportUUID hidden"><?= h($report['uuid']); ?></td>
+            <td class="EventReportContent ellipsis-overflow" style="max-width:800px;">
+              <?= h($report['content']); ?>
+            </td>
+            <td class="short" style="width:40px;text-align:center;">
+              <select class='EventReportDistribution' style='padding:0px;height:20px;margin-bottom:0px;'>
+              <?php
+                  foreach ($distributions as $distKey => $distValue) {
+                      echo '<option value="' . h($distKey) . '" ' . ($distKey == $report['distribution'] ? 'selected="selected"' : '') . '>' . h($distValue) . '</option>';
+                  }
+              ?>
+              </select>
+              <div style="display:none;">
+                <select class='EventReportSharingGroup' style='padding:0px;height:20px;margin-top:3px;margin-bottom:0px;'>
+                  <?php
+                  foreach ($sgs as $sgKey => $sgValue) {
+                      echo '<option value="' . h($sgKey) . '" ' . ($sgKey == $report['sharing_group_id'] ? 'selected="selected"' : '') . '>' . h($sgValue) . '</option>';
+                  }
+                  ?>
+                </select>
+              </div>
+            </td>
+          </tr>
+        <?php endforeach; ?>
+      </tbody>
+      <table>
+    <?php endif; ?>
+
+    <?php
         if (!empty($event['Object'])) {
     ?>
     <table class="table table-striped table-condensed">
@@ -389,7 +439,7 @@
 </div>
 <script type="text/javascript">
     $(function() {
-      $('.AttributeDistribution, .ObjectDistribution').change(function() {
+      $('.AttributeDistribution, .ObjectDistribution, .EventReportDistribution').change(function() {
           if ($(this).val() == 4) {
               $(this).next().show();
           } else {
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 80f7a55d0..8509bc116 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -3024,6 +3024,23 @@ function moduleResultsSubmit(id) {
         });
         data_collected['Attribute'] = attributes;
     }
+    if ($('.MISPEventReport').length) {
+        var reports = [];
+        $('.MISPEventReport').each(function() {
+            temp = {
+                import_report: $(this).find('.ImportMISPEventReport')[0].checked,
+                name: $(this).find('.EventReportName').text(),
+                content: $(this).find('.EventReportContent').text(),
+                uuid: $(this).find('.EventReportUUID').text(),
+                distribution: $(this).find('.EventReportDistribution').val(),
+                sharing_group_id: $(this).find('.EventReportSharingGroup').val()
+            }
+            if (temp['import_report']) {
+                reports.push(temp);
+            }
+        });
+        data_collected['EventReport'] = reports;
+    }
     $("#EventJsonObject").val(JSON.stringify(data_collected));
     var formData = $('.mainForm').serialize();
     $.ajax({

From c9e0326d4ed9aefe7e3af9deb04d14370515fb87 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 15 Feb 2021 16:35:20 +0100
Subject: [PATCH 127/437] fix: [event] Includes eventReport when using the
 `merge from` feature

---
 app/Controller/EventsController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 7a1c167a9..061ce3568 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -2198,18 +2198,22 @@ class EventsController extends AppController
             $results = [
                 'results' => [
                     'Object' => $source_event[0]['Object'],
-                    'Attribute' => $source_event[0]['Attribute']
+                    'Attribute' => $source_event[0]['Attribute'],
+                    'EventReport' => $source_event[0]['EventReport']
                 ]
             ];
             if ($this->_isRest()) {
                 $this->loadModel('Log');
-                $save_results = ['attributes' => 0, 'objects' => 0];
+                $save_results = ['attributes' => 0, 'objects' => 0, 'eventReports' => 0];
                 foreach ($results['results']['Attribute'] as $attribute) {
                     $this->Event->Attribute->captureAttribute($attribute, $target_id, $this->Auth->user(), false, $this->Log);
                 }
                 foreach ($results['results']['Object'] as $object) {
                     $this->Event->Object->captureObject($object, $target_id, $this->Auth->user(), $this->Log);
                 }
+                foreach ($results['results']['EventReport'] as $report) {
+                    $this->Event->EventReport->captureReport($this->Auth->user(), $report, $target_id);
+                }
                 $event = $this->Event->fetchEvent(
                     $this->Auth->user(),
                     [

From ac836fcca963c0d45cea9198dcb1e1eaf151071e Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 15 Feb 2021 16:36:17 +0100
Subject: [PATCH 128/437] fix: [event] `merge from` feature correctly saves
 object relations. Fix #6969

---
 app/Controller/EventsController.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 061ce3568..1f11acf7a 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -2169,9 +2169,12 @@ class EventsController extends AppController
             if (empty($source_event)) {
                 throw new NotFoundException(__('Invalid source event.'));
             }
+            $recovered_uuids = [];
             foreach ($source_event[0]['Attribute'] as &$attribute) {
                 unset($attribute['id']);
+                $originalUUID = $attribute['uuid'];
                 $attribute['uuid'] = CakeText::uuid();
+                $recovered_uuids[$originalUUID] = $attribute['uuid'];
                 unset($attribute['ShadowAttribute']);
                 $attribute['Tag'] = [];
                 foreach ($attribute['AttributeTag'] as $aT) {
@@ -2182,10 +2185,14 @@ class EventsController extends AppController
             }
             foreach ($source_event[0]['Object'] as &$object) {
                 unset($object['id']);
+                $originalUUID = $object['uuid'];
                 $object['uuid'] = CakeText::uuid();
+                $recovered_uuids[$originalUUID] = $object['uuid'];
                 foreach ($object['Attribute'] as &$attribute) {
                     unset($attribute['id']);
+                    $originalUUID = $attribute['uuid'];
                     $attribute['uuid'] = CakeText::uuid();
+                    $recovered_uuids[$originalUUID] = $attribute['uuid'];
                     unset($attribute['ShadowAttribute']);
                     $attribute['Tag'] = [];
                     foreach ($attribute['AttributeTag'] as $aT) {
@@ -2195,6 +2202,20 @@ class EventsController extends AppController
                     unset($attribute['AttributeTag']);
                 }
             }
+            foreach ($source_event[0]['Object'] as &$object) {
+                foreach ($object['ObjectReference'] as &$reference) {
+                    if (isset($recovered_uuids[$object['uuid']])) {
+                        $reference['object_uuid'] = $recovered_uuids[$object['uuid']];
+                    }
+                    if (isset($recovered_uuids[$reference['referenced_uuid']])) {
+                        $reference['referenced_uuid'] = $recovered_uuids[$reference['referenced_uuid']];
+                    }
+                }
+            }
+            foreach ($source_event[0]['EventReport'] as &$report) {
+                unset($report['id'], $report['event_id']);
+                $report['uuid'] = CakeText::uuid();
+            }
             $results = [
                 'results' => [
                     'Object' => $source_event[0]['Object'],

From 9f026749dd0fed89c06c750273e9162cbedcddde Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 15 Feb 2021 16:44:39 +0100
Subject: [PATCH 129/437] fix: [eventreport] add fixed to avoid ID collisions

---
 app/Model/EventReport.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/Model/EventReport.php b/app/Model/EventReport.php
index 2e508a932..89c1d4baf 100644
--- a/app/Model/EventReport.php
+++ b/app/Model/EventReport.php
@@ -103,6 +103,9 @@ class EventReport extends AppModel
             $report = ['EventReport' => $report];
         }
         $report['EventReport']['event_id'] = $eventId;
+        if (!empty($report['EventReport']['id'])) {
+            unset($report['EventReport']['id']);
+        }
         $report = $this->captureSG($user, $report);
         $this->create();
         $errors = $this->saveAndReturnErrors($report, ['fieldList' => $this->captureFields]);
@@ -114,7 +117,7 @@ class EventReport extends AppModel
         }
         return $errors;
     }
-    
+
     /**
      * addReport Add a report
      *
@@ -131,7 +134,7 @@ class EventReport extends AppModel
         }
         return $errors;
     }
-    
+
     /**
      * editReport Edit a report
      *
@@ -208,7 +211,7 @@ class EventReport extends AppModel
         }
         return $errors;
     }
-    
+
     /**
      * restoreReport ACL-aware method to restore a report.
      *
@@ -235,7 +238,7 @@ class EventReport extends AppModel
         }
         return $report;
     }
-    
+
     /**
      * buildACLConditions Generate ACL conditions for viewing the report
      *
@@ -299,7 +302,7 @@ class EventReport extends AppModel
         }
         return array();
     }
-    
+
     /**
      * fetchReports ACL-aware method. Basically find with ACL
      *
@@ -391,7 +394,7 @@ class EventReport extends AppModel
         }
         return true;
     }
-    
+
     public function reArrangeReport(array $report)
     {
         $rearrangeObjects = array('Event', 'SharingGroup');
@@ -548,7 +551,7 @@ class EventReport extends AppModel
         }
         return $errors;
     }
-    
+
     public function applySuggestionsInText($contentWithSuggestions, array $attribute, $value)
     {
         $textToBeReplaced = "@[suggestion]($value)";
@@ -592,7 +595,7 @@ class EventReport extends AppModel
             'attribute' => $savedAttribute
         ];
     }
-    
+
     /**
      * transformFreeTextIntoReplacement
      *
@@ -704,7 +707,7 @@ class EventReport extends AppModel
             'replacementResult' => $replacementResult,
         ];
     }
-    
+
     /**
      * extractWithReplacements Extract context information from report with special care for ATT&CK
      *

From 75ba83b40bd57c934ba80ad467628407f147eba9 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 15 Feb 2021 17:26:48 +0100
Subject: [PATCH 130/437] fix: [dashboard] Typo breakig the dashboards fixed

---
 app/webroot/js/misp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 80f7a55d0..450e32f0d 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -5393,7 +5393,7 @@ function saveDashboardState() {
 
 function updateDashboardWidget(element) {
     var $element = $(element);
-    if (element.length) {
+    if ($element.length) {
         var container_id = $element.attr('id').substring(7);
         var container = $element.find('.widgetContent');
         var titleText = $element.find('.widgetTitleText');

From 6112c0d4068c0ebcef49da9c7f8646a12f3abd90 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 15 Feb 2021 18:08:41 +0100
Subject: [PATCH 131/437] chg: [event model] fetchEvent() now accepts
 page/limit/order as parameters

---
 app/Model/Event.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 0c61be43d..475ead5be 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -1325,7 +1325,7 @@ class Event extends AppModel
         if (!$eventReportSupportedByRemote) {
             return [];
         }
-        
+
         // Downgrade the object from connected communities to community only
         if (!$server['Server']['internal'] && $report['distribution'] == 2) {
             $report['distribution'] = 1;
@@ -1852,7 +1852,10 @@ class Event extends AppModel
             'includeServerCorrelations',
             'includeWarninglistHits',
             'noEventReports', // do not include event report in event data
-            'noShadowAttributes', // do not fetch proposals
+            'noShadowAttributes', // do not fetch proposals,
+            'limit',
+            'page',
+            'order'
         );
         if (!isset($options['excludeLocalTags']) && !empty($user['Role']['perm_sync']) && empty($user['Role']['perm_site_admin'])) {
             $options['excludeLocalTags'] = 1;
@@ -2137,6 +2140,15 @@ class Event extends AppModel
             unset($params['contain']['Object']);
             unset($params['contain']['EventReport']);
         }
+        if (!empty($options['limit'])) {
+            $params['limit'] = $options['limit'];
+        }
+        if (!empty($options['page'])) {
+            $params['page'] = $options['page'];
+        }
+        if (!empty($options['order'])) {
+            $params['order'] = $options['order'];
+        }
         $results = $this->find('all', $params);
         if (empty($results)) {
             return array();
@@ -7169,7 +7181,7 @@ class Event extends AppModel
             }
         }
     }
-    
+
     /**
      * extractAllTagNames Returns all tag names attached to any elements in an event
      *

From 74aaf2de0b5f7156926cb271614877220089a36c Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 15 Feb 2021 18:09:35 +0100
Subject: [PATCH 132/437] chg: [array lookup index field] updatd to work
 correctly

---
 .../genericElements/IndexTable/Fields/array_lookup_field.ctp   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/View/Elements/genericElements/IndexTable/Fields/array_lookup_field.ctp b/app/View/Elements/genericElements/IndexTable/Fields/array_lookup_field.ctp
index dc10c9285..9c505baee 100644
--- a/app/View/Elements/genericElements/IndexTable/Fields/array_lookup_field.ctp
+++ b/app/View/Elements/genericElements/IndexTable/Fields/array_lookup_field.ctp
@@ -1,4 +1,3 @@
 <?php
-
-    echo h($arrayData[Hash::extract($row, $field['data_path'])[0]]);
+    echo h($field['arrayData'][Hash::extract($row, $field['data_path'])[0]]);
 ?>

From e7a7f30ba2e680ea3651b18d4c925d229152aef0 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 15 Feb 2021 18:10:15 +0100
Subject: [PATCH 133/437] new: [widget] Eventstream widget and index widget UI
 added

- EventStream
  - add a lightweight event index to your dashboard
  - configure filters for the events you're interested in (tags, orgs, published)
  - set the number of events to display (limit)
  - set the list of fields it should display (id, orgc, info, tags, threat_level, analysis, date)

- Index widget UI
  - uses the generic index builder
  - build simple index like UIs
---
 app/Lib/Dashboard/EventStreamWidget.php       | 95 +++++++++++++++++++
 app/View/Elements/dashboard/Widgets/Index.ctp | 14 +++
 2 files changed, 109 insertions(+)
 create mode 100644 app/Lib/Dashboard/EventStreamWidget.php
 create mode 100644 app/View/Elements/dashboard/Widgets/Index.ctp

diff --git a/app/Lib/Dashboard/EventStreamWidget.php b/app/Lib/Dashboard/EventStreamWidget.php
new file mode 100644
index 000000000..86a4efbed
--- /dev/null
+++ b/app/Lib/Dashboard/EventStreamWidget.php
@@ -0,0 +1,95 @@
+<?php
+
+class EventStreamWidget
+{
+    public $title = 'Event Stream';
+    public $render = 'Index';
+    public $width = 4;
+    public $height = 2;
+    public $params = [
+        'tags' => 'A list of tagnames to filter on. Comma separated list, prepend each tag with an exclamation mark to negate it.',
+        'orgs' => 'A list of organisation names to filter on. Comma separated list, prepend each tag with an exclamation mark to negate it.',
+        'published' => 'Boolean flag to filter on published events only',
+        'limit' => 'How many events should be listed? Defaults to 5',
+        'fields' => 'A list of fields that should be displayed. Valid fields: id, orgc, info, tags, threat_level, analysis, date. Default field selection ["id", "orgc", "info"]'
+    ];
+    public $description = 'Monitor incoming events based on your own filters.';
+    public $cacheLifetime = false;
+    public $autoRefreshDelay = 5;
+    private $__default_fields = ['id', 'orgc', 'info'];
+
+	public function handler($user, $options = array())
+	{
+        $this->Event = ClassRegistry::init('Event');
+        $params = [
+            'metadata' => 1,
+            'limit' => 5,
+            'page' => 1,
+            'order' => 'Event.id DESC'
+        ];
+        $field_options = [
+            'id' => [
+                'name' => '#',
+                'url' => Configure::read('MISP.baseurl') . '/events/view',
+                'element' => 'links',
+                'data_path' => 'Event.id',
+                'url_params_data_paths' => 'Event.id'
+            ],
+            'orgc' => [
+                'name' => 'Org',
+                'data_path' => 'Orgc',
+                'element' => 'org'
+            ],
+            'info' => [
+                'name' => 'Info',
+                'data_path' => 'Event.info',
+            ],
+            'tags' => [
+                'name' => 'Tags',
+                'data_path' => 'EventTag',
+                'element' => 'tags',
+                'scope' => 'feeds'
+            ],
+            'threat_level' => [
+                'name' => 'Threat Level',
+                'data_path' => 'ThreatLevel.name'
+            ],
+            'analysis' => [
+                'name' => 'Analysis',
+                'data_path' => 'Event.analysis',
+                'element' => 'array_lookup_field',
+                'arrayData' => [__('Initial'), __('Ongoing'), __('Complete')]
+            ],
+            'date' => [
+                'name' => 'Date',
+                'data_path' => 'Event.date'
+            ],
+        ];
+        $fields = [];
+        if (empty($options['fields'])) {
+            $options['fields'] = $this->__default_fields;
+        }
+        foreach ($options['fields'] as $field) {
+            if (!empty($field_options[$field])) {
+                $fields[] = $field_options[$field];
+            }
+        }
+        foreach (['published', 'limit', 'tags', 'orgs'] as $field) {
+            if (!empty($options[$field])) {
+                $params[$field] = $options[$field];
+            }
+        }
+        $data = $this->Event->fetchEvent($user, $params);
+        return [
+            'data' => $data,
+            'fields' => $fields
+        ];
+	}
+
+    public function checkpermissions($user) {
+        if (in_array($user['id'], [1, 2, 3])) {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/app/View/Elements/dashboard/Widgets/Index.ctp b/app/View/Elements/dashboard/Widgets/Index.ctp
new file mode 100644
index 000000000..d7a432423
--- /dev/null
+++ b/app/View/Elements/dashboard/Widgets/Index.ctp
@@ -0,0 +1,14 @@
+<?php
+    echo $this->element('genericElements/IndexTable/index_table', [
+        'data' => [
+            'data' => $data['data'],
+            'top_bar' => [],
+            'fields' => $data['fields'],
+            'title' => false,
+            'description' => false,
+            'pull' => 'right',
+            'skip_pagination' => true,
+            'actions' => []
+        ]
+    ]);
+?>

From 1b5c0587332f191ce271d9527e4f23bda87b4ba8 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 15 Feb 2021 20:06:06 +0100
Subject: [PATCH 134/437] fix: [internal] Field name in HttpSocketExtended

---
 app/Lib/Tools/HttpSocketExtended.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Lib/Tools/HttpSocketExtended.php b/app/Lib/Tools/HttpSocketExtended.php
index cee948df9..2147ea8a8 100644
--- a/app/Lib/Tools/HttpSocketExtended.php
+++ b/app/Lib/Tools/HttpSocketExtended.php
@@ -107,7 +107,7 @@ class HttpSocketExtended extends HttpSocket
         }
         // Convert connection timeout to SocketException
         if (!empty($this->lastError)) {
-            throw new SocketException($this->lastError['msg']);
+            throw new SocketException($this->lastError['str']);
         }
         return $response;
     }

From 2741da9dc1406689636db64c2ea56c838819b383 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 15 Feb 2021 20:16:33 +0100
Subject: [PATCH 135/437] fix: [UI] Escaping in row_attribute

---
 app/View/Elements/Events/View/row_attribute.ctp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/View/Elements/Events/View/row_attribute.ctp b/app/View/Elements/Events/View/row_attribute.ctp
index 95d3ea57a..e05934420 100644
--- a/app/View/Elements/Events/View/row_attribute.ctp
+++ b/app/View/Elements/Events/View/row_attribute.ctp
@@ -211,16 +211,16 @@ $quickEdit = function($fieldName) use ($editScope, $object, $event) {
             if (isset($object['Feed'])) {
                 foreach ($object['Feed'] as $feed) {
                     $relatedData = array(
-                        __('Name') => $feed['name'],
-                        __('URL') => $feed['url'],
-                        __('Provider') => $feed['provider'],
+                        __('Name') => h($feed['name']),
+                        __('URL') => h($feed['url']),
+                        __('Provider') => h($feed['provider']),
                     );
                     if (isset($feed['event_uuids'])) {
-                        $relatedData[__('Event UUIDs')] = implode('<br>', $feed['event_uuids']);
+                        $relatedData[__('Event UUIDs')] = implode('<br>', array_map('h', $feed['event_uuids']));
                     }
                     $popover = '';
                     foreach ($relatedData as $k => $v) {
-                        $popover .= '<span class="bold black">' . h($k) . '</span>: <span class="blue">' . h($v) . '</span><br>';
+                        $popover .= '<span class="bold black">' . $k . '</span>: <span class="blue">' . $v . '</span><br>';
                     }
                     if ($isSiteAdmin || $hostOrgUser) {
                         if ($feed['source_format'] === 'misp') {

From 8e3ccb3d5f71e84ef5d5fb506e74c8b57d218160 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 15 Feb 2021 23:40:39 +0100
Subject: [PATCH 136/437] fix: [auto logout] disabled

- this crap just causes issues and is pretty pointless
---
 app/View/Layouts/dashboard.ctp | 2 +-
 app/View/Layouts/default.ctp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/View/Layouts/dashboard.ctp b/app/View/Layouts/dashboard.ctp
index 55ed64675..e8a14042d 100644
--- a/app/View/Layouts/dashboard.ctp
+++ b/app/View/Layouts/dashboard.ctp
@@ -121,7 +121,7 @@
         <?php
             if (!Configure::read('MISP.disable_auto_logout') and $me):
         ?>
-                checkIfLoggedIn();
+                //checkIfLoggedIn();
         <?php
             endif;
         ?>
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index 41fc82fca..6a05c310c 100644
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -117,7 +117,7 @@
         <?php
             if (!Configure::read('MISP.disable_auto_logout') && isset($me) && $me):
         ?>
-                checkIfLoggedIn();
+                //checkIfLoggedIn();
         <?php
             endif;
         ?>

From 8bde7d01f488837f679b3ea7fd7c0eaa8fd6d716 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 16 Feb 2021 00:15:18 +0100
Subject: [PATCH 137/437] fix: [breakOnDuplicate] on event add fixed, fixes
 #6917

- add breakOnDuplicate on the event level as a flag
  - {"Event":{"breakOnDuplicate":1, "info": "foo", ...}}

- correctly handle 2 equal objects added to the same event in memory
---
 app/Model/Event.php      |  6 ++++--
 app/Model/MispObject.php | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 475ead5be..56ea9a4e3 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -3652,6 +3652,7 @@ class Event extends AppModel
         if (!$this->checkEventBlockRules($data)) {
             return 'Blocked by event block rules';
         }
+        $breakOnDuplicate = !empty($data['Event']['breakOnDuplicate']);
         $this->Log = ClassRegistry::init('Log');
         if (empty($data['Event']['Attribute']) && empty($data['Event']['Object']) && !empty($data['Event']['published']) && empty($data['Event']['EventReport'])) {
             $this->Log->create();
@@ -3874,8 +3875,9 @@ class Event extends AppModel
             }
             $referencesToCapture = array();
             if (!empty($data['Event']['Object'])) {
-                foreach ($data['Event']['Object'] as $object) {
-                    $result = $this->Object->captureObject($object, $this->id, $user, $this->Log, false);
+                $objectDuplicateCache = [];
+                foreach ($data['Event']['Object'] as $k => $object) {
+                    $result = $this->Object->captureObject($object, $this->id, $user, $this->Log, false, $breakOnDuplicate);
                 }
                 foreach ($data['Event']['Object'] as $object) {
                     if (isset($object['ObjectReference'])) {
diff --git a/app/Model/MispObject.php b/app/Model/MispObject.php
index 8d23328e4..ee55b56fc 100644
--- a/app/Model/MispObject.php
+++ b/app/Model/MispObject.php
@@ -321,6 +321,17 @@ class MispObject extends AppModel
             );
         }
         $newObjectAttributeCount = count($newObjectAttributes);
+        if (!empty($this->__objectDuplicationCheckCache['new'][$object['Object']['template_uuid']])) {
+            foreach ($this->__objectDuplicationCheckCache['new'][$object['Object']['template_uuid']] as $previousNewObject) {
+                if ($newObjectAttributeCount === count($previousNewObject)) {
+                    if (empty(array_diff($previousNewObject, $newObjectAttributes))) {
+                        return true;
+                    }
+                }
+            }
+        }
+        $this->__objectDuplicationCheckCache['new'][$object['Object']['template_uuid']][] = $newObjectAttributes;
+
         if (!isset($this->__objectDuplicationCheckCache[$object['Object']['template_uuid']])) {
             $this->__objectDuplicationCheckCache[$object['Object']['template_uuid']] = $this->find('all', array(
                 'recursive' => -1,
@@ -892,13 +903,13 @@ class MispObject extends AppModel
         return $this->id;
     }
 
-    public function captureObject($object, $eventId, $user, $log = false, $unpublish = true)
+    public function captureObject($object, $eventId, $user, $log = false, $unpublish = true, $breakOnDuplicate = false)
     {
         $this->create();
         if (!isset($object['Object'])) {
             $object = array('Object' => $object);
         }
-        if (!empty($object['Object']['breakOnDuplicate'])) {
+        if (!empty($object['Object']['breakOnDuplicate']) || $breakOnDuplicate) {
             $duplicate = $this->checkForDuplicateObjects($object, $eventId);
             if ($duplicate) {
                 $log->create();

From 5e48a484b07eee661329e430f8e3c6694981f48f Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 11 Feb 2021 22:11:56 +0100
Subject: [PATCH 138/437] fix: [UI] Remove unnecessary CSS from default
 template

---
 app/View/Layouts/default.ctp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index 6a05c310c..b395c78e9 100644
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -15,7 +15,6 @@
             'jquery-ui',
             'chosen.min',
             'main',
-            'jquery-jvectormap-2.0.5',
             array('print', array('media' => 'print'))
         );
         if (Configure::read('MISP.custom_css')) {

From c9ca98ef04e3a67f0f384b40d8d75310ad21357b Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 12 Feb 2021 07:44:48 +0100
Subject: [PATCH 139/437] chg: [js] Move code from template to misp.js

---
 app/View/Layouts/dashboard.ctp | 4 ----
 app/View/Layouts/default.ctp   | 4 ----
 app/webroot/js/misp.js         | 5 +++++
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/View/Layouts/dashboard.ctp b/app/View/Layouts/dashboard.ctp
index e8a14042d..839d0dad8 100644
--- a/app/View/Layouts/dashboard.ctp
+++ b/app/View/Layouts/dashboard.ctp
@@ -125,10 +125,6 @@
         <?php
             endif;
         ?>
-        if ($('.alert').text().indexOf("$flashErrorMessage") >= 0) {
-            var flashMessageLink = '<span class="useCursorPointer underline bold" onClick="flashErrorPopover();">here</span>';
-            $('.alert').html(($('.alert').html().replace("$flashErrorMessage", flashMessageLink)));
-        }
         });
     </script>
 </body>
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index b395c78e9..3b79002e4 100644
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -120,10 +120,6 @@
         <?php
             endif;
         ?>
-        if ($('.alert').text().indexOf("$flashErrorMessage") >= 0) {
-            var flashMessageLink = '<span class="useCursorPointer underline bold" onClick="flashErrorPopover();">here</span>';
-            $('.alert').html(($('.alert').html().replace("$flashErrorMessage", flashMessageLink)));
-        }
         });
     </script>
 </body>
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index f9377f717..0b54590cc 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -4925,6 +4925,11 @@ $(document).ready(function() {
             html: true,
             trigger: 'hover'
         });
+
+    if ($('.alert').text().indexOf("$flashErrorMessage") >= 0) {
+        var flashMessageLink = '<span class="useCursorPointer underline bold" onClick="flashErrorPopover();">here</span>';
+        $('.alert').html(($('.alert').html().replace("$flashErrorMessage", flashMessageLink)));
+    }
 });
 
 $(document.body).on("click", ".correlation-expand-button", function() {

From 426dce20055cbc8760c12b42f25c7020d195ffc5 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 14 Feb 2021 09:54:42 +0100
Subject: [PATCH 140/437] fix: [internal] Remove unused roboto font

---
 .../css/fonts/roboto/Roboto-Black-webfont.eot | Bin 25828 -> 0 bytes
 .../css/fonts/roboto/Roboto-Black-webfont.svg | 147 --------------
 .../css/fonts/roboto/Roboto-Black-webfont.ttf | Bin 25640 -> 0 bytes
 .../fonts/roboto/Roboto-Black-webfont.woff    | Bin 14920 -> 0 bytes
 .../roboto/Roboto-BlackItalic-webfont.eot     | Bin 30040 -> 0 bytes
 .../roboto/Roboto-BlackItalic-webfont.svg     | 147 --------------
 .../roboto/Roboto-BlackItalic-webfont.ttf     | Bin 29824 -> 0 bytes
 .../roboto/Roboto-BlackItalic-webfont.woff    | Bin 17696 -> 0 bytes
 .../css/fonts/roboto/Roboto-Bold-webfont.eot  | Bin 25880 -> 0 bytes
 .../css/fonts/roboto/Roboto-Bold-webfont.svg  | 147 --------------
 .../css/fonts/roboto/Roboto-Bold-webfont.ttf  | Bin 25696 -> 0 bytes
 .../css/fonts/roboto/Roboto-Bold-webfont.woff | Bin 14940 -> 0 bytes
 .../roboto/Roboto-BoldCondensed-webfont.eot   | Bin 26100 -> 0 bytes
 .../roboto/Roboto-BoldCondensed-webfont.svg   | 147 --------------
 .../roboto/Roboto-BoldCondensed-webfont.ttf   | Bin 25876 -> 0 bytes
 .../roboto/Roboto-BoldCondensed-webfont.woff  | Bin 15036 -> 0 bytes
 .../Roboto-BoldCondensedItalic-webfont.eot    | Bin 30884 -> 0 bytes
 .../Roboto-BoldCondensedItalic-webfont.svg    | 147 --------------
 .../Roboto-BoldCondensedItalic-webfont.ttf    | Bin 30632 -> 0 bytes
 .../Roboto-BoldCondensedItalic-webfont.woff   | Bin 18112 -> 0 bytes
 .../roboto/Roboto-BoldItalic-webfont.eot      | Bin 30980 -> 0 bytes
 .../roboto/Roboto-BoldItalic-webfont.svg      | 147 --------------
 .../roboto/Roboto-BoldItalic-webfont.ttf      | Bin 30768 -> 0 bytes
 .../roboto/Roboto-BoldItalic-webfont.woff     | Bin 18208 -> 0 bytes
 .../fonts/roboto/Roboto-Condensed-webfont.eot | Bin 26444 -> 0 bytes
 .../fonts/roboto/Roboto-Condensed-webfont.svg | 147 --------------
 .../fonts/roboto/Roboto-Condensed-webfont.ttf | Bin 26240 -> 0 bytes
 .../roboto/Roboto-Condensed-webfont.woff      | Bin 15380 -> 0 bytes
 .../roboto/Roboto-CondensedItalic-webfont.eot | Bin 31352 -> 0 bytes
 .../roboto/Roboto-CondensedItalic-webfont.svg | 147 --------------
 .../roboto/Roboto-CondensedItalic-webfont.ttf | Bin 31120 -> 0 bytes
 .../Roboto-CondensedItalic-webfont.woff       | Bin 18428 -> 0 bytes
 .../fonts/roboto/Roboto-Italic-webfont.eot    | Bin 30544 -> 0 bytes
 .../fonts/roboto/Roboto-Italic-webfont.svg    | 147 --------------
 .../fonts/roboto/Roboto-Italic-webfont.ttf    | Bin 30352 -> 0 bytes
 .../fonts/roboto/Roboto-Italic-webfont.woff   | Bin 17940 -> 0 bytes
 .../css/fonts/roboto/Roboto-Light-webfont.eot | Bin 26368 -> 0 bytes
 .../css/fonts/roboto/Roboto-Light-webfont.svg | 147 --------------
 .../css/fonts/roboto/Roboto-Light-webfont.ttf | Bin 26180 -> 0 bytes
 .../fonts/roboto/Roboto-Light-webfont.woff    | Bin 15296 -> 0 bytes
 .../roboto/Roboto-LightItalic-webfont.eot     | Bin 31260 -> 0 bytes
 .../roboto/Roboto-LightItalic-webfont.svg     | 147 --------------
 .../roboto/Roboto-LightItalic-webfont.ttf     | Bin 31044 -> 0 bytes
 .../roboto/Roboto-LightItalic-webfont.woff    | Bin 18188 -> 0 bytes
 .../fonts/roboto/Roboto-Medium-webfont.eot    | Bin 26264 -> 0 bytes
 .../fonts/roboto/Roboto-Medium-webfont.svg    | 147 --------------
 .../fonts/roboto/Roboto-Medium-webfont.ttf    | Bin 26072 -> 0 bytes
 .../fonts/roboto/Roboto-Medium-webfont.woff   | Bin 15192 -> 0 bytes
 .../roboto/Roboto-MediumItalic-webfont.eot    | Bin 31048 -> 0 bytes
 .../roboto/Roboto-MediumItalic-webfont.svg    | 147 --------------
 .../roboto/Roboto-MediumItalic-webfont.ttf    | Bin 30828 -> 0 bytes
 .../roboto/Roboto-MediumItalic-webfont.woff   | Bin 18108 -> 0 bytes
 .../fonts/roboto/Roboto-Regular-webfont.eot   | Bin 26220 -> 0 bytes
 .../fonts/roboto/Roboto-Regular-webfont.svg   | 147 --------------
 .../fonts/roboto/Roboto-Regular-webfont.ttf   | Bin 26024 -> 0 bytes
 .../fonts/roboto/Roboto-Regular-webfont.woff  | Bin 15280 -> 0 bytes
 .../css/fonts/roboto/Roboto-Thin-webfont.eot  | Bin 26684 -> 0 bytes
 .../css/fonts/roboto/Roboto-Thin-webfont.svg  | 147 --------------
 .../css/fonts/roboto/Roboto-Thin-webfont.ttf  | Bin 26500 -> 0 bytes
 .../css/fonts/roboto/Roboto-Thin-webfont.woff | Bin 15568 -> 0 bytes
 .../roboto/Roboto-ThinItalic-webfont.eot      | Bin 33324 -> 0 bytes
 .../roboto/Roboto-ThinItalic-webfont.svg      | 147 --------------
 .../roboto/Roboto-ThinItalic-webfont.ttf      | Bin 33112 -> 0 bytes
 .../roboto/Roboto-ThinItalic-webfont.woff     | Bin 18984 -> 0 bytes
 app/webroot/css/roboto.css                    | 191 ------------------
 65 files changed, 2543 deletions(-)
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Black-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Black-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Black-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Black-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Bold-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Bold-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Bold-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Bold-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Italic-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Italic-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Italic-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Italic-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Light-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Light-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Light-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Light-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Medium-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Medium-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Medium-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Medium-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Regular-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Regular-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Regular-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Regular-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Thin-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Thin-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Thin-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-Thin-webfont.woff
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.eot
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.svg
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.ttf
 delete mode 100644 app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.woff
 delete mode 100644 app/webroot/css/roboto.css

diff --git a/app/webroot/css/fonts/roboto/Roboto-Black-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-Black-webfont.eot
deleted file mode 100644
index bae10a28aa92389d576622b3ffe1d8f130ee975f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25828
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
Bm+$}p

diff --git a/app/webroot/css/fonts/roboto/Roboto-Black-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-Black-webfont.svg
deleted file mode 100644
index e1d6178e0..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-Black-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoBlack" horiz-adv-x="1186" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="510" />
-<glyph unicode=" "  horiz-adv-x="510" />
-<glyph unicode="&#x09;" horiz-adv-x="510" />
-<glyph unicode="&#xa0;" horiz-adv-x="510" />
-<glyph unicode="!" horiz-adv-x="565" d="M115 0v283h339v-283h-339zM115 516v940h339v-940h-339z" />
-<glyph unicode="&#x22;" horiz-adv-x="881" d="M149 932v524h246v-275l-102 -249h-144zM506 932v524h245v-275l-102 -249h-143z" />
-<glyph unicode="#" horiz-adv-x="1190" d="M37 410v183h252l44 264h-221v183h251l69 416h198l-68 -416h161l69 416h199l-69 -416h231v-183h-261l-44 -264h229v-183h-259l-67 -410h-199l67 410h-161l-67 -410h-199l67 410h-222zM488 593h161l44 264h-161z" />
-<glyph unicode="$" horiz-adv-x="1227" d="M98 441l2 6h329q0 -115 55.5 -164t149.5 -49q83 0 120.5 41.5t37.5 110.5q0 80 -38.5 121.5t-146.5 86.5q-239 84 -350.5 184t-111.5 290q0 171 116 280.5t314 125.5v211h158v-214q187 -25 294 -141t104 -299l-2 -5h-330q0 100 -43.5 148t-122.5 48q-82 0 -116 -42.5 t-34 -113.5q0 -67 36.5 -106.5t147.5 -92.5q231 -74 346.5 -182t115.5 -297q0 -175 -111 -281t-304 -124v-201h-159v201q-202 17 -332 128.5t-125 329.5z" />
-<glyph unicode="%" horiz-adv-x="1521" d="M91 1099v77q0 130 84 215.5t239 85.5q157 0 241 -85.5t84 -215.5v-77q0 -130 -84 -214.5t-239 -84.5q-156 0 -240.5 85t-84.5 214zM305 188l711 1138l157 -79l-711 -1138zM307 1099q0 -50 28 -83.5t81 -33.5q51 0 78.5 33.5t27.5 83.5v77q0 50 -28 84.5t-80 34.5 q-51 0 -79 -34.5t-28 -84.5v-77zM782 280v77q0 129 85 214.5t240 85.5q157 0 240.5 -85t83.5 -215v-77q0 -131 -83.5 -215.5t-238.5 -84.5q-156 0 -241.5 85t-85.5 215zM999 280q0 -48 32 -83t78 -35q62 0 84 31t22 87v77q0 49 -28.5 83.5t-79.5 34.5q-52 0 -80 -34.5 t-28 -83.5v-77z" />
-<glyph unicode="&#x26;" horiz-adv-x="1380" d="M60 391q0 116 56.5 197.5t173.5 176.5l18 12q-61 86 -90.5 159t-29.5 148q0 189 110 291t302 102q159 0 258.5 -102t99.5 -248q0 -107 -36.5 -184.5t-110.5 -137.5l-100 -70l235 -271q34 57 53.5 124t19.5 140h260q0 -147 -34 -268.5t-109 -214.5l209 -240l-2 -5h-369 l-74 84q-87 -54 -173.5 -79.5t-190.5 -25.5q-218 0 -347 114t-129 298zM399 414q0 -77 46.5 -126t113.5 -49q43 0 87 9t85 28l-257 292q-41 -36 -58 -73t-17 -81zM480 1088q0 -37 17 -75.5t51 -82.5l45 28q56 36 75.5 70t19.5 75q0 46 -25.5 80t-74.5 34t-78.5 -37.5 t-29.5 -91.5z" />
-<glyph unicode="'" horiz-adv-x="440" d="M74 881v575h291v-292l-102 -283h-189z" />
-<glyph unicode="(" horiz-adv-x="727" d="M120 564v28q0 389 148 659.5t348 347.5h6l61 -159q-128 -94 -211 -304t-83 -542v-32q0 -333 83 -542.5t211 -303.5l-61 -159h-6q-200 77 -348 347t-148 660z" />
-<glyph unicode=")" horiz-adv-x="726" d="M44 -284q126 95 210 304.5t84 541.5v32q0 332 -84 542t-210 304l61 159h6q205 -76 362 -355t157 -652v-28q0 -374 -157 -652.5t-362 -354.5h-6z" />
-<glyph unicode="*" horiz-adv-x="843" d="M30 731l56 175l243 -72l8 248h182l15 -258l229 73l56 -177l-230 -85l131 -205l-149 -109l-153 204l-151 -195l-150 105l139 214z" />
-<glyph unicode="+" horiz-adv-x="1094" d="M45 537v289h342v380h315v-380h341v-289h-341v-391h-315v391h-342z" />
-<glyph unicode="," horiz-adv-x="590" d="M71 -326l70 327v263h326v-272l-163 -318h-233z" />
-<glyph unicode="-" horiz-adv-x="875" d="M135 497v261h589v-261h-589z" />
-<glyph unicode="." horiz-adv-x="619" d="M136 0v284h337v-284h-337z" />
-<glyph unicode="/" horiz-adv-x="811" d="M-29 -125l497 1581h341l-497 -1581h-341z" />
-<glyph unicode="0" d="M86 535v386q0 261 138 408.5t368 147.5q228 0 368 -148t140 -408v-386q0 -261 -139 -408.5t-367 -147.5q-230 0 -369 147.5t-139 408.5zM423 514q0 -136 44.5 -205.5t126.5 -69.5q80 0 124.5 69.5t44.5 205.5v430q0 133 -45.5 203t-125.5 70q-81 0 -125 -70t-44 -203 v-430z" />
-<glyph unicode="1" d="M208 1167v258l631 52v-1477h-338v1167h-293z" />
-<glyph unicode="2" d="M64 994q-5 202 133 342.5t366 140.5q239 0 369 -117.5t130 -323.5q0 -138 -72 -244.5t-264 -314.5l-177 -212l2 -5h562v-260h-1012v220l448 492q90 102 132 182t42 139q0 85 -38 134.5t-122 49.5q-79 0 -122.5 -64.5t-43.5 -164.5h-331z" />
-<glyph unicode="3" d="M77 398l2 6h329q0 -71 49 -118t125 -47q91 0 149.5 50.5t58.5 125.5q0 106 -55.5 154.5t-156.5 48.5h-160v251h160q91 0 140 49t49 136q0 68 -50 115.5t-135 47.5q-64 0 -108.5 -37.5t-44.5 -98.5h-328l-2 6q-6 174 136.5 282t346.5 108q237 0 379.5 -108.5t142.5 -307.5 q0 -99 -60 -182t-163 -131q118 -43 182 -129.5t64 -210.5q0 -200 -153.5 -314.5t-391.5 -114.5q-206 0 -358 107.5t-147 311.5z" />
-<glyph unicode="4" d="M48 515l599 938v3h338v-887h147v-262h-147v-307h-338v307h-579zM338 569h309v453l-6 1l-37 -75z" />
-<glyph unicode="5" d="M92 378l1 6l331 20q0 -77 48.5 -121t128.5 -44q94 0 131 57t37 171q0 120 -43 189t-136 69q-67 0 -108.5 -29t-57.5 -73l-303 17l84 816h853v-262h-579l-37 -303q41 29 104.5 47t138.5 20q203 4 312.5 -124.5t109.5 -364.5q0 -211 -122 -350.5t-384 -139.5 q-208 0 -361.5 109.5t-147.5 289.5z" />
-<glyph unicode="6" d="M74 566v293q0 288 170.5 453t438.5 165q84 0 150 -14.5t147 -46.5l-57 -246q-70 21 -121 31.5t-117 10.5q-124 0 -199 -88.5t-75 -262.5v-14q56 55 135.5 85t180.5 30q187 0 289.5 -136t102.5 -354q0 -215 -143 -354t-367 -139q-240 0 -387.5 157t-147.5 430zM411 566 q0 -158 52 -242.5t146 -84.5q76 0 124 67.5t48 165.5q0 110 -46 171t-121 61q-72 0 -123 -19t-80 -54v-65z" />
-<glyph unicode="7" d="M58 1196v260h1053v-260q-232 -264 -317.5 -486.5t-85.5 -518.5v-191h-338v191q0 292 106 535.5t311 469.5h-729z" />
-<glyph unicode="8" d="M72 410q0 116 70 206.5t192 140.5q-99 48 -154.5 130.5t-55.5 187.5q0 193 135 297.5t352 104.5q210 0 339 -104t129 -298q0 -105 -53 -187t-146 -131q116 -50 184 -140.5t68 -206.5q0 -204 -146 -317.5t-373 -113.5q-236 0 -388.5 114t-152.5 317zM411 428 q0 -86 57 -137.5t145 -51.5q78 0 129.5 51t51.5 138t-52.5 142t-130.5 55q-86 0 -143 -55t-57 -142zM463 1057q0 -79 40.5 -125.5t109.5 -46.5q60 0 94.5 46.5t34.5 125.5q0 76 -35 118t-96 42q-69 0 -108.5 -41.5t-39.5 -118.5z" />
-<glyph unicode="9" d="M80 967q0 216 142 363t367 147q221 0 363.5 -153.5t142.5 -422.5v-366q0 -252 -155.5 -404t-391.5 -152q-74 0 -154.5 16.5t-153.5 46.5l58 241q64 -23 121 -33.5t129 -10.5q92 0 151 72.5t59 200.5v84q-49 -60 -114 -90.5t-139 -30.5q-198 0 -311.5 133.5t-113.5 358.5z M417 967q0 -112 41.5 -180.5t120.5 -68.5q58 0 103.5 22t75.5 60v163q0 124 -47.5 189t-122.5 65q-79 0 -125 -75t-46 -175z" />
-<glyph unicode=":" horiz-adv-x="613" d="M136 0v284h337v-284h-337zM136 876v284h337v-284h-337z" />
-<glyph unicode=";" horiz-adv-x="579" d="M137 876v284h337v-284h-337zM122 -326l70 327v263h326v-272l-163 -318h-233z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1044" d="M46 410v266l884 360v-306l-552 -186v-6l552 -181v-307z" />
-<glyph unicode="=" horiz-adv-x="1195" d="M128 293v260h926v-260h-926zM128 732v260h926v-260h-926z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1050" d="M111 48v306l547 186v6l-547 182v306l879 -360v-266z" />
-<glyph unicode="?" horiz-adv-x="1043" d="M18 1060q-3 208 132.5 312.5t357.5 104.5q238 0 374.5 -120t136.5 -324q0 -125 -74.5 -230t-189.5 -165q-64 -42 -86.5 -90.5t-22.5 -131.5h-338q1 139 50 209t179 161q67 42 105.5 104t38.5 143q0 84 -45 134t-128 50q-67 0 -112 -41t-47 -122h-329zM309 0v270h336v-270 h-336z" />
-<glyph unicode="@" horiz-adv-x="1809" d="M43 478q18 429 258 680.5t638 251.5q391 0 598.5 -238t191.5 -652q-9 -220 -132 -380.5t-367 -160.5q-81 0 -140 45.5t-83 128.5q-41 -85 -103.5 -127.5t-146.5 -42.5q-149 0 -228 118.5t-58 314.5q26 251 146.5 402t292.5 151q121 0 194.5 -26t161.5 -80l-3 -4h5 l-51 -566q-5 -87 11.5 -119.5t44.5 -32.5q112 0 179.5 107.5t75.5 271.5q16 339 -133 528.5t-460 189.5q-302 0 -480 -204t-193 -556q-17 -343 144.5 -542t463.5 -199q84 0 174.5 18.5t156.5 46.5l38 -166q-67 -42 -170.5 -65.5t-202.5 -23.5q-404 0 -622 249t-201 682z M719 416q-9 -120 17.5 -181.5t86.5 -61.5q54 0 96.5 30t74.5 111l40 452q-22 5 -43 8.5t-42 3.5q-104 0 -158.5 -90.5t-71.5 -271.5z" />
-<glyph unicode="A" horiz-adv-x="1307" d="M5 0l475 1456h181v-1l1 1h181l476 -1456h-356l-85 283h-433l-84 -283h-356zM523 543h277l-136 452h-6z" />
-<glyph unicode="B" horiz-adv-x="1306" d="M116 0v1456h477q271 0 422.5 -100.5t151.5 -299.5q0 -104 -48 -184.5t-150 -121.5q130 -28 192.5 -116t62.5 -203q0 -213 -143 -322t-410 -109h-555zM454 260h217q108 0 162 42.5t54 130.5q0 93 -47.5 141t-156.5 51h-11h-218v-365zM454 849h133q122 0 182 42.5t60 126.5 q0 93 -58 135.5t-178 42.5h-139v-347z" />
-<glyph unicode="C" horiz-adv-x="1307" d="M89 576v304q0 266 157.5 431.5t416.5 165.5q277 0 429 -129q148 -126 147 -362v-13l-3 -6h-329q0 134 -57 192t-187 58q-114 0 -175 -91.5t-61 -243.5v-306q0 -153 67 -245t192 -92q116 0 167.5 58t51.5 194h329l2 -6v-13q0 -238 -140 -364q-144 -128 -410 -129 q-270 0 -433.5 165t-163.5 432z" />
-<glyph unicode="D" horiz-adv-x="1338" d="M116 0v1456h533q257 0 430 -167.5t173 -429.5v-262q0 -263 -173 -430t-430 -167h-533zM454 260h195q115 0 189.5 94t74.5 243v264q0 147 -74.5 241t-189.5 94h-195v-936z" />
-<glyph unicode="E" horiz-adv-x="1143" d="M116 0v1456h954v-260h-616v-313h513v-260h-513v-363h615v-260h-953z" />
-<glyph unicode="F" horiz-adv-x="1143" d="M116 0v1456h973v-260h-635v-350h533v-260h-533v-586h-338z" />
-<glyph unicode="G" horiz-adv-x="1353" d="M88 576v304q0 263 164.5 430t423.5 167q279 0 422 -125q137 -120 137 -325v-15l-2 -6h-317q0 107 -57 159t-172 52q-118 0 -190 -93t-72 -242v-306q0 -152 71.5 -244.5t200.5 -92.5q93 0 146.5 15t84.5 40v260h-258v224h596v-577q-76 -92 -214 -157t-355 -65 q-271 0 -440 166t-169 431z" />
-<glyph unicode="H" horiz-adv-x="1446" d="M116 0v1456h338v-610h539v610h337v-1456h-337v586h-539v-586h-338z" />
-<glyph unicode="I" horiz-adv-x="611" d="M137 0v1456h337v-1456h-337z" />
-<glyph unicode="J" horiz-adv-x="1144" d="M14 440l3 6h330q0 -107 54 -157t141 -50q66 0 108 60.5t42 167.5v989h338v-989q0 -223 -137 -355.5t-351 -132.5q-246 0 -390 118q-138 114 -138 328v15z" />
-<glyph unicode="K" horiz-adv-x="1306" d="M116 0v1456h338v-570h70l329 570h425l-458 -662l497 -794h-434l-335 584h-94v-584h-338z" />
-<glyph unicode="L" horiz-adv-x="1144" d="M116 0v1456h338v-1196h625v-260h-963z" />
-<glyph unicode="M" horiz-adv-x="1783" d="M116 0v1456h443l326 -1019h6l329 1019h447v-1456h-338v938l-6 1l-321 -939h-227l-315 925l-6 -1v-924h-338z" />
-<glyph unicode="N" horiz-adv-x="1446" d="M116 0v1456h338l533 -915l6 2v913h337v-1456h-337l-533 916l-6 -2v-914h-338z" />
-<glyph unicode="O" horiz-adv-x="1416" d="M89 597v262q0 268 171.5 443t447.5 175q274 0 446 -175t172 -443v-262q0 -269 -170.5 -443.5t-445.5 -174.5q-277 0 -449 174.5t-172 443.5zM426 597q0 -158 73.5 -258t210.5 -100q133 0 206 100t73 258v264q0 156 -73.5 256t-207.5 100q-137 0 -209.5 -99.5 t-72.5 -256.5v-264z" />
-<glyph unicode="P" horiz-adv-x="1306" d="M116 0v1456h556q259 0 411 -132t152 -347t-152 -346.5t-411 -131.5h-218v-499h-338zM454 759h218q110 0 168 60.5t58 155.5q0 97 -57.5 159t-168.5 62h-218v-437z" />
-<glyph unicode="Q" horiz-adv-x="1447" d="M89 597v262q0 268 171.5 443t447.5 175q274 0 446 -175t172 -443v-262q0 -107 -29 -201.5t-83 -171.5l218 -222l-217 -167l-210 210q-65 -33 -139 -49.5t-156 -16.5q-277 0 -449 174.5t-172 443.5zM426 597q0 -158 73.5 -258t210.5 -100q133 0 206 100t73 258v264 q0 156 -73.5 256t-207.5 100q-137 0 -209.5 -99.5t-72.5 -256.5v-264z" />
-<glyph unicode="R" horiz-adv-x="1306" d="M116 0v1456h507q253 0 401 -117t148 -320q0 -113 -59.5 -194t-175.5 -132q134 -38 192.5 -126.5t58.5 -220.5v-92q0 -57 17 -130t59 -104v-20h-349q-40 31 -52 109t-12 147v88q0 104 -55 159t-161 55h-181v-558h-338zM454 818h171q102 0 156 46.5t54 133.5 q0 89 -55.5 143.5t-156.5 54.5h-169v-378z" />
-<glyph unicode="S" horiz-adv-x="1273" d="M72 462l2 6h329q0 -127 62.5 -180.5t191.5 -53.5q106 0 158 42t52 110q0 78 -51 119.5t-185 88.5q-271 88 -402.5 187.5t-131.5 286.5q0 183 153 296t389 113q249 -1 401 -117q147 -113 147 -315v-13l-2 -6h-328q0 103 -56 149.5t-169 46.5q-92 0 -145 -45t-53 -111 q0 -64 54.5 -102.5t203.5 -96.5q253 -75 383 -183t130 -296q0 -192 -150 -300.5t-398 -108.5q-247 1 -419 117q-167 113 -166 352v14z" />
-<glyph unicode="T" horiz-adv-x="1150" d="M28 1196v260h1101v-260h-385v-1196h-338v1196h-378z" />
-<glyph unicode="U" horiz-adv-x="1417" d="M107 512v944h339v-944q0 -135 70 -204t194 -69q123 0 191.5 68.5t68.5 204.5v944h339v-944q0 -250 -166 -391.5t-433 -141.5q-269 0 -436 141.5t-167 391.5z" />
-<glyph unicode="V" horiz-adv-x="1307" d="M0 1456h353l285 -1061l10 -53h6l10 49l289 1065h354l-472 -1456h-365z" />
-<glyph unicode="W" horiz-adv-x="1825" d="M12 1456h343l176 -945l6 -1l247 946h255l248 -944h6l176 944h342l-334 -1456h-318l-245 899h-6l-243 -899h-318z" />
-<glyph unicode="X" horiz-adv-x="1307" d="M14 0l428 734l-417 722h387l236 -491l240 491h390l-417 -722l449 -734h-410l-248 501l-248 -501h-390z" />
-<glyph unicode="Y" horiz-adv-x="1307" d="M-5 1456h366l289 -636h6l290 636h366l-494 -944v-512h-337v527z" />
-<glyph unicode="Z" horiz-adv-x="1131" d="M64 1196v260h994v-146l-591 -1050h600v-260h-1000v152l588 1044h-591z" />
-<glyph unicode="[" horiz-adv-x="577" d="M108 -349v2055h456v-246h-118v-1564h118v-245h-456z" />
-<glyph unicode="\" horiz-adv-x="871" d="M-16 1456h338l608 -1581h-339z" />
-<glyph unicode="]" horiz-adv-x="577" d="M14 -104h119v1564h-119v246h456v-2055h-456v245z" />
-<glyph unicode="^" horiz-adv-x="916" d="M36 729l299 727h249l300 -727h-254l-165 413l-4 18h-6l-4 -18l-162 -413h-253z" />
-<glyph unicode="_" horiz-adv-x="904" d="M0 0h903v-251h-903v251z" />
-<glyph unicode="`" horiz-adv-x="695" d="M40 1512l2 6h370l208 -266h-297z" />
-<glyph unicode="a" horiz-adv-x="1086" d="M32 305q0 161 121 248.5t367 87.5h139v77q0 69 -33 106t-101 37q-59 0 -87.5 -27.5t-28.5 -85.5l-328 1l-2 6v15q-1 138 123 232q130 100 345 100q201 0 325.5 -100t124.5 -286v-408q0 -86 14.5 -160t43.5 -148l-334 1q-19 34 -32.5 77t-20.5 90q-44 -86 -108.5 -137.5 t-168.5 -51.5q-170 0 -264.5 87.5t-94.5 238.5zM370 323q0 -46 31.5 -74.5t81.5 -28.5q62 0 109.5 29t66.5 69v143h-136q-81 0 -117 -39t-36 -99z" />
-<glyph unicode="b" horiz-adv-x="1151" d="M96 0v1560h338v-583q45 60 104.5 92.5t137.5 32.5q209 0 315.5 -153t106.5 -410v-21q0 -247 -106 -393t-314 -146q-88 0 -154 38t-113 110l-20 -127h-295zM434 307q24 -34 63.5 -51t95.5 -17q100 0 134 69.5t34 209.5v21q0 144 -36 223.5t-134 79.5q-55 0 -94.5 -20.5 t-62.5 -59.5v-455z" />
-<glyph unicode="c" horiz-adv-x="1048" d="M45 529v23q0 244 133 397t379 153q205 0 329 -114q120 -111 120 -302v-12l-2 -6h-308q0 77 -35 125.5t-104 48.5q-98 0 -136.5 -78.5t-38.5 -211.5v-23q0 -136 38.5 -213t138.5 -77q69 0 103 37.5t34 108.5h308l2 -6v-11q0 -170 -122 -278q-126 -112 -325 -111 q-247 0 -380.5 152.5t-133.5 397.5z" />
-<glyph unicode="d" horiz-adv-x="1151" d="M51 518v21q0 253 110.5 408t311.5 155q75 0 135.5 -34.5t108.5 -98.5v591h338v-1560h-296l-23 132q-49 -74 -114.5 -113.5t-150.5 -39.5q-200 0 -310 148t-110 391zM389 518q0 -132 38.5 -205.5t129.5 -73.5q53 0 93.5 19.5t66.5 57.5v437q-26 43 -66 66t-92 23 q-90 0 -130 -83t-40 -220v-21z" />
-<glyph unicode="e" horiz-adv-x="1070" d="M51 505v38q-1 248 131 404q131 155 378 155h3q219 0 339.5 -131t120.5 -359v-177h-620l-2 -6q8 -85 63 -137.5t158 -52.5q97 0 161.5 16t147.5 51l81 -206q-70 -51 -188 -86t-248 -35q-246 0 -385.5 149t-139.5 377zM399 651l2 -5h292v26q0 84 -29.5 127t-100.5 43 q-81 0 -119.5 -51.5t-44.5 -139.5z" />
-<glyph unicode="f" horiz-adv-x="734" d="M13 848v234h156v112q0 186 112 286.5t317 100.5q39 0 78.5 -5.5t88.5 -15.5l-25 -249q-28 5 -49 7.5t-51 2.5q-64 0 -98 -33t-34 -94v-112h214v-234h-214v-848h-339v848h-156z" />
-<glyph unicode="g" horiz-adv-x="1151" d="M50 518v21q0 253 110.5 408t311.5 155q85 0 150 -40.5t112 -114.5l22 135h298v-1070q0 -214 -146.5 -331.5t-403.5 -117.5q-84 0 -176 23t-176 62l58 250q73 -32 139.5 -47.5t152.5 -15.5q108 0 160.5 43t52.5 136v84q-46 -59 -106.5 -89t-138.5 -30q-200 0 -310 148 t-110 391zM387 518q0 -132 38.5 -205.5t130.5 -73.5q55 0 94.5 17t64.5 51v455q-25 39 -64 59.5t-93 20.5q-90 0 -130.5 -83.5t-40.5 -219.5v-21z" />
-<glyph unicode="h" horiz-adv-x="1151" d="M86 0v1560h338v-612q49 73 119.5 113.5t155.5 40.5q168 0 264 -117t96 -363v-622h-338v624q0 124 -32 171t-97 47q-57 0 -99 -16.5t-69 -46.5v-779h-338z" />
-<glyph unicode="i" horiz-adv-x="561" d="M111 0v1082h339v-1082h-339zM111 1333v227h339v-227h-339z" />
-<glyph unicode="j" horiz-adv-x="548" d="M-115 -420l14 255q29 -6 49.5 -9t51.5 -3q56 0 85.5 41t29.5 121v1097h339v-1097q0 -202 -108.5 -312t-301.5 -110q-44 0 -80.5 4t-78.5 13zM109 1334v226h339v-226h-339z" />
-<glyph unicode="k" horiz-adv-x="1119" d="M96 0v1560h338v-875h48l228 397h387l-333 -488l388 -594h-385l-272 430h-61v-430h-338z" />
-<glyph unicode="l" horiz-adv-x="561" d="M111 0v1560h339v-1560h-339z" />
-<glyph unicode="m" horiz-adv-x="1764" d="M96 0v1082h318l12 -143q51 78 128.5 120.5t177.5 42.5q101 0 174 -44t110 -134q50 85 128.5 131.5t183.5 46.5q158 0 248.5 -113.5t90.5 -349.5v-639h-339v639q0 116 -32.5 159.5t-97.5 43.5q-49 0 -86.5 -17.5t-63.5 -48.5q0 -17 1 -29.5t1 -24.5v-722h-338v639 q0 117 -32 160t-99 43q-46 0 -83.5 -17.5t-63.5 -48.5v-776h-338z" />
-<glyph unicode="n" horiz-adv-x="1151" d="M90 0v1082h317l13 -152q53 81 131 126.5t174 45.5q159 0 248.5 -108t89.5 -343v-651h-338v652q0 103 -33 146.5t-96 43.5q-54 0 -97 -19t-72 -54v-769h-337z" />
-<glyph unicode="o" horiz-adv-x="1151" d="M51 530v21q0 244 138 397.5t385 153.5q248 0 386 -153.5t138 -397.5v-21q0 -245 -138 -398t-384 -153q-249 0 -387 153t-138 398zM389 530q0 -136 42.5 -213.5t144.5 -77.5q99 0 142 78t43 213v21q0 132 -43 211.5t-144 79.5q-100 0 -142.5 -80t-42.5 -211v-21z" />
-<glyph unicode="p" horiz-adv-x="1151" d="M96 -416v1498h319l10 -118q45 66 107.5 102t143.5 36q201 0 311.5 -155t110.5 -408v-21q0 -244 -110 -391.5t-310 -147.5q-78 0 -138.5 30t-105.5 87v-512h-338zM434 308q24 -35 63.5 -52t97.5 -17q89 0 127.5 73.5t38.5 205.5v21q0 137 -40 220t-128 83q-57 0 -96.5 -21 t-62.5 -61v-452z" />
-<glyph unicode="q" horiz-adv-x="1151" d="M51 518v21q0 253 110.5 408t311.5 155q85 0 150 -40.5t112 -114.5l26 135h295v-1498h-338v516q-46 -59 -107.5 -90t-139.5 -31q-200 0 -310 148t-110 391zM389 518q0 -132 38.5 -205.5t129.5 -73.5q56 0 96 17.5t65 52.5v450q-25 41 -64.5 62t-94.5 21q-90 0 -130 -83 t-40 -220v-21z" />
-<glyph unicode="r" horiz-adv-x="722" d="M96 0v1082h318l12 -159q34 85 90 132t131 47q23 0 41 -3t38 -9l-32 -296l-110 1q-58 0 -95 -21.5t-55 -60.5v-713h-338z" />
-<glyph unicode="s" horiz-adv-x="1048" d="M41 341l2 6h306q2 -77 46.5 -111t126.5 -34q68 0 103 26.5t35 75.5q0 40 -45.5 71.5t-165.5 56.5q-189 37 -285 114.5t-96 213.5q0 143 120 242.5t325 99.5q216 0 344 -96q122 -92 122 -236v-14l-2 -6h-328q0 64 -32 97t-105 33q-53 0 -89 -29t-36 -74q0 -43 41.5 -73 t167.5 -54q199 -39 294 -116.5t95 -219.5q0 -146 -129.5 -240.5t-342.5 -94.5q-221 0 -349 112q-123 107 -123 238v12z" />
-<glyph unicode="t" horiz-adv-x="723" d="M-5 848v234h151v269h338v-269h171v-234h-171v-496q0 -58 23.5 -83.5t63.5 -25.5q26 0 41.5 2t39.5 8l23 -250q-51 -13 -92 -18.5t-97 -5.5q-167 0 -253.5 89t-86.5 282v498h-151z" />
-<glyph unicode="u" horiz-adv-x="1151" d="M88 462v620h337v-622q0 -127 32.5 -174t100.5 -47q54 0 95 15t70 45v783h338v-1082h-272l-41 162q-48 -88 -124.5 -135.5t-176.5 -47.5q-168 0 -263.5 118t-95.5 365z" />
-<glyph unicode="v" horiz-adv-x="1053" d="M0 1082h356l145 -636l20 -115l6 -1l22 116l143 636h355l-352 -1082h-343z" />
-<glyph unicode="w" horiz-adv-x="1485" d="M21 1082h322l108 -609h6l177 609h213l178 -605h6l107 605h322l-254 -1082h-286l-176 554h-6l-177 -554h-285z" />
-<glyph unicode="x" horiz-adv-x="1053" d="M5 0l325 547l-315 535h377l132 -319h6l137 319h379l-314 -535l325 -547h-379l-144 329h-6l-144 -329h-379z" />
-<glyph unicode="y" horiz-adv-x="1053" d="M-5 1082h359l161 -605l1 -8h6l179 613h360l-431 -1243q-50 -120 -129 -198t-251 -78q-44 0 -72 5.5t-88 20.5l41 241l21 -4q7 -2 18 -2q80 0 117 23.5t55 70.5l27 70z" />
-<glyph unicode="z" horiz-adv-x="1053" d="M65 0v188l481 634h-460v260h888v-182l-482 -640h492v-260h-919z" />
-<glyph unicode="{" horiz-adv-x="665" d="M40 505v227q82 0 122 51.5t40 145.5v203q0 171 82.5 290.5t277.5 174.5l63 -176q-73 -29 -102 -103t-29 -186v-203q0 -104 -46 -184.5t-139 -125.5q93 -47 139 -127.5t46 -182.5v-203q0 -112 29 -186t102 -103l-63 -177q-195 55 -277.5 175t-82.5 291v203q0 92 -40 144 t-122 52z" />
-<glyph unicode="|" horiz-adv-x="523" d="M142 -270v1726h246v-1726h-246z" />
-<glyph unicode="}" horiz-adv-x="665" d="M41 -183q72 29 101.5 103t29.5 186v203q0 103 45.5 183.5t140.5 126.5q-95 45 -140.5 125.5t-45.5 184.5v203q0 112 -29.5 186t-101.5 103l63 176q194 -55 277 -174.5t83 -290.5v-203q0 -94 39.5 -145.5t122.5 -51.5v-227q-83 0 -122.5 -52t-39.5 -144v-203 q0 -171 -83 -291t-277 -175z" />
-<glyph unicode="~" horiz-adv-x="1295" d="M94 435q0 175 87 288t226 113q81 0 156 -32.5t147 -96.5q43 -42 76.5 -60.5t72.5 -18.5q43 0 74.5 50t31.5 122l232 -31q0 -175 -88.5 -288.5t-226.5 -113.5q-83 0 -154 30.5t-146 99.5q-47 43 -79.5 61t-73.5 18q-43 0 -73.5 -50t-30.5 -121z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1210" d="M45 529v23q0 231 120.5 381.5t345.5 166.5v218h200v-235q141 -39 221 -146.5t80 -268.5h-316q0 77 -35 125.5t-104 48.5q-98 0 -136.5 -78.5t-38.5 -211.5v-23q0 -136 38.5 -213t138.5 -77q69 0 103 37.5t34 108.5h316q0 -144 -82 -246t-219 -140v-244h-200v226 q-225 16 -345.5 166t-120.5 382z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1227" d="M103 575v261h154l-7 185q0 213 124.5 334.5t333.5 121.5q223 0 345 -115t118 -304l-2 -6h-330q0 85 -37.5 125t-94.5 40t-88 -51t-31 -145l9 -185h325v-261h-312l3 -51q0 -73 -34.5 -141t-98.5 -123h692v-260h-1006v260h10q47 12 70.5 86.5t23.5 156.5l-3 72h-164z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1258" d="M18 1456h367l243 -579h6l244 579h366l-366 -714h213v-184h-295v-106h295v-183h-295v-269h-337v269h-323v183h323v106h-323v184h249z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1608" d="M85 729q0 315 207 531t503 216q295 0 502.5 -216t207.5 -531q0 -316 -208 -533t-502 -217q-296 0 -503 217t-207 533zM207 729q0 -264 171.5 -444.5t416.5 -180.5q244 0 415.5 180.5t171.5 444.5q0 263 -171.5 442.5t-415.5 179.5q-246 0 -417 -179.5t-171 -442.5z M432 669v119q0 173 94.5 280t254.5 107q157 0 245.5 -79.5t84.5 -228.5l-2 -6h-148q0 94 -45 136.5t-135 42.5q-94 0 -144 -69t-50 -182v-120q0 -115 50 -183.5t144 -68.5q90 0 134.5 41.5t44.5 137.5h148l2 -6q4 -151 -84 -229.5t-245 -78.5q-160 0 -254.5 106t-94.5 281z " />
-<glyph unicode="&#xad;" horiz-adv-x="875" d="M135 497v261h589v-261h-589z" />
-<glyph unicode="&#xae;" horiz-adv-x="1608" d="M85 729q0 315 207 531t503 216q295 0 502.5 -216t207.5 -531q0 -316 -208 -533t-502 -217q-296 0 -503 217t-207 533zM207 729q0 -264 171.5 -444.5t416.5 -180.5q244 0 415.5 180.5t171.5 444.5q0 263 -171.5 442.5t-415.5 179.5q-246 0 -417 -179.5t-171 -442.5z M500 316v850h281q151 0 238 -69t87 -195q0 -56 -27.5 -98.5t-79.5 -71.5q55 -31 79.5 -86.5t24.5 -130.5v-56q0 -41 3.5 -73.5t13.5 -53.5v-16h-155q-9 21 -11 61.5t-2 82.5v54q0 71 -33.5 105t-109.5 34h-158v-337h-151zM651 787h128q74 0 125.5 30t51.5 86q0 72 -39 101 t-136 29h-130v-246z" />
-<glyph unicode="&#xb4;" horiz-adv-x="762" d="M107 1252l206 266h371l2 -6l-281 -260h-298z" />
-<glyph unicode="&#x2000;" horiz-adv-x="853" />
-<glyph unicode="&#x2001;" horiz-adv-x="1706" />
-<glyph unicode="&#x2002;" horiz-adv-x="853" />
-<glyph unicode="&#x2003;" horiz-adv-x="1706" />
-<glyph unicode="&#x2004;" horiz-adv-x="568" />
-<glyph unicode="&#x2005;" horiz-adv-x="426" />
-<glyph unicode="&#x2006;" horiz-adv-x="284" />
-<glyph unicode="&#x2007;" horiz-adv-x="284" />
-<glyph unicode="&#x2008;" horiz-adv-x="213" />
-<glyph unicode="&#x2009;" horiz-adv-x="341" />
-<glyph unicode="&#x200a;" horiz-adv-x="94" />
-<glyph unicode="&#x2010;" horiz-adv-x="875" d="M135 497v261h589v-261h-589z" />
-<glyph unicode="&#x2011;" horiz-adv-x="875" d="M135 497v261h589v-261h-589z" />
-<glyph unicode="&#x2012;" horiz-adv-x="875" d="M135 497v261h589v-261h-589z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1412" d="M136.498 578v264h1084.19v-264h-1084.19z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1675" d="M134.997 578v264h1334.38v-264h-1334.38z" />
-<glyph unicode="&#x2018;" horiz-adv-x="576" d="M142 912v295l102 249h167v-544h-269z" />
-<glyph unicode="&#x2019;" horiz-adv-x="577" d="M158 912v544h269v-294l-102 -250h-167z" />
-<glyph unicode="&#x201c;" horiz-adv-x="921" d="M120 912v295l102 249h167v-544h-269zM448 912v295l102 249h167v-544h-269z" />
-<glyph unicode="&#x201d;" horiz-adv-x="932" d="M123 912v544h269v-294l-102 -250h-167zM459 912v544h269v-294l-102 -250h-167z" />
-<glyph unicode="&#x2022;" horiz-adv-x="757" d="M134 706v107q0 106 69 173.5t183 67.5q118 0 186.5 -67t68.5 -174v-107q0 -107 -68.5 -172.5t-184.5 -65.5t-185 66t-69 172z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1587" d="M136 0v284h337v-284h-337zM579 0v284h337v-284h-337zM999 0v284h337v-284h-337z" />
-<glyph unicode="&#x202f;" horiz-adv-x="341" />
-<glyph unicode="&#x205f;" horiz-adv-x="426" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1130" d="M67 472v166h146v144h-146v166h146v13q0 235 154.5 375.5t405.5 140.5q60 0 117.5 -8t125.5 -23l-21 -264q-53 16 -109.5 25.5t-112.5 9.5q-105 0 -163 -66.5t-58 -187.5v-15h396v-166h-396v-144h396v-166h-396v-14q0 -111 57.5 -165t165.5 -54q57 0 112.5 8t107.5 25 l21 -262q-57 -15 -118 -23t-123 -8q-252 0 -407 129.5t-155 349.5v14h-146z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1298" d="M92 1340v116h406v-116h-121v-423h-168v423h-117zM564 913v543h180l100 -348h6l99 348h175v-543h-147v243l-6 1l-83 -244h-83l-88 260l-6 -1v-259h-147z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1120" d="M135 578v264h834v-264h-834z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-Black-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-Black-webfont.ttf
deleted file mode 100644
index 7acbe9390f0d4dc4f3b93021c172089d0fa067b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25640
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
NdTOHCsajGo`yVVSfn5Lq

diff --git a/app/webroot/css/fonts/roboto/Roboto-Black-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-Black-webfont.woff
deleted file mode 100644
index 2bbbfbf34d68e46853314d4ec0cd0cbd55eb13c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14920
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
BpyU7m

diff --git a/app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.eot
deleted file mode 100644
index 6e811a66d7f8efef935f467913dfd41f0a07caba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30040
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
DsT-js

diff --git a/app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.svg
deleted file mode 100644
index 810986695..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoBlackItalic" horiz-adv-x="1186" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="510" />
-<glyph unicode=" "  horiz-adv-x="510" />
-<glyph unicode="&#x09;" horiz-adv-x="510" />
-<glyph unicode="&#xa0;" horiz-adv-x="510" />
-<glyph unicode="!" horiz-adv-x="565" d="M35 0l42 283h339l-42 -283h-339zM112 516l141 940h339l-141 -940h-339z" />
-<glyph unicode="&#x22;" horiz-adv-x="881" d="M204 932l33 235l41 289h246l-39 -275l-137 -249h-144zM561 932l35 244l39 280h245l-39 -275l-137 -249h-143z" />
-<glyph unicode="#" horiz-adv-x="1190" d="M19 410l27 183h252l83 264h-220l27 183h251l131 416h198l-131 -416h162l131 416h199l-131 -416h231l-27 -183h-262l-83 -264h229l-27 -183h-259l-129 -410h-199l129 410h-162l-128 -410h-199l129 410h-222zM497 593h161l83 264h-161z" />
-<glyph unicode="$" horiz-adv-x="1227" d="M85 442l2 5h330q-17 -120 31 -166.5t144 -46.5q79 0 124 42t55 110q11 82 -21 122t-135 86q-228 84 -325.5 184t-69.5 290q24 178 154 284t332 122l30 211h158l-30 -215q178 -26 271.5 -143t69.5 -301h-337q14 104 -22.5 150t-116.5 46q-78 0 -120.5 -43.5t-51.5 -112.5 q-10 -70 20.5 -107.5t135.5 -91.5q221 -74 321 -182t74 -297q-26 -183 -150.5 -285.5t-321.5 -119.5l-28 -201h-159l28 201q-194 18 -310.5 130.5t-81.5 328.5z" />
-<glyph unicode="%" horiz-adv-x="1521" d="M176 1099l11 77q20 134 116.5 217.5t252.5 83.5q150 0 224 -86.5t55 -214.5l-11 -77q-21 -134 -116 -216.5t-252 -82.5q-150 0 -225 86t-55 213zM253 188l882 1138l145 -79l-882 -1138zM392 1099q-8 -51 15 -84t76 -33q49 0 82.5 34t41.5 83l11 77q7 52 -15 85.5 t-75 33.5q-49 0 -83.5 -35t-41.5 -84zM744 280l12 77q19 133 116.5 216.5t253.5 83.5q150 0 223.5 -86t55.5 -214l-12 -77q-21 -135 -115.5 -217.5t-251.5 -82.5q-150 0 -226 86t-56 214zM961 280q-8 -49 19 -83.5t73 -34.5q60 0 88 32t36 86l12 77q7 51 -16.5 84.5 t-74.5 33.5q-50 0 -84 -35t-41 -83z" />
-<glyph unicode="&#x26;" horiz-adv-x="1380" d="M39 391q17 120 84 198.5t202 175.5l19 11q-48 87 -67 160t-6 148q29 196 153 294.5t318 98.5q152 0 239 -103t66 -247q-17 -112 -64 -187t-131 -135l-111 -70l193 -269q44 57 73.5 123t40.5 139h260q-23 -153 -74.5 -272.5t-139.5 -211.5l176 -244h-376l-62 84 q-94 -54 -184.5 -79.5t-194.5 -25.5q-210 0 -326 115.5t-88 296.5zM381 414q-12 -80 27.5 -127.5t106.5 -47.5q42 0 86.5 9.5t89.5 28.5l-212 291q-46 -37 -68.5 -73.5t-29.5 -80.5zM563 1088q-6 -38 5.5 -76t39.5 -83l49 29q62 36 86 70.5t30 74.5q7 48 -13 81t-69 33 q-47 0 -83.5 -38t-44.5 -91z" />
-<glyph unicode="'" horiz-adv-x="440" d="M122 881l38 270l43 305h291l-41 -292l-142 -283h-189z" />
-<glyph unicode="(" horiz-adv-x="727" d="M124 564l4 28q56 405 239 667t398 341l6 -1l39 -159q-141 -94 -254 -304t-159 -542l-4 -32q-49 -347 4.5 -548.5t170.5 -297.5l-84 -159h-5q-189 77 -299.5 347t-55.5 660z" />
-<glyph unicode=")" horiz-adv-x="726" d="M-71 -284q139 95 252.5 304.5t160.5 541.5l4 32q48 346 -5.5 548t-169.5 298l84 159h6q194 -76 311.5 -355t65.5 -652l-4 -28q-55 -389 -247.5 -659.5t-412.5 -348.5l-6 1z" />
-<glyph unicode="*" horiz-adv-x="843" d="M60 731l82 175l232 -72l45 248h182l-23 -258l240 73l29 -177l-243 -85l101 -205l-166 -109l-122 204l-180 -195l-135 105l171 214z" />
-<glyph unicode="+" horiz-adv-x="1094" d="M46 537l43 289h342l57 380h315l-57 -380h341l-43 -289h-342l-58 -391h-315l58 391h-341z" />
-<glyph unicode="," horiz-adv-x="590" d="M-58 -326l119 327l40 263h326l-41 -272l-211 -318h-233z" />
-<glyph unicode="-" horiz-adv-x="875" d="M130 497l39 261h589l-39 -261h-589z" />
-<glyph unicode="." horiz-adv-x="619" d="M56 0l43 284h337l-43 -284h-337z" />
-<glyph unicode="/" horiz-adv-x="811" d="M-128 -125l734 1581h341l-734 -1581h-341z" />
-<glyph unicode="0" d="M86 535l58 386q40 271 198.5 413.5t391.5 142.5q220 0 341 -149t83 -407l-58 -386q-41 -272 -199.5 -414t-389.5 -142q-221 0 -342.5 148.5t-82.5 407.5zM420 514q-22 -141 12.5 -208t117.5 -67q77 0 133.5 70t76.5 205l65 430q20 138 -14.5 205.5t-115.5 67.5 q-78 0 -134.5 -71t-75.5 -202z" />
-<glyph unicode="1" d="M303 1167l39 258l639 52l-222 -1477h-338l175 1167h-293z" />
-<glyph unicode="2" d="M26 0l31 220l517 492q104 102 157 181.5t62 139.5q11 88 -20 136t-115 48q-75 0 -129.5 -65t-68.5 -164h-330l-2 6q25 210 180.5 346.5t386.5 136.5q230 0 347.5 -119t89.5 -322q-21 -144 -103 -243.5t-311 -315.5l-208 -211l3 -6h561l-36 -260h-1012z" />
-<glyph unicode="3" d="M57 398l2 6h330q-12 -74 30 -119.5t119 -45.5q88 0 155.5 51t78.5 125q16 110 -31 156.5t-150 46.5h-160l22 149l15 102h160q88 0 146 49.5t71 135.5q10 70 -32.5 116.5t-127.5 46.5q-62 0 -113.5 -38t-60.5 -98h-327l-2 6q22 181 178.5 285.5t363.5 104.5 q229 0 358.5 -109.5t100.5 -306.5q-16 -104 -87.5 -186.5t-182.5 -128.5q109 -44 161 -130.5t34 -207.5q-32 -208 -199.5 -318.5t-409.5 -110.5q-199 0 -338.5 108t-103.5 311z" />
-<glyph unicode="4" d="M34 307l11 208l739 938l1 3h338l-133 -887h147l-39 -262h-147l-46 -307h-338l46 307h-579zM348 574l2 -5h302l68 452l-6 2l-48 -75z" />
-<glyph unicode="5" d="M68 378l2 5l335 21q-13 -80 28.5 -122.5t123.5 -42.5q90 0 137.5 58t64.5 170q18 124 -14.5 191t-125.5 67q-65 0 -112.5 -29.5t-69.5 -72.5l-300 17l206 816h853l-39 -262h-579l-82 -303q45 29 111 47t142 20q204 4 293.5 -124.5t54.5 -364.5q-33 -218 -174 -354 t-405 -136q-201 0 -341.5 110.5t-108.5 288.5z" />
-<glyph unicode="6" d="M79 566l44 293q44 299 237 458.5t465 159.5q81 0 146.5 -15t140.5 -46l-93 -246q-67 22 -116.5 32t-115.5 10q-120 0 -211 -89.5t-116 -261.5l-2 -10q64 54 147.5 82.5t185.5 28.5q179 0 265 -137.5t54 -352.5q-34 -223 -195.5 -358t-388.5 -135q-231 0 -359.5 158.5 t-87.5 428.5zM416 566q-25 -165 14.5 -246t134.5 -81q73 0 132.5 68t74.5 165q17 114 -19.5 173t-112.5 59q-70 0 -124.5 -20t-90.5 -56z" />
-<glyph unicode="7" d="M157 1196l39 260h1053l-39 -260q-271 -264 -390 -486.5t-163 -518.5l-29 -191h-338l29 191q45 303 184.5 539t382.5 466h-729z" />
-<glyph unicode="8" d="M54 410q17 121 100.5 211t213.5 139q-90 50 -134.5 131t-28.5 184q30 200 179 301t369 101q202 0 318.5 -105t88.5 -297q-17 -110 -81.5 -192t-165.5 -129q107 -52 162 -141t39 -203q-32 -212 -192.5 -321.5t-391.5 -109.5q-227 0 -367 115t-109 316zM395 428 q-14 -90 35.5 -139.5t138.5 -49.5q76 0 136 51.5t73 137.5q13 91 -30.5 144t-122.5 53q-83 0 -150 -55.5t-80 -141.5zM542 1057q-13 -82 20.5 -127t103.5 -45q57 0 100 47t55 125q11 79 -17 119.5t-90 40.5q-67 0 -114.5 -42t-57.5 -118z" />
-<glyph unicode="9" d="M145 967q33 224 196 367t390 143q213 0 336 -155t83 -421l-55 -366q-40 -262 -215.5 -409t-414.5 -147q-71 0 -151 17t-148 46l94 241q60 -23 116 -33.5t128 -10.5q88 0 160 73t91 200l11 79q-57 -58 -126.5 -87t-143.5 -29q-191 0 -287.5 135t-63.5 357zM482 967 q-18 -116 13.5 -182.5t111.5 -66.5q56 0 105 22.5t86 61.5l24 161q19 129 -18 191.5t-113 62.5t-135.5 -75.5t-73.5 -174.5z" />
-<glyph unicode=":" horiz-adv-x="613" d="M56 0l43 284h337l-43 -284h-337zM187 876l43 284h337l-43 -284h-337z" />
-<glyph unicode=";" horiz-adv-x="579" d="M188 876l43 284h337l-43 -284h-337zM-7 -326l119 327l40 263h326l-41 -272l-211 -318h-233z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1044" d="M28 410l14 98l25 168l938 360l-45 -306l-581 -186v-6l525 -181l-46 -307z" />
-<glyph unicode="=" horiz-adv-x="1195" d="M92 293l39 260h926l-39 -260h-926zM158 732l39 260h926l-39 -260h-926z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1050" d="M38 48l46 306l575 186v6l-519 182l46 306l825 -360l-25 -169h-1l-14 -97z" />
-<glyph unicode="?" horiz-adv-x="1043" d="M97 1060q29 208 180 312.5t373 104.5q229 0 351.5 -121t92.5 -323q-20 -130 -108.5 -232t-214.5 -163q-71 -42 -101 -90.5t-42 -131.5h-338q22 139 82 209t203 161q73 42 120.5 104t60.5 143q12 86 -24.5 135t-120.5 49q-65 0 -117.5 -41.5t-66.5 -121.5h-329zM229 0 l41 270h336l-41 -270h-336z" />
-<glyph unicode="@" horiz-adv-x="1809" d="M35 478q81 429 359.5 680.5t676.5 251.5q376 0 554.5 -240.5t101.5 -649.5q-42 -220 -189 -380.5t-391 -160.5q-79 0 -131 46t-65 129q-54 -86 -123.5 -128.5t-153.5 -42.5q-143 0 -206.5 119.5t-14.5 313.5q64 251 207 402t315 151q116 0 189.5 -27t150.5 -79l-4 -4h6 l-136 -566q-18 -87 -6.5 -119.5t39.5 -32.5q107 0 193.5 108.5t118.5 270.5q66 339 -54 528.5t-431 189.5q-291 0 -505.5 -206t-281.5 -554q-68 -343 63.5 -542t433.5 -199q80 0 175.5 19t164.5 46l13 -166q-73 -42 -180 -65.5t-206 -23.5q-388 0 -575.5 251.5t-107.5 679.5 zM692 234.5q17 -61.5 77 -61.5q52 0 99.5 30t92.5 110l109 453q-21 5 -41.5 8.5t-42.5 3.5q-100 0 -170 -91.5t-115 -270.5q-26 -120 -9 -181.5z" />
-<glyph unicode="A" horiz-adv-x="1307" d="M-75 0l693 1456h181v-1l1 1h181l258 -1456h-356l-43 283h-432l-127 -283h-356zM524 543h277l-67 451l-6 1z" />
-<glyph unicode="B" horiz-adv-x="1306" d="M36 0l218 1456h477q261 0 402 -102q117 -84 117 -234q0 -31 -5 -64q-16 -107 -75 -187t-166 -120q124 -27 172 -115q36 -66 37 -148q0 -27 -4 -55q-34 -220 -190.5 -325.5t-427.5 -105.5h-555zM413 260h217q104 0 166.5 43.5t75.5 129.5q3 24 3 45q1 63 -29 98 q-40 46 -149 49h-11h-219zM501 849h133q117 0 186 43t82 126q3 21 3 39q0 66 -40 98q-51 41 -173 41h-139z" />
-<glyph unicode="C" horiz-adv-x="1307" d="M95 576l46 304q41 276 221.5 436.5t442.5 160.5q267 0 403 -130q106 -101 106 -269q0 -49 -9 -105l-3 -6h-330q6 41 6 76q0 81 -33 119q-47 56 -179 55q-109 0 -187 -92.5t-100 -242.5l-46 -306q-7 -49 -8 -91q-1 -95 37 -157q54 -90 180 -89q111 0 174 59t83 193h328 l2 -6q-35 -259 -196 -382.5t-430 -123.5q-260 0 -404 167q-113 131 -113 320q0 53 9 110z" />
-<glyph unicode="D" horiz-adv-x="1338" d="M36 0l218 1456h533q247 0 399 -169q122 -135 123 -328q0 -48 -8 -100l-39 -262q-42 -273 -237.5 -435t-455.5 -162h-533zM413 260h195q110 0 201 95t114 242l39 264q6 41 6 78q0 100 -44 166q-60 91 -176 91h-195z" />
-<glyph unicode="E" horiz-adv-x="1143" d="M36 0l218 1456h954l-39 -260h-616l-47 -313h513l-39 -260h-513l-54 -363h615l-39 -260h-953z" />
-<glyph unicode="F" horiz-adv-x="1143" d="M36 0l218 1456h973l-39 -260h-635l-53 -350h534l-39 -260h-534l-87 -586h-338z" />
-<glyph unicode="G" horiz-adv-x="1353" d="M94 576l46 304q41 274 228.5 435.5t449.5 161.5q268 0 397 -126q100 -98 100 -248q0 -44 -8 -91l-2 -6h-318q4 28 4 51q0 72 -37 110q-48 50 -164 50q-114 0 -202.5 -94t-110.5 -241l-46 -306q-7 -46 -7 -86q0 -97 41 -161q58 -90 188 -90q89 0 147.5 15t91.5 40l39 260 h-258l34 224h596l-87 -577q-89 -92 -236.5 -157t-365.5 -65q-260 0 -410 167q-118 133 -118 324q0 51 8 106z" />
-<glyph unicode="H" horiz-adv-x="1446" d="M36 0l218 1456h338l-92 -610h539l92 610h337l-218 -1456h-337l87 586h-539l-87 -586h-338z" />
-<glyph unicode="I" horiz-adv-x="611" d="M57 0l218 1456h337l-218 -1456h-337z" />
-<glyph unicode="J" horiz-adv-x="1144" d="M1 440l2 6h331q-5 -30 -5 -55q0 -70 35 -105q46 -47 134 -47q63 0 115.5 61t68.5 167l148 989h338l-148 -989q-35 -231 -189.5 -359.5t-371.5 -128.5q-237 0 -367 119q-100 93 -100 247q0 45 9 95z" />
-<glyph unicode="K" horiz-adv-x="1269" d="M38 0l218 1456h338l-87 -576h91l346 576h446l-527 -721l328 -735h-390l-243 578h-96l-86 -578h-338z" />
-<glyph unicode="L" horiz-adv-x="1144" d="M36 0l218 1456h338l-179 -1196h625l-39 -260h-963z" />
-<glyph unicode="M" horiz-adv-x="1783" d="M36 0l218 1456h443l173 -1018l6 -1l482 1019h447l-218 -1456h-338l140 937l-6 1l-461 -938h-227l-177 924h-6l-138 -924h-338z" />
-<glyph unicode="N" horiz-adv-x="1446" d="M36 0l218 1456h338l396 -915l6 1l137 914h337l-218 -1456h-337l-397 916l-6 -1l-136 -915h-338z" />
-<glyph unicode="O" horiz-adv-x="1416" d="M99 597l39 262q41 278 236.5 448t475.5 170q264 -1 414 -177q119 -140 119 -335q0 -51 -8 -106l-39 -262q-43 -280 -237 -449t-472 -169q-265 1 -417 177q-119 139 -120 332q0 53 9 109zM436 597q-7 -49 -8 -92q0 -101 42 -169q58 -97 196 -97q128 0 218.5 101t114.5 257 l39 264q7 47 7 89q0 101 -41 170q-58 97 -193 97q-132 0 -222.5 -100.5t-113.5 -255.5z" />
-<glyph unicode="P" horiz-adv-x="1306" d="M36 0l218 1456h556q249 0 386 -134q112 -109 112 -269q0 -36 -6 -76q-34 -223 -203.5 -350.5t-431.5 -127.5h-219l-74 -499h-338zM487 759h219q106 0 175 61.5t83 154.5q3 23 3 43q0 72 -37 118q-48 60 -159 60h-218z" />
-<glyph unicode="Q" horiz-adv-x="1447" d="M99 597l39 262q41 278 236.5 448t475.5 170q264 0 414 -177q119 -140 119 -335q0 -51 -8 -106l-39 -262q-18 -110 -60 -205.5t-106 -171.5l182 -218l-242 -167l-176 207q-70 -31 -147.5 -47t-159.5 -16q-266 0 -417 177q-120 138 -120 332q0 53 9 109zM436 597 q-7 -49 -7 -92q0 -101 41 -169q58 -97 196 -97q128 0 218.5 101t114.5 257l39 264q7 47 7 89q0 101 -41 170q-58 97 -193 97q-132 0 -222.5 -100.5t-113.5 -255.5z" />
-<glyph unicode="R" horiz-adv-x="1306" d="M36 0l218 1456h507q244 0 379 -118q110 -97 111 -249q0 -34 -6 -70q-19 -118 -90 -198t-196 -129q123 -38 171 -128q34 -65 35 -151q0 -32 -5 -67l-14 -92q-5 -34 -5 -73q1 -28 3 -58q6 -72 43 -103l-3 -20h-349q-35 31 -36 108v13q0 70 10 135l14 88q4 28 4 52 q0 70 -34 109q-46 53 -154 53h-182l-83 -558h-338zM496 818h172q98 0 160.5 47t76.5 133q3 20 3 38q0 65 -37 107q-47 53 -149 53h-169z" />
-<glyph unicode="S" horiz-adv-x="1267" d="M92 425l2 6h328q-3 -20 -3 -37q-1 -78 61 -112q76 -42 184 -43q74 0 134.5 35.5t68.5 88.5q3 18 3 34q0 65 -41 99q-51 44 -198 98q-259 85 -388 202q-107 97 -107 235q0 29 5 60q27 179 188.5 282.5t389.5 103.5q248 0 389 -119q112 -95 112 -246q0 -39 -7 -81l-2 -6 h-329q2 15 2 29q0 66 -46 110q-56 53 -158 53q-74 0 -133 -36t-67 -88q-2 -14 -2 -27q0 -61 47 -94q57 -40 242 -105q236 -77 351 -195q92 -95 93 -236q0 -34 -6 -71q-29 -187 -187.5 -286.5t-392.5 -99.5q-241 0 -407 109q-134 88 -134 253q0 40 8 84z" />
-<glyph unicode="T" horiz-adv-x="1150" d="M127 1196l39 260h1101l-39 -260h-385l-179 -1196h-338l179 1196h-378z" />
-<glyph unicode="U" horiz-adv-x="1417" d="M104 512l141 944h339l-141 -944q-6 -38 -6 -70q-1 -88 43 -136q60 -66 186 -67q119 0 199.5 69t101.5 204l141 944h339l-141 -944q-40 -260 -224.5 -396.5t-454.5 -136.5q-259 0 -410 143q-121 114 -121 295q0 45 8 95z" />
-<glyph unicode="V" horiz-adv-x="1307" d="M138 1456h353l126 -1061l2 -53l6 -1l18 50l448 1065h354l-690 -1456h-365z" />
-<glyph unicode="W" horiz-adv-x="1825" d="M150 1456h343l34 -945l6 -1l389 946h255l106 -943l6 -1l318 944h342l-552 -1456h-318l-110 899l-6 1l-378 -900h-318z" />
-<glyph unicode="X" horiz-adv-x="1307" d="M-66 0l538 734l-309 722h387l161 -484l6 -1l309 485h390l-525 -722l339 -734h-410l-173 501l-323 -501h-390z" />
-<glyph unicode="Y" horiz-adv-x="1307" d="M133 1456h366l193 -637l6 -1l386 638h366l-636 -944l-76 -512h-337l79 528z" />
-<glyph unicode="Z" horiz-adv-x="1160" d="M-6 152l713 1044h-534l39 260h972l-21 -146l-718 -1050h631l-39 -260h-1022z" />
-<glyph unicode="[" horiz-adv-x="577" d="M-16 -349l288 2055h456l-35 -246h-118l-219 -1564h118l-34 -245h-456z" />
-<glyph unicode="\" horiz-adv-x="871" d="M122 1456h338l371 -1581h-339z" />
-<glyph unicode="]" horiz-adv-x="577" d="M-110 -349l34 245h119l219 1564h-119l35 246h456l-288 -2055h-456z" />
-<glyph unicode="^" horiz-adv-x="916" d="M65 729l408 727h249l191 -727h-254l-103 413l-1 17l-6 1l-7 -18l-224 -413h-253z" />
-<glyph unicode="_" horiz-adv-x="904" d="M-118 -251l38 251h903l-38 -251h-903z" />
-<glyph unicode="`" horiz-adv-x="695" d="M177 1512l3 6h370l170 -266h-297z" />
-<glyph unicode="a" horiz-adv-x="1086" d="M-2 305q25 167 157 251.5t381 84.5h139l12 77q3 19 3 36q0 46 -20 72q-27 36 -96 35q-57 0 -91 -28t-42 -85l-328 1l-1 6q17 154 160.5 250.5t359.5 96.5q194 0 307 -101q91 -81 91 -215q0 -33 -6 -70l-61 -408q-11 -69 -11 -128v-32q4 -72 23 -148l-334 1 q-13 34 -20.5 77t-7.5 90q-57 -86 -129 -137.5t-176 -51.5q-164 1 -248 89q-67 70 -67 178q0 28 5 59zM338 323q-1 -10 -2 -19q0 -34 22 -56q28 -28 78 -28q59 0 112.5 29.5t78.5 69.5l21 142h-136q-77 0 -121 -39.5t-53 -98.5z" />
-<glyph unicode="b" horiz-adv-x="1151" d="M16 0l234 1560h338l-88 -583q54 60 118.5 92.5t142.5 32.5q201 0 288 -154q61 -108 62 -266q0 -67 -12 -143l-3 -21q-39 -256 -165 -397.5t-336 -141.5q-86 0 -146 39.5t-97 114.5l-41 -133h-295zM400 307q18 -34 55.5 -51t93.5 -17q96 0 142 71t68 208l3 21 q11 71 11 126q0 60 -13 100q-24 77 -123 77q-54 0 -96.5 -21.5t-73.5 -61.5z" />
-<glyph unicode="c" horiz-adv-x="1048" d="M44 529l4 23q37 253 191.5 401.5t402.5 148.5q198 0 308 -116q84 -89 85 -226q0 -41 -8 -87l-2 -5h-309q4 24 4 46q0 49 -20 81q-28 47 -97 47q-94 0 -146.5 -80t-71.5 -210l-4 -23q-9 -62 -9 -111q0 -62 15 -104q27 -75 128 -75q66 0 107 38t52 108h307l2 -6 q-24 -184 -165.5 -292t-341.5 -108q-237 1 -353 155q-88 117 -88 283q0 54 9 112z" />
-<glyph unicode="d" horiz-adv-x="1151" d="M49 518l3 21q39 262 171 412.5t335 150.5q73 0 129 -36.5t94 -104.5l90 599h338l-234 -1560h-296l-3 131q-59 -73 -131.5 -112.5t-156.5 -39.5q-192 0 -284 150q-66 107 -66 259q0 61 11 130zM387 518q-9 -59 -9 -106q0 -62 16 -102q28 -72 119 -71q51 0 95 20.5t76 59.5 l66 434q-19 43 -56 66t-89 23q-86 0 -140.5 -84.5t-74.5 -218.5z" />
-<glyph unicode="e" horiz-adv-x="1070" d="M47 505l5 38q38 257 192 409q152 151 401 150h3q210 0 315 -132q80 -101 80 -256q0 -49 -8 -102l-27 -177h-621l-2 -6v-16q0 -77 42 -123q47 -51 151 -51q93 0 163 16.5t156 50.5l50 -206q-77 -51 -200.5 -86t-253.5 -35q-236 1 -358 151q-95 118 -95 280q0 46 7 95z M417 652l2 -6h291l4 26q5 31 5 56q1 46 -15 72q-24 42 -95 42q-78 0 -124.5 -51.5t-67.5 -138.5z" />
-<glyph unicode="f" horiz-adv-x="734" d="M60 848l35 234h156l17 112q29 194 154.5 290.5t332.5 96.5q37 0 77.5 -6t86.5 -15l-62 -249q-27 5 -48 7.5t-51 2.5q-62 0 -102.5 -33.5t-48.5 -93.5l-17 -112h214l-35 -234h-214l-127 -848h-339l127 848h-156z" />
-<glyph unicode="g" horiz-adv-x="1151" d="M19 -352l96 250q68 -32 132 -47.5t150 -15.5q104 0 165 43.5t75 135.5l12 83q-55 -58 -120 -88t-142 -30q-192 0 -284 150q-66 107 -66 259q0 61 11 130l3 21q39 262 171 412.5t335 150.5q83 0 141.5 -42t95.5 -119l44 141h298l-160 -1070q-34 -222 -196 -335.5 t-422 -113.5q-81 0 -172 23t-167 62zM385 518q-9 -59 -9 -106q0 -61 16 -102q27 -71 120 -71q54 0 96.5 18t72.5 54l68 451q-19 39 -55 59.5t-90 20.5q-86 0 -141 -84.5t-75 -218.5z" />
-<glyph unicode="h" horiz-adv-x="1151" d="M6 0l234 1560h338l-91 -605q60 71 135.5 109t161.5 38q162 0 244 -118q56 -82 56 -222q0 -64 -12 -140l-93 -622h-338l94 624q8 55 8 94q-1 54 -15 80q-24 44 -90 44q-56 0 -100 -17.5t-78 -49.5l-116 -775h-338z" />
-<glyph unicode="i" horiz-adv-x="561" d="M31 0l162 1082h339l-162 -1082h-339zM231 1333l34 227h339l-34 -227h-339z" />
-<glyph unicode="j" horiz-adv-x="548" d="M-258 -420l52 255q28 -6 48 -9t51 -3q55 0 91.5 41.5t48.5 120.5l164 1097h339l-164 -1097q-32 -210 -155.5 -316t-318.5 -106q-42 0 -79 4t-77 13zM229 1334l34 226h339l-34 -226h-339z" />
-<glyph unicode="k" horiz-adv-x="1119" d="M16 0l234 1560h338l-132 -875h49l287 397h380l2 -5l-400 -483l298 -594h-385l-208 430h-61l-64 -430h-338z" />
-<glyph unicode="l" horiz-adv-x="561" d="M31 0l234 1560h339l-234 -1560h-339z" />
-<glyph unicode="m" horiz-adv-x="1764" d="M16 0l162 1082h318l-9 -138q62 76 145.5 117t184.5 41q96 0 163 -43.5t92 -132.5q62 85 148 130.5t193 45.5q153 0 229 -114q52 -79 52 -214q0 -62 -11 -135l-96 -639h-339l96 639q7 50 7 86q-1 52 -15 76q-26 41 -92 41q-48 0 -88.5 -18.5t-71.5 -50.5l-6 -51l-108 -722 h-338l96 639q7 50 7 86q-1 52 -15 76q-26 41 -93 41q-44 0 -84 -18t-73 -50l-116 -774h-338z" />
-<glyph unicode="n" horiz-adv-x="1151" d="M10 0l162 1082h317l-9 -147q65 80 149.5 123.5t180.5 43.5q153 0 229 -109q53 -75 52 -210q0 -60 -10 -132l-98 -651h-338l98 652q6 40 6 71q-1 51 -17 77q-26 42 -90 42q-53 0 -99 -20t-81 -55l-115 -767h-337z" />
-<glyph unicode="o" horiz-adv-x="1151" d="M51 530l3 21q37 253 196 402t409 149q237 0 357 -155q92 -120 93 -291q0 -50 -8 -105l-3 -21q-39 -254 -197.5 -402.5t-407.5 -148.5q-239 1 -359 155q-92 118 -92 287q0 52 9 109zM389 530q-9 -58 -9 -105q0 -67 18 -111q31 -75 134 -75q95 0 151.5 79t77.5 212l3 21 q8 53 8 98q0 69 -19 115q-31 78 -133 78q-96 0 -153 -81t-75 -210z" />
-<glyph unicode="p" horiz-adv-x="1151" d="M-46 -416l224 1498h319l-7 -118q55 66 122.5 102t148.5 36q193 0 284 -156q65 -112 65 -270q0 -65 -11 -137l-3 -21q-39 -253 -169 -396t-332 -143q-77 0 -133 31.5t-93 92.5l-77 -519h-338zM400 308q19 -35 56.5 -52t94.5 -17q86 0 136.5 74.5t71.5 204.5l3 21 q8 59 8 108q0 67 -16 114q-27 81 -115 81q-55 0 -98 -22t-74 -64z" />
-<glyph unicode="q" horiz-adv-x="1151" d="M49 518l3 21q39 262 171 412.5t335 150.5q82 0 141 -41.5t96 -118.5l48 140h295l-224 -1498h-338l77 516q-56 -59 -121.5 -90t-143.5 -31q-192 0 -284 150q-66 107 -66 259q0 61 11 130zM387 518q-9 -59 -9 -106q0 -61 16 -102q27 -71 119 -71q55 0 98 18.5t74 55.5 l67 447q-19 40 -55.5 61t-91.5 21q-86 0 -140.5 -84.5t-74.5 -218.5z" />
-<glyph unicode="r" horiz-adv-x="722" d="M16 0l162 1082h318l-11 -148l5 -3q42 82 104 126.5t138 44.5q22 0 40.5 -3t37.5 -9l-77 -296l-110 1q-56 0 -97 -22.5t-66 -62.5l-106 -710h-338z" />
-<glyph unicode="s" horiz-adv-x="1048" d="M15 341l2 6h306q-2 -14 -1 -27q0 -56 32 -84q40 -34 121 -34q66 0 106 27t47 75q1 5 1 9q-1 36 -37 63q-40 31 -158 56q-184 36 -269 114q-69 63 -69 166q0 23 3 48q20 148 153 245t340 97q208 0 326 -98q97 -80 97 -195q0 -26 -5 -53l-2 -6h-329q2 16 2 30q-1 43 -21 68 q-28 32 -100 32q-52 0 -93 -29t-46 -74q-1 -7 -1 -13q0 -34 32 -60q38 -30 160 -54q193 -38 277 -116q69 -63 69 -170q0 -24 -4 -50q-22 -152 -162.5 -243.5t-356.5 -91.5q-211 0 -328 113q-96 93 -96 202q0 23 4 47z" />
-<glyph unicode="t" horiz-adv-x="723" d="M42 848l35 234h151l41 269h338l-41 -269h171l-35 -234h-171l-74 -496q-3 -21 -3 -37q0 -32 12 -48q20 -24 61 -24q25 0 42 2t41 8l-15 -250q-52 -13 -94 -18.5t-98 -5.5q-161 0 -237 90q-55 65 -55 183q0 45 8 98l74 498h-151z" />
-<glyph unicode="u" horiz-adv-x="1151" d="M77 462l93 620h337l-93 -622q-9 -58 -9 -99q1 -51 15 -77q26 -44 94 -45q53 0 97 16t77 47l117 780h338l-162 -1082h-272l-16 157q-62 -87 -145 -132.5t-184 -45.5q-162 0 -243 119q-56 82 -56 223q0 64 12 141z" />
-<glyph unicode="v" horiz-adv-x="1053" d="M82 1082h356l50 -636l3 -115l6 -1l39 116l238 636h355l-514 -1082h-343z" />
-<glyph unicode="w" horiz-adv-x="1485" d="M103 1082h322l17 -608l6 -1l268 609h213l87 -605h6l198 605h322l-416 -1082h-286l-92 554l-6 1l-261 -555h-285z" />
-<glyph unicode="x" horiz-adv-x="1053" d="M-75 0l407 547l-235 535h377l84 -318l6 -1l185 319h379l-394 -535l243 -547h-379l-95 329h-6l-193 -329h-379z" />
-<glyph unicode="y" horiz-adv-x="1053" d="M-52 -411l78 241q12 -3 19.5 -4.5t18.5 -1.5q76 0 118.5 24t67.5 70l37 70l-210 1094h359l71 -605v-5l6 -2l270 612h360l-617 -1243q-67 -120 -158.5 -198t-263.5 -78q-42 0 -71 6t-85 20z" />
-<glyph unicode="z" horiz-adv-x="1053" d="M-15 0l28 188l571 629l-2 5h-453l39 260h888l-27 -182l-573 -635l2 -5h485l-39 -260h-919z" />
-<glyph unicode="{" horiz-adv-x="665" d="M36 505l8 61l23 166q79 0 127.5 52t62.5 145l28 203q24 177 122.5 293.5t303.5 171.5l38 -176q-77 -29 -116.5 -103t-55.5 -186l-28 -203q-16 -109 -73 -189t-158 -124q85 -47 121 -127.5t23 -179.5l-28 -203q-17 -116 2 -187.5t88 -101.5l-87 -177q-188 55 -254 175 t-41 291l28 203q13 96 -19 146t-115 50z" />
-<glyph unicode="|" horiz-adv-x="523" d="M22 -270l258 1726h246l-258 -1726h-246z" />
-<glyph unicode="}" horiz-adv-x="665" d="M-60 -183q76 29 116 103t56 186l28 203q14 108 71.5 188t159.5 125q-86 46 -122 126t-22 181l28 203q16 115 -3 187t-87 102l88 176q186 -55 252 -174.5t42 -290.5l-28 -203q-14 -97 18 -147t116 -50l-9 -61h1l-23 -166q-80 0 -128.5 -52.5t-61.5 -143.5l-28 -203 q-25 -177 -123.5 -294t-301.5 -172z" />
-<glyph unicode="~" horiz-adv-x="1295" d="M80 435q25 182 127 291.5t242 109.5q78 0 150.5 -33t134.5 -96q38 -43 68.5 -61t69.5 -18q42 0 81 50.5t49 121.5l228 -31q-26 -181 -129.5 -291.5t-242.5 -110.5q-80 0 -148.5 31t-132.5 99q-41 43 -71 61t-71 18q-42 0 -80.5 -50.5t-47.5 -120.5z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1210" d="M44 529l4 23q35 240 177 387t371 161l33 218h200l-36 -237q131 -41 196.5 -148t42.5 -265h-316q12 80 -15.5 127t-97.5 47q-94 0 -146.5 -80t-71.5 -210l-4 -23q-21 -141 6 -215.5t128 -74.5q66 0 107 38t52 108h308l3 -6q-20 -146 -115.5 -245.5t-239.5 -135.5l-36 -243 h-200l34 226q-214 17 -316 168.5t-68 379.5z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1227" d="M86 0l39 260h10q49 12 83 86.5t47 156.5l8 72h-164l39 261h154l21 185q32 221 173.5 338.5t353.5 117.5q214 0 323 -116t77 -303l-3 -6h-330q13 89 -18 127t-89 38q-55 0 -95.5 -51.5t-53.5 -144.5l-19 -185h325l-39 -261h-311l-5 -51q-12 -76 -55.5 -143.5 t-114.5 -120.5h689l-39 -260h-1006z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1258" d="M96 269l28 183h323l15 106h-322l27 184h249l-260 714h367l157 -578l6 -1l330 579h366l-473 -714h213l-27 -184h-296l-15 -106h295l-28 -183h-295l-40 -269h-337l40 269h-323z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1608" d="M114 729q49 327 285.5 537t536.5 210q283 0 464 -218t134 -529q-49 -328 -286.5 -539t-535.5 -211q-284 0 -464.5 218.5t-133.5 531.5zM236 729q-41 -274 103 -449.5t392 -175.5q235 0 437.5 182t242.5 443q41 273 -102.5 447.5t-390.5 174.5q-237 0 -440 -181t-242 -441 zM452 669l18 119q26 179 135.5 283t271.5 104q152 0 231 -80.5t53 -228.5l-2 -5h-149q14 97 -24 138t-129 41t-153.5 -69.5t-78.5 -181.5l-18 -120q-18 -119 22 -185.5t135 -66.5q87 0 139 42t66 137h147l2 -6q-19 -156 -117.5 -232t-257.5 -76q-154 0 -235.5 107.5 t-55.5 279.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="875" d="M130 497l39 261h589l-39 -261h-589z" />
-<glyph unicode="&#xae;" horiz-adv-x="1608" d="M114 729q49 327 285.5 537t536.5 210q283 0 464 -218t134 -529q-49 -328 -286.5 -539t-535.5 -211q-284 0 -464.5 218.5t-133.5 531.5zM236 729q-41 -274 103 -449.5t392 -175.5q235 0 437.5 182t242.5 443q41 273 -102.5 447.5t-390.5 174.5q-237 0 -440 -181t-242 -441 zM467 316l128 850h281q145 0 224 -69.5t61 -194.5q-9 -59 -43 -101.5t-91 -70.5q49 -32 66 -87t7 -128l-8 -56q-7 -43 -8 -74.5t6 -52.5l-3 -16h-155q-5 21 -1.5 59t10.5 85l8 54q11 74 -17 106.5t-105 32.5h-158l-51 -337h-151zM689 787h128q72 0 129 30.5t65 85.5 q11 75 -22.5 102.5t-132.5 27.5h-130z" />
-<glyph unicode="&#xb4;" horiz-adv-x="762" d="M212 1257l239 261h370l2 -6l-318 -260h-291z" />
-<glyph unicode="&#x2000;" horiz-adv-x="853" />
-<glyph unicode="&#x2001;" horiz-adv-x="1706" />
-<glyph unicode="&#x2002;" horiz-adv-x="853" />
-<glyph unicode="&#x2003;" horiz-adv-x="1706" />
-<glyph unicode="&#x2004;" horiz-adv-x="568" />
-<glyph unicode="&#x2005;" horiz-adv-x="426" />
-<glyph unicode="&#x2006;" horiz-adv-x="284" />
-<glyph unicode="&#x2007;" horiz-adv-x="284" />
-<glyph unicode="&#x2008;" horiz-adv-x="213" />
-<glyph unicode="&#x2009;" horiz-adv-x="341" />
-<glyph unicode="&#x200a;" horiz-adv-x="94" />
-<glyph unicode="&#x2010;" horiz-adv-x="875" d="M130 497l39 261h589l-39 -261h-589z" />
-<glyph unicode="&#x2011;" horiz-adv-x="875" d="M130 497l39 261h589l-39 -261h-589z" />
-<glyph unicode="&#x2012;" horiz-adv-x="875" d="M130 497l39 261h589l-39 -261h-589z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1412" d="M145.599 578l50.6992 264h1084.19l-50.6992 -264h-1084.19z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1675" d="M146.196 578l62.3994 264h1334.38l-62.3994 -264h-1334.38z" />
-<glyph unicode="&#x2018;" horiz-adv-x="576" d="M199 912l44 295l139 249h167l-36 -243l-45 -301h-269z" />
-<glyph unicode="&#x2019;" horiz-adv-x="577" d="M215 912l37 251l44 293h269l-44 -294l-139 -250h-167z" />
-<glyph unicode="&#x201c;" horiz-adv-x="921" d="M177 912l44 295l139 249h167l-36 -243l-45 -301h-269zM505 912l44 295l139 249h167l-36 -243l-45 -301h-269z" />
-<glyph unicode="&#x201d;" horiz-adv-x="932" d="M180 912l37 251l44 293h269l-44 -294l-139 -250h-167zM516 912l37 251l44 293h269l-44 -294l-139 -250h-167z" />
-<glyph unicode="&#x2022;" horiz-adv-x="757" d="M160 706l16 107q16 110 94 175.5t194 65.5q113 0 173.5 -67.5t45.5 -173.5l-16 -107q-17 -111 -94 -174.5t-195 -63.5q-111 0 -172.5 66.5t-45.5 171.5z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1587" d="M56 0l43 284h337l-43 -284h-337zM499 0l43 284h337l-43 -284h-337zM919 0l43 284h337l-43 -284h-337z" />
-<glyph unicode="&#x202f;" horiz-adv-x="341" />
-<glyph unicode="&#x205f;" horiz-adv-x="426" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1130" d="M58 472l25 166h146l21 144h-146l25 166h146l2 13q36 244 210 380t428 136q58 0 116 -8t122 -23l-61 -264q-51 16 -105.5 25.5t-110.5 9.5q-101 0 -171.5 -67.5t-88.5 -186.5l-2 -15h396l-25 -166h-396l-22 -144h397l-25 -166h-396l-2 -14q-18 -116 31.5 -167.5 t158.5 -51.5q55 0 113.5 8.5t111.5 24.5l-18 -262q-60 -15 -122 -23t-124 -8q-242 0 -382.5 130.5t-107.5 348.5l2 14h-146z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1298" d="M213 1340l17 116h406l-17 -116h-121l-63 -423h-168l63 423h-117zM621 913l81 543h180l48 -347l6 -1l151 348h175l-81 -543h-147l36 242l-6 1l-119 -243h-83l-50 259h-6l-38 -259h-147z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1120" d="M142 578l39 264h834l-39 -264h-834z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.ttf
deleted file mode 100644
index ded49e8b511bb45d62c26b6365a22e52a3778fb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29824
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
UJ6@83SA1_IADE-2moxT%0Z$c$bpQYW

diff --git a/app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-BlackItalic-webfont.woff
deleted file mode 100644
index 382c2a85b62a62b046debcdd6ab0379d0d2661f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17696
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-Bold-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-Bold-webfont.eot
deleted file mode 100644
index c4ec7ebe221491064846843e6fed815347ad89ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25880
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
Q)`x6L_gJ=3OD<;r3yYD{ZU6uP

diff --git a/app/webroot/css/fonts/roboto/Roboto-Bold-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-Bold-webfont.svg
deleted file mode 100644
index f731abac7..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-Bold-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoBold" horiz-adv-x="1175" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="510" />
-<glyph unicode=" "  horiz-adv-x="510" />
-<glyph unicode="&#x09;" horiz-adv-x="510" />
-<glyph unicode="&#xa0;" horiz-adv-x="510" />
-<glyph unicode="!" horiz-adv-x="557" d="M134 0v256h292v-256h-292zM134 502v954h292v-954h-292z" />
-<glyph unicode="&#x22;" horiz-adv-x="832" d="M141 932v524h231v-275l-102 -249h-129zM483 932v524h230v-275l-102 -249h-128z" />
-<glyph unicode="#" horiz-adv-x="1219" d="M48 410v169h256l51 290h-232v171h262l73 416h183l-73 -416h192l74 416h183l-73 -416h220v-171h-250l-51 -290h225v-169h-254l-72 -410h-184l72 410h-192l-71 -410h-184l72 410h-227zM488 579h191l51 290h-192z" />
-<glyph unicode="$" horiz-adv-x="1216" d="M108 435l3 6h284q0 -128 62.5 -182.5t162.5 -54.5q98 0 147 48t49 131q0 82 -47 131.5t-167 95.5q-226 76 -335 177t-109 284q0 169 109 276.5t296 126.5v214h159v-217q180 -25 282 -140.5t99 -300.5l-2 -5h-285q0 109 -49.5 167.5t-138.5 58.5q-94 0 -136 -49t-42 -132 q0 -77 44.5 -123t170.5 -99q222 -72 332 -176.5t110 -286.5q0 -174 -108.5 -278.5t-296.5 -123.5v-197h-159v197q-192 17 -315.5 127.5t-119.5 324.5z" />
-<glyph unicode="%" horiz-adv-x="1513" d="M95 1099v77q0 129 83.5 215t232.5 86q151 0 234 -85.5t83 -215.5v-77q0 -129 -83 -214t-232 -85q-150 0 -234 85t-84 214zM289 1099q0 -58 32 -97.5t92 -39.5q58 0 89.5 39.5t31.5 97.5v77q0 58 -32 98.5t-91 40.5t-90.5 -40.5t-31.5 -98.5v-77zM319 184l711 1138 l142 -75l-711 -1138zM791 280v77q0 128 84 214t233 86q150 0 233.5 -85.5t83.5 -214.5v-77q0 -130 -83 -215t-232 -85q-150 0 -234.5 85.5t-84.5 214.5zM985 280q0 -57 34.5 -97.5t90.5 -40.5q65 0 93 37.5t28 100.5v77q0 57 -32 97.5t-91 40.5q-60 0 -91.5 -40.5 t-31.5 -97.5v-77z" />
-<glyph unicode="&#x26;" horiz-adv-x="1346" d="M61 392q0 121 63.5 206.5t194.5 182.5q-66 90 -98 164.5t-32 151.5q0 182 106 281t291 99q159 0 258.5 -98.5t99.5 -238.5q0 -104 -42.5 -180t-125.5 -141l-102 -72l270 -315q36 59 56 129t20 148h233q0 -142 -35.5 -260t-110.5 -209l201 -235l-2 -5h-324l-77 89 q-85 -55 -175 -82.5t-193 -27.5q-218 0 -347 114.5t-129 298.5zM353 407q0 -89 55 -146.5t144 -57.5q53 0 106 13.5t102 40.5l-295 342l-9 -7q-59 -48 -81 -94t-22 -91zM450 1100q0 -42 20 -86t61 -96l76 49q56 36 75.5 74t19.5 83q0 51 -33 89.5t-91 38.5q-60 0 -94 -44 t-34 -108z" />
-<glyph unicode="'" horiz-adv-x="442" d="M91 904v552h261v-269l-102 -283h-159z" />
-<glyph unicode="(" horiz-adv-x="711" d="M124 570v22q0 392 152 665.5t344 354.5h6l53 -146q-131 -98 -220 -316t-89 -556v-26q0 -339 89 -556.5t220 -318.5l-53 -143h-6q-192 81 -344 354t-152 666z" />
-<glyph unicode=")" horiz-adv-x="713" d="M31 -307q129 98 219 317t90 558v26q0 336 -91 556.5t-218 319.5l54 142h6q194 -80 352.5 -359t158.5 -661v-22q0 -383 -158.5 -661.5t-352.5 -358.5h-6z" />
-<glyph unicode="*" horiz-adv-x="857" d="M49 741l54 170l240 -79l2 249h176l7 -257l230 78l53 -171l-233 -79l138 -202l-144 -106l-149 208l-145 -199l-145 102l145 210z" />
-<glyph unicode="+" horiz-adv-x="1117" d="M56 560v252h362v394h276v-394h360v-252h-360v-414h-276v414h-362z" />
-<glyph unicode="," horiz-adv-x="528" d="M63 -302l70 324v228h284v-237l-159 -315h-195z" />
-<glyph unicode="-" horiz-adv-x="892" d="M146 510v225h589v-225h-589z" />
-<glyph unicode="." horiz-adv-x="596" d="M144 0v256h292v-256h-292z" />
-<glyph unicode="/" horiz-adv-x="825" d="M-14 -125l534 1581h284l-534 -1581h-284z" />
-<glyph unicode="0" d="M95 527v401q0 255 134.5 402t357.5 147q222 0 357.5 -147t135.5 -402v-401q0 -256 -134.5 -402t-356.5 -146q-224 0 -359 146t-135 402zM386 499q0 -143 53 -219.5t150 -76.5q95 0 147.5 76.5t52.5 219.5v459q0 140 -53.5 217t-148.5 77q-96 0 -148.5 -77t-52.5 -217 v-459z" />
-<glyph unicode="1" d="M204 1202v223l592 52v-1477h-291v1202h-301z" />
-<glyph unicode="2" d="M89 1014q-5 194 128 328.5t357 134.5t348 -114.5t124 -307.5q0 -131 -69.5 -239t-239.5 -299l-240 -288l2 -5h595v-224h-977v191l451 510q101 119 143.5 201.5t42.5 151.5q0 90 -45 144t-135 54q-95 0 -147 -69t-52 -175h-284z" />
-<glyph unicode="3" d="M91 390l2 6h284q0 -82 57.5 -137.5t148.5 -55.5q100 0 162 59t62 149q0 115 -58 170.5t-170 55.5h-161v219h161q104 0 154.5 54t50.5 152q0 82 -53 136t-148 54q-80 0 -134.5 -49t-54.5 -125h-282l-2 6q-6 171 132 282t341 111q226 0 359 -106.5t133 -305.5 q0 -100 -57.5 -183.5t-157.5 -131.5q114 -43 176 -130.5t62 -211.5q0 -200 -144.5 -314.5t-370.5 -114.5q-199 0 -348 108t-144 303z" />
-<glyph unicode="4" d="M56 491l604 965h295v-914h164v-226h-164v-316h-292v316h-593zM321 542h342v529l-6 1l-30 -65z" />
-<glyph unicode="5" d="M113 378l2 5l281 13q0 -91 55 -142t144 -51q104 0 151.5 68t47.5 194t-52 200.5t-154 74.5q-84 0 -128.5 -31t-63.5 -84l-257 17l84 814h812v-234h-573l-40 -340q41 30 103 49.5t135 21.5q203 3 314.5 -125.5t111.5 -360.5q0 -214 -121 -351t-370 -137q-201 0 -344 106.5 t-138 292.5z" />
-<glyph unicode="6" d="M95 562v305q0 277 162.5 443.5t411.5 166.5q85 0 157.5 -15.5t143.5 -45.5l-52 -214q-68 23 -122 34.5t-125 11.5q-128 0 -206.5 -98t-78.5 -273v-47q58 57 138.5 88.5t179.5 31.5q187 0 292 -132.5t105 -345.5q0 -219 -136 -356t-355 -137q-228 0 -371.5 156t-143.5 427 zM386 555q0 -168 61.5 -260t162.5 -92q91 0 145 76.5t54 192.5q0 120 -54.5 188.5t-147.5 68.5q-79 0 -134.5 -25.5t-86.5 -70.5v-78z" />
-<glyph unicode="7" d="M71 1231v225h1024v-225q-247 -289 -336 -520.5t-89 -530.5v-180h-292v180q0 304 111.5 554.5t324.5 496.5h-743z" />
-<glyph unicode="8" d="M82 406q0 118 72.5 209.5t196.5 140.5q-103 47 -161.5 130.5t-58.5 191.5q0 192 131 295.5t341 103.5q201 0 327 -103.5t126 -295.5q0 -108 -56 -191.5t-154 -130.5q119 -49 189 -140.5t70 -209.5q0 -202 -140.5 -314.5t-359.5 -112.5q-229 0 -376 112.5t-147 314.5z M375 420q0 -99 64.5 -158t165.5 -59q90 0 149 59t59 158q0 97 -60.5 159.5t-149.5 62.5q-98 0 -163 -62.5t-65 -159.5zM423 1065q0 -89 50 -143.5t132 -54.5q72 0 116 54t44 144q0 86 -45 136.5t-117 50.5q-82 0 -131 -49.5t-49 -137.5z" />
-<glyph unicode="9" d="M84 970q0 219 137 363t350 144q220 0 359 -148t139 -410v-392q0 -252 -151.5 -400t-385.5 -148q-76 0 -156.5 16.5t-151.5 46.5l49 211q63 -26 123 -38t136 -12q108 0 177 81.5t69 227.5v94q-49 -63 -116 -95t-144 -32q-203 0 -318.5 132t-115.5 359zM376 970 q0 -125 49 -201t142 -76q71 0 125 29t86 78v170q0 137 -56 209.5t-150 72.5q-88 0 -142 -81.5t-54 -200.5z" />
-<glyph unicode=":" horiz-adv-x="582" d="M144 0v256h292v-256h-292zM144 876v256h292v-256h-292z" />
-<glyph unicode=";" horiz-adv-x="562" d="M145 876v256h292v-256h-292zM114 -302l70 324v228h284v-237l-159 -315h-195z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1043" d="M54 436v227l862 366v-272l-577 -207v-6l577 -203v-272z" />
-<glyph unicode="=" horiz-adv-x="1181" d="M136 332v229h896v-229h-896zM136 763v229h896v-229h-896z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1058" d="M119 60v270l586 209v6l-586 206v269l872 -366v-227z" />
-<glyph unicode="?" horiz-adv-x="1021" d="M32 1081q-3 192 126.5 294t337.5 102q224 0 351.5 -113.5t127.5 -308.5q0 -127 -74.5 -235t-186.5 -181q-61 -47 -80 -94.5t-19 -130.5h-291q1 140 41.5 205t161.5 158q71 58 113.5 125t42.5 150q0 92 -48.5 144t-138.5 52q-74 0 -125.5 -44t-52.5 -129h-284zM323 0v250 h294v-250h-294z" />
-<glyph unicode="@" horiz-adv-x="1817" d="M66 478q18 427 255.5 683.5t625.5 256.5q387 0 593 -242.5t190 -662.5q-9 -218 -128 -376t-356 -158q-78 0 -135 44t-81 123q-44 -82 -109.5 -123t-153.5 -41q-141 0 -216.5 119t-55.5 315q25 254 143.5 407t287.5 153q116 0 186.5 -26t154.5 -80l-3 -4h5l-51 -573 q-7 -95 14 -130t57 -35q115 0 184.5 109t77.5 276q16 353 -136.5 551t-471.5 198q-303 0 -484 -213t-196 -571q-17 -355 146 -560t469 -205q85 0 175.5 20t155.5 50l38 -147q-67 -42 -170.5 -65.5t-202.5 -23.5q-396 0 -610.5 249t-197.5 682zM720 416q-10 -127 18.5 -192.5 t92.5 -65.5q56 0 101.5 26t81.5 96v6q0 3 1 7l44 496q-23 7 -46 11t-48 4q-111 0 -169 -96.5t-76 -291.5z" />
-<glyph unicode="A" horiz-adv-x="1303" d="M18 0l491 1456h299l489 -1456h-305l-99 314h-472l-98 -314h-305zM493 543h329l-161 513h-6z" />
-<glyph unicode="B" horiz-adv-x="1305" d="M134 0v1456h477q257 0 401 -100.5t144 -298.5q0 -100 -52 -179t-152 -119q136 -25 205 -118t69 -217q0 -209 -138 -316.5t-391 -107.5h-563zM426 224h271q116 0 177 50.5t61 149.5q0 106 -60 163t-181 57h-268v-420zM426 846h195q117 0 180 48t63 140q0 101 -63.5 149 t-189.5 48h-185v-385z" />
-<glyph unicode="C" horiz-adv-x="1303" d="M99 583v289q0 266 157 435.5t412 169.5q266 0 416 -130q146 -127 146 -354v-12l-2 -6h-284q0 140 -67.5 208.5t-208.5 68.5q-131 0 -204.5 -105.5t-73.5 -272.5v-291q0 -168 77.5 -274t215.5 -106q131 0 195.5 68.5t64.5 210.5h283l2 -6v-12q0 -224 -142 -353 q-146 -132 -403 -132q-262 0 -423 168.5t-161 435.5z" />
-<glyph unicode="D" horiz-adv-x="1355" d="M134 0v1456h508q267 0 440 -170.5t173 -437.5v-241q0 -268 -173 -437.5t-440 -169.5h-508zM426 224h216q144 0 232 107.5t88 275.5v243q0 167 -88 274t-232 107h-216v-1007z" />
-<glyph unicode="E" horiz-adv-x="1139" d="M134 0v1456h932v-225h-640v-366h540v-225h-540v-416h642v-224h-934z" />
-<glyph unicode="F" horiz-adv-x="1139" d="M134 0v1456h953v-225h-661v-401h559v-225h-559v-605h-292z" />
-<glyph unicode="G" horiz-adv-x="1364" d="M99 576v304q0 264 163 430.5t419 166.5q267 0 409 -127q137 -122 137 -323v-14l-2 -6h-275q0 116 -67 180.5t-195 64.5q-134 0 -216 -103.5t-82 -266.5v-306q0 -165 84 -269t225 -104q104 0 164.5 21t93.5 53v282h-280v202h573v-562q-68 -89 -203 -154.5t-348 -65.5 q-264 0 -432 166t-168 431z" />
-<glyph unicode="H" horiz-adv-x="1445" d="M134 0v1456h292v-626h593v626h292v-1456h-292v605h-593v-605h-292z" />
-<glyph unicode="I" horiz-adv-x="601" d="M154 0v1456h292v-1456h-292z" />
-<glyph unicode="J" horiz-adv-x="1137" d="M36 424l2 6h284q0 -116 57 -171.5t153 -55.5q80 0 131 66.5t51 181.5v1005h291v-1005q0 -216 -132.5 -344t-340.5 -128q-231 0 -366 114q-130 110 -130 316v15z" />
-<glyph unicode="K" horiz-adv-x="1305" d="M134 0v1456h292v-595h82l399 595h361l-504 -677l543 -779h-372l-402 608h-107v-608h-292z" />
-<glyph unicode="L" horiz-adv-x="1138" d="M134 0v1456h292v-1232h652v-224h-944z" />
-<glyph unicode="M" horiz-adv-x="1782" d="M134 0v1456h383l370 -1073h6l374 1073h381v-1456h-292v994l-6 1l-360 -995h-198l-360 997l-6 -1v-996h-292z" />
-<glyph unicode="N" horiz-adv-x="1445" d="M134 0v1456h292l587 -981l6 1v980h292v-1456h-292l-587 982l-6 -1v-981h-292z" />
-<glyph unicode="O" horiz-adv-x="1409" d="M97 597v262q0 267 167.5 442.5t436.5 175.5q271 0 441 -175.5t170 -442.5v-262q0 -269 -169 -443.5t-440 -174.5q-270 0 -438 175t-168 443zM388 597q0 -173 83 -282t232 -109q150 0 234 109t84 282v264q0 170 -85 279t-235 109q-148 0 -230.5 -109t-82.5 -279v-264z" />
-<glyph unicode="P" horiz-adv-x="1305" d="M134 0v1456h557q251 0 395 -128t144 -337t-144 -336t-395 -127h-265v-528h-292zM426 753h265q122 0 185 66.5t63 169.5q0 105 -62.5 173.5t-185.5 68.5h-265v-478z" />
-<glyph unicode="Q" horiz-adv-x="1441" d="M97 597v262q0 267 167.5 442.5t436.5 175.5q271 0 441 -175.5t170 -442.5v-262q0 -110 -30.5 -207t-86.5 -175l217 -217l-191 -156l-213 210q-67 -36 -143.5 -54.5t-161.5 -18.5q-270 0 -438 175t-168 443zM388 597q0 -173 83 -282t232 -109q150 0 234 109t84 282v264 q0 170 -85 279t-235 109q-148 0 -230.5 -109t-82.5 -279v-264z" />
-<glyph unicode="R" horiz-adv-x="1305" d="M134 0v1456h504q249 0 389.5 -113.5t140.5 -316.5q0 -112 -59.5 -193.5t-173.5 -131.5q129 -38 185.5 -127t56.5 -220v-107q0 -61 16.5 -127.5t56.5 -98.5v-21h-301q-40 32 -51.5 106t-11.5 143v103q0 109 -59.5 169.5t-168.5 60.5h-232v-582h-292zM426 807h207 q123 0 183 52t60 154q0 100 -60.5 159t-177.5 59h-212v-424z" />
-<glyph unicode="S" horiz-adv-x="1266" d="M86 445l2 6h283q0 -129 76 -190t206 -61q117 0 178.5 49t61.5 131q0 84 -58.5 135t-205.5 96q-252 76 -382.5 179t-130.5 281q0 179 147 292.5t375 113.5q242 0 390 -122q143 -118 142 -307v-13l-2 -6h-283q0 109 -66 167.5t-185 58.5q-108 0 -167 -52t-59 -133 q0 -74 64 -121.5t221 -100.5q240 -68 366 -177.5t126 -288.5q0 -187 -146 -295t-386 -108q-235 0 -403 117q-164 114 -164 336v13z" />
-<glyph unicode="T" d="M31 1231v225h1118v-225h-416v-1231h-292v1231h-410z" />
-<glyph unicode="U" horiz-adv-x="1407" d="M120 503v953h293v-953q0 -146 78 -223t211 -77q135 0 214 77t79 223v953h293v-953q0 -246 -163 -385t-423 -139q-259 0 -420.5 139t-161.5 385z" />
-<glyph unicode="V" horiz-adv-x="1303" d="M7 1456h308l315 -1061l18 -80h6l17 77l317 1064h308l-495 -1456h-300z" />
-<glyph unicode="W" horiz-adv-x="1804" d="M20 1456h301l194 -987h6l262 987h236l264 -988h6l193 988h301l-340 -1456h-271l-268 959h-6l-267 -959h-271z" />
-<glyph unicode="X" horiz-adv-x="1303" d="M31 0l443 734l-432 722h338l269 -516l273 516h340l-432 -722l457 -734h-353l-281 525l-281 -525h-341z" />
-<glyph unicode="Y" horiz-adv-x="1303" d="M10 1456h320l318 -671h6l318 671h320l-499 -944v-512h-292v527z" />
-<glyph unicode="Z" horiz-adv-x="1163" d="M77 0v152l648 1079h-647v225h994v-146l-651 -1086h668v-224h-1012z" />
-<glyph unicode="[" horiz-adv-x="570" d="M119 -336v2027h434v-216h-141v-1595h141v-216h-434z" />
-<glyph unicode="\" horiz-adv-x="863" d="M2 1456h289l608 -1581h-289z" />
-<glyph unicode="]" horiz-adv-x="570" d="M13 -120h142v1595h-142v216h434v-2027h-434v216z" />
-<glyph unicode="^" horiz-adv-x="896" d="M44 729l299 727h212l299 -727h-231l-165 413l-8 34h-6l-7 -34l-162 -413h-231z" />
-<glyph unicode="_" horiz-adv-x="914" d="M1 0h910v-219h-910v219z" />
-<glyph unicode="`" horiz-adv-x="678" d="M54 1512l2 6h325l196 -266h-251z" />
-<glyph unicode="a" horiz-adv-x="1100" d="M57 305q0 159 122.5 246.5t357.5 87.5h164v86q0 78 -41 121t-122 43q-71 0 -109.5 -34.5t-38.5 -94.5h-281l-2 6v14q-1 128 119 222q126 100 331 100q195 0 315.5 -98t120.5 -281v-447q0 -76 11.5 -143t36.5 -133h-291q-16 37 -27.5 78t-16.5 84q-45 -79 -119 -131 t-176 -52q-170 0 -262 87.5t-92 238.5zM349 315q0 -55 35.5 -87.5t98.5 -32.5q76 0 136 38t82 88v153h-164q-93 0 -140.5 -46t-47.5 -113z" />
-<glyph unicode="b" horiz-adv-x="1156" d="M112 0v1560h291v-593q47 65 112.5 100t150.5 35q206 0 314 -155.5t108 -414.5v-21q0 -242 -108 -387t-312 -145q-95 0 -165.5 40t-119.5 117l-24 -136h-247zM403 307q27 -49 74.5 -75t116.5 -26q113 0 158 79.5t45 225.5v21q0 158 -46.5 250.5t-158.5 92.5 q-68 0 -115 -28.5t-74 -81.5v-458z" />
-<glyph unicode="c" horiz-adv-x="1056" d="M62 525v30q0 238 130.5 392.5t369.5 154.5q198 0 319 -114q117 -110 117 -288v-12l-2 -6h-266q0 84 -44.5 139.5t-123.5 55.5q-113 0 -160.5 -90.5t-47.5 -231.5v-30q0 -144 47.5 -233t162.5 -89q76 0 121 45.5t45 121.5h266l2 -6v-10q0 -156 -122 -264 q-126 -110 -312 -111q-240 0 -371 153.5t-131 392.5z" />
-<glyph unicode="d" horiz-adv-x="1156" d="M67 511v21q0 256 110.5 413t311.5 157q81 0 146 -35t114 -100v593h293v-1560h-249l-25 133q-51 -75 -121 -114.5t-160 -39.5q-199 0 -309.5 146t-110.5 386zM358 511q0 -142 48 -223.5t156 -81.5q63 0 110 25.5t77 74.5v461q-30 51 -76.5 79.5t-108.5 28.5 q-107 0 -156.5 -95t-49.5 -248v-21z" />
-<glyph unicode="e" horiz-adv-x="1071" d="M67 510v40q0 243 132 398q131 154 360 154h3q218 0 334.5 -133.5t116.5 -359.5v-151h-645l-3 -6q7 -111 67.5 -180t179.5 -69q98 0 166.5 20t141.5 61l79 -180q-65 -53 -176 -89t-242 -36q-242 0 -378 148.5t-136 382.5zM369 656l2 -5h356v22q0 95 -39 149.5t-126 54.5 q-88 0 -135.5 -60.5t-57.5 -160.5z" />
-<glyph unicode="f" horiz-adv-x="714" d="M27 877v205h161v120q0 182 105 280.5t295 98.5q37 0 75.5 -5.5t84.5 -15.5l-25 -217q-24 4 -46.5 7t-52.5 3q-71 0 -107.5 -39t-36.5 -112v-120h208v-205h-208v-877h-292v877h-161z" />
-<glyph unicode="g" horiz-adv-x="1156" d="M69 511v21q0 256 111 413t312 157q91 0 160 -41t118 -117l23 138h251v-1077q0 -211 -138 -326.5t-385 -115.5q-82 0 -174 22.5t-170 61.5l49 218q67 -32 138.5 -48.5t154.5 -16.5q120 0 176.5 50t56.5 156v98q-48 -61 -113 -93t-149 -32q-199 0 -310 146t-111 386z M361 511q0 -142 47.5 -223.5t155.5 -81.5q67 0 113.5 24.5t74.5 71.5v469q-28 50 -74.5 77t-111.5 27q-107 0 -156 -95t-49 -248v-21z" />
-<glyph unicode="h" horiz-adv-x="1156" d="M105 0v1560h292v-615q51 74 125 115.5t164 41.5q169 0 265.5 -112.5t96.5 -347.5v-642h-292v644q0 126 -40.5 178.5t-121.5 52.5q-67 0 -116.5 -21.5t-80.5 -61.5v-792h-292z" />
-<glyph unicode="i" horiz-adv-x="547" d="M127 0v1082h292v-1082h-292zM127 1341v219h292v-219h-292z" />
-<glyph unicode="j" horiz-adv-x="543" d="M-98 -420l14 223q23 -6 46 -9t49 -3q59 0 91 41.5t32 127.5v1122h293v-1122q0 -190 -101 -293.5t-281 -103.5q-40 0 -73 4t-70 13zM128 1343v217h293v-217h-293z" />
-<glyph unicode="k" horiz-adv-x="1097" d="M112 0v1560h292v-885h65l259 407h338l-352 -493l400 -589h-336l-300 453h-74v-453h-292z" />
-<glyph unicode="l" horiz-adv-x="547" d="M127 0v1560h292v-1560h-292z" />
-<glyph unicode="m" horiz-adv-x="1772" d="M112 0v1082h271l12 -143q52 78 130.5 120.5t181.5 42.5q104 0 178 -46t112 -139q50 87 130 136t188 49q160 0 252.5 -113.5t92.5 -346.5v-642h-292v643q0 130 -40 181t-119 51q-62 0 -107.5 -27.5t-72.5 -76.5q0 -19 1 -32.5t1 -27.5v-711h-291v643q0 127 -40 179.5 t-120 52.5q-59 0 -103.5 -22.5t-73.5 -63.5v-789h-291z" />
-<glyph unicode="n" horiz-adv-x="1156" d="M107 0v1082h272l13 -155q54 83 133 129t177 46q164 0 256 -105.5t92 -333.5v-663h-293v662q0 116 -40.5 164.5t-121.5 48.5q-65 0 -114.5 -24.5t-81.5 -67.5v-783h-292z" />
-<glyph unicode="o" horiz-adv-x="1156" d="M67 530v21q0 242 135 396.5t374 154.5q240 0 376 -154t136 -397v-21q0 -244 -135.5 -397.5t-374.5 -153.5q-240 0 -375.5 153.5t-135.5 397.5zM358 530q0 -148 52 -237.5t168 -89.5q113 0 165.5 90t52.5 237v21q0 144 -53 235t-167 91q-113 0 -165.5 -91.5t-52.5 -234.5 v-21z" />
-<glyph unicode="p" horiz-adv-x="1156" d="M112 -416v1498h263l17 -128q48 71 115.5 109.5t157.5 38.5q201 0 312 -157t111 -413v-21q0 -240 -111 -386t-310 -146q-85 0 -151 31.5t-113 92.5v-519h-291zM403 297q27 -46 73.5 -70t114.5 -24q106 0 155.5 83t49.5 225v21q0 153 -51 248t-156 95q-66 0 -112.5 -27 t-73.5 -77v-474z" />
-<glyph unicode="q" horiz-adv-x="1156" d="M67 511v21q0 256 110.5 413t311.5 157q90 0 158 -39.5t117 -113.5l27 133h248v-1498h-292v517q-48 -60 -112.5 -91t-147.5 -31q-199 0 -309.5 146t-110.5 386zM358 511q0 -142 48 -225t156 -83q64 0 110 24t75 70v480q-29 48 -74.5 74t-108.5 26q-107 0 -156.5 -96 t-49.5 -249v-21z" />
-<glyph unicode="r" horiz-adv-x="721" d="M112 0v1082h271l13 -160q38 85 98.5 132.5t139.5 47.5q22 0 40.5 -3.5t37.5 -8.5l-31 -259l-107 3q-65 0 -107 -27t-64 -76v-731h-291z" />
-<glyph unicode="s" horiz-adv-x="1056" d="M64 338l2 6h267q3 -87 57 -126t141 -39q81 0 123.5 32.5t42.5 88.5q0 48 -46.5 82.5t-172.5 60.5q-190 38 -288.5 115t-98.5 209q0 139 118 237t314 98q205 0 329 -98q119 -94 118 -233v-11l-2 -6h-282q0 65 -42 106t-121 41q-70 0 -111 -35t-41 -86q0 -50 42.5 -81.5 t172.5 -56.5q199 -40 296.5 -117.5t97.5 -213.5q0 -146 -125 -239t-330 -93q-215 -1 -341 109q-120 105 -120 237v13z" />
-<glyph unicode="t" horiz-adv-x="713" d="M13 877v205h158v265h291v-265h183v-205h-183v-551q0 -63 26.5 -90t69.5 -27q23 0 40 2.5t39 8.5l24 -211q-44 -15 -85.5 -22.5t-90.5 -7.5q-151 0 -232.5 83t-81.5 263v552h-158z" />
-<glyph unicode="u" horiz-adv-x="1156" d="M105 455v627h291v-629q0 -142 38.5 -194.5t119.5 -52.5q70 0 120 22.5t82 66.5v787h292v-1082h-242l-31 160q-50 -87 -127 -134t-179 -47q-171 0 -267.5 116t-96.5 360z" />
-<glyph unicode="v" horiz-adv-x="1046" d="M16 1082h305l182 -679l19 -100h6l20 100l178 679h305l-368 -1082h-279z" />
-<glyph unicode="w" horiz-adv-x="1507" d="M29 1082h284l133 -677h6l202 677h195l204 -680h6l131 680h284l-275 -1082h-244l-201 624h-6l-201 -624h-243z" />
-<glyph unicode="x" horiz-adv-x="1046" d="M19 0l337 547l-327 535h328l162 -344h6l166 344h330l-326 -535l337 -547h-329l-177 359l-177 -359h-330z" />
-<glyph unicode="y" horiz-adv-x="1046" d="M5 1082h314l183 -628l12 -60h6l207 688h314l-439 -1244q-46 -116 -125 -195.5t-237 -79.5q-37 0 -68.5 6t-76.5 17l34 213q13 -2 28 -4t27 -2q72 0 111 35.5t60 88.5l34 84z" />
-<glyph unicode="z" horiz-adv-x="1046" d="M75 0v172l515 684h-499v226h866v-167l-519 -691h536v-224h-899z" />
-<glyph unicode="{" horiz-adv-x="676" d="M48 518v201q90 0 133.5 54.5t43.5 155.5v203q0 171 82.5 290.5t277.5 174.5l56 -157q-85 -31 -120 -110.5t-35 -197.5v-203q0 -104 -44.5 -184.5t-134.5 -125.5q90 -47 134.5 -127.5t44.5 -182.5v-203q0 -118 35 -197.5t120 -110.5l-56 -158q-195 55 -277.5 175 t-82.5 291v203q0 99 -43.5 154t-133.5 55z" />
-<glyph unicode="|" horiz-adv-x="519" d="M143 -270v1726h231v-1726h-231z" />
-<glyph unicode="}" horiz-adv-x="676" d="M34 -202q85 31 120 110.5t35 197.5v203q0 104 46 184t140 125q-94 45 -140 125.5t-46 185.5v203q0 118 -35 197.5t-120 110.5l56 157q194 -55 277 -174.5t83 -290.5v-203q0 -101 43 -155.5t135 -54.5v-201q-92 0 -135 -55t-43 -154v-203q0 -171 -83 -291t-277 -175z" />
-<glyph unicode="~" horiz-adv-x="1327" d="M105 448q0 162 86.5 269.5t223.5 107.5q83 0 158.5 -33.5t151.5 -99.5q49 -45 86.5 -64.5t81.5 -19.5q50 0 87 52t37 125l203 -27q0 -161 -88.5 -270.5t-223.5 -109.5q-85 0 -157 31.5t-150 101.5q-52 44 -89.5 64t-81.5 20q-52 0 -87.5 -51t-35.5 -122z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1181" d="M62 525v30q0 221 113.5 371.5t324.5 172.5v219h200v-233q140 -36 222 -142.5t82 -260.5h-274q0 84 -44.5 139.5t-123.5 55.5q-113 0 -160.5 -90.5t-47.5 -231.5v-30q0 -144 47.5 -233t162.5 -89q76 0 121 45.5t45 121.5h267l3 -5q2 -131 -81 -231.5t-219 -136.5v-242 h-200v228q-211 21 -324.5 170.5t-113.5 371.5z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1216" d="M92 588v225h155l-8 214q0 210 120.5 330t322.5 120q215 0 333.5 -111.5t114.5 -294.5l-2 -6h-284q0 96 -46 141.5t-117 45.5q-70 0 -110 -58.5t-40 -166.5l10 -214h355v-225h-345l4 -85q0 -78 -30 -150t-86 -129h713v-224h-996v224h10q47 12 70.5 95t23.5 171l-4 98h-164 z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1253" d="M22 1456h321l280 -608h6l281 608h320l-382 -714h244v-165h-324v-125h324v-164h-324v-288h-292v288h-339v164h339v125h-339v165h267z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1606" d="M86 729q0 315 207 531t503 216q295 0 502.5 -216t207.5 -531q0 -316 -208 -533t-502 -217q-296 0 -503 217t-207 533zM208 729q0 -264 171.5 -444.5t416.5 -180.5q244 0 415.5 180.5t171.5 444.5q0 263 -171.5 442.5t-415.5 179.5q-246 0 -417 -179.5t-171 -442.5z M433 669v119q0 173 94.5 280t254.5 107q157 0 245.5 -79.5t84.5 -228.5l-2 -6h-148q0 94 -45 136.5t-135 42.5q-94 0 -144 -69t-50 -182v-120q0 -115 50 -183.5t144 -68.5q90 0 134.5 41.5t44.5 137.5h148l2 -6q4 -151 -84 -229.5t-245 -78.5q-160 0 -254.5 106t-94.5 281z " />
-<glyph unicode="&#xad;" horiz-adv-x="892" d="M146 510v225h589v-225h-589z" />
-<glyph unicode="&#xae;" horiz-adv-x="1606" d="M86 729q0 315 207 531t503 216q295 0 502.5 -216t207.5 -531q0 -316 -208 -533t-502 -217q-296 0 -503 217t-207 533zM208 729q0 -264 171.5 -444.5t416.5 -180.5q244 0 415.5 180.5t171.5 444.5q0 263 -171.5 442.5t-415.5 179.5q-246 0 -417 -179.5t-171 -442.5z M501 316v850h281q151 0 238 -68t87 -194q0 -58 -29 -101.5t-85 -74.5q58 -30 84.5 -84.5t26.5 -128.5v-56q0 -41 3.5 -73.5t13.5 -53.5v-16h-155q-9 21 -11 61.5t-2 82.5v54q0 71 -33.5 105t-109.5 34h-158v-337h-151zM652 787h135q71 0 120.5 30t49.5 86q0 72 -39 101 t-136 29h-130v-246z" />
-<glyph unicode="&#xb4;" horiz-adv-x="727" d="M115 1252l199 266h325l2 -6l-277 -260h-249z" />
-<glyph unicode="&#x2000;" horiz-adv-x="845" />
-<glyph unicode="&#x2001;" horiz-adv-x="1691" />
-<glyph unicode="&#x2002;" horiz-adv-x="845" />
-<glyph unicode="&#x2003;" horiz-adv-x="1691" />
-<glyph unicode="&#x2004;" horiz-adv-x="563" />
-<glyph unicode="&#x2005;" horiz-adv-x="422" />
-<glyph unicode="&#x2006;" horiz-adv-x="281" />
-<glyph unicode="&#x2007;" horiz-adv-x="281" />
-<glyph unicode="&#x2008;" horiz-adv-x="211" />
-<glyph unicode="&#x2009;" horiz-adv-x="338" />
-<glyph unicode="&#x200a;" horiz-adv-x="93" />
-<glyph unicode="&#x2010;" horiz-adv-x="892" d="M146 510v225h589v-225h-589z" />
-<glyph unicode="&#x2011;" horiz-adv-x="892" d="M146 510v225h589v-225h-589z" />
-<glyph unicode="&#x2012;" horiz-adv-x="892" d="M146 510v225h589v-225h-589z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1413" d="M150.798 601v228h1084.19v-228h-1084.19z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1670" d="M152.597 601v228h1334.38v-228h-1334.38z" />
-<glyph unicode="&#x2018;" horiz-adv-x="559" d="M143 912v256l102 288h144v-544h-246z" />
-<glyph unicode="&#x2019;" horiz-adv-x="557" d="M159 912v544h246v-259l-102 -285h-144z" />
-<glyph unicode="&#x201c;" horiz-adv-x="877" d="M121 912v256l102 288h144v-544h-246zM449 912v256l102 288h144v-544h-246z" />
-<glyph unicode="&#x201d;" horiz-adv-x="878" d="M124 912v544h246v-259l-102 -285h-144zM460 912v544h246v-259l-102 -285h-144z" />
-<glyph unicode="&#x2022;" horiz-adv-x="737" d="M135 716v90q0 100 65 164t172 64q110 0 175 -63.5t65 -164.5v-90q0 -101 -64.5 -163t-173.5 -62t-174 62.5t-65 162.5z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1519" d="M144 0v256h292v-256h-292zM587 0v256h292v-256h-292zM1007 0v256h292v-256h-292z" />
-<glyph unicode="&#x202f;" horiz-adv-x="338" />
-<glyph unicode="&#x205f;" horiz-adv-x="422" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1116" d="M71 485v153h146v150h-146v153h146v13q0 238 150.5 380.5t394.5 142.5q60 0 117.5 -8t125.5 -23l-21 -229q-53 16 -109.5 25.5t-112.5 9.5q-118 0 -185.5 -79t-67.5 -217v-15h428v-153h-428v-150h428v-153h-428v-8q0 -132 67.5 -203t187.5 -71q58 0 113.5 8.5t106.5 25.5 l21 -227q-57 -15 -118 -23t-123 -8q-245 0 -396 135t-151 363v8h-146z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1294" d="M96 1351v105h398v-105h-128v-434h-144v434h-126zM565 915v541h159l119 -362h6l120 362h154v-541h-129v282l-6 1l-105 -283h-73l-110 298l-6 -1v-297h-129z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1137" d="M146 601v228h834v-228h-834z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-Bold-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-Bold-webfont.ttf
deleted file mode 100644
index cd29fc5efdab542018af914c1b86d44baafdcb22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25696
zcmdsg349bq_J37(PtRl~#~hhV?#$$dBqW(3<lqYTeT6H5a36wl35b9wa)`((vaI(3
zcpvE6J;ZZ&6>srA5fu?sRwJnBdaOcv{@+(U12G=EpWo;I`TUPGHQiNRT~+VZtM^{L
z_qt)6G3LgP!u$gVjvFyO)qVwIycDIGgZd8`$oAk4<Aag+4;npctVcWMMt&Y+$zKf`
zJHBuK6~oVCETxg|j~ZJZd~~TT3Hg=CPoK4L#*)b&9-D*w0X*~OtQE`s@!vT6F_wBC
z?suKL<gA5BE#-G1f0!|8&RH{-EkU`Hu?*_ZcGiMbbMIK*^-bhQGgkldyg4&wpPG2I
zlCkDY-0wCI1qmU`mB^1nK7ZcA<ttqii+)BP{Y$9}7SEco@2kJnGd6V_`cGUqW91Tl
z5C0ou({`c0f6<JEbFzojMUdZ%`&*VQUbei;jIQe#n=u^uSC=fEvm|tVr>_~Ch5k6k
z%?Mj;-(`z22F6|*G=kuu^8?~eA~LB|!X)H5y95c?L(Y8C&azo4<NXH?AIEIs4vR#@
zll+`HOBbQctVd7LGct>pniF<0E-9jR5o^RTl`UZ_*k-ns-NZh|@j3g7{aajZ<`R$R
zx$JXZ!3XkYK9gV0ui-cGTlwAiy@~&mf5#2}ooIzx;%pLgP|K08SZ?G2HZk%wn-uv-
zjL0nilEp{<$?7BDvFW%6=y6xZ?+G>p&rFJZ!Cc5a%aV+*m<uTjDIfX%kwa`?<QN--
zG#F_pQUlUBr15C65l=QnK4;BHYw-->)hpURMv$Y0Ns%W74m`MenXZg?*+iDeEV%n2
ztHwBLBcHOm$Z^&Kc^cCKwEP5Wzai?huy~ft>M_3Yk&oGQ<`JbYp)?7l@hClp(nQhc
z+suyV|H|S}lb%Y5yoNe%!1x8~9ROaw5G`C3c}tA$CG>JsJb6O=ej$FpN6QTGSU|yc
zB(r}v@bEeC@Hz1CIq>i~aPYZkZ8hp#fV2kbLL`|DK?@Tx;z>w=IPyJ85=7hIARmvG
z0X^Ebqb#3wLRksx3aY7QJu%w;YyeARgYirTYhYtp78{Qvhc)5wv&pQP1=wozl*hQE
zi=d}CmdU!PFIc~_F<YYjgv0Lei}Dm!3oO*JLe_(&@H;V*XOZ@r3A4pICO|}x|9<)c
z_x>m87@qsTIUU0IC=q@r{lA|7Pq_ZQIsQ-2wZH$La1`sK{WE`b9ji}gsu!D!Sia-4
z9m`|$7o*Qu{a8MBj+J*jx9`7w+Z~^ajqA709dXj}*;pU3^8fbSajgHR@*Uy(Px%<U
zvGad|_kTBBvGM)4=ii#s|6E2=vtuGD+A)z-?U+c)c1$F7J0_CC9TQ3Aj)|mn$3#-Q
zV<IWuF_Bd7m`KWZOeFO?Cei{rCejKzCeji*rXg7EA3`FM-i1Whf0&Nr{%@s^P)@1i
z^Re>S`BT)1rC8Z-J=d|FSU%Qw`)7asJn1$a6X`k~6X`x36X`-76X|!aqs3Rz!k4)F
zy3m%sVr9_aYLFhmeXKKRAitUZP_D<;=l{oN!pr|7I3UflV<JtoV<OG8V<LUGV<OG9
zV<JtqV<OGAV<JtrV<OGBV<OGGV<OGCV<JttV<OGDV<JtuV^T4L#{tQ4jQlu8dK@D=
zj*%QEeLAv{B_X+xvXIsy$)bK4?$;o37KdF@CurJLtQWNFk<iblGD&@zbY+X*asv7`
z?fT*)-$h=Hd>`2p`8x7?q*r8O<Syji!<|3;15WT4*@txW4=euSrr<-Lh$1)b!G8ab
z^lr5MPOSaNvB(#Z*2t#ce<F4#VzwX4{^}h05<LDFf7m0Q{sXW1#b4x^h#vVX#!c(#
zF8XCo?AMYaf1zrI0c`Dwv=}EMCnEQo4@Qng4n&Ta*U^&JGdZ*GNb{Kzw0lY9vq+FI
zYP6!oP~_XlZJ@8;`HTFEc5EI0A|oTOL=GAYa5wsgeb^uTnfU#!3XwN4|EF7_8e-NS
z6jz-hZ;SIRl)}Oxu8&2IL_QPJ%q$T4Z1j>v;hlXt|8eAr$Z^b(JF*LVR9Iy|!|x&e
z6?;Y&NyFXN$a9f-z~_^ZUG&s1afyONnj@kN{GMyxjXZ;E$RtsA3^VYH85VPj*3G--
zx&3eCn=`rgv~Z^M_pkmK%NP~fZeQou)Y-mwv!C|Zk9_<4egD=S*f{?1kM6hc5uBpK
zAGD%h{I#!*8^55vNYk0I#_FL(n$_4Jt(en)k+B`u7e@1|5uC1$i(lXUV+enJH*!a;
zJ!&iRftib36Frl@dpli2(;%ByuCQ063wuR6E5N~FQ78o0EW#nPVjLD&FiKIk42PX{
z!C__PIBcwfRiZqILuMfyaj<e!GnLigu){u43!YquBawB-5f4j6572#297(W*^ap<#
zfCJVS94=Tz27?a_!;#EJvoZK>z~P0JWGw2Cox~^XBq^|yOa?b^#*xCN;7AiTlXQ$F
zU%(S5;E6*oN$7))WVG+XISYpqwem3z6VA@8GoU5dd;$^$GNda?y5aB&c<cfmRls8r
z@Wcyv5(PZAcJQPCj=|_>C=Qo^!75;o1PoR-4u^|Pz~K@0J%@lt7Vx+QJhFg?vz2TW
z#!Qx=IJOpt6R;%+*v{CNicwYqtXqX`$q9T81Pp}5bb-YTj9@IRM}#@Q=qZ4nreMyg
z-2%)%S@i6vk^L)sCvM<RmLt;N(JQmuU<sjmj(L{fU~^&mYWH`TNnej<{>dovQ}L2j
zOPArwe;CAIAg|uYzw|S{a};`1>MR<H{1`o1PtBAm#=_XkC_x>JNnup081)oT+C^*^
zyN%t!?qPprEq=Q{*`Mam^5^;s{pJ2?{`&&Cx$eVcr=@mxv0FvW`%#nmo&HpR=C5l;
zK8ZX9p1U{lkH}+@2M?cpc+TOOho>KIKHPM8%;DUR_J1_v&{99yhX3n74h<$&ofB-o
zM3J~DD;Cvii?ci86B3i0F1IJyo8n7NOV7y6%Fgiza`W;F3X6(6buK9_>r!4(84Pu;
z>Q-G-Ti3lu&tARj`}FMxYyY6ZLxv6;K4Rpk(PJ9MjvGH=Vq?>!$<0%yPMbdCzZmPR
z*}x^6H+RGQSmimfi}vTWGevIYsx=p`zCc{AZ-4vuuZ>~R89stJc#^%qUSaRB_t=N*
zDEkt2?|h!by*!m?;i`;x<#nuuy{NHLjd_M?okurnLsv9uEU$N}rj|7JY!YP`Hu>My
zxTi~MnZ`@~?`!cTWtvnvtf6s0UQ?h<lS}8P`nCGejRCE`sZ3K!>Cr%5V0Gh%8Lu>D
zpk8BJ#+OYQc>&E*(x?qw(Ijp(HK9FAX+ra)GEFVjbNOcU?%&+poS`u^V=dM5MN$3f
zB3r53<*zL-)8b0~7g8tBpnbn47YxbsYf9lzjg4;HGH1&SKV8&h1OiPNTSTtG%u$DS
zb9BxOX8@fzO8svNaN<k-<(jpmxzX<*ls9n3+5SfV?3rd0R4;*gM%Vr={y|#?&dA&1
z-;yV~%hOmxqgIcafRDP>>gP}f&m@YTdhSmR1Ty^lw*U=zXb8qOJ~}px57m-N^Zfgx
zo#*)*hmFk$XuPR$3ji9Dw<XWNWyqGi88i|Chkj{1PMQWcrolx3(1p7L02pZAz`Pk}
zPj3$iJ?be15L+%Kv<;n|x5cXYM>qD!*o!;KrF&RCukYKJ4|~MPW-;+gmB(Y`{w)oS
zc{4HkyuKMY@w~pke0@V>80)>?tiECH=QwHpSz6khOfgcl=q=Sy3cTQ_j7S##9`J}H
ztjzvcp0h3E!ELPI=waL`X;CaJQ7O@^<t<!Xam`k)vHdNIlQ~eXICTpzX^}-vkK-k*
zqB7(PxC#QUK!3?^<n!x{d6w}%@9wX>g1#gM?VaBXUPpa|%szCU*c!ITtR&jDrUZ34
zsZ~>hx;3d)G>T4KZcV8*8|Ua?6VEpeV!bf9p?;7bJ2en(Um@Qv?L*rN<U=<W=4et=
zLoJZBHVoAg<eFWK9ivS{fozW5CUUw%jNRi3xvU}jx#F|A@BDKvT8uZo{7L+X@mF9a
zUyeR9SPq}d!s)<K*qf3T3WdT}^cS`{;&I)=c)B&AWRK*^%*ywLbY^MYlk7{)$oB<X
zEQ+`#JF|1>mIb%eIC}zaaSb$=zP}~S#BG{WPXTVdB8N`wC41_<p16`dHgAfpq{V91
z!pr~y%thF0qZ(Evu0-=X37(dCaYGOA60KYMW4&$PeZjmX_Q!h1eRqN`v~=elDc$NR
z*&~Zzm43A}=bpGU8!l3ud+aF=TzH*(61?%K<`lm!@taJ)RL3Xk;Hgyc6xz&)wUZfZ
zCyVOr$&S^`p>nz2Dai!6(?zHuX5Xd5pH`m^dh%2SJb6eVIYh~uCsLj#PtNmHhdg-|
zoP|E;>X3(r>>c{>kb^&mju?X<8N7GUBZJ?0BD9y^a1YPj&375oDeX26-DAw<H&8;k
zN&gEXot3fbb<lQhV&M|Zs8)=5akPd@EQHaL&cJA9d5b%d*%c6JmvSv}zn%jMW&Zsx
zUGlVQIZoXLd?%Yz(iz1qoy_ZGr)~rK(}H>d9`FVAa$cfKiJ<2ATD_CY<=*44Waj4k
zYV`se3iE22o@sHpAB5M}ms)^w&F#`%$+aMTPjw(UB^2yd)wQsw3$N<ht-31Y&4%m<
zbS=!wRlUh6zHIJIR;}K=sxEwi%rh^XJ#*&Nl^?(V{@-@Cyevz`C$pNSj%&K;(82fq
zzH{%7e2;qZ!s%lhW_20<;=}j6>)HQa+Gmei7M?eA?1<*7!EZeD*Ec-RKI?)B5ULKF
z7CCPDv*lUnTcCVksyo|Z;!3Zyw1yRszMg7nZK=sGQ4&h@8eF;@;?iYl<ysH1?h>8M
zjdhpk)RTcMP%Y(bPTh}O7c<wzsdq)LSmgAcz*RDEwa1}kVzJcfUArKYm0yyL4AU!1
zfU%rft;VHg*6OK1rj}i+DK0IGumuE#f+<-%S<TBWtQMH-$xTdoxQ`e7!To7>U48AH
zcV2zX-A~o`sOw$dy?gI$>G`c~wS4H^S6_1%Zrt<KfSNuv_1$~)R)&pOci-;yBi7w}
z@4C8Cqv}S~jTuvS%C9UPc5>_P5f|ULd)<ij_wHU-J7!q#5w&B+)RJb`Gjhz530wxS
zgQz8%%OEb2gCD&>X${8_GOHD!t&Y&9=Ynu@omv?Yo9YB#EZ56$$~94iHBQVd-b5;x
z1#)_KATC!0K4jpm%;j#0%PHvOBx;Ixg<YA&wY9ZcvRlij)x0h(6{sx8aJlugOcYnU
z9%O2KYNra+1{OhOg4TdakX91sy?9j!H0HAgiV}HVZhnElY&Ewgat|o58utZ~d#>Hk
zxBl%%cRoLU>|CChU)(xq*gnbl`-t%^XT5J2JbzJB)!CKCdvV=MXB2lDUQ^V!u19~q
zdDZS2ldc}|&~wjTKJU6dgN<jqUp{i{@yW+5P1V&$pKn^0k-;ZeE1IRvog2GW<_|9m
zji6Y7$?|4CUGV)plj}!WKG!S)fwHqzr=&(%e8447=9angW~tctmvI#I&Dk2Gmvomp
z96J#Y<C<GMXU8)h^O-6qs}A{8$>nvreb&4}wuV>iRjW3H!yBs9y~gWOT?*eU<&D`s
z(-?02HQl)17%}I{F%mHt&T`Q9r1ovg`}Kq~ZFh6Ks+>|$btr|Qd1lSaS=aK=+HUGo
zyr=Q>Q>yXGO#Tobo6bk`M`vvv-S(!jKE+tq_SR_8b|r6=OO#s3IKVDr@58mEa!uOb
zVljEY6O>?)KnadoVx`qSaLj5Srmx6aR9)Hagrr&jS=G8_+tq*m^Pi=o_m29>h>YAl
z>cz8Pe}3+pH1-;{UCCA+Vh-%tGzNVvr1OMU2vevB#2lGDt|ZJEU2-`Ny~mep_Wha^
z)Z<*OkmTVwJKc-3qMAL9F6}I?L{EsK6>5Sj;HBRhel}0$^Nj0^<5I;bzQtH^%9zP_
z&=`6fZ}MB%&)`A@G=>&Q2y~8xpz-~>;%U{bfKnk9!9q}G@T!1U?mdua?!=S*KmF2p
zR^VzoH>8gwiUY}|c66?^QsSCYt}}2Q*~hF{JWyy%spH))jo`+SBQ%C>_-Wy^dONk#
zT5zL;)E8=kmMYX1k<2DY5!z<zDAYe}dK=_?q5Ci^5AZ}Og=e;XaiLoF(_6SNfyW+G
zYN9+A`j>+mcYz_8+?58JDSAl+Lok`BZbOGzQ7)-Flv**#E+-2GnHQ(LTxPD%DwoOm
zrtyT24)G-8UxyAG-}1b(XH1)a&a~<Cr6m4m7U6})`w?Stgpp?T>6O=Ce<gqE@*8fr
zoZx>MpcBuskk+OUzmkYeamnf53+&P0Fdd3O0R~JH4K=KUW=0^h0JwNr8f|>2gg@%~
zb9aTb%O>bj1JPzWTg<|V1g!(m%G7QOE>c7*Dd|L28KfBLX%My0im)biHK{eMdZ-&U
z0i@+o>C%&k9y4**ljd@VWrrPnj_D4Pwn?>GiYu%#4~no33V|VFXja(=@~a}QW+Eui
zWa0M1hyVSjdrwHx*i+^F={e&kO`0~(_*DMkDV}ij$qfgdFb-P|Kf#Uj?-(#?!IrZz
zb%13u=58op=?ptUxR_wE00c`h4a>qY!b}1y8D+_tRF<3?SJILYUz`bPnP3O@O3F3c
zexW3|h|xp62)lBqrYjyml>(?7QV?<hP&^a_ofUvtC%8}mPOhirbkGn=z@~+&K$=0I
zs4zbiR0v+u5EQWO$r8_8HhK1%<x6h4W!{{#r;T1{{8LhS@=G6c`?A?f*BBpt{JgQB
zZ&Di;ub8xK@dpcLHY}JqT-|->o#$uYRZ;T5niq~9Aeybg98LpG+p&Wf!NNA83{t#X
z><$}GfRY{3?F#V=t~m)pEnaB#U=U%OmB6zRl|XsIJlO#stJSzmOQbpC0T+}#&`qE^
z;3~4#NX@+H_S=nvZ4aE}6Vz;eOn&y%qK}Pdc#n@I7w==v!?~D;UKmdfydB}J*gQB1
z`JRN<7M~-_35@&VfN?0>z<4@V5ENuR9oW@fZb2}>Zwr$WlhR3I`dnHv4W~M~k_4St
z3p}73xfieQ=JqB_K<K#=Pg~S9Z`!=M<C;81WSm^u_H=QlHA7zd=-Z$686Wf2mW0W3
zH(zwo)xD}*a+fcR`?8B9*@%3;-}vgC=-MA4)<O|m$ik^K@@!CxSo@Cn))seuDrr`3
z2S#2j*gyucfuNS*6yx^-j!u9h07(vg$(>4L_queOl|ahR25!BiOwvklxHX$ll&l1p
zU>7MqYZr)fH49526a-AfJ9tdr#0~2-KH#VEe;(Ae|AIjm-&}XgtiQc!ocQ2V;|R~Y
zV9w+P3#W`)oFfH!B`g^ua<cdPe9t^kUfbLF@tqHhuXqi&-Tlb*%U50&D#KbC1ezIy
zIf`e!+fj_kL=wcLVBZ(p&OoTNr<6pZ6h<pSrm=(3+qnxX*y*kwq_7{u#=(!?QC>T8
z#Q4alG~Q`xK|ta6KY(k)^RJ8netnRW<%mEGdkMoCz_3ua%9PfYqJTFJ7%n1SRv|E)
z3Jj+@wS1v@;ToD(z9`bOfoV4`N!8cmf%-}mq((Ka&iR-EZ$=;vQ=rEa=94f5G%>oH
zVbvD7^duSQGPfSDigg>+vam=6Q;IFp_7n%@>hywc`16{x&g1Hv`%W#HdH&_bXCE9j
z-sc7D=1f|#s%hr>irEc=8z&8Jn8~kM@o;7NT?_WU_S)VBca>K@yyC?pM-I$dv0~PY
z3on%Nn-(sZG+_?hIJAxt1)-Fkp+7rehh&f7#?VSzQnT$cu#-wF=M4RU_@K*c0duQP
z^q0W^W<nysOLpzCyJVt6rn_iuC)8@Gw6?WuL5l@0tai*{SCUp~oG7las5%?u*R3Zf
z-BOC`mL_W+$KCH7<SE7*UktxxP-X9x!xwC++%)2)&v^dKDT5aHmrQM3Aiwwl_ZtU{
zpN*BLj01t}x6)H@+dj2-J-2;w;dOPD_g?nr+sGa&WVy1ySqN>9Ij!_7FF^THXbW$n
zya**+Uf@(&5*c`5OBf(u1w)9HF;5kDS-cikH+gE?6H*`E@(EvLoOn%r$v9!+aWfyT
z*yO{YI4k6u&@$qo2bJrVcp%PJ9<`AW;gXiJS-$wx#qz~`_|c>Mfup2~qQCQ55BVec
z6!ll_DyS-Oaqs!k(6)!<c|CaI8|te(!Px!@=FE?Azb57^o6RwI5qf4qOoGP$QiA4`
zYZ?2sgrJ@cvW*XF*{9_w?Z5PFP-j?nrO?j6<I?Q4n(Ef#FmoxHxPcu(RBp!PNFw(J
z!2M!!(;6UX{4$qchspWsB|Qs`5BZo?gT~L8H1sTPd<u1^P^sPf@+VKPJuswv+Stq2
zPpR89ws~IT_>-^v{4-$bYjjtivTT8N(T_dB!f}HCVP}~{7uA+lt+HJ2j8mU--HTIx
zxh~VjvOlfUmLhZWSR^=Mi)w1V1EN-sCw?AF#*Rd-r&H^-SI<cMNlV|$_M~U@>_z4V
ze)<a52Cif7-8#nxNej5@?QyazzjK$$s=DsPO;xvU%_VNyxf0aerB;h`X=Sx~HLY;$
z=DmGzP9utTvw)w;D#Sve*d!G~N?>XGtRY#YRa|XWkXQiMK9IVfaq~u1*J_X8!+qWS
z1HO@O;5RwrzWQ?H($vxojaOWooc85C%dZ$GTSC^(`OE%fa~iK1Pa1C+*Ce?RHys@R
zV4uQ%ugx-+8)K!N_S*WI$@#q0*ClQ7a(;;Kmbj5&G{0{=(>SW3;j3p19_-ppX?uFw
z!1wRsGx+7k1mgzdW@Bz~_Fp=e^KbdGwHvw)RAq&qu-cvkT}tHBv$(*wt;_*mim(qt
zzMJA+wK0f$T_q~V767`iHKkRvI-!=A=yFOcY5clk1!I)BjTj@-IdO42@D&1e1muA1
z3CMYFevFs!Rs&EJ&%Bopxka^TKab{h#&c4R#4!x4EZ7j07cq`RaC1LNOQAa^fm;ck
z)KA>XmnadpvSK&^F`Oh~+(9kLBzp&P4yR@z_MM6AOe|1v@mvhj;=!<N7@sc*7Y@O*
zAT9m0xe)e8e>+9005eGJDG=4RO86%JA?MsbZ}#Rb#_=}e8=ka$^~zPocTb;p(b|h1
zwP^dEo4unr?Xfj)ynA@gth1NCIK6q!bgcPV;J>e8E$6YBEF2)B7b<XoR3uV?O+|oU
zOj4*U$w6vyz5vYw06b1T4FnJEDho=o4dy0*k_J#vKOofLq!duLElbE7i2Q)x2U+8_
zMvX@<Q@jLx$=+nE3i6%B>#!rRU$b2@KE3pc4S%_D%Z7D4L)yCCh=9L7E)Bw@+4<P@
zYd=v{_43Q!y36?R?zb=7ip=448~GTb7n-NfFi&yVQ&&XSG?YPemOLb8lg0S$7{A@A
zL$s4xuY1Lo0h=ek*bfJagh1$8NVq-49ek2;r}6!P1KTuh+X0Ja>^8pt#`w;-|M0ta
z|Ld;(#6PLuQuOP9rXi?Qk3+AdmFfy;!(x&u^z#_0#$f=oRTbOVIA|Q2J!tM(qZ?HW
zhBm1pZIW+qyI9I>`&3$Q(T*6~j~LSrgDj){_7?EgoBf{Y(`FIN!$y4yBeedjKBFC)
zcIY!5Zjv8uJ4Y&SdxJV#e5CC*voE5Tj|IJ)-;Q2{w)jgTY01b8km8s@OX0WZ1@a)A
zmQ6I3mI27Izp}ep&ybIjVv<iv0IMOpR!@RF!16Hl#@{5OYFD5t;8GQEwOQaw2-@Fz
znPhyq>Ecbd-+jfrRRQC3sb_!V+joqA8=6!P1<l4stX;j&YE_r7d+j#k)jMAA?C0q(
zw!PZ4fe(-3)siFT6Z#_X40nXdbu>$;#SY&nzyn>yW|P*o6vXltmRC3v$ctba9B4-#
zJK#Z(#*i1G?E#C{wpCjC^Jr-b(978k==5>)C&NM~`V;f``+NKwICk|vj}|nLA2}v}
ziDx}Tdx9^CePANtSL_2x-4ulH-Y-nYk{G6rK@;KYHnP<ug8Rf_6JqK|F|#j5PC8Oi
zVO7_B?B146A3c}n89%=M*`@3G-Rknimn@UNJmon6J!a9XP#wfNuw-B?@wEB`-fXAw
z#x-c#;L^}t$yg)QYEH6G#-`bHvw$tfVUg#Nucd)s$>$q3DaW|nSac5Xb-y&WZStw_
zrRi<EPSbuj^ksof(_C|Mbj=CFfN2{E%VLGemeYm-F(F=>3OH3xRveDCr7l5RN$}m9
zZCM@guh0U<jEjvV+9QSzZVv0Zm|$!nVGRKQl7&Px!4j732|{f_FC5SSfkixzTLI8o
zzEtHa_=Uzn)wu3C<2p#0ldmb2KaZ9_=BKjcqx=-Ts1?PbNqf<;w4=TD1P5v(Nf#wG
z-GS~kN$jyml$e-}i(-~zg<wQ9j(lmDDroRQjNnuWm*2(^_VZIE#6M@iPVC1TC!71P
z?Lj1I|JWX+IDm=RLWPD+Oh2}#i`s)`@KHPgE`)K$UyW~!Zw)vR$?kpcHCNpsjpr)3
z?KI;S<9l%Ye;K#&sXYGv_us#t+wOh;{d);NCXas=b7cp`_l>R=A%(%;TjCsyq%gQ|
zdsgoV61PtRwn*d>x7R%mperg~VYz~ZB9O*oqIHv0b`om+;giOXJZ|+x7hYieXwf3<
zjW>+86Vf-AoHhS4fvcI8jlh)$Yjz?FyGVliK!NeNFlA>pAuLxAeKJS~j+t~pGOc<Z
z&gsdZmqf)y`mfEUJ3u(l0LZ04`xO`TfOd!!_HWYceixlRYu<a}oqpGk|09$xdTQi*
zH@%r(&;hL`PCo`t)1eK_h^|~`$P}A-Kx<ltKx-PI)#T_fVrUsb`18bWEGH<IwZ&8d
z;sKd%17J)~BdUZ(li{NMf8H6CM>QHaOHzE^Ko?Gqk`kUqTQO)iBzXV*6HhyT>AG_R
z#l~C3zVjD;{@MjASDp8^Mf>EXCAS3&!yC@&d5PcaziPl)3s<#0CKt_{J9`DKp9zpt
zw_sk%5M2|si@~wh&MxL6v7CvrOc(LUOxVTRyVy!eLyNlD&N$L^AB?`_Ny{O28BbHz
z;&54Vi%CuQopGb>N%R$zq6~8v<Dzh$73PD3hJwBn>lytg>O6yKjQHyWiDz85{=5s$
z`^zcgBrp8*+pDhRl5uq7`3qKDeDjG@#=#TE?!KM>LtVFeX2ZC-Wy4<$@A+i)ihrn9
zb>VsQ#tfZS)&GM%e>-sA(nBiYAP4%$g_uv_Rac21g)Rc4sV2iN28X)3pVmUyBCMDe
zGI^-N^{A3@%=D_$j*&Q6jxyDlZX6^V$H_|NHEMq)_=FAZyAbnaZkW_4@73&Jm!>m=
zJnHaxqcLHxAR8)nH^MYQlnvP;><e^3Y+@xZxapEhcklw^G2@icX8eQyC_j2?(DoZ{
z*iPpkj4yZ!^$kH|aiZ@yM0|-|TNq-K-0m?whhrPSo#cC=9RazeaZMBnZU{?G9EKn)
zIRWkqRntbm%DeLJZq-FZXt)fJ*vSt@k5Gz9z;eWYF%`=nvf=tDtd2y;2I@4dSZwgU
z$K(U|ijGM>#CcoE#7Iu?o(I3aO8CB&E{U4FS5HuWvS^8WAA73g>(!#%f%5ph*vO#V
zvR7t%WHmlPY!n}+KqU%Nq8$BU!wB&MSnNpx7TPaJL~HO>L*9fufClm=kj%@TQn`AZ
z+tep{nQ<RD?RP4e>NjBd1@Z@{^5uiz`cItdW73Mn3iup|#5*msiJ=O~7hf(E8C@bt
zt(cM;GCKAzhyTqO%^SecUEt`W`95Q(@tN_NbVz!$?Ubanb!p3$650^h3x^HnEndu9
zFlvJn^QM^d2D>OpGMX$a*+peZ07x4)6F?HD9JFHR^}Lq~n_<0?U>t;AFhkmTYP7+m
zB=j)?bl*qx(IqCwL6<^Dg>payBBCyISYX^5uhkWzN0qdXDh?IW%LCpK(&n~R^2crG
zNjF`mR3F)X@~OilcVHud?$}Aa5%dR|7fnib>^HHEBV)Q5qhj@u!=BU|EUuPlPKIYn
zY%oCcur7zZ=kxFtR~VZ0*nyv(g-IK2OYqZdz_<~IM^h-_-*n?6izeJOxSs$q`Gn{j
zdcH7_DQ4d++P8H-7IuqjcCR{hj<v_J%AK)6V4UV4d?6P?8(e{ety_867`amIe&F9;
z8bhh{o;*R|j(LFWJh>>(D#Hu#HZS??4x4JdReDc)x2+SuIXBmsh59^FAYX~m%a9sT
z{mb4eE`)n4>W~5p;qul~OFs~Bc2ho;`dGd~yi67&6O}}cEa5UGR~TYuVjk0K1YmTN
z_<(0lT0U2eA4u-kg0H)jk&sYb*v6;_TWnj4(5(l4NG$NyuuXVqZ17;T$fW@fbOB+t
zDHl?hOsV-!y)%eR$qojw-)_|_kjW?Fj(0*3cXovx9@>5oPtO3mD1w!WeEg*@-3Lpm
zZUe>W2{2k=(RJ<C{j?LOsB0B$E@VvwTk}DnnP!-nJrU;Y+V79u-Y{m+2&@ji@}gIs
z{>GPPeCYI9%C4Gw?;|{aQ19U@Q*NI!jaTk`V8X}=1A3@d>%~)NKl8BBXZWVR1q~&m
z<~?vrb)VtE>qQv9#FhXb^=c}3a1O$>1meR9q=a}u@+#pYlP-ksM}<E~xF4X!k`Wo3
z6}MAQ1?bob>*S2Un-Ol!Nu~!~6`F|GEYMZjeG$JT#aUSDUBdlPSY-7?EvKe`VhPVH
z-!T5w0|#E7c12}sX~whx=T4fkr2o_mHMQ-5J_C(?Mw|Cr<Iw04n|Y|R>(1@o9go&l
zfsT4%|ME{UuT$IYD^uFpAqbXsTTIMtObh8?hd_)%J39oTx0v4E22n+J-}W{L(mqJx
zh}s~mxvUqreEr<2^CaVkrcviko3?EDByN{hU-Z}s<7X)$`zv0xbWs=vhjEJ^ydryB
zc=B-7V!3I-BF<s8B^vFAIdPwv6Y{5;;*sV=iOq>3=0vgma!$+%(X7GKbCT*No(oQ|
z*<DaMnC>N|6?Q*`=0tc>;DsPFAEqWx5M0cF?Gh$EZ@&-sjagsG3w}xqT|Vjg4|(47
z1-++cXHV&M&MY2*KZ4f{>?4i&>GMm5jpF$yw%!)1<gbKkAHO~di~K$2B@Mpou`KK(
z(sBX}3xPovuZ(z~g|_)B)^J|AmbqWId!SSa?|UYx5&1-47^?0;G!fICK8!k<0zxzo
zEgx7Ov0&i($$|(Lq$Dhpa02-PrUAa+#tlcg^nPpG1+sP3`7<vYGOEv^4c{6kco&J!
z9yzgb8aImnb>j`j_a9%YF5XhysikT#@5I+wQl>3jCHPGS06DHwOnD;<rwBa=qt{%B
zkF&vo6~va*G$5vyYbhdz08TB<8EhB(7EbY!mY6~S!QRCn4gm&Pt6i{G6Br>guIIEn
z%XA@T-16q*1tYqorIuw68uI$<#zA@ED=Qy*)?t57QAZA0`O2xk$O{F{3^0Z%$-r|K
zqR3Z9ZR!EwIe`Js$uO?lFl3W>ib;l*3RXrobr{rr&@u8&iYWuOvx$*8p?SlHxJOA&
zK=>bshiHYNDU2H{9IChrwq`e?aCBR72STb2xyV`j+g_0<Q4Kh>Z}OH(-$~>6j}4EE
ztn7E?*p=s2tRMIMA)Y^NLBA=PnN#|lGc!tF4a2vbeCe&v%8K6i2WFo=vuC{^v&wS*
zPOux18P-1{pp{gt84r1Lk%uWPWb!Xs^J)@d-{fDW?T*$w_!rENq%08sA}fZ2Y^W;0
zR7odl&#%Cd1Loe->YC5<Lsw0@=Skz>m@)lk<$yC?KXmMoV{I2n8!wt)Qhe%jtl_m7
z)NL3K`BS1=L>PhOh&*jC>S4W$g^W@NhACT#MUq!ytr;q+)SZ0J((?lneUR`wjA48?
z+D!taRm_}Tg*-J*@<WPQhQk_uE6gz<g+zCXiPhY}sDV;8T~$@+MTD4<f<80R*CoAs
zJui5%rMT}upgcE!q^e^lC^Jv)c>Fb+di=fj2**o+<4Nc{9=jqF$FR%LLjEnIjD?8k
zH;gh%czz!)^9ExV-)3mW+e6jVQ-9*u8lJX2{8^(r^>YSynPxw~Z^8nO)YPBE3w>gI
z>Kd$p0(P$XobJpd`wLM%i83udq+?BJUTj_p1^pKQ=@R&Tfm1}I2#dN1iPW9AQv`}A
zppBYbt7W-B7g{FymNXY!r(WVkFwFqQn0drUaxKODJwq+Y?I~voPm1q)^I7w*Dh%#g
zu<KFd;OJ4kCTB>-hoeV#Z^}~Yt{geOdCJ6@pR|IOHmsjpUFpe4Y^#+vtes!h=@edW
z;_MvEK{{acP@F)F&QC)~0xo8<0EG+KI*_<03Xp>U0toF0z2neb=Wu62w;eNYf5iA;
z%$Pp2{7T)8W1HXlv~9k0&GH$QC8xd-G%4g&J;wAadk=7~r_zZ2*xnP1{}GavL7bk6
z|A|FD_T!0PpWsg8o3Bs6HIX-O`MLAYUV83)$?g4?R~aw=%ln=23J-mE)t;8Wc(*<D
zFlm&~ZH(y(jVr3#oK|ZR1TRhiFFr#Xq~^qQ8y9$kJE*ySsoUV4BS8t!Z4%)9h8#6n
zq0VEv4K#CsLU&BJN#h-K8>_40(n<Rc9eRHJ#`26Q{m-5?cYfa~8OC(W`xir{doIGf
zCyax=d$#=~?dwu;=T`6ak9P}3aST|J&cGtvi=+-D30TOh(vHKogN5`o=mcPL@FJbo
z2^{Tp0%Gf4A_M3IwvIXhSb4w&i_vMP_8FaE(&oyHe;WrY){QlFg8JsHtjWDk>ja~Q
zUh;FHWa-h1nDw0%UHIXOu6x0(#X6N<04zzdX#IB6;2>Qd5jUoxln9u1z<QENwV+p0
zUZRXSy5Qs@M0vQdv=RzejY=u-<ebxIT#8b+Yy32;#b}eeRkjrn4mrN6bWDC5{g$1H
zb+Z1_rb7gqiL$6oC#{`L$1S3zW2PLKalAh0{=$}nIIXZ8kF6%zbM{yqE{coR3fy{f
z9?=QKMgPK}BZvaJi5U(3+XfvqPbGs+y~G{zf{A0sPr2yvXOBPg%9`_G&-v%LQ3D&s
zuYdmOpI>?RqLsWsoj9^jO~rup!W%aJ>6w{R|D;;fJ`Dpy!QN@bH*Vhk7+*Ahqp+(d
zM2<;UTlztdna;u<(!}E7Y!_0=V(K#1U@RsQ(fC|Dt<S`qJ|dQ1#6+fun8-8wOgu?W
z=mm@db%Z_xx*;7#=*Ff>R#@dq*unE2ez>Z{mz$DWI=1rK+n~?zIOE4x+TQEk&7!`Q
zlyql{RE)Wr4;?sFsRN%I3MofAmoSYA0}-)uG7y=Pyn}&=#JDgJK|O(vNG=JL7ODu%
zBAG|JIvKJ}Rkv_H&l@pj;A}t7|28Lh!`$6Z^5>;xZGYN2zpPaDoP2KA#Ho-joH@aF
ztr$-n`Buow9|nVo*^5kbKs%d|2R0$vf;)NTLmo9b%qxv;MypcS)--#zbl1t}OnS_M
zE#oP)nS|&&q2QCwLe1(53_`RF%m6cn#Tk}jp$st6hyx}X8Ale+yhMHR>6g_FJk$8{
zyM5}uf1#hr(j9G$(%mPYla{n?qw#w%ejECVKW(3hgJm`b0u)%`Nipp+Fu!A?2ICC+
zAsdZ@d-xdRQ9k%q^-ez2cnq0`bzRDne8%0pv8}c3Lw=S)Y8d*lKo51HA1~g&48vH1
zXdKX(z!kYbQpz>UeqHsolFoT1yarTb8q<I{;EniAOnL0hExhjGc=a{-(uZ`}v7?}O
zS#Cmh{NRz^T)=sG4@o<jzkFxB;~hyER7GE<<M8n_`BgDjzp&pBV*gwF%`n8cCCD?u
zh*R&A?)&(zwh@O-_$rL+q;+afyk%KoM#+$S(u`4oE|&~l0<LTdOi89KzZ29)J``Ng
znxFt7giIlFg2MZ;TM>q91hA2qtC%$Lj;CwJ4{Vw=scGQ&ny2rWD5?7v&UtC~*VQ-Y
z>|F8Eyj#l3Z<+hjik&$-s!!~GY1SeE>y-$HT_J2fxn>M`R9B)`n-EbSJ;h>!@q*Bm
zpBdk(kN?ycc*+GV%VV(k%Jq~eEb@N%k@XC~0;Q2)$shw4i3#ix%`GEXuK>jyIz>N;
zU9gt|@c>!w_<_w+r#1tOr|z84+&tmVr(P5w>?$j}Wj=v$bM@D|Uz)RU-=bMB?LJYB
zvCQYIm1pEy>=VZ_P>C+bx9*9P@xGAmB>zV`Nd$Vqh+e&bt2Z8D&k5$s78w{|JmO{%
zDo@-t1#e>NEDc5$88%uy9%cxjUc6J`Ga0W>sJ&pm6k<C6{>#Q*JG^pOX>jOE`laKy
zjqEzCwCf<g_ttm&^(`x!Hzebh4|)$QEuK3FW9$`i$j2>(ESD{1nDZ8|c(F!HEN`(y
zU$MakHfkGz%*}z!Re~+q=Acy(x&&j1<_PNPz%5WrTifg$j51NElU};a@<WUyy2AF<
zbP^~Q?A;LwNz~KTZN50;HA5c+!iCu(MZ7vwDE0c}trsr8-T3OX(ZL~0cW!>+txsTd
z_>h;Se9)Tz&JCxH4weo3^1uC*+*q_`U=C6)hQA}1UCY9mBpb4zDW?U)D)~7Qp=l%v
zBYz?^4ZJ0msUk+!4WWTb$xx>OxFn21VaZKfEeXmMely{imz-LFoFOT26h!SY$#gS?
zy!NJQLR)@;3^x>Ngd*t<iuq6xjK{#2P!!!F7l~;+{o)XXKw~nkI8}uZ(N)xZqwSj)
z-~CcS=tuLQfurqwmT{NTqej|yD$`zGu1Ld=?0@sbM-QvhC!e=q|B>+{x78j#9Diry
zOu!GP0OD9Q$i@{WFE;%FN~p!<PGSJo9@6nj5LS1KH$@bvAraAK1N4xSN&8_4&?&+_
zE*MS}+s#CnW-!^|B;iC)@*?L7((WJC0AAEK4M^MDrbAvpBOE5MB-4??`|wm1KCOCV
z{ddOSd4J>Y#zEtLJ{HLV!}Tt>vb)`J;qAs@?!W!QJIIm>-<9QK%QMUYXsXx)ro3uN
z67N9@yKjqET(^Wu;t(6z5;E_UglOhU$}z#2`Qk>Vc_Uv~n)3am5_A&_(R@LVUfuyg
z(_2sUPGzxE?*j4;1Y0W1f}EgM;ndxz5e;pt2JBs6EO;m`$t&k)hM*=P#20TvJ*dXJ
zb6E7%9pUa3kv_~L-Uu*X2#CHImBjOer7%YRAzuo;C^doa;KjU%?}U@-eS}iZT+Jtb
z{~e!b-1FTJ#=S@WvFm1Ck*=CFY3l6RQztcDB`Mm?yZ#})$GdaQ7;QXjJY$UHVcr9=
z9oO>ti0rVENHhL%{{8!RUad|YzvbMO%Pt!`UA^{Z@evWu{^##xD8HDWAl^ue#tr_~
z3_%Rj3{{#FQ7LAq60SzAIM|ZjUEE6-_hRp={c>i4=0t>oTF^<c_*!+aCEqN|3dZIQ
zw(NFuMDMPZ2BEQvIf5RW@6!C3rb^l&<ke~+R|_VK`ANm??lxap`<)qsqa_v>Ota<l
z=Kb13`^WRf3wYYKf32&jtFqc}j8pmz-*M@nStDnx|4$Rw)+{${zNl_uPWHl~HJ$o+
zo!&8>yAA4ZJiy=WQ8Ty>>wOt~2<wCop~#fuzvV;FWinz&=IbdLJmBNYp63H3<CyX(
zx2wh}wDUiwga1R%B3}3!sY!WD?&%!JHonKkhUzJ{_&TY{@|s!p0Gm6vo@Bz6@-}`6
zc%lMtiSXigct1_S=8RJ8{WK4>i@DqI5aa%~!wi3%?L_wKSR3R%?$AcZciciQdFKyv
z<!yKeyUq9nO<-)RkbT&qA?|tg7ZmrrnqyOp@---bN|aylA(dai%S4}-@?+9$#SVK!
z7p6JNTNLr$RrJImuSu7%`B)tEBlAR29pZJL_U~R^y8fI+>(?z@xL$gB((H@Z&Y3i4
z&4r?0DAX2gpQ3Tth`gmQ98)~DJWceEFa05w>RDJ~FJs{%lBF<ohY|24Len8Vi|i06
zY2x*2gg@ZTYEfXmR4uGiu+DZyn3akhW){pi$*I9$IIA<U=PZ(%DZy~(EXs9;m?aw`
zthP+|7h#3wi!E4QErb<vhyj7oKS8Jup{hJGGSdr0r;W@))<E90+oZ9ce9-po+j-e{
zJ(l(NR-Ie3;!=K}F^<xuE9(}AytS))eUE_iqt{<^eZp5f%b9f4>DjR*30d35tuEIm
zNlu>lsg3L})8)S?voQBo$f50!LWBUGfVa$TVnV`}Bu@~4QF*LLTq78Z-rc7d14vdi
z_D<k$hZ$%V5lhwLGufKYsXHNXl0;4jTXGoa6i{Wpf3e3A@AiUukw!(1)I1k=i47I5
zim;)wx~B837jNSecb>1VykVU>f5;-$GHCvMk`KmkDa*KqpWXHePv^!_-kIYY$ymoy
zll->a6Oz{#i=5XvX{}`IjS^PCyIt-pHGTRi>f=wTQEE`1VILY$YEHgDNze|h8TQkX
z%iPnFdVJ4vfJgj^?_EdFumE>ge}os8<4Y=%xGkPhZ#1ySv!+FML=LJyn!QBt(rJ@)
zoW7HQX+Z!K$7fumGPX&sXICgsvkGM|TVQEr(=2^4`;W27((`PMw2$S;O{`Lx!fGTZ
z>n*PVoa5Lwxi<2xaxI&N^fFQt(qyC>q;rv|d=OFt(l}`#+a?9sQpLl%DL1ptN-jHJ
zZexCH8tZHEF}Ed+ZNhn$Wf<F}EHjg39P)QyyiM!|<y@9eb(E!SlllYdqTI5M%@EJs
zVxE<6*#z{JV_C~qqAjZx-`T@C2g$DdiH(rz(C0KJ;hZ2}%u40$j7xW7Ji}S7vXL!O
z{Hzzw{giUnPkNDM;CcYkd?}Bum2x6Glp$;hU8~1YcOyGT)TQU}jP!<hz8<(rpl6g6
z=CpjmvT*hwS&)WFx3db#%C5vY*HVss4sZ`#^a9SCm7^?09mpmSZs{z&%a+NAKEUj<
z*ja*8kl%@vW+wI)&JCEzDX4?zV##s|yGGpvK3<N#%D{IQf^ROuJRV_}TE1r6=oxB9
zX=a14U6~HtZU+t0AAR$Qj_HtQYotV}MQ)ZalJAq>SM17gWr?y?(UiTGL`#ijhnlX=
zR3Eo?wJx$6w&k{qZI|0_wLN1y5ZBA@w2!kt?kIN5cI<NOj~^btG5*&0&l9o}`X_8j
zcp))8acbf-Nu87KOFHOGcQ!bma{k~dc1>_?bY10o&UMK3Z+D7&hez_v^Sqi|k-Xk3
zd53yecw4-mrzj~aQug}deM@}@Qj=4!O8p`&nAV)OJ?*)4TY9(ji_&jO|2U&7j$1Qx
zGdE||Wi@7}XZQM@qd9wZ_I25}X5W|nYW9ijQ#rPrnw-Jnc-dd?Z}iUvHfVir!dkJw
zRw84CA+CaU2M}s=k*B*hCa#n?T=zmkDXux{_ljOis53NrEhFB)A$qN#rRmXY3#>jX
zqSq?QcSWyXV2jv8h#*~z^K#~Avk^<T90^g$C|iPWNiBu9>nt`;+#Q6n#mFsSb5J7)
zt3)M^29(W2T8`8gX#rX}A2nuT<Yv3=YxqysnSeS=*)p_GwftzQ3tEgF-G8TtveVCx
z!>H!tdH?Bt{OEUvC^-vlFB0t&JaaH2KgP2PzsvCyjs6VGW8uL$4=pXlF$bgfBPzN5
z(~D8w1(=WWzsT8W?YI6mp^)ZJW(ww0g(Sjjn}{KDV6GA{FZ4w*7v2x?AU?~BIq>02
zWNC;*$zYlAq-G-~!Vi02F7%&#c$EtA6}4i#N8MR`L#+%WC>Qt+;_aWV*lBe`OivBI
zj8F%iz6avUdf`36de#Tn=?8im0Qd&sdtO688N=9c_$f!SQR2H|^zHa@_^#IkM1VHp
z?czy{z8yaW-@Kd#YMB88?MD312G_7ZL4Vr9uHXtxVk&khHXesp865Z$Qvyt8N!-a@
z@Coe!^*oF(F+IpGWxKf>w!36@Is2M>t>-P8Us2JgB6{vm=U_#J$m3iY%?G3BQ1sk2
zdajC|yG75{(Q{4oTpK<2G0&CJb}K9GbLXFR-qJa<XDpj%-U<#h&s77J0p~4UOql@~
z2V;-$$R!%Tf(_GbqZ@V3w>Iem>HANb6CaOCZotLGO<DL@Q*$HYe*6P8xun15@DF&5
zDG2J5pfMnC_YVj=HbygX$k?YxGd5)6g3*i>8C$1lMn%TDGn%m=qxzzmc(e72SnCP6
z89yz0GZC4D95aK@7eoi-L21$s3AV<8D=;26vK~AU&AO0vk2#%nBJ1jLI-5-0C9RF1
fyJ&qcDkNWdI-7#5cl7D3580INv22r;T*Cer*7v<D

diff --git a/app/webroot/css/fonts/roboto/Roboto-Bold-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-Bold-webfont.woff
deleted file mode 100644
index 3c5926be759ddcaa891eda980607d2155edbbacf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14940
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
U6<q9WXE7)pUl*Zf5diT20NRmt82|tP

diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.eot
deleted file mode 100644
index 14062404db8f7e0c7e798cd7419dca87cb602f43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26100
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
Pn+OPvha1&|0>=Iq4%NFY

diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.svg
deleted file mode 100644
index fc9e5cb09..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoBoldCondensed" horiz-adv-x="1075" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="453" />
-<glyph unicode=" "  horiz-adv-x="453" />
-<glyph unicode="&#x09;" horiz-adv-x="453" />
-<glyph unicode="&#xa0;" horiz-adv-x="453" />
-<glyph unicode="!" horiz-adv-x="508" d="M114 504v952h283v-952h-283zM116 0v253h279v-253h-279z" />
-<glyph unicode="&#x22;" horiz-adv-x="783" d="M133 1178v278h219v-266l-94 -251h-123zM451 1186v270h217v-266l-94 -251h-122z" />
-<glyph unicode="#" horiz-adv-x="1050" d="M43 410v163h215l45 303h-195v164h219l61 416h172l-61 -416h143l62 416h171l-61 -416h189v-164h-213l-45 -303h193v-163h-217l-60 -410h-172l60 410h-143l-60 -410h-172l60 410h-191zM430 573h143l45 303h-143z" />
-<glyph unicode="$" horiz-adv-x="1069" d="M96 435l2 5h274q0 -131 47.5 -187t127.5 -56q74 0 109 50t35 133q0 85 -35.5 134.5t-127.5 98.5q-200 78 -295 177t-95 283q0 167 96 274.5t260 126.5v211h145v-215q157 -26 246.5 -141t89.5 -302h-281q0 111 -38 170.5t-105 59.5q-70 0 -100.5 -50.5t-30.5 -134.5 q0 -78 34 -125t131 -102q194 -72 291 -176t97 -287q0 -172 -94.5 -275.5t-258.5 -122.5v-198h-146v197q-168 19 -275 129t-103 323z" />
-<glyph unicode="%" horiz-adv-x="1376" d="M91 1099v77q0 129 75.5 215t211.5 86q138 0 213.5 -85.5t75.5 -215.5v-77q0 -129 -75 -214t-212 -85t-213 85t-76 214zM276 1099q0 -59 27 -99.5t77 -40.5q48 0 74.5 40t26.5 100v77q0 59 -27 100.5t-76 41.5t-75.5 -41.5t-26.5 -100.5v-77zM315 183l612 1138l134 -73 l-612 -1138zM713 280v77q0 128 76 214t213 86q138 0 213 -85.5t75 -214.5v-77q0 -130 -75 -215t-212 -85q-138 0 -214 85t-76 215zM898 280q0 -57 30 -99t75 -42q57 0 79 38t22 103v77q0 59 -26.5 100t-75.5 41q-50 0 -77 -41t-27 -100v-77z" />
-<glyph unicode="&#x26;" horiz-adv-x="1236" d="M59 388q0 119 55.5 205t169.5 181l8 6q-60 91 -89.5 166t-29.5 153q0 182 97.5 280t266.5 98q144 0 235 -97.5t91 -237.5q0 -104 -36.5 -179t-109.5 -136l-95 -74l234 -304l6 1q27 52 43 118t16 140h224q0 -141 -32 -257.5t-100 -206.5l188 -244h-320l-66 86 q-77 -54 -156 -80.5t-171 -26.5q-196 0 -312.5 113t-116.5 296zM344 404q0 -89 45 -147t116 -58q46 0 92.5 13.5t90.5 39.5l-264 345q-46 -50 -63 -97.5t-17 -95.5zM423 1103q0 -40 17.5 -83t51.5 -93l54 40q50 37 67 75t17 84q0 53 -26.5 91.5t-74.5 38.5 q-49 0 -77.5 -44.5t-28.5 -108.5z" />
-<glyph unicode="'" horiz-adv-x="411" d="M79 1175v281h251v-268l-94 -281h-155z" />
-<glyph unicode="(" horiz-adv-x="637" d="M110 567v24q0 384 133 659t300 357h6l50 -139q-108 -98 -182 -320t-74 -555v-28q0 -333 74 -554.5t182 -321.5l-50 -137h-6q-168 83 -300.5 356t-132.5 659z" />
-<glyph unicode=")" horiz-adv-x="637" d="M36 -311q107 98 182 320.5t75 555.5v28q0 332 -76 555t-181 322l52 138h6q170 -81 309 -362.5t139 -654.5v-24q0 -375 -138.5 -654.5t-309.5 -361.5h-6z" />
-<glyph unicode="*" horiz-adv-x="780" d="M44 743l50 161l214 -78l4 255h165l8 -264l205 80l50 -163l-207 -82l120 -208l-134 -100l-134 211l-131 -204l-135 97l127 216z" />
-<glyph unicode="+" horiz-adv-x="1010" d="M53 560v246h317v400h267v-400h314v-246h-314v-414h-267v414h-317z" />
-<glyph unicode="," horiz-adv-x="495" d="M58 -305l61 317v234h274v-242l-146 -309h-189z" />
-<glyph unicode="-" horiz-adv-x="782" d="M133 514v221h506v-221h-506z" />
-<glyph unicode="." horiz-adv-x="545" d="M126 0v253h278v-253h-278z" />
-<glyph unicode="/" horiz-adv-x="722" d="M-12 -125l442 1581h277l-444 -1581h-275z" />
-<glyph unicode="0" d="M88 528v399q0 255 123 402.5t326 147.5q202 0 325.5 -147.5t123.5 -402.5v-399q0 -257 -123 -403t-324 -146q-204 0 -327.5 146t-123.5 403zM371 505q0 -147 44 -226.5t124 -79.5q77 0 120.5 79.5t43.5 226.5v447q0 144 -44.5 224t-121.5 80q-79 0 -122.5 -80t-43.5 -224 v-447z" />
-<glyph unicode="1" d="M191 1204v217l549 56v-1477h-283v1211z" />
-<glyph unicode="2" d="M77 1011q-4 195 118 330.5t326 135.5q207 0 320.5 -114.5t113.5 -311.5q0 -133 -65.5 -245t-219.5 -299l-198 -287h526v-220h-892v188l403 509q86 116 123.5 200t37.5 153q0 95 -36.5 150.5t-112.5 55.5q-79 0 -121.5 -70.5t-42.5 -180.5h-277z" />
-<glyph unicode="3" d="M84 393l2 6h275q0 -85 48 -142.5t121 -57.5q86 0 139 59t53 151q0 118 -49.5 173.5t-143.5 55.5h-147v214h147q86 0 129 55.5t43 153.5q0 83 -45 139t-124 56q-65 0 -109 -49t-44 -128h-276l-2 6q-5 172 121 282t310 110q207 0 330.5 -107t123.5 -305q0 -101 -54 -185 t-147 -131q105 -43 162.5 -131t57.5 -213q0 -199 -133.5 -312.5t-341.5 -113.5q-181 0 -316 107.5t-130 306.5z" />
-<glyph unicode="4" d="M55 493l538 963h285v-914h139v-222h-139v-320h-284v320h-525zM306 542h288v526l-6 1l-26 -58z" />
-<glyph unicode="5" d="M100 378l2 5l274 14q0 -94 46 -146t121 -52q87 0 125.5 68t38.5 198t-43 205.5t-130 75.5q-69 0 -106 -32t-51 -88l-253 17l76 813h746v-227h-514l-35 -353q37 31 92.5 52t118.5 23q184 3 283.5 -125t99.5 -359q0 -214 -109.5 -351t-338.5 -137q-184 0 -316 107t-127 292 z" />
-<glyph unicode="6" d="M84 558v315q0 276 149 440t381 164q77 0 140.5 -15.5t129.5 -46.5l-49 -209q-58 23 -106.5 34.5t-112.5 11.5q-112 0 -181 -97.5t-69 -275.5v-44q51 55 122.5 85t160.5 30q168 0 261 -133t93 -349t-124.5 -352.5t-323.5 -136.5q-209 0 -340 155t-131 424zM366 554 q0 -169 51.5 -262t137.5 -93q75 0 120 77t45 192q0 124 -45.5 194.5t-121.5 70.5q-66 0 -113 -23.5t-74 -65.5v-90z" />
-<glyph unicode="7" d="M66 1235v221h932v-221q-218 -269 -295.5 -504t-77.5 -553v-178h-284v178q0 307 98.5 561.5t286.5 495.5h-660z" />
-<glyph unicode="8" d="M77 406q0 118 65.5 209.5t179.5 140.5q-94 47 -147 130.5t-53 191.5q0 192 119.5 295.5t310.5 103.5q184 0 298.5 -103t114.5 -296q0 -108 -51 -191.5t-140 -130.5q109 -49 172.5 -140.5t63.5 -209.5q0 -203 -128.5 -315t-328.5 -112q-208 0 -342 112.5t-134 314.5z M361 419q0 -101 54 -160.5t138 -59.5q75 0 124.5 59.5t49.5 160.5q0 99 -50.5 162t-124.5 63q-83 0 -137 -63t-54 -162zM406 1065q0 -91 40 -145.5t107 -54.5q59 0 94 54t35 146q0 88 -35.5 139.5t-94.5 51.5q-68 0 -107 -50t-39 -141z" />
-<glyph unicode="9" d="M81 971q0 216 125 361t320 145q199 0 326 -148.5t127 -411.5v-394q0 -249 -139 -396.5t-351 -147.5q-68 0 -141 16.5t-136 46.5l47 205q56 -25 109.5 -36.5t120.5 -11.5q90 0 148 81.5t58 225.5v99q-43 -61 -101.5 -92t-124.5 -31q-181 0 -284.5 132.5t-103.5 356.5z M363 971q0 -126 40.5 -203.5t117.5 -77.5q57 0 101.5 28t72.5 75v174q0 141 -46 215t-122 74q-74 0 -119 -83.5t-45 -201.5z" />
-<glyph unicode=":" horiz-adv-x="540" d="M126 0v253h278v-253h-278zM126 876v253h278v-253h-278z" />
-<glyph unicode=";" horiz-adv-x="517" d="M127 876v253h278v-253h-278zM109 -305l61 317v234h274v-242l-146 -309h-189z" />
-<glyph unicode="&#x3c;" horiz-adv-x="910" d="M49 435v222l749 366v-263l-497 -213v-6l497 -208v-264z" />
-<glyph unicode="=" horiz-adv-x="1036" d="M120 329v223h783v-223h-783zM120 760v223h783v-223h-783z" />
-<glyph unicode="&#x3e;" horiz-adv-x="921" d="M107 63v262l501 215v6l-501 209v262l755 -365v-223z" />
-<glyph unicode="?" horiz-adv-x="907" d="M25 1078q-3 195 113 297t302 102q201 0 316 -114t115 -310q0 -126 -64.5 -233t-162.5 -181q-53 -46 -70 -94.5t-17 -131.5h-282q1 136 39.5 200.5t148.5 158.5q57 57 91 124.5t34 154.5q0 94 -38.5 148.5t-109.5 54.5q-56 0 -96.5 -47t-42.5 -135h-274zM275 0v243h280 v-243h-280z" />
-<glyph unicode="@" horiz-adv-x="1642" d="M57 478q16 427 230 681.5t567 254.5q348 0 534.5 -241t172.5 -657q-9 -220 -117.5 -378.5t-324.5 -158.5q-73 0 -125 45t-73 126q-39 -84 -97 -126t-133 -42q-129 0 -198 119t-52 315q23 252 130.5 404.5t259.5 152.5q107 0 171.5 -26t143.5 -81l-2 -3h4l-46 -570 q-6 -99 10 -134.5t44 -28.5l6 -1q99 -5 159 105.5t68 281.5q14 353 -121 550t-418 197q-271 0 -431 -212t-173 -573q-16 -353 129.5 -560t417.5 -207q76 0 157.5 19.5t139.5 49.5l35 -144q-61 -42 -154 -65.5t-181 -23.5q-359 0 -553.5 249t-179.5 682zM658 416 q-9 -128 15.5 -196.5t78.5 -68.5q48 0 87 29t69 106v7l40 500q-19 6 -39 9.5t-41 3.5q-97 0 -146 -96.5t-64 -293.5z" />
-<glyph unicode="A" horiz-adv-x="1141" d="M18 0l413 1456h292l413 -1456h-295l-83 315h-364l-82 -315h-294zM452 537h248l-121 462h-6z" />
-<glyph unicode="B" horiz-adv-x="1142" d="M112 0v1456h417q228 0 355 -99.5t127 -297.5q0 -103 -46.5 -183.5t-137.5 -119.5q122 -25 181.5 -117t59.5 -215q0 -209 -121.5 -316.5t-346.5 -107.5h-488zM394 220h206q92 0 139 51.5t47 152.5q0 104 -43 161t-134 60h-10h-205v-425zM394 840h148q91 2 139 51t48 142 q0 104 -50 153t-150 49h-135v-395z" />
-<glyph unicode="C" horiz-adv-x="1133" d="M85 511v432q0 254 133.5 394t360.5 140q239 0 367 -116q124 -112 124 -337v-14l-2 -6h-274q0 140 -49.5 196t-165.5 56q-106 0 -159 -76.5t-53 -234.5v-434q0 -159 57 -235.5t172 -76.5q105 0 151 55.5t46 197.5h273l2 -6v-15q0 -223 -120 -335q-124 -116 -352 -117 q-235 0 -373 138.5t-138 393.5z" />
-<glyph unicode="D" horiz-adv-x="1173" d="M112 0v1456h449q228 0 377 -170.5t149 -437.5v-241q0 -268 -149 -437.5t-377 -169.5h-449zM394 220h167q109 0 176 108t67 279v243q0 169 -67 277t-176 108h-167v-1015z" />
-<glyph unicode="E" horiz-adv-x="994" d="M112 0v1456h813v-221h-531v-372h445v-220h-445v-423h533v-220h-815z" />
-<glyph unicode="F" horiz-adv-x="994" d="M112 0v1456h832v-221h-550v-406h462v-220h-462v-609h-282z" />
-<glyph unicode="G" horiz-adv-x="1178" d="M83 507v442q0 252 138.5 390t366.5 138q238 0 359 -113q117 -108 117 -307v-13l-2 -6h-265q0 114 -50 166t-151 52q-109 0 -170 -76t-61 -229v-444q0 -156 62 -232t177 -76q82 0 129 19.5t72 51.5v294h-222v195h504v-567q-62 -87 -179.5 -150t-303.5 -63 q-236 0 -378.5 137.5t-142.5 390.5z" />
-<glyph unicode="H" horiz-adv-x="1257" d="M112 0v1456h282v-629h469v629h281v-1456h-281v607h-469v-607h-282z" />
-<glyph unicode="I" horiz-adv-x="538" d="M128 0v1456h281v-1456h-281z" />
-<glyph unicode="J" horiz-adv-x="994" d="M28 426l3 6h273q0 -119 45.5 -176t118.5 -57q59 0 96.5 68t37.5 186v1003h282v-1003q0 -217 -116.5 -345.5t-299.5 -128.5q-206 0 -325 114q-115 110 -115 319v14z" />
-<glyph unicode="K" horiz-adv-x="1142" d="M112 0v1456h282v-596h58l309 596h350l-420 -665l451 -791h-360l-311 611h-77v-611h-282z" />
-<glyph unicode="L" horiz-adv-x="994" d="M112 0v1456h282v-1236h543v-220h-825z" />
-<glyph unicode="M" horiz-adv-x="1499" d="M106 0v1456h367l271 -1080h6l273 1080h369v-1456h-280v917l-6 1l-263 -918h-189l-261 911l-6 -1v-910h-281z" />
-<glyph unicode="N" horiz-adv-x="1256" d="M112 0v1456h282l462 -930l6 1v929h282v-1456h-282l-462 929l-6 -1v-928h-282z" />
-<glyph unicode="O" horiz-adv-x="1230" d="M85 524v406q0 256 143.5 401.5t384.5 145.5t386.5 -145.5t145.5 -401.5v-406q0 -257 -145 -401t-386 -144t-385 144t-144 401zM366 524q0 -162 62.5 -243t185.5 -81t186.5 81t63.5 243v409q0 159 -64.5 240t-186.5 81q-123 0 -185 -80.5t-62 -240.5v-409z" />
-<glyph unicode="P" horiz-adv-x="1142" d="M112 0v1456h487q219 0 347 -128.5t128 -336.5q0 -209 -128 -336.5t-347 -127.5h-205v-527h-282zM394 748h205q95 0 144.5 68t49.5 173q0 107 -49.5 176.5t-144.5 69.5h-205v-487z" />
-<glyph unicode="Q" horiz-adv-x="1261" d="M85 524v406q0 256 143.5 401.5t384.5 145.5t386.5 -145.5t145.5 -401.5v-406q0 -100 -23 -183.5t-66 -148.5l177 -202l-182 -148l-173 194q-58 -29 -124.5 -43t-139.5 -14q-241 0 -385 144t-144 401zM366 524q0 -162 62.5 -243t185.5 -81t186.5 81t63.5 243v409 q0 159 -64.5 240t-186.5 81q-123 0 -185 -80.5t-62 -240.5v-409z" />
-<glyph unicode="R" horiz-adv-x="1130" d="M112 0v1455h436q217 0 341.5 -113t124.5 -315q0 -113 -52.5 -196t-151.5 -132q114 -38 164 -126t50 -220v-106q0 -61 14 -128t50 -98v-21h-292q-35 32 -44.5 104.5t-9.5 144.5v102q0 111 -46 172t-132 61h-170v-584h-282zM394 804h152q91 0 138.5 54.5t47.5 154.5 q0 102 -47 162t-137 60h-154v-431z" />
-<glyph unicode="S" horiz-adv-x="1107" d="M76 446l2 6h275q0 -137 55.5 -197t163.5 -60q91 0 136.5 50t45.5 133q0 87 -44.5 137.5t-159.5 98.5q-224 79 -337 179t-113 280q0 179 129 291.5t329 112.5q212 0 341 -120q125 -116 125 -310v-12l-2 -6h-274q0 113 -50.5 171.5t-144.5 58.5q-81 0 -126 -53.5 t-45 -133.5q0 -74 51 -122t175 -105q211 -70 319.5 -177t108.5 -288q0 -187 -127 -294t-337 -107q-207 -1 -354 115q-142 112 -142 337v15z" />
-<glyph unicode="T" horiz-adv-x="1014" d="M30 1235v221h958v-221h-342v-1235h-283v1235h-333z" />
-<glyph unicode="U" horiz-adv-x="1229" d="M102 505v951h281v-951q0 -149 62 -227.5t169 -78.5q109 0 170.5 78t61.5 228v951h282v-951q0 -248 -142.5 -387t-371.5 -139q-228 0 -370 139.5t-142 386.5z" />
-<glyph unicode="V" horiz-adv-x="1141" d="M8 1456h297l249 -1084l12 -61h6l12 58l252 1087h297l-417 -1456h-293z" />
-<glyph unicode="W" horiz-adv-x="1566" d="M18 1456h289l149 -924l6 -1l209 925h222l210 -923l6 1l149 922h287l-285 -1456h-262l-213 902h-6l-212 -902h-262z" />
-<glyph unicode="X" horiz-adv-x="1141" d="M27 0l371 734l-363 722h326l204 -515h6l207 515h327l-362 -722l386 -734h-341l-214 526h-6l-213 -526h-328z" />
-<glyph unicode="Y" horiz-adv-x="1141" d="M9 1456h308l250 -633h6l251 633h308l-425 -937v-519h-281v537z" />
-<glyph unicode="Z" horiz-adv-x="966" d="M62 1235v221h830v-137l-518 -1099h529v-220h-837v142l516 1093h-520z" />
-<glyph unicode="[" horiz-adv-x="533" d="M108 -337v2030h402v-211h-117v-1609h117v-210h-402z" />
-<glyph unicode="\" horiz-adv-x="765" d="M0 1456h278l523 -1581h-280z" />
-<glyph unicode="]" horiz-adv-x="533" d="M19 -127h118v1609h-118v211h402v-2030h-402v210z" />
-<glyph unicode="^" horiz-adv-x="793" d="M39 729l257 727h205l256 -727h-218l-137 424l-3 13h-6l-2 -13l-134 -424h-218z" />
-<glyph unicode="_" horiz-adv-x="802" d="M6 0h787v-214h-787v214z" />
-<glyph unicode="`" horiz-adv-x="633" d="M49 1512l3 6h312l179 -266h-246z" />
-<glyph unicode="a" horiz-adv-x="957" d="M47 303q0 158 104.5 245.5t312.5 87.5h123v90q0 81 -30 124.5t-89 43.5q-52 0 -79 -35t-27 -100l-272 1l-2 6v14q0 131 105 224q111 98 293 98q171 0 277 -98t106 -280v-444q0 -76 11 -144t34 -136h-280q-16 36 -26.5 78t-15.5 86q-36 -81 -94.5 -133t-143.5 -52 q-148 0 -227.5 86.5t-79.5 237.5zM328 314q0 -56 27 -91t72 -35q56 0 100 34.5t60 83.5v170h-123q-71 0 -103.5 -46t-32.5 -116z" />
-<glyph unicode="b" horiz-adv-x="1008" d="M94 0v1560h281v-574q39 56 92 86t121 30q179 0 271.5 -154t92.5 -413v-21q0 -245 -92.5 -390t-270.5 -145q-78 0 -136 36.5t-99 105.5l-19 -121h-241zM375 282q21 -41 56 -61.5t86 -20.5q89 0 121 80t32 234v21q0 163 -33 254t-121 91q-49 0 -84.5 -25t-56.5 -70v-503z " />
-<glyph unicode="c" horiz-adv-x="921" d="M53 526v29q0 240 113.5 393.5t324.5 153.5q176 0 280 -112q101 -109 101 -293v-11l-2 -5h-256q0 90 -31 145t-92 55q-88 0 -122 -89.5t-34 -236.5v-29q0 -151 34 -239t123 -88q60 0 91 44.5t31 127.5h255l3 -6v-9q0 -162 -106 -268q-108 -108 -274 -109 q-212 0 -325.5 152.5t-113.5 394.5z" />
-<glyph unicode="d" horiz-adv-x="1008" d="M56 514v21q0 255 95 411t269 156q65 0 117.5 -31t93.5 -88v577h282v-1560h-241l-21 122q-43 -70 -101 -106.5t-132 -36.5q-172 0 -267 146.5t-95 388.5zM336 514q0 -147 36 -230.5t119 -83.5q46 0 81.5 21.5t58.5 63.5v497q-23 46 -59 72t-80 26q-82 0 -119 -95t-37 -250 v-21z" />
-<glyph unicode="e" horiz-adv-x="937" d="M58 508v41q0 245 113.5 399t319.5 154q191 0 293 -131t102 -356v-154h-546q7 -120 54.5 -191t146.5 -71q84 0 140.5 19.5t121.5 61.5l73 -176q-58 -53 -156.5 -89t-211.5 -36q-214 0 -332 148t-118 381zM342 647h268v25q0 99 -27.5 154t-91.5 55q-71 0 -105.5 -62.5 t-43.5 -171.5z" />
-<glyph unicode="f" horiz-adv-x="638" d="M23 881v201h135v122q0 181 94.5 279t266.5 98q33 0 66 -5.5t76 -15.5l-22 -212q-21 5 -40 8t-45 3q-56 0 -85 -40.5t-29 -114.5v-122h174v-201h-174v-881h-282v881h-135z" />
-<glyph unicode="g" horiz-adv-x="1008" d="M57 514v21q0 255 95 411t269 156q75 0 131.5 -37.5t98.5 -106.5l19 124h245v-1076q0 -211 -123.5 -327t-342.5 -116q-72 0 -151.5 22t-149.5 60l47 214q60 -32 120 -48t132 -16q94 0 139.5 51.5t45.5 160.5v80q-41 -53 -93.5 -80.5t-119.5 -27.5q-172 0 -267 146.5 t-95 388.5zM339 514q0 -148 35 -231t119 -83q48 0 82.5 20t56.5 58v512q-23 43 -57.5 66.5t-80.5 23.5q-82 0 -118.5 -94.5t-36.5 -250.5v-21z" />
-<glyph unicode="h" horiz-adv-x="1008" d="M87 0v1560h281v-609q43 72 103.5 111.5t133.5 39.5q145 0 229 -114t84 -351v-637h-282v639q0 134 -29.5 187.5t-91.5 53.5q-49 0 -85.5 -19.5t-61.5 -55.5v-805h-281z" />
-<glyph unicode="i" horiz-adv-x="497" d="M107 0v1082h282v-1082h-282zM107 1345v215h282v-215h-282z" />
-<glyph unicode="j" horiz-adv-x="489" d="M-77 -419l13 217q23 -6 41 -9.5t40 -3.5q45 0 70.5 45t25.5 133v1119h282v-1119q0 -191 -91 -295.5t-252 -104.5q-35 0 -64 4.5t-65 13.5zM107 1347v213h283v-213h-283z" />
-<glyph unicode="k" horiz-adv-x="973" d="M94 0v1560h282v-888h46l196 410h325l-294 -488l338 -594h-323l-237 454h-51v-454h-282z" />
-<glyph unicode="l" horiz-adv-x="497" d="M107 0v1560h282v-1560h-282z" />
-<glyph unicode="m" horiz-adv-x="1530" d="M94 0v1082h263l11 -139q44 76 110.5 117.5t152.5 41.5q85 0 147 -44.5t95 -135.5q43 85 110.5 132.5t157.5 47.5q136 0 215 -114t79 -349v-639h-282v639q0 137 -29 189t-89 52q-44 0 -78 -25.5t-56 -70.5q1 -25 2.5 -43t1.5 -36v-705h-281v639q0 135 -29 188t-90 53 q-41 0 -73.5 -20.5t-55.5 -57.5v-802h-282z" />
-<glyph unicode="n" horiz-adv-x="1008" d="M89 0v1082h263l12 -151q46 81 112.5 126t148.5 45q138 0 216.5 -107.5t78.5 -337.5v-657h-282v657q0 122 -29.5 172.5t-89.5 50.5q-47 0 -84.5 -22t-63.5 -62v-796h-282z" />
-<glyph unicode="o" horiz-adv-x="1008" d="M59 528v23q0 244 116.5 397.5t327.5 153.5q210 0 328 -153.5t118 -397.5v-23q0 -244 -117.5 -396.5t-326.5 -152.5q-212 0 -329 152t-117 397zM340 528q0 -151 37.5 -240t127.5 -89q86 0 124 89t38 240v23q0 149 -38 239.5t-126 90.5t-125.5 -91t-37.5 -239v-23z" />
-<glyph unicode="p" horiz-adv-x="1008" d="M94 -416v1498h258l12 -111q40 63 95 97t128 34q174 0 269.5 -156t95.5 -411v-21q0 -242 -95.5 -388.5t-267.5 -146.5q-69 0 -122 27.5t-92 80.5v-503h-281zM375 277q21 -38 56 -58t84 -20q82 0 118.5 83.5t36.5 231.5v21q0 155 -38 250t-118 95q-48 0 -83 -24.5 t-56 -68.5v-510z" />
-<glyph unicode="q" horiz-adv-x="1008" d="M56 514v21q0 255 95 411t269 156q74 0 130 -36t98 -104l22 120h242v-1498h-283v501q-40 -52 -92.5 -79t-118.5 -27q-172 0 -267 146.5t-95 388.5zM336 514q0 -148 36 -231.5t119 -83.5q47 0 81 19t57 56v519q-23 42 -57 65t-80 23q-82 0 -119 -95.5t-37 -250.5v-21z" />
-<glyph unicode="r" horiz-adv-x="637" d="M94 0v1082h263l11 -153q31 82 79.5 127.5t111.5 45.5q19 0 35 -3.5t33 -8.5l-29 -252l-96 3q-47 0 -78.5 -25t-48.5 -70v-746h-281z" />
-<glyph unicode="s" horiz-adv-x="899" d="M41 332l3 6h256q2 -88 42 -126.5t110 -38.5q60 0 91.5 29.5t31.5 79.5q0 48 -37 82t-143 83q-165 62 -248 139t-83 198q0 132 105.5 225t279.5 93q183 0 291 -96q104 -92 103 -231v-13l-2 -6h-272q0 68 -30 109.5t-91 41.5q-49 0 -82.5 -32t-33.5 -78q0 -48 33 -77.5 t144 -81.5q171 -59 254.5 -138.5t83.5 -206.5q0 -138 -110.5 -226t-291.5 -88q-189 0 -299 108q-105 103 -105 233v12z" />
-<glyph unicode="t" horiz-adv-x="635" d="M11 881v201h131v269h282v-269h147v-201h-147v-551q0 -69 20 -98t55 -29q20 0 33 2.5t32 8.5l22 -208q-40 -14 -76.5 -20.5t-82.5 -6.5q-138 0 -211.5 84t-73.5 265v553h-131z" />
-<glyph unicode="u" horiz-adv-x="1008" d="M87 458v624h282v-626q0 -145 28.5 -200.5t89.5 -55.5q49 0 86 18.5t63 54.5v809h283v-1082h-231l-31 154q-43 -84 -107.5 -129.5t-149.5 -45.5q-146 0 -229.5 117t-83.5 362z" />
-<glyph unicode="v" horiz-adv-x="920" d="M13 1082h297l134 -682l13 -82h6l15 82l132 682h295l-308 -1082h-275z" />
-<glyph unicode="w" horiz-adv-x="1301" d="M25 1082h271l98 -606h6l157 606h183l158 -603h6l96 603h272l-228 -1082h-235l-157 571h-6l-157 -571h-236z" />
-<glyph unicode="x" horiz-adv-x="920" d="M16 0l282 547l-274 535h315l117 -346h6l121 346h318l-273 -535l282 -547h-317l-127 357h-6l-126 -357h-318z" />
-<glyph unicode="y" horiz-adv-x="920" d="M5 1082h303l136 -645v-3h6l162 648h303l-373 -1245q-41 -117 -110 -195.5t-211 -78.5q-34 0 -60.5 5.5t-74.5 17.5l34 207q11 -2 21.5 -4t20.5 -2q62 0 94.5 34t47.5 89l27 83z" />
-<glyph unicode="z" horiz-adv-x="920" d="M68 0v165l441 696h-428v221h760v-161l-444 -701h453v-220h-782z" />
-<glyph unicode="{" horiz-adv-x="593" d="M43 516v197q73 0 108 55t35 156v208q0 171 72 290.5t241 174.5l54 -153q-66 -32 -91.5 -111.5t-25.5 -200.5v-208q0 -105 -41.5 -185t-125.5 -125q84 -46 125.5 -126.5t41.5 -183.5v-206q0 -121 25 -200t91 -111l-53 -154q-169 55 -241 175t-72 290v206q0 101 -35 156.5 t-108 55.5z" />
-<glyph unicode="|" horiz-adv-x="469" d="M126 -270v1726h217v-1726h-217z" />
-<glyph unicode="}" horiz-adv-x="593" d="M40 -213q65 32 91 111t26 200v206q0 105 41.5 185t127.5 125q-86 44 -127.5 124t-41.5 186v208q0 121 -26 200.5t-91 111.5l53 153q168 -55 240.5 -174.5t72.5 -290.5v-208q0 -101 34.5 -156t108.5 -55v-197q-74 0 -108.5 -56t-34.5 -156v-206q0 -170 -72.5 -290 t-240.5 -175z" />
-<glyph unicode="~" horiz-adv-x="1139" d="M90 446q0 163 75.5 270t195.5 107q71 0 135.5 -33.5t128.5 -99.5q38 -47 68 -67t66 -20q39 0 67 53.5t28 130.5l193 -27q0 -162 -77 -271t-195 -109q-73 0 -134 32t-128 103q-43 46 -71.5 65.5t-64.5 19.5q-40 0 -67.5 -52t-27.5 -128z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1042" d="M53 526v29q0 223 98.5 372t283.5 171v220h184v-234q120 -38 189 -143t69 -260h-263q0 90 -31 145t-92 55q-88 0 -122 -89.5t-34 -236.5v-29q0 -151 34 -239t123 -88q60 0 91 44.5t31 127.5h263q0 -137 -70.5 -236.5t-187.5 -136.5v-243h-184v228q-185 21 -283.5 169.5 t-98.5 373.5z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1068" d="M91 591v221h126l-7 214q0 211 106 331t285 120q190 0 295.5 -112t102.5 -296l-3 -6h-273q0 99 -35.5 146t-87.5 47q-51 0 -79.5 -60t-28.5 -170l8 -214h288v-221h-279l4 -85q0 -80 -30 -154t-85 -132h614v-220h-867v220h9q37 12 55.5 96t18.5 175l-4 100h-133z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1096" d="M21 1456h308l216 -568h6l216 568h307l-326 -721h198v-160h-261v-130h261v-159h-261v-286h-281v286h-279v159h279v130h-279v160h223z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1456" d="M82 729q0 315 186 531t453 216q265 0 451.5 -216t186.5 -531q0 -316 -187 -533t-451 -217q-267 0 -453 217t-186 533zM194 729q0 -267 153.5 -449.5t373.5 -182.5q218 0 371.5 182.5t153.5 449.5q0 265 -153.5 446.5t-371.5 181.5q-220 0 -373.5 -181.5t-153.5 -446.5z M392 669v119q0 173 85.5 280t229.5 107q143 0 222.5 -79.5t76.5 -228.5l-3 -6h-137q0 97 -39.5 141.5t-119.5 44.5q-83 0 -127 -71t-44 -187v-120q0 -119 44 -189.5t127 -70.5q80 0 119.5 43.5t39.5 143.5h136l3 -6q3 -151 -76 -229.5t-222 -78.5q-144 0 -229.5 106.5 t-85.5 280.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="782" d="M133 514v221h506v-221h-506z" />
-<glyph unicode="&#xae;" horiz-adv-x="1455" d="M82 729q0 315 186 531t452 216q265 0 452 -216t187 -531q0 -316 -187 -533t-452 -217q-266 0 -452 217t-186 533zM196 729q0 -267 153 -449.5t371 -182.5q219 0 372.5 182.5t153.5 449.5q0 265 -153.5 446.5t-372.5 181.5t-371.5 -181.5t-152.5 -446.5zM453 316v850h255 q136 0 214.5 -67.5t78.5 -193.5q0 -58 -26.5 -102t-77.5 -74q54 -30 78.5 -84.5t24.5 -129.5v-56q0 -42 3 -74.5t12 -52.5v-16h-144q-8 21 -9.5 61.5t-1.5 82.5v54q0 73 -30 107.5t-97 34.5h-140v-340h-140zM593 783h116q64 0 108.5 32t44.5 90q0 74 -34 104t-120 30h-115 v-256z" />
-<glyph unicode="&#xb4;" horiz-adv-x="685" d="M108 1252l179 266h314l3 -6l-252 -260h-244z" />
-<glyph unicode="&#x2000;" horiz-adv-x="846" />
-<glyph unicode="&#x2001;" horiz-adv-x="1693" />
-<glyph unicode="&#x2002;" horiz-adv-x="846" />
-<glyph unicode="&#x2003;" horiz-adv-x="1693" />
-<glyph unicode="&#x2004;" horiz-adv-x="564" />
-<glyph unicode="&#x2005;" horiz-adv-x="423" />
-<glyph unicode="&#x2006;" horiz-adv-x="282" />
-<glyph unicode="&#x2007;" horiz-adv-x="282" />
-<glyph unicode="&#x2008;" horiz-adv-x="211" />
-<glyph unicode="&#x2009;" horiz-adv-x="338" />
-<glyph unicode="&#x200a;" horiz-adv-x="94" />
-<glyph unicode="&#x2010;" horiz-adv-x="782" d="M133 514v221h506v-221h-506z" />
-<glyph unicode="&#x2011;" horiz-adv-x="782" d="M133 514v221h506v-221h-506z" />
-<glyph unicode="&#x2012;" horiz-adv-x="782" d="M133 514v221h506v-221h-506z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1228" d="M126.099 604v223h933.391v-223h-933.391z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1451" d="M122.197 604v223h1148.78v-223h-1148.78z" />
-<glyph unicode="&#x2018;" horiz-adv-x="509" d="M127 921v260l92 275h137l4 -271v-264h-233z" />
-<glyph unicode="&#x2019;" horiz-adv-x="508" d="M140 1194v262h232v-262l-91 -273h-137z" />
-<glyph unicode="&#x201c;" horiz-adv-x="795" d="M105 921v260l92 275h137l4 -271v-264h-233zM433 921v260l92 275h137l4 -271v-264h-233z" />
-<glyph unicode="&#x201d;" horiz-adv-x="800" d="M105 1194v262h232v-262l-91 -273h-137zM441 1194v262h232v-262l-91 -273h-137z" />
-<glyph unicode="&#x2022;" horiz-adv-x="685" d="M127 711v94q0 99 60 162t160 63q102 0 162.5 -63t60.5 -162v-94q0 -99 -60 -160.5t-162 -61.5q-101 0 -161 61.5t-60 160.5z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1358" d="M126 0v253h278v-253h-278zM569 0v253h278v-253h-278zM989 0v253h278v-253h-278z" />
-<glyph unicode="&#x202f;" horiz-adv-x="338" />
-<glyph unicode="&#x205f;" horiz-adv-x="423" />
-<glyph unicode="&#x20ac;" horiz-adv-x="981" d="M66 487v147h122v156h-122v148h122v17q0 238 132 380t347 142q51 0 101 -8t108 -23l-19 -225q-45 16 -93.5 25.5t-96.5 9.5q-93 0 -145 -79.5t-52 -219.5v-19h347v-148h-347v-156h347v-147h-347v-13q0 -134 52 -204.5t146 -70.5q49 0 97 8.5t92 24.5l19 -222 q-49 -15 -101.5 -23t-106.5 -8q-215 0 -347.5 134t-132.5 361v13h-122z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1131" d="M89 1352v104h345v-104h-106v-435h-137v435h-102zM494 914v542h148l92 -363h6l93 363h144v-542h-122v251l-6 1l-78 -252h-67l-83 270l-6 -1v-269h-121z" />
-<glyph unicode="&#x2212;" horiz-adv-x="984" d="M127 604v223h718v-223h-718z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.ttf
deleted file mode 100644
index dc5a1d393c8b7690e8505275267a654709abdb6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25876
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-BoldCondensed-webfont.woff
deleted file mode 100644
index 10c69625553813415f17678d3a51badc577d06c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15036
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
HX!`y?3Nx?q

diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.eot
deleted file mode 100644
index e9f04b304c490b9e4755c8ba66f264039ad64926..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30884
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.svg
deleted file mode 100644
index dc39022a7..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoBoldCondensedItalic" horiz-adv-x="1075" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="453" />
-<glyph unicode=" "  horiz-adv-x="453" />
-<glyph unicode="&#x09;" horiz-adv-x="453" />
-<glyph unicode="&#xa0;" horiz-adv-x="453" />
-<glyph unicode="!" horiz-adv-x="508" d="M36 0l38 253h279l-38 -253h-279zM110 504l142 952h283l-142 -952h-283z" />
-<glyph unicode="&#x22;" horiz-adv-x="783" d="M191 939l32 239l39 278h219l-37 -266l-130 -251h-123zM508 939l34 247l38 270h217l-37 -266l-130 -251h-122z" />
-<glyph unicode="#" horiz-adv-x="1050" d="M25 410l24 163h215l90 303h-195l25 164h218l124 416h172l-124 -416h144l124 416h171l-124 -416h190l-25 -164h-213l-90 -303h193l-24 -163h-218l-121 -410h-172l122 410h-144l-121 -410h-172l121 410h-190zM436 573h143l90 303h-143z" />
-<glyph unicode="$" horiz-adv-x="1069" d="M78 440h281q-20 -136 19.5 -189.5t121.5 -53.5q71 0 114 50.5t55 132.5q12 89 -15.5 136t-114.5 97q-189 78 -270.5 177t-55.5 283q24 174 134 279t278 122l30 211h145l-31 -215q149 -27 224.5 -143t50.5 -300h-281q16 116 -13.5 173t-97.5 57q-67 0 -106 -51t-51 -134 q-12 -81 15.5 -126t117.5 -101q185 -72 267 -176t56 -287q-25 -179 -132.5 -280.5t-276.5 -118.5l-27 -197h-146l27 198q-161 20 -255 131t-63 325z" />
-<glyph unicode="%" horiz-adv-x="1376" d="M176 1099l11 77q20 134 107.5 217.5t225.5 83.5q132 0 197 -86.5t46 -214.5l-11 -77q-21 -134 -107.5 -216.5t-224.5 -82.5q-132 0 -198 86t-46 213zM262 183l783 1138l123 -73l-782 -1138zM361 1099q-10 -61 11 -100.5t72 -39.5q47 0 80 40.5t42 99.5l11 77 q9 62 -11 102t-70 40q-47 0 -81 -42t-43 -100zM675 280l12 77q19 133 107.5 216.5t226.5 83.5q132 0 196.5 -86.5t46.5 -213.5l-12 -77q-21 -135 -107.5 -217.5t-224.5 -82.5q-132 0 -198.5 86.5t-46.5 213.5zM860 280q-10 -60 14 -100.5t70 -40.5q54 0 83 39t39 102l12 77 q8 62 -12 101.5t-69 39.5q-48 0 -82.5 -41.5t-42.5 -99.5z" />
-<glyph unicode="&#x26;" horiz-adv-x="1236" d="M37 388q18 124 84.5 206t198.5 180l9 6q-46 90 -64.5 165.5t-6.5 153.5q28 188 138.5 283t282.5 95q139 0 217.5 -98.5t57.5 -236.5q-16 -108 -63 -180.5t-130 -134.5l-106 -74l191 -308q37 57 63.5 123.5t37.5 139.5h224q-22 -146 -70.5 -261t-130.5 -203l151 -244h-320 l-53 86q-85 -54 -168 -80.5t-175 -26.5q-189 0 -292 114.5t-76 294.5zM325 404q-15 -92 21.5 -148.5t108.5 -56.5q45 0 93 13.5t96 41.5l-211 342q-53 -51 -77.5 -98t-30.5 -94zM508 1103q-7 -42 4 -84.5t38 -91.5l61 40q55 37 77.5 75t30.5 84q8 54 -12.5 92t-69.5 38 q-47 0 -83.5 -45t-45.5 -108z" />
-<glyph unicode="'" horiz-adv-x="411" d="M133 907l36 268l39 281h251l-38 -268l-133 -281h-155z" />
-<glyph unicode="(" horiz-adv-x="637" d="M114 567l4 24q55 400 224 666t351 351l6 -1l31 -139q-121 -98 -226.5 -320t-152.5 -555l-4 -28q-49 -347 -6 -560t139 -316l-69 -138l-6 1q-156 83 -250.5 356t-40.5 659z" />
-<glyph unicode=")" horiz-adv-x="637" d="M-83 -311q121 98 227 320.5t153 555.5l4 28q48 346 4 561t-138 316l71 138l6 -1q160 -81 259 -362t47 -654l-4 -24q-55 -391 -229.5 -661.5t-360.5 -354.5l-6 1z" />
-<glyph unicode="*" horiz-adv-x="780" d="M75 743l75 161l202 -78l42 255h165l-31 -264l217 80l25 -163l-219 -82l89 -208l-149 -100l-103 211l-161 -204l-121 97l160 216z" />
-<glyph unicode="+" horiz-adv-x="1010" d="M57 560l37 246h317l60 400h267l-60 -400h314l-37 -246h-314l-62 -414h-267l62 414h-317z" />
-<glyph unicode="," horiz-adv-x="495" d="M-68 -305l109 317l35 234h274l-36 -242l-193 -309h-189z" />
-<glyph unicode="-" horiz-adv-x="782" d="M130 514l33 221h506l-33 -221h-506z" />
-<glyph unicode="." horiz-adv-x="545" d="M46 0l38 253h278l-38 -253h-278z" />
-<glyph unicode="/" horiz-adv-x="722" d="M-111 -125l679 1581h277l-681 -1581h-275z" />
-<glyph unicode="0" d="M87 528l60 399q40 265 183 407.5t349 142.5q195 0 299.5 -148.5t66.5 -401.5l-60 -399q-40 -267 -182.5 -408t-346.5 -141q-197 0 -302.5 147.5t-66.5 401.5zM367 505q-23 -153 9 -229.5t113 -76.5q74 0 130.5 80t79.5 226l67 447q22 150 -10.5 227t-110.5 77 q-76 0 -133 -80.5t-78 -223.5z" />
-<glyph unicode="1" d="M292 1204l32 217l558 56l-222 -1477h-283l182 1211z" />
-<glyph unicode="2" d="M31 0l26 188l475 509q103 116 151.5 200t58.5 153q14 98 -14.5 152t-105.5 54q-76 0 -130.5 -71.5t-68.5 -179.5h-277l-2 6q24 202 163.5 334t345.5 132q199 0 300 -115.5t74 -310.5q-19 -138 -96.5 -244t-264.5 -300l-233 -282l2 -5h519l-31 -220h-892z" />
-<glyph unicode="3" d="M63 394l2 5h276q-14 -89 25.5 -144.5t113.5 -55.5q82 0 145.5 59.5t77.5 150.5q18 123 -22 176t-136 53h-147l9 62l13 86l10 66h147q83 0 135.5 56t67.5 153q13 86 -23.5 140.5t-116.5 54.5q-63 0 -115.5 -49.5t-63.5 -127.5h-275l-2 6q22 179 162.5 285.5t327.5 106.5 q200 0 310.5 -108t81.5 -304q-17 -106 -82.5 -189.5t-165.5 -129.5q97 -44 141 -131t27 -210q-32 -207 -179.5 -316.5t-359.5 -109.5q-175 0 -296.5 108.5t-87.5 306.5z" />
-<glyph unicode="4" d="M37 320l12 173l682 963h285l-137 -914h139l-33 -222h-139l-48 -320h-284l48 320h-525zM307 542h288l79 524l-6 2l-34 -57z" />
-<glyph unicode="5" d="M76 378l2 5l278 14q-15 -97 23 -147.5t114 -50.5q84 0 134 69t70 197q20 134 -11.5 207.5t-119.5 73.5q-66 0 -109.5 -33t-65.5 -87l-251 17l198 813h746l-34 -227h-514l-88 -353q42 31 100.5 52t122.5 23q184 3 264 -125t46 -359q-34 -221 -162 -354.5t-359 -133.5 q-178 0 -297 107.5t-87 291.5z" />
-<glyph unicode="6" d="M88 558l47 315q42 287 214 445.5t407 158.5q74 0 137 -15.5t123 -46.5l-80 -209q-55 23 -101.5 34.5t-110.5 11.5q-108 0 -194 -98.5t-112 -274.5l-6 -39q59 53 135 81.5t165 28.5q161 0 236.5 -134t44.5 -348q-34 -224 -177 -356.5t-344 -132.5t-313 156.5t-71 422.5z M369 554q-27 -175 10.5 -265t125.5 -90q72 0 130 77.5t75 191.5q19 128 -15.5 196.5t-111.5 68.5q-64 0 -115.5 -25t-85.5 -68z" />
-<glyph unicode="7" d="M171 1235l33 221h932l-33 -221q-259 -269 -371.5 -504t-159.5 -553l-27 -178h-284l27 178q48 319 181.5 565.5t361.5 491.5h-660z" />
-<glyph unicode="8" d="M58 406q18 124 97.5 215t201.5 138q-86 48 -128 130.5t-25 188.5q30 200 163 299.5t327 99.5q178 0 279.5 -104t73.5 -295q-18 -113 -81 -196t-159 -129q99 -50 149.5 -140.5t34.5 -206.5q-32 -211 -175 -319t-346 -108q-201 0 -322 113.5t-90 313.5zM344 419 q-16 -104 29 -162t130 -58q72 0 131.5 60t75.5 160q15 103 -25.5 164t-115.5 61q-80 0 -145.5 -63.5t-79.5 -161.5zM486 1065q-15 -94 17.5 -147t99.5 -53q57 0 101 54.5t58 145.5q13 91 -14.5 141t-87.5 50q-66 0 -113.5 -50.5t-60.5 -140.5z" />
-<glyph unicode="9" d="M138 42l78 205q52 -25 104 -36.5t119 -11.5q87 0 158.5 82t93.5 225l14 93q-51 -58 -114 -87.5t-130 -29.5q-174 0 -261 134t-53 355q33 224 178.5 365t342.5 141q191 0 299 -150t70 -410l-60 -394q-39 -259 -197.5 -401.5t-373.5 -142.5q-65 0 -137.5 16.5t-130.5 46.5z M429 971q-21 -130 8.5 -205.5t107.5 -75.5q55 0 104 29t85 77l26 171q22 146 -13 217.5t-112 71.5q-71 0 -130.5 -84.5t-75.5 -200.5z" />
-<glyph unicode=":" horiz-adv-x="540" d="M46 0l38 253h278l-38 -253h-278zM177 876l38 253h278l-38 -253h-278z" />
-<glyph unicode=";" horiz-adv-x="517" d="M178 876l38 253h278l-38 -253h-278zM-17 -305l109 317l35 234h274l-36 -242l-193 -309h-189z" />
-<glyph unicode="&#x3c;" horiz-adv-x="910" d="M34 435l22 144l12 78l803 366l-39 -263l-529 -213v-6l465 -208l-40 -264z" />
-<glyph unicode="=" horiz-adv-x="1036" d="M89 329l34 223h783l-34 -223h-783zM154 760l33 223h783l-33 -223h-783z" />
-<glyph unicode="&#x3e;" horiz-adv-x="921" d="M36 63l40 262l534 214v6l-470 210l40 262l700 -365l-22 -146h-1l-11 -77z" />
-<glyph unicode="?" horiz-adv-x="907" d="M107 1078q27 195 158 297t317 102q194 0 295 -115.5t72 -308.5q-20 -131 -99 -234.5t-190 -179.5q-60 -46 -84.5 -94t-36.5 -132h-282q21 136 69 200.5t173 158.5q66 57 109.5 124.5t57.5 154.5q14 98 -16 150.5t-102 52.5q-54 0 -102.5 -47.5t-63.5 -134.5h-273zM195 0 l36 243h280l-36 -243h-280z" />
-<glyph unicode="@" horiz-adv-x="1642" d="M49 478q80 428 332 682t605 254q335 0 491.5 -243.5t80.5 -654.5q-42 -220 -174 -378.5t-348 -158.5q-69 0 -115 45t-56 127q-52 -85 -116.5 -127t-140.5 -42q-124 0 -177.5 120t-7.5 314q61 252 191.5 404.5t282.5 152.5q102 0 166.5 -27t132.5 -80l-3 -3h4l-131 -570 q-21 -99 -10 -134.5t39 -28.5l6 -1q94 -5 173.5 107t111.5 280q67 353 -38.5 550t-388.5 197q-261 0 -458 -214.5t-263 -570.5q-69 -353 45.5 -560t386.5 -207q73 0 159 19.5t148 49.5l13 -144q-66 -42 -163 -65.5t-185 -23.5q-345 0 -508 251.5t-85 679.5zM626.5 219.5 q14.5 -68.5 68.5 -68.5q47 0 90.5 29t85.5 106v4q0 1 1 3l115 500q-18 6 -37.5 9.5t-40.5 3.5q-93 0 -158.5 -98t-110.5 -292q-28 -128 -13.5 -196.5z" />
-<glyph unicode="A" horiz-adv-x="1141" d="M-62 0l631 1456h292l195 -1456h-295l-35 315h-364l-130 -315h-294zM453 537h248l-52 460l-6 1z" />
-<glyph unicode="B" horiz-adv-x="1142" d="M32 0l218 1456h417q220 0 336 -100q93 -80 92 -222q0 -35 -5 -75q-17 -107 -74.5 -186.5t-154.5 -117.5q114 -27 161 -119q35 -68 35 -150q0 -30 -5 -62q-34 -217 -169 -320.5t-363 -103.5h-488zM347 220h206q89 0 145.5 52t71.5 152q5 34 5 62q1 65 -25 104 q-36 55 -134 55h-206zM439 840h140q92 0 151 49.5t74 143.5q4 30 4 55q0 66 -30 100q-42 47 -144 47h-135z" />
-<glyph unicode="C" horiz-adv-x="1133" d="M82 511l64 432q40 264 192.5 399t382.5 135q230 1 345 -117q86 -88 86 -240q0 -52 -10 -111l-2 -5h-275q7 50 7 89q0 75 -26 110q-40 53 -159 53q-102 0 -168.5 -77.5t-89.5 -233.5l-65 -434q-9 -59 -9 -106q-1 -87 29 -133q46 -74 162 -73q102 0 157.5 56t77.5 197h272 l2 -6q-32 -243 -171 -355t-371 -112q-227 -1 -348 139q-92 106 -92 279q0 54 9 114z" />
-<glyph unicode="D" horiz-adv-x="1173" d="M32 0l218 1456h449q220 0 347 -172q97 -132 97 -317q0 -57 -9 -119l-36 -241q-42 -278 -214 -442.5t-403 -164.5h-449zM347 220h167q105 0 190 109t111 278l37 243q9 60 9 111q1 99 -33 169q-50 104 -162 105h-167z" />
-<glyph unicode="E" horiz-adv-x="994" d="M32 0l218 1456h813l-33 -221h-531l-56 -372h445l-33 -220h-445l-63 -423h533l-33 -220h-815z" />
-<glyph unicode="F" horiz-adv-x="994" d="M32 0l218 1456h832l-33 -221h-550l-61 -406h462l-33 -220h-462l-91 -609h-282z" />
-<glyph unicode="G" horiz-adv-x="1178" d="M79 507l66 442q39 262 196.5 395t388.5 133q229 0 338 -114q82 -86 82 -224q0 -45 -9 -95l-3 -6h-265q5 35 5 63q0 70 -30 105q-41 50 -144 50q-105 0 -179.5 -77t-96.5 -228l-67 -444q-8 -54 -8 -98q0 -89 33 -137q51 -73 168 -73q79 0 130.5 19.5t81.5 51.5l44 294 h-222l29 195h504l-85 -567q-75 -87 -202 -150t-313 -63q-228 0 -354 139q-97 106 -97 279q0 52 9 110z" />
-<glyph unicode="H" horiz-adv-x="1257" d="M32 0l218 1456h282l-94 -629h469l94 629h281l-218 -1456h-281l91 607h-469l-91 -607h-282z" />
-<glyph unicode="I" horiz-adv-x="538" d="M48 0l218 1456h281l-218 -1456h-281z" />
-<glyph unicode="J" horiz-adv-x="994" d="M13 427l2 5h274q-7 -42 -7 -77q0 -66 24 -101q37 -55 112 -55q56 0 105 68.5t67 185.5l150 1003h282l-150 -1003q-34 -225 -168 -349.5t-319 -124.5q-199 0 -303 115q-78 86 -78 228q0 49 9 105z" />
-<glyph unicode="K" horiz-adv-x="1103" d="M30 0l218 1456h283l-90 -598h77l330 598h368l-491 -722l288 -734h-324l-211 606h-75l-90 -606h-283z" />
-<glyph unicode="L" horiz-adv-x="994" d="M32 0l218 1456h282l-185 -1236h543l-33 -220h-825z" />
-<glyph unicode="M" horiz-adv-x="1499" d="M26 0l218 1456h367l110 -1080h6l434 1080h369l-218 -1456h-280l137 916l-6 2l-400 -918h-189l-125 911h-6l-136 -911h-281z" />
-<glyph unicode="N" horiz-adv-x="1256" d="M32 0l218 1456h282l323 -930h6l139 930h282l-218 -1456h-282l-323 929h-6l-139 -929h-282z" />
-<glyph unicode="O" horiz-adv-x="1230" d="M84 524l61 406q39 266 202.5 406.5t407.5 140.5q232 0 360 -147q99 -113 99 -290q0 -52 -9 -110l-61 -406q-41 -267 -205 -406t-408 -139q-232 -1 -359 145q-97 111 -97 287q0 53 9 113zM365 524q-9 -57 -9 -104q0 -90 33 -142q50 -78 175 -78q118 0 196 82t103 242 l61 409q8 52 8 96q0 94 -36 147q-52 78 -175 78q-118 0 -195 -81.5t-100 -239.5z" />
-<glyph unicode="P" horiz-adv-x="1142" d="M32 0l218 1456h487q211 0 323 -130q89 -103 89 -252q0 -40 -6 -83q-34 -217 -178.5 -340.5t-366.5 -123.5h-205l-79 -527h-282zM426 748h205q91 0 153 69t77 172q5 34 5 63q0 68 -27 116q-39 68 -135 67h-205z" />
-<glyph unicode="Q" horiz-adv-x="1261" d="M84 524l61 406q39 266 202.5 406.5t407.5 140.5q232 0 360 -147q99 -113 99 -290q0 -52 -9 -110l-61 -406q-16 -102 -51 -186.5t-86 -148.5l145 -199l-205 -148l-142 191q-61 -27 -130 -40.5t-144 -13.5q-232 0 -359 145q-97 112 -97 287q0 53 9 113zM365 524 q-9 -57 -9 -104q0 -91 33 -142q50 -78 175 -78q118 0 196 82t103 242l61 409q8 52 8 96q0 94 -36 147q-51 78 -175 78q-118 0 -195 -81.5t-100 -239.5z" />
-<glyph unicode="R" horiz-adv-x="1130" d="M32 0l218 1455h436q208 -1 320 -115q88 -90 89 -232q0 -38 -7 -81q-18 -119 -82 -200t-173 -129q105 -39 143 -128q26 -61 26 -139q0 -37 -5 -78l-16 -106q-7 -43 -7 -88q0 -20 2 -41q4 -66 35 -97l-3 -21h-292q-29 31 -29 102q0 72 12 147l16 102q5 37 5 67 q0 66 -24 107q-36 59 -124 59h-171l-87 -584h-282zM434 804h153q88 0 144.5 55t72.5 154q5 31 5 59q0 65 -27 105q-38 58 -129 58h-154z" />
-<glyph unicode="S" horiz-adv-x="1101" d="M80 422l2 6h273q-4 -28 -4 -53q0 -85 51 -125q66 -52 164 -51q65 0 119 43.5t65 108.5q3 24 3 45q0 66 -33 106q-44 52 -169 112q-219 82 -323 194q-82 89 -82 220q0 35 6 74q26 174 164 274.5t332 100.5q214 0 332 -119q91 -92 92 -236q0 -43 -8 -90l-3 -6h-273 q4 24 4 46q0 72 -38 120q-48 64 -140 64q-65 0 -118 -44.5t-61 -107.5q-4 -22 -4 -42q-1 -64 37 -102q48 -50 201 -115q202 -79 296 -191q72 -87 72 -218q0 -39 -6 -83q-28 -182 -163.5 -278t-334.5 -96q-209 0 -351 108q-111 85 -110 242q0 44 8 93z" />
-<glyph unicode="T" horiz-adv-x="1014" d="M135 1235l33 221h958l-33 -221h-342l-185 -1235h-283l185 1235h-333z" />
-<glyph unicode="U" horiz-adv-x="1229" d="M98 505l142 951h281l-142 -951q-8 -50 -7 -92q0 -87 33 -138q50 -76 159 -76q105 0 180 79t98 227l142 951h282l-142 -951q-39 -257 -200 -391.5t-393 -134.5q-220 1 -345 141q-96 108 -96 279q0 50 8 106z" />
-<glyph unicode="V" horiz-adv-x="1141" d="M146 1456h297l87 -1084l3 -59l6 -1l20 57l415 1087h297l-635 -1456h-293z" />
-<glyph unicode="W" horiz-adv-x="1566" d="M156 1456h289l11 -925l6 -1l347 926h222l72 -922l6 -1l287 923h287l-503 -1456h-262l-78 901l-6 1l-347 -902h-262z" />
-<glyph unicode="X" horiz-adv-x="1141" d="M-53 0l481 734l-255 722h326l127 -515l6 -1l284 516h327l-470 -722l276 -734h-341l-135 525l-6 1l-292 -526h-328z" />
-<glyph unicode="Y" horiz-adv-x="1141" d="M147 1456h308l155 -633l6 -1l346 634h308l-565 -937l-78 -519h-281l81 537z" />
-<glyph unicode="Z" horiz-adv-x="1012" d="M0 142l659 1093h-482l33 221h824l-20 -137l-662 -1099h562l-33 -220h-866z" />
-<glyph unicode="[" horiz-adv-x="533" d="M-14 -337l284 2030h402l-30 -211h-117l-225 -1609h117l-29 -210h-402z" />
-<glyph unicode="\" horiz-adv-x="765" d="M138 1456h278l286 -1581h-280z" />
-<glyph unicode="]" horiz-adv-x="533" d="M-103 -337l29 210h118l225 1609h-118l30 211h402l-284 -2030h-402z" />
-<glyph unicode="^" horiz-adv-x="793" d="M68 729l366 727h205l147 -727h-218l-73 424l-1 12l-6 1l-4 -13l-198 -424h-218z" />
-<glyph unicode="_" horiz-adv-x="802" d="M-106 -214l32 214h787l-32 -214h-787z" />
-<glyph unicode="`" horiz-adv-x="633" d="M186 1513l3 5h313l141 -266h-246z" />
-<glyph unicode="a" horiz-adv-x="957" d="M12 303q24 164 140.5 248.5t326.5 84.5h123l14 90q4 28 4 52q0 46 -15 74q-23 42 -83 42q-50 0 -83.5 -35.5t-42.5 -99.5l-272 1l-1 6q16 145 140.5 240.5t307.5 95.5q165 0 259 -98q74 -77 73 -206q0 -35 -5 -74l-67 -444q-11 -74 -11 -136v-10q1 -66 14 -134h-280 q-10 37 -14 79q-3 29 -4 59q0 13 1 26q-48 -81 -114.5 -133t-151.5 -52q-142 -1 -211 87q-53 67 -53 171q0 31 5 66zM295 314q-3 -17 -3 -33q0 -35 16 -59q22 -34 67 -34q54 0 104.5 35.5t73.5 84.5l25 168h-123q-68 0 -109 -46.5t-51 -115.5z" />
-<glyph unicode="b" horiz-adv-x="1008" d="M14 0l234 1560h281l-86 -574q47 56 104.5 86t125.5 30q173 0 245 -156q48 -102 47 -247q0 -76 -13 -164l-3 -21q-38 -254 -150.5 -394.5t-292.5 -140.5q-76 0 -128.5 37.5t-83.5 109.5l-39 -126h-241zM337 282q15 -41 47 -61.5t83 -20.5q86 0 131.5 81.5t68.5 232.5l3 21 q14 94 14 164q0 55 -8 93q-20 88 -108 88q-48 0 -87.5 -26.5t-68.5 -73.5z" />
-<glyph unicode="c" horiz-adv-x="921" d="M52 526l4 29q37 249 172 398t348 149q169 0 260 -114q70 -88 69 -221q0 -41 -6 -86h-263q5 35 5 65q0 50 -14 82q-23 54 -84 53q-84 0 -134 -91t-71 -235l-4 -29q-13 -83 -13 -146q0 -56 10 -96q21 -86 111 -85q58 0 96.5 45t51.5 127h255l2 -6q-23 -176 -146 -281 t-292 -105q-203 1 -298 155q-69 112 -69 267q0 60 10 125z" />
-<glyph unicode="d" horiz-adv-x="1008" d="M53 514l3 21q40 265 156.5 416t292.5 151q63 0 111 -32.5t81 -92.5l88 583h282l-234 -1560h-241l-3 122q-53 -70 -116.5 -106.5t-137.5 -36.5q-165 0 -241 148q-52 101 -53 243q0 68 12 144zM333 514q-11 -76 -12 -134q1 -60 13 -100q24 -80 107 -80q45 0 84 23t69 66 l74 493q-17 46 -48.5 72t-75.5 26q-78 0 -131.5 -96.5t-76.5 -248.5z" />
-<glyph unicode="e" horiz-adv-x="937" d="M54 508l6 41q38 254 173 403.5t343 149.5q183 0 269 -132q62 -96 63 -239q0 -55 -10 -116l-23 -154h-546q-3 -30 -3 -57q0 -84 28 -136q37 -70 137 -69q81 0 143 20t131 61l47 -176q-66 -53 -170.5 -89t-216.5 -36q-205 -1 -305 149q-75 111 -75 267q0 54 9 113zM359 647 h268l4 25q7 45 7 81q0 45 -11 75q-19 53 -84 53q-68 0 -113.5 -63t-70.5 -171z" />
-<glyph unicode="f" horiz-adv-x="638" d="M75 881l30 201h135l19 122q27 188 135 282.5t282 94.5q32 0 65.5 -5.5t73.5 -15.5l-54 -212q-20 5 -38.5 8t-44.5 3q-54 0 -90.5 -41t-46.5 -114l-19 -122h174l-30 -201h-174l-132 -881h-282l132 881h-135z" />
-<glyph unicode="g" horiz-adv-x="1008" d="M15 -355l79 214q55 -32 112.5 -48t129.5 -16q91 0 145.5 52.5t71.5 159.5l12 80q-49 -53 -105.5 -80.5t-123.5 -27.5q-165 0 -242 148q-52 101 -52 243q0 68 12 144l3 21q40 265 156.5 416t292.5 151q73 0 124.5 -39t82.5 -111l39 130h245l-161 -1076q-34 -219 -173 -331 t-360 -112q-69 0 -147 22.5t-141 59.5zM336 280q23 -80 107 -80q47 0 85 21t66 62l77 506q-16 43 -47.5 67t-77.5 24q-78 0 -131 -96t-76 -249l-3 -21q-11 -77 -11.5 -135.5t11.5 -98.5z" />
-<glyph unicode="h" horiz-adv-x="1008" d="M7 0l234 1560h281l-91 -603q53 70 119.5 107.5t139.5 37.5q140 0 209 -115q46 -77 46 -208q0 -64 -11 -142l-96 -637h-282l96 639q10 68 10 115q0 49 -11 75q-21 51 -84 51q-48 0 -88 -21t-71 -58l-120 -801h-281z" />
-<glyph unicode="i" horiz-adv-x="497" d="M27 0l162 1082h282l-162 -1082h-282zM229 1345l32 215h282l-32 -215h-282z" />
-<glyph unicode="j" horiz-adv-x="489" d="M-220 -419l46 217q21 -6 39 -9.5t40 -3.5q45 0 76.5 45t45.5 133l168 1119h282l-168 -1119q-30 -199 -134.5 -299.5t-268.5 -100.5q-33 0 -62.5 4.5t-63.5 13.5zM229 1347l32 213h283l-32 -213h-283z" />
-<glyph unicode="k" horiz-adv-x="973" d="M14 0l234 1560h282l-134 -888h47l257 410h325l-367 -488l249 -594h-323l-169 454h-51l-68 -454h-282z" />
-<glyph unicode="l" horiz-adv-x="497" d="M27 0l234 1560h282l-234 -1560h-282z" />
-<glyph unicode="m" horiz-adv-x="1530" d="M14 0l162 1082h263l-9 -134q55 74 127 114t159 40q80 0 136 -44.5t77 -133.5q55 85 130 131.5t167 46.5q131 0 195 -116q42 -75 42 -200q0 -66 -12 -147l-96 -639h-282l96 639q10 71 10.5 119t-10.5 72q-21 50 -82 50q-43 0 -80.5 -26.5t-67.5 -72.5q-1 -17 -3 -35.5 t-5 -40.5l-106 -705h-281l96 639q10 70 10 117.5t-10 73.5q-21 50 -83 50q-41 0 -76.5 -21.5t-65.5 -61.5l-119 -797h-282z" />
-<glyph unicode="n" horiz-adv-x="1008" d="M9 0l162 1082h263l-10 -145q58 79 131 122t155 43q133 0 198 -108q43 -71 42 -194q0 -64 -11 -143l-99 -657h-282l99 657q8 58 8 99q1 50 -11 76q-22 48 -83 48q-46 0 -87 -23.5t-74 -65.5l-119 -791h-282z" />
-<glyph unicode="o" horiz-adv-x="1008" d="M58 528l4 23q37 253 175 402t351 149q202 0 300 -155q73 -114 73 -276q0 -57 -9 -120l-4 -23q-38 -253 -176.5 -401t-349.5 -148q-204 0 -302 154q-72 113 -72 272q0 58 10 123zM339 528q-11 -77 -12 -137q0 -62 13 -106q24 -86 115 -86q83 0 136 90.5t75 238.5l4 23 q11 75 11 134q-1 63 -13 108q-24 88 -113 88q-85 0 -138 -92.5t-74 -237.5z" />
-<glyph unicode="p" horiz-adv-x="1008" d="M-48 -416l224 1498h258l-4 -111q49 63 109 97t133 34q167 0 242 -158q51 -104 51 -251q0 -74 -13 -158l-3 -21q-38 -251 -153.5 -393t-289.5 -142q-67 0 -116 29.5t-81 85.5l-76 -510h-281zM337 277q15 -38 46.5 -58t81.5 -20q79 0 129.5 85t72.5 230l3 21q12 81 12 144 t-12 109q-23 92 -104 92q-47 0 -85.5 -25.5t-68.5 -71.5z" />
-<glyph unicode="q" horiz-adv-x="1008" d="M53 514l3 21q40 265 156.5 416t292.5 151q72 0 122.5 -38t82.5 -107l42 125h242l-224 -1498h-283l75 501q-47 -52 -104 -79t-123 -27q-165 0 -241 148q-53 101 -53 243q0 68 12 144zM333 514q-11 -76 -11 -134q0 -59 12 -100q23 -81 107 -81q47 0 84 20t66 60l77 514 q-17 42 -47.5 65t-76.5 23q-78 0 -131.5 -96.5t-76.5 -249.5z" />
-<glyph unicode="r" horiz-adv-x="637" d="M14 0l162 1082h263l-10 -141l5 -2q38 77 92 120t118 43q19 0 35 -3.5t32 -8.5l-67 -252l-96 3q-46 0 -82 -26.5t-60 -73.5l-111 -741h-281z" />
-<glyph unicode="s" horiz-adv-x="899" d="M13 332l2 6h257q-2 -20 -3 -37q-1 -59 27 -89q34 -38 105 -39q58 0 94.5 30t43.5 79q1 9 1 18q0 38 -26 64q-32 32 -131 83q-157 61 -229 139q-58 63 -58 153q0 22 3 45q19 137 136 227.5t293 90.5t274 -98q79 -78 78 -185q0 -27 -5 -57l-2 -6h-273q3 21 3 39 q1 44 -17 72q-24 40 -86 40q-48 0 -87 -32.5t-44 -77.5q-2 -11 -2 -21q1 -35 23 -57q28 -28 133 -81q164 -58 236 -138q58 -64 57 -158q0 -24 -3 -49q-21 -143 -142 -228.5t-304 -85.5q-182 0 -280 109q-79 88 -79 192q0 25 5 52z" />
-<glyph unicode="t" horiz-adv-x="635" d="M63 881l30 201h131l41 269h282l-41 -269h147l-30 -201h-147l-82 -551q-5 -30 -5 -53q0 -30 9 -46q16 -28 51 -28q19 0 33.5 2.5t33.5 8.5l-9 -208q-42 -14 -79.5 -20.5t-83.5 -6.5q-132 1 -196 85q-45 59 -45 165q0 45 8 99l83 553h-131z" />
-<glyph unicode="u" horiz-adv-x="1008" d="M76 458l93 624h282l-94 -626q-12 -80 -12 -132q-1 -48 9 -72q20 -52 83 -52q48 0 88.5 19.5t72.5 57.5l120 805h283l-162 -1082h-231l-8 149q-54 -83 -126 -126.5t-157 -43.5q-141 0 -209 118q-44 77 -45 206q0 70 13 155z" />
-<glyph unicode="v" horiz-adv-x="920" d="M95 1082h297l32 -682l1 -82l6 -1l27 83l234 682h295l-470 -1082h-275z" />
-<glyph unicode="w" horiz-adv-x="1301" d="M107 1082h271l7 -605l6 -1l248 606h183l68 -602l6 -1l186 603h272l-390 -1082h-235l-72 570h-6l-242 -570h-236z" />
-<glyph unicode="x" horiz-adv-x="920" d="M-64 0l364 547l-194 535h315l65 -346l6 -1l173 347h318l-353 -535l200 -547h-317l-73 356l-6 1l-180 -357h-318z" />
-<glyph unicode="y" horiz-adv-x="920" d="M-56 -414l65 207q12 -2 21.5 -4t19.5 -2q59 0 98.5 35t62.5 88l39 83l-163 1089h303l40 -645l6 -1l258 646h303l-559 -1245q-58 -116 -139.5 -195t-223.5 -79q-32 0 -59.5 5.5t-71.5 17.5z" />
-<glyph unicode="z" horiz-adv-x="920" d="M-12 0l25 165l545 696h-428l33 221h760l-24 -161l-549 -701h453l-33 -220h-782z" />
-<glyph unicode="{" horiz-adv-x="593" d="M40 516l7 50l21 147q70 0 114 55.5t58 155.5l29 208q24 177 111.5 292.5t263.5 167.5l5 -2l31 -146q-70 -32 -107 -111t-54 -201l-29 -208q-16 -110 -68 -189.5t-143 -122.5q76 -47 107 -127.5t18 -180.5l-29 -206q-19 -125 -4.5 -202t76.5 -109l-74 -154 q-162 55 -217.5 175t-30.5 290l29 206q13 104 -13.5 158t-100.5 54z" />
-<glyph unicode="|" horiz-adv-x="469" d="M6 -270l258 1726h217l-258 -1726h-217z" />
-<glyph unicode="}" horiz-adv-x="593" d="M-65 -213q69 32 106 111t55 200l29 206q14 109 67.5 189t146.5 124q-79 44 -111 124.5t-17 182.5l29 208q17 124 2.5 202t-75.5 110l75 153q161 -55 216 -174.5t31 -290.5l-29 -208q-15 -104 12 -157.5t102 -53.5l-7 -52l-4 -24l-9 -69h-1l-7 -52q-71 0 -115 -56.5 t-57 -155.5l-29 -206q-25 -176 -112.5 -292t-261.5 -168l-5 2z" />
-<glyph unicode="~" horiz-adv-x="1139" d="M77 446q23 169 112.5 273t211.5 104q68 0 130 -34t116 -99q31 -46 58 -66.5t63 -20.5q37 0 73.5 54t47.5 130l189 -27q-24 -168 -115 -274t-210 -106q-70 0 -128.5 32.5t-114.5 102.5q-36 46 -62 65.5t-62 19.5q-38 0 -74 -52.5t-46 -127.5z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1042" d="M52 526l4 29q35 232 155 378t309 166l33 219h184l-35 -236q111 -40 165 -145t32 -256h-263q14 93 -9 146.5t-84 53.5q-84 0 -134 -91t-71 -235l-4 -29q-24 -156 -3 -241.5t111 -85.5q58 0 96.5 45t51.5 127h256l2 -5q-19 -140 -103 -237t-207 -132l-36 -242h-184l34 228 q-175 22 -254.5 172.5t-45.5 370.5z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1068" d="M65 0l33 220h9q39 12 69.5 95.5t45.5 175.5l11 100h-133l33 221h126l25 214q32 219 155 335t304 116q183 0 275 -113.5t61 -295.5l-3 -5h-274q15 103 -13 148t-81 45q-49 0 -87.5 -60.5t-54.5 -169.5l-24 -214h288l-33 -221h-279l-9 -85q-13 -83 -53 -156.5t-103 -129.5 h612l-33 -220h-867z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1096" d="M88 286l24 159h279l19 130h-279l24 160h223l-219 721h308l131 -569h6l301 569h307l-434 -721h198l-24 -160h-261l-19 -130h261l-24 -159h-261l-43 -286h-281l43 286h-279z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1456" d="M111 729q49 327 265 537t486 210q254 0 413.5 -218t112.5 -529q-49 -328 -265.5 -539t-484.5 -211q-256 0 -415 218.5t-112 531.5zM223 729q-42 -277 84 -454.5t349 -177.5q210 0 394.5 184t224.5 448q41 275 -84.5 451.5t-345.5 176.5q-211 0 -397 -183t-225 -445z M412 669l18 119q26 179 126.5 283t246.5 104q138 0 208.5 -80.5t44.5 -228.5l-3 -5h-138q15 101 -17.5 143.5t-113.5 42.5q-79 0 -136 -72t-74 -186l-18 -120q-19 -123 14.5 -191.5t117.5 -68.5q77 0 124.5 44t62.5 143h136l2 -6q-20 -156 -109.5 -232t-234.5 -76 q-138 0 -210.5 107.5t-46.5 279.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="782" d="M130 514l33 221h506l-33 -221h-506z" />
-<glyph unicode="&#xae;" horiz-adv-x="1455" d="M111 729q49 327 265 537t485 210q255 0 414.5 -218t112.5 -529q-49 -328 -266 -539t-485 -211q-255 0 -414 218.5t-112 531.5zM225 729q-42 -277 83.5 -454.5t346.5 -177.5q210 0 395 184t225 448q41 276 -84 452t-347 176q-211 0 -395.5 -183t-223.5 -445zM420 316 l128 850h255q130 0 201 -68.5t53 -192.5q-10 -61 -42.5 -104.5t-89.5 -73.5q48 -30 65 -85t7 -127l-8 -56q-7 -44 -8.5 -75.5t4.5 -51.5l-3 -16h-144q-4 21 0 58.5t11 85.5l8 54q11 76 -13.5 109t-92.5 33h-140l-51 -340h-140zM630 783h116q62 0 112.5 32t59.5 90 q11 77 -18 105.5t-116 28.5h-115z" />
-<glyph unicode="&#xb4;" horiz-adv-x="685" d="M212 1257l213 261h314l2 -6l-289 -260h-237z" />
-<glyph unicode="&#x2000;" horiz-adv-x="846" />
-<glyph unicode="&#x2001;" horiz-adv-x="1693" />
-<glyph unicode="&#x2002;" horiz-adv-x="846" />
-<glyph unicode="&#x2003;" horiz-adv-x="1693" />
-<glyph unicode="&#x2004;" horiz-adv-x="564" />
-<glyph unicode="&#x2005;" horiz-adv-x="423" />
-<glyph unicode="&#x2006;" horiz-adv-x="282" />
-<glyph unicode="&#x2007;" horiz-adv-x="282" />
-<glyph unicode="&#x2008;" horiz-adv-x="211" />
-<glyph unicode="&#x2009;" horiz-adv-x="338" />
-<glyph unicode="&#x200a;" horiz-adv-x="94" />
-<glyph unicode="&#x2010;" horiz-adv-x="782" d="M130 514l33 221h506l-33 -221h-506z" />
-<glyph unicode="&#x2011;" horiz-adv-x="782" d="M130 514l33 221h506l-33 -221h-506z" />
-<glyph unicode="&#x2012;" horiz-adv-x="782" d="M130 514l33 221h506l-33 -221h-506z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1228" d="M140.398 604l42.8994 223h933.392l-42.9004 -223h-933.391z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1451" d="M139.797 604l52.7988 223h1148.78l-52.7988 -223h-1148.78z" />
-<glyph unicode="&#x2018;" horiz-adv-x="509" d="M185 921l39 260l133 275h137l-36 -271l-40 -264h-233z" />
-<glyph unicode="&#x2019;" horiz-adv-x="508" d="M202 921l37 273l39 262h232l-39 -262l-132 -273h-137z" />
-<glyph unicode="&#x201c;" horiz-adv-x="795" d="M163 921l39 260l133 275h137l-36 -271l-40 -264h-233zM491 921l39 260l133 275h137l-36 -271l-40 -264h-233z" />
-<glyph unicode="&#x201d;" horiz-adv-x="800" d="M167 921l37 273l39 262h232l-39 -262l-132 -273h-137zM503 921l37 273l39 262h232l-39 -262l-132 -273h-137z" />
-<glyph unicode="&#x2022;" horiz-adv-x="685" d="M154 711l14 94q14 103 83.5 164t170.5 61q98 0 150.5 -63.5t38.5 -161.5l-14 -94q-16 -103 -84.5 -162.5t-171.5 -59.5q-97 0 -149.5 62t-37.5 160z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1358" d="M46 0l38 253h278l-38 -253h-278zM489 0l38 253h278l-38 -253h-278zM909 0l38 253h278l-38 -253h-278z" />
-<glyph unicode="&#x202f;" horiz-adv-x="338" />
-<glyph unicode="&#x205f;" horiz-adv-x="423" />
-<glyph unicode="&#x20ac;" horiz-adv-x="981" d="M59 487l22 147h122l23 156h-121l22 148h121l3 17q37 247 188.5 384.5t369.5 137.5q49 0 99.5 -8t104.5 -23l-53 -225q-43 16 -90 25.5t-95 9.5q-89 0 -155 -80t-86 -219l-3 -19h347l-22 -148h-348l-23 -156h347l-22 -147h-347l-2 -13q-21 -139 20.5 -207t136.5 -68 q47 0 97.5 8.5t96.5 24.5l-14 -222q-51 -15 -105 -23t-108 -8q-207 0 -323.5 135t-82.5 360l2 13h-122z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1131" d="M212 1352l15 104h345l-15 -104h-107l-64 -435h-137l64 435h-101zM551 914l81 542h148l38 -363l6 -1l147 364h144l-81 -542h-122l37 250l-6 2l-115 -252h-67l-43 270h-6l-40 -270h-121z" />
-<glyph unicode="&#x2212;" horiz-adv-x="984" d="M138 604l33 223h718l-33 -223h-718z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.ttf
deleted file mode 100644
index 268545422ac472d21a6453bfb2958f988c53559c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30632
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
BBQF2|

diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-BoldCondensedItalic-webfont.woff
deleted file mode 100644
index 7e1daf415e27d6816bd15dc9ae91b20a8cdc5a19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18112
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.eot
deleted file mode 100644
index ba54c8a2688684f283b79fa2867fc698d8b90d1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30980
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
AtpET3

diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.svg
deleted file mode 100644
index 3ee9e9229..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoBoldItalic" horiz-adv-x="1175" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="510" />
-<glyph unicode=" "  horiz-adv-x="510" />
-<glyph unicode="&#x09;" horiz-adv-x="510" />
-<glyph unicode="&#xa0;" horiz-adv-x="510" />
-<glyph unicode="!" horiz-adv-x="557" d="M54 0l38 256h292l-38 -256h-292zM129 502l143 954h292l-143 -954h-292z" />
-<glyph unicode="&#x22;" horiz-adv-x="832" d="M196 932l34 236l40 288h231l-39 -275l-137 -249h-129zM538 932l35 245l39 279h230l-39 -275l-137 -249h-128z" />
-<glyph unicode="#" horiz-adv-x="1219" d="M30 410l25 169h256l94 290h-232l26 171h261l136 416h183l-135 -416h192l136 416h183l-136 -416h221l-26 -171h-250l-94 -290h225l-25 -169h-255l-133 -410h-184l133 410h-191l-133 -410h-184l133 410h-226zM495 579h191l95 290h-192z" />
-<glyph unicode="$" horiz-adv-x="1216" d="M94 436l3 5h285q-19 -133 35.5 -185t156.5 -52q94 0 151.5 48.5t69.5 130.5q11 85 -28 132.5t-155 94.5q-215 76 -310 177t-69 284q24 175 147 280.5t314 122.5l30 214h159l-30 -218q171 -25 260 -142t64 -303h-292q15 113 -26 169.5t-131 56.5t-141 -49.5t-62 -131.5 q-12 -80 26 -124t158 -98q211 -72 306.5 -176.5t70.5 -286.5q-26 -182 -147.5 -283.5t-313.5 -118.5l-28 -197h-159l28 197q-185 18 -295.5 129t-76.5 324z" />
-<glyph unicode="%" horiz-adv-x="1513" d="M180 1099l11 77q20 133 116 217t246 84q145 0 217.5 -86.5t53.5 -214.5l-11 -77q-21 -134 -115 -216.5t-245 -82.5q-144 0 -218.5 86t-54.5 213zM267 184l881 1138l131 -75l-882 -1138zM374 1099q-9 -60 16.5 -98.5t86.5 -38.5q56 0 94.5 40t47.5 97l11 77 q9 61 -16.5 100t-85.5 39q-57 0 -96 -41t-47 -98zM753 280l12 77q19 132 115.5 216t246.5 84q144 0 217 -86.5t55 -213.5l-12 -77q-21 -134 -115.5 -217t-244.5 -83q-144 0 -219 86.5t-55 213.5zM947 280q-9 -59 19.5 -98.5t84.5 -39.5q63 0 97.5 38.5t44.5 99.5l12 77 q8 60 -18 99t-85 39q-57 0 -96.5 -41t-46.5 -97z" />
-<glyph unicode="&#x26;" horiz-adv-x="1346" d="M40 392q18 126 92 208t224 181q-52 90 -73.5 164.5t-8.5 151.5q28 189 147.5 284.5t306.5 95.5q152 0 239.5 -99.5t67.5 -237.5q-17 -108 -69.5 -181.5t-146.5 -139.5l-113 -73l221 -313q46 59 76.5 128.5t42.5 147.5h233q-23 -147 -75 -264t-140 -206l169 -239h-331 l-64 89q-92 -55 -186 -82.5t-198 -27.5q-209 0 -325.5 116t-88.5 297zM334 407q-14 -93 32 -148.5t136 -55.5q51 0 106 14t109 42l-242 339l-10 -6q-66 -48 -95 -93.5t-36 -91.5zM535 1100q-7 -43 7 -86t46 -96l84 49q62 36 86.5 73.5t32.5 83.5q8 53 -19 90.5t-86 37.5 q-58 0 -100 -44.5t-51 -107.5z" />
-<glyph unicode="'" horiz-adv-x="442" d="M143 904l37 268l40 284h261l-38 -269l-141 -283h-159z" />
-<glyph unicode="(" horiz-adv-x="711" d="M129 570l3 22q57 408 244.5 672.5t394.5 347.5l6 -1l32 -145q-145 -98 -264.5 -316t-166.5 -556l-3 -26q-50 -354 8 -563t178 -312l-74 -143h-5q-181 81 -295 354t-58 666z" />
-<glyph unicode=")" horiz-adv-x="713" d="M-87 -307q143 98 263.5 317t168.5 558l3 26q49 350 -10.5 562.5t-175.5 313.5l75 142h6q183 -80 301.5 -359t65.5 -661l-3 -22q-56 -399 -250 -669t-404 -352l-6 1z" />
-<glyph unicode="*" horiz-adv-x="857" d="M80 741l80 170l228 -79l39 249h176l-31 -257l241 78l28 -171l-245 -79l108 -202l-160 -106l-118 208l-175 -199l-130 102l177 210z" />
-<glyph unicode="+" horiz-adv-x="1117" d="M60 560l38 252h362l59 394h276l-59 -394h360l-38 -252h-360l-62 -414h-276l62 414h-362z" />
-<glyph unicode="," horiz-adv-x="528" d="M-62 -302l118 324l35 228h284l-36 -237l-206 -315h-195z" />
-<glyph unicode="-" horiz-adv-x="892" d="M143 510l33 225h589l-33 -225h-589z" />
-<glyph unicode="." horiz-adv-x="596" d="M64 0l38 256h292l-38 -256h-292z" />
-<glyph unicode="/" horiz-adv-x="825" d="M-113 -125l771 1581h284l-771 -1581h-284z" />
-<glyph unicode="0" d="M94 527l60 401q40 265 194.5 407t380.5 142q214 0 331 -148.5t79 -400.5l-60 -401q-40 -266 -194 -407t-379 -141q-215 0 -333 147.5t-79 400.5zM381 499q-23 -149 18.5 -222.5t139.5 -73.5q92 0 157.5 77t87.5 219l69 459q21 145 -20.5 219.5t-137.5 74.5 q-93 0 -159 -78t-86 -216z" />
-<glyph unicode="1" d="M304 1202l34 223l600 52l-222 -1477h-291l180 1202h-301z" />
-<glyph unicode="2" d="M42 0l27 191l522 510q118 119 171.5 201.5t64.5 151.5q12 93 -25 145.5t-128 52.5t-155 -70t-78 -174h-283l-2 6q23 201 173.5 332t376.5 131q215 0 327 -115.5t86 -306.5q-20 -136 -100.5 -238t-284.5 -300l-281 -287l3 -6h594l-31 -224h-977z" />
-<glyph unicode="3" d="M69 390l2 6h285q-13 -85 36.5 -139t140.5 -54q96 0 169 59.5t87 148.5q17 120 -32 173t-162 53h-161l9 63l6 44l7 45l10 67h161q101 0 161.5 55t74.5 151q13 84 -31.5 137t-140.5 53q-77 0 -141 -49.5t-74 -124.5h-281l-2 6q21 177 173.5 285t358.5 108q217 0 338 -107.5 t92 -304.5q-17 -105 -86.5 -188t-176.5 -129q106 -44 155.5 -131t31.5 -209q-32 -208 -191 -318.5t-388 -110.5q-192 0 -328.5 108.5t-102.5 302.5z" />
-<glyph unicode="4" d="M37 316l13 175l748 965h295l-137 -914h164l-34 -226h-164l-47 -316h-292l47 316h-593zM326 547l3 -5h335l79 528l-6 2l-39 -65z" />
-<glyph unicode="5" d="M90 378l2 5l283 13q-14 -94 32.5 -143.5t137.5 -49.5q100 0 160 69t79 193q19 130 -21.5 202.5t-143.5 72.5q-80 0 -131.5 -31t-77.5 -84l-255 17l206 814h812l-35 -234h-573l-91 -340q46 30 111 49.5t138 21.5q204 3 295.5 -125.5t57.5 -360.5q-34 -221 -173.5 -354.5 t-390.5 -133.5q-194 0 -324 107.5t-98 291.5z" />
-<glyph unicode="6" d="M99 562l46 305q43 288 228 449t438 161q82 0 154 -16t137 -45l-84 -214q-64 23 -116.5 34.5t-123.5 11.5q-124 0 -219.5 -99t-120.5 -272l-7 -43q66 56 151 86t185 30q179 0 267.5 -134t57.5 -344q-35 -227 -189.5 -360t-375.5 -133q-219 0 -343.5 157t-84.5 426z M389 555q-27 -174 20.5 -263t150.5 -89q88 0 155 77t85 192q18 124 -26 190.5t-138 66.5q-76 0 -136.5 -26.5t-99.5 -72.5z" />
-<glyph unicode="7" d="M176 1231l33 225h1024l-33 -225q-291 -289 -415 -520.5t-168 -530.5l-27 -180h-292l27 180q47 317 193 558.5t401 492.5h-743z" />
-<glyph unicode="8" d="M63 406q18 124 104 215t219 138q-95 48 -142.5 131t-30.5 188q30 200 174.5 299.5t357.5 99.5q194 0 307.5 -104.5t85.5 -294.5q-18 -113 -86 -196t-172 -129q109 -50 165.5 -141t40.5 -206q-32 -210 -187 -318.5t-377 -108.5q-221 0 -355.5 113.5t-103.5 313.5zM358 420 q-16 -103 39.5 -160t157.5 -57q86 0 156 60t85 157q15 101 -35.5 161.5t-141.5 60.5q-95 0 -171 -63t-90 -159zM503 1065q-15 -93 27 -145.5t125 -52.5q69 0 122.5 54.5t67.5 143.5q13 89 -24 138t-110 49q-79 0 -137 -50t-71 -137z" />
-<glyph unicode="9" d="M150 42l81 211q59 -26 117 -38t134 -12q104 0 187.5 82t105.5 227l13 89q-57 -61 -128.5 -91.5t-149.5 -30.5q-195 0 -294.5 133.5t-65.5 357.5q33 227 190.5 367t372.5 140q212 0 332.5 -149.5t81.5 -408.5l-59 -392q-40 -262 -211 -405t-408 -143q-73 0 -153.5 16.5 t-145.5 46.5zM442 970q-20 -129 17.5 -203t131.5 -74q70 0 129 30.5t99 80.5l25 166q20 142 -24.5 212t-139.5 70q-84 0 -152.5 -82.5t-85.5 -199.5z" />
-<glyph unicode=":" horiz-adv-x="582" d="M64 0l38 256h292l-38 -256h-292zM195 876l38 256h292l-38 -256h-292z" />
-<glyph unicode=";" horiz-adv-x="562" d="M196 876l38 256h292l-38 -256h-292zM-11 -302l118 324l35 228h284l-36 -237l-206 -315h-195z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1043" d="M39 436l12 78l22 149l917 366l-40 -272l-609 -207v-6l546 -203l-41 -272z" />
-<glyph unicode="=" horiz-adv-x="1181" d="M106 332l34 229h896l-34 -229h-896zM170 763l35 229h896l-35 -229h-896z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1058" d="M48 60l41 270l617 209v6l-554 206l40 269l817 -366l-22 -149h-1l-11 -78z" />
-<glyph unicode="?" horiz-adv-x="1021" d="M114 1081q26 192 171 294t353 102q216 0 330 -114.5t85 -307.5q-20 -132 -108.5 -236.5t-214.5 -179.5q-68 -47 -94.5 -94t-38.5 -131h-291q22 140 72.5 205t185.5 158q79 58 131.5 125t65.5 150q14 95 -26.5 145.5t-131.5 50.5q-72 0 -131 -44t-73 -129h-284zM243 0 l38 250h294l-38 -250h-294z" />
-<glyph unicode="@" horiz-adv-x="1817" d="M58 478q82 426 358 683t664 257q372 0 548.5 -245.5t98.5 -659.5q-42 -218 -184.5 -376t-379.5 -158q-75 0 -126 44.5t-64 124.5q-57 -83 -129 -124.5t-160 -41.5q-136 0 -195.5 120t-11.5 314q64 254 205 407t310 153q110 0 181 -27t145 -79l-4 -4h5l-137 -573 q-21 -95 -5.5 -130t51.5 -35q110 0 198.5 110t121.5 275q70 353 -53.5 551t-442.5 198q-291 0 -509.5 -215t-287.5 -569q-71 -355 61.5 -560t438.5 -205q82 0 177 20t164 50l16 -147q-73 -42 -180 -65.5t-206 -23.5q-381 0 -564.5 251.5t-103.5 679.5zM692.5 223.5 q18.5 -65.5 82.5 -65.5q54 0 104 26.5t97 95.5l3 13l118 496q-21 7 -43.5 11t-47.5 4q-106 0 -181.5 -98t-122.5 -290q-28 -127 -9.5 -192.5z" />
-<glyph unicode="A" horiz-adv-x="1303" d="M-62 0l709 1456h299l271 -1456h-305l-51 314h-473l-145 -314h-305zM495 543h328l-83 514l-6 1z" />
-<glyph unicode="B" horiz-adv-x="1305" d="M54 0l218 1456h477q247 0 381 -102q110 -84 110 -232q0 -31 -5 -65q-17 -104 -79 -181.5t-167 -116.5q131 -26 185 -119q41 -71 40 -158q0 -28 -4 -58q-33 -217 -185 -320.5t-408 -103.5h-563zM379 224h272q112 0 182.5 51t85.5 149q3 25 3 48q0 75 -38 117 q-50 55 -173 55h-269zM473 846h206q108 2 177 51t83 137q4 23 4 44q1 71 -43 107q-56 46 -184 46h-185z" />
-<glyph unicode="C" horiz-adv-x="1303" d="M106 583l44 289q41 276 221.5 440.5t438.5 164.5q256 1 391 -131q105 -102 105 -266q0 -47 -9 -99l-3 -6h-284q6 40 6 75q0 89 -41 136q-57 66 -199 66q-126 0 -218 -107t-117 -271l-44 -291q-8 -52 -7 -97q0 -107 42 -180q62 -103 201 -103q126 0 203.5 69.5t98.5 209.5 h282l2 -6q-32 -242 -195 -369.5t-424 -127.5q-252 0 -392 170q-110 133 -110 324q0 53 8 110z" />
-<glyph unicode="D" horiz-adv-x="1355" d="M54 0l218 1456h508q257 0 409 -172q121 -137 120 -332q0 -50 -7 -104l-36 -241q-42 -278 -238 -442.5t-466 -164.5h-508zM379 224h217q138 0 245 108.5t132 274.5l37 243q6 45 6 85q0 115 -52 192q-72 104 -217 104h-217z" />
-<glyph unicode="E" horiz-adv-x="1139" d="M54 0l218 1456h932l-33 -225h-641l-55 -366h541l-34 -225h-540l-63 -416h643l-34 -224h-934z" />
-<glyph unicode="F" horiz-adv-x="1139" d="M54 0l218 1456h953l-33 -225h-662l-60 -401h560l-34 -225h-560l-90 -605h-292z" />
-<glyph unicode="G" horiz-adv-x="1364" d="M105 576l46 304q41 274 227 435.5t445 161.5q256 0 384 -128q100 -100 100 -249q0 -41 -8 -87l-2 -6h-276q4 29 4 54q0 81 -43 129q-57 62 -186 62t-229.5 -104.5t-124.5 -265.5l-46 -306q-7 -48 -7 -90q0 -110 49 -182q68 -101 211 -101q99 0 166.5 21.5t103.5 52.5 l42 282h-280l30 202h573l-84 -562q-82 -89 -226.5 -154.5t-357.5 -65.5q-254 0 -402 168q-117 132 -117 322q0 52 8 107z" />
-<glyph unicode="H" horiz-adv-x="1445" d="M54 0l218 1456h292l-94 -626h593l94 626h292l-218 -1456h-292l90 605h-593l-90 -605h-292z" />
-<glyph unicode="I" horiz-adv-x="601" d="M74 0l218 1456h292l-218 -1456h-292z" />
-<glyph unicode="J" horiz-adv-x="1137" d="M20 424l3 6h284q-5 -34 -5 -63q0 -73 34 -111q48 -53 146 -53q77 0 139.5 67t80.5 181l150 1005h291l-150 -1005q-34 -225 -183.5 -348.5t-360.5 -123.5q-223 0 -344 115q-93 89 -93 237q0 44 8 93z" />
-<glyph unicode="K" horiz-adv-x="1255" d="M49 0l218 1456h293l-89 -595h102l411 595h381l-570 -727l372 -729h-336l-295 604h-104l-90 -604h-293z" />
-<glyph unicode="L" horiz-adv-x="1138" d="M54 0l218 1456h292l-185 -1232h653l-34 -224h-944z" />
-<glyph unicode="M" horiz-adv-x="1782" d="M54 0l218 1456h383l209 -1073l6 -1l535 1074h381l-218 -1456h-292l148 993l-5 1l-509 -994h-198l-211 996h-6l-149 -996h-292z" />
-<glyph unicode="N" horiz-adv-x="1445" d="M54 0l218 1456h292l440 -981l6 1l147 980h292l-218 -1456h-292l-441 982l-6 -1l-146 -981h-292z" />
-<glyph unicode="O" horiz-adv-x="1409" d="M107 597l39 262q41 277 232.5 447.5t464.5 170.5q261 1 409 -177q117 -140 117 -335q0 -51 -8 -106l-39 -262q-43 -279 -235.5 -448.5t-466.5 -169.5q-259 1 -406 177q-116 139 -116 332q0 52 9 109zM398 597q-8 -52 -8 -98q0 -112 47 -187q66 -106 217 -106 q144 0 247 110t130 281l39 264q7 48 7 92q1 114 -49 190q-68 106 -220 106q-143 0 -244.5 -110t-126.5 -278z" />
-<glyph unicode="P" horiz-adv-x="1305" d="M54 0l218 1456h557q241 0 371 -130q105 -105 105 -260q0 -36 -6 -75q-33 -217 -194 -340t-415 -123h-265l-79 -528h-292zM459 753h265q117 0 192 67.5t91 168.5q4 26 4 49q1 74 -39 126q-52 66 -176 67h-265z" />
-<glyph unicode="Q" horiz-adv-x="1441" d="M107 597l39 262q41 277 232.5 447.5t464.5 170.5q261 0 409 -177q117 -141 117 -335q0 -51 -8 -106l-39 -262q-18 -114 -61.5 -211t-110.5 -174l182 -214l-215 -156l-179 208q-72 -35 -152 -53t-166 -18q-259 0 -406 177q-116 138 -116 332q0 52 9 109zM398 597 q-8 -52 -8 -98q0 -112 47 -187q66 -106 217 -106q144 0 247 110t130 281l39 264q7 48 7 92q0 113 -49 190q-69 106 -220 106q-143 0 -244.5 -110t-126.5 -278z" />
-<glyph unicode="R" horiz-adv-x="1305" d="M54 0l218 1456h504q240 0 368 -114q104 -93 103 -243q0 -35 -5 -73q-18 -118 -89 -198t-195 -129q120 -40 166 -129q32 -63 31 -144q0 -34 -5 -72l-16 -107q-5 -37 -5 -74q1 -27 3 -55q6 -66 41 -97l-3 -21h-301q-34 32 -35 104v14q0 66 9 131l16 103q4 29 4 54 q0 74 -37 118q-50 58 -161 58h-232l-87 -582h-292zM467 807h207q118 0 188 52.5t86 153.5q3 23 3 44q0 73 -39 117q-51 58 -169 57h-212z" />
-<glyph unicode="S" horiz-adv-x="1259" d="M97 425l2 6h283q-3 -23 -4 -43q0 -92 70 -134q84 -52 208 -51q88 0 157 42.5t79 107.5q3 19 3 36q0 71 -46 113q-57 52 -216 109q-251 79 -371 192q-98 92 -97 230q0 32 5 67q26 176 180 276.5t374 100.5q244 0 382 -119q109 -94 109 -245q0 -39 -7 -82l-2 -6h-283 q2 18 2 35q-1 77 -53 129q-64 63 -182 63q-87 0 -152.5 -43t-74.5 -107q-3 -18 -2 -34q0 -69 47 -108q59 -48 247 -112q237 -78 347 -190q88 -90 88 -229q0 -35 -6 -74q-28 -184 -181 -280t-380 -96q-238 1 -402 109q-132 87 -132 252q0 40 8 85z" />
-<glyph unicode="T" d="M136 1231l33 225h1118l-33 -225h-417l-184 -1231h-292l184 1231h-409z" />
-<glyph unicode="U" horiz-adv-x="1407" d="M115 503l143 953h293l-143 -953q-6 -39 -5 -73q0 -96 48 -152q66 -74 201 -75q130 0 223 78t115 222l143 953h293l-143 -953q-38 -256 -219 -390t-445 -134q-249 1 -395 141q-116 112 -116 289q0 45 7 94z" />
-<glyph unicode="V" horiz-adv-x="1303" d="M145 1456h308l156 -1061l6 -81l6 -1l29 79l476 1064h308l-713 -1456h-300z" />
-<glyph unicode="W" horiz-adv-x="1804" d="M158 1456h301l46 -987l6 -1l410 988h236l115 -988h6l342 988h301l-558 -1456h-271l-124 958l-5 1l-412 -959h-271z" />
-<glyph unicode="X" horiz-adv-x="1303" d="M-49 0l553 734l-324 722h338l192 -516l350 516h340l-540 -722l347 -734h-353l-202 525l-360 -525h-341z" />
-<glyph unicode="Y" horiz-adv-x="1303" d="M148 1456h320l217 -670l6 -1l419 671h320l-640 -943l-77 -513h-292l79 527z" />
-<glyph unicode="Z" horiz-adv-x="1155" d="M11 152l746 1079h-576l33 225h945l-21 -146l-751 -1086h667l-34 -224h-996z" />
-<glyph unicode="[" horiz-adv-x="570" d="M-3 -336l284 2027h434l-30 -216h-141l-224 -1595h141l-30 -216h-434z" />
-<glyph unicode="\" horiz-adv-x="863" d="M140 1456h289l371 -1581h-289z" />
-<glyph unicode="]" horiz-adv-x="570" d="M-109 -336l30 216h142l224 1595h-142l30 216h434l-284 -2027h-434z" />
-<glyph unicode="^" horiz-adv-x="896" d="M73 729l408 727h212l190 -727h-231l-103 413l-2 33l-6 1l-13 -34l-224 -413h-231z" />
-<glyph unicode="_" horiz-adv-x="914" d="M-112 -219l33 219h910l-33 -219h-910z" />
-<glyph unicode="`" horiz-adv-x="678" d="M191 1513l2 5h326l158 -266h-251z" />
-<glyph unicode="a" horiz-adv-x="1100" d="M23 305q24 165 158 249.5t372 84.5h164l13 86q3 21 3 39q1 54 -25 84q-34 42 -117 41q-68 0 -113.5 -34.5t-53.5 -94.5h-281l-1 6q15 142 154.5 239t345.5 97q188 0 297 -99q87 -79 87 -211q0 -33 -5 -69l-67 -447q-10 -68 -10 -125v-19q2 -65 17 -132h-291 q-11 36 -16 78q-4 35 -4 71v14q-57 -80 -138.5 -132t-183.5 -52q-164 1 -246 89q-64 69 -64 175q0 29 5 62zM316 315q-2 -13 -2 -24q0 -41 24 -65q31 -32 94 -31q73 0 140 38.5t97 88.5l23 152h-164q-89 0 -145.5 -47t-66.5 -112z" />
-<glyph unicode="b" horiz-adv-x="1156" d="M32 0l234 1560h291l-89 -592q58 65 128 99.5t155 34.5q199 0 287 -158q62 -110 61 -268q0 -68 -11 -144l-3 -21q-38 -251 -166 -391.5t-334 -140.5q-93 0 -157.5 42t-102.5 121l-46 -142h-247zM369 308q20 -50 63 -76t113 -26q108 0 167 81t82 224l3 21q10 69 10 125 q-1 75 -19 127q-32 90 -145 91q-66 0 -118 -30t-88 -84z" />
-<glyph unicode="c" horiz-adv-x="1056" d="M61 525l4 30q37 247 189 397t393 150q191 0 299 -115q83 -89 82 -219q0 -39 -7 -81l-2 -5h-267q3 23 3 44q1 56 -25 96q-36 54 -116 55q-109 0 -172.5 -92t-84.5 -230l-4 -30q-9 -60 -10 -110q0 -73 21 -125q34 -86 150 -87q73 0 126.5 46t65.5 121h265l2 -6 q-22 -170 -162.5 -277.5t-329.5 -107.5q-231 -1 -343 155q-85 118 -86 282q0 52 9 109z" />
-<glyph unicode="d" horiz-adv-x="1156" d="M64 511l3 21q39 265 171.5 417.5t335.5 152.5q79 0 138.5 -36.5t100.5 -104.5l90 599h293l-234 -1560h-249l-5 133q-62 -75 -138 -114.5t-166 -39.5q-192 0 -284 148q-67 107 -66 259q0 59 10 125zM355 511q-9 -57 -9 -104q0 -74 22 -122q36 -79 145 -79q62 0 113.5 26.5 t88.5 76.5l69 458q-22 51 -64.5 79.5t-104.5 28.5q-102 0 -168.5 -96.5t-88.5 -246.5z" />
-<glyph unicode="e" horiz-adv-x="1071" d="M64 510l6 40q36 252 190 402q152 150 384 150h3q211 0 311 -135q75 -101 75 -251q0 -51 -9 -107l-22 -151h-646l-2 -5q-2 -22 -2 -43q0 -86 40 -140q50 -68 170 -67q94 0 169 20.5t152 60.5l52 -180q-74 -53 -190 -89t-247 -36q-232 1 -351 151q-91 116 -91 277 q0 50 8 103zM389 657l2 -6h354l3 22q5 32 5 60q-1 56 -21 91q-30 53 -118 53q-84 0 -141.5 -61t-83.5 -159z" />
-<glyph unicode="f" horiz-adv-x="714" d="M79 877l30 205h161l18 120q28 189 146 284t311 95q35 0 74.5 -6t82.5 -15l-58 -217q-23 4 -45 7t-52 3q-68 0 -112 -39.5t-55 -111.5l-18 -120h208l-30 -205h-209l-131 -877h-292l131 877h-160z" />
-<glyph unicode="g" horiz-adv-x="1156" d="M44 -353l82 218q62 -32 131 -48.5t152 -16.5q115 0 181.5 50.5t82.5 155.5l14 98q-58 -62 -127 -93.5t-153 -31.5q-191 0 -284 148q-67 107 -67 259q0 59 10 125l3 21q39 266 172 418t336 152q88 0 151 -43t102 -121l45 144h251l-161 -1077q-34 -219 -187 -330.5 t-403 -111.5q-79 0 -169 23t-162 61zM358 511q-9 -58 -9 -105q0 -73 21 -121q36 -79 145 -79q65 0 115.5 25.5t87.5 73.5l70 465q-21 51 -63.5 78t-107.5 27q-102 0 -168 -96.5t-88 -246.5z" />
-<glyph unicode="h" horiz-adv-x="1156" d="M25 0l234 1560h292l-92 -609q63 72 142.5 111.5t169.5 39.5q163 0 245 -114q58 -80 58 -218q0 -59 -10 -128l-96 -642h-292l97 644q7 48 7 86q0 64 -20 95q-32 50 -115 50q-66 0 -118.5 -23t-91.5 -65l-118 -787h-292z" />
-<glyph unicode="i" horiz-adv-x="547" d="M47 0l162 1082h292l-162 -1082h-292zM248 1341l33 219h292l-33 -219h-292z" />
-<glyph unicode="j" horiz-adv-x="543" d="M-241 -420l47 223q22 -6 45 -9t49 -3q58 0 96 41.5t52 127.5l168 1122h293l-168 -1122q-30 -198 -145 -297.5t-297 -99.5q-38 0 -71.5 4t-68.5 13zM249 1343l33 217h293l-33 -217h-293z" />
-<glyph unicode="k" horiz-adv-x="1097" d="M32 0l234 1560h292l-133 -885h65l320 407h331l2 -5l-421 -488l312 -589h-336l-232 453h-74l-68 -453h-292z" />
-<glyph unicode="l" horiz-adv-x="547" d="M47 0l234 1560h292l-234 -1560h-292z" />
-<glyph unicode="m" horiz-adv-x="1772" d="M32 0l162 1082h271l-8 -137q63 76 147.5 116.5t187.5 40.5q98 0 166.5 -46t93.5 -138q63 88 150.5 136t197.5 48q155 0 233 -114q54 -79 54 -214q0 -60 -11 -132l-96 -642h-292l96 643q8 52 8 92q0 61 -20 91q-32 48 -112 49q-60 0 -110 -28.5t-86 -78.5q-1 -14 -2.5 -28 t-3.5 -29l-107 -711h-291l96 643q8 51 8 89q0 62 -20 93q-32 50 -113 50q-58 0 -106 -23.5t-84 -66.5l-118 -785h-291z" />
-<glyph unicode="n" horiz-adv-x="1156" d="M27 0l162 1082h272l-9 -149q65 81 151 125t184 44q158 0 237 -107q55 -75 55 -207q0 -57 -10 -125l-99 -663h-293l99 662q6 43 6 76q0 60 -20 90q-32 46 -116 47q-64 0 -117.5 -25.5t-92.5 -70.5l-117 -779h-292z" />
-<glyph unicode="o" horiz-adv-x="1156" d="M67 530l3 21q37 251 193.5 401t397.5 150q231 0 348 -156q90 -120 90 -289q0 -51 -8 -106l-3 -21q-39 -253 -195 -402t-398 -149q-231 -1 -348 155q-89 118 -89 286q0 52 9 110zM358 530q-9 -58 -9 -107q0 -79 24 -133q39 -87 155 -87q108 0 177 91t91 236l3 21 q7 53 7 98q0 83 -24 139q-38 88 -154 89q-109 0 -178 -92.5t-89 -233.5z" />
-<glyph unicode="p" horiz-adv-x="1156" d="M-30 -416l224 1498h263l-2 -128q59 72 132 110t163 38q193 0 284 -158q65 -113 65 -274q0 -65 -11 -138l-3 -21q-38 -249 -169 -390.5t-332 -141.5q-83 0 -144.5 33.5t-100.5 97.5l-78 -526h-291zM367 298q20 -47 63 -71t111 -24q102 0 166 84t86 224l3 21q9 61 9 112 q0 81 -23 138q-36 93 -142 93q-64 0 -115 -28.5t-87 -80.5z" />
-<glyph unicode="q" horiz-adv-x="1156" d="M64 511l3 21q39 265 171.5 417.5t335.5 152.5q87 0 149.5 -41t101.5 -117l48 138h248l-224 -1498h-292l77 517q-57 -60 -126 -91t-152 -31q-191 0 -284 148q-66 107 -66 259q0 59 10 125zM355 511q-9 -58 -9 -105q0 -74 22 -122q35 -81 144 -81q63 0 113 25t87 73l71 476 q-21 48 -62.5 74t-104.5 26q-102 0 -169 -97.5t-89 -247.5z" />
-<glyph unicode="r" horiz-adv-x="721" d="M32 0l162 1082h271l-10 -155q50 84 117 129.5t147 45.5q21 0 40.5 -3.5t36.5 -8.5l-70 -259l-107 3q-63 0 -110 -28.5t-78 -80.5l-108 -725h-291z" />
-<glyph unicode="s" horiz-adv-x="1056" d="M36 338l3 6h267q-1 -14 -1 -26q1 -67 41 -100q48 -39 135 -39q77 0 126 33t57 88q1 7 1 14q1 41 -35 69q-42 33 -165 60q-184 38 -272 115q-73 64 -73 166q0 21 3 43q20 144 150.5 239.5t328.5 95.5q196 0 310 -99q93 -81 94 -192q0 -25 -5 -51l-2 -6h-282q2 13 2 26 q0 49 -29 81q-36 40 -116 40q-67 0 -114.5 -35t-54.5 -86q-1 -8 -1 -16q0 -41 32 -66q38 -30 165 -56q193 -40 279 -118q72 -64 72 -168q0 -22 -3 -45q-22 -152 -158.5 -242t-343.5 -90q-208 0 -322 111q-93 91 -93 200q0 23 4 48z" />
-<glyph unicode="t" horiz-adv-x="713" d="M65 877l30 205h158l40 265h291l-40 -265h183l-30 -205h-184l-82 -551q-3 -21 -3 -37q0 -37 15 -55q22 -26 66 -25q22 0 40.5 2.5t40.5 8.5l-8 -211q-46 -15 -88.5 -22.5t-91.5 -7.5q-146 0 -218 84q-52 61 -51 171q0 42 7 91l82 552h-157z" />
-<glyph unicode="u" horiz-adv-x="1156" d="M93 455l94 627h291l-94 -629q-9 -62 -9 -106q-1 -62 17 -91q30 -50 113 -50q68 0 122.5 24t93.5 69l117 783h292l-162 -1082h-242l-7 155q-62 -86 -146 -131t-187 -45q-165 0 -247 117q-57 81 -57 223q0 62 11 136z" />
-<glyph unicode="v" horiz-adv-x="1046" d="M98 1082h305l80 -679l4 -99l6 -1l35 100l280 679h305l-530 -1082h-279z" />
-<glyph unicode="w" horiz-adv-x="1507" d="M111 1082h284l31 -675l6 -1l304 676h195l103 -678h6l232 678h284l-437 -1082h-244l-107 623l-6 1l-295 -624h-243z" />
-<glyph unicode="x" horiz-adv-x="1046" d="M-61 0l419 547l-247 535h328l111 -343l6 -1l217 344h330l-406 -535l255 -547h-329l-123 359l-231 -359h-330z" />
-<glyph unicode="y" horiz-adv-x="1046" d="M-47 -414l66 213q12 -2 27 -4t27 -2q69 0 115 36.5t75 87.5l46 83l-222 1082h314l89 -628l2 -59l6 -1l311 688h314l-625 -1244q-63 -116 -154.5 -195.5t-249.5 -79.5q-35 0 -66.5 6t-74.5 17z" />
-<glyph unicode="z" horiz-adv-x="1046" d="M-5 0l26 172l612 679l-2 5h-492l34 226h866l-25 -167l-618 -686l2 -5h530l-34 -224h-899z" />
-<glyph unicode="{" horiz-adv-x="676" d="M46 518l6 48l10 71l5 35l7 47q87 0 139.5 55t66.5 155l28 203q24 177 122.5 293.5t303.5 171.5l34 -157q-90 -31 -136 -110.5t-63 -197.5l-28 -203q-16 -109 -71.5 -189t-152.5 -124q82 -47 116 -127.5t21 -179.5l-28 -203q-17 -122 7 -199t105 -109l-78 -158 q-188 55 -254 175t-41 291l28 203q14 102 -21 155.5t-126 53.5z" />
-<glyph unicode="|" horiz-adv-x="519" d="M23 -270l258 1726h231l-258 -1726h-231z" />
-<glyph unicode="}" horiz-adv-x="676" d="M-69 -202q89 31 135 110.5t63 197.5l28 203q15 110 72 189.5t159 122.5q-87 45 -123 125.5t-21 182.5l28 203q17 121 -7 198.5t-104 109.5l78 157q187 -55 252.5 -174.5t41.5 -290.5l-28 -203q-15 -104 20.5 -157t128.5 -53l-21 -149l-7 -52q-88 0 -141.5 -56t-66.5 -153 l-28 -203q-25 -177 -123.5 -294t-301.5 -172z" />
-<glyph unicode="~" horiz-adv-x="1327" d="M93 448q23 168 124 272.5t239 104.5q79 0 152 -34t139 -99q42 -45 77 -64.5t79 -19.5q49 0 93.5 52t55.5 125l199 -27q-24 -168 -126 -274t-239 -106q-82 0 -151.5 32t-136.5 101q-46 44 -81 64t-79 20q-50 0 -93.5 -51t-53.5 -122z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1181" d="M61 525l4 30q34 230 169.5 377t350.5 167l33 219h200l-36 -234q132 -38 199 -144.5t45 -257.5h-274q13 86 -22.5 140.5t-115.5 54.5q-109 0 -172.5 -92t-84.5 -230l-4 -30q-23 -149 11 -235.5t150 -86.5q73 0 126.5 46t65.5 121h266l3 -6q-18 -136 -116 -234.5 t-240 -133.5l-36 -241h-200l34 228q-200 22 -295 173t-61 369z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1216" d="M76 0l34 224h10q48 12 83.5 94.5t50.5 171.5l11 98h-165l34 225h155l24 214q32 218 169 334t342 116q207 0 312.5 -112.5t74.5 -293.5l-3 -6h-284q14 100 -24.5 143.5t-110.5 43.5q-68 0 -118 -59.5t-66 -165.5l-23 -214h356l-34 -225h-345l-9 -85q-13 -80 -52.5 -151.5 t-103.5 -127.5h712l-34 -224h-996z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1253" d="M100 288l25 164h339l19 125h-339l24 165h268l-276 714h321l190 -607l6 -1l371 608h320l-489 -714h244l-24 -165h-324l-19 -125h324l-25 -164h-324l-43 -288h-292l43 288h-339z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1606" d="M115 729q49 327 285.5 537t536.5 210q283 0 464 -218t134 -529q-49 -328 -286.5 -539t-535.5 -211q-284 0 -464.5 218.5t-133.5 531.5zM237 729q-41 -274 103 -449.5t392 -175.5q235 0 437.5 182t242.5 443q41 273 -102.5 447.5t-390.5 174.5q-237 0 -440 -181t-242 -441 zM453 669l18 119q26 179 135.5 283t271.5 104q152 0 231 -80.5t53 -228.5l-2 -5h-149q14 97 -24 138t-129 41t-153.5 -69.5t-78.5 -181.5l-18 -120q-18 -119 22 -185.5t135 -66.5q87 0 139 42t66 137h147l2 -6q-19 -156 -117.5 -232t-257.5 -76q-154 0 -235.5 107.5 t-55.5 279.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="892" d="M143 510l33 225h589l-33 -225h-589z" />
-<glyph unicode="&#xae;" horiz-adv-x="1606" d="M115 729q49 327 285.5 537t536.5 210q283 0 464 -218t134 -529q-49 -328 -286.5 -539t-535.5 -211q-284 0 -464.5 218.5t-133.5 531.5zM237 729q-41 -274 103 -449.5t392 -175.5q235 0 437.5 182t242.5 443q41 273 -102.5 447.5t-390.5 174.5q-237 0 -440 -181t-242 -441 zM468 316l128 850h281q145 0 224.5 -68.5t61.5 -193.5q-9 -61 -45 -104.5t-98 -72.5q53 -31 72 -85.5t9 -126.5l-8 -56q-7 -43 -8 -74.5t6 -52.5l-3 -16h-155q-5 21 -1.5 59t10.5 85l8 54q11 74 -17 106.5t-105 32.5h-158l-51 -337h-151zM690 787h135q69 0 124 30.5t63 85.5 q11 75 -22.5 102.5t-132.5 27.5h-130z" />
-<glyph unicode="&#xb4;" horiz-adv-x="727" d="M220 1257l232 261h324l2 -6l-314 -260h-242z" />
-<glyph unicode="&#x2000;" horiz-adv-x="845" />
-<glyph unicode="&#x2001;" horiz-adv-x="1691" />
-<glyph unicode="&#x2002;" horiz-adv-x="845" />
-<glyph unicode="&#x2003;" horiz-adv-x="1691" />
-<glyph unicode="&#x2004;" horiz-adv-x="563" />
-<glyph unicode="&#x2005;" horiz-adv-x="422" />
-<glyph unicode="&#x2006;" horiz-adv-x="281" />
-<glyph unicode="&#x2007;" horiz-adv-x="281" />
-<glyph unicode="&#x2008;" horiz-adv-x="211" />
-<glyph unicode="&#x2009;" horiz-adv-x="338" />
-<glyph unicode="&#x200a;" horiz-adv-x="93" />
-<glyph unicode="&#x2010;" horiz-adv-x="892" d="M143 510l33 225h589l-33 -225h-589z" />
-<glyph unicode="&#x2011;" horiz-adv-x="892" d="M143 510l33 225h589l-33 -225h-589z" />
-<glyph unicode="&#x2012;" horiz-adv-x="892" d="M143 510l33 225h589l-33 -225h-589z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1413" d="M163.798 601l44.2002 228h1084.19l-44.1992 -228h-1084.19z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1670" d="M168.596 601l54.3994 228h1334.38l-54.3994 -228h-1334.38z" />
-<glyph unicode="&#x2018;" horiz-adv-x="559" d="M200 912l38 256l145 288h144l-42 -286l-39 -258h-246z" />
-<glyph unicode="&#x2019;" horiz-adv-x="557" d="M216 912l42 284l39 260h246l-38 -259l-145 -285h-144z" />
-<glyph unicode="&#x201c;" horiz-adv-x="877" d="M178 912l38 256l145 288h144l-42 -286l-39 -258h-246zM506 912l38 256l145 288h144l-42 -286l-39 -258h-246z" />
-<glyph unicode="&#x201d;" horiz-adv-x="878" d="M181 912l42 284l39 260h246l-38 -259l-145 -285h-144zM517 912l42 284l39 260h246l-38 -259l-145 -285h-144z" />
-<glyph unicode="&#x2022;" horiz-adv-x="737" d="M162 716l14 90q15 104 88.5 166t182.5 62q106 0 163.5 -64t42.5 -164l-14 -90q-16 -105 -88.5 -165t-182.5 -60q-105 0 -163 63t-43 162z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1519" d="M64 0l38 256h292l-38 -256h-292zM507 0l38 256h292l-38 -256h-292zM927 0l38 256h292l-38 -256h-292z" />
-<glyph unicode="&#x202f;" horiz-adv-x="338" />
-<glyph unicode="&#x205f;" horiz-adv-x="422" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1116" d="M64 485l23 153h146l22 150h-146l23 153h146l2 13q37 247 207 385t417 138q58 0 116 -8t122 -23l-55 -229q-51 16 -106 25.5t-111 9.5q-114 0 -196 -80t-102 -216l-2 -15h428l-23 -153h-428l-23 -150h429l-23 -153h-428l-1 -8q-21 -138 35.5 -206t177.5 -68 q55 0 113.5 8.5t112.5 25.5l-13 -227q-60 -15 -122 -23t-124 -8q-236 0 -371 136t-101 362l1 8h-146z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1294" d="M219 1351l15 105h398l-15 -105h-129l-64 -434h-144l64 434h-125zM622 915l81 541h159l65 -361l6 -1l174 362h154l-81 -541h-129l41 281l-5 2l-147 -283h-73l-65 298h-6l-45 -298h-129z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1137" d="M156 601l34 228h834l-34 -228h-834z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.ttf
deleted file mode 100644
index 536d4cae810d39e8bf1b2b3ada0269f445b1a50d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30768
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
Lvh8Xn`91#^QJ|%^

diff --git a/app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-BoldItalic-webfont.woff
deleted file mode 100644
index baf277b3e58e01f9469a331ed36b64e5e4fab33d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18208
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.eot
deleted file mode 100644
index 4eea4985a8980df587ab8ef53fa4e1ca3df10790..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26444
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.svg
deleted file mode 100644
index a62941c4d..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoCondensed" horiz-adv-x="1056" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="450" />
-<glyph unicode=" "  horiz-adv-x="450" />
-<glyph unicode="&#x09;" horiz-adv-x="450" />
-<glyph unicode="&#xa0;" horiz-adv-x="450" />
-<glyph unicode="!" horiz-adv-x="477" d="M136 0v204h206v-204h-206zM137 485v971h204v-971h-204z" />
-<glyph unicode="&#x22;" horiz-adv-x="705" d="M129 951l5 246v259h179v-250l-87 -255h-97zM409 951l5 252v253h178v-250l-86 -255h-97z" />
-<glyph unicode="#" horiz-adv-x="1085" d="M57 410v130h221l59 368h-215v132h236l66 416h139l-67 -416h198l67 416h138l-66 -416h184v-132h-205l-58 -368h198v-130h-218l-65 -410h-140l65 410h-198l-65 -410h-138l65 410h-201zM417 540h198l58 368h-198z" />
-<glyph unicode="$" horiz-adv-x="1045" d="M109 423l3 5h196q0 -156 62.5 -223t157.5 -67q98 0 151.5 64t53.5 168q0 96 -48 158t-166 117q-186 68 -276.5 166t-90.5 271q0 164 88 268t241 123v212h131v-213q150 -22 234.5 -137.5t84.5 -305.5h-203q0 130 -50 209t-139 79q-93 0 -138 -64.5t-45 -168.5 q0 -98 46 -157.5t171 -117.5q184 -69 274 -167t90 -270q0 -168 -91.5 -270t-249.5 -119v-193h-131v193q-157 17 -258 124t-98 316z" />
-<glyph unicode="%" horiz-adv-x="1370" d="M98 1099v77q0 128 73.5 214.5t200.5 86.5t201 -86.5t74 -214.5v-77q0 -128 -73.5 -213.5t-199.5 -85.5q-128 0 -202 85.5t-74 213.5zM242 1099q0 -75 34 -127t98 -52q61 0 95 52t34 127v77q0 75 -34.5 128t-96.5 53q-63 0 -96.5 -53t-33.5 -128v-77zM334 176l612 1138 l105 -63l-612 -1138zM732 279v78q0 127 74 213.5t201 86.5t201 -86t74 -214v-78q0 -129 -74 -214.5t-200 -85.5q-128 0 -202 86t-74 214zM876 279q0 -74 35.5 -127t96.5 -53q65 0 97.5 51t32.5 129v78q0 76 -34 128t-97 52t-97 -52t-34 -128v-78z" />
-<glyph unicode="&#x26;" horiz-adv-x="1189" d="M67 383q0 123 63 215t188 190q-68 97 -101 176t-33 161q0 169 90 260.5t246 91.5q141 0 228 -89.5t87 -218.5q0 -98 -41.5 -168.5t-121.5 -136.5l-111 -90l296 -390l6 1q32 58 50 132t18 158h172q0 -132 -33.5 -242.5t-100.5 -196.5l179 -236h-239l-79 105 q-75 -62 -159.5 -94t-179.5 -32q-194 0 -309 111.5t-115 292.5zM273 388q0 -110 59 -182.5t165 -72.5q64 0 126 23.5t116 69.5l-323 430l-21 -17q-72 -72 -97 -134.5t-25 -116.5zM375 1127q0 -50 22.5 -105t67.5 -119l103 80q51 40 69.5 84t18.5 97q0 65 -37 111t-102 46 q-67 0 -104.5 -56t-37.5 -138z" />
-<glyph unicode="'" horiz-adv-x="408" d="M107 951l5 266v239h192v-226l-87 -279h-110z" />
-<glyph unicode="(" horiz-adv-x="607" d="M117 574v16q0 379 132.5 660.5t288.5 372.5h6l37 -108q-114 -102 -197 -344t-83 -579v-20q0 -337 83 -578t197 -349l-37 -102h-6q-157 91 -289 369t-132 662z" />
-<glyph unicode=")" horiz-adv-x="612" d="M23 -355q113 102 197.5 345.5t84.5 581.5v20q0 334 -86.5 579.5t-195.5 349.5l39 102h6q157 -90 292 -373.5t135 -659.5v-16q0 -380 -134.5 -660t-292.5 -371h-6z" />
-<glyph unicode="*" horiz-adv-x="793" d="M68 764l43 137l221 -87l-3 267h141v-273l213 89l44 -138l-220 -78l134 -213l-115 -86l-134 225l-130 -219l-117 82l139 220z" />
-<glyph unicode="+" horiz-adv-x="1037" d="M66 600v174h349v432h199v-432h350v-174h-350v-454h-199v454h-349z" />
-<glyph unicode="," horiz-adv-x="414" d="M58 -271l60 302v185h200v-192l-130 -295h-130z" />
-<glyph unicode="-" horiz-adv-x="787" d="M137 542v155h507v-155h-507z" />
-<glyph unicode="." horiz-adv-x="500" d="M138 0v203h205v-203h-205z" />
-<glyph unicode="/" horiz-adv-x="730" d="M9 -125l490 1581h189l-490 -1581h-189z" />
-<glyph unicode="0" d="M100 518v419q0 248 116 394t311 146t312 -145.5t117 -394.5v-419q0 -250 -116.5 -394.5t-310.5 -144.5q-195 0 -312 144.5t-117 394.5zM305 490q0 -165 59 -261t165 -96t163.5 95.5t57.5 261.5v476q0 165 -58.5 260t-164.5 95t-164 -95t-58 -260v-476z" />
-<glyph unicode="1" d="M185 1266v151l488 60v-1477h-204v1284z" />
-<glyph unicode="2" d="M108 1040q-4 183 111 310t310 127q187 0 292 -108.5t105 -290.5q0 -123 -63.5 -238.5t-194.5 -282.5l-284 -403h585v-154h-841v135l412 539q101 140 140.5 230t39.5 174q0 111 -48.5 177t-142.5 66q-106 0 -162.5 -81t-56.5 -206h-199z" />
-<glyph unicode="3" d="M101 386l2 6h197q0 -110 64.5 -184.5t165.5 -74.5q105 0 167 73.5t62 193.5q0 137 -60 204t-177 67h-140v153h140q110 0 162 67.5t52 181.5q0 110 -52.5 179t-153.5 69q-93 0 -154 -69t-61 -176h-198l-2 6q-5 168 114.5 281.5t300.5 113.5q190 0 301.5 -105t111.5 -300 q0 -104 -53 -189t-146 -131q106 -43 163 -132t57 -218q0 -198 -121.5 -310.5t-312.5 -112.5q-173 0 -303.5 108.5t-125.5 298.5z" />
-<glyph unicode="4" d="M65 456l554 1000h212v-959h169v-155h-169v-342h-205v342h-555zM266 497h360v678l-6 2l-27 -62z" />
-<glyph unicode="5" d="M131 378l2 5l193 4q0 -122 58 -188t152 -66q110 0 165 85.5t55 244.5q0 145 -56.5 231t-162.5 86q-95 0 -142 -37.5t-68 -111.5l-177 17l74 808h689v-167h-518l-40 -438q40 38 95.5 62.5t128.5 26.5q179 2 280.5 -125t101.5 -350q0 -219 -106 -352.5t-319 -133.5 q-173 0 -291.5 102.5t-113.5 296.5z" />
-<glyph unicode="6" d="M115 546v350q0 257 136.5 419t341.5 162q76 0 146 -17t126 -46l-40 -149q-52 27 -106 41t-126 14q-121 0 -197.5 -113t-76.5 -297v-114q53 63 129 99t167 36q170 0 265.5 -127.5t95.5 -339.5q0 -218 -116 -351.5t-305 -133.5q-192 0 -316 152t-124 415zM319 535 q0 -187 66 -295t170 -108q101 0 159 93.5t58 238.5q0 148 -59 233t-165 85q-82 0 -140.5 -39t-88.5 -106v-102z" />
-<glyph unicode="7" d="M81 1300v156h891v-156q-229 -291 -318 -550t-89 -591v-159h-205v159q0 330 106.5 603.5t304.5 537.5h-690z" />
-<glyph unicode="8" d="M89 399q0 124 70 217.5t190 138.5q-102 43 -160.5 129.5t-58.5 199.5q0 190 113.5 291.5t295.5 101.5q174 0 283.5 -101.5t109.5 -291.5q0 -113 -57 -199.5t-153 -129.5q113 -45 181.5 -139t68.5 -217q0 -200 -121.5 -310t-310.5 -110q-198 0 -324.5 110t-126.5 310z M295 404q0 -124 69 -197.5t176 -73.5q98 0 162.5 74t64.5 197q0 120 -66 196t-162 76q-105 0 -174.5 -76t-69.5 -196zM335 1080q0 -112 57.5 -180t147.5 -68q82 0 134.5 68t52.5 180q0 107 -53.5 174t-134.5 67q-91 0 -147.5 -64.5t-56.5 -176.5z" />
-<glyph unicode="9" d="M86 978q0 216 118.5 357.5t298.5 141.5q195 0 315.5 -140t120.5 -393v-440q0 -246 -130.5 -385.5t-335.5 -139.5q-69 0 -140.5 16t-133.5 47l33 147q57 -30 113 -43t128 -13q116 0 188 96t72 269v140q-44 -70 -109.5 -107t-141.5 -37q-184 0 -290 131t-106 353zM292 978 q0 -148 55 -240.5t156 -92.5q82 0 140.5 44t89.5 114v171q0 168 -61 257.5t-166 89.5q-94 0 -154 -98t-60 -245z" />
-<glyph unicode=":" horiz-adv-x="479" d="M138 0v203h205v-203h-205zM138 876v203h205v-203h-205z" />
-<glyph unicode=";" horiz-adv-x="473" d="M139 876v203h205v-203h-205zM109 -271l60 302v185h200v-192l-130 -295h-130z" />
-<glyph unicode="&#x3c;" horiz-adv-x="910" d="M61 477v151l722 374v-192l-505 -243l-65 -14v-6l65 -14l505 -240v-192z" />
-<glyph unicode="=" horiz-adv-x="1017" d="M130 390v160h745v-160h-745zM130 808v160h745v-160h-745z" />
-<glyph unicode="&#x3e;" horiz-adv-x="928" d="M114 89v189l525 247l63 13v6l-63 15l-525 243v188l743 -374v-152z" />
-<glyph unicode="?" horiz-adv-x="867" d="M49 1109q-3 172 102 270t270 98q179 0 280.5 -105t101.5 -286q0 -130 -61 -236.5t-162 -208.5q-50 -51 -63 -97.5t-13 -135.5h-204q1 133 28.5 191t122.5 151q73 91 111 163t38 170q0 110 -46.5 171.5t-132.5 61.5q-73 0 -123.5 -56.5t-50.5 -156.5h-196zM299 0v198h209 v-198h-209z" />
-<glyph unicode="@" horiz-adv-x="1661" d="M89 478q17 425 227.5 684.5t553.5 259.5q346 0 528.5 -244.5t168.5 -668.5q-9 -216 -111.5 -373t-305.5 -157q-70 0 -120 45t-69 127q-43 -86 -106 -128.5t-145 -42.5q-121 0 -185.5 120t-47.5 316q21 255 126.5 409.5t256.5 154.5q97 0 155.5 -26t130.5 -81l-3 -3h5 l-46 -577q-8 -115 17 -157.5t65 -42.5q111 0 176.5 117t73.5 299q15 376 -127 586t-441 210q-278 0 -447.5 -227t-182.5 -600q-17 -370 135 -590.5t434 -220.5q78 0 159.5 21t137.5 55l34 -107q-60 -42 -153 -65.5t-181 -23.5q-349 0 -539 249.5t-174 681.5zM646 416 q-11 -142 18.5 -221.5t95.5 -79.5q57 0 104.5 31.5t84.5 114.5q0 6 0.5 13.5t1.5 18.5l42 535q-24 11 -49.5 18t-53.5 7q-108 0 -167.5 -109t-76.5 -328z" />
-<glyph unicode="A" horiz-adv-x="1127" d="M32 0l437 1456h197l433 -1456h-211l-105 368h-435l-105 -368h-211zM394 529h344l-168 592h-6z" />
-<glyph unicode="B" horiz-adv-x="1130" d="M139 0v1456h403q209 0 326.5 -98t117.5 -294q0 -102 -51 -181t-142 -116q127 -21 195.5 -120.5t68.5 -234.5q0 -201 -115.5 -306.5t-318.5 -105.5h-484zM342 154h281q110 0 170 66.5t60 190.5q0 120 -58.5 192t-164.5 76h-11h-277v-525zM342 825h231q98 3 153.5 63.5 t55.5 171.5q0 120 -61 180t-179 60h-200v-475z" />
-<glyph unicode="C" horiz-adv-x="1133" d="M101 525v404q0 258 131 403t352 145q223 1 348 -115q121 -112 121 -324v-14l-2 -6h-195q0 156 -68 229.5t-204 73.5q-134 0 -207 -100.5t-73 -288.5v-407q0 -190 75 -291t212 -101q132 0 198 72.5t66 232.5h195l2 -6v-13q0 -205 -120 -321q-124 -119 -341 -119 q-224 0 -357 143.5t-133 402.5z" />
-<glyph unicode="D" horiz-adv-x="1191" d="M139 0v1456h413q236 0 385.5 -175t149.5 -450v-207q0 -276 -149.5 -450t-385.5 -174h-413zM342 154h210q150 0 240 131.5t90 338.5v209q0 204 -90 335.5t-240 131.5h-210v-1146z" />
-<glyph unicode="E" horiz-adv-x="989" d="M139 0v1456h780v-156h-577v-469h494v-155h-494v-522h582v-154h-785z" />
-<glyph unicode="F" horiz-adv-x="988" d="M139 0v1456h800v-156h-597v-498h509v-155h-509v-647h-203z" />
-<glyph unicode="G" horiz-adv-x="1198" d="M103 514v432q0 253 135 392t359 139q221 0 341 -114q116 -110 116 -299v-13l-2 -6h-191q0 131 -66.5 203.5t-193.5 72.5q-137 0 -215.5 -95.5t-78.5 -277.5v-434q0 -186 81.5 -283.5t221.5 -97.5q103 0 164.5 32t89.5 78v339h-268v148h472v-540q-52 -83 -165.5 -147 t-292.5 -64q-228 0 -367.5 139t-139.5 396z" />
-<glyph unicode="H" horiz-adv-x="1254" d="M139 0v1456h203v-659h570v659h203v-1456h-203v642h-570v-642h-203z" />
-<glyph unicode="I" horiz-adv-x="518" d="M157 0v1456h203v-1456h-203z" />
-<glyph unicode="J" horiz-adv-x="985" d="M56 404l3 6h195q0 -141 53.5 -209t148.5 -68q83 0 136 80.5t53 217.5v1025h204v-1025q0 -207 -110 -329.5t-283 -122.5q-186 0 -295 109q-105 104 -105 301v15z" />
-<glyph unicode="K" horiz-adv-x="1130" d="M139 0v1456h203v-638h86l406 638h246l-480 -684l517 -772h-258l-417 655h-100v-655h-203z" />
-<glyph unicode="L" horiz-adv-x="987" d="M139 0v1456h203v-1302h589v-154h-792z" />
-<glyph unicode="M" horiz-adv-x="1494" d="M133 0v1456h265l348 -1188h6l349 1188h260v-1456h-202v1049l-6 1l-334 -1050h-139l-339 1066l-6 -1v-1065h-202z" />
-<glyph unicode="N" horiz-adv-x="1255" d="M139 0v1456h203l564 -1071l6 1v1070h204v-1456h-204l-564 1074l-6 -2v-1072h-203z" />
-<glyph unicode="O" horiz-adv-x="1218" d="M98 527v400q0 258 137 404t368 146q235 0 375.5 -145.5t140.5 -404.5v-400q0 -259 -140 -403.5t-375 -144.5q-232 0 -369 144.5t-137 403.5zM300 527q0 -192 79 -291t225 -99q151 0 232 98.5t81 291.5v403q0 190 -81.5 288.5t-232.5 98.5q-146 0 -224.5 -98.5 t-78.5 -288.5v-403z" />
-<glyph unicode="P" horiz-adv-x="1130" d="M139 0v1456h473q207 0 324.5 -121.5t117.5 -319.5q0 -199 -117.5 -320t-324.5 -121h-270v-574h-203zM342 730h270q118 0 179 80.5t61 202.5q0 123 -60.5 205t-179.5 82h-270v-570z" />
-<glyph unicode="Q" horiz-adv-x="1244" d="M98 527v400q0 258 137 404t368 146q235 0 375.5 -145.5t140.5 -404.5v-400q0 -108 -26 -197.5t-74 -157.5l182 -201l-135 -117l-180 196q-59 -36 -130 -53.5t-152 -17.5q-232 0 -369 144.5t-137 403.5zM300 527q0 -192 79 -291t225 -99q151 0 232 98.5t81 291.5v403 q0 190 -81.5 288.5t-232.5 98.5q-146 0 -224.5 -98.5t-78.5 -288.5v-403z" />
-<glyph unicode="R" horiz-adv-x="1138" d="M138 0v1455h429q210 0 324.5 -107t114.5 -307q0 -114 -53.5 -199.5t-153.5 -132.5q112 -38 161.5 -126t49.5 -218v-127q0 -67 13 -125t46 -90v-23h-209q-34 33 -44.5 100.5t-10.5 139.5v123q0 122 -56.5 193t-156.5 71h-251v-627h-203zM341 782h216q126 0 186 66.5 t60 188.5q0 125 -58.5 194t-177.5 69h-226v-518z" />
-<glyph unicode="S" horiz-adv-x="1094" d="M91 420l2 6h196q0 -148 78.5 -221t194.5 -73q113 0 177 63.5t64 170.5q0 100 -57 164.5t-201 117.5q-205 64 -315 165t-110 269q0 172 121.5 283.5t311.5 111.5q202 0 324 -124q118 -120 118 -299v-12l-2 -6h-195q0 128 -68 207t-179 79q-108 0 -167.5 -68t-59.5 -170 q0 -95 63 -157t212 -117q199 -65 303 -170t104 -272q0 -178 -122.5 -283.5t-321.5 -105.5q-192 0 -334 114q-137 110 -137 313v14z" />
-<glyph unicode="T" horiz-adv-x="1045" d="M37 1300v156h973v-156h-386v-1300h-204v1300h-383z" />
-<glyph unicode="U" horiz-adv-x="1213" d="M123 493v963h203v-963q0 -169 76.5 -264.5t200.5 -95.5q128 0 206.5 95t78.5 265v963h204v-963q0 -242 -136 -378t-353 -136q-213 0 -346.5 136.5t-133.5 377.5z" />
-<glyph unicode="V" horiz-adv-x="1127" d="M20 1456h216l303 -1122l21 -89h6l21 88l303 1123h217l-445 -1456h-198z" />
-<glyph unicode="W" horiz-adv-x="1553" d="M32 1456h214l190 -1033h6l245 1033h177l247 -1035h6l189 1035h213l-299 -1456h-187l-254 1033h-6l-255 -1033h-187z" />
-<glyph unicode="X" horiz-adv-x="1127" d="M47 0l396 735l-386 721h238l265 -569h6l267 569h240l-386 -721l402 -735h-244l-276 582h-6l-275 -582h-241z" />
-<glyph unicode="Y" horiz-adv-x="1127" d="M28 1456h226l305 -710h6l304 710h228l-437 -932v-524h-203v539z" />
-<glyph unicode="Z" horiz-adv-x="1005" d="M78 0v125l613 1176h-607v155h825v-121l-614 -1181h635v-154h-852z" />
-<glyph unicode="[" horiz-adv-x="507" d="M128 -319v1991h358v-153h-152v-1686h152v-152h-358z" />
-<glyph unicode="\" horiz-adv-x="745" d="M25 1456h197l523 -1581h-198z" />
-<glyph unicode="]" horiz-adv-x="507" d="M15 -167h153v1686h-153v153h359v-1991h-359v152z" />
-<glyph unicode="^" horiz-adv-x="767" d="M53 729l257 727h146l256 -727h-171l-146 444l-11 52h-6l-11 -52l-142 -444h-172z" />
-<glyph unicode="_" horiz-adv-x="802" d="M8 0h784v-152h-784v152z" />
-<glyph unicode="`" horiz-adv-x="596" d="M70 1513l2 5h235l172 -266h-177z" />
-<glyph unicode="a" horiz-adv-x="967" d="M75 300q0 153 107.5 241t299.5 88h166v111q0 99 -44 154.5t-126 55.5q-74 0 -117.5 -48t-43.5 -123l-194 -1l-2 6v14q0 118 98 208q104 96 272 96q161 0 261 -94.5t100 -269.5v-502q0 -62 8 -120.5t25 -115.5h-206q-13 49 -20.5 87.5t-9.5 76.5q-43 -80 -113.5 -132.5 t-160.5 -52.5q-145 0 -222.5 86t-77.5 235zM279 300q0 -75 36 -120t102 -45q83 0 147 51.5t84 124.5v192h-169q-94 0 -147 -59.5t-53 -143.5z" />
-<glyph unicode="b" horiz-adv-x="1008" d="M117 0v1560h204v-595q43 66 104 101.5t142 35.5q174 0 268.5 -156.5t94.5 -417.5v-21q0 -240 -94.5 -384t-267.5 -144q-88 0 -153.5 39.5t-108.5 115.5l-22 -134h-167zM321 280q27 -69 75.5 -106.5t121.5 -37.5q109 0 158.5 99.5t49.5 271.5v21q0 188 -50 302t-160 114 q-71 0 -119 -41t-76 -111v-512z" />
-<glyph unicode="c" horiz-adv-x="927" d="M75 521v38q0 236 109 389.5t309 153.5q161 0 263 -110q99 -106 99 -274v-10l-2 -5h-184q0 108 -48.5 175.5t-127.5 67.5q-114 0 -164.5 -110t-50.5 -277v-38q0 -170 50 -279t165 -109q75 0 125.5 58t50.5 157h183l2 -6v-11q0 -146 -103 -247q-107 -105 -258 -105 q-200 0 -309 152.5t-109 389.5z" />
-<glyph unicode="d" horiz-adv-x="1008" d="M79 507v21q0 260 95 417t267 157q77 0 138 -34.5t105 -99.5v592h203v-1560h-168l-21 130q-45 -74 -110 -112.5t-149 -38.5q-171 0 -265.5 144.5t-94.5 383.5zM281 507q0 -170 51 -270.5t159 -100.5q68 0 115.5 36t77.5 102v524q-30 67 -78 106.5t-114 39.5 q-108 0 -159.5 -115.5t-51.5 -300.5v-21z" />
-<glyph unicode="e" horiz-adv-x="933" d="M77 512v47q0 238 114 390.5t298 152.5q185 0 281.5 -131t96.5 -352v-114h-587q0 -166 59.5 -269t182.5 -103q85 0 148 26.5t116 77.5l66 -126q-54 -56 -142.5 -94t-201.5 -38q-202 0 -316.5 148t-114.5 385zM284 649h383v23q0 122 -43.5 198t-134.5 76q-88 0 -140 -81.5 t-65 -215.5z" />
-<glyph unicode="f" horiz-adv-x="609" d="M42 937v145h143v139q0 172 83.5 266t233.5 94q30 0 61.5 -5.5t68.5 -15.5l-19 -149q-19 5 -40 8t-46 3q-68 0 -103.5 -52t-35.5 -149v-139h179v-145h-179v-937h-203v937h-143z" />
-<glyph unicode="g" horiz-adv-x="1008" d="M83 507v21q0 260 95 417t268 157q84 0 148.5 -40.5t108.5 -115.5l19 136h170v-1084q0 -208 -111 -321.5t-313 -113.5q-69 0 -147.5 21t-141.5 57l33 152q55 -31 119.5 -48.5t134.5 -17.5q114 0 168 67.5t54 204.5v107q-44 -63 -104.5 -95t-139.5 -32q-171 0 -266 144.5 t-95 383.5zM287 507q0 -171 50 -271t159 -100q68 0 115.5 35t76.5 99v532q-29 66 -76.5 104t-114.5 38q-108 0 -159 -115.5t-51 -300.5v-21z" />
-<glyph unicode="h" horiz-adv-x="1008" d="M114 0v1560h204v-623q46 78 113 121.5t150 43.5q147 0 230 -108t83 -332v-662h-204v664q0 149 -43 214.5t-127 65.5q-70 0 -120.5 -34t-81.5 -95v-815h-204z" />
-<glyph unicode="i" horiz-adv-x="465" d="M130 0v1082h204v-1082h-204zM130 1366v194h204v-194h-204z" />
-<glyph unicode="j" horiz-adv-x="470" d="M-68 -419l12 155q16 -6 37 -10t39 -4q55 0 87 50.5t32 153.5v1156h203v-1156q0 -174 -80 -268.5t-222 -94.5q-30 0 -54.5 4.5t-53.5 13.5zM133 1369v191h204v-191h-204z" />
-<glyph unicode="k" horiz-adv-x="933" d="M118 0v1560h203v-909h71l260 431h239l-331 -492l367 -590h-237l-293 496h-76v-496h-203z" />
-<glyph unicode="l" horiz-adv-x="465" d="M130 0v1560h204v-1560h-204z" />
-<glyph unicode="m" horiz-adv-x="1547" d="M116 0v1082h187l11 -147q45 80 114.5 123.5t161.5 43.5q90 0 156 -49.5t99 -150.5q43 94 114.5 147t168.5 53q141 0 221.5 -114.5t80.5 -348.5v-639h-204v640q0 169 -42 236.5t-125 67.5q-70 0 -117.5 -52t-69.5 -137q1 -18 2 -37.5t1 -39.5v-678h-203v640 q0 163 -43 233.5t-125 70.5q-66 0 -112 -36t-72 -99v-809h-204z" />
-<glyph unicode="n" horiz-adv-x="1008" d="M115 0v1082h186l12 -161q46 86 116 133.5t159 47.5q144 0 224.5 -106t80.5 -330v-666h-203v665q0 153 -42.5 216t-128.5 63q-70 0 -120 -36.5t-80 -100.5v-807h-204z" />
-<glyph unicode="o" horiz-adv-x="1008" d="M76 526v27q0 241 114 395t313 154t313.5 -154t114.5 -395v-27q0 -242 -114 -394.5t-312 -152.5q-201 0 -315 152.5t-114 394.5zM280 526q0 -173 55.5 -283t169.5 -110q111 0 166.5 110.5t55.5 282.5v27q0 170 -56 281.5t-168 111.5t-167.5 -111.5t-55.5 -281.5v-27z" />
-<glyph unicode="p" horiz-adv-x="1008" d="M117 -416v1498h173l19 -130q44 73 108 111.5t149 38.5q172 0 267.5 -157t95.5 -417v-21q0 -240 -95.5 -384t-266.5 -144q-80 0 -141.5 31.5t-104.5 92.5v-519h-204zM321 260q28 -61 75 -94t116 -33q107 0 160 102t53 272v21q0 184 -53.5 300t-160.5 116q-68 0 -115 -37.5 t-75 -101.5v-545z" />
-<glyph unicode="q" horiz-adv-x="1008" d="M79 507v21q0 260 95 417t267 157q82 0 145 -38t107 -108l22 126h167v-1498h-204v514q-43 -59 -102.5 -89t-136.5 -30q-171 0 -265.5 144.5t-94.5 383.5zM281 507q0 -171 51 -272.5t159 -101.5q65 0 111 32.5t76 92.5v557q-29 61 -75.5 96t-110.5 35q-108 0 -159.5 -116.5 t-51.5 -301.5v-21z" />
-<glyph unicode="r" horiz-adv-x="630" d="M117 0v1082h187l14 -160q36 85 92 132.5t129 47.5q19 0 35.5 -3.5t29.5 -8.5l-23 -177l-88 5q-64 0 -106.5 -38.5t-65.5 -108.5v-771h-204z" />
-<glyph unicode="s" horiz-adv-x="902" d="M69 318l2 6h189q4 -105 59.5 -151.5t138.5 -46.5q81 0 126.5 41.5t45.5 105.5q0 63 -42 105.5t-161 95.5q-167 63 -250 137t-83 190q0 125 100.5 213t261.5 88q167 0 269 -96q98 -93 98 -224v-10l-2 -6h-196q0 77 -45.5 132.5t-123.5 55.5t-121.5 -43.5t-43.5 -101.5 q0 -62 37.5 -97.5t160.5 -91.5q170 -60 255.5 -139t85.5 -198q0 -135 -103.5 -219.5t-271.5 -84.5q-183 -1 -287 101q-100 97 -99 226v12z" />
-<glyph unicode="t" horiz-adv-x="614" d="M31 937v145h143v269h204v-269h169v-145h-169v-644q0 -84 25.5 -119.5t67.5 -35.5q17 0 32 3t35 9l21 -140q-29 -14 -64.5 -22.5t-73.5 -8.5q-117 0 -182 75.5t-65 238.5v644h-143z" />
-<glyph unicode="u" horiz-adv-x="1008" d="M112 451v631h204v-633q0 -174 40 -243.5t122 -69.5q75 0 127.5 35t82.5 100v811h204v-1082h-173l-20 158q-44 -86 -112 -132.5t-158 -46.5q-149 0 -233 115t-84 357z" />
-<glyph unicode="v" horiz-adv-x="903" d="M32 1082h212l191 -757l17 -85h6l18 85l189 757h210l-330 -1082h-181z" />
-<glyph unicode="w" horiz-adv-x="1328" d="M40 1082h203l142 -721h6l197 721h146l200 -729h6l138 729h204l-252 -1082h-168l-200 702h-6l-194 -702h-169z" />
-<glyph unicode="x" horiz-adv-x="903" d="M35 0l301 548l-292 534h230l172 -395h6l174 395h234l-293 -534l303 -548h-232l-183 408h-6l-182 -408h-232z" />
-<glyph unicode="y" horiz-adv-x="903" d="M20 1082h222l183 -709l16 -73h6l212 782h223l-387 -1250q-37 -111 -103 -190t-190 -79q-25 0 -54 5.5t-57 12.5l23 150q10 -2 29.5 -4t30.5 -2q60 0 95 50.5t55 119.5l37 112z" />
-<glyph unicode="z" horiz-adv-x="903" d="M79 0v128l499 797h-488v157h721v-126l-504 -802h527v-154h-755z" />
-<glyph unicode="{" horiz-adv-x="601" d="M54 535v146q86 0 127 61.5t41 174.5v215q0 171 70 290.5t237 174.5l41 -114q-86 -36 -121.5 -126.5t-35.5 -224.5v-215q0 -106 -40.5 -186.5t-122.5 -122.5q82 -44 122.5 -125t40.5 -186v-212q0 -133 36 -222.5t121 -126.5l-41 -115q-166 55 -236.5 174.5t-70.5 289.5 v212q0 112 -41 175t-127 63z" />
-<glyph unicode="|" horiz-adv-x="449" d="M132 -270v1726h177v-1726h-177z" />
-<glyph unicode="}" horiz-adv-x="601" d="M29 -264q85 37 121.5 126.5t36.5 222.5v212q0 108 41.5 188.5t127.5 121.5q-86 40 -127.5 120.5t-41.5 189.5v215q0 133 -36.5 223.5t-120.5 127.5l39 114q166 -55 236.5 -174.5t70.5 -290.5v-215q0 -112 41 -174t127 -62v-146q-85 0 -126.5 -63t-41.5 -175v-212 q0 -170 -70.5 -289.5t-236.5 -174.5z" />
-<glyph unicode="~" horiz-adv-x="1182" d="M108 466q0 141 73.5 239t188.5 98q72 0 136.5 -35.5t135.5 -105.5q45 -52 82.5 -75t79.5 -23q51 0 88 58t37 143l144 -20q0 -142 -74.5 -242.5t-187.5 -100.5q-75 0 -137 34t-134 108q-49 50 -86 74t-78 24q-52 0 -88 -56t-36 -140z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1004" d="M75 521v38q0 215 92 364t264 174v221h164v-229q121 -33 193 -135.5t72 -250.5h-191q0 108 -48.5 175.5t-127.5 67.5q-114 0 -164.5 -110t-50.5 -277v-38q0 -170 50 -279t165 -109q75 0 125.5 58t50.5 157h191q0 -128 -75 -224.5t-190 -129.5v-239h-164v229 q-172 23 -264 171.5t-92 365.5z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1048" d="M76 618v154h140l-9 264q0 205 99.5 323t266.5 118q177 0 273.5 -107t93.5 -282l-3 -6h-195q0 123 -47.5 181t-121.5 58q-75 0 -118.5 -75t-43.5 -210l9 -264h334v-154h-329l5 -141q0 -93 -24.5 -177.5t-69.5 -145.5h640v-154h-845v154h8q43 13 65 113t22 206l-5 145h-145 z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1084" d="M30 1456h227l280 -635h6l278 635h227l-355 -730h252v-122h-307v-170h307v-120h-307v-314h-203v314h-311v120h311v170h-311v122h262z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1462" d="M88 729q0 315 186 531t453 216q265 0 451.5 -216t186.5 -531q0 -316 -187 -533t-451 -217q-267 0 -453 217t-186 533zM191 729q0 -271 156 -457t380 -186q221 0 377.5 186t156.5 457q0 268 -156.5 453t-377.5 185q-224 0 -380 -185t-156 -453zM404 669v119q0 173 84 280 t227 107q139 0 217.5 -79.5t75.5 -228.5l-3 -6h-122q0 102 -42 150t-126 48q-88 0 -135.5 -75t-47.5 -195v-120q0 -123 47.5 -197.5t135.5 -74.5q84 0 125.5 47t41.5 152h122l3 -6q3 -150 -75 -229t-217 -79q-143 0 -227 106.5t-84 280.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="787" d="M137 542v155h507v-155h-507z" />
-<glyph unicode="&#xae;" horiz-adv-x="1462" d="M87 729q0 315 186 531t452 216q265 0 452 -216t187 -531q0 -316 -187 -533t-452 -217q-266 0 -452 217t-186 533zM191 729q0 -271 156 -457t378 -186t378.5 186t156.5 457q0 268 -156 453t-379 185q-222 0 -378 -185t-156 -453zM467 316v850h248q136 0 212.5 -65.5 t76.5 -189.5q0 -63 -30 -109.5t-87 -77.5q59 -27 86 -80.5t27 -128.5v-56q0 -42 3 -74.5t12 -52.5v-16h-130q-8 21 -10 61.5t-2 82.5v54q0 76 -31 111t-102 35h-147v-344h-126zM593 776h134q63 0 107 35t44 97q0 78 -36.5 110.5t-126.5 32.5h-122v-275z" />
-<glyph unicode="&#xb4;" horiz-adv-x="620" d="M116 1252l176 266h233l3 -5l-242 -261h-170z" />
-<glyph unicode="&#x2000;" horiz-adv-x="842" />
-<glyph unicode="&#x2001;" horiz-adv-x="1685" />
-<glyph unicode="&#x2002;" horiz-adv-x="842" />
-<glyph unicode="&#x2003;" horiz-adv-x="1685" />
-<glyph unicode="&#x2004;" horiz-adv-x="561" />
-<glyph unicode="&#x2005;" horiz-adv-x="421" />
-<glyph unicode="&#x2006;" horiz-adv-x="280" />
-<glyph unicode="&#x2007;" horiz-adv-x="280" />
-<glyph unicode="&#x2008;" horiz-adv-x="210" />
-<glyph unicode="&#x2009;" horiz-adv-x="337" />
-<glyph unicode="&#x200a;" horiz-adv-x="93" />
-<glyph unicode="&#x2010;" horiz-adv-x="787" d="M137 542v155h507v-155h-507z" />
-<glyph unicode="&#x2011;" horiz-adv-x="787" d="M137 542v155h507v-155h-507z" />
-<glyph unicode="&#x2012;" horiz-adv-x="787" d="M137 542v155h507v-155h-507z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1230" d="M144.298 649v155h933.392v-155h-933.392z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1446" d="M144.597 649v155h1148.78v-155h-1148.78z" />
-<glyph unicode="&#x2018;" horiz-adv-x="474" d="M132 937v202l84 317h102l-3 -318v-201h-183z" />
-<glyph unicode="&#x2019;" horiz-adv-x="471" d="M144 937l3 309v210h183v-208l-85 -311h-101z" />
-<glyph unicode="&#x201c;" horiz-adv-x="724" d="M110 937v202l84 317h102l-3 -318v-201h-183zM438 937v202l84 317h102l-3 -318v-201h-183z" />
-<glyph unicode="&#x201d;" horiz-adv-x="717" d="M109 937l3 309v210h183v-208l-85 -311h-101zM445 937l3 309v210h183v-208l-85 -311h-101z" />
-<glyph unicode="&#x2022;" horiz-adv-x="651" d="M131 721v72q0 87 52.5 143t141.5 56q91 0 144.5 -55.5t53.5 -143.5v-72q0 -89 -53 -143.5t-143 -54.5t-143 54.5t-53 143.5z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1255" d="M138 0v203h205v-203h-205zM581 0v203h205v-203h-205zM1001 0v203h205v-203h-205z" />
-<glyph unicode="&#x202f;" horiz-adv-x="337" />
-<glyph unicode="&#x205f;" horiz-adv-x="421" />
-<glyph unicode="&#x20ac;" horiz-adv-x="960" d="M71 511v119h128v173h-128v119h128v23q0 243 125 387.5t328 144.5q51 0 100.5 -8t106.5 -23l-16 -160q-46 16 -94.5 25.5t-96.5 9.5q-116 0 -183 -101t-67 -273v-25h400v-119h-400v-173h400v-119h-400v-9q0 -170 67.5 -269.5t183.5 -99.5q50 0 97.5 8.5t92.5 25.5l16 -157 q-48 -15 -100.5 -23t-105.5 -8q-203 0 -328.5 142t-125.5 381v9h-128z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1119" d="M92 1371v85h336v-85h-119v-453h-100v453h-117zM492 917v539h116l121 -392h6l122 392h111v-539h-94v315l-6 1l-109 -316h-53l-114 330l-6 -1v-329h-94z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1005" d="M141 649v155h718v-155h-718z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.ttf
deleted file mode 100644
index dfc0f94856d4f038f1291dabf69ecb2bffeccb72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26240
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-Condensed-webfont.woff
deleted file mode 100644
index 306e23addab635d7648c8683838155e052f3f9bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15380
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.eot
deleted file mode 100644
index b6534ea22a83995a12dd6666ad6e37c7d70437e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31352
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.svg
deleted file mode 100644
index 12d5a638c..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoCondensedItalic" horiz-adv-x="1056" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="450" />
-<glyph unicode=" "  horiz-adv-x="450" />
-<glyph unicode="&#x09;" horiz-adv-x="450" />
-<glyph unicode="&#xa0;" horiz-adv-x="450" />
-<glyph unicode="!" horiz-adv-x="477" d="M56 0l31 204h206l-31 -204h-206zM130 485l145 971h204l-145 -971h-204z" />
-<glyph unicode="&#x22;" horiz-adv-x="705" d="M187 951l40 246l36 259h179l-35 -250l-123 -255h-97zM467 951l40 252l36 253h178l-35 -250l-122 -255h-97z" />
-<glyph unicode="#" horiz-adv-x="1085" d="M39 410l19 130h221l114 368h-215l20 132h235l129 416h139l-129 -416h198l129 416h138l-128 -416h184l-20 -132h-205l-113 -368h198l-19 -130h-219l-126 -410h-140l126 410h-198l-126 -410h-138l126 410h-200zM417 540h198l114 368h-198z" />
-<glyph unicode="$" horiz-adv-x="1045" d="M90 428h203q-23 -163 29.5 -226.5t149.5 -63.5q94 0 158.5 64.5t79.5 167.5q14 99 -25 159t-151 116q-176 68 -253.5 166t-52.5 271q24 170 125.5 272t258.5 120l30 211h131l-30 -214q143 -23 212.5 -138.5t44.5 -303.5h-203q18 135 -20.5 211.5t-128.5 76.5 q-89 0 -145 -65t-70 -168q-15 -101 22.5 -158.5t155.5 -116.5q175 -69 251 -166.5t52 -270.5q-25 -176 -129 -274t-266 -115l-27 -193h-131l27 193q-152 18 -240 126.5t-58 318.5z" />
-<glyph unicode="%" horiz-adv-x="1370" d="M183 1099l11 77q19 132 105.5 216.5t214.5 84.5q122 0 185 -87.5t44 -213.5l-11 -77q-21 -133 -106 -216t-212 -83q-123 0 -187 86.5t-44 212.5zM280 176l783 1138l96 -63l-783 -1138zM327 1099q-12 -77 14 -128t91 -51q59 0 101.5 52.5t54.5 126.5l11 77 q11 77 -14.5 129t-88.5 52q-61 0 -104 -53.5t-54 -127.5zM694 279l12 78q19 132 105.5 216t214.5 84q122 0 185 -87t45 -213l-12 -78q-21 -133 -106 -216.5t-213 -83.5q-122 0 -186.5 87t-44.5 213zM838 279q-12 -77 15.5 -128.5t89.5 -51.5q63 0 104 52t53 128l12 78 q11 79 -15 129.5t-89 50.5q-61 0 -104 -53t-54 -127z" />
-<glyph unicode="&#x26;" horiz-adv-x="1189" d="M44 383q19 128 94 216.5t218 188.5q-53 97 -74.5 176t-8.5 161q26 175 128.5 263.5t260.5 88.5q135 0 211 -90.5t57 -217.5q-15 -101 -66 -169.5t-142 -135.5l-125 -90l240 -394q43 64 72.5 138t42.5 157h172q-22 -137 -70.5 -246t-128.5 -194l143 -235h-239l-63 104 q-86 -62 -175 -93.5t-183 -31.5q-187 0 -289 112.5t-75 291.5zM251 388q-18 -114 30.5 -184.5t155.5 -70.5q62 0 127.5 24.5t126.5 70.5l-257 428l-23 -17q-83 -72 -118 -135t-42 -116zM464 1127q-8 -53 6.5 -107t49.5 -117l115 80q57 40 82.5 84t33.5 97q10 67 -20.5 112 t-95.5 45q-64 0 -111.5 -56.5t-59.5 -137.5z" />
-<glyph unicode="'" horiz-adv-x="408" d="M165 951l42 266l34 239h192l-32 -226l-126 -279h-110z" />
-<glyph unicode="(" horiz-adv-x="607" d="M122 574l3 16q55 395 223.5 667.5t341.5 365.5l6 -1l22 -107q-128 -102 -245 -344t-164 -579l-3 -20q-49 -351 0 -584t150 -343l-51 -102h-6q-145 91 -238 369t-39 662z" />
-<glyph unicode=")" horiz-adv-x="612" d="M-102 -355q127 102 245.5 345.5t166.5 581.5l3 20q48 348 -3.5 585t-148.5 344l53 103l6 -1q144 -90 239.5 -373.5t43.5 -659.5l-3 -16q-56 -396 -226.5 -667t-344.5 -365l-6 1z" />
-<glyph unicode="*" horiz-adv-x="793" d="M103 764l63 137l208 -87l37 267h141l-41 -273l227 89l23 -138l-232 -78l102 -213l-128 -86l-100 225l-163 -219l-104 82l172 220z" />
-<glyph unicode="+" horiz-adv-x="1037" d="M76 600l26 174h349l65 432h199l-65 -432h350l-26 -174h-350l-68 -454h-199l68 454h-349z" />
-<glyph unicode="," horiz-adv-x="414" d="M-63 -271l106 302l27 185h200l-28 -192l-175 -295h-130z" />
-<glyph unicode="-" horiz-adv-x="787" d="M138 542l24 155h507l-24 -155h-507z" />
-<glyph unicode="." horiz-adv-x="500" d="M58 0l30 203h205l-30 -203h-205z" />
-<glyph unicode="/" horiz-adv-x="730" d="M-90 -125l727 1581h189l-727 -1581h-189z" />
-<glyph unicode="0" d="M98 518l63 419q38 258 174.5 399t333.5 141q187 0 285.5 -147t62.5 -393l-63 -419q-40 -260 -175.5 -399.5t-332.5 -139.5q-188 0 -287 146t-61 393zM299 490q-27 -171 18 -264t152 -93q102 0 176 96.5t99 260.5l71 476q25 171 -19 263t-151 92q-102 0 -176.5 -96 t-98.5 -259z" />
-<glyph unicode="1" d="M295 1266l23 151l497 60l-222 -1477h-204l193 1284z" />
-<glyph unicode="2" d="M53 0l19 135l487 539q121 140 173 230t64 174q16 115 -23 179t-134 64q-102 0 -172 -82t-87 -205h-199l-2 6q22 190 153.5 313.5t328.5 123.5q179 0 272 -110t69 -289q-19 -128 -96 -238.5t-235 -282.5l-335 -398l2 -5h578l-22 -154h-841z" />
-<glyph unicode="3" d="M79 387l2 5h198q-18 -114 35.5 -186.5t155.5 -72.5q101 0 175.5 74t93.5 193q21 142 -28 206.5t-168 64.5h-140l5 36l8 53l4 26l6 38h140q106 0 170 68.5t81 180.5q17 113 -25 180.5t-144 67.5q-89 0 -162.5 -69.5t-89.5 -175.5h-197l-2 6q22 175 157 285t318 110 q184 0 282.5 -106t69.5 -299q-17 -108 -82.5 -193t-165.5 -130q98 -43 142.5 -132.5t25.5 -214.5q-31 -206 -167 -314.5t-330 -108.5q-166 0 -283.5 109.5t-84.5 298.5z" />
-<glyph unicode="4" d="M42 342l11 114l704 1000h212l-144 -959h170l-24 -155h-169l-51 -342h-205l51 342h-555zM261 497h359l102 677l-6 2l-36 -61z" />
-<glyph unicode="5" d="M107 378l2 5l195 4q-19 -127 28.5 -190.5t143.5 -63.5q106 0 176 87t93 243q22 150 -21 233.5t-150 83.5q-91 0 -146.5 -38.5t-85.5 -110.5l-175 17l195 808h689l-25 -167h-518l-105 -438q46 38 105 62.5t132 26.5q180 2 262 -125t49 -350q-34 -227 -158.5 -356.5 t-339.5 -129.5q-167 0 -273 103.5t-73 295.5z" />
-<glyph unicode="6" d="M117 546l52 350q40 267 199 424t367 157q73 0 142 -17t120 -46l-62 -149q-48 27 -100 41t-124 14q-116 0 -212 -114t-123 -296l-17 -109q63 62 143.5 96t172.5 34q163 0 242 -129t49 -338q-35 -226 -168.5 -355.5t-325.5 -129.5q-185 0 -290 153.5t-65 413.5zM319 535 q-29 -194 21 -298.5t155 -104.5q97 0 171 94.5t96 237.5q23 153 -23.5 235.5t-153.5 82.5q-80 0 -145 -40.5t-106 -107.5z" />
-<glyph unicode="7" d="M196 1300l23 156h891l-23 -156q-272 -291 -400.5 -550t-177.5 -591l-24 -159h-205l24 159q51 344 195.5 608t386.5 533h-690z" />
-<glyph unicode="8" d="M69 399q18 129 102.5 222.5t211.5 135.5q-94 45 -140.5 130.5t-29.5 196.5q29 197 156 295t312 98q167 0 264 -102.5t70 -290.5q-19 -118 -88.5 -204t-172.5 -128q105 -46 160.5 -139t37.5 -214q-31 -208 -167 -314t-328 -106q-191 0 -304.5 111t-83.5 309zM276 404 q-20 -128 37.5 -199.5t166.5 -71.5q94 0 171.5 74.5t96.5 196.5q18 124 -36 198t-152 74q-101 0 -184 -76.5t-100 -195.5zM417 1080q-18 -117 29 -182.5t139 -65.5q79 0 143 68.5t81 179.5q16 111 -27 176t-125 65q-87 0 -155.5 -65t-84.5 -176z" />
-<glyph unicode="9" d="M125 42l55 147q54 -30 107.5 -43t125.5 -13q112 0 200 97t115 268l20 135q-54 -69 -124.5 -104t-147.5 -35q-177 0 -266.5 132.5t-56.5 351.5q33 225 171.5 362t320.5 137q187 0 290 -141t66 -392l-66 -440q-39 -256 -188 -390.5t-357 -134.5q-67 0 -137.5 16t-127.5 47z M359 978q-24 -153 17.5 -243t143.5 -90q80 0 146 45.5t108 116.5l25 167q26 174 -21.5 260.5t-153.5 86.5q-90 0 -167 -99t-98 -244z" />
-<glyph unicode=":" horiz-adv-x="479" d="M58 0l30 203h205l-30 -203h-205zM189 876l30 203h205l-30 -203h-205z" />
-<glyph unicode=";" horiz-adv-x="473" d="M190 876l30 203h205l-30 -203h-205zM-12 -271l106 302l27 185h200l-28 -192l-175 -295h-130z" />
-<glyph unicode="&#x3c;" horiz-adv-x="910" d="M53 477l6 44l9 60l7 47l778 374l-28 -192l-542 -243l-67 -14v-6l62 -14l469 -240l-29 -192z" />
-<glyph unicode="=" horiz-adv-x="1017" d="M109 390l24 160h745l-24 -160h-745zM171 808l24 160h745l-24 -160h-745z" />
-<glyph unicode="&#x3e;" horiz-adv-x="928" d="M47 89l29 189l562 247l65 13l1 6l-61 15l-489 243l29 188l686 -374l-7 -45h1l-16 -107z" />
-<glyph unicode="?" horiz-adv-x="867" d="M135 1109q23 172 143 270t285 98q172 0 260.5 -106t62.5 -285q-21 -136 -95.5 -238t-194.5 -207q-58 -51 -78 -97.5t-33 -135.5h-204q21 133 57 191t146 151q86 91 134.5 163t63.5 170q17 114 -20 173.5t-124 59.5q-70 0 -130 -57t-76 -156h-195zM219 0l30 198h209 l-30 -198h-209z" />
-<glyph unicode="@" horiz-adv-x="1661" d="M81 478q81 425 330 684.5t592 259.5q333 0 485 -247.5t75 -665.5q-41 -216 -167 -373t-329 -157q-68 0 -111 45.5t-51 127.5q-57 -86 -126.5 -129t-151.5 -43q-116 0 -165 121t-3 315q60 255 188.5 409.5t279.5 154.5q93 0 151 -27t119 -80l-3 -3h5l-133 -577 q-25 -115 -6.5 -157.5t56.5 -35.5l6 -1q103 -5 188.5 113t119.5 297q72 376 -38.5 586t-409.5 210q-267 0 -476.5 -229.5t-277.5 -597.5q-72 -370 46.5 -590.5t400.5 -220.5q76 0 162 21t146 55l18 -107q-66 -42 -162.5 -65.5t-184.5 -23.5q-336 0 -494 252t-79 679z M613 194.5q17 -79.5 84 -79.5q55 0 108.5 32t103.5 114q0 7 1.5 15t4.5 17l123 535q-22 11 -47 18t-53 7q-104 0 -182 -110.5t-128 -326.5q-32 -142 -15 -221.5z" />
-<glyph unicode="A" horiz-adv-x="1127" d="M-48 0l655 1456h197l215 -1456h-211l-49 368h-436l-160 -368h-211zM394 529h343l-79 592l-5 1z" />
-<glyph unicode="B" horiz-adv-x="1130" d="M59 0l218 1456h403q202 0 308 -99q84 -78 84 -216q0 -36 -6 -77q-17 -106 -78.5 -183.5t-157.5 -113.5q124 -22 176 -121q39 -73 38 -165q0 -33 -5 -69q-32 -209 -161 -310.5t-335 -101.5h-484zM285 154h281q106 0 178 67t91 190q5 34 5 64q0 79 -34 130q-48 70 -154 74 h-11h-277zM386 825h221q99 0 168 61t86 174q5 33 5 62q0 78 -38 120q-52 58 -171 58h-200z" />
-<glyph unicode="C" horiz-adv-x="1133" d="M100 525l60 404q40 268 191 408t375 140q214 0 326 -117q84 -88 84 -234q0 -48 -9 -103l-2 -5h-196q7 49 7 89q0 95 -40 144q-56 70 -194 70q-129 0 -220 -101.5t-118 -287.5l-61 -407q-10 -66 -10 -121q-1 -109 39 -174q60 -97 199 -97q127 0 206 73.5t104 231.5h194 l2 -6q-30 -224 -169.5 -338.5t-359.5 -114.5q-216 0 -332 145q-86 108 -86 279q0 57 10 122z" />
-<glyph unicode="D" horiz-adv-x="1191" d="M59 0l218 1456h413q226 0 354 -177q97 -135 98 -324q0 -59 -10 -124l-31 -207q-44 -286 -217 -455t-412 -169h-413zM285 154h210q144 0 257 133t144 337l31 209q10 65 10 123q-1 128 -49 216q-70 128 -221 128h-211z" />
-<glyph unicode="E" horiz-adv-x="989" d="M59 0l218 1456h780l-23 -156h-578l-70 -469h495l-24 -155h-494l-78 -522h582l-23 -154h-785z" />
-<glyph unicode="F" horiz-adv-x="988" d="M59 0l218 1456h800l-23 -156h-598l-74 -498h509l-23 -155h-509l-97 -647h-203z" />
-<glyph unicode="G" horiz-adv-x="1198" d="M100 514l65 432q39 263 193 397t381 134q213 0 319 -115q82 -88 82 -223q0 -42 -8 -89l-2 -5h-192q5 36 5 67q0 88 -41 139q-55 70 -183 70q-132 0 -227.5 -96.5t-122.5 -276.5l-65 -434q-9 -59 -9 -109q0 -113 47 -179q66 -93 208 -93q99 0 168 32.5t102 77.5l51 339 h-268l23 148h472l-81 -540q-65 -83 -188 -147t-302 -64q-220 0 -343 141q-93 106 -93 278q0 55 9 116z" />
-<glyph unicode="H" horiz-adv-x="1254" d="M59 0l218 1456h203l-99 -659h570l99 659h203l-218 -1456h-203l96 642h-570l-96 -642h-203z" />
-<glyph unicode="I" horiz-adv-x="518" d="M77 0l218 1456h203l-218 -1456h-203z" />
-<glyph unicode="J" horiz-adv-x="985" d="M33 410h203q-8 -50 -8 -91q0 -78 28 -121q44 -65 140 -65q80 0 146.5 81t87.5 217l153 1025h204l-153 -1025q-33 -215 -159 -333.5t-302 -118.5q-180 0 -276 111q-72 82 -72 221q0 47 8 99z" />
-<glyph unicode="K" horiz-adv-x="1078" d="M49 0l218 1456h204l-95 -632h104l432 632h263l-553 -723l353 -733h-234l-294 654h-96l-98 -654h-204z" />
-<glyph unicode="L" horiz-adv-x="987" d="M59 0l218 1456h203l-195 -1302h589l-23 -154h-792z" />
-<glyph unicode="M" horiz-adv-x="1494" d="M53 0l218 1456h265l170 -1187l6 -1l527 1188h260l-218 -1456h-202l157 1048l-6 2l-491 -1050h-139l-180 1066h-6l-159 -1066h-202z" />
-<glyph unicode="N" horiz-adv-x="1255" d="M59 0l218 1456h203l404 -1071l6 1l160 1070h204l-218 -1456h-204l-404 1074l-6 -1l-160 -1073h-203z" />
-<glyph unicode="O" horiz-adv-x="1218" d="M97 527l60 400q40 269 197 409.5t391 140.5q227 0 349 -147q93 -112 93 -288q0 -55 -9 -115l-60 -400q-41 -269 -199.5 -408.5t-397.5 -139.5q-223 -1 -343 145q-91 110 -91 284q0 56 10 119zM299 527q-10 -65 -10 -119q-1 -112 43 -176q64 -95 213 -95q145 0 243.5 99.5 t127.5 290.5l61 403q9 60 9 111q0 115 -46 181q-66 94 -219 95q-141 0 -237.5 -99.5t-123.5 -287.5z" />
-<glyph unicode="P" horiz-adv-x="1130" d="M59 0l218 1456h473q199 0 302 -123q80 -96 80 -236q0 -39 -6 -82q-31 -207 -165 -324t-343 -117h-270l-86 -574h-203zM371 730h271q114 0 189 81.5t93 201.5q5 36 5 69q0 82 -34 138q-48 80 -168 80h-270z" />
-<glyph unicode="Q" horiz-adv-x="1244" d="M97 527l60 400q40 269 197 409.5t391 140.5q227 0 349 -147q93 -112 93 -288q0 -54 -9 -115l-60 -400q-18 -112 -55.5 -202t-94.5 -156l149 -198l-153 -117l-148 193q-64 -35 -138 -51.5t-157 -16.5q-223 0 -343 145q-91 110 -91 284q0 56 10 119zM299 527 q-10 -65 -10 -119q0 -112 43 -176q65 -95 213 -95q145 0 243.5 99.5t127.5 290.5l61 403q9 60 9 111q0 116 -46 181q-66 95 -219 95q-141 0 -237.5 -99.5t-123.5 -287.5z" />
-<glyph unicode="R" horiz-adv-x="1138" d="M58 0l218 1455h429q203 0 305 -108q79 -84 78 -221q0 -40 -6 -85q-18 -119 -84 -203.5t-174 -130.5q103 -39 141 -127q26 -60 26 -137q0 -37 -6 -78l-19 -127q-8 -47 -8 -89q0 -19 2 -37q5 -57 32 -89l-3 -23h-209q-30 33 -30 101v6q0 65 11 133l18 123q6 37 6 69 q-1 77 -33 126q-46 69 -146 69h-251l-94 -627h-203zM378 782h216q121 0 193.5 67.5t91.5 187.5q5 37 5 68q0 80 -34 128q-48 67 -168 67h-226z" />
-<glyph unicode="S" horiz-adv-x="1088" d="M94 419l3 6h194q-5 -36 -5 -68q0 -105 62 -157q81 -66 203 -67q89 0 161 57.5t85 142.5q4 26 4 50q-1 79 -41 131q-52 68 -201 133q-207 77 -301 181q-72 80 -72 210q0 39 6 82q25 168 152.5 262.5t308.5 94.5q205 -1 317 -119q86 -90 86 -231q0 -44 -9 -93l-2 -5h-196 q5 31 5 59q0 90 -46 152q-60 81 -179 81q-89 0 -155 -58t-78 -141q-5 -30 -4 -57q0 -76 38 -123q52 -63 216 -133q202 -77 292 -181q69 -80 69 -208q0 -40 -7 -85q-27 -174 -155.5 -265t-316.5 -91q-200 0 -336 107q-106 84 -106 240q0 44 8 93z" />
-<glyph unicode="T" horiz-adv-x="1045" d="M152 1300l23 156h973l-23 -156h-387l-194 -1300h-204l194 1300h-382z" />
-<glyph unicode="U" horiz-adv-x="1213" d="M117 493l144 963h203l-144 -963q-8 -53 -8 -98q0 -105 44 -169q62 -92 187 -93q123 0 218 96t121 264l144 963h204l-144 -963q-38 -251 -192 -382.5t-374 -131.5q-205 -1 -322 137q-89 105 -89 270q0 51 8 107z" />
-<glyph unicode="V" horiz-adv-x="1127" d="M158 1456h216l135 -1122l8 -89l6 -1l34 89l471 1123h217l-663 -1456h-198z" />
-<glyph unicode="W" horiz-adv-x="1553" d="M170 1456h214l35 -1031l6 -1l400 1032h177l92 -1034l6 -1l344 1035h213l-517 -1456h-187l-100 1032l-6 1l-409 -1033h-187z" />
-<glyph unicode="X" horiz-adv-x="1127" d="M-33 0l506 735l-278 721h238l180 -568l6 -1l352 569h240l-494 -721l292 -735h-244l-189 581l-6 1l-362 -582h-241z" />
-<glyph unicode="Y" horiz-adv-x="1127" d="M166 1456h226l199 -710h6l410 710h228l-576 -931l-79 -525h-203l81 538z" />
-<glyph unicode="Z" horiz-adv-x="999" d="M17 125l726 1176h-556l23 155h791l-18 -121l-730 -1181h628l-23 -154h-837z" />
-<glyph unicode="[" horiz-adv-x="507" d="M8 -319l279 1991h358l-21 -153h-152l-236 -1686h152l-22 -152h-358z" />
-<glyph unicode="\" horiz-adv-x="745" d="M163 1456h197l286 -1581h-198z" />
-<glyph unicode="]" horiz-adv-x="507" d="M-105 -319l22 152h153l236 1686h-153l21 153h359l-279 -1991h-359z" />
-<glyph unicode="^" horiz-adv-x="767" d="M82 729l366 727h146l147 -727h-171l-79 444l-3 51l-6 1l-19 -52l-209 -444h-172z" />
-<glyph unicode="_" horiz-adv-x="802" d="M-95 -152l23 152h784l-23 -152h-784z" />
-<glyph unicode="`" horiz-adv-x="596" d="M203 1518h242l134 -266h-177z" />
-<glyph unicode="a" horiz-adv-x="967" d="M40 300q23 158 142.5 243.5t313.5 85.5h166l17 111q5 31 5 57q0 61 -25 99q-35 54 -118 54q-71 0 -123.5 -48.5t-63.5 -122.5l-194 -1l-1 6q13 130 130 224t287 94q156 0 244 -95q69 -74 69 -196q0 -35 -6 -73l-76 -502q-11 -64 -11 -121v-6q0 -54 9 -109h-206 q-5 46 -7 86q0 11 -1 22q0 29 3 57q-55 -80 -133.5 -133t-168.5 -53q-138 1 -206 87q-51 65 -51 165q0 33 5 69zM244 300q-3 -23 -3 -42q1 -48 21 -80q30 -44 95 -43q80 0 153 52.5t105 124.5l28 191h-169q-90 0 -154 -60.5t-76 -142.5z" />
-<glyph unicode="b" horiz-adv-x="1008" d="M37 0l234 1560h204l-89 -595q53 66 119 101.5t147 35.5q168 0 242 -158q48 -104 48 -252q0 -76 -13 -164l-3 -21q-38 -249 -152.5 -388.5t-288.5 -139.5q-86 0 -145 41t-92 119l-44 -139h-167zM283 280q17 -69 59.5 -106.5t115.5 -37.5q105 0 171.5 101t92.5 270l3 21 q14 91 14 165q1 82 -17 140q-32 111 -144 111q-68 0 -124 -42t-95 -113z" />
-<glyph unicode="c" horiz-adv-x="927" d="M73 521l6 38q36 244 166.5 393.5t332.5 149.5q156 0 244 -111q68 -86 69 -211q0 -37 -6 -77h-191q5 35 5 65q0 66 -26 112q-38 66 -118 66q-109 0 -179 -112t-94 -275l-6 -38q-11 -77 -12 -140q0 -82 20 -142q34 -106 149 -106q72 0 132.5 58.5t75.5 156.5h182l3 -6 q-20 -159 -141.5 -261t-274.5 -102q-192 1 -282 155q-65 111 -65 263q0 59 10 124z" />
-<glyph unicode="d" horiz-adv-x="1008" d="M75 507l3 21q40 269 157 421.5t291 152.5q76 0 131.5 -37t90.5 -105l90 600h203l-234 -1560h-168l-1 130q-56 -74 -126.5 -112.5t-155.5 -38.5q-164 0 -240 146q-52 99 -53 240q0 66 12 142zM277 507q-12 -76 -12 -137q0 -82 21 -137q36 -97 145 -97q66 0 120 37.5 t95 104.5l78 519q-20 68 -61.5 107.5t-108.5 39.5q-103 0 -175 -117t-99 -299z" />
-<glyph unicode="e" horiz-adv-x="933" d="M74 512l7 47q37 247 172 395t321 148q178 0 258 -132q57 -95 57 -233q0 -55 -9 -118l-17 -114h-587q-9 -63 -9 -116q-1 -93 27 -156q44 -100 168 -100q82 0 151 27t129 77l47 -126q-63 -56 -157 -94t-207 -38q-194 -1 -290 149q-70 110 -70 265q0 56 9 119zM307 654l2 -5 h375l4 23q7 47 7 87q0 67 -20 113q-32 74 -124 74q-85 0 -150 -82t-94 -210z" />
-<glyph unicode="f" horiz-adv-x="609" d="M103 937l21 145h143l21 139q27 179 123 269.5t248 90.5q28 0 60 -6t67 -15l-41 -149q-18 5 -39 8t-46 3q-65 0 -110 -52.5t-59 -148.5l-21 -139h179l-21 -145h-180l-140 -937h-203l140 937h-142z" />
-<glyph unicode="g" horiz-adv-x="1008" d="M45 -359l56 152q51 -32 112.5 -49t131.5 -17q109 0 175.5 68.5t87.5 203.5l16 107q-53 -63 -118.5 -95t-144.5 -32q-164 0 -241 146q-52 99 -52 241q0 66 11 141l3 21q40 270 157 422t292 152q82 0 140 -42t92 -119l41 141h170l-162 -1084q-33 -216 -159.5 -325.5 t-330.5 -109.5q-66 0 -143 21.5t-134 56.5zM283 507q-12 -77 -12 -139q0 -80 20 -135q35 -97 145 -97q66 0 119.5 36.5t93.5 102.5l79 528q-19 65 -60.5 103t-108.5 38q-103 0 -174.5 -117t-98.5 -299z" />
-<glyph unicode="h" horiz-adv-x="1008" d="M34 0l234 1560h204l-93 -617q57 76 130.5 117.5t156.5 41.5q142 0 211 -109q47 -74 47 -199q0 -60 -11 -132l-99 -662h-204l100 664q9 63 9 110q1 70 -19 108q-32 62 -118 62q-68 0 -124.5 -36t-98.5 -99l-121 -809h-204z" />
-<glyph unicode="i" horiz-adv-x="465" d="M50 0l162 1082h204l-162 -1082h-204zM255 1366l29 194h204l-29 -194h-204z" />
-<glyph unicode="j" horiz-adv-x="470" d="M-211 -419l35 155q16 -6 36.5 -10t37.5 -4q54 0 94 51t56 153l173 1156h203l-173 -1156q-28 -181 -120.5 -272t-236.5 -91q-28 0 -53 4.5t-52 13.5zM258 1369l29 191h204l-29 -191h-204z" />
-<glyph unicode="k" horiz-adv-x="933" d="M38 0l234 1560h203l-137 -909h72l324 431h232l3 -5l-400 -486l278 -591h-237l-219 496h-76l-74 -496h-203z" />
-<glyph unicode="l" horiz-adv-x="465" d="M50 0l234 1560h204l-234 -1560h-204z" />
-<glyph unicode="m" horiz-adv-x="1547" d="M36 0l162 1082h187l-10 -142q56 78 131.5 120t168.5 42q86 0 145 -50t78 -149q57 94 137 146.5t178 52.5q135 0 201 -116q44 -76 44 -203q0 -65 -12 -144l-96 -639h-204l96 640q12 80 12 136q0 69 -18 104q-32 64 -115 64q-68 0 -124.5 -53.5t-91.5 -140.5 q-3 -25 -4.5 -40.5t-3.5 -31.5l-102 -678h-203l96 640q11 75 11 129q0 70 -18 108q-32 67 -115 67q-65 0 -116.5 -37.5t-89.5 -104.5l-120 -802h-204z" />
-<glyph unicode="n" horiz-adv-x="1008" d="M35 0l162 1082h186l-11 -155q58 84 135 129.5t166 45.5q139 0 205 -107q45 -72 46 -197q0 -60 -11 -132l-100 -666h-203l100 665q10 66 10 115q0 69 -20 104q-32 60 -119 60q-67 0 -123.5 -38t-98.5 -104l-120 -802h-204z" />
-<glyph unicode="o" horiz-adv-x="1008" d="M75 526l4 27q37 250 172.5 399.5t336.5 149.5q191 0 286 -156q69 -114 69 -271q0 -58 -9 -122l-4 -27q-38 -251 -173 -399t-335 -148q-193 0 -288 154q-69 112 -69 268q0 59 10 125zM279 526q-12 -74 -12 -136q-1 -88 23 -150q40 -108 155 -107q106 0 180.5 112 t100.5 281l4 27q10 70 10 129q0 89 -23 155q-39 109 -152 109q-108 0 -183 -113t-99 -280z" />
-<glyph unicode="p" horiz-adv-x="1008" d="M-25 -416l224 1498h173v-130q55 73 124.5 111.5t154.5 38.5q165 0 240 -159q50 -106 50 -254q0 -75 -13 -161l-3 -21q-38 -249 -153 -388.5t-288 -139.5q-78 0 -134.5 33t-92.5 97l-78 -525h-204zM280 260q18 -61 60.5 -94t111.5 -33q103 0 173 103.5t96 270.5l3 21 q13 85 13 154q0 86 -20 149q-36 113 -144 113q-66 0 -120 -39t-92 -104z" />
-<glyph unicode="q" horiz-adv-x="1008" d="M75 507l3 21q40 269 157 421.5t291 152.5q80 0 137.5 -39.5t91.5 -112.5l42 132h167l-224 -1498h-204l77 515q-52 -59 -116 -89.5t-141 -30.5q-164 0 -240 146q-53 99 -53 240q0 66 12 142zM277 507q-12 -76 -12 -137q0 -82 21 -138q36 -99 145 -99q64 0 115.5 34 t91.5 96l82 550q-20 62 -60.5 97.5t-105.5 35.5q-103 0 -175 -118t-99 -300z" />
-<glyph unicode="r" horiz-adv-x="630" d="M37 0l162 1082h187l-10 -149l6 -3q43 80 105.5 126t136.5 46q19 0 35.5 -3t28.5 -9l-50 -177l-87 5q-62 0 -112 -40.5t-84 -113.5l-114 -764h-204z" />
-<glyph unicode="s" horiz-adv-x="902" d="M39 318l2 6h189q-2 -19 -2 -36q0 -78 40 -116q50 -46 133 -46q77 0 130 42t62 105q2 13 2 25q-1 48 -29 82q-36 42 -148 94q-158 63 -231 137q-59 60 -59 148q0 20 3 42q18 129 129.5 215t274.5 86q161 0 253 -97q73 -78 72 -180q0 -26 -4 -53l-3 -6h-196q2 18 2 35 q-1 57 -29 99q-38 54 -115 54q-75 0 -127 -44t-59 -101q-2 -14 -2 -27q1 -45 25 -71q32 -34 149 -91q161 -60 235 -139q61 -65 62 -157q0 -20 -3 -41q-21 -140 -134.5 -222t-283.5 -82q-175 0 -269 103q-74 82 -74 183q0 26 5 53z" />
-<glyph unicode="t" horiz-adv-x="614" d="M92 937l21 145h143l41 269h204l-41 -269h169l-21 -145h-169l-97 -644q-6 -36 -6 -62q0 -39 12 -59q20 -34 64 -34q17 0 33 3t36 9v-140q-31 -14 -68 -22.5t-75 -8.5q-113 0 -169 76q-39 53 -39 146q0 42 8 92l97 644h-143z" />
-<glyph unicode="u" horiz-adv-x="1008" d="M100 451l94 631h204l-95 -633q-13 -86 -13 -147q0 -66 16 -100q30 -66 112 -66q74 0 132.5 37t99.5 105l120 804h204l-162 -1082h-173l4 153q-55 -85 -130.5 -129.5t-166.5 -44.5q-144 0 -214 116q-45 76 -45 204q0 69 13 152z" />
-<glyph unicode="v" horiz-adv-x="903" d="M114 1082h212l78 -757l4 -85l6 -1l31 86l302 757h210l-492 -1082h-181z" />
-<glyph unicode="w" horiz-adv-x="1328" d="M122 1082h203l34 -720l6 -1l305 721h146l91 -729h6l247 729h204l-414 -1082h-168l-94 701l-6 1l-300 -702h-169z" />
-<glyph unicode="x" horiz-adv-x="903" d="M-45 0l383 548l-212 534h230l113 -395h6l233 395h234l-373 -534l221 -548h-232l-122 408l-6 1l-243 -409h-232z" />
-<glyph unicode="y" horiz-adv-x="903" d="M-52 -419l46 150q9 -2 28.5 -4t30.5 -2q57 0 101.5 51.5t73.5 118.5l54 113l-180 1074h222l77 -709l5 -72l6 -1l329 782h223l-574 -1250q-54 -111 -132 -190t-202 -79q-24 0 -52.5 5.5t-55.5 12.5z" />
-<glyph unicode="z" horiz-adv-x="903" d="M-1 0l19 128l619 797h-488l23 157h721l-19 -126l-624 -802h527l-23 -154h-755z" />
-<glyph unicode="{" horiz-adv-x="601" d="M54 535l4 31l12 85l4 30q82 0 133.5 62.5t67.5 173.5l30 215q24 177 110 292.5t259 167.5l5 -2l24 -107q-91 -36 -140 -126.5t-67 -224.5l-30 -215q-16 -110 -67.5 -190.5t-139.5 -120.5q74 -45 104 -125.5t17 -183.5l-30 -212q-20 -138 3.5 -225t104.5 -124l-57 -115 q-159 55 -212.5 174.5t-29.5 289.5l30 212q16 116 -16.5 177t-118.5 61z" />
-<glyph unicode="|" horiz-adv-x="449" d="M12 -270l258 1726h177l-258 -1726h-177z" />
-<glyph unicode="}" horiz-adv-x="601" d="M-83 -264q90 37 139 127t68 222l30 212q15 113 68 193t146 119q-79 41 -111 122t-17 186l30 215q19 137 -4 225.5t-103 125.5l55 114q158 -55 211.5 -174.5t29.5 -290.5l-30 -215q-17 -116 16 -176t119 -60l-15 -111l-5 -35q-82 0 -134 -64t-67 -174l-30 -212 q-26 -176 -111 -291.5t-257 -167.5l-5 2z" />
-<glyph unicode="~" horiz-adv-x="1182" d="M98 466q21 147 107 242t202 95q70 0 131.5 -36t121.5 -105q37 -52 71.5 -75t76.5 -23q49 0 95 58.5t58 142.5l141 -20q-21 -147 -108.5 -245t-201.5 -98q-72 0 -131 34.5t-120 107.5q-41 50 -75 74t-75 24q-51 0 -95.5 -56t-56.5 -140z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1004" d="M73 521l6 38q33 224 146.5 369.5t290.5 169.5l33 220h164l-35 -230q113 -34 170.5 -137t36.5 -248h-191q17 112 -21 177.5t-118 65.5q-109 0 -179 -112t-94 -275l-6 -38q-26 -176 7.5 -282t149.5 -106q72 0 132.5 58.5t75.5 156.5h184l2 -5q-17 -130 -104.5 -225 t-209.5 -126l-35 -237h-164l34 229q-161 25 -234.5 175t-40.5 362z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1048" d="M51 0l23 154h8q45 13 82 113t53 206l16 145h-144l23 154h139l31 264q32 213 148 327t285 114q171 0 255 -109t57 -286h-203q19 128 -19 183.5t-114 55.5q-72 0 -128.5 -75.5t-76.5 -209.5l-31 -264h335l-23 -154h-329l-16 -141q-16 -97 -52 -180.5t-90 -142.5h639 l-23 -154h-845z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1084" d="M91 314l18 120h311l25 170h-310l18 122h262l-247 730h227l185 -635h6l373 635h227l-465 -730h253l-18 -122h-308l-25 -170h307l-18 -120h-307l-47 -314h-203l47 314h-311z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1462" d="M117 729q49 327 265 537t486 210q254 0 413.5 -218t112.5 -529q-49 -328 -265.5 -539t-484.5 -211q-256 0 -415 218.5t-112 531.5zM220 729q-43 -281 85.5 -462t354.5 -181q213 0 401.5 187.5t228.5 455.5q42 278 -86 458t-352 180q-215 0 -404 -186.5t-228 -451.5z M424 669l18 119q26 179 125.5 283t243.5 104q134 0 203.5 -80.5t43.5 -228.5l-3 -5h-123q16 106 -18.5 152t-119.5 46q-84 0 -145 -76t-79 -194l-18 -120q-20 -128 17 -200t126 -72q81 0 130.5 47.5t65.5 151.5h122l2 -6q-20 -156 -108.5 -232t-229.5 -76q-137 0 -208 107.5 t-45 279.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="787" d="M138 542l24 155h507l-24 -155h-507z" />
-<glyph unicode="&#xae;" horiz-adv-x="1462" d="M116 729q49 327 265 537t485 210q255 0 414.5 -218t112.5 -529q-49 -328 -266 -539t-485 -211q-255 0 -414 218.5t-112 531.5zM220 729q-43 -281 85 -462t353 -181q214 0 402.5 187.5t228.5 455.5q42 279 -86 458.5t-353 179.5q-214 0 -402.5 -186.5t-227.5 -451.5z M434 316l128 850h248q130 0 199.5 -66t51.5 -189q-10 -65 -47 -111.5t-99 -77.5q54 -27 73.5 -80.5t8.5 -126.5l-8 -56q-7 -44 -8.5 -75.5t4.5 -51.5l-3 -16h-130q-4 21 -0.5 58.5t10.5 85.5l8 54q12 79 -13.5 112.5t-97.5 33.5h-147l-52 -344h-126zM629 776h134 q64 0 112.5 35t58.5 97q11 80 -19.5 111.5t-121.5 31.5h-122z" />
-<glyph unicode="&#xb4;" horiz-adv-x="620" d="M220 1257l210 261h233l2 -6l-279 -260h-163z" />
-<glyph unicode="&#x2000;" horiz-adv-x="842" />
-<glyph unicode="&#x2001;" horiz-adv-x="1685" />
-<glyph unicode="&#x2002;" horiz-adv-x="842" />
-<glyph unicode="&#x2003;" horiz-adv-x="1685" />
-<glyph unicode="&#x2004;" horiz-adv-x="561" />
-<glyph unicode="&#x2005;" horiz-adv-x="421" />
-<glyph unicode="&#x2006;" horiz-adv-x="280" />
-<glyph unicode="&#x2007;" horiz-adv-x="280" />
-<glyph unicode="&#x2008;" horiz-adv-x="210" />
-<glyph unicode="&#x2009;" horiz-adv-x="337" />
-<glyph unicode="&#x200a;" horiz-adv-x="93" />
-<glyph unicode="&#x2010;" horiz-adv-x="787" d="M138 542l24 155h507l-24 -155h-507z" />
-<glyph unicode="&#x2011;" horiz-adv-x="787" d="M138 542l24 155h507l-24 -155h-507z" />
-<glyph unicode="&#x2012;" horiz-adv-x="787" d="M138 542l24 155h507l-24 -155h-507z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1230" d="M166.398 649l31.1992 155h933.392l-31.2002 -155h-933.391z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1446" d="M171.796 649l38.3994 155h1148.78l-38.4004 -155h-1148.78z" />
-<glyph unicode="&#x2018;" horiz-adv-x="474" d="M193 937l30 202l131 317h102l-50 -318l-30 -201h-183z" />
-<glyph unicode="&#x2019;" horiz-adv-x="471" d="M205 937l49 309l31 210h183l-31 -208l-131 -311h-101z" />
-<glyph unicode="&#x201c;" horiz-adv-x="724" d="M171 937l30 202l131 317h102l-50 -318l-30 -201h-183zM499 937l30 202l131 317h102l-50 -318l-30 -201h-183z" />
-<glyph unicode="&#x201d;" horiz-adv-x="717" d="M170 937l49 309l31 210h183l-31 -208l-131 -311h-101zM506 937l49 309l31 210h183l-31 -208l-131 -311h-101z" />
-<glyph unicode="&#x2022;" horiz-adv-x="651" d="M159 721l11 72q13 90 73.5 144.5t150.5 54.5q87 0 133.5 -56.5t34.5 -142.5l-11 -72q-14 -92 -74.5 -145t-151.5 -53q-87 0 -133 55t-33 143z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1255" d="M58 0l30 203h205l-30 -203h-205zM501 0l30 203h205l-30 -203h-205zM921 0l30 203h205l-30 -203h-205z" />
-<glyph unicode="&#x202f;" horiz-adv-x="337" />
-<glyph unicode="&#x205f;" horiz-adv-x="421" />
-<glyph unicode="&#x20ac;" horiz-adv-x="960" d="M68 511l18 119h127l26 173h-128l18 119h128l4 23q37 252 182 392t351 140q48 0 98.5 -8.5t103.5 -22.5l-40 -160q-44 16 -91 25.5t-95 9.5q-111 0 -196 -102t-110 -272l-4 -25h400l-18 -119h-400l-26 -173h401l-18 -119h-401l-1 -9q-26 -177 26.5 -273t169.5 -96 q48 0 98.5 8.5t96.5 25.5l-7 -157q-50 -15 -104 -23t-107 -8q-196 0 -304 143t-72 380l1 9h-127z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1119" d="M218 1371l12 85h336l-12 -85h-120l-67 -453h-100l67 453h-116zM550 917l80 539h116l62 -392l6 -1l181 393h111l-80 -539h-94l46 314l-6 2l-155 -316h-53l-66 330h-6l-48 -330h-94z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1005" d="M158 649l24 155h718l-24 -155h-718z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.ttf
deleted file mode 100644
index 02fdc4eb0b7c4aadf876f361f147d3e93e848c16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31120
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-CondensedItalic-webfont.woff
deleted file mode 100644
index 5e79ca7d2e4fb7936bee8201e193c17190733ea9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18428
zcmY&-b9nDe)a|csPi^bewr$(CZQG}|ZQHi(_SC1g-QK?6{q7%kp6twCD{E#aPcpNU
zjGLUOC;$lXQ^Y<1NdMIyasL<p=l}mjR8(08002t*VX=P<M;`-DPE1%t^oOha!MHz0
z0B8h&ipk3<{cv*t09Z2sfO3U0bE7P#q#_6aK!pE~=0_*&D(xbtM928UmHlu(dVqeL
z6ojpjje-3S_wm#ICkD`h*4DX+k*hNS004#Yqf!0O;H{BVOzq8Vez+ekP(1(uYy#gz
zS88V9^n;;^e>9N)YY1l69;QDWH2}am1^}pdUy&YQo0}LI0{{XKKboKT0M_@2lN0kF
z5&#e+|H1!V2QdsUsE4_Yv-=Mx{=YFW7IuC+TiY4^=!AaG5AgZJ!%?ea64)5H|HKvk
zk0bccfXadDYz=Ho000r3AAJ0yn<KdwIJLKPas~iIL4PpikIm2;FbCK>n*6jCqyN!O
z{czei(|KO*8%Fy2`o@63#O&8lg14qlKf0tG0D$)jY!UF^F=KuGT@XVka0Goreb50_
z0#l%S48SiSK-*6z?i*X`I@TyEC|{<VG?%V!otp!|A(H)fWPAmAACRG83$~REihuYi
zg414%4VNGafbSHM@WOd9-03mmF$(Fx3xtta^y|I^lJZzEh(htt8#-wsQ-(_Mdc9oD
zQ#aQyQ_O$Qq+ZWVr8~`bAOGcg&cS2{0JlNk?=iFTY{WPwDFP#=k<Bd1@qELWjBVeh
z#~ver`ef$|*?SjP@L*#{RJ)^X)}z<%63`+-Jsi+=Z=Anm<uQRknZ+;ubLN!ee9r=z
z5jd{9r=1Lvt!3JU;RLZ9?h}BZj5awPh2aQ+b%e#et9&A)x)zf6tk(pui=HJvUPMa4
zY^swDBSt*bVXGhxCD#yRz3EY)&67|xCp|ExS{H3eJhyNlva(G8<s9FtGSbY-dr}&4
z(maWqWd>*I^3*c1GXxp9xj#dvPR657rBWxfsQSnA&g`C*607howfu@85H)J~WY?`d
zz`DV(u$ZK(fK|jSVxhkI5kLgufseYx+$?y9>r!!Ql;C-cnOdajuF<oalVwWPYcU;_
zB0*y}$9NKpkGK)pcB#e$2Q@<2&rXaH25J;1Z$+nI2GO4QS0p7b1dX+B6t_r@riGxW
zrS_gze9|{t1ZV<_KDEI^eL$lTrE*P{XholKzlsUWMm>zPimb!{Ss`}%WXQRt9olWM
zT)XVP99XHo?xND+^N<`Kf-yN@!ZUfaF3U$xAd?EwX?y<GKg${OUf&Rf)Go37o1L!h
z!qua6C-%s$=k}A#h*dSymCy0=-(u_g;w8iJpX|t2Lxa_GT7E8Y*R4&T*sG;y<Erz~
z-sK&`bssI}&XVaeh;wdpSB*^5)n*G<gUo5XD6hKZAR9dE=e+epn+%<ul5t>bSI;?P
zC{`_Ibby;faXampGu~5M)1w!)?zn+mfM;Rzj#6FExQ%s&_Grnt&rda0GJY_#FoC#o
zR`{>V)c#YQpOz@rY=^;=AP2|A?mPD$?oYrtw+%SAIipf0sZz5AquT$Ae2K@LUMG`?
zx%qdmKO67wVLzkKb;g(}qijpUWzj3?$$rP?uuDtixh48)GOZ8ag7^PyQ_WN_EX=9t
zPay7TRx?IZv#kSat|MI<U!H!UuTR7)FRHd<EF6>|cl8&hS9nR!|LFg4zOWcf1bgcg
zeVIIahZLgFZ1^gA5)a?Gv}<O426A>^waZOftt|E+zKu?IjNfB_Ohk-n-EoMK{uZN1
zHz~RckWN@7CaRs_UFM=gcY5=6F+O)>RHNkj7wk>6>GAkiAHVmMz=~vIJ?Xm4@%+;x
za_iF3;Rg8>H^q?{T7)qDc|5ubmg6`^S=BQtt7IoDE;lUq-dn+U)yc99M(Zo5bJ$mt
zc9Jkh&K_L&kj%GJwJ<}ko=`)-$Wdj6J{0p+yocUX=uujEkZn}#IhRL+LJagR<a#Fk
z0<!b7og;_v*}^ioceVKg#fbBlm|M}&&D2zjS!=FSZuA$v(S=-z`E*t9sW*$5C^^^p
zg|DKM-xW2Er*5^0aa#ysG>`7}>P;89ZpO}mw?o{g<5|i($W{BhDU~*a-@jsbrUyTf
z>aW_eVd;T>>H?I;2&5^(kF>DYB^`dyx;Tt5uLwu#0iUEDxg>oCg@9sV%oIc*YBI|D
zK*$5a-{Hx^kd@(-%t(k;gl%Dn3PTZC+=5Y~2kMgz(P{oJ!p&b~>1E#%hHKK&f@Fw;
zXod}6OywqeSWCHzkEKb~%Jnui`W?Vx9y(&d<;#8B7<@i$VPkKs3Ou(C@EQYm0)}00
zOtPO83Vy(6a_Mi#ihh(%AL;yj`_|RT;brhFXF+;CWddA?{m8=7-<Qdid@*mxDt<VR
zrNDH%B2Vk?Du1?w(|CSqe5V|p^cD|a<i56|7`)3o^b6Ok7P5!%sE3tfwR_rFaBi*-
zFtE9reZe-?j(Yvf+W?>+`vt%O-~oVyMWvO0GT2X^006$f|J(mJuN&!`+L~nb^-cBl
zaYinu1q3MI2{P#!iyIm8gTrH_Z9~wL3xlNpBJdS3QD6We3K{?bXASk^=iO8uk^2P`
zb^nQpiJ@Ml&gQ?&00fA1fwTUfKK1oY{q-@yMZpo+LH;oWzEZ<r`!|6H0mlvZ%a7Li
z8!!wih9<+DW3-UlQ-qU?Q;t!RQ<PDhPz_O4DJUx<dG_6W^T~$+%OC!(n`q`whWQ2j
z3+WeQ8s#_Nm*2^E|2M?f^=I$-_X>mtydpj^kGMO+J;9y8E=ckF>J`~Gm7;k_#~<>(
zu@QjU%or$f+8ipNdtzW>WTt<7czSShl#YO$nEE#*DJ>xd2@MeyS#4ffQB^@jNlkuv
zadly3shz&Lv9+P4sjY#9iH(t!+4b(pzl;5|qpQ8s!^?y7V|)Y*6dWWhG(1F1R9s|i
z^xQb{V5&qVe}nP3_?0XuWQpODDqbjQ73GyBRh6K0nW11Hz)ioj0^myu0089#s|92L
zd;#%*6hIE32v7lN2Mhov0cC({KqsL0#~%WW{@_`_3Sb{l4+sJT0HOi0fJneJU>wi{
zNCeCSx&gI-0)RKb5TFIn`R_jJD0Iqd2_S62!h-}1tr2i+pfsk(0bhr(iWAh(4ve`P
zaR_ciYyUIU?t_pgPzZXm0yigDDv}9`gC^z;kPA;rXNf3a=HhB}nn`DpnuxD(v*<o9
zcR~~2vkfxM^d&3W5b=jtc#IYm-RLKxVP*0>?C|N0?KfpUl*QurnAMsP5?z$dL%VGE
zW8@3k<NcoGh6qYA&B)O-BjgG0^JcQOxM3;OaQhU{tLM~)1rJ48RQ~%osyy-YL~Gk%
zwy-i~xY-l_=1T)Nx2%rlU(Dq!^5l&%gmQefu7V{ksp1<Kwl`qZSyrZD>T$Kty`bh?
zE0T2D1%j(n$q5WQD1-`mpow6V5(*Alqht^qA`TOj<#21@qmbuK2xhQLSeR)us19)W
z$3kB=y@=B@WvaBP6-MuiD0Z_&H<AFy+mO#H8oU;x{!1S?K2AZUCx66=E)uAH>5B=0
zMBn4>QjZL{nu`^Y&cr6$C<-+&XNPs?)ns_9Li<=Gztc^HMfo)8NQlmC=KxVIHe@fa
zes}uV$FGq85;hVWHUp$TZaaGWdtTFJNM#!uf8CCyu^#Qe!3P8Y`Wc7t?i<72Zr&&+
zU*FtHt=HCe<ECt#<0Wy{Ya~!o65`~7Wq|}b83ZB}fxpWL3h?y%;nq6y`lf8>xF#{>
z=Mzs(Bg)E3OVwa<j<dJfFbETOjy+6W8wIZ4eSGwG_<YSxOD|@)XG?qd4l)0fh{~gM
zhi6JMB=N%*ET9xnYH7qcHY6t?*ohd!OLVjeXPcYQBtaf)C>+U~Pzl8t^HdaBzLD7&
zXi2Q0;R%E#k#7`h56FC;rXyZ#qWsOl5?45JlKnl~Cg~G8L~LSw7Iz|?VYC}3mk^eR
z%y@YfS2hQgIn@V8BMH21HjRsfoeJh87Frlzqj)rp`!cSW{T(u*kPS_tRveH_{xc_J
zf!NZTf`+;&FECOmt4R%hK*HDaQqac`Gu54B7gV>l?rd+zd=21mX-UO1^o()K^+Fi^
zBPVj9N-i;ww-7CrBTcMMidYzIdIe38c8K65WLkl953UlT_p%DJUKy!BafZbU1B=CK
z?q?%zxeOTrD;0XFDheuZlJHbuY*N4+`W0&V66WaT9>*xOd4ZIg;LI8!C*j#?EZyIS
z`xsM%N`j4Otw$Yc`Wri!F0zCOJMEYY@m^_m{VLaUiDQWT4=$7wq`ZhZX|gLw_9AUA
z{!tv-jkmKXayq;t^w9*24HbEmX9DA}i*Xj79l@DIlOuKeP<a1u?}#9&u5JBLDe+&!
zB;OILxgmET4BiD7;F$LDg;BeX=agD5XC$fQ*n0^PIO7J%>_U;fs0^687@Ds(Ecs!2
zQ**xkK=4Fbcy@a&nB8&^T(%5G_Sm>DwwR5Rpn3@7E21s3UBf%Kao2sdUH{bVXZfFa
z!PehV_OFct*X_{u?x*PEO>d@zv2#2H4C>0>vi$lG){k4)O=4t<jS~@{E@F}<VvC4?
z{Uky^pb+oS9d`M=DUM#Or^9CKYBn9V=FeN~zMAhZm&I^%wY~0}#cH>FZQf2Y3e9KH
znk=b2)zibiTPV3&$s_0SJ|K<-RLatMmZw%fwv<U8VUuY`Hxx6HG+KysX0Rxk1}BW(
zB+IGe(dzfv6B_hZ<Iz4}{+I_*x$dg)Rn;;AR|^zqgZ~XL?}~_MfQ`90i`PlwAsDos
zE2fkQJ<g>i{!4+(WSBl3;1};Obiv=J*fo4SdFw$+#3?!1=q!jLAI4g&sF)6Gtomo&
zgcVYZHPafhzjTZC{Nv`dUScolU(4jSVP4UNnavZ7iE~(C4oV!$cxPfn$6LpOI!lEe
zKf$#i0#tm*f;a=+jV(NmdK{|AS>^ncQBLvwv94LOv^vSw@jadwfxFL53vQ3m(=C%(
zRfGDdu7iE*>ho1$z&S`K@xz5tW{p;Z{bwIy?d8s@t>1U>u^ru3lh<TIBpp8Y-SX#x
zRm))5C4SJC{n9<pPMw}pt&-`4D5`?WlKvUKatG20-SaW$0(G1g?JlP#geaAUQ!zJ!
ztBz>H`95bHGchgva+&(O9$!U@|3C_V3%av}i2kn;=Nh7+$3F?RGAsQW`83Za6vUEy
ztnFAcaG{NjoPGpm5aEh8ncAvrB*PnJ2ERi<v$xKveuWsBEQ44=<We=C_<j9i2)pb1
z>SK(A74GZ<^D1Bo(Eu3Bk^WUR7Kq<hgt#LJy(vO0m*)4WS$%GQ>YA_jyAQR(6<zI-
z!Dg#9s=A-~s_eDkU)(JxEo4|{cg{ehVT`X`ld18^WYd0bEAPp7Xc#xf@uzDr8nxT<
zy4kp8<8J@HP`k(&VQOV08>Q3TVD$YUnbexG&8T}k1zDAC+baiIjnQ))Z-YXn(_IO)
z!4rA}$)N$x3E|fQS1c@R!q@61Fx5n17L83;9R>DMbQt##bPedn17*B+3@m;OfDsiK
zF6Ni4Xl!OIXr-?CV+c}FyFw~u43{ge8MhlTbXTGq3$_510JT#^rhIbTcHFWd+4y}4
zVYhKuN1Nj^%|`{1nd>r}>%8d}y}00{XU%7l+uODGmM<A=Hc{s091=gNB#~`kzE~GI
zS2BH9@Cq->OOC(ceA}|eluQ-6#bUBKUcRHfF!xfbSKD6f$Ktud`lk8DfB9!b!er4Z
zY*t&wK<gIto;x98C!@fV=B6rRR1m4QgGwum+B|{dx#@-pUt~NSY@Be@n+>#t*1vAi
zyP%+r#+inD>}D%f5<(=WQ=q(bXO9k4CLia~wW0^|mYHbIH5P%Qn2rAN<m0o;>%N?Q
z(XW44;_C_h1RU`)Z_sJ(ZdfwFaju-ZKv}QF9c?RCkjE>D(>WtI=6ZN(eb3doYWtvN
z@RFRc#eK1rMS42nwfSR44V)e%*$nPx0wi*NXU>=`BU+YLFVNKWTlO`%tm^X1k@mNd
zR$xtW=NgJh{!Hlt3@oz&kgoaxk`O(Nt5kt#Y^2<3<pV%+&IVvZ40j^nl!oUnb<)q6
zN5~mu`oW|BaLyAb77kVaMiPCU@>lUI`S^S|6P?F(yzyb(2K{&8-B#2kGH=?`Pa5!(
z9AS#-2zt%%fr}f4lPuV8m`MYDFgo!kBSr#*)t#2W=yyCuFc;h)8t#Ux06{njnr7o-
z@=OA*7}&Xpg|t_=ybQ#oj=>EnV0PtUVb;vM)Ak;y)2wl~_wPl$bH?YgX38`GjEVG9
z#MHt4HqrNm95Qyy`R%@k^N4m)d8PRL35=)yjF7lsUpT5?A=FD^1V)71U#cByT>w-@
z-3b^JR7f~u9CdxHRIqJocF5j}FPY3chWvh4PH{f|Z*XQ-X><QIxQ{Tv%3kK2t|SE8
z-k6NO@qjBG=RtAM^A<!eE+`v$eoVhzrOHEizL9O%Utkb1Cp7jzJ|(+g!kxU`&3>cN
z8w}5!i}oB$VS93tJmL%qzZXZhR~B!T)ptr?&AEHnMUe|X|BgUO>{}4)D%00)_c}0#
zc6lN%rQ<PgY&!>6381=7B~HEHf9?MyKwEnww%jh=uaRnH)$q?qe_up_D}s#4k|4VR
z6|pKxTbYjJYp#Js7mq!?Mb?U8PbT?we=W>k12d)4^-Q|u*uC8iyLnmQ@r0WHQ<HV2
zbV_QJg!tooHw7JrFP6)Df8H{B^MSZ4L<)C*P*$#-p`yTEkI7gtEU%?q5)3z>@&rn1
zm_cYCl>eB_@jk!c5zT3(qC{MS)t}4iuB->#5NwF|P|MeXZ`#}IHYOLuq1ucNXiQhS
zvF1x&aEAmXK@eT(kC7dUT}Xc*Pz`9)23#a|`%@AJ&(~Q$=|3k`iD?K?2^+d7EOSDS
zA){I1p4h4B7$T8rH@%o{VmDz!)tc$va6WODjWKUs^hCh@{p;C(n2EnL_Wkrwnm(P&
zQ(3k5wCf-P`Yq7kR#8^TqBq-b|L3NSyY7Hu;NTAQA-TGsyaCd?JNz&&W0z_pf(Qi(
zA}L^McrP)Op){RefHGwC6UPjR=c_={o>DPgXQh+=jKSfoNjOs(IBtv<6=610h%dP;
zUg3Eroop9B2ke+Bp4U>Z=ViYWw+2jYd+JpE>&PV2rUe>pwoS<!*VNYIYqb`Aqeibu
zKeSN%^*ElaS76o2%C`4>LaR1%<xQ%!TGMAS#^j@4E*4+6zP5tVX_^b)FVLhH_~jn;
zBs8Ewv9r7hPb!Rd{ahi+6N_|K5J0Gu*AYkvv?38D^@iL4cVs&`K1!;>OEAaK>cD<x
zu)$abcOfS_XR$J#$2OP`Wrr!rs8%QhBP>AbM0c}t8X$^BkfM+Xv;iKLCQV+Rf0<B6
zM5>H&+H%14?D0&xBTI>-*^m}nU}2S3JIlINdLguURhXL>R&m#g^Md35imG5$?re}U
zEBuA?7NZ(lFCYBs;fzZ>*FWXrY#fvtn*Z&HSd3Ollh7QUh`UD{`43dgz-1p}hLSU@
z9Rp6ve`q%!BzG~qr3kXYQdr~5ux12j?aI)=6`C8CTSvC{tj&D8A(Q9IV$!S{2G2V=
z#b=9;rn<*a`ut#TzXm>+GltdvqC^Jbs`t43w$Mg;T}e{P!Y@OW_gnJxi|57;cde!u
z;q%Yl%W|X{#?%IFVNKyO-lJie<tU{tTI!_VdK8$TPC_w_5v;nu5JQ*DAZrs(6VHH_
z^;43uj6xW>aXq+U2FbZok)c!}u6Ul5M3oGZqDJP?6XY@=+ns8lZi4p416-D5q65gJ
zY;TKUGZB_0HA;6At&WA4@x2}*2=TCY!}mVy8XBD@+b?yK$?Ua==FpiTBQnZd-eGSm
zAdrvG&0-Kz#N%437@MRsrtA66rZbn_kNxP?3ISdYBq!5;MIeksQ@jL`6fz`v4JVZb
z3zgJ`w;KGkPalL{ogO5py#<DD*EtZbKrtIg9B5Nlv1sqNw>)F*s9+y7rw<(zIc_}g
za_T7pkuZRmL-(E@n`eSAIp=G;wOaz^E5~WuulG*lSx)j?2tNO`DSQfJF$PpO2VB>)
z3=*|eRNeyp$dmxuta2@8MSZOp!gl0_+j1YtPcSAB?Fj-J<q)XqMY66qBE%q7A>Kz%
zIJ1%D6~_MGWo*;+7PDJSwfyU}k{ECdu2f1*QxJoN*I}hycB&rdGjEvBaA0I^*9NcK
z)6g`l!^S`8*8I&Hulj<s^yJ#!rza^jZY_n+0hMdK?}Pg3)~)WnvrgAVmGhdN7RSRB
znu^?R@T1lI@w3Z}s{NalP%|~)MkerX*0k(f91YyH@$v@Ba7BmA3r4p9qyYg@GL)dU
z&|6m6caME6a0gUpS+zEHs+w0Z%35{0n?I5gqS)#g8DG)l;o{ms@w_^EtLL#&xUYz_
zERQaeVzmjtGaXtZlj-&t?Kxhz*$GE!j{94Ctz+91kz_X2H?MS>tWI*n*#h73X0})y
zzfSpHksGM|cnYJg@{{ldr?5M<%(9=C0zSnkDoVq4vr5-J>rsdd6#OqAr~c&R<oJOk
zY(O6y*_%=|3jU+8QhY2&XHrU6@~5H@BZ>x<wfA7pPg#YI%FlbB+=D#{5`56;C3J8W
z*@Q>izMExD{z@&tPB%+uli;1HEnvVMuXR}aINjHjg^#2S?3L<v4r}$I+%CYz_r>6O
zyBVyIiB@7ti%jR+KV~aP5JjO12q&i)f<6^S#;S1tbqWHEWY*=qF{S0_F0roLtnKq9
zL-0=x;R~XilM=V@gAO1(s{hsLf{W<~sH08zv+oEA0^|pzuGl>toL#XAUiJH~N`mnN
z--7?KyAMD#m&yI@y|1x;-Qo3_$LQ2)^<c7iq-8^c9-~Ru!^!cY8<+idVKvIsYpIu!
z#dHwb>|}bWU3WCW0zEq>7MpOJT?=yr^0#^kFxQQ%yzysLZPo>$lpNgwSMfKk+JKl6
zj@Xx?gtn<Yu)eW2UNJ`$$G4|?@=|`m5<s=NP3o>yfxb2$)^dZcvs6;w1elmUC*gs$
zoRb7~y?7u=*)B1VqI{e-T`^%2yq;2eLpDSRMF=MpEzB~71<HXlSlR`FbI)$>iJrUx
zq6ev<K)4(N@Q3(Fjs4sEfu{o@T8!mjauyGpK_+#B!Q(RUj1Y2*%j{A<w6kALae~gH
z#Qni+0%F3C!bvph3+;83hihot+r8sAMeTfIWY{X59Q~B2TfuI^JMu}aIUNl-tI3tv
z#Jomgsm%Kq<Z_VZxn=s58f`8m!PPZp6CO{^5+zr%R`NaNpH#J>`Pf`OX6pumGmF^y
zyLB=C`y4j`(i#71H2#bxocgIciDg|W=Z54}g)x{LLW+BWsw^yQgS@lx5J8*P>>idd
z+5RXi0bEf2ETB;#&n~bb0|5A37H_6o$P2ob6_Gr9U_uNevMG)MsjAS<(_7f}v)TyH
z2b=Sra7?0aMzAUcmjyNtRC#+?|E`{;{*-LEMFoGwvO;HHLVi^?E!=^^<Z#z7ED$nd
zs$dEecImw>P{yZ-y)w)43M}pVi$MDV$s|PYwjt>?6|h0N5iRf!nzh=BETF=F`}COI
z${~#-{t38y!K0UshST<5e*=-V-jJvfT$(`)i|fVPc++{xgoES?xOOyMf$TQfug`!O
zhC)ydaYY1rOt^5h9i|xz@1oxuLpE)+PyMNO{uPBFw}?%qZlSx-;V^OG_*}2$V6&k?
zkdcbjyIHH_(q_psge%^s?$lNC_fD2~D|1RVVVf%=49j=qiR+aIB5^(GpgNRa1PhZG
z)5Q&E$94UF8gGD$b3r6k#E@4n7A=Cx?ri4fbGKL;nYco5w?IEZjT@4AkQAkb4fU85
z4-}(pFj4msKtX830gojJ5qI5!+@6P1B`IVIofMxC1EWZ@RYf6e>Yo_6q1_fjAwTW^
zVpP@S(w~oGRQ?=}P(eRAT@7vs*sS%UrC;)&2)$T)$h(HbRp#XVG{0oth`JIa{innB
z8I$2z<F_vIDTeDMps}ItXR-Lfh5xVjW%80LN5ViW$mHZ#pn~_3Dy7W;d5Gl1Q5C`~
zeewsp8_7Cy+Xdk%k|TfN*vpJoqu~LOp%J*pEn>Y#zJv8KEM@xzKP`5gRG2_C-dM=I
z3tH#tG^<`Nq%tZ#d>oLrE{r#RTjz$Nj56Mf<Gr^r`B^FV>sF-S+N+5|JkWAf$Fq-Y
zf}N*_{o-{pT{4JQT>fWwi9lwl9chFAF?#4LW_fXj?@6N)Nb1f6V)ckR&bbq9DMQbF
z%Egd6BLk0gl*(hiohQgS$Yl8(Rpz=ll5_PJEbn+4_f{`%NY6dx6VwAaJlR&Q^7iUh
zd)P#DE!s$F>5)Y;g-?T<J7)}xTv(VHfk6PCehLFwT<4NPf_4Vp@xmJnO_11=)L@`M
z2=~^zrhKcI!O;Pt#?^VxpC~i5lNrsqY~LklWzLl4?5csL&`2Zy{bF%NIA~l&$SQpm
z?TQZ)Sm5FED=Qt}684t~QSXpMLHlAze>>1g@g`U!@6=B63^1876_h{1UWdXh08>j7
zXnl6}mT61ndQ;KwLPic16UX55K^Rwk;oJ;E^FB3v>ddOb&9=L@X)Qe{=F@}eR@%RK
zvXtLXd9gEgXH(uC4sbF=P=P*+hl_R<;ZE}fr{fA?TFFpB$d#GL%qsa5ZZ6**6GvJp
zJX*O2=X&9Pd8+PMXm*=2CpMX<Z`+Ve^~2>15*q?8;~pyHfJm_el0@TJapp3e7<vGm
zz~w#(cSfqJqpsWHlv?~#RuSwN!!Slg%WVP64r{l&G`x0w$LTPGPn`JF=n~+i`@i9+
zF-OrBg3$1|Jgjw}=RLBPd?<X5<q}V5wpIslMh1s^$X+W)v{6~k@tcLQW;S;>iddbw
z*FFRo%bw#8<nXv6vNI|mc>Dh4_I2wl{i38XY)9t5ih4OBZEMdoo^8$y`k4H2#X4Wv
zRkUd6h3q>Mpu)bAtm%z{qFRLwqu3)T!`W#We$`2FC|S;vk)e!di3i7?{(76vbPlp|
zd%wETD0kU5Zz5CR&2KoJ*Q-B~o(<cn$?77iiRt9KdDS)KQ?q&!F<WS(Uc|XcV?aVR
zg(2P_Bo53U#Bd^RcpyR4o}eeyR~iX#jhez(&H|0*?|`NE9)aW%lq~)&?BIzafLQW9
z{uD{ukF@bgnBgbM!C?nvf35cLc2#i&>0|Ybr9zr+LafF|8fMSwi8*Grm}ViINKBuc
z>OL6*XH9r;VMt7>=iWDg>y?ZL-*Q>1<mLFv3U|LKxmC<d1#)K>?a3U_|L7Vo4|0HL
zCEMo|k#(Eh`nbUg?Jd;M^cW*Z7D%*bk2BKBkW|$gr^p)1*9;nisy>AUR0qwPK3MLg
zNG#n5&NLq8Pvh*4Aj>oA?}}LRM7(f)U_oUl*YgOdZF6n9gLha+=Lq-tD3z#6<-J#H
z*`I=vsr{CG@JtjH>Q6glQ$2H1e$h6;-Dzj?(-hXP2iOsraaa#<M2r@DrlDD}mkQR(
z3YtEgp(H>;+kir;+sx~H3|^9LCZm1~(%(EIXu*QW<uUcD8RbCt*YN$UEdw!J`%>EU
z6OD#w8Lk&{BArOO8jfwzJDUkQMzX)f2SR1(C&EN%V{o@PN$ELVIS0<iG#~0f4I~S;
z8TP3~5d+!Kb3zBzYXfrzMTOL7akw2s!D8IS$(VjpR8x~~x|H*dWC{0ktIoaQ&^ngo
zAx*t|_lX3_`ZOEF_=>mRow?=K=DPg#e}nCOe_DkOJFCoe+i_$Ed~8Kbjkz6DmivY`
zNWKc3^1Erf>gyXRZB-bcci;Z%a1y_}J8D0PPA#Km)dcEd1!3*bZgf8~hC|;&1F6~|
zh5Ze*I?YefNY2Gl1L26WnQ>e;-S&~eknWRrfYt>jX4CNE$o*uHwFV&p@-WCCfW{&=
z00`mrH5w=G5r2L5ns{EM6<J|<UIU`5RqNxm%W`w7x_d6|h@B(D*TRRD!()%Q`DPsO
z!x#QFt7JiT<VQaF{VN*_&mHO;S|8~vSeam=nEuN==KJ=0$dB*HQHA%r(4NGR_WLv5
z{KqF!;rL2L(|4ogq(RN#Y7K-5wvS#)Nuadey_!u1)rLVe)Ckhqu^M)|;+4a@Fj8{6
z?y*|aQ3{t=X5D(6WK>{N)@ZJ1em&_JjK8@&4j<kqiR7m=&muAibATXhDJ#}pqV})l
zwgR#gpq!u#S57i0FC$V^fP0`qKg3d@WR&d@g{Yg@B19c3)>m{Lz$@!Q9mPgmiybnd
z@^(jd^oiMDJsy|ipdB}xn6MJ?rMyA=S6WrTYW4P;Uurxz!IGXlp?Y1=33CQoi-847
zSkXjkOw<B{0ugKf&EnF31Bhd3n*FYzS%7T*%P5lU_jZrVaDpP=_1wI+zXzRp(>=Lz
z_sP^>7knKTF1Wude&avy2>mS$6;#ivqb2Z|dWt<1x_fn{f;l&kp%z&6^~B6Q-(y!=
z7?U#RQh!L7<GfFq>l6s%=0$NLU<5TSMq;6)$~dTLS>g<f{tYx$0RILeg;=Cq9k8t?
z2fIBbm*>Jt4a)PAX<OLlXM90`9W3P`Nw>k&()boopDA#qh))P=wkM3D099ZonAUG=
z5vU$mt=#PsI)WeS`wpmD7D>EvswcVb*K;;&PKG?xK7w4e{|d$Anx>}2wtv1pjydvC
zp3QGnlL;D&uEcXZjH)JuONMj*s7@ye@n5)K$n4b&#XBg>F9yk&KUDhMjsOv5j_x&H
zNKrprq${K{-Cn5WQ&XmI-1}%&3Jh?#9Z|5iane{0I8M>C_v4f9)gj1KOT-a{PClw{
z-uJwpW~ACph=?J!YVUe#wnh-^ia85Rv);)_2^sWtObzqcEYx-?`h=9l`hIYmk@)y1
z?rU`0O~=c6Y&{-Tv)HhfFbq41ma;WeXNTEA!W?RMp{zSpzS7WV?!igfEXhD1mQ=>J
zMb_`DV|HCBhlIB-EthHVZ`rNOWYAcy!}hBvrw*oKvo)knkdE=$CH0tgsoM0gF0IiU
zWWn}3-&yZzRJQnjxO8EfYn`ez3tLg8!DYp6=81luCD$>3Umz3DxfjSgHzO9MQle6_
zpo}zF%7gI`mlqvJ@#U1VFD`^!E+qcL{W34Z*@NNp;_$psxSNKb6<}Hi&2T2N#QSHz
z_BX~U6wRbrpE~dkH*7pMVNRNte`wT3=%+K#9y(}AsO198>3IT-{~sS6x~AyUv*1Y4
zJnPV77`VUG=?wLvVkTH{_m&X$veme0_U^-uUH#@0(6w=v)cS&|+Hxq$bD)WL1a}Z=
zQ1**G$cT8CNoM!vZxCB%y4pijQo6wuu7s*?CCK%n00K_uBj$1+KR9OZ_?Lx+ZT8fe
zgn3|6_(gd1TH~2ue6;z>*o8#1ka@X@a=)fK^KCv<u0LPzCc5omUs=Aj?=r%r9S2(m
zp2TOqKv(a?+{Zoxm62Xnv}@xMNfWeNPzxgwptz8PhnEDWW_EV+)nJuqs74hCN|p6-
z)hUgmm|U905=bXNzwZ8}+TEDX=5}t9;&I{UJrlg0taEJf&H19jA8aSUG1geBgc|28
zGtM+&ZB-%-ol7tfY=S5)_Tq&&;Nc|AiRPa0UKwydT`782A74bS)^%QWo=pw#{QKfO
zr1t^&rkeXqPa+<2fD1E{P{g&R%NK45OL<ZZ++dM1?c8-{r;_%+;AqS^q<3Sm7;?-I
zB19F*Vb1NNw{Ojd^O!SSt?9jXqzVgRb9JNH6dAcupM89YCgvTw1uNm07!DZ|@C3rd
zd0=;P*fV(Aku&x(6PT}GShQ)9W@>jvkY~GFJ12+iSbXFioA0KVLr*{E*5&|Q?X$u~
z$nGA~pB26SwSLvhq0xa|fh!oN#nFUzZ($}fZ#<+Z7-&lke$WV=SA4$ey>`tfkqmQm
zNB5h(!dIeS9e)^o(1YX?LSb+dZc|^#k^)u^B|#D_3r*~B@IOtQH*x#>Iwc(H)&;@$
zUDt`zog@sBgh*d2=1H5sL#(00_ZPmLHS>Z%5t9%V5r}y2H$0K2>*WTR5&OtjI^N7D
zh%a&hG3oXn={6$H+T!80%>`f~_NUKi#%K8AMEy<3p-r`V<T7@aB+pdIuzHnBe#=J9
z4S|CKnwVZ(b_8b4$K>j%-CtqtidacQ!{7_pO9-hIa$`{T-B5_55e*R1o}iuj7hc#b
z8SvLxMQ2LC+^omG<k9o=;9?l9e;t#8@6iaEu;=m>lX|Ilah0`V<d%UK>W7T!{8`f%
zZp)JycWG-;mj@<;*!-vNLRk#{QXp2z3McxgacnKZpk1xtK-30m|0{lB&410`(?7Nt
z%Nul6CsxYp=96*OO)RI$p=T`VJ_Re5;J)1FSq^_Zmg#I~&wOZ!kKXA${GS($BX}n1
z79!;umlM<3^DYxr<cE;d`B5u@@1zuZvvqh9WvBr~XnAEVEfW?rG%1bHVg_1BA)c5_
z8NMdxTXLm81W8{I2tk2tMX;ylBvSlR7`i`4tcQG5fQLm*H)IhDq%$kP!-&K0m1<f~
zHHaDbU&-=cEZI#a+ALA>{!M1<`-ueUKb9iQ2bA-D?8TQAxS;IwyD}02S{dk(P|cCu
z{8~Xm&|K-%96(G7KkHX>k|{3DE|hqb9Lv0guII0EtxIX?3%xjLt|Dza!kbGBQg$~W
zj;&#;(dwuN-COUOvtBm|og*@CE)=+lWEcF~@kTov=NZe49&;1WGfJ1HM04guV-}b!
zL6Tw(E+_n;lO_b=POnWHBq2q2Z75s<!E=TCzp|@^YW(FIM@v{h&#fI5Amzr;0KKM=
z!^*v)f2!C|sf9g5LeaC<m%LPEM{X2`x?R2>5X1dK?o(wu9!%-%glG0A#q>;kVjRBe
zI&DmmtLZ-3DzrH+GZGra>)JbBBS$4i*<|q=tha!_@?D$E4r}^_zx8#iWDY*5ENfGZ
z#Vg1O{0|zupST<s2U3RhPy4=dn!b-E1ZiJ>%YYJ4%+Ripm7iNPZj*xzM<FZ)D5LDz
zV6}KC68bAca(1so#w-A@6EW^Nl%1@bPu8vQGwd2k!tHV=Ma<2{R_3=cFcgFs*MG!G
z(|kmmOvvJ5v@$Z@ua%e1_i2^z^4bD84ID-2Y;+ZP`#DTr60(7uN5Jyczf%w&9%^b^
zo1%J+_GqRLMqsnG`TQ>IH8B`&mz;uKWil>*DWWb(QeFyKI%*bU3jeAmOoV^V2)19Y
zWTZvS=|e!4FT@#EG`Nm?H(1gr0~c1%%4kN952f(hIB`S{Xnlu_N|I(>SAiTUrWV$e
z^fUp3_G3>C=|d_YCFS1B+Oj~Dj5`c@C`#I1@ez;x^`^t)@gC=XAXOPVh5g7AU1JPp
zX8yE9!;H!oJ<+1u)ZODCV|1A{BH|KZ1ra0ktnIqf*UBN+W$o@Vc~C)14fL#kTnVt^
zE2yc7)Aql<EwaGAirnWiE+vcaizeYt$-=pDJp{U#&#qMVx*)|{C6WA{X4IONzZKQ7
z-G78Mjs?NcIReCHr^rZTcp%N>J}y}6;My+XE)p;h|4=lvN!*RaUA~3a-h$n1V;OPI
zs+MP?)?X*y-aW9&ytqHnrfJ9P%GCJ$gqtoz`niSE>%1MaIjcK%LDE&DIKp@hs1;K7
zJJYBpV+4OgEV7Rf-id$O`_lAdyc}>Y8(EYcA~}cR0Ctjnf~6$pGZ)R1se#$65pQ-V
zM1q)i&kX(K)+r<CKqxDlYPNZ4gs2b|uG$z{*Vlay)y5?nK}II1jRuJnB~olI(w$~X
z<(yH8s|Xm6E~M@5Ct1<uyS=>yiOQpcAgiUJ-FY@|>+JTJB}`;;)VRNEh=7|*-UObw
z(#hYqVWY9baUC7d${g+3<zPXN>OGvY!uL@e|4ZLvp!oU0Fx|Aq3`Yf9@JGP)3c~B4
zP}VYM#QJv66ZDpeR);p^5Jcwov7BeOZ!n`zSB#N_(KJX#t^7<0=eYAOL0ijF9<I5c
z2QcxNkP~ce`I7Qkfk+o-;Jqg1@$+kXvxoN#;e|YLxw1IQcqFs>OW*!t;GBz|HdzM+
zvAd^70$?!NPE_)u{GPRxtz?Uf$wq6fS0pww*MwL}RRfIgeBDNo+M>;5?EK8=sb=J@
zY%zE;(uiNdu?UKAWtE3{rKFLocAF<LfHO$VpPNMi!LCA=Z7}wWVM1CEnv`zgYC0bT
zX<!=2dvkU*iUBixB)Df8^RHrpd()?a@|x}#9H&!Krt3dQk!OF~JUe}F)ro+{dD8+U
z&IFYHT?Mg3a_F$Qm?G;Shy7v>StMYC(Y*<aQ5j=();YNR=)_BQ3p0Y#$0+i(B{bWx
ze%UI(j7ShGhH&OqyxzUBvcs&Zf~3R2*E?eUUsX1Vzkb$!{dTTs#B<Q}z9ut1UADJ|
zuIK5M@I0mHZECuNE!8Oh?%n9onVLzoN?C%O9qGeVM}!?ro7MZ%#HHvLKp>FVZKozX
zOra@PdVrx)8KW?z(#NaNl%>1DP!)*)o2H6f;2c`I1|+BRi5vW<<wl#Lg@}4g6O{kH
zo)R5sx}Gl%PY6n1I!zwrM2HWrlam=ZBwq2Y41G{S6^!tOkCO)yrT3NJDYiEsS$sv4
z3fh?01}v3ptCO7BBZ-!a%7C4JS5T)XuxC?&`Exp`5D&*lyYz^wR$Af)?4b<WGH8U5
zv?Dc`kNi$>2*-PAKvo0VZvX+;UPQOjEV7I*^16Px#S`2OCl}e=<yEBTgOKK&BMBp4
zm(Y515<Z9=mR4{;a7X;TNxxlUkXiaHLP3#Kkki^3xM!}SK%UCLo8(soyllDf57GcA
z&8mEj_P%&`IGa@iUp#)s6uGV?&{_Cgr1~NeMY(oqRoYyG8~V&?Oc>v1p8jT=W3k4*
z2v65u$%${V>&b)E%X}hy88I{;9Y517IH-iA_<UWURklrkexO}yHD+^(x&EEg^S&s6
zh-ffH?}Q4e(`+GgbS0V+m)G@WoexPPLSGBU`#~Y>ZDSt?-3eUdAeS!Juje~iV}=11
zrlFN)m2mn<%b2rTQ^Owy%fyG$gof47^s?JDWxVjWz?2Upn#Tj!K^_m2E3+EmL4i>u
z%*<TKpqd)M<Em4C<!*j$g0{qs?HL~vld%R9S!mc1A^@$8b~&M1%A{U9X?mqtTtTv0
zJl^-(vCEde*4&t*)I14((Z1BqZoW)6TB!*!)<i1q(XCdSS#dUna;Mkhr68V6dQ8jp
zwW0H~svlXadmoR^2I?c2@>=h{FV7%=X+q3Pb&Id9z1YBW@Yloec3)XPQwH7V9mPJK
z=U2&;(bJ$deTkn$rQv}Jc(?U5uqXX5;a=uK{m<b!S*vS+%zz7;0xgt_L3Kj8yxK}F
z)*kzTeTqM2`^|r=Qx*S!5rjCh*6Hak3A};_1?=-Nbss9^@kZS+x(Kli=nup@W}<J?
zwlU-iv#%pRAGu0+8CZb`xAmUo)N!-z>wV6~NZ8&n8<{!^JVeSFW4YQ*re4BQwpd)T
z;BGU*T)z4Fc$;3I<=RVPvR2wW1ryKAumfysEu5vS(&zYVK^6@OpU{o+dGqU1I9U@+
zkyKfOJJ=<1sj#sfAcDu$gVhf9ZLps1!%;yEF{4VX9}?%SIxV05A<$#1fpADMtQ8sN
zq}8gD_Zs))cx>}uLjEZ0zA&BM?f)t5F~{fAzkeAWT~0VLTT5sdpSjQUEX<8CYWY%@
zWC{v1EzAvo7Gs_(hCTlL<fua>;irc(CsCYa;Ulti73x!F#0-#Z$=X7=zXVTnTi<3o
zwTl-{kW8)0dsmft7ST2|l^Fk9RNPoU;>FA!YgH``r7qfYmw_g>mef{fpm2-jI=3}d
zw9ZZEbR2uSvho)t$aXfgo>h^}^qj+6Y(uVqS)ls3O?FIW2Ch7Sx}nu=H%ADk5X@jm
zK%ru|G{P-*viZ9{$4T7mz7iF;oz-%X1((8nvi2l+Afg8~`yU4?uF48nbAeKYinF$D
zbHPDB3uAIQ!<$J5HG|0qBTw|Nf=WCbrnGv$uQj5^QGyf?SlQ$le6I+8B0KXfA{rsY
zgEz~a{&t$O0Jk;LBvrjRbJk@PH5hYiOvbI#o~!j&WVCmXuC0`cvdo-@w91d+azf-x
zQ!X7gz8>SdVc)!+iyXTXm%kp$gyswp&&HKCLeMYlG`owaq`ocYbm3|flcH?=3WfMD
zv%sf+m`7qSvXZsz)%nqI_C@~yLw^7AHMqpfqNA1{<nsZ7`ex7W$*W`gFdFZ0W<x`x
ziUGx?h-esh?X?VQJYRGYb~{`eWY~1k^6+}qUEO}|8egA9b3|)Ss=>opoDLI5NKeMM
zz3$;Wi{*&)_%e;O(Z0<31KN#h?npSc#C1V%lkHZCrb=US?i9>$P!YkWH93=<)x}4}
zVN!+0l!em&0xSr=X58%h&xLjSwviEqMoAjYW0yr)wjoq9S20qyL8elHEd3*;K-{Nh
z*4p-6#FT-(-9+d0?Mdvp@$q?PgQMbCx1`>>&tg;l^zbwdQQAp*VQ1-#I+yLecom-&
zfUFC~X<3P7y#x7E%7v_1I|$+q`mvN{l&sDhvEnOepL+=Ij8#@-@#Om_=T+r{aeDy$
z-TAXRq|pq6;tMK_=+R8pOm+M>17W9>G`NzWh_q=>ogwyZhar-0tA^U$leQLT2U@OL
z;K6H);q8D)>@-!ujVZ))JFFeo-|V>>V!l@y-f-Cy!EkAmeV0QTb;J3iw(>PbX(DE}
zXS?s4U(BMl0q*jIclncIBP5BW?P#ec3apng+)?4PtVu`;Bkn}}L|jYxI8bYn{;Sv+
znw9)WnKsE{2%cJyUkGUqrfg+2svI-KrP>c?_SSsrcuVZ;s&^w(@#wEmqf}_EDe_j3
z7}1C$Y1^FuQN14z5B;bW<afilXb5$KfwKn-zJQLg=*nxtNUV6xNf6G1<M4U@j+66s
zQFYF=^d87+&S&9@kxJ=b{@wxjqJbsfhChM*uQi4VA8h3zvEigM&~mBen)pK^y6ec7
z18a2TrY{7(Iw26iJh7-v+tIBr-iW-pp*A@||CB7+VxEQjj=S_xw{o_hRr7MQ2{Q}_
zaGc|E@Irrs1Jj8XGI(Ii`ydWfZjO5r^kEXK1*^3#)swp3Au*izxbhumH}~P8q)OXi
z8p3fN9GBv0Ucvs6X(~0hyvaz$pYX%xr;EkwxE-9tqp0*W9>2YWkfg2sw%xgH#`fnW
zJ@k5zY{7G}%`IqVBW-*dF+SjI{buv5MRSUSnr|o|-?{I-v>fr?uC*?OxDhHxaLG#O
za#)XkMIiOIuk<EgSuweI?;$huS!ZqUE2G`W_R<WK3tC<7NBzq{gbwQL7yud2)-A)8
zZGc%=h;-k86O<kWgl`CaN$x*~^G$%<=Vj5B=Ln1Lx%Zp)fp@kJyl@MV{KRCn-E2ve
zdWtq6&!SarkPXHc9bBU~!~?lf%_F(#ch)k<_HfCR_AaDm>U28$6qd8HT!kNky0KM`
z=^?3}A?({T&m;w3N|P;5&)c5*YoQe1U((d7^6#s3_|+Oc%ysW|2Pk&PE=~U{eKLB)
zx^pH9dhP~1W>n_Hagvg|?GHo2<Z4qFTpvJd;2XU@VRp7>AFaj2o|4+xSRgVlrdI}=
z#fW4Gy=BRO&=O}!K_gg=*=o!Ndy%oR$oG1QmNvv{RF9$gYxvzi805FX>|R_RNB+kS
z=q$G$R!8Xq(`7LA=aC1DbQf(36=@0-*EW%H)l?|-zi}u5g~*O`frL@N6m4)ZxAj5I
z2KyywY420uV4T8-U@xi9?`z=9QjI6!3nRrF$iovw*xfrb0PDZwLVwGus1S|?9ii>h
z@Zt{~FV;;jYO^MXo@@T`O9OJNx(}Sz#hCDN7`?Y|ndM-SCjXtz+K`syY_RuH14Un_
z^Yq$`j<mG?-bFcFQO!JTg8b2vr05BQ|0M~>ho|AwevZ1yuE=r=ugCR9d0uO=*$*2(
z8j0VYxRUA{@OxYCTk~V)va;rTzh3e5r3375$_|>(J39Uu#DlCN%A|d5P_-9lCwT5<
z+#e(hCfa<i^%zwFvGi$w&@TU|zL^Pcg7~pDawgqzFwuF}K)`O5i1+R&6XiO`-#`lV
zv`%7pK)&^ku&7)I8GmON7#=&!E=`Rh7B?7WJG-u3U+vYnpI)pv$ZccT0EJ+>u@90J
zoUcl3ho-bwGK_8iXnAN|+`~zQrm#b)nV7=KdG{<gF8dJ%o9%<88DhqXLJs=yyvqaW
zEZ%+Qr0q_SGycbGQJ2SIHyb72RlCWTQV<J1J@m;P`Dw35O)IJYP75(+qn+kL1xS`A
zuDJ<^w<05%37Ra!@2g+GlYzBK$4+i4lZ^W}385S`jxVdRrLU628^~&{Z}`+;eRXN)
zEXF~*Tve!0f^YqzHpJpl=pF2P=c&0Wo+<3s5&hmOcW%tL)Fit$YntBW7izk2`Ow6I
zR<1Ysb1!-Vw%2qz40b#Z$+19Fe065o{$gFROhBTPPuCFJH9IOZXi03)XzCdEvS^f>
z`LjyY5b2~3-LyAo>aA-ckeETUH+#@|7c`6eOso6UcsD2}V?UB`n&5aa$c~&xCYKu+
zxyF{sDPVvWu<Ht0O3q8NlmA*SD;bjwK}HceKy`u3kR&B%N2VxotnGVkXAEf8T*a3d
zE65vh_cJNDyT+5`aFinv)bsVPp{zW~?|G4LzlG}jj?QMgx?#c|j#r{v({JU{GR^9h
z|I5#HsMWG1=@&I46iaoGv_sLWYFZ#fUi=}`4xt0ZI~`4{;7U%Xo9^)(-`Qr;=%!Qe
zdp{FNyLY|wxc7beiAmjz=H8%rAQ6ZaMg5&l^_dv__1PYyx})E4uC!wV>fXbW-(YC2
zr&^cLngOC)=lC1^)^~d{l3Ec=R(XO!UlCN+&-F-WpQErI(zR&y8-rk^NpMP8br;O`
z^Cl$`$*{!FkRFHZ=ZkdpPTHbZ8OwLuD-f&XS+t<uS0%#QCA<r4{Dg??oebhQdxjPM
zakRLwAt|XzB7fT?nc&y3k1*j}r#jZV#@}>_m9HaDMguz<G)SgpA!0*d@nFY)+mgbc
zr@@p6ew_J#o$c>qwOrR=X<%I#3T5@(O`)kEIh7nAvOz?**{yr}*_~HHzeTCJ%_ABL
zy-1ln&PPf(L;?<tz@My~|J2m8xFCm7$rU~+z$Rh|@ba2`OJ5&-2{`l_e8i+!(@9?8
z(ttnW(tv_ZFlSzlk-d_pl|zW|ehNWUJ9C2z4&P3!e;;sZef55zA$%u3u)1;}qlzhL
z@s*SihwZs6&(3YOMVz$<E$t5v*74$+J{7Rt?_>t+Wq`JlP)R|}8_Qn!*d??)$qPYQ
zrXJ01XAUW}rx4+I{t63PrIQ6s@3za&pNQWn|Jt{4zq-|P*Gr_m_L1?J&0cz4`u_5f
zv3sWT>^bptm%qf{R=IIvfKBUukjo-YQN)(rYd*x556s#by)Z%G=)Gm~_9d$Lec&C=
zx&U<q9S(nxWE|Dn@GqNhBTV(hV!50~Ry7M{rrGAvCt^)V^j?LDF3X5fvnIo3&-$%<
zo{3I}$L8U}B(?l}YrT4j!KT|Qsv#eJ+2wjl#2ALiv&Y~ICao~xt-A${7W6hVKml8}
zuX6-ut@Dlf8mmltmklE!5k`~{XO*yhZ1cwPx^=R<w<HkMFhus_7Z6+~K}TR$6oOr`
zAj1Kr^L_{U`rC~vixRK^VPIpOU^5eV24WU%Z7u!IRGbPZp>}x8zH=0c#5ikA*Bt0E
z?X;!~o;{RA!n5khV8uPEa;i{+t}_vq!Op)O>z%2TynQ!I+8Ua3wpP<aUi?VcjpY9m
zI0wi0Rep54U0I3zOV`z0TrDJ4)V}sn6rr9g_h0Ebi@Y|=!=j^opAQc8a+}TefK^1n
zZ}lYSdy=`EolJU_J=6zkbSCR9`0bG7m7k<rIs0lVkG}E{$Lp-3gS-gRi(8mmIrU|r
z9BG7U^{7W45x-fh)v7uQUrvZ0JGaC6g~q9!Z}l!EvcNATH>p$oMt#$Y2q>IWmmM*b
zY;%*wG(m5%xqHEkM~4FsI)(E<X@kjuqYkTGHrq8|jGHAR0Xpd*oiUCWgR6-rO=yy7
z{qRM@Kbo|*fj_iz(%fqPzS?HKhMP5Ysxlb8t_-3B%6f#hb^iqoqLtTBi}IYRyARUa
zn5|3{?2_kPyOd{*9`w@hc<F6m$?$LBA3Km8h~GJ73){l%z%y^+KZ^Q)jUoi^c-muN
zWME(bVq2b7tnvIdUm4^%7(n2(yZ;0j{a^Q=8CxaWR0bsm4hANWC;$j@3P}I}c-muN
zWME*M`i~Dp{@4BQ&sNC*6hQ%P0E71h!~g&Qc-l3QPe{~J5XV1nW_AgxgG8V=+5QNT
zl!YR@g$Z^jiZCK^EhLK;s=Y{d5WKcf&@GY<YZ1G_N*(JEK`TLrGWv(1t$1q*3_N%V
z53l+4=fQ{X%zN{l_n0TE4B$&@5ayg^dZo?_J4}adC!fmm+$!u1(^O=XNx2m7Ya0dI
z%85{pb=}6TuufK%V%6Fiv-Z&8+U=Zj_BdCa3FozQ)R_t^WW!=y*E@9UFN*qreR`2n
zdWu0S#1D3boE6F2V{*FeG(3OGh<zs~X-?`QZPr7Vej}G!@VlCRKF81>U&D2rtR3O3
zzkk|ZQnUi)bPF}_z2b3Io3w-tHpvejg^hSmBBwPIAIcft>Kk_G8oP9cKG#02&@UG#
zc--k^!bc8-h1lu)yOTJ*nVr6$c=~lMHWQEBaQ{s*a+!0U4{3?<)P5$l6hAxfoG8Qe
zggRSfI6kp5W6A7wm1EY*K|91q>KPNsY+bL*H5z&x(s#Y)pGueiRmExj3!hvEUC(=s
z`~G9^sivyTh9&CZEA#S&S(&FMx0&&|WfM=*M_(~uqb%u9%GL|N0pCT2!~g&Qc-muN
zU@(Hh7KUexr<mH96PO>c$gnuEWU*{w6=F4E4Pq^0ZDak$X2RCM&ca^8{)8is;}oYA
z=P}MpocB0?amjI6admOKaL?n>;yJ);z}vukf-i^f8b1qv0{=GtHv$m?TLk?Cw+KZD
zvk5N~ejpMgQYZ37R712xbcyIQF$u94u@<p;Vtd5vBm^XCB&8&$NeM`8k@l0GC&MC>
zA~Q|4N{&G;O`b`9hWtB)K1B(|KE-{Cf0Xo;@|5N&>nSIxu&BhS#Hfm>E>P1@yQ20<
z{fP!24ydEyrIDdgq*0@>L*t7kgC>urou(fc{?VGIwLxni01^g8e*gdg009610EPfX
z00jUH00RI50096302TlM0RRD700RI4c-n=K!7c<r5Qe|COGv~s^jVnTDshnzj)?or
z&e|Q>>@ZgFLY~FZ13CDnr!fa2o$C7QudctU3s~odA%oEdaHMs3z@|}$R|uRZJY<X8
zghymNC%nowuL-ZQ!+XMSEcoDrTEA4MB-iJnvD_UmG*nEP#q6nEZ8T?Mbif|_o(s7`
zTWZHqsWiXf!MpU`SyY^>Gv-OI@JC(0er5Q#_FAqnQ^j||&Y2T@ox?vS+WkehuX^R*
zD*5m|RdC8YGSgVoc5S!PO;os(U^I(6_}Sbg_dKf9cqVGM+v-=>`s@?W-beiac-n2w
z$4-J_5QX7)5JV6W1nj+c{~xJ#6tMT+CBeGT1j8Lz63f<`aA&<NFF{ehr6-v@IkT7y
z2LAGWMw0(>lNrH44n|DmVkQp@R`Rh?fSp1dI4Qz~8xO^lP)Zr)R8UD3)znZ+9rZNO
zNE6Mp&`KNabkIo`-SnWL<E0lLegXsu5vGrR1{h?BVMd5B${0~%#2IITNv4=)hFRvA
zXMshQSZ0M))>vnQO}5x(hh6sA=YWJ5xZ;{8?j?si9>pjo$rZEYiAAiEFE%L<yA+B;
zoV@VL2cNw0&MnVUBrb9Dz?XQ;>GM-fi)hN|uU<{ll)BQZ>{a@deq}%zRECscWhASv
z?&`Yr==3<9I!q=mPqHg-JgYx$jHOc-za^IW;|F`YOb7q~c-lqH&kn&r5C-rLwOW5$
z-KvXZC2kuWy?{!DgE+N`gI5sZCR`kO4cDoYcsZuJ-QM;$^X+_Z_}&oi#uBY{lmI;9
zWX@zXKqp=z-_YY4_mRnMWS}WREXx^IMffpHaE+4un~CsM-78cGY@%RgNtq{YT3Tm?
z8o^#D)CskbLW58j833EAmZ!&>Am~_9o}XyqQI0<~J4ElO=@L6TO^4{NG}}aHtl1*A
jhnoJs>+&tSy6MCRznBE{rF+oq5rb*Y7`glb<l0}qNER9#

diff --git a/app/webroot/css/fonts/roboto/Roboto-Italic-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-Italic-webfont.eot
deleted file mode 100644
index 8049a4d3c4d0180c5064d9fe41596faa2954489c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30544
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
Lj29=U$wmJU5@61Z

diff --git a/app/webroot/css/fonts/roboto/Roboto-Italic-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-Italic-webfont.svg
deleted file mode 100644
index be11e0833..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-Italic-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoItalic" horiz-adv-x="1153" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="509" />
-<glyph unicode=" "  horiz-adv-x="509" />
-<glyph unicode="&#x09;" horiz-adv-x="509" />
-<glyph unicode="&#xa0;" horiz-adv-x="509" />
-<glyph unicode="!" horiz-adv-x="539" d="M91 0l31 204h198l-31 -204h-198zM163 478l146 978h197l-146 -978h-197z" />
-<glyph unicode="&#x22;" horiz-adv-x="733" d="M182 936l35 240l39 280h197l-38 -270l-136 -250h-97zM491 936l35 248l38 272h198l-38 -270l-136 -250h-97z" />
-<glyph unicode="#" horiz-adv-x="1276" d="M52 410l21 140h263l121 348h-256l21 142h284l144 416h151l-144 -416h255l144 416h151l-144 -416h199l-21 -142h-227l-120 -348h220l-21 -140h-248l-141 -410h-152l142 410h-255l-142 -410h-151l142 410h-236zM487 550h255l121 348h-255z" />
-<glyph unicode="$" horiz-adv-x="1193" d="M111 429h197q-23 -160 45 -222.5t183 -62.5q124 0 208 62.5t99 169.5q12 93 -41.5 155t-195.5 112q-193 61 -282 163t-65 272q23 171 132 273t279 122l31 220h158l-31 -222q159 -24 237 -139.5t53 -305.5h-196q18 131 -33 208t-164 77t-183.5 -62.5t-85.5 -167.5 q-14 -100 38 -158.5t204 -112.5q196 -66 280.5 -164.5t61.5 -267.5q-25 -178 -141 -277.5t-301 -116.5l-26 -192h-157l26 191q-165 19 -262.5 128t-67.5 318z" />
-<glyph unicode="%" horiz-adv-x="1498" d="M189 1099l11 77q19 132 114 216.5t233 84.5q132 0 203 -87.5t52 -213.5l-11 -77q-20 -132 -113.5 -215.5t-230.5 -83.5q-133 0 -205.5 87t-52.5 212zM296 177l881 1138l99 -67l-881 -1138zM335 1099q-12 -77 21 -127t109 -50q70 0 119 52t61 125l11 77q11 77 -21.5 128 t-106.5 51q-72 0 -121.5 -53t-60.5 -126zM771 279l12 78q19 131 113.5 215.5t232.5 84.5q131 0 202.5 -87.5t53.5 -212.5l-12 -78q-20 -132 -114 -216t-230 -84q-133 0 -205.5 87t-52.5 213zM917 279q-12 -78 20.5 -128t109.5 -50q70 0 119 52t61 126l12 78q11 77 -22 127.5 t-107 50.5q-72 0 -121.5 -53t-59.5 -125z" />
-<glyph unicode="&#x26;" horiz-adv-x="1276" d="M43 392q18 126 101 215t240 182q-64 97 -90.5 175.5t-13.5 160.5q26 175 136 263.5t283 88.5q151 0 239.5 -92t69.5 -218q-16 -102 -77 -170.5t-178 -145.5l-121 -80l277 -407q52 66 86.5 144t48.5 165h176q-21 -137 -76 -247t-143 -198l156 -228h-236l-70 102 q-90 -60 -191 -91.5t-205 -31.5q-209 0 -324.5 116t-87.5 297zM240 392q-18 -117 42 -188t196 -71q70 0 143.5 25t142.5 72l-294 433l-44 -29q-101 -69 -140.5 -131t-45.5 -111zM477 1127q-8 -55 10.5 -111.5t62.5 -124.5l152 95q63 39 90 83t35 98q9 64 -32.5 109.5 t-119.5 45.5t-132 -57t-66 -138z" />
-<glyph unicode="'" horiz-adv-x="445" d="M184 951l38 265l34 240h197l-31 -223l-141 -282h-97z" />
-<glyph unicode="(" horiz-adv-x="679" d="M138 582l2 9q57 411 251.5 680.5t387.5 364.5l6 -1l22 -116q-152 -107 -287 -343t-183 -583l-2 -13q-51 -362 16.5 -589t192.5 -346l-53 -108h-6q-162 93 -282.5 371.5t-64.5 673.5z" />
-<glyph unicode=")" horiz-adv-x="687" d="M-119 -355q150 105 286 345.5t185 589.5l2 13q50 357 -21 589.5t-188 345.5l53 108h6q161 -93 281.5 -372t65.5 -673l-2 -9q-58 -412 -252.5 -681t-386.5 -364l-6 1z" />
-<glyph unicode="*" horiz-adv-x="884" d="M122 763l73 154l222 -90l28 254h161l-49 -260l247 89l24 -156l-252 -68l123 -200l-146 -96l-108 218l-166 -210l-119 92l188 206z" />
-<glyph unicode="+" horiz-adv-x="1162" d="M89 605l26 178h402l64 423h197l-64 -423h399l-26 -178h-399l-69 -459h-197l69 459h-402z" />
-<glyph unicode="," horiz-adv-x="404" d="M-71 -258l118 316l24 163h197l-26 -173l-196 -306h-117z" />
-<glyph unicode="-" horiz-adv-x="923" d="M168 538l23 154h590l-23 -154h-590z" />
-<glyph unicode="." horiz-adv-x="548" d="M81 0l30 202h197l-30 -202h-197z" />
-<glyph unicode="/" horiz-adv-x="850" d="M-83 -125l845 1581h167l-844 -1581h-168z" />
-<glyph unicode="0" d="M110 514l64 428q38 254 184 394.5t359 140.5q204 0 312 -146t72 -389l-64 -428q-39 -256 -184 -395.5t-359 -139.5q-203 0 -312 145.5t-72 389.5zM301 474q-25 -163 31.5 -252t184.5 -89q122 0 207.5 92.5t109.5 248.5l76 509q24 163 -32 251t-185 88q-121 0 -206.5 -92 t-109.5 -247z" />
-<glyph unicode="1" d="M306 1271l22 152l524 54l-222 -1477h-198l191 1274z" />
-<glyph unicode="2" d="M75 0l19 135l533 545q143 148 198.5 235.5t68.5 176.5q14 105 -35 167.5t-155 62.5q-124 0 -205.5 -80t-97.5 -196h-189l-2 6q21 185 161 305t355 120q188 0 288 -109.5t77 -277.5q-18 -121 -94 -226t-234 -275l-426 -429l2 -6h662l-22 -154h-904z" />
-<glyph unicode="3" d="M97 378l2 6h189q-17 -110 48.5 -180.5t187.5 -70.5q115 0 197.5 75.5t100.5 193.5q21 142 -32 207.5t-190 65.5h-162l5 32l13 88l5 33h162q126 0 193.5 66.5t85.5 182.5q17 114 -32 179.5t-168 65.5q-110 0 -197.5 -71.5t-102.5 -175.5h-188l-2 6q21 170 166 283t348 113 q195 0 298 -103.5t74 -300.5q-16 -107 -82 -190.5t-170 -128.5q102 -46 147 -135t27 -213q-32 -208 -173 -317.5t-346 -109.5q-179 0 -307.5 110.5t-96.5 288.5z" />
-<glyph unicode="4" d="M42 336l17 111l764 1009h208l-145 -966h202l-24 -154h-201l-50 -336h-196l50 336h-625zM277 490h413l102 680l-5 2l-26 -48z" />
-<glyph unicode="5" d="M133 378l2 5h179q-19 -123 39.5 -186.5t169.5 -63.5q120 0 204.5 89t107.5 240q21 144 -35 227.5t-181 83.5q-111 0 -171 -36t-95 -107l-161 17l205 809h729l-26 -175h-563l-110 -419q52 35 112.5 57.5t133.5 23.5q202 2 297.5 -126.5t62.5 -352.5q-35 -227 -170.5 -356 t-362.5 -129q-179 0 -289.5 101.5t-77.5 297.5z" />
-<glyph unicode="6" d="M140 552l50 335q40 266 208.5 428t384.5 162q82 0 166 -17.5t134 -42.5l-65 -151q-53 25 -114 40.5t-145 15.5q-132 0 -238 -118t-132 -295l-16 -109q70 60 158 93.5t185 33.5q180 0 274 -127t65 -330q-36 -232 -176.5 -361.5t-350.5 -129.5q-195 0 -311.5 154.5 t-76.5 418.5zM333 533q-29 -192 35 -296t183 -104q118 0 201 94.5t106 242.5q21 147 -37.5 228.5t-189.5 81.5q-91 0 -164 -41t-120 -110z" />
-<glyph unicode="7" d="M212 1301l23 155h966l-23 -155q-325 -328 -459.5 -579t-181.5 -563l-24 -159h-197l24 159q51 344 208 598t436 544h-772z" />
-<glyph unicode="8" d="M82 400q19 129 109.5 222t228.5 135q-104 44 -157.5 130t-36.5 197q29 198 165 295.5t336 97.5q179 0 286 -102t80 -291q-19 -119 -95 -205t-189 -127q115 -46 176.5 -139t44.5 -213q-32 -209 -176.5 -315t-349.5 -106q-207 0 -330 111t-92 310zM280 404 q-20 -127 49.5 -199t197.5 -72q110 0 199.5 75t108.5 196q18 123 -47.5 198t-180.5 75q-119 0 -214.5 -77.5t-112.5 -195.5zM422 1081q-17 -115 42.5 -182t167.5 -67q93 0 169.5 69.5t93.5 179.5q16 109 -39 175t-153 66q-103 0 -184 -66t-97 -175z" />
-<glyph unicode="9" d="M119 42l53 150q62 -32 123 -45.5t146 -13.5q137 0 241.5 99t131.5 277l17 117q-58 -69 -134 -103t-162 -34q-202 0 -306 131t-69 358q34 229 180.5 364t335.5 135q210 0 325 -138t78 -386l-66 -442q-39 -261 -201.5 -396.5t-393.5 -135.5q-74 0 -154 16t-145 47zM357 978 q-24 -156 27.5 -245.5t173.5 -89.5q99 0 178 48.5t123 121.5l26 169q25 170 -34.5 255t-192.5 85q-103 0 -191 -96t-110 -248z" />
-<glyph unicode=":" horiz-adv-x="517" d="M81 0l30 202h197l-30 -202h-197zM212 876l30 202h197l-30 -202h-197z" />
-<glyph unicode=";" horiz-adv-x="525" d="M213 876l30 202h197l-30 -202h-197zM-20 -258l118 316l24 163h197l-26 -173l-196 -306h-117z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1040" d="M64 486l16 108l6 41l873 378l-30 -201l-594 -233l-88 -18v-6l81 -19l525 -228l-30 -201z" />
-<glyph unicode="=" d="M133 407l25 164h834l-25 -164h-834zM195 823l25 164h834l-25 -164h-834z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1072" d="M69 87l29 196l634 238l88 18v6l-81 19l-563 234l29 195l799 -378l-6 -40l-10 -69l-6 -40z" />
-<glyph unicode="?" horiz-adv-x="974" d="M149 1122q22 161 153 258t311 97q189 0 286.5 -101.5t70.5 -279.5q-20 -135 -103.5 -236.5t-221.5 -218.5q-62 -54 -80 -97t-31 -134h-197q23 146 55 201.5t148 147.5q116 116 167.5 179.5t65.5 152.5q16 110 -31.5 165t-153.5 55q-88 0 -161.5 -50t-87.5 -145h-188z M273 0l31 208h206l-31 -208h-206z" />
-<glyph unicode="@" horiz-adv-x="1833" d="M106 478q82 423 352 688t642 265q365 0 536.5 -252.5t90.5 -676.5q-41 -214 -175 -368.5t-355 -154.5q-70 0 -118 42t-60 118q-62 -81 -140 -120.5t-174 -39.5q-121 0 -173.5 121.5t-6.5 315.5q63 260 200.5 416t302.5 156q100 0 163.5 -27t128.5 -79l-4 -4h6l-139 -585 q-26 -110 -1.5 -151.5t75.5 -41.5q118 0 211.5 115t127.5 287q74 382 -54 595.5t-464 213.5q-296 0 -524.5 -233.5t-298.5 -599.5q-74 -376 61 -594.5t449 -218.5q85 0 180 21.5t162 56.5l22 -107q-73 -42 -180 -65.5t-206 -23.5q-366 0 -542 252t-95 679zM691.5 200 q21.5 -74 95.5 -74q62 0 120 25t111 89q1 13 3.5 26.5t6.5 26.5l128 538q-25 12 -52 19t-58 7q-120 0 -205.5 -111t-138.5 -330q-32 -142 -10.5 -216z" />
-<glyph unicode="A" horiz-adv-x="1295" d="M-37 0l743 1456h169l296 -1456h-201l-71 375h-549l-186 -375h-201zM432 540h435l-118 625l-6 1z" />
-<glyph unicode="B" horiz-adv-x="1302" d="M90 0l218 1456h475q219 0 337 -100q95 -80 96 -221q0 -35 -6 -73q-15 -97 -83 -171t-170 -112q139 -21 207 -125q52 -80 52 -181q0 -30 -5 -62q-32 -208 -175 -309.5t-369 -101.5h-577zM310 154h380q130 0 217 67t105 188q4 27 4 52q0 89 -50 145q-64 72 -194 77h-13 h-370zM412 837h320q106 0 186 61t96 168q4 26 4 50q0 84 -51 128q-65 56 -207 57h-278z" />
-<glyph unicode="C" horiz-adv-x="1297" d="M128 598l39 259q41 279 221 449.5t430 170.5q238 -1 368 -133q102 -104 102 -258q0 -43 -7 -89l-3 -6h-189q5 37 5 70q0 109 -58 175q-76 86 -242 86q-158 0 -279.5 -134.5t-150.5 -328.5l-39 -261q-9 -60 -10 -114q0 -131 56 -222q78 -129 245 -129q158 0 264 89.5 t130 243.5h188l2 -6q-28 -213 -195 -347t-412 -134q-237 1 -371 177q-103 135 -104 323q0 57 10 119z" />
-<glyph unicode="D" horiz-adv-x="1387" d="M90 0l218 1456h458q275 0 427 -178q120 -140 120 -339q0 -54 -9 -112l-30 -199q-44 -289 -240.5 -458.5t-485.5 -169.5h-458zM310 154h261q194 0 334.5 134.5t171.5 339.5l30 201q8 53 8 101q0 144 -72 242q-96 130 -300 129h-261z" />
-<glyph unicode="E" horiz-adv-x="1130" d="M90 0l218 1456h886l-23 -155h-690l-70 -471h599l-24 -155h-598l-78 -521h700l-23 -154h-897z" />
-<glyph unicode="F" horiz-adv-x="1130" d="M90 0l218 1456h913l-23 -155h-716l-76 -502h615l-23 -155h-615l-96 -644h-197z" />
-<glyph unicode="G" horiz-adv-x="1387" d="M128 578l45 300q41 275 223 437t436 162q233 0 360 -131q99 -103 99 -247q0 -39 -7 -81l-3 -6h-189q4 30 4 57q0 99 -56 167q-73 86 -232 86q-160 0 -284.5 -126t-152.5 -316l-45 -302q-8 -52 -8 -99q0 -134 66 -224q89 -122 259 -122q123 0 207.5 34.5t126.5 78.5 l49 328h-330l23 154h527l-80 -532q-64 -81 -203 -149t-343 -68q-243 0 -388 169q-113 131 -113 321q0 52 9 109z" />
-<glyph unicode="H" horiz-adv-x="1441" d="M90 0l218 1456h197l-99 -658h707l99 658h197l-218 -1456h-197l96 643h-707l-96 -643h-197z" />
-<glyph unicode="I" horiz-adv-x="579" d="M110 0l218 1456h198l-218 -1456h-198z" />
-<glyph unicode="J" horiz-adv-x="1123" d="M58 396l2 5h190q-6 -40 -6 -74q0 -85 38 -131q52 -63 170 -63q105 0 187.5 79.5t102.5 209.5l155 1034h197l-155 -1034q-32 -211 -171.5 -327t-338.5 -116q-193 0 -299 107q-81 81 -81 216q0 44 9 94z" />
-<glyph unicode="K" horiz-adv-x="1226" d="M73 0l218 1456h197l-95 -633h128l545 633h242l2 -5l-655 -724l462 -727h-225l-407 658h-117l-98 -658h-197z" />
-<glyph unicode="L" horiz-adv-x="1126" d="M90 0l218 1456h197l-195 -1302h710l-23 -154h-907z" />
-<glyph unicode="M" horiz-adv-x="1779" d="M90 0l218 1456h259l286 -1183l6 -1l642 1184h245l-218 -1456h-197l163 1090l-6 2l-604 -1092h-137l-285 1128h-6l-169 -1128h-197z" />
-<glyph unicode="N" horiz-adv-x="1442" d="M90 0l218 1456h197l535 -1112l6 1l166 1111h197l-218 -1456h-197l-535 1113l-6 -1l-166 -1112h-197z" />
-<glyph unicode="O" horiz-adv-x="1396" d="M123 598l39 259q41 277 225 448.5t442 171.5q253 -1 397 -179q113 -140 114 -333q0 -52 -9 -108l-39 -259q-43 -278 -232 -448.5t-456 -170.5q-246 -1 -384 177q-107 138 -106 327q0 56 9 115zM320 598q-9 -58 -9 -110q0 -134 60 -224q83 -124 257 -124q176 0 306 129 t161 329l39 261q8 53 8 100q0 139 -66 231q-88 124 -272 125q-165 0 -290.5 -129.5t-154.5 -326.5z" />
-<glyph unicode="P" horiz-adv-x="1302" d="M90 0l218 1456h557q223 0 339 -121q93 -97 93 -242q0 -35 -5 -73q-32 -206 -176.5 -321t-380.5 -115h-361l-87 -584h-197zM397 738h361q142 0 230 80.5t106 199.5q4 29 4 55q0 88 -46 149q-60 79 -210 79h-360z" />
-<glyph unicode="Q" horiz-adv-x="1427" d="M123 598l39 259q41 277 225 448.5t442 171.5q253 0 397 -179q113 -140 113 -333q0 -52 -8 -108l-39 -259q-19 -120 -67 -222.5t-120 -181.5l183 -208l-154 -129l-188 210q-76 -44 -162.5 -66t-179.5 -22q-246 0 -384 177q-106 138 -106 327q0 56 9 115zM320 598 q-9 -58 -9 -110q0 -134 60 -224q83 -124 257 -124q176 0 306 129t161 329l39 261q8 53 8 100q0 139 -66 231q-88 125 -272 125q-165 0 -290.5 -129.5t-154.5 -326.5z" />
-<glyph unicode="R" horiz-adv-x="1303" d="M90 0l218 1455h498q230 0 344 -107q91 -85 92 -228q0 -38 -7 -79q-18 -118 -89 -199.5t-192 -128.5q111 -41 153 -129q29 -62 29 -141q0 -34 -5 -72l-21 -137q-7 -42 -6 -78q0 -24 2 -46q8 -52 40 -86l-4 -24h-203q-34 34 -35 99v12q0 60 9 125l20 133q4 29 4 56 q1 85 -43 137q-58 70 -175 69h-338l-94 -631h-197zM404 786h282q160 0 246 64.5t106 192.5q5 30 5 57q-1 86 -47 136q-60 66 -213 65h-301z" />
-<glyph unicode="S" horiz-adv-x="1243" d="M107 423l3 6h188q-4 -30 -5 -56q0 -116 86 -172q105 -68 263 -68q115 0 202 56.5t101 144.5q3 22 3 42q0 84 -54 139q-67 69 -256 131q-230 70 -334 175q-81 82 -80 218q0 38 6 81q25 170 163.5 263.5t341.5 93.5q235 0 366 -119q103 -93 103 -241q0 -41 -8 -85l-2 -6 h-189q4 25 4 48q0 98 -65 166q-80 82 -233 82q-113 0 -192.5 -57.5t-91.5 -142.5q-4 -28 -4 -52q1 -82 47 -130q60 -62 261 -130q235 -78 337 -180q80 -80 80 -214q0 -38 -6 -80q-27 -177 -168.5 -267t-354.5 -90q-235 0 -393 108q-127 87 -127 251q0 40 8 85z" />
-<glyph unicode="T" horiz-adv-x="1225" d="M152 1301l23 155h1151l-23 -155h-480l-195 -1301h-197l195 1301h-474z" />
-<glyph unicode="U" horiz-adv-x="1386" d="M140 489l145 967h197l-145 -967q-6 -42 -7 -80q0 -116 62 -185q81 -91 234 -91q154 0 271.5 95t142.5 261l145 967h197l-145 -967q-37 -249 -211 -379.5t-423 -130.5q-229 1 -364 137q-107 108 -107 278q0 45 8 95z" />
-<glyph unicode="V" horiz-adv-x="1295" d="M160 1456h214l215 -1074l15 -120l6 -1l51 121l537 1074h213l-759 -1456h-169z" />
-<glyph unicode="W" horiz-adv-x="1763" d="M175 1456h213l70 -951l-4 -191l6 -1l63 192l400 951h193l118 -951l4 -194l6 -1l57 195l350 951h214l-570 -1456h-176l-139 1010l-3 130l-6 1l-40 -131l-447 -1010h-176z" />
-<glyph unicode="X" horiz-adv-x="1295" d="M-14 0l582 734l-354 722h236l253 -568l425 568h238l-570 -722l362 -734h-235l-262 578l-437 -578h-238z" />
-<glyph unicode="Y" horiz-adv-x="1295" d="M178 1456h225l270 -740l490 740h225l-652 -944l-77 -512h-196l79 527z" />
-<glyph unicode="Z" horiz-adv-x="1145" d="M41 0l2 146l816 1155h-666l23 155h894l-21 -141l-820 -1161h740l-23 -154h-945z" />
-<glyph unicode="[" horiz-adv-x="552" d="M24 -312l277 1976h385l-22 -155h-188l-233 -1666h188l-22 -155h-385z" />
-<glyph unicode="\" horiz-adv-x="846" d="M177 1456h186l371 -1581h-186z" />
-<glyph unicode="]" horiz-adv-x="552" d="M-108 -312l22 155h189l233 1666h-189l22 155h386l-277 -1976h-386z" />
-<glyph unicode="^" horiz-adv-x="856" d="M90 729l408 727h134l189 -727h-181l-103 419l-5 69l-6 1l-27 -70l-226 -419h-183z" />
-<glyph unicode="_" horiz-adv-x="931" d="M-99 -154l23 154h923l-23 -154h-923z" />
-<glyph unicode="`" horiz-adv-x="641" d="M219 1513l3 5h231l137 -266h-158z" />
-<glyph unicode="a" horiz-adv-x="1126" d="M72 304q23 160 160 245t355 85h214l16 107q3 23 3 44q0 69 -38 109q-50 54 -156 53q-91 0 -160 -48t-78 -115l-188 -2l-1 6q12 123 143 218.5t318 95.5q177 0 278 -94q81 -76 80 -203q0 -31 -4 -66l-78 -521q-10 -62 -12 -114v-16q0 -44 7 -88h-203q-2 56 -2 90.5t4 70.5 q-67 -77 -163.5 -129.5t-197.5 -52.5q-163 -1 -241 87q-61 68 -61 173q0 31 5 65zM268 300q-3 -18 -3 -34q-1 -52 29 -82q38 -40 129 -40q102 0 198 56t133 126l27 175h-221q-115 0 -198 -61t-94 -140z" />
-<glyph unicode="b" horiz-adv-x="1164" d="M63 0l234 1560h197l-91 -606q63 72 144 110t181 38q192 0 284 -162q65 -114 65 -276q0 -67 -12 -143l-3 -21q-37 -243 -169 -382t-331 -139q-105 0 -178 44t-114 129l-56 -152h-151zM306 308q26 -80 81 -124.5t149 -44.5q134 0 219.5 100.5t109.5 260.5l3 21 q11 70 11 130q0 105 -33 177q-51 114 -192 114q-88 0 -158.5 -45.5t-119.5 -122.5z" />
-<glyph unicode="c" horiz-adv-x="1072" d="M95 520l6 42q36 237 182 388.5t375 151.5q175 0 277 -113q79 -88 79 -206q0 -33 -6 -69l-2 -5h-180q3 23 3 44q0 75 -41 127q-53 68 -153 67q-139 0 -226 -114.5t-110 -270.5l-6 -42q-9 -58 -9 -109q0 -97 32 -169q49 -110 197 -109q87 0 165.5 61t92.5 148h178l2 -6 q-18 -146 -156.5 -251.5t-304.5 -105.5q-218 1 -324 157q-80 118 -79 277q0 51 8 107z" />
-<glyph unicode="d" horiz-adv-x="1164" d="M93 500l3 21q40 271 174 426t337 155q93 0 161.5 -37t111.5 -107l90 602h197l-234 -1560h-151l-9 137q-65 -78 -149 -118t-187 -40q-191 0 -285 145q-68 106 -68 257q0 56 9 119zM290 500q-9 -56 -8 -104q0 -97 34 -161q52 -96 195 -96q85 0 152 41t117 114l75 501 q-28 68 -82.5 107.5t-139.5 39.5q-136 0 -224.5 -118.5t-115.5 -302.5z" />
-<glyph unicode="e" horiz-adv-x="1072" d="M95 520l7 44q35 242 190.5 390t352.5 148q209 0 301 -137q68 -101 68 -247q0 -52 -9 -110l-15 -104h-700q-7 -49 -7 -93q0 -109 41 -179q57 -100 207 -99q96 0 178.5 29t142.5 78l58 -128q-66 -56 -167 -94.5t-235 -38.5q-224 0 -336 151q-85 114 -86 279q0 53 9 111z M327 665l2 -6h487l2 16q5 34 5 64q0 79 -33 133q-46 76 -168 75q-99 0 -179.5 -80t-115.5 -202z" />
-<glyph unicode="f" horiz-adv-x="674" d="M116 936l22 146h169l21 137q27 180 130 271t267 91q33 0 68 -6t74 -15l-46 -150q-18 4 -43.5 7t-52.5 3q-83 0 -134.5 -52.5t-65.5 -148.5l-21 -137h196l-22 -146h-196l-140 -936h-197l140 936h-169z" />
-<glyph unicode="g" horiz-adv-x="1164" d="M92 -357l53 153q53 -30 130.5 -48.5t155.5 -18.5q138 0 216.5 66.5t98.5 198.5l18 123q-63 -68 -142.5 -103t-175.5 -35q-190 0 -284 145q-68 106 -68 257q0 56 9 119l3 21q40 271 174 426t336 155q101 0 173 -43t114 -124l46 147h157l-163 -1088q-33 -216 -168.5 -323.5 t-366.5 -107.5q-75 0 -164 22t-152 58zM300 500q-9 -56 -9 -104q0 -97 35 -161q53 -96 194 -96q86 0 153 41.5t118 116.5l75 495q-29 69 -83.5 109.5t-140.5 40.5q-135 0 -223.5 -119t-115.5 -302z" />
-<glyph unicode="h" horiz-adv-x="1164" d="M63 0l234 1560h197l-93 -617q68 76 155 117.5t187 41.5q167 0 251 -105q61 -77 60 -211q0 -50 -8 -108l-102 -678h-197l102 680q6 42 6 77q0 80 -33 123q-48 62 -163 62q-85 0 -156.5 -36t-121.5 -100l-121 -806h-197z" />
-<glyph unicode="i" horiz-adv-x="516" d="M79 0l162 1082h197l-162 -1082h-197zM283 1359l30 201h197l-30 -201h-197z" />
-<glyph unicode="j" horiz-adv-x="530" d="M-209 -419l37 155q13 -5 39.5 -8.5t42.5 -3.5q64 0 109.5 44.5t60.5 142.5l175 1171h197l-175 -1171q-27 -173 -125 -260.5t-253 -87.5q-29 0 -55 4.5t-53 13.5zM291 1363l30 197h197l-30 -197h-197z" />
-<glyph unicode="k" horiz-adv-x="1050" d="M64 0l234 1560h197l-136 -904h99l389 426h228l3 -6l-462 -493l339 -583h-233l-284 499h-102l-75 -499h-197z" />
-<glyph unicode="l" horiz-adv-x="516" d="M79 0l234 1560h197l-234 -1560h-197z" />
-<glyph unicode="m" horiz-adv-x="1790" d="M63 0l162 1082h176l-7 -137q64 76 151 116.5t197 40.5q103 0 174 -50t96 -149q64 93 156.5 146t206.5 53q159 0 241 -114q58 -82 58 -220q0 -56 -10 -121l-97 -647h-197l97 649q9 60 9 106q0 83 -28 123q-44 64 -156 64q-97 0 -171.5 -71t-102.5 -177q-1 -2 -1 -4v-3 l-103 -687h-198l97 649q8 55 8 98q1 83 -29 127q-46 68 -154 68q-88 0 -152.5 -39.5t-106.5 -109.5l-119 -793h-197z" />
-<glyph unicode="n" horiz-adv-x="1164" d="M63 0l162 1082h176l-9 -155q66 84 154.5 129.5t192.5 45.5q169 0 253 -104q60 -75 60 -206q0 -50 -9 -109l-102 -683h-197l102 679q7 47 7 85q0 80 -32 120q-47 58 -165 58q-88 0 -158 -38.5t-118 -106.5l-120 -797h-197z" />
-<glyph unicode="o" horiz-adv-x="1164" d="M96 529l4 22q37 249 188.5 400t376.5 151q215 0 327 -156q85 -119 85 -286q0 -52 -8 -109l-4 -22q-38 -251 -189 -400.5t-377 -149.5q-215 0 -327 156q-84 118 -85 283q0 53 9 111zM293 529q-9 -58 -9 -109q0 -105 38 -178q56 -109 200 -109q135 0 227.5 113.5 t118.5 282.5l4 22q8 55 8 104q0 106 -38 182q-56 110 -200 110q-136 0 -228.5 -114.5t-116.5 -281.5z" />
-<glyph unicode="p" horiz-adv-x="1164" d="M1 -416l224 1498h151l10 -140q65 78 150 119t190 41q193 0 284 -162q64 -113 64 -275q0 -68 -11 -144l-3 -21q-37 -243 -168.5 -382t-330.5 -139q-97 0 -168 35.5t-115 104.5l-80 -535h-197zM301 275q28 -67 82 -104.5t141 -37.5q134 0 224.5 103.5t114.5 263.5l3 21 q10 66 10 123q0 108 -36 183q-55 115 -197 115q-82 0 -148.5 -39.5t-115.5 -107.5z" />
-<glyph unicode="q" horiz-adv-x="1164" d="M93 500l3 21q40 271 174 426t337 155q96 0 165.5 -39t111.5 -113l49 132h151l-224 -1498h-197l77 518q-60 -61 -136 -92t-167 -31q-191 0 -285 145q-68 106 -68 257q0 56 9 119zM290 500q-9 -57 -9 -105q0 -98 35 -163q52 -99 194 -99q78 0 142 37t114 104l81 542 q-29 61 -82 96t-131 35q-136 0 -225 -121t-116 -305z" />
-<glyph unicode="r" horiz-adv-x="717" d="M63 0l162 1082h176l-4 -153q58 82 132 127.5t163 45.5q21 0 41.5 -3.5t32.5 -7.5l-55 -183l-100 6q-77 0 -136 -38.5t-100 -108.5l-115 -767h-197z" />
-<glyph unicode="s" horiz-adv-x="1071" d="M80 329l2 6h189q-1 -13 -1 -24q0 -85 58 -129q66 -48 164 -49q101 0 168 45t78 113q2 12 2 22q0 52 -36 85q-43 40 -178 71q-186 41 -278 115q-77 62 -78 159q0 19 3 39q19 138 143.5 229t305.5 91q176 0 280 -101q85 -83 86 -186q0 -23 -5 -46l-2 -6h-189q2 11 2 22 q0 58 -45 106q-53 56 -148 56q-100 0 -160.5 -47.5t-69.5 -111.5q-2 -12 -2 -24q0 -49 32 -76q39 -34 176 -63q193 -42 285 -119q78 -65 78 -163q0 -18 -3 -38q-21 -149 -149 -237.5t-318 -88.5q-198 0 -306 106q-88 86 -89 193q0 25 5 51z" />
-<glyph unicode="t" horiz-adv-x="690" d="M108 936l22 146h172l39 261h197l-39 -261h205l-22 -146h-205l-98 -657q-4 -25 -4 -44q1 -45 19 -65q26 -30 79 -29q16 0 38.5 4.5t36.5 9.5l7 -135q-25 -18 -69.5 -29.5t-86.5 -11.5q-117 0 -179 73q-45 53 -45 148q0 36 7 79l98 657h-172z" />
-<glyph unicode="u" horiz-adv-x="1164" d="M126 444l95 638h197l-96 -640q-11 -71 -11 -124q0 -80 25 -117q41 -62 151 -62q103 0 179 44.5t124 125.5l115 773h197l-162 -1082h-177l11 155q-64 -86 -150.5 -131t-192.5 -45q-171 1 -256 115q-60 80 -60 220q0 60 11 130z" />
-<glyph unicode="v" horiz-adv-x="1030" d="M128 1082h202l142 -763l6 -76l6 -1l30 77l363 763h201l-560 -1082h-149z" />
-<glyph unicode="w" horiz-adv-x="1550" d="M127 1082h205l67 -688l4 -138l5 -1l48 139l319 688h158l114 -688l5 -155l6 -1l55 156l263 688h206l-476 -1082h-159l-115 659l-15 171l-6 1l-64 -172l-309 -659h-159z" />
-<glyph unicode="x" horiz-adv-x="1030" d="M-30 5l439 542l-271 535h227l167 -399l290 399h223l3 -5l-427 -530l279 -547h-226l-179 409l-301 -409h-221z" />
-<glyph unicode="y" horiz-adv-x="1030" d="M-40 -421l43 155q-3 1 36.5 -2t50.5 -3q60 0 111.5 58.5t85.5 121.5l65 113l-244 1060h220l126 -681l15 -136l6 -1l388 818h219l-642 -1248q-58 -109 -146.5 -190t-218.5 -81q-23 0 -59 5.5t-56 10.5z" />
-<glyph unicode="z" horiz-adv-x="1030" d="M14 0l21 138l698 783l-2 5h-571l23 156h819l-20 -134l-705 -789l2 -5h618l-23 -154h-860z" />
-<glyph unicode="{" horiz-adv-x="696" d="M64 543l3 23l14 101l4 23q102 0 163.5 62.5t78.5 173.5l28 206q24 177 122.5 293.5t302.5 171.5l23 -117q-115 -35 -174 -125t-77 -223l-28 -206q-16 -109 -69.5 -189.5t-145.5 -123.5q77 -47 109 -127t19 -180l-29 -205q-20 -136 14 -223.5t140 -123.5l-57 -118 q-187 55 -252.5 175t-41.5 290l29 205q16 116 -26.5 176.5t-149.5 60.5z" />
-<glyph unicode="|" horiz-adv-x="507" d="M25 -270l258 1726h197l-258 -1726h-197z" />
-<glyph unicode="}" horiz-adv-x="696" d="M-88 -246q114 36 173 125.5t78 221.5l29 205q15 112 71.5 191.5t156.5 120.5q-86 43 -121.5 123t-19.5 185l28 206q19 136 -15 224.5t-139 123.5l58 117q186 -55 251.5 -174.5t41.5 -290.5l-28 -206q-17 -117 25 -176.5t151 -59.5l-16 -115h-1l-4 -32 q-104 0 -165.5 -63.5t-76.5 -173.5l-29 -205q-26 -176 -123.5 -293t-300.5 -172z" />
-<glyph unicode="~" horiz-adv-x="1391" d="M124 479q16 137 113.5 230.5t230.5 93.5q84 0 157 -35.5t147 -103.5q52 -51 96.5 -74t95.5 -23q64 0 121.5 57t68.5 134l132 -17l2 -6q-17 -139 -116 -236.5t-231 -97.5q-86 0 -157 33.5t-145 106.5q-53 48 -98.5 72t-95.5 24q-65 0 -121 -53.5t-66 -127.5l-132 17z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1122" d="M95 520l6 42q31 210 151 355t310 177l34 224h198l-35 -228q132 -32 203.5 -137t50.5 -244h-187q15 103 -38 170.5t-153 67.5q-139 0 -226 -114.5t-110 -270.5l-6 -42q-26 -168 23 -277.5t197 -109.5q87 0 165.5 61t92.5 148h179l2 -6q-14 -121 -117 -217.5t-240 -127.5 l-36 -236h-198l35 233q-172 34 -252 183t-49 349z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1194" d="M54 0l23 154h10q50 13 89 111t54 201l16 149h-164l24 155h158l30 270q32 212 160 324.5t318 112.5q192 0 290 -105.5t69 -275.5l-3 -6h-190q18 123 -36 177.5t-154 54.5q-96 0 -167 -75t-90 -207l-31 -270h419l-24 -155h-412l-17 -149q-15 -93 -42 -173.5t-64 -138.5h734 l-24 -154h-976z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1243" d="M107 326l18 122h375l25 167h-375l19 123h310l-311 718h226l259 -663l460 663h224l-525 -718h312l-19 -123h-383l-25 -167h383l-18 -122h-383l-49 -326h-197l49 326h-375z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1604" d="M117 729q49 327 285.5 537t536.5 210q283 0 463.5 -218t133.5 -529q-49 -328 -286 -539t-535 -211q-284 0 -464.5 218.5t-133.5 531.5zM238 729q-42 -276 102 -452.5t393 -176.5q235 0 439 183t244 446q41 274 -103 449.5t-392 175.5q-237 0 -440.5 -182t-242.5 -443z M456 669l18 119q26 179 135.5 283t270.5 104q152 0 231 -80t53 -228l-2 -5h-147q15 99 -23.5 140.5t-130.5 41.5q-90 0 -154 -71t-81 -184l-18 -120q-18 -122 22.5 -189.5t135.5 -67.5q88 0 140.5 43.5t67.5 140.5h145l2 -6q-19 -156 -117.5 -232t-257.5 -76 q-153 0 -234.5 107.5t-55.5 279.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="923" d="M168 538l23 154h590l-23 -154h-590z" />
-<glyph unicode="&#xae;" horiz-adv-x="1604" d="M117 729q49 327 285.5 537t536.5 210q283 0 463.5 -218t133.5 -529q-49 -328 -286 -539t-535 -211q-284 0 -464.5 218.5t-133.5 531.5zM238 729q-42 -276 102 -452.5t393 -176.5q235 0 438.5 183t243.5 446q41 274 -102.5 449.5t-391.5 175.5q-237 0 -440.5 -182 t-242.5 -443zM471 316l128 850h280q146 0 225 -66t61 -191q-10 -65 -50 -111t-108 -77q60 -27 82.5 -80.5t12.5 -125.5l-8 -56q-7 -43 -8 -74.5t6 -52.5l-3 -16h-153q-5 21 -1.5 59t10.5 85l8 54q11 75 -17 107.5t-106 32.5h-160l-50 -338h-149zM690 784h153q65 1 115 32.5 t59 87.5q11 76 -24 104t-134 28h-131z" />
-<glyph unicode="&#xb4;" horiz-adv-x="654" d="M236 1257l218 261h229l2 -6l-306 -260h-141z" />
-<glyph unicode="&#x2000;" horiz-adv-x="846" />
-<glyph unicode="&#x2001;" horiz-adv-x="1693" />
-<glyph unicode="&#x2002;" horiz-adv-x="846" />
-<glyph unicode="&#x2003;" horiz-adv-x="1693" />
-<glyph unicode="&#x2004;" horiz-adv-x="564" />
-<glyph unicode="&#x2005;" horiz-adv-x="423" />
-<glyph unicode="&#x2006;" horiz-adv-x="282" />
-<glyph unicode="&#x2007;" horiz-adv-x="282" />
-<glyph unicode="&#x2008;" horiz-adv-x="211" />
-<glyph unicode="&#x2009;" horiz-adv-x="338" />
-<glyph unicode="&#x200a;" horiz-adv-x="94" />
-<glyph unicode="&#x2010;" horiz-adv-x="923" d="M168 538l23 154h590l-23 -154h-590z" />
-<glyph unicode="&#x2011;" horiz-adv-x="923" d="M168 538l23 154h590l-23 -154h-590z" />
-<glyph unicode="&#x2012;" horiz-adv-x="923" d="M168 538l23 154h590l-23 -154h-590z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1416" d="M201.498 648l29.8994 155h1085.49l-29.9004 -155h-1085.49z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1660" d="M214.995 648l36.7998 155h1335.98l-36.7998 -155h-1335.98z" />
-<glyph unicode="&#x2018;" horiz-adv-x="524" d="M203 917l27 184l154 355h97l-55 -361l-26 -178h-197z" />
-<glyph unicode="&#x2019;" horiz-adv-x="516" d="M218 917l52 343l29 196h197l-29 -193l-152 -346h-97z" />
-<glyph unicode="&#x201c;" horiz-adv-x="788" d="M181 917l27 184l154 355h97l-55 -361l-26 -178h-197zM509 917l27 184l154 355h97l-55 -361l-26 -178h-197z" />
-<glyph unicode="&#x201d;" horiz-adv-x="769" d="M183 917l52 343l29 196h197l-29 -193l-152 -346h-97zM519 917l52 343l29 196h197l-29 -193l-152 -346h-97z" />
-<glyph unicode="&#x2022;" horiz-adv-x="695" d="M167 733l9 60q13 91 77 145.5t159 54.5q92 0 141 -56.5t37 -143.5l-9 -60q-14 -92 -77.5 -145t-159.5 -53q-91 0 -140.5 55t-36.5 143z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1380" d="M81 0l30 202h197l-30 -202h-197zM524 0l30 202h197l-30 -202h-197zM944 0l30 202h197l-30 -202h-197z" />
-<glyph unicode="&#x202f;" horiz-adv-x="338" />
-<glyph unicode="&#x205f;" horiz-adv-x="423" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1088" d="M76 512l18 124h146l25 166h-146l19 125h145l3 15q38 253 199.5 394t395.5 141q57 0 115.5 -8t121.5 -23l-43 -159q-52 16 -107 25.5t-111 9.5q-141 0 -244.5 -104t-128.5 -274l-3 -17h492l-19 -125h-492l-25 -166h492l-18 -124h-493q-27 -180 44 -279.5t219 -99.5 q55 0 113.5 8.5t112.5 25.5l-4 -157q-59 -15 -121.5 -23t-123.5 -8q-222 0 -347 145.5t-89 387.5h-146z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1284" d="M229 1374l12 82h384l-12 -82h-145l-68 -455h-94l68 455h-145zM623 919l80 537h116l103 -389l6 -1l220 390h110l-80 -537h-93l51 342l-6 2l-201 -344h-51l-103 358h-6l-53 -358h-93z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1170" d="M185 648l23 155h835l-23 -155h-835z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-Italic-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-Italic-webfont.ttf
deleted file mode 100644
index e2534041501024a80e76ed89129635db1bec7879..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30352
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
a;@RGMLo$lqKCML`ipgE$#qnx#(f<R%{k6jY

diff --git a/app/webroot/css/fonts/roboto/Roboto-Italic-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-Italic-webfont.woff
deleted file mode 100644
index f5436e548175e32e1782b7db9cba3ad06100b570..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17940
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
Grc`Rs0!66+

diff --git a/app/webroot/css/fonts/roboto/Roboto-Light-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-Light-webfont.eot
deleted file mode 100644
index a8b0d4322dba35882f652e111c49f61e855617a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26368
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
Uh&DpCCE$VhIpJ)D7MJ(G0OME#asU7T

diff --git a/app/webroot/css/fonts/roboto/Roboto-Light-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-Light-webfont.svg
deleted file mode 100644
index a46503535..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-Light-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoLight" horiz-adv-x="1135" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="498" />
-<glyph unicode=" "  horiz-adv-x="498" />
-<glyph unicode="&#x09;" horiz-adv-x="498" />
-<glyph unicode="&#xa0;" horiz-adv-x="498" />
-<glyph unicode="!" horiz-adv-x="462" d="M158 0v167h142v-167h-142zM169 478v978h119v-978h-119z" />
-<glyph unicode="&#x22;" horiz-adv-x="666" d="M142 979l25 255v222h120v-216l-73 -261h-72zM381 979l26 258v219h119v-216l-73 -261h-72z" />
-<glyph unicode="#" horiz-adv-x="1270" d="M67 410v93h272l83 441h-279v96h297l79 416h100l-79 -416h314l79 416h100l-79 -416h229v-96h-247l-83 -441h255v-93h-273l-77 -410h-100l77 410h-313l-77 -410h-100l77 410h-255zM439 503h314l83 441h-314z" />
-<glyph unicode="$" horiz-adv-x="1154" d="M128 412l3 6h112q0 -177 101 -255t244 -78q148 0 234.5 77.5t86.5 196.5q0 110 -72 180t-254 135q-208 66 -308 159t-100 262q0 162 100 264t272 116v202h102v-202q175 -16 271.5 -129t93.5 -304l-2 -5h-113q0 147 -80 240t-223 93q-148 0 -225 -77t-77 -196 q0 -114 68 -183.5t262 -133.5q206 -69 305.5 -160.5t99.5 -258.5q0 -166 -103.5 -265t-279.5 -114v-190h-102v189q-181 11 -300.5 115.5t-115.5 315.5z" />
-<glyph unicode="%" horiz-adv-x="1514" d="M110 1099v77q0 127 78.5 214t206.5 87q127 0 205.5 -87t78.5 -214v-77q0 -126 -78 -212.5t-204 -86.5q-129 0 -208 86.5t-79 212.5zM206 1099q0 -88 49.5 -150t141.5 -62q89 0 137.5 62t48.5 150v77q0 88 -49 151t-139 63t-139.5 -63t-49.5 -151v-77zM352 169l711 1138 l74 -48l-711 -1138zM842 279v78q0 126 78.5 213t206.5 87q127 0 206 -87t79 -213v-78q0 -127 -78.5 -213.5t-204.5 -86.5q-129 0 -208 86.5t-79 213.5zM939 279q0 -89 49 -151t141 -62q89 0 137.5 62t48.5 151v78q0 91 -49 152t-139 61t-139 -61.5t-49 -151.5v-78z" />
-<glyph unicode="&#x26;" horiz-adv-x="1260" d="M91 371q0 120 72.5 216.5t209.5 196.5l15 11q-81 100 -120 182.5t-39 169.5q0 158 89 244t244 86q144 0 228.5 -81t84.5 -204q0 -90 -45 -155t-130 -130l-159 -122l412 -481q49 71 76 159t27 188h110q0 -128 -36.5 -235.5t-105.5 -194.5l185 -216l-2 -5h-137l-122 141 q-85 -78 -186 -120t-218 -42q-209 0 -331 107t-122 285zM211 371q0 -124 85.5 -207.5t247.5 -83.5q92 0 179.5 36t157.5 103l-414 482l-9 9q-3 3 -5 7l-47 -36q-116 -94 -155.5 -170t-39.5 -140zM349 1149q0 -66 31.5 -137t96.5 -151l177 132q58 45 82.5 94t24.5 105 q0 79 -52.5 131t-146.5 52q-102 0 -157.5 -65t-55.5 -161z" />
-<glyph unicode="'" horiz-adv-x="423" d="M142 986l25 266v204h120v-195l-73 -275h-72z" />
-<glyph unicode="(" horiz-adv-x="640" d="M140 573v15q0 363 139 651t310 386l6 -1l26 -73q-145 -103 -253 -366t-108 -594v-20q0 -331 108 -594t253 -370l-26 -70h-6q-173 100 -311 382t-138 654z" />
-<glyph unicode=")" horiz-adv-x="652" d="M18 -393q144 102 252.5 367t108.5 597v20q0 329 -110.5 595.5t-250.5 368.5l26 70h6q170 -98 309 -386t139 -651v-15q0 -372 -138 -654t-310 -382h-6z" />
-<glyph unicode="*" horiz-adv-x="869" d="M89 782l32 101l272 -92l-8 291l104 -1l-4 -294l264 97l33 -101l-273 -84l172 -230l-85 -62l-163 241l-159 -239l-85 60l172 237z" />
-<glyph unicode="+" horiz-adv-x="1156" d="M75 628v112h434v466h121v-466h443v-112h-443v-482h-121v482h-434z" />
-<glyph unicode="," horiz-adv-x="392" d="M83 -258l69 279v167h119v-170l-106 -276h-82z" />
-<glyph unicode="-" horiz-adv-x="860" d="M130 570v101h590v-101h-590z" />
-<glyph unicode="." horiz-adv-x="489" d="M167 0v164h137v-164h-137z" />
-<glyph unicode="/" horiz-adv-x="813" d="M30 -125l608 1581h108l-607 -1581h-109z" />
-<glyph unicode="0" d="M115 514v428q0 247 121 391t331 144t331.5 -144t121.5 -391v-428q0 -249 -120.5 -392t-330.5 -143t-332 143.5t-122 391.5zM234 496q0 -189 87.5 -302.5t247.5 -113.5q159 0 245 113t86 303v465q0 191 -86.5 302.5t-246.5 111.5t-246.5 -112t-86.5 -302v-465z" />
-<glyph unicode="1" d="M194 1311v96l465 70v-1477h-120v1353z" />
-<glyph unicode="2" d="M137 1052q-5 178 115 301.5t323 123.5q187 0 295 -105t108 -284q0 -118 -71 -236t-209 -286l-394 -460l2 -5h733v-101h-886v92l479 559q128 151 177 247.5t49 190.5q0 133 -71.5 209.5t-211.5 76.5q-156 0 -240 -92.5t-84 -236.5h-112z" />
-<glyph unicode="3" d="M113 389l2 6h112q0 -135 99 -225t252 -90q152 0 238 84t86 227q0 154 -91.5 229.5t-259.5 75.5h-134v102h134q159 0 241 79t82 204q0 130 -76 212t-225 82q-140 0 -232 -83.5t-92 -216.5h-112l-2 6q-5 170 121 283t317 113q194 0 307.5 -105t113.5 -295 q0 -108 -62.5 -196t-171.5 -131q126 -40 193.5 -131t67.5 -224q0 -195 -123 -305.5t-320 -110.5q-185 0 -327.5 109.5t-137.5 300.5z" />
-<glyph unicode="4" d="M72 368v68l657 1020h131v-987h228v-101h-228v-368h-119v368h-669zM214 469h527v830l-6 2l-51 -109z" />
-<glyph unicode="5" d="M171 377l2 6h108q0 -147 83 -225t222 -78q163 0 243.5 98t80.5 284q0 163 -80.5 259t-226.5 96q-139 0 -212.5 -44.5t-106.5 -134.5l-97 17l80 801h708v-111h-605l-54 -524q55 49 121.5 77t178.5 31q187 3 300.5 -123t113.5 -342q0 -221 -111 -353t-333 -132 q-180 0 -300 100.5t-115 297.5z" />
-<glyph unicode="6" d="M155 531v394q0 242 135.5 397t335.5 155q81 0 161.5 -17t139.5 -49l-31 -98q-60 31 -122.5 46.5t-147.5 15.5q-153 0 -252.5 -122t-99.5 -317v-200q60 84 155 134.5t210 50.5q193 0 301 -126t108 -341q0 -213 -121.5 -344t-319.5 -131q-196 0 -324 149t-128 403zM274 522 q0 -201 94 -321.5t239 -120.5q148 0 234.5 106t86.5 268q0 176 -81.5 272.5t-240.5 96.5q-118 0 -208.5 -63.5t-123.5 -161.5v-76z" />
-<glyph unicode="7" d="M91 1354v102h947v-102q-245 -286 -368.5 -572.5t-123.5 -637.5v-144h-120v144q0 347 128.5 642t359.5 568h-823z" />
-<glyph unicode="8" d="M100 394q0 128 82 224t218 137q-119 40 -189 128.5t-70 206.5q0 186 122 286.5t314 100.5q181 0 300 -100.5t119 -286.5q0 -118 -68.5 -207t-181.5 -129q130 -41 210.5 -137t80.5 -223q0 -196 -130.5 -305.5t-327.5 -109.5q-210 0 -344.5 109t-134.5 306zM219 393 q0 -143 102 -228t258 -85q143 0 240.5 85.5t97.5 227.5q0 137 -99 224t-241 87q-153 0 -255.5 -87t-102.5 -224zM260 1091q0 -129 91 -207.5t228 -78.5q125 0 211 79t86 207q0 125 -87 204.5t-212 79.5q-138 0 -227.5 -76.5t-89.5 -207.5z" />
-<glyph unicode="9" d="M94 983q0 213 125 353.5t313 140.5q206 0 333 -135t127 -384v-474q0 -237 -131.5 -371t-342.5 -134q-75 0 -151.5 16t-148.5 47l22 97q66 -32 129.5 -45.5t148.5 -13.5q160 0 255 106t95 296v212q-53 -89 -141.5 -137t-195.5 -48q-198 0 -317.5 131.5t-119.5 342.5z M218 983q0 -160 83.5 -266.5t229.5 -106.5q127 0 214 64t123 158v139q0 194 -90 299t-241 105q-141 0 -230 -113t-89 -279z" />
-<glyph unicode=":" horiz-adv-x="434" d="M167 0v164h137v-164h-137zM167 876v164h137v-164h-137z" />
-<glyph unicode=";" horiz-adv-x="438" d="M168 876v164h137v-164h-137zM134 -258l69 279v167h119v-170l-106 -276h-82z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1047" d="M77 501v97l827 378v-126l-614 -272l-108 -28v-6l108 -28l614 -268v-126z" />
-<glyph unicode="=" horiz-adv-x="1147" d="M149 422v106h834v-106h-834zM149 833v106h834v-106h-834z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1061" d="M124 113v124l632 274l108 27v6l-108 29l-632 271v123l845 -378v-97z" />
-<glyph unicode="?" horiz-adv-x="930" d="M81 1122q-3 165 104 260t273 95q179 0 280.5 -101t101.5 -273q0 -135 -66.5 -239.5t-188.5 -218.5q-62 -53 -75.5 -99t-13.5 -142h-119q1 131 22 182.5t114 136.5q108 112 157.5 187.5t49.5 191.5q0 128 -68 198t-194 70q-118 0 -190 -68.5t-73 -185.5h-112zM373 0v154 h139v-154h-139z" />
-<glyph unicode="@" horiz-adv-x="1870" d="M122 478q18 424 252.5 683t609.5 259q391 0 587.5 -241.5t179.5 -665.5q-10 -216 -117 -375t-313 -159q-78 0 -130.5 51t-69.5 142q-53 -96 -131 -144.5t-180 -48.5q-131 0 -199 120t-49 317q23 254 141 407.5t286 153.5q94 0 151 -26.5t126 -81.5l-2 -2h3l-50 -574 q-10 -132 30 -180t95 -48q142 0 224.5 124.5t93.5 323.5q18 389 -150 604.5t-530 215.5q-323 0 -533 -235.5t-227 -619.5q-19 -379 163.5 -612.5t519.5 -233.5q88 0 178 22t152 57l31 -75q-64 -41 -167 -65t-198 -24q-380 0 -588 249.5t-189 681.5zM672 416 q-16 -155 26 -247t138 -92q86 0 156.5 43t122.5 157v9q0 3 1 7l47 544q-32 23 -71 36t-87 13q-134 0 -222 -119t-111 -351z" />
-<glyph unicode="A" horiz-adv-x="1256" d="M38 0l535 1456h113l531 -1456h-124l-145 406h-639l-147 -406h-124zM347 513h562l-276 772h-6z" />
-<glyph unicode="B" horiz-adv-x="1263" d="M186 0v1456h425q227 0 354 -95.5t127 -287.5q0 -109 -61.5 -191t-165.5 -116q138 -17 225.5 -120t87.5 -241q0 -195 -126.5 -300t-338.5 -105h-527zM306 101h407q161 0 253 79.5t92 222.5q0 131 -90.5 212.5t-242.5 86.5h-16h-403v-601zM306 803h350q151 3 233.5 72.5 t82.5 201.5q0 138 -92 207.5t-269 69.5h-305v-551z" />
-<glyph unicode="C" horiz-adv-x="1313" d="M132 609v237q0 278 149 454.5t392 176.5q237 0 379 -125q139 -122 139 -332v-12l-2 -6h-112q0 176 -107.5 274.5t-296.5 98.5q-191 0 -306.5 -148t-115.5 -379v-239q0 -234 115.5 -381.5t306.5 -147.5q189 0 296.5 96t107.5 279h112l2 -6v-12q0 -206 -140 -330 q-144 -128 -378 -128q-243 0 -392 175.5t-149 454.5z" />
-<glyph unicode="D" horiz-adv-x="1378" d="M186 0v1456h444q267 0 441.5 -178t174.5 -457v-187q0 -279 -174.5 -456.5t-441.5 -177.5h-444zM306 101h324q216 0 356 151t140 382v190q0 228 -140.5 379t-355.5 151h-324v-1253z" />
-<glyph unicode="E" horiz-adv-x="1129" d="M186 0v1456h870v-102h-750v-547h653v-102h-653v-604h755v-101h-875z" />
-<glyph unicode="F" horiz-adv-x="1128" d="M186 0v1456h891v-102h-771v-569h669v-103h-669v-682h-120z" />
-<glyph unicode="G" horiz-adv-x="1410" d="M146 600v267q0 270 155 440t401 170q237 0 376 -125q136 -122 136 -307v-11l-3 -6h-110q0 151 -104 249t-295 98q-196 0 -316 -142t-120 -364v-269q0 -228 125 -374t326 -146q153 0 250 46t135 107v373h-392v102h511v-512q-48 -79 -177.5 -148t-326.5 -69 q-251 0 -411 173t-160 448z" />
-<glyph unicode="H" horiz-adv-x="1439" d="M186 0v1456h120v-684h827v684h120v-1456h-120v670h-827v-670h-120z" />
-<glyph unicode="I" horiz-adv-x="554" d="M217 0v1456h120v-1456h-120z" />
-<glyph unicode="J" horiz-adv-x="1122" d="M86 395l2 6h112q0 -164 80.5 -242.5t234.5 -78.5q133 0 219 92.5t86 249.5v1034h120v-1034q0 -203 -118.5 -323t-306.5 -120q-200 0 -317 106q-112 102 -112 293v17z" />
-<glyph unicode="K" horiz-adv-x="1261" d="M186 0v1456h120v-664h156l572 664h136l2 -5l-604 -700l664 -746l-2 -5h-144l-623 691h-157v-691h-120z" />
-<glyph unicode="L" horiz-adv-x="1128" d="M186 0v1456h120v-1355h752v-101h-872z" />
-<glyph unicode="M" horiz-adv-x="1766" d="M186 0v1456h160l540 -1282h6l542 1282h146v-1456h-120v1223l-6 1l-522 -1224h-86l-534 1254l-6 -1v-1253h-120z" />
-<glyph unicode="N" horiz-adv-x="1445" d="M186 0v1456h120l827 -1243l6 1v1242h120v-1456h-120l-827 1246l-6 -1v-1245h-120z" />
-<glyph unicode="O" horiz-adv-x="1378" d="M124 609v237q0 281 152 456t408 175q260 0 415 -175t155 -456v-237q0 -282 -154.5 -456t-414.5 -174q-256 0 -408.5 174t-152.5 456zM244 609q0 -238 116.5 -382t324.5 -144q213 0 331.5 143.5t118.5 382.5v239q0 236 -119.5 380t-331.5 144q-208 0 -324 -144t-116 -380 v-239z" />
-<glyph unicode="P" horiz-adv-x="1263" d="M186 0v1456h502q229 0 354.5 -117t125.5 -308q0 -194 -125.5 -310t-354.5 -116h-382v-605h-120zM306 707h382q180 0 270 91.5t90 230.5q0 140 -90 232.5t-270 92.5h-382v-647z" />
-<glyph unicode="Q" horiz-adv-x="1393" d="M124 609v237q0 281 152 456t408 175q260 0 415 -175t155 -456v-237q0 -133 -36.5 -245t-104.5 -195l232 -227l-83 -80l-235 225q-70 -53 -156.5 -80.5t-185.5 -27.5q-256 0 -408.5 174t-152.5 456zM244 609q0 -238 116.5 -382t324.5 -144q213 0 331.5 143.5t118.5 382.5 v239q0 236 -119.5 380t-331.5 144q-208 0 -324 -144t-116 -380v-239z" />
-<glyph unicode="R" horiz-adv-x="1336" d="M183 0v1455h485q234 0 359 -102.5t125 -299.5q0 -116 -66.5 -207.5t-188.5 -133.5q135 -34 194.5 -121.5t59.5 -219.5v-137q0 -68 16 -122t53 -88v-24h-122q-37 36 -52 101t-15 135v133q0 134 -86.5 211.5t-241.5 77.5h-400v-658h-120zM303 760h351q197 0 288 79.5 t91 214.5q0 144 -90.5 221.5t-274.5 77.5h-365v-593z" />
-<glyph unicode="S" horiz-adv-x="1236" d="M100 408l2 6h111q0 -169 127 -251.5t290 -82.5q167 0 272 76.5t105 197.5q0 112 -89 185t-302 137q-233 64 -354.5 159.5t-121.5 259.5q0 167 136 274.5t347 107.5q222 1 357 -121q131 -118 131 -298v-11l-2 -6h-112q0 144 -104.5 239t-269.5 95q-170 0 -266.5 -80.5 t-96.5 -197.5q0 -111 87.5 -182.5t308.5 -133.5q230 -67 351 -165t121 -260q0 -170 -141.5 -273.5t-356.5 -103.5q-215 -1 -375 109q-155 106 -155 307v13z" />
-<glyph unicode="T" horiz-adv-x="1224" d="M48 1354v102h1128v-102h-496v-1354h-119v1354h-513z" />
-<glyph unicode="U" horiz-adv-x="1374" d="M167 489v967h120v-967q0 -188 111.5 -298.5t285.5 -110.5q178 0 292 110t114 299v967h119v-967q0 -240 -147 -375t-378 -135q-228 0 -372.5 135.5t-144.5 374.5z" />
-<glyph unicode="V" horiz-adv-x="1256" d="M29 1456h130l437 -1201l29 -102h6l29 102l438 1201h129l-542 -1456h-114z" />
-<glyph unicode="W" horiz-adv-x="1813" d="M50 1456h130l260 -1038l45 -235h6l51 235l304 1038h121l305 -1038l49 -236h6l48 236l257 1038h130l-373 -1456h-114l-329 1117l-36 157h-6l-34 -157l-333 -1117h-114z" />
-<glyph unicode="X" horiz-adv-x="1256" d="M59 0l500 738l-485 718h145l409 -622l411 622h145l-484 -718l500 -738h-143l-427 642l-426 -642h-145z" />
-<glyph unicode="Y" horiz-adv-x="1256" d="M38 1456h139l448 -809l451 809h139l-531 -924v-532h-119v537z" />
-<glyph unicode="Z" horiz-adv-x="1224" d="M95 0v92l858 1262h-831v102h977v-87l-861 -1268h893v-101h-1036z" />
-<glyph unicode="[" horiz-adv-x="491" d="M163 -312v1976h330v-102h-210v-1772h210v-102h-330z" />
-<glyph unicode="\" horiz-adv-x="807" d="M48 1456h117l608 -1581h-117z" />
-<glyph unicode="]" horiz-adv-x="491" d="M0 -210h211v1772h-211v102h331v-1976h-331v102z" />
-<glyph unicode="^" horiz-adv-x="852" d="M77 729l299 727h90l298 -727h-116l-196 484l-30 106h-6l-30 -106l-193 -484h-116z" />
-<glyph unicode="_" horiz-adv-x="884" d="M1 0h881v-101h-881v101z" />
-<glyph unicode="`" horiz-adv-x="585" d="M93 1513l2 5h154l202 -266h-117z" />
-<glyph unicode="a" horiz-adv-x="1101" d="M98 293q0 145 127 235t330 90h266v134q0 116 -73.5 182t-207.5 66q-123 0 -198.5 -60t-75.5 -151h-111l-2 6v12q1 115 105 203q110 92 288 92t286 -91t108 -261v-532q0 -57 6.5 -111t21.5 -107h-125q-11 57 -16.5 98t-5.5 84q-56 -88 -157 -145.5t-232 -57.5 q-159 0 -246.5 84.5t-87.5 229.5zM218 289q0 -92 60.5 -148t166.5 -56q138 0 239 65.5t137 168.5v207h-267q-146 0 -241 -69.5t-95 -167.5z" />
-<glyph unicode="b" horiz-adv-x="1140" d="M158 0v1560h120v-644q54 89 138 137.5t199 48.5q195 0 305 -155.5t110 -414.5v-21q0 -243 -110 -387.5t-303 -144.5q-118 0 -204.5 47.5t-140.5 135.5l-20 -162h-94zM278 286q40 -94 118.5 -148.5t197.5 -54.5q157 0 236 116t79 312v21q0 207 -80 336.5t-237 129.5 q-124 0 -200 -60.5t-114 -156.5v-495z" />
-<glyph unicode="c" horiz-adv-x="1054" d="M97 520v42q0 236 120 388t336 152q174 0 290 -105q112 -101 112 -265v-11l-2 -6h-107q0 130 -85 207.5t-208 77.5q-170 0 -253 -125t-83 -313v-42q0 -191 83 -315.5t254 -124.5q115 0 203.5 68t88.5 189h107l2 -6v-9q0 -144 -118 -242q-122 -101 -283 -101 q-216 0 -336.5 152t-120.5 389z" />
-<glyph unicode="d" horiz-adv-x="1140" d="M111 511v21q0 259 109.5 414.5t305.5 155.5q111 0 194.5 -47t138.5 -133v638h120v-1560h-98l-17 157q-55 -86 -140 -132t-200 -46q-194 0 -303.5 144.5t-109.5 387.5zM231 511q0 -196 78.5 -312t236.5 -116q116 0 193 51.5t120 142.5v513q-41 92 -116 150t-195 58 q-158 0 -237.5 -129.5t-79.5 -336.5v-21z" />
-<glyph unicode="e" horiz-adv-x="1054" d="M97 509v55q0 234 132.5 386t328.5 152q197 0 304.5 -126.5t107.5 -340.5v-93h-753v-33q0 -185 93.5 -307t258.5 -122q99 0 182 32.5t138 87.5l51 -82q-57 -60 -149.5 -99.5t-221.5 -39.5q-210 0 -341 148.5t-131 381.5zM227 650l3 -6h620v25q0 144 -75.5 237.5 t-216.5 93.5q-138 0 -227 -99t-104 -251z" />
-<glyph unicode="f" horiz-adv-x="658" d="M61 984v98h179v158q0 163 82 252t229 89q32 0 66 -5t70 -14l-16 -99q-24 6 -49 9.5t-59 3.5q-98 0 -150.5 -62t-52.5 -174v-158h245v-98h-245v-984h-120v984h-179z" />
-<glyph unicode="g" horiz-adv-x="1140" d="M115 511v21q0 259 109.5 414.5t305.5 155.5q115 0 200 -49.5t140 -140.5l17 170h97v-1088q0 -207 -114 -319t-323 -112q-78 0 -166.5 19t-154.5 52l23 101q65 -32 138.5 -48.5t157.5 -16.5q160 0 239 82t79 242v153q-55 -81 -139.5 -124.5t-195.5 -43.5 q-194 0 -303.5 145t-109.5 387zM235 511q0 -196 79 -312t237 -116q114 0 191.5 51.5t120.5 141.5v516q-41 91 -116.5 148.5t-193.5 57.5q-158 0 -238 -130t-80 -336v-21z" />
-<glyph unicode="h" horiz-adv-x="1140" d="M158 0v1560h120v-662q55 97 144.5 150.5t209.5 53.5q171 0 262.5 -106t91.5 -329v-667h-120v669q0 176 -69.5 252.5t-191.5 76.5q-126 0 -207.5 -61.5t-119.5 -164.5v-772h-120z" />
-<glyph unicode="i" horiz-adv-x="465" d="M173 0v1082h119v-1082h-119zM173 1392v168h119v-168h-119z" />
-<glyph unicode="j" horiz-adv-x="484" d="M-115 -418l13 101q16 -5 44 -10t49 -5q89 0 139 61.5t50 181.5v1171h119v-1171q0 -167 -80 -257.5t-222 -90.5q-30 0 -56.5 5t-55.5 14zM174 1396v164h119v-164h-119z" />
-<glyph unicode="k" horiz-adv-x="1006" d="M159 0v1560h120v-930h114l415 452h140l2 -5l-444 -491l480 -581l-3 -5h-137l-441 527h-126v-527h-120z" />
-<glyph unicode="l" horiz-adv-x="465" d="M173 0v1560h119v-1560h-119z" />
-<glyph unicode="m" horiz-adv-x="1815" d="M154 0v1082h106l11 -178q52 94 138.5 146t205.5 52q124 0 207 -59.5t119 -181.5q49 113 139.5 177t218.5 64q173 0 267.5 -115t94.5 -356v-631h-120v633q0 200 -71 282.5t-196 82.5q-137 0 -212 -83.5t-95 -215.5q0 -11 0.5 -22t0.5 -28v-649h-121v633q0 196 -71.5 280.5 t-196.5 84.5q-126 0 -200.5 -63.5t-104.5 -171.5v-763h-120z" />
-<glyph unicode="n" horiz-adv-x="1140" d="M158 0v1082h106l11 -188q53 99 141 153.5t209 54.5q176 0 268 -107.5t92 -335.5v-659h-120v658q0 186 -69.5 263t-197.5 77t-206.5 -63t-113.5 -169v-766h-120z" />
-<glyph unicode="o" horiz-adv-x="1140" d="M91 524v33q0 239 131 392t347 153q217 0 348 -153t131 -392v-33q0 -240 -130.5 -392.5t-346.5 -152.5q-218 0 -349 152.5t-131 392.5zM211 524q0 -188 95 -316t265 -128q167 0 262.5 128t95.5 316v33q0 185 -96 314t-264 129t-263 -129t-95 -314v-33z" />
-<glyph unicode="p" horiz-adv-x="1140" d="M158 -416v1498h92l22 -169q54 90 140 139.5t202 49.5q195 0 305 -155.5t110 -414.5v-21q0 -243 -110 -387.5t-303 -144.5q-113 0 -198.5 43t-139.5 122v-560h-120zM278 269q42 -88 119 -138.5t192 -50.5q157 0 238.5 118t81.5 313v21q0 206 -82 336t-240 130 q-119 0 -194.5 -57t-114.5 -148v-524z" />
-<glyph unicode="q" horiz-adv-x="1140" d="M111 511v21q0 259 109.5 414.5t305.5 155.5q112 0 195.5 -47t137.5 -134l19 161h96v-1498h-120v557q-55 -78 -138 -120t-192 -42q-194 0 -303.5 144.5t-109.5 387.5zM231 511q0 -196 78.5 -313.5t236.5 -117.5q111 0 187.5 49.5t120.5 136.5v535q-41 89 -115.5 144 t-190.5 55q-158 0 -237.5 -130.5t-79.5 -337.5v-21z" />
-<glyph unicode="r" horiz-adv-x="699" d="M158 0v1082h105l15 -180v-12q47 100 126 156t188 56q22 0 42 -3.5t33 -7.5l-15 -112l-85 6q-113 0 -185.5 -63.5t-103.5 -174.5v-747h-120z" />
-<glyph unicode="s" horiz-adv-x="1043" d="M110 297l2 6h110q7 -117 95.5 -170t208.5 -53q130 0 205 58t75 139q0 76 -62.5 132.5t-225.5 92.5q-192 40 -285.5 109.5t-93.5 194.5q0 124 104.5 210t276.5 86q181 0 289 -92q103 -87 103 -213v-12l-2 -6h-111q0 89 -76.5 155t-202.5 66q-130 0 -196 -57t-66 -133 q0 -74 56.5 -122.5t225.5 -85.5q190 -42 287.5 -117t97.5 -202q0 -135 -109.5 -219.5t-289.5 -84.5q-198 0 -310 94q-107 89 -106 211v13z" />
-<glyph unicode="t" horiz-adv-x="659" d="M37 984v98h187v277h121v-277h238v-98h-238v-705q0 -106 38.5 -150.5t102.5 -44.5q22 0 42.5 2.5t48.5 8.5l18 -89q-24 -12 -59.5 -19.5t-70.5 -7.5q-114 0 -177.5 72t-63.5 228v705h-187z" />
-<glyph unicode="u" horiz-adv-x="1140" d="M154 455v627h120v-629q0 -198 67.5 -284t191.5 -86q135 0 215.5 60.5t113.5 165.5v773h120v-1082h-106l-10 176q-52 -95 -139.5 -146t-207.5 -51q-171 0 -268 116t-97 360z" />
-<glyph unicode="v" horiz-adv-x="1002" d="M44 1082h124l298 -811l35 -127h6l38 127l294 811h124l-411 -1082h-96z" />
-<glyph unicode="w" horiz-adv-x="1550" d="M65 1082h128l198 -731l42 -198h6l50 198l230 731h103l230 -731l50 -204h6l47 204l193 731h128l-315 -1082h-102l-245 740l-43 175h-6l-43 -175l-240 -740h-103z" />
-<glyph unicode="x" horiz-adv-x="1002" d="M50 0l383 551l-367 531h141l291 -442l293 442h142l-367 -531l382 -551h-140l-308 461l-308 -461h-142z" />
-<glyph unicode="y" horiz-adv-x="1002" d="M35 1082h133l297 -789l38 -129h6l327 918h134l-470 -1255q-42 -110 -109 -187t-196 -77q-21 0 -51 4.5t-44 9.5l14 100q12 -2 38.5 -4.5t38.5 -2.5q78 0 125 55.5t80 142.5l57 146z" />
-<glyph unicode="z" horiz-adv-x="1002" d="M90 0v88l652 891h-632v103h783v-89l-655 -892h703v-101h-851z" />
-<glyph unicode="{" horiz-adv-x="676" d="M68 543v104q118 0 174.5 67t56.5 190v228q0 171 77.5 290.5t260.5 174.5l26 -79q-127 -41 -185.5 -142t-58.5 -244v-228q0 -110 -45.5 -191t-138.5 -118q93 -39 138.5 -120.5t45.5 -190.5v-226q0 -143 59.5 -241.5t187.5 -140.5l-29 -80q-183 55 -260.5 173.5 t-77.5 288.5v226q0 122 -56.5 190.5t-174.5 68.5z" />
-<glyph unicode="|" horiz-adv-x="452" d="M164 -270v1726h120v-1726h-120z" />
-<glyph unicode="}" horiz-adv-x="676" d="M9 -324q127 42 187 140.5t60 241.5v226q0 112 47 193t146 117q-99 35 -146 116t-47 194v228q0 144 -58.5 244.5t-185.5 141.5l26 79q182 -55 260 -174.5t78 -290.5v-228q0 -122 56 -189.5t175 -67.5v-104q-119 0 -175 -68.5t-56 -190.5v-226q0 -170 -77.5 -288.5 t-260.5 -173.5z" />
-<glyph unicode="~" horiz-adv-x="1402" d="M143 474q0 131 79 222t202 91q87 0 160.5 -37t162.5 -113q63 -57 116.5 -82.5t110.5 -25.5q77 0 131 64t54 162l98 -15q0 -129 -81 -223t-202 -94q-88 0 -160.5 35.5t-160.5 114.5q-64 54 -118.5 80.5t-110.5 26.5q-79 0 -131.5 -60.5t-52.5 -160.5z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1115" d="M97 520v42q0 225 110.5 374.5t309.5 163.5v218h120v-223q143 -25 232.5 -126t86.5 -249l-2 -5h-108q0 130 -85 207.5t-208 77.5q-170 0 -253 -125t-83 -313v-42q0 -191 83 -315.5t254 -124.5q115 0 203.5 68t88.5 189h108l2 -5q3 -130 -90 -225t-229 -120v-232h-120v226 q-199 14 -309.5 163.5t-110.5 375.5z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1170" d="M67 642v102h203l-11 296q0 204 106 320.5t284 116.5q187 0 281 -103.5t91 -277.5l-3 -6h-112q0 148 -68.5 216.5t-188.5 68.5q-125 0 -197.5 -88t-72.5 -247l11 -296h450v-102h-447l7 -176q0 -107 -25.5 -204t-71.5 -161h769v-101h-941v101h10q70 15 105 130t35 235 l-7 176h-207z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1223" d="M45 1456h139l423 -723l424 723h139l-455 -751h371v-87h-421v-206h421v-86h-421v-326h-119v326h-416v86h416v206h-416v87h370z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1637" d="M107 729q0 315 207 531t503 216q295 0 502 -216t207 -531q0 -316 -207.5 -533t-501.5 -217q-296 0 -503 217t-207 533zM192 729q0 -279 182.5 -471.5t442.5 -192.5q257 0 440.5 192.5t183.5 471.5q0 277 -183 468.5t-441 191.5q-260 0 -442.5 -191.5t-182.5 -468.5z M474 669v119q0 172 91 279.5t242 107.5q147 0 230 -79t79 -228l-2 -6h-91q0 113 -55 168t-161 55q-110 0 -172 -83.5t-62 -212.5v-120q0 -132 61.5 -214.5t172.5 -82.5q107 0 161 54t54 170h91l2 -6q4 -150 -78.5 -229t-229.5 -79q-151 0 -242 106.5t-91 280.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="860" d="M130 570v101h590v-101h-590z" />
-<glyph unicode="&#xae;" horiz-adv-x="1642" d="M102 729q0 315 207 531t503 216q295 0 502.5 -216t207.5 -531q0 -316 -207.5 -533t-502.5 -217q-296 0 -503 217t-207 533zM187 729q0 -279 183 -471.5t442 -192.5q258 0 441 192.5t183 471.5q0 277 -183 468.5t-441 191.5q-259 0 -442 -191.5t-183 -468.5zM552 316v850 h258q147 0 226 -63t79 -185q0 -68 -36.5 -117.5t-104.5 -79.5q68 -25 98 -78t30 -128v-56q0 -40 4 -73t13 -54v-16h-102q-10 21 -12 61.5t-2 82.5v54q0 84 -38 121t-127 37h-188v-356h-98zM650 763h181q79 0 132.5 40.5t53.5 112.5q0 85 -46 122t-161 37h-160v-312z" />
-<glyph unicode="&#xb4;" horiz-adv-x="576" d="M122 1252l206 266h147l3 -6l-249 -260h-107z" />
-<glyph unicode="&#x2000;" horiz-adv-x="838" />
-<glyph unicode="&#x2001;" horiz-adv-x="1677" />
-<glyph unicode="&#x2002;" horiz-adv-x="838" />
-<glyph unicode="&#x2003;" horiz-adv-x="1677" />
-<glyph unicode="&#x2004;" horiz-adv-x="559" />
-<glyph unicode="&#x2005;" horiz-adv-x="419" />
-<glyph unicode="&#x2006;" horiz-adv-x="279" />
-<glyph unicode="&#x2007;" horiz-adv-x="279" />
-<glyph unicode="&#x2008;" horiz-adv-x="209" />
-<glyph unicode="&#x2009;" horiz-adv-x="335" />
-<glyph unicode="&#x200a;" horiz-adv-x="93" />
-<glyph unicode="&#x2010;" horiz-adv-x="860" d="M130 570v101h590v-101h-590z" />
-<glyph unicode="&#x2011;" horiz-adv-x="860" d="M130 570v101h590v-101h-590z" />
-<glyph unicode="&#x2012;" horiz-adv-x="860" d="M130 570v101h590v-101h-590z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1414" d="M175.498 686v102h1085.49v-102h-1085.49z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1667" d="M182.996 686v102h1335.98v-102h-1335.98z" />
-<glyph unicode="&#x2018;" horiz-adv-x="473" d="M159 970v175l74 311h71l-25 -312v-174h-120z" />
-<glyph unicode="&#x2019;" horiz-adv-x="469" d="M157 970l26 304v182h119v-179l-73 -307h-72z" />
-<glyph unicode="&#x201c;" horiz-adv-x="726" d="M137 970v175l74 311h71l-25 -312v-174h-120zM465 970v175l74 311h71l-25 -312v-174h-120z" />
-<glyph unicode="&#x201d;" horiz-adv-x="708" d="M122 970l26 304v182h119v-179l-73 -307h-72zM458 970l26 304v182h119v-179l-73 -307h-72z" />
-<glyph unicode="&#x2022;" horiz-adv-x="662" d="M146 717v65q0 78 50.5 128.5t134.5 50.5q85 0 135.5 -50.5t50.5 -128.5v-65q0 -79 -50.5 -128t-134.5 -49q-85 0 -135.5 49t-50.5 128z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1313" d="M167 0v164h137v-164h-137zM610 0v164h137v-164h-137zM1030 0v164h137v-164h-137z" />
-<glyph unicode="&#x202f;" horiz-adv-x="335" />
-<glyph unicode="&#x205f;" horiz-adv-x="419" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1073" d="M80 533v88h169v195h-169v89h169v37q0 244 135.5 389.5t355.5 145.5q57 0 112.5 -8t119.5 -23l-9 -106q-54 16 -110.5 25.5t-112.5 9.5q-172 0 -272 -116t-100 -315v-39h547v-89h-547v-195h547v-88h-547v-19q0 -198 101.5 -316t272.5 -118q57 0 113 8.5t108 25.5l9 -104 q-54 -15 -112.5 -23t-117.5 -8q-220 0 -356.5 145t-136.5 390v19h-169z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1264" d="M96 1387v69h384v-69h-152v-468h-74v468h-158zM558 919v537h94l171 -423h6l174 423h88v-537h-73v383l-6 1l-160 -384h-51l-165 399l-6 -1v-398h-72z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1168" d="M165 686v102h835v-102h-835z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-Light-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-Light-webfont.ttf
deleted file mode 100644
index 7b44118b5f1f0f96b046903ef00efbe76162b81a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26180
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-Light-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-Light-webfont.woff
deleted file mode 100644
index 64264d88befa6270322a160d963829c2b58a4b8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15296
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.eot
deleted file mode 100644
index 81545b0e4ad4ccc5baa7d3d577e45f2ba7b77908..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31260
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
Zx=`c8PrU1zf8xifZ*uf>yy`1p{|mFZw9o(m

diff --git a/app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.svg
deleted file mode 100644
index 5f0668dd9..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoLightItalic" horiz-adv-x="1135" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="498" />
-<glyph unicode=" "  horiz-adv-x="498" />
-<glyph unicode="&#x09;" horiz-adv-x="498" />
-<glyph unicode="&#xa0;" horiz-adv-x="498" />
-<glyph unicode="!" horiz-adv-x="462" d="M78 0l25 167h142l-25 -167h-142zM161 478l146 978h119l-146 -978h-119z" />
-<glyph unicode="&#x22;" horiz-adv-x="666" d="M204 979l61 255l31 222h120l-30 -216l-110 -261h-72zM443 979l62 258l31 219h119l-30 -216l-110 -261h-72z" />
-<glyph unicode="#" horiz-adv-x="1270" d="M49 410l13 93h273l149 441h-279l14 96h297l141 416h100l-141 -416h314l141 416h100l-141 -416h229l-14 -96h-248l-149 -441h255l-13 -93h-273l-139 -410h-100l139 410h-314l-138 -410h-100l138 410h-254zM435 503h313l149 441h-313z" />
-<glyph unicode="$" horiz-adv-x="1154" d="M111 413l3 5h113q-26 -185 63 -259t235 -74q142 0 242 78.5t117 195.5q16 114 -45.5 182t-236.5 133q-198 66 -285.5 159t-63.5 262q23 169 136.5 268t289.5 112l28 202h102l-29 -203q167 -17 251.5 -131t57.5 -306h-120q21 153 -45 243t-211 90q-143 0 -234 -78.5 t-106 -194.5q-17 -118 41 -185t244 -132q197 -69 283.5 -160.5t63.5 -258.5q-25 -172 -141 -269t-296 -111l-26 -189h-102l26 189q-175 13 -282 117.5t-73 314.5z" />
-<glyph unicode="%" horiz-adv-x="1514" d="M195 1099l11 77q19 131 110.5 216t220.5 85q122 0 189.5 -88t48.5 -213l-11 -77q-20 -131 -110 -215t-217 -84q-124 0 -193 87t-49 212zM291 1099q-14 -91 26 -151.5t133 -60.5q85 0 145 62.5t73 149.5l11 77q14 91 -25.5 152.5t-129.5 61.5q-86 0 -147.5 -64t-74.5 -150 zM297 169l882 1138l67 -48l-882 -1138zM804 279l12 78q19 130 110 215t220 85q122 0 190 -87.5t50 -212.5l-12 -78q-20 -132 -110.5 -216t-217.5 -84q-124 0 -193 87.5t-49 212.5zM901 279q-14 -91 25.5 -152t132.5 -61q85 0 145 63t73 150l12 78q14 94 -25.5 153.5 t-130.5 59.5q-87 0 -147 -62t-73 -151z" />
-<glyph unicode="&#x26;" horiz-adv-x="1260" d="M67 371q18 125 103 217.5t241 195.5l16 11q-66 101 -92.5 183t-13.5 169q24 164 125 247t258 83q138 0 213 -81.5t57 -203.5q-15 -94 -68 -156t-150 -129l-177 -122l338 -479q61 72 101.5 159t55.5 186h110q-21 -133 -73 -238.5t-134 -191.5l157 -221h-144l-101 141 q-97 -78 -204 -120t-224 -42q-201 0 -311 108.5t-83 283.5zM187 371q-20 -129 52.5 -210t236.5 -81q88 0 180.5 37t175.5 105l-340 479l-12 16l-52 -36q-130 -94 -181 -170t-60 -140zM441 1149q-11 -68 10.5 -138t74.5 -150l197 132q65 45 96.5 94t40.5 105q12 81 -33 132 t-139 51q-98 0 -165.5 -65.5t-81.5 -160.5z" />
-<glyph unicode="'" horiz-adv-x="423" d="M205 986l62 266l29 204h120l-27 -195l-112 -275h-72z" />
-<glyph unicode="(" horiz-adv-x="640" d="M145 573l2 15q53 378 229.5 657.5t364.5 379.5l6 -1l16 -73q-159 -103 -304.5 -366t-190.5 -594l-3 -20q-49 -344 22 -599.5t204 -364.5l-36 -70l-6 1q-159 99 -258 381.5t-46 653.5z" />
-<glyph unicode=")" horiz-adv-x="652" d="M-112 -393q158 102 303.5 367t192.5 597l3 20q48 342 -25 600.5t-201 363.5l35 70l6 -1q156 -97 254.5 -385t48.5 -651l-2 -15q-54 -388 -228.5 -661t-364.5 -375l-6 1z" />
-<glyph unicode="*" horiz-adv-x="869" d="M126 782l47 101l259 -92l35 291l104 -1l-48 -294l279 97l17 -101l-285 -84l137 -230l-94 -62l-127 241l-195 -239l-76 60l208 237z" />
-<glyph unicode="+" horiz-adv-x="1156" d="M89 628l17 112h434l70 466h121l-70 -466h443l-17 -112h-443l-72 -482h-121l72 482h-434z" />
-<glyph unicode="," horiz-adv-x="392" d="M-36 -258l111 279l25 167h119l-25 -170l-148 -276h-82z" />
-<glyph unicode="-" horiz-adv-x="860" d="M136 570l15 101h590l-15 -101h-590z" />
-<glyph unicode="." horiz-adv-x="489" d="M87 0l25 164h137l-25 -164h-137z" />
-<glyph unicode="/" horiz-adv-x="813" d="M-69 -125l845 1581h108l-844 -1581h-109z" />
-<glyph unicode="0" d="M112 514l64 428q38 257 179 396t354 139q202 0 305.5 -145.5t66.5 -389.5l-64 -428q-39 -259 -178.5 -397t-352.5 -138q-202 0 -306.5 145t-67.5 390zM228 496q-29 -196 41.5 -306t231.5 -110q153 0 259 114.5t134 301.5l70 465q29 197 -40 305.5t-231 108.5 q-154 0 -260.5 -113t-134.5 -301z" />
-<glyph unicode="1" d="M311 1311l14 96l476 70l-222 -1477h-120l203 1353z" />
-<glyph unicode="2" d="M78 0l13 92l557 559q149 151 211 247.5t76 190.5q19 138 -40.5 212t-201.5 74q-150 0 -250.5 -93.5t-120.5 -235.5h-111l-2 6q21 185 157 305t341 120q180 0 276.5 -106t71.5 -283q-18 -124 -102 -235.5t-251 -286.5l-458 -459l2 -6h732l-14 -101h-886z" />
-<glyph unicode="3" d="M91 389l3 6h112q-21 -141 64.5 -228t239.5 -87q146 0 247.5 85t123.5 226q23 160 -56 232.5t-250 72.5h-134l11 71l2 11l3 20h134q153 0 249.5 80t115.5 203q20 134 -43.5 214t-213.5 80q-135 0 -242.5 -84.5t-126.5 -215.5h-111l-2 6q22 177 163.5 286.5t334.5 109.5 q187 0 287.5 -106t73.5 -294q-18 -113 -93 -200t-192 -129q118 -41 173 -132t36 -221q-30 -202 -168 -309t-337 -107q-179 0 -308 110t-96 300z" />
-<glyph unicode="4" d="M47 368l10 68l810 1020h131l-148 -987h228l-15 -101h-228l-55 -368h-119l55 368h-669zM208 474l3 -5h520l124 828l-6 2l-66 -107z" />
-<glyph unicode="5" d="M147 378l2 5h109q-23 -153 48 -228t212 -75q156 0 254.5 99t126.5 283q25 169 -40.5 262t-212.5 93q-134 0 -217.5 -45.5t-128.5 -133.5l-95 17l200 801h708l-16 -111h-605l-133 -524q63 49 133.5 77t182.5 31q187 3 282 -123t63 -342q-35 -229 -163.5 -357t-353.5 -128 q-174 0 -281.5 101.5t-74.5 297.5z" />
-<glyph unicode="6" d="M155 531l59 394q37 251 194 401.5t360 150.5q78 0 157 -17.5t134 -48.5l-46 -98q-55 31 -115.5 46.5t-145.5 15.5q-147 0 -268 -123t-150 -316l-29 -196q71 83 173.5 132t218.5 49q186 0 278.5 -127.5t60.5 -339.5q-33 -221 -172.5 -348t-339.5 -127q-188 0 -297.5 150.5 t-71.5 401.5zM272 522q-32 -209 44 -325.5t223 -116.5q142 0 247.5 107t129.5 267q27 182 -39.5 275.5t-227.5 93.5q-114 0 -216 -65t-150 -164z" />
-<glyph unicode="7" d="M214 1354l15 102h947l-15 -102q-287 -286 -454 -572.5t-219 -637.5l-22 -144h-120l22 144q53 361 222.5 646t446.5 564h-823z" />
-<glyph unicode="8" d="M79 394q19 133 115.5 228t239.5 134q-111 41 -169 129.5t-40 204.5q28 194 163.5 290.5t330.5 96.5q175 0 281.5 -101.5t79.5 -285.5q-19 -123 -100 -211t-200 -126q121 -43 187.5 -138.5t48.5 -220.5q-31 -205 -175.5 -310t-344.5 -105q-203 0 -325 110t-92 305z M198 393q-23 -149 66 -231t247 -82q138 0 251 86t134 227q21 142 -64 226.5t-229 84.5q-148 0 -266.5 -87.5t-138.5 -223.5zM344 1091q-21 -134 58 -210t218 -76q121 0 221 79.5t119 206.5q19 130 -55.5 207t-201.5 77q-132 0 -236 -77t-123 -207z" />
-<glyph unicode="9" d="M144 42l37 97q62 -32 123 -45.5t146 -13.5q154 0 268 107t142 295l31 207q-66 -88 -161 -134t-203 -46q-191 0 -294 133t-72 341q33 221 177.5 357.5t335.5 136.5q199 0 308.5 -136t73.5 -383l-71 -474q-38 -246 -187 -375.5t-363 -129.5q-73 0 -149 16t-142 47zM285 983 q-25 -166 43 -269.5t215 -103.5q124 0 222 66.5t149 161.5l20 133q30 202 -44 303t-227 101q-135 0 -244.5 -114t-133.5 -278z" />
-<glyph unicode=":" horiz-adv-x="434" d="M87 0l25 164h137l-25 -164h-137zM218 876l25 164h137l-25 -164h-137z" />
-<glyph unicode=";" horiz-adv-x="438" d="M219 876l25 164h137l-25 -164h-137zM15 -258l111 279l25 167h119l-25 -170l-148 -276h-82z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1047" d="M72 501l11 71l4 26l883 378l-18 -126l-655 -272l-113 -28v-6l103 -28l574 -268l-19 -126z" />
-<glyph unicode="=" horiz-adv-x="1147" d="M132 422l16 106h834l-16 -106h-834zM194 833l16 106h834l-16 -106h-834z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1061" d="M61 113l19 124l673 274l112 27l1 6l-104 29l-591 271l18 123l788 -378l-4 -24h1l-7 -48l-4 -25z" />
-<glyph unicode="?" horiz-adv-x="930" d="M169 1122q23 165 144 260t287 95q173 0 262 -102t63 -272q-21 -141 -100.5 -241t-222.5 -217q-70 -54 -91 -100t-34 -141h-119q20 131 49 182.5t134 136.5q125 112 185.5 187.5t78.5 191.5q20 133 -37 200.5t-184 67.5q-113 0 -198 -69t-104 -185h-111zM293 0l23 154h139 l-23 -154h-139z" />
-<glyph unicode="@" horiz-adv-x="1870" d="M114 478q82 424 354.5 683t648.5 259t543.5 -244.5t87.5 -662.5q-43 -217 -174 -375.5t-336 -158.5q-75 0 -121 51.5t-49 141.5q-68 -96 -153.5 -144.5t-187.5 -48.5q-126 0 -178 121t-5 316q61 254 202.5 407.5t309.5 153.5q90 0 145.5 -27.5t114.5 -80.5l-3 -2h4 l-136 -574q-30 -132 3 -180t88 -48q136 0 240.5 126t144.5 322q77 389 -59 604.5t-498 215.5q-311 0 -562.5 -237.5t-325.5 -617.5q-76 -379 71 -612.5t485 -233.5q84 0 179.5 22t162.5 57l19 -75q-70 -41 -176.5 -65t-201.5 -24q-366 0 -542.5 252t-94.5 679zM643.5 169 q28.5 -92 124.5 -92q83 0 161 44t148 157l3 15l129 544q-29 23 -66.5 36t-84.5 13q-129 0 -238 -120t-166 -350q-39 -155 -10.5 -247z" />
-<glyph unicode="A" horiz-adv-x="1256" d="M-42 0l753 1456h113l313 -1456h-124l-85 406h-638l-208 -406h-124zM345 513h561l-160 771l-6 1z" />
-<glyph unicode="B" horiz-adv-x="1263" d="M106 0l218 1456h425q218 0 335 -96q94 -78 94 -217q0 -33 -5 -70q-17 -114 -89.5 -194t-181.5 -113q135 -16 206 -120q55 -81 55 -182q0 -28 -4 -59q-31 -202 -171 -303.5t-355 -101.5h-527zM241 101h407q155 0 262 80.5t128 221.5q4 28 4 54q0 99 -61 161 q-77 79 -231 84h-16h-403zM346 803h350q146 3 241.5 73t116.5 201q4 29 4 56q0 101 -64 154q-81 67 -260 67h-305z" />
-<glyph unicode="C" horiz-adv-x="1313" d="M143 609l36 237q43 288 216.5 459.5t419.5 171.5q228 0 356 -126q99 -98 100 -250q0 -44 -9 -93l-3 -6h-112q7 42 7 80q0 124 -72 198q-92 96 -283 95q-183 0 -325 -149t-176 -378l-36 -239q-10 -68 -10 -127q0 -154 67 -258q93 -144 286 -144q182 0 307 97t153 278h111 l2 -6q-29 -223 -189.5 -346.5t-398.5 -123.5q-234 0 -362 177q-96 133 -95 322q0 63 10 131z" />
-<glyph unicode="D" horiz-adv-x="1378" d="M106 0l218 1456h444q258 0 410 -180q120 -142 120 -343q0 -54 -9 -112l-28 -187q-44 -290 -242 -462t-469 -172h-444zM241 101h324q208 0 374.5 152t201.5 381l29 190q8 54 8 102q0 168 -90 282q-116 146 -335 146h-325z" />
-<glyph unicode="E" horiz-adv-x="1129" d="M106 0l218 1456h870l-15 -102h-750l-82 -547h653l-15 -102h-654l-90 -604h755l-15 -101h-875z" />
-<glyph unicode="F" horiz-adv-x="1128" d="M106 0l218 1456h891l-15 -102h-772l-85 -569h670l-16 -103h-669l-102 -682h-120z" />
-<glyph unicode="G" horiz-adv-x="1410" d="M156 600l40 267q42 280 220.5 445t427.5 165q228 0 352 -126q99 -100 99 -240q0 -37 -7 -77l-2 -6h-111q5 33 5 64q0 112 -70 188q-89 95 -282 95q-189 0 -334.5 -143.5t-177.5 -362.5l-40 -269q-9 -61 -9 -116q0 -158 76 -262q103 -142 306 -142q147 0 254 47t154 106 l56 373h-392l15 102h511l-77 -512q-60 -79 -199.5 -148t-336.5 -69q-241 0 -380 175q-107 134 -107 327q0 57 9 119z" />
-<glyph unicode="H" horiz-adv-x="1439" d="M106 0l218 1456h120l-103 -684h827l103 684h120l-218 -1456h-120l100 670h-827l-100 -670h-120z" />
-<glyph unicode="I" horiz-adv-x="554" d="M137 0l218 1456h120l-218 -1456h-120z" />
-<glyph unicode="J" horiz-adv-x="1122" d="M65 396l2 5h113q-7 -47 -7 -86q0 -105 49 -159q69 -76 225 -76q128 0 230.5 93.5t125.5 248.5l155 1034h120l-155 -1034q-32 -211 -166 -327t-325 -116q-193 0 -298 107q-78 81 -78 215q0 44 9 95z" />
-<glyph unicode="K" horiz-adv-x="1198" d="M88 0l218 1456h120l-99 -659h174l618 659h148l3 -6l-683 -716l498 -734h-140l-465 691h-169l-103 -691h-120z" />
-<glyph unicode="L" horiz-adv-x="1128" d="M106 0l218 1456h120l-203 -1355h752l-15 -101h-872z" />
-<glyph unicode="M" horiz-adv-x="1766" d="M106 0l218 1456h160l348 -1281l6 -1l734 1282h146l-218 -1456h-120l183 1222l-6 2l-705 -1224h-86l-346 1254h-6l-188 -1254h-120z" />
-<glyph unicode="N" horiz-adv-x="1445" d="M106 0l218 1456h120l641 -1243l5 1l187 1242h120l-218 -1456h-120l-641 1246l-5 -1l-187 -1245h-120z" />
-<glyph unicode="O" horiz-adv-x="1378" d="M135 609l36 237q44 292 220 461.5t435 169.5q250 -1 383 -177q102 -135 101 -329q0 -60 -9 -125l-36 -237q-44 -293 -222 -461.5t-441 -168.5q-246 -1 -378 175q-100 133 -99 326q0 61 10 129zM255 609q-11 -71 -11 -133q0 -154 68 -254q94 -140 305 -139 q205 0 349.5 145t179.5 381l36 239q10 67 10 127q0 157 -70 257q-98 140 -312 140q-200 0 -342 -145.5t-177 -378.5z" />
-<glyph unicode="P" horiz-adv-x="1263" d="M106 0l218 1456h502q219 0 332 -118q91 -95 91 -235q0 -35 -6 -72q-31 -201 -171.5 -313.5t-372.5 -112.5h-383l-90 -605h-120zM332 707h382q172 0 279.5 93t128.5 229q5 33 5 63q-1 103 -59 172q-76 90 -257 90h-382z" />
-<glyph unicode="Q" horiz-adv-x="1393" d="M135 609l36 237q44 292 220 461.5t435 169.5q250 0 383 -177q102 -134 102 -329q0 -59 -10 -125l-36 -237q-21 -138 -73 -250.5t-131 -193.5l195 -223l-95 -80l-198 222q-78 -52 -169 -78.5t-192 -26.5q-246 0 -378 175q-99 134 -99 326q0 61 10 129zM255 609 q-11 -71 -11 -133q0 -154 68 -254q94 -139 305 -139q205 0 349.5 145t179.5 381l36 239q10 67 10 127q0 156 -70 257q-98 140 -312 140q-200 0 -342 -145.5t-177 -378.5z" />
-<glyph unicode="R" horiz-adv-x="1336" d="M103 0l218 1455h485q225 1 339 -103q91 -83 91 -224q0 -36 -6 -75q-19 -121 -99 -211t-210 -131q127 -35 175 -123q35 -64 36 -150q0 -32 -5 -67l-21 -137q-6 -41 -6 -75q0 -25 3 -48q8 -53 41 -87l-4 -24h-122q-30 36 -36 101q-2 23 -2 47q0 43 6 88l20 133q4 30 4 57 q0 99 -58 157q-74 75 -230 75h-401l-98 -658h-120zM337 760h351q189 0 296 81t127 213q5 33 5 62q0 104 -61 162q-78 75 -264 75h-365z" />
-<glyph unicode="S" horiz-adv-x="1232" d="M134 412l2 6h111q-5 -36 -5 -68q0 -131 93 -193q116 -77 289 -77q144 0 254.5 69t126.5 168q4 26 4 50q1 97 -61 157q-76 76 -296 152q-232 77 -336 175q-82 77 -83 210q0 36 6 75q24 160 159 250.5t328 90.5q220 -1 345 -117q98 -92 98 -235q0 -39 -7 -82l-2 -6h-112 q4 29 4 56q0 113 -75 189q-93 94 -267 93q-139 0 -238 -70t-113 -167q-5 -30 -5 -58q0 -92 55 -149q71 -74 295 -151q232 -78 340 -179q86 -81 87 -213q0 -33 -6 -69q-25 -165 -167 -252.5t-349 -87.5q-217 -1 -365 105q-118 84 -118 241q0 41 8 87z" />
-<glyph unicode="T" horiz-adv-x="1224" d="M171 1354l15 102h1128l-15 -102h-497l-202 -1354h-119l202 1354h-512z" />
-<glyph unicode="U" horiz-adv-x="1374" d="M160 489l145 967h120l-145 -967q-7 -47 -7 -89q-1 -132 71 -214q94 -106 272 -106q171 0 305 111t162 298l145 967h119l-145 -967q-37 -249 -201.5 -379.5t-399.5 -130.5q-219 1 -348 137q-101 107 -101 274q0 47 8 99z" />
-<glyph unicode="V" horiz-adv-x="1256" d="M167 1456h130l257 -1201l14 -101l5 -1l45 102l618 1201h129l-760 -1456h-114z" />
-<glyph unicode="W" horiz-adv-x="1813" d="M188 1456h130l105 -1038l9 -235l6 -1l87 236l459 1038h121l150 -1038l14 -236l6 -1l83 237l412 1038h130l-591 -1456h-114l-161 1117l-13 156l-6 1l-57 -157l-501 -1117h-114z" />
-<glyph unicode="X" horiz-adv-x="1256" d="M-17 5l607 733l-378 718h145l316 -622l504 622h138l3 -5l-587 -713l389 -738h-143l-331 642l-522 -642h-138z" />
-<glyph unicode="Y" horiz-adv-x="1256" d="M176 1456h139l328 -809l571 809h139l-669 -923l-80 -533h-119l80 536z" />
-<glyph unicode="Z" horiz-adv-x="1121" d="M22 0l2 92l916 1262h-746l15 102h894l-13 -87l-920 -1268h824l-15 -101h-957z" />
-<glyph unicode="[" horiz-adv-x="491" d="M44 -312l277 1976h330l-14 -102h-210l-248 -1772h210l-15 -102h-330z" />
-<glyph unicode="\" horiz-adv-x="807" d="M186 1456h117l371 -1581h-117z" />
-<glyph unicode="]" horiz-adv-x="491" d="M-119 -312l15 102h211l248 1772h-211l14 102h331l-277 -1976h-331z" />
-<glyph unicode="^" horiz-adv-x="852" d="M106 729l408 727h90l189 -727h-116l-123 484l-14 106l-6 1l-46 -107l-266 -484h-116z" />
-<glyph unicode="_" horiz-adv-x="884" d="M-94 -101l15 101h881l-15 -101h-881z" />
-<glyph unicode="`" horiz-adv-x="585" d="M226 1518h161l164 -266h-117z" />
-<glyph unicode="a" horiz-adv-x="1101" d="M62 293q22 151 161.5 238t344.5 87h266l20 134q4 26 4 49q0 85 -50 135q-62 64 -198 64q-118 0 -205 -60.5t-101 -150.5h-110l-2 6q13 126 136.5 216.5t302.5 90.5q171 0 269 -92q78 -73 78 -195q0 -31 -5 -65l-80 -532q-9 -59 -11 -112v-21q0 -42 6 -85h-125 q-2 62 -2 101t6 80q-69 -87 -178.5 -144.5t-239.5 -57.5q-153 -1 -231 85q-61 67 -61 169q0 29 5 60zM181 289q-3 -20 -3 -39q0 -68 40 -110q52 -54 160 -55q132 0 245 66t165 167l32 208h-267q-140 0 -248.5 -70t-123.5 -167z" />
-<glyph unicode="b" horiz-adv-x="1140" d="M78 0l234 1560h120l-97 -644q67 89 158.5 137.5t206.5 48.5q188 0 278 -157q64 -111 63 -270q0 -67 -11 -143l-3 -21q-38 -252 -167.5 -392t-325.5 -140q-114 0 -194 48.5t-122 138.5l-46 -166h-94zM241 284q27 -93 96.5 -147t188.5 -54q150 0 250 117.5t130 310.5l3 21 q11 74 11 138q0 120 -40 202q-60 126 -218 126q-119 0 -206 -62t-141 -158z" />
-<glyph unicode="c" horiz-adv-x="1054" d="M95 520l6 42q36 244 177.5 392t359.5 148q168 0 271 -106q80 -83 80 -204q0 -34 -6 -72l-2 -5h-108q4 29 4 56q-1 96 -57 154q-72 75 -197 75q-163 0 -268.5 -127t-133.5 -311l-6 -42q-10 -63 -9 -118q0 -118 43 -200q64 -122 237 -122q111 0 211.5 68.5t119.5 188.5h106 l2 -6q-20 -157 -155.5 -254.5t-298.5 -97.5q-208 -1 -310 153q-75 113 -75 271q0 56 9 117z" />
-<glyph unicode="d" horiz-adv-x="1140" d="M108 511l3 21q40 269 171 419.5t329 150.5q108 0 185 -48.5t121 -137.5l96 644h120l-234 -1560h-98l7 157q-67 -86 -159.5 -132t-207.5 -46q-187 1 -279 147q-65 104 -65 255q0 61 11 130zM228 511q-10 -68 -11 -127q0 -114 41 -188q61 -112 220 -113q111 0 198 53 t145 144l77 509q-27 93 -93.5 151t-186.5 58q-152 0 -254.5 -131.5t-132.5 -334.5z" />
-<glyph unicode="e" horiz-adv-x="1054" d="M93 509l9 55q35 243 188.5 390.5t352.5 147.5q189 0 281 -128q68 -96 69 -238q0 -48 -8 -101l-14 -93h-753l-5 -33q-8 -53 -8 -101q1 -124 55 -210q76 -118 241 -118q95 0 185.5 33t152.5 87l39 -82q-66 -60 -164.5 -99.5t-227.5 -39.5q-202 0 -315 150q-86 115 -86 276 q0 50 8 104zM245 650l2 -6h620l3 25q6 39 6 75q0 98 -45 165q-61 91 -203 91q-132 0 -238 -100t-145 -250z" />
-<glyph unicode="f" horiz-adv-x="658" d="M129 984l14 98h179l24 158q25 169 119 255t243 86q31 0 65 -5t68 -14l-31 -99q-22 6 -47 9.5t-59 3.5q-94 0 -157.5 -62.5t-80.5 -173.5l-24 -158h245l-14 -98h-245l-148 -984h-120l147 984h-178z" />
-<glyph unicode="g" horiz-adv-x="1140" d="M91 -366l38 101q61 -32 132 -48.5t155 -16.5q154 0 248 83t118 241l23 153q-67 -81 -158 -124.5t-202 -43.5q-186 0 -278 147q-66 104 -66 256q0 60 11 129l3 21q40 269 171 419.5t329 150.5q111 0 189.5 -51t120.5 -144l44 175h97l-163 -1088q-33 -215 -162 -323 t-340 -108q-76 0 -162.5 19t-147.5 52zM232 511q-10 -68 -10 -125q0 -115 40 -190q62 -113 221 -113q110 0 196.5 52.5t145.5 142.5l77 514q-27 91 -93.5 148.5t-185.5 57.5q-152 0 -255 -131.5t-133 -334.5z" />
-<glyph unicode="h" horiz-adv-x="1140" d="M78 0l234 1560h120l-99 -655q69 95 166.5 146t217.5 51q165 0 243 -107q55 -75 56 -207q0 -55 -10 -121l-100 -667h-120l100 669q9 59 9 107q-1 100 -39 149q-56 73 -181 73q-123 0 -215 -64t-148 -170l-114 -764h-120z" />
-<glyph unicode="i" horiz-adv-x="465" d="M93 0l162 1082h119l-162 -1082h-119zM302 1392l25 168h119l-25 -168h-119z" />
-<glyph unicode="j" horiz-adv-x="484" d="M-258 -418l28 101q15 -5 42.5 -10t48.5 -5q86 0 146.5 62t79.5 181l175 1171h119l-175 -1171q-27 -173 -118.5 -260.5t-236.5 -87.5q-29 0 -55 5t-54 14zM303 1396l25 164h119l-25 -164h-119z" />
-<glyph unicode="k" horiz-adv-x="1006" d="M79 0l234 1560h120l-140 -930h115l482 452h139l2 -6l-517 -490l396 -586h-144l-362 527h-126l-79 -527h-120z" />
-<glyph unicode="l" horiz-adv-x="465" d="M93 0l234 1560h119l-234 -1560h-119z" />
-<glyph unicode="m" horiz-adv-x="1815" d="M74 0l162 1082h106l-15 -171q65 92 159 141.5t214 49.5q118 0 193 -59t95 -180q65 113 165.5 176t230.5 63q167 0 247 -116q56 -81 56 -221q0 -61 -11 -134l-95 -631h-120l95 633q11 73 11 130q1 107 -37 157q-58 78 -186 78q-132 0 -222 -86t-131 -219l-6 -44l-97 -649 h-121l95 633q10 70 10 125q0 106 -38 160q-58 80 -185 80q-123 0 -208 -66t-134 -176l-113 -756h-120z" />
-<glyph unicode="n" horiz-adv-x="1140" d="M78 0l162 1082h106l-16 -181q67 97 162.5 149t217.5 52q170 0 249 -108q55 -76 55 -210q0 -57 -10 -125l-99 -659h-120l99 658q9 64 9 115q1 103 -37 151q-56 74 -188 74q-124 0 -213.5 -65.5t-142.5 -173.5l-114 -759h-120z" />
-<glyph unicode="o" horiz-adv-x="1140" d="M90 524l5 33q36 248 188 396.5t371 148.5q208 0 320 -154q86 -118 87 -284q0 -51 -9 -107l-5 -33q-38 -249 -189.5 -397t-369.5 -148q-210 0 -322 154q-85 117 -85 281q0 53 9 110zM210 524q-9 -55 -9 -105q1 -125 55 -215q76 -124 247 -124q160 0 278 129.5t147 314.5 l5 33q8 51 8 98q-1 127 -57 219q-76 126 -245 126q-161 0 -279 -130.5t-145 -312.5z" />
-<glyph unicode="p" horiz-adv-x="1140" d="M16 -416l224 1498h92l-3 -169q68 91 161 140t209 49q188 0 278 -157q63 -110 63 -270q0 -67 -11 -143l-3 -21q-38 -252 -167.5 -392t-325.5 -140q-110 0 -189.5 44.5t-123.5 125.5l-84 -565h-120zM238 269q29 -88 98.5 -138.5t184.5 -50.5q151 0 253 119.5t132 311.5 l3 21q11 72 11 134q0 122 -42 206q-62 126 -221 126q-116 0 -201.5 -59t-139.5 -151z" />
-<glyph unicode="q" horiz-adv-x="1140" d="M108 511l3 21q40 269 171 419.5t329 150.5q108 0 185 -48.5t120 -136.5l44 165h96l-224 -1498h-120l83 557q-66 -78 -155.5 -120t-198.5 -42q-187 0 -279 147q-65 104 -65 255q0 61 11 130zM228 511q-10 -68 -10 -127q0 -114 40 -190q61 -114 220 -114q108 0 193 51 t143 138l80 533q-28 88 -94 143t-182 55q-152 0 -254.5 -132t-132.5 -336z" />
-<glyph unicode="r" horiz-adv-x="699" d="M78 0l162 1082h105l-12 -180l-1 -6q61 98 148 152t197 54q21 0 41.5 -3.5t32.5 -7.5l-32 -112l-84 6q-109 0 -193 -66t-133 -179l-111 -740h-120z" />
-<glyph unicode="s" horiz-adv-x="1043" d="M77 297l2 6h110q-1 -12 -1 -23q0 -100 74 -147q82 -53 200 -53q124 0 210 58.5t98 138.5q2 12 2 24q0 63 -46 110q-54 55 -213 91q-186 40 -270 110q-69 57 -69 152q0 20 3 42q18 129 133 212.5t289 83.5q175 0 273 -92q80 -75 79 -176q0 -24 -4 -49l-2 -6h-112 q2 15 2 29q1 74 -55 128q-66 64 -195 64q-125 0 -202 -58t-87 -132q-2 -13 -2 -25q0 -60 41 -99q49 -47 214 -84q184 -42 271 -117q73 -63 73 -162q0 -19 -3 -40q-21 -140 -140.5 -222t-301.5 -82q-189 0 -292 95q-84 77 -84 176q0 23 5 47z" />
-<glyph unicode="t" horiz-adv-x="659" d="M105 984l14 98h187l42 277h121l-42 -277h238l-14 -98h-239l-105 -705q-6 -39 -6 -69q0 -57 21 -84q32 -42 97 -42q21 0 43.5 3t48.5 8l5 -89q-27 -13 -63 -20t-71 -7q-110 1 -165 73q-38 50 -38 140q0 39 7 87l105 705h-186z" />
-<glyph unicode="u" horiz-adv-x="1140" d="M142 455l94 627h120l-94 -629q-12 -77 -12 -136q0 -100 34 -152q54 -82 181 -82q132 0 223.5 63t141.5 171l114 765h120l-162 -1082h-106l16 171q-66 -93 -161 -142.5t-215 -49.5q-166 0 -248 117q-57 81 -57 223q0 62 11 136z" />
-<glyph unicode="v" horiz-adv-x="1002" d="M126 1082h124l177 -811l17 -126l5 -1l57 127l415 811h124l-573 -1082h-96z" />
-<glyph unicode="w" horiz-adv-x="1550" d="M147 1082h128l89 -731l12 -197l6 -1l80 198l339 731h103l121 -731l20 -204l6 -1l77 205l302 731h128l-477 -1082h-102l-134 740l-17 174l-6 1l-69 -175l-351 -740h-103z" />
-<glyph unicode="x" horiz-adv-x="1002" d="M-25 5l461 546l-288 531h141l225 -442l359 442h135l2 -5l-441 -526l299 -551h-140l-239 461l-377 -461h-135z" />
-<glyph unicode="y" horiz-adv-x="1002" d="M-43 -423l29 100q12 -2 38 -4.5t38 -2.5q75 0 132.5 57t101.5 141l79 146l-258 1068h133l179 -789l19 -129l6 -1l464 919h134l-658 -1255q-59 -110 -137.5 -187t-207.5 -77q-20 0 -49 4.5t-43 9.5z" />
-<glyph unicode="z" horiz-adv-x="1002" d="M10 0l13 88l781 886l-2 5h-625l15 103h783l-13 -89l-784 -887l2 -5h696l-15 -101h-851z" />
-<glyph unicode="{" horiz-adv-x="676" d="M69 543l3 23l8 58l4 23q114 0 182 68t85 189l31 228q24 177 118 293.5t286 171.5l15 -79q-133 -41 -206 -141.5t-93 -244.5l-31 -228q-17 -115 -73.5 -195t-155.5 -116q85 -39 120.5 -121t21.5 -188l-32 -226q-21 -147 24.5 -243t169.5 -139l-41 -80q-175 55 -236 173.5 t-37 288.5l32 226q17 127 -29.5 193t-165.5 66z" />
-<glyph unicode="|" horiz-adv-x="452" d="M44 -270l258 1726h120l-258 -1726h-120z" />
-<glyph unicode="}" horiz-adv-x="676" d="M-111 -324q133 42 206.5 141t93.5 241l32 226q16 117 74.5 197t163.5 115q-91 35 -129 116.5t-22 191.5l31 228q21 149 -23 246.5t-166 139.5l37 79q175 -55 235.5 -174.5t36.5 -290.5l-31 -228q-18 -127 28.5 -192t166.5 -65l-11 -77l-4 -27q-114 0 -182.5 -69.5 t-84.5 -189.5l-32 -226q-25 -176 -118 -291.5t-285 -170.5z" />
-<glyph unicode="~" horiz-adv-x="1402" d="M134 474q19 137 110 225t215 88q83 0 154 -38t148 -112q56 -57 105.5 -82.5t106.5 -25.5q74 0 138.5 64.5t78.5 161.5l96 -15q-20 -134 -113 -225.5t-215 -91.5q-85 0 -154.5 36.5t-145.5 113.5q-56 54 -107 80.5t-107 26.5q-76 0 -139 -61t-76 -160z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1115" d="M95 520l6 42q35 234 166.5 380t334.5 159l33 217h120l-34 -224q136 -27 212.5 -128t54.5 -251h-115q20 135 -52.5 210t-197.5 75q-163 0 -268.5 -127t-133.5 -311l-6 -42q-30 -197 34 -318.5t237 -121.5q111 0 211.5 68.5t119.5 188.5h107l2 -6q-18 -135 -124.5 -228.5 t-247.5 -116.5l-34 -231h-120l34 226q-190 15 -281.5 165.5t-57.5 373.5z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1170" d="M51 0l15 101h10q72 15 124.5 130t70.5 235l19 176h-207l16 102h203l33 296q32 212 154 324.5t302 112.5q179 0 261.5 -104.5t53.5 -277.5l-3 -5h-113q22 154 -35.5 219.5t-179.5 65.5q-120 0 -208.5 -89t-111.5 -246l-34 -296h451l-16 -102h-446l-20 -176 q-17 -112 -56 -207t-95 -158h768l-15 -101h-941z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1223" d="M99 326l13 86h416l31 206h-416l13 87h370l-343 751h139l315 -722l532 722h139l-567 -751h371l-13 -87h-421l-31 -206h421l-13 -86h-421l-49 -326h-119l49 326h-416z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1637" d="M136 729q49 327 285.5 537t536.5 210q283 0 463.5 -218t133.5 -529q-49 -328 -286 -539t-535 -211q-284 0 -464.5 218.5t-133.5 531.5zM221 729q-43 -290 110 -477t416 -187q248 0 464.5 194t258.5 470q43 288 -110.5 474t-414.5 186q-250 0 -466.5 -193t-257.5 -467z M494 669l18 119q26 179 132 283t259 104q141 0 215 -80t48 -228l-2 -5h-92q17 117 -28.5 170t-153.5 53q-106 0 -183 -84.5t-96 -211.5l-18 -120q-20 -137 29 -217t161 -80q103 0 167 54.5t81 169.5h90l3 -6q-20 -156 -113 -232t-242 -76q-145 0 -223 107.5t-52 279.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="860" d="M136 570l15 101h590l-15 -101h-590z" />
-<glyph unicode="&#xae;" horiz-adv-x="1642" d="M131 729q49 327 285.5 537t536.5 210q284 0 464.5 -218t133.5 -529q-49 -328 -286 -539t-536 -211q-284 0 -464.5 218.5t-133.5 531.5zM216 729q-43 -290 110.5 -477t415.5 -187q248 0 464.5 194t258.5 470q43 288 -110 474t-415 186q-250 0 -466.5 -193t-257.5 -467z M519 316l128 850h258q141 0 213 -63.5t55 -184.5q-12 -71 -55.5 -120t-117.5 -78q63 -26 86.5 -79.5t12.5 -125.5l-8 -56q-7 -41 -7.5 -73.5t5.5 -53.5l-3 -16h-102q-6 21 -2.5 59t10.5 85l8 54q13 87 -18.5 122.5t-122.5 35.5h-189l-53 -356h-98zM684 763h181 q79 0 138.5 40.5t70.5 112.5q13 88 -27 123.5t-156 35.5h-160z" />
-<glyph unicode="&#xb4;" horiz-adv-x="576" d="M227 1257l239 261h147l2 -6l-286 -260h-100z" />
-<glyph unicode="&#x2000;" horiz-adv-x="838" />
-<glyph unicode="&#x2001;" horiz-adv-x="1677" />
-<glyph unicode="&#x2002;" horiz-adv-x="838" />
-<glyph unicode="&#x2003;" horiz-adv-x="1677" />
-<glyph unicode="&#x2004;" horiz-adv-x="559" />
-<glyph unicode="&#x2005;" horiz-adv-x="419" />
-<glyph unicode="&#x2006;" horiz-adv-x="279" />
-<glyph unicode="&#x2007;" horiz-adv-x="279" />
-<glyph unicode="&#x2008;" horiz-adv-x="209" />
-<glyph unicode="&#x2009;" horiz-adv-x="335" />
-<glyph unicode="&#x200a;" horiz-adv-x="93" />
-<glyph unicode="&#x2010;" horiz-adv-x="860" d="M136 570l15 101h590l-15 -101h-590z" />
-<glyph unicode="&#x2011;" horiz-adv-x="860" d="M136 570l15 101h590l-15 -101h-590z" />
-<glyph unicode="&#x2012;" horiz-adv-x="860" d="M136 570l15 101h590l-15 -101h-590z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1414" d="M205.397 686l19.5 102h1085.49l-19.5 -102h-1085.49z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1667" d="M219.795 686l24 102h1335.98l-23.999 -102h-1335.98z" />
-<glyph unicode="&#x2018;" horiz-adv-x="473" d="M225 970l26 175l120 311h71l-71 -312l-26 -174h-120z" />
-<glyph unicode="&#x2019;" horiz-adv-x="469" d="M223 970l71 304l27 182h119l-26 -179l-119 -307h-72z" />
-<glyph unicode="&#x201c;" horiz-adv-x="726" d="M203 970l26 175l120 311h71l-71 -312l-26 -174h-120zM531 970l26 175l120 311h71l-71 -312l-26 -174h-120z" />
-<glyph unicode="&#x201d;" horiz-adv-x="708" d="M188 970l71 304l27 182h119l-26 -179l-119 -307h-72zM524 970l71 304l27 182h119l-26 -179l-119 -307h-72z" />
-<glyph unicode="&#x2022;" horiz-adv-x="662" d="M174 717l9 65q12 81 69.5 130t142.5 49q82 0 126.5 -51t32.5 -128l-9 -65q-13 -82 -70 -129.5t-142 -47.5q-82 0 -126.5 49.5t-32.5 127.5z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1313" d="M87 0l25 164h137l-25 -164h-137zM530 0l25 164h137l-25 -164h-137zM950 0l25 164h137l-25 -164h-137z" />
-<glyph unicode="&#x202f;" horiz-adv-x="335" />
-<glyph unicode="&#x205f;" horiz-adv-x="419" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1073" d="M80 533l13 88h169l29 195h-169l14 89h168l6 37q38 253 193.5 394t378.5 141q55 0 110.5 -8t116.5 -23l-25 -106q-52 16 -107 25.5t-111 9.5q-165 0 -286 -117t-150 -314l-6 -39h547l-14 -89h-546l-30 -195h547l-13 -88h-547l-3 -19q-31 -206 52.5 -320t256.5 -114 q55 0 113.5 8.5t112.5 25.5l-6 -104q-56 -15 -116 -23t-119 -8q-212 0 -330.5 146.5t-82.5 388.5l3 19h-169z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1264" d="M224 1387l10 69h384l-10 -69h-153l-69 -468h-74l69 468h-157zM616 919l80 537h94l108 -422l6 -1l237 423h88l-80 -537h-73l57 382l-6 2l-217 -384h-51l-106 399l-6 -1l-59 -398h-72z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1168" d="M188 686l15 102h835l-15 -102h-835z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.ttf
deleted file mode 100644
index 445afbcdc23ddb62fa6c7ef117f064b45e42c3f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31044
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-LightItalic-webfont.woff
deleted file mode 100644
index 752e9fbd2f0214071abd04915e4916155a6edd88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18188
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%0A1nYM;h`3K5ULi4*qqRB{disbHv
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-Medium-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-Medium-webfont.eot
deleted file mode 100644
index cc69239e491427783e5254b6d95bd51dbbfa99ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26264
zcmdsg349bq_J37(PtRmBN#@Mt&P*mGKu7`!NeK6SpK=A{3YQ!PkV|e*4iQ~MbQSPo
zT|x2e4pCXx0|7<F`#^LB(M2U7phS07NYDTKs%Id?WB2p>{6C-nk*21*s;ldG@6~&+
z-h16_nabFaDU5L@u`B;L`+-wQ|H0=ZcKqr98ytvKcz`op@<C^cx2}j3H8?rgRctn!
zh%_IGF$WvKrm)FuI$OZ1kZ;aLAU~JQL&<D53r)3R1+3+zqa8|$kZXm5v6L%X3p8pA
z6=;lZ{3tBYv*)k@6Os}qqOb)@(|UF9(Ua}Q9mabjALuoB&`^(d+Kv1)#=K{H4ISRK
z`@;SU7)z|6`-6rS7VUY$)*Sgo$WNG5RXOMCqo)C##3Oj-{YeYw2NK#kpJgoRaole|
zb<Q<a2{nZeBY%=HY05Q~^X8!3$yn-OoNd=!yLjqHyY_mJNBdp9)238TzS!q`jA!h%
zxL-OA1#vl+JCJ_}`Rr*`^B2V*$?uN*YiKX&+S!vTKdL#XGB*A=`j4-wTr`L8;(y1`
zzC-=Mtjek>nIE<9##kl#<af=PJ#T(NW$POloA?OwZ_k-KWlrlmlI~}0GUmg_;TeJ!
zd;R9w1X^~e*U-Bn=WXInJaS1?0%G7e)*@lFf;8w!JIi1#81LS*|1f3~cUU+qp5!y9
z%$<cYvj=*L$Vp}nX-wR9#wA76&Se!i#<4kUAzRNjvU}N=I8L&&>?d)xo=e=pv)D=A
zlK13e_(Xmyzl-0?ALNhV_g?-r|A8C)2hj?(#Mx*TOD%`bvaIk^Y-IQx8y)^!jL0lM
z!yMtSS?BN%Yy$3K4!A4h_dC`H&x{VAVlL!fVF|`r=0ZwG%0|9>_!#RMKFxX|^+xK8
zbQRJtq~U0>0#A+#pJZc@R^l0gj!(3Inr4m`Mu%S(F!12&O}a8ZW+PcVv*7MgR)%qu
zhflD!;cr=c<Y`RTqUD!R`#n*o1`Ef_I%9mp!(Xxq%p*z<p)>)d4wRloX}sw3Ltuu5
zpJXwpNl(Rv-$5NW=6DMAjsPyFL<=jzABfQ%LN8y5C%+TFr^N4%XqjO?7ErJq$?V?^
zIGh9=P67@m0f&=-!Aa5D64Y6Wv<zuElFa&`g^?KXXe7)y{3A-@MBCpZ??B6#J=(UT
zESoh$SsrT*swra~Fxu{{2TNwX@k}Zf{ZN+9hU3U&qi_V+)oct4vL)y##CU9hpr;s?
z#tPKetY>Y^7H|J9)*c%W<%z5uP-x3?SbLVpcVZ;3Ani31u*DiD%!p?G`{@+!{ZG<q
zJokTdI)?F4BKT1He?9-7VEubI{!h;}y#JqI6z!woGk<g)txspF7sW+1-}u?a<x%`a
z=`&hCnvb5N<&Dn``)}BG<L9E|`mJ+gm^6Mi+DEkfzdbh|>;I{I<N5uke009i^M9J}
z|L%E3$M@f!e+#Goxs0S{<3v)laU!YOIFXcXoJi_6P9%jJCz8sI6G`dDiKKSpL{hwQ
zBB|auk(6(oNa{CEqy;oiq!lzyq$M;?eX!b(LL!phg+$kXn7+mR-%6jOoKoZGqvg@_
z3Dk+EXxVQ)*SMW%KH7J~XMg=X={AiM={k)Q={}7U=|YVY>38p<#kbMI8QgtWXiH~V
zJ~X&CNPBP}>kJymZ>B$#>(TZ3|M8jN^8W}7Nb_u*NE2<GNHcAmNZ)OoNONtRNRw@x
zNV9F6NYibcNb_x+NHcGoNHcDnNK<Z{NONwSNRw`yumi+e>50?}sW(zzq+v)F+*!jC
zkX%UVNGp+KQ9mE|+aPfkgI!WHXxb&LBed&*(9g#)Nqv)aWlO;F9rSJ5^*O>ngx?PT
z7~UN|7k)R~F+4K-Fmj*Z&L92(Cin}#j`Y<ZR=nb-;6wiuMQ+-I{r(^6-DvxxX#3&Q
z;Zxz-@VeiBB6=rmwja&@>Kr};9)HCj_K27Mz-zAf3m*vU;U_U}T2BwtFLPqQmJr7N
z9XkpG(ApiYF}@3b7k<KgF#J{cNcao$I#N=5IcN4A9&@<_?XC@f6D}f%8ntM#ID9_*
zSJ2n*{Dtdi$JY2SJTUxL_%q{L+>QKUANB`-CVYRZLil~)|57VdLtyP`an&sRp*T-M
z>HBnr^Xc#x;ctXAGYf=18@XhW`A)u+|1$hi_*>w}9o~*TDy%Y~;ZKmB#Ga9blX15;
z{Azd_;Q4ZRJ3VzJEKv|oI3mix?{((g@Bv&yCW*4sz`zw47C1%g=3VpL@HhPZ<y=Er
zxLo@CSAPs;j0$Zxtn+K?Y}mWmPebU3&;NekzjX&Tjz9dP`we>pr)cyCt>}ushP83y
z3fc>gx;)lsJ+w$zjsDS!x%3wv+IW3oG`||brRuo&_1!<7;jiz8cSPHxw!;4~b75fv
zL!R{Aho}si2HCu_guNm~*eg<46C4~Cg&c6rTpTiMio*g6Mhn!<$6<#Vvw&GyAr6}`
zU`jA#7NKS_ju==u%9zU9;IP9!Q4XHm7Dqg5hr<C&MSIYF2OJ5ogmedg>45{*7aT5F
zMS6n|^uyt0gV_-LUWLO4E6GsQAv=j**hvy$C%GEjd<>36HWo*+u$iP_jM-v7F=9S3
z=p_Mt(BVb<E}YYGI8iGb<1pvh9L8Ej%*`)mqCkeUMoB3SpO}wb%tsaTv55IN#C+n#
zd~6NolZbirMn8RVxWpW+Vh)m+gOv@#;eu&+1m;P$y;w0HS<J^R<|B*waJGmo#+b<x
z6vI~HaAIz8Vs4jhOHEOh2dG<xZOI9E_5_3oiYWq$sTjdfSdR#D0nt+sJ&gs<sof^P
zKUwtbsFCq2dnaz-PnLgyCDH;3y3JCI>Y3(QeveIs>8rutaVDJ`%mP=VC_u$?7SEjr
zO(k#~#9$z=-ow8OF#f<G^r*D8XebI`^kh9XQ<@kHV{f8_MwJE(P_3q@r-0H{u<h)x
zYzN!Lo@6xvd%zn=4x|UN0y%-g!1%!9!K^IzakA4=yW81=qUIB*$pX$mQXuWuHN*c5
z?*q@>8-5}DT=?nZGmcL=KJoa3<71AGIzHrh*5`*muRJz4K(^uk`j10{iB{({w<|#;
zZpw;9wc29rv5vU-1gFdG@%j?|Ny#axY3Ui6fnZiByGc%N(`L={TI3fLwro{Y+`6Q+
ztW9~_cI`WK?9{nS*KV-(_v+oJZ@>Nn1`ZlL<f@^=hL0FoF>3VHW5$jfKcVu!80)0T
zfF+wYb@lXU<tfpNhUb+NMQ+jJWy_Z=6_+<Qy#4#vM!yJ#_p>dmnmxl_U<cVD_73}q
zos+(0b?goH9y`WPurs*6z`|VScJ>hag6(BbX{?3DJpHuhgDbSY3rA@z)G0|*^C~)w
z5@pLr1wPccrywa`<1GT8YL2{oO={8as)`<=QNesoZZSP6pmiQx5!5=5%GZ<@^k^^?
zTvBl~^{r8<s8>;+dS+B=D5zQTDzu&pM~NGwMxi}Ri?}hP^EI`Fp2gRr_rUrwV^TGS
zW~?prY*EztQjx8N+Z8A;%-3RC1eQ}L2he^%lbiGj1vDk6uf_&fY?!j4GC&t?QiH)!
zsT)M@Dl<nN+Rf29Q=LI{65As1zL<`qMW9f#=8dTc1bT&fR?Y}i1SU^3o1l7e)HAvc
zYzXw)(6chMA+RANx(jLSstT<$YGQuWt=4%8W$;YA=&8fuq+l>LaCig2fQR~EY{MgC
z!}w4wp+zWgIMR72P|<H_YEa{&DmGw3eL@>Tfen2&geqwyG#&b-@i++$ZlJ+M6QB!s
zqX}T3p`M}2850`LgdX*@z$7-@L}2SXIkds51qN5NPu+_<-WI!AXWqGMSKe=rlTBjc
zmnsj($O9X$st8TQ=tEsoapIw_fPCkxDyp&WyG`m^%>x`KEig$-o{}a;iWYq>G?W4^
z_{k^Ih2ICfA^|J3JC^BW%W!ZVD>!>K?&Q@d*q$kQnzgWoiz}|#3N?1PMscz@lq*i%
z!t-imk<(*%9&6dE*cEg&3A%#arGSymw;0nb!+&|KyYd$LlGrwM_$Tl@>Z91~L+5d|
z)fSoMMcUSsB3(|X)zl*0nouhmMJFz|rj(=cl476iDt2wFtE)S8il3HWx!8`{T`NB%
zZAZHbWJF6=&C#5u7S}-9S}{yZ5!dWAZe4cOYO)x#ZgbV@v0}s?G-xfRpS6dlesp*$
z+Hx3YeilDyyFFI%7POtpGWk?iodUR2`x29ji;Jsc(NDG2=D>9g<0-LmdAlW7T6(s>
zSZ9{n-CloEYPP?q#-fN@vNI!-Zdq_kjj_k!7S}*$DTiy4oh%UpO?K*ufTvI7(1|^7
zcW0j`CU3XRmuSnYv6{7j4VziRYNHxfB_>bvIcYXE4sk;d@;t3H<++Y$e;CPpdG_Zz
ze)B^KU1%xJ-BOCxleb$IzbgHr+ubqAHe4h+ciR(Vap80Bj`KNC%_)9e;@3;RRL3vs
z;Hf0>6xvLUwv!fZC!Ol-&WP5`q;k2lQ<7=sP8WfO7=1ybKdo~LXvk9%^n{R#<zh;{
zkVqj<NDg_*ianwB+|ss=y9Pcy@c6(-2EKc??a>SUAMXDJ(koxI{eo}1pO-(tw;K~E
zJzyNX-<Zm`Q9`*%^NYjzN_+Jl=sG)CbsjLPH3eRj+Uh(DK{T&<OkTB%h{#*4r=i%D
zM#V0745+lAP>VmTXM#jo;IK=VytP`UQ+EOQUK2mfQC!o^y!JYE8*q_aq&L9>{vy4Q
z=joXe$k|b@H*>k%yJIbBS=s(_y@}1`u1-t}m6w+@J<Z~BKMfbKKdA}s0U%|?-o)af
z(vsFWxdptWb!izELIzLZq1HK}EY;^t^k;CNSGD>=B?Wx3bo$nrbC=9s_u+?cXb(KO
zSCUW9nKEPQjN3kZ?}I%L)YS5)EVnGYcI@!kh27uMAO6Vu>1Y10pSR4vscOuKX(c`0
z)Sr0UvwxraQ)oMr!>27bTV8>_1?mU1+F=C?c<HSywbcqBq$gQwYuaSzDRFsv8(g|#
z#ih$q%eD4`SHzo;h<EB<z{sRr&F0ht$Q79P3Y>at<eG|{-T@%;#uI3iG%T2My>$UH
z>DhT1$S}QC9-x<5uC;M#Y2|tnV5p~OloOBum*S$tbnaC{Svh3_U>&##AP@KRCVy~$
z@{Zd!?bxw#)6QLex_9l>r)#&~U8RG|>&yADof{)J`gQHuy-&Apy_J3gRz30f4Fgs^
z_SmY<qbj-#=rVeAmy7Aj+};;9K00va6OXSNc*A3luj)K{WVeBxN007IT3yHRX{8Qu
z3}W|C&hBK@sl-Jx@uN2ZdBqSQ%M^gDtzc7Gpp`7AmQVDhdcX?{^?aPN1ekOOn3zLA
zQ};P*^>zSPeimRNmuszEH8Gh@nmGX|&EeM5nwFPqUYG7l#o6c9k^sIYsQ_4V8Vbr>
zPczk#)U2gRVjwC(S^yy^DS`8jyrdW;<+lcN<9R46+k|Ktx5jf12(AqG1#mmATi>VW
zoB9I>E5}ab1x@qc?ALFvWSkvx)!(OmVi<KRuIsp@%=mjs|Kd4?Evw3Nhj#Bdh~K<O
zA3JW#U~TV9H%<9-&wj?%PInF4P&@jBWqf(NulG(~l^x=%JZ+{+TUt);(5K0eR;9yX
zc;Ku`zL#Gm_<YFZ@(~u#HH*pLJ+-=wq(&LLPp<lEs(i2H{n;Q7_$s4~^q^XSori~U
z%`Kj>yK8liS--@|$}+hsxqMEy-x|tct9bb{YW}*HUc4z^eb#tQ>g?njq-MkUx~WD-
zW0%+1Wpu1sH9~4iV{@VHb`9H>59@IlOQh{mx2wb{<(3sEGBnSuA=lcyudFIipW&U2
zm!DOQJyZE>yu!<e@z<x_Fs%MvW0})fTL1oVA)|ZpDmkQ-L!M#YGWI%LODNQ&!!;Ij
z$v8m+7UC+g<-|VA{JF()nIEXjwdR)fEIw=5C4EzTcJqc!x8AZvI``1fpN;U)hx@!X
z^@Br`u=(YX{hO8M$}=n$do+zf?<&^0qZWb_Y5;LQW(Py$j4ruMOwduN*$-<{ksbr~
zrxaDk*y&!371iu9bZKWXd3sy~tU(CZpfBhOxw`We-|}U~ns23U$M~O(na7MlTsL`g
zsqqb;iP#Ve_G1`BjU<FO2k~qCu&#J(bt`76kSbuIS*C(KeR65fbNArEF0a00yk@p@
zzZ4^VE4_tPmqqR9T&bnRHKkBz;4*SDDFvjsn3BeKzcf&aIRHZvXIt@e3#-Mm%^GMY
zxRFO{3N<0L2<RnHQ6f!{PO|lUElhm~stT``GlYJ_{JfY;Qisp$_b*rTfBt~RCb4PY
z1EB~%g^m?V4ZFYqOioIJOcOoCg8`TfQ@5d`^aw}PV--jTAlTKK6&Ep|%gaJp%v_fx
zE|b$u<H{$WaEnp@$tT7yb<5_=S-foaoF!5WzwZLiHa@#xOuA?s<DnyW?s(|W{Hx77
zc5KGD4`OiVFfI#eWeV{oiC7YsoPoW78Vw9+P@q61&|nF{P_^<1BLav`fZBsn(>mqd
zms|hRPI;GLF%NoEE3}z{u&?TPnrSR%DpR|OxJVSOB&HBGrIHe)Cxeur0b#x9D!NfU
z)QuVklJcl@>4`^=X}If2hNzTd?Lt(>LQ-f6<yxYvT4f#-0X#W?4lyw+_k-+8h?AMX
z3C*)`{^@(CSKnp4B}oe}4(A7FkC;|@-J;Wq_3vCh{>;)NPaE4U`yQ6!S3f#%?1Ig+
zO`4hsyyamo%@M;?-IV4+%7UdS4a>qY!Zeze7iC_dDR`4&@@nE7P17J1<7|Llo<J+<
z3jQKZa_ULAO2P^j>VeP=T*U05Rp>1+!z6}DrIhO~tm)krM_N-7gPG6}v@Ec22ebp7
zH318cbD==<f}v-MiC<O|@~}FDzCh|hC^siN0ufRZ6fpCd(y5zf%(`*$(gz=0IBm|1
zi8t0tDvy2RqkmUb&R%Go|7b6WWR*H*`RZ$yEqQ6-jPchms8ApN=X<YBez>rOzWntQ
z<R_3=7vPxqu^l^z3RZ0+$|2>u#vW_qae10ttlJghBV2P9YPQ3gLumD298jAHcvcI5
zXS33!4LpX_D5l5SF;P~oahDcP=;Tn&eIbxouq^1xwRVvv{Jdw+`T7UG;Y(CMKO!Hw
zIP!q;0`GP}x{9~KxHwx6eC1+XnTR^8PLJZtNl5a<*4FrA)1APKpXeG2I5q|n#A^f@
zDZoKQf9|yLr-edob{52I341NNC-vue&AXTB3EqMNzB|F`!MUISS}WHj!dZN|W^-xj
z<ywkccezQGiv_ZFGbujBl(L<8RFMN>thpZ0r`(a3mAZXi320d_ome_)?!qP4O|DFQ
zcbLrT-)NC{eeXkGo;|bI_%~l-u}+=0ZT;#8I(Kx*E#5c&l-Zn1hH>JEasC~Fj|G@_
zxma_#2)?XNqM2uaDg}SR@~d%YCy}P+CYo$2W}Zr{rbtV5(xi1CCf^L_AhZPNU+yH*
zBz!L2W~I4gXJCrHa?S0c6&LH)Y~`Bb(yW9emy;Hq-&z1wK~2Y!D=xyEh(AGDxI~K9
z1-$s{;rDkc?67dq+P}8@>%_l*Y#1MYY}B6LIBVwOm2*Ze4oU^Q1Hu9a22-C;N<FOg
zZ`ai@-aBf1$4fbT^3_LHuez&K8Q~a`Q7HwE9jsFW$}^c&91$DsAERUjp%o=F;#=`V
zW{lR8EELC}k3r~%N}O)baQO@4=fBm}9#hWj-*3EOWEt;2_84!+!`w!^09HxBxHVwx
zhb%5+8(6iEpqvUQ3pFkuP|gkdVgTh_qOX<$%1MB-N-I1Y7fDV%12A^u((Tk7RNNfb
z%?ou0z~2hDvXjKnwC1kezSLk0At8gf921Dq-3)6#*QF=OIOn@{hbmV8l^UEiy3`}`
zL2$r^xEOoKiWy5TzWMTx3#Tl)&G`PkW5zdix6hlpe#6u`oAVcqA67MM_=E-g&P96)
z3wF(V`OUZX&e~N_xM$I!W5+(MTD`hz=FK-txf2&Jo;Ys7b;Jus0WPix?OnsF?F1E)
zZGz)N%dJVuu*-l-(v`Fa!o$8m3!2+~qP<isBt0%3Q}eoZ+g&ozAk$sM6ynOYBw`8#
z4Ig1n$iZYzbe5A_mI0zG?Z8P}l_J`z$@oWc>%o8U1mlx$2K=RGZkJ_)SKQZf!;p7Q
zpPzT_$YsGB=2oth-~I<rGrly!#-w`V^FZd`(vz$IGQC@Ou6}*<&OYs)xZ{DRU?&m!
zfim2g0}YZnt@JBji}LAELGDL+E=st3ty5(QWF!V<j*!>LVOS-Yr-b_~R-fPE>m>K6
zf6?QSy7D((=JU@VlU4cCI-)I!-Ogvp=j7v{GArb!&|YGoUlr;WJ4ne^7_qTnf9&H(
zx69)$J}8glvtEClKk~*K)CP21)>}R<e@}gul{D$ZbDN;&Rnk~D_tgJYp3wW;my)U+
zJ!jndve{=L=CEDhErTRA?M(DE*knveZLi&(k}BIEq%#`|=~SRBu1L>F#8#w8%eW-9
zX;-IbfO%BQ&O``f&Eu-JyJCc-PDw+t>TytUq6-Y3BsJ~WNK(ghUkH5gvZN;Mu2BAQ
z-}|TUm{Xo!$2-p&IA(g~(D|o$@F%5z^})k0uKZ+l(dd!4EgjqcmSL4MuO4;bIVfQg
zyV_`{?ze1$Cew{Q&#Get55#UYfiB7{wOXq}y*W-@3Uwb&*@e1Ho7L{LPHS?_4Qa06
zhBc~b*y>?gQ#!r;%S4g}@mdF`)^V?%s{X8{>}7yYhmIr#_@yf$4?qiUozo61=z2Cr
zc4ap&XjMWhS#|5yEMlk4TY;nt%C#7mmS3)y5p#uAz}E%mWCD(x1p`c0As2GQ4lJiE
z1q2QrTP&-@Qp?N=5)0zm52_C^Zr%VV@CZhHwVQv)m-3Z-i!<iyuliLb6>b=__BMA?
z?ao;@4VEp%w$^#q-)3_fuNixcw~gBq+`Jzz9a+;kr`tP|jOE5?=_Y&o9_=RQa-Q#R
zowjfpKgJ)C?1tAEdBk{a*nq)<&K-aSv9xumQvbq~{zo6>vteoJY20btVT@@Sys>#9
zuj6yqZfMoX=5$DMOe~oJfujI;_s`(nRu&tz1436YRR`6^pgQO(Q9QO8q;w|Mimims
ziDTOVnqnx|Avq{}f^sOpFMh-Sbzye>#W}nA%D<}??U%uPnDMxjDRl&C)0$P@L|^gn
zlLbjCVvXeK3E)gZ#|?rrB_}ZnT_#)6WtQOA3E;=cMOuPM*s;jPIyDP%>U3PEV?lyb
zhd}F|bPUM`WF{rxBDP#hc9B#J(k4Y1LyHt5Z<7}{0iwu+6AG4?S9yFZKl(j)R#o15
zxADWb#va~##rk!N<BS)%a^30;Yff3TgRf55*3^Gs&08Psn^!gKM&;?56R(|4>%0p5
z_5jvx2+<wYL7J0LtAnIVky>pEeVS*2LS+fDq-tl2>3J{-k5f+uVM8NJhcaq|g$mP2
z_Fxv+XzB@xpk7<LkSiqG1AZ)1pEY7{a+xB%*zfgut!i!-tKw}gaCYY=>Gb_u?|eer
z^5=U_Nw?kci(wp)25=v@^HHl;{X<pN&G($%ZPY$}`rbQ``Ebp8&PNhG5RNcc@GKA6
zZ^fF0;%H*XLt@k`#%;&A?M@Qkv_;T;V*7!;WkBqygSmqJx6UE3et~YUHg*`N&z^ni
z?YEygYtf9I#&<`JbH*e4&OG<|o-+hP>bC{@jb*(ebP<DINrTlD(1pb$Md<p16rm@^
zU;wn;6<gsLXcd~h$lUivHoN9Vmo~dW-&Xn7`fH@N^{<j`dcQGczfru8=-=$OgP3n;
zv){{o+AM<nZPce}wEk6}kq%Ak_2mw?$`92KlKRy@O`UbyUw?<$*DTP<yMj)xZ$KwP
zBfOG0YEsjJq#UNwGWabz$$&nUoI$jdoQj!auV%-tJW4jzN@7s(`BadOmQk)JfZvPN
zYU+l+K|p0LECiRTfN{;@UF(gF8{}`c-gfujUcP6+`jGLCl-=I=`CY>>c1xY{iinL5
zSheh+MOByH_2rYs+uA=%a(MnT^`8!3%LkY+wb%tNp${Stw}r`3G)r-f9llgd4Kx+S
zB&}(w2+LX+XyJ4qZ-Z&DAYTBPEU@8lZLO1TsjI7BVA1MVNvnPtELBC}`UDUOyn@37
z8{qJFYy@cSi8|s;CQjOgPs<<RSr5^j*c*%eWIVxE>?cW;6h!aF-UQ1tvNyq?iRg73
z*?Qu!Ok=RS(A*>}qFX=oME1|zoRZe<q|?{W7{B;@_|V5I7V~ZDvg<c3k}q7ey#Ldz
z83&=w3Ocm7FpfCVp#{uhF2hWA2$;#SfLXj)esKb3dID+BvI9MX(_xcF`ai*}m<Rna
zJjg?U+Iap6PnYYDNrQ~Hj3(Cue0NLJE%n3dxwNo;Lv#(0{%(Oy)a1!>WbFxK19@ve
zZ?afvGPa2kV}n4B4`_MRqFr!bUQg=PXe$AJf3q!XEc`RHkb!-%`9yof)WOkVkQd0t
zUK7?8usO*>(ij#zXf5_Q(6C_K5HV!2%H<($b#3LH_=76n!At8@WA?+wG>DlC+m#8w
z3|12Pg<2&~y72K8G#D920~%~dc%V8ZG76BK9!pzCN$jOal+Z|Y8A_7?D=!0R#Te?O
zwJK<FDfRu0r1;T!vUGuTp6RgDlkQD+`b&1Dn5bPT1_=Bw?MhBkIg+_JMfM62yV7*t
zi^D>|2OGNagK@#wQ}^8VhhN^e^DlpshU12vPcXI{|1y3tel-5V$Me`dr%(Nj+nzaf
z>X`_Ce;xR-gW|h3SS>nudreHNpfhmZhHO5zh&Vk+O^90J^w_!sObx`U5(*}BQ;>#&
zTcv{Uxyv~Bz3~cfchmayHyN*3w4V>X_3!#4(&<gJXWvP3W_ozKWftJ%!I~Y(s$C>C
z{eY7L7pA<-AYhp~fEVNf|4oV@6I0r!ctIoaE?D7cpRdP)SeWjI3qtHkT#)}*i4d0p
zh{ASGid!JM1#S$=PVGK^@JNsCqy7M#b6y>E`1X&QHE#sc2uz8Gq(B3xjI3U#N%MM$
zl$ull)?@;!$<1Ne&{B)w0~9;1%p%%u!Zsr~xC1kTPn719Ow<TXCRJ!Mp({X6nhYE)
ziGE**w&~bY0tJ!XeQ+!Pv5wmp%vo9$X!1+b#2aQCU;Mav-I|*W!=iom=5>E<m8;#j
zxbu>LKX_};1#{NaKO|?)nKx@W*3A^is9S)Sd<GfyTlO__#tBbcnu~a38tiKgJ#j5a
zGmCiQF8kYbpTEfTxY;s=9W9IOXj&7O7Q!^i$F@7(*Q5o?8t~7Ehb_A}@d|+z@vy;k
zMx1qubn59FZ@BG-hfari(r2eP-YlKkx^n5-&AYz(&N%VSu^rp_lj`cVRb#K7U(n@)
zN3|1t#S&e$s`J**A2Y0~Rp+CRKYe83ytk|n1{_vurfdcth1XprLKON3jINptyBQqr
z>S0;~)fQm|wU8-86>dtEOc|!vopyx8t+JFkM#nlbU0m=eP;t=yI>7dOwC_S}l(`8~
zBYak~gEg8?5c0UgF^<NB4T5a2*s=(d15q?&im>6(1(|f#)jfIJoi%mF%NKt#UgO`(
zFJ0_%&#qnf(7Dby!#&h5;sq@h^c#byFrm>^LsXJmKC0L7q*{$T$ycLWlY}!K*F=Tj
ze6Y^MpnGAR337jN8HtqyM95s7q9)^2QMvx7Z@>lrF=LvND}*XXG#gWopuYrYb>=){
z;~@j6(`v<HgO5Hc2e@B!OmZN`UrRPea+Y`a;@mD_>{DRullQ`Iiycb*-sko;Id{7#
zk43p-udb${+_G0@yJgi8CpLc1QZN$*GEt8HumOaa!CdSKVlK2dkci6Q(}r9r_Fy)2
zq_gl5mHQ5Jzj~N6W9L!hsA_z6jQG2feBo;)1uWii;Rk`oBG3u6Sm>%bk=1T177DVE
zaE?NAi$qpPU4dyFvIDX>`mcz;VRYsh(4vZY09WrBpBV?BoF9|kum4&~sV}I{l0x-(
z@q>e(Fy&w9$A+lCYAbO_DZbXkoeU7hz&mtUXy10gPqm7fF<ruiZn25|0`<y4j45zX
zkH?W<SkFTNXfGYOIKYr42d0C5D$vg;K_3NCnGL!WdMOkEA`%gwp~K4J)_A$D5Iw3i
zuM!Tm(Z_?n3h7{dC;5x|GU=aNl;Qg~Uw9~@53Dhsm(tXYSW_ho(JL63u%bw0dNLze
ztjWxdhzoeIu(Zf0L^;HqM3xh@_YjQEYxtHOJB;V8@4xu-t`{(7AN)I&7&Bt^fXI;V
zTWP|#kTM_8d>qE}e5dHMqv(^NPq|Q6B7Is9V>#ETk&c`?$BN@v+s<g`sB3oahq#AY
z9CSSVFoiALq>g;?rvejZCDJEyiGUe{RUBL3+>li+;dzho=5OtAsE!AvPo$6QoALWf
zON~hwlN|0MZ^5H7uo}^^Y``UuD%@eF53HDM(DI)z&U{JWrH67t@>tFymL|Ypda9A)
zSdxPJ!ox~~je++p;$SU9oJJ3cd-uFyIjI`|!t;pl1iz7#fsjfC?6!!fTWn8Z4z2dU
zcd6Sj2AlBi*c|Ya$Sr~%=;p!-Qz-OIGLmLHwOHcnanOF_KngfzJN4$EIVA&J-49K;
zB{I#S6I6SGxg?SOE-e+DBNyf;>_4;?F5M49scr+|U_UEJvvp~^s4vKx+q$H6nXo^B
zyZIr{B1RU$>dH!B#vc097cWd2H+14DK6lCf7f!mp|B7?Ttsa`P>*=~7{ja_w>E#)V
zc&q!K8b5r(piW%1S{IF-w715{?6$OBvw^w&uX*y`j(x_o+m78j!DSWTQmVqU1Fys+
z6C2fWw7h&!KvaTD8eItgkqVzu)HOk7Vr*30a2jF0*Z~VeJ>H^lYfdtU>Z;H}d}aaI
z6K)XSBt=<R;a$SDkdtfmMC_x&5^P;nS9I&xLr0IkKJ~7m^n%P;Ls!h5zhX#LKuxND
zxJO@bhl{>5#^=KZ-^R<k^wRJ4?RvL&XQJ~V*t;AR_?^&TKbhFT?m%<7a%&mYKpNQ{
z+*jBgbOrmzsO13>3t*Qet=+{%4dpQD9;9xN<pBZ}cHSXI?F$R%N}tUdb>rOY)(oBZ
znZy?@d+L-S#fDDt(z&x9RxRqNWv|~Ey8Ga?!Ky{sJaZN=iPEWj86V_}HN^(uLy6);
z5%^GSSK`A&hGs3ggpVXQ@m+9x&F+E~kLf;AR$<Ol2p_^j0`CG@?|_z&ptPuo+9fP?
zzM;onuehbS?v?b`cUB%eRyS|?fSFlY*Y;hukpJw1;Oo$<t2FfIlQ$0-!n3};tGa6k
zex!Z3_Z~563u{h34V)xHo0!O|{X|wyEH?{HBLHPE)#10$)?Nhz44Hd5m~K;wv^b}5
zsS;UbgS^t>T<#jH!{YRlret^N9xvg<>Bl6zh$(St9)Xt}S~&3Vr1Ky&LSRJLAF~)7
zuBOF(C||esJuZEEynd3TtXVth_Kt%(zPa{{@goaM{Nc*!<L63B)3e*Q8FgQ*wyfRR
zGXH_nzC4ewuz053a5E;w;cI2mr)oa@EbuHQ5_S+uoTs@ETc^T$g`pSfDrxKRqb7=2
z1URoWXHkQ=x#~n8X^V-ZC&AXmAR;jjJ4~=HEk?|v*o+Cf<hC;XjLmoK*FwGXlfA9d
z1`T@s^*VW7&5GUoV(rf>>gZuBYA!C3*O_o1ZS+&@fO|Tk&u@&_&VwMII0m?TW5MPy
zWRsYh(okCn(8G>GCUZaZj%-0ew9~OUu^15N10-aS40l2o2S?kjc;gU6i0uYZ5!1au
z5UqPC=PqGpOag;z+K9x;pr%1n{cVp(gxp3Sd%g0G;-ohW<IJFE`{s7sI(W^J;#)=^
zJa&Hm@_{phSu^`Bk5b;yfq%O2>U$^ho4k}6x^BVjF5LtLcIm)BZ6_#@BZi(S4y+{)
zKG-6}3sg&!rzH?iOCT(mJk7M@5g!0gg9#EwEU|{jsu4@ZM-`J)NndKn!xDW^Crq~G
zT3%Or&$!25uA4M*;M{C5tGoIS`{c{|D(TNF=asd(_yrInu}vVL)ff-?Q6k!fNj>CB
zaYU5>Sn|lmKw=-Ki1a14DZ}@$2_dFR+Y7H+x_$H!wHeloetaX^Ou#Hln2BPAyfaSn
zISNd}$*sG{T!L9b-aAd?x{D%)O4)Q!m7oU^qUJ$2gX3LAzK*@>p4*w-_LVwg%sz{C
z_-JMEg`0Nox2bjSzfW|=*$seiEA;Jv$K8Z4bU#|$HF7MYg-xatL_`40vJf3`fWqKG
z`#Wej!rLhmKWbp9F%300oFB@Y@O0x({9fZL<Jr+_(#19Wej~nq5C6o-6@6cZWt!Rd
z@0++b)u~B8pTu}qK^I?ub<u=fXFj7l)5sn}tARwF<|x*&PBb4jI5}dd2#?ey$b%+M
z5$%$Ok*A5MO5KS&xuA|FWb;CdTe=H0qNTa9f;E>*cld}w!Bo@0Wa1~emuUW8rW|iW
zDq3|cu4Mc48C!CS9-8&n7wX23A9!t&R988!?==}p+dmB$Hetf(ssH@CeyOx><Gf+L
z5)$q8-K2FlFDh?+@oUTv?+qxin4gCYyiD(xW~YPbqoxc{x|mlZQujnA6HAl9@EZ_(
z<6*m29E&gc%amO&)J>c;aBh~;_THgm-#uDCUV31~jCQRro{Y+}))>zf_8*Xh5MxQC
zP5-g|M~MXxg}kM>A_&>baYfMx%Aq{w>slUT{QH}e#=q;9-MDh)${SWLm)ySdyu>(k
z-uHv?7H?hmz^e!E_ucdQ>-P}dLgz6iC^Rn8dEgT^)g6p0PVnV8@a4-iLF!Lb=Wzl3
zST+)PqU%b%hazH#3ZVDI!Rrk<YcfQgNA(`;Rs{&%QN1S_`yNQB$V9BG-b!kHN9Aju
zAA5Do#^S(?fy<UIU)Fy{z?fk9bbbH9#(tyT_pNcPYv=kpX@7Z#XaDTm`9YVqq}Lh~
z<cpEHKz|eNL?7moAm&2el?L1%LBr9xm~MVzbXwA7eId4?zCeuKM<f7!!PZz`05cD{
zU`4v*(!Q)OjN4S4_DWsR`jJ9k=zC38*0f%i^o4<aR{xSCsU12Jw|=Hw8~#&ihmVB5
zAl9d}2Xmos3kiPG01b8ubVIa`X)q<?r5&=KU;>`$c2YFqf`{QZ!lEO~&6<md7T2m{
z&Sp0ZOU!YmPwO>4MQMBA&~aAFKb7`n^-iJ*?E9dryo0{;AvGel9_tmcR4y<GJq=~Q
zVe7#zz_j%sUI$UvQCkn(5PqZv!PPL&)x^3irp3qa{%wnopbK)yMFL+NYMPf~s!fYe
zh4iJeYRuSc#;<wljjx~I2aU6K+Q^DABi0>!<NH@WSTdgvQpb(x+o4UL^xQ40*1tS?
z{95RpT`LE-E$f=n^qw0x|Lxjq*5Iuu%s&u5Ev>V3fnGD3ReMNNb3jH4-Ns_-HrAqO
ztR*7*8|XJtN04|gK*U-midf6b`i+AmsMFMJAZ19KF?TcM9nQ)raRqjq-?y)AOK*-V
zC3ASex~<S`xYhW%rvA}x<yN)Y<+<+>X@rTVrP#07mA2q<!_1XynoFT_nS&+cktxlu
zG#*iGavVaGp`MXY7iJ`=DhO30hlNVZRYY}>6eL|<n77TX*V6N&$5&jRRrg+E(S6rE
zd4RtxEv{dC&%93U<@gJ)ZXY@BD*-=jXMe=F8rYRcqBO88L9>n8mEbuh4dXZMO2r=7
zm1r9uxNy|1dOp5jtolG{Ti?2(LVEMUs{&U|V8ePBeI*dBiWP6#lt_+Uwkch*AoV$O
z+Z7h1^oRxNg)_^pupp`bl?4eluuFC$ya!<(*z@CPQum<xrT(>gf1PpU;8*IG2QhA!
zbgtei{e0n7>CO7qptB(0bOvL;(q2TMB9F-L*o#ty$tV`~n{meD-22LF+>i4(<J<S%
zlR}aodcwT=+WMmu!b`Yt8vVc%+v4reL5TPvrPpOQcO4o-Cy9cK@MM7x7#nmo84DF>
z;cKzSLB%cCEG~rdT#oNS*0lNoJ1~<8x{XBkbmC4P^LCPYhTDzKdH3Fy(Ib!=*V55-
zP;yhuf6=wl4;Qko+wQPE&y~^bCerv2BPJgZv~q=wi5Sd(YhxNNW!2Zpec?su`hfKD
zfo=6!5gSt*V~cdV+5vBjwlpJkXm5oe8N{qXuk?aJ!L?4|FkZ4pI59<<b!2r4aU?cP
z^twXSsE*({l2UCZj^DAr<-{Q)MvfdYWMa$xJH|_{>iIJcJ$A0_*5D({4o&+@e&JuH
z9$NND@K0smJ$7i?d_k+5jPrb|uuVZvBNOr^Jq>R<;l-zD#5302ro+a0^~ImNisw=>
zj|I_r_zU&K$UNl3@NMg<m<J>=%_Efza3rd*hc#76Fn)}e-W#A{6PCpO+(!X`m{n@!
z&{1Q@jv89oa^KEzlP8bcx$hq|{OQ|U<o#tP4gc1%bB`UGF~55Lv_p@5R|b47;H#C-
z<U;IYhcQy7W9+pcB3-6fkQ5@O25(9^5X&8BhQA{kNp~P9SeKoo62#zj(rV^S26Z8J
z1lLxF>DBXy7ew%?44Dx8LI(%yhoQ%};PIPA+&#E-L}9xTk7;X1-afRfqM-dS{^nh8
zb?e@;c~xKk-5+-8RnX#^-X?Dx5{{MsX~|((h?oM-YkYCSei&a^V-Z);O?E`~XF~Ra
zCNiMTs3KYlmK-g%NKb*n3mDVJI|CjHJznUtKDtZ~U}?l7cq%DHED{(O5Q1r%M9i0e
zd}b_$fVi-TB#PI6a-<>eA9(H7M@~cyB1a|p@pZ2qcpnCl4|(&nV_#=|c;_X9h-LY~
ztaD$da%{F~y$pd~I}?7GEP7)#jbu|g+z`n{)hhX4;-T%t3nxT8Vs-JxTbha(UpIsn
zDtV#G!?J*v9-zEc%fd|~L&3w2Bn`m=E~l1A=DZ*@yC8@Rbs{DsuefV&1R=u-81TDO
z2$UX6K`1IB0U7o%D2nXaa|IeNz5GNm-aw``XbqMWBY-S-$UQM9_rG&Okxo|)A2Bh8
zuQgU%@|#PC`NbT2VWCADdEo3jXFjP`r%zeE@a%!>uG-Re-@Z6~++q_3WdD8<>nIT)
zG!?%2sO`JP>56BVa7?l8MBrF#QH|Fp3Lv(<D6j$oetJ2K77V${ZAH~_!lfUF_acDk
z>i9U?p~cgTokhZ&7e~?S66S|s{-}$9c4n9o9nkz>>ZT(Fyss<o23z_(?ltb?lZ^Z7
zjC=SLq)an5p}zEv+cq0-^P<hS-9Z-Lk?;wBX*mG?@5g@iDboj2lOW#X6v2HpK5<=B
zoEL+*%$i~g>#O8d=M~c!^9q6Bv}|!B&AgE<EMeIJQb|h1TExqS^cE=OJ?NR<-lAMn
zr(OW+4i?q4Gz&6|w3bfYjT(_~x-ww6049rPViJ6Ec3Ls48wf4V!y9j^!=1?@uOkU3
zs_9DgP-rp3H9Sv|m%O6LZ%F-6a7Oa`c~hQ?9c-oXsd2=ZxP*`V@drNA*!9D|j7PtC
zVf%f$BHcN9^tdTg#*H3zr=)22ZGS=f1mV4!G1zzoM$dt~nzuK8GVbQn5pZJV*BD!k
z7p{Ne@B@EV#|__b-J*Fn51pXieV_Ok3TOZGcTJQl@Kc00>t6bO48fH{7;0r<9e|-$
z0z<9f0@a!p)ugl&_fo{Y=sR~;Vy4JML~)T;<fPXNw6da_Y_lxAD2g{2*Bju7-oa~8
z1P7_W5zJ57E-e5wwIYoqRIU}fYJe;jAj?!cHv-<lnSKXj+!ZuKJR5nA^LW&AoX7td
zZ?I4#-~D8Vb{)&C_IqNKZvF4St^2rvl{fw;#MO_HuUfmZ-RR7;Yx}in*2U-a4QXE5
ztGn?O|F}b0@3!D~%i!x6EPNf!#XCp*cYGbXOeQ(WeESAElAkYoiF+jDoN|KORpTP@
z&i^?r{2zK2amzcUD&>US%Gr~x`GgHE?o8i}cucCYM9Q9GQ>S*Oxowg+@hb2{g`)E)
zY_idNcM3L%NU(*~NG4%PFwVl_N&?FRg=6aV@}|#um-^!-kKK;;mW%e9|Mq))Xis+6
zM&2`zwuJqRy#44@d6N|Q%6Nswx&+q`STw|AFF8f=*h@IPq$ppGa>NIreCbgtU&`~*
zG2RQ|VX3?P6YL}fOp7h7QN%lDky9kfsm3OJbdi$?b`oNjJVm6|fX%F5G-c}IMN_9N
zmOdOXZt<e=112n3DEbv~jI1^iAC3rM`g$|PiOb_f|NXG{Jr4Pr$Ld*iF3DFI=c^H%
z26dpAqU9kMAXjtk5Hrb;tB@+G^!~UgFkc;q&1`pkuAL&XVNGt1@G!LqA)GKXd6SBY
zs?(bj`%b6$yu_mF=INAc4lxY<LrcfT4C@*uX860c9K5p<A6M`?tm5$nuagJ7PJVef
z?Ni|Pc52SO@C|6Od!PGp@ZPUc8jDc5-HzBeyaMiY;?0+MPhK^$^c{kb3Mp1zjWV3@
zdQt+#LdQB1oDo+zXL=wPd?ULYQ3&831kU1;5E6y&Uw&sKBJ{BHzU)xw!2509yqSm2
zw4dM2TY6oaHCy?cMr%sj)|Ss{?QOHP;~C>0{JV|!ZghOl1I~nlPS5VG@yJSdKk9P5
zlHlb2ZzZxtO_uLeCW7XykcXSWYe}Qwad>mzCWxTglHe%<0I57$B(4#lM&Cf7SPXa?
zRPoLw1l@0kV`vs(l&JBWtHAHn@oHvGg2<5zLU>Yi3Nka_KLMEBJ}^-N3Avm@F76UL
zJzV8tr)PCd<~MCv!28_%Cw1fMS?UcP)~S{u<Hs94_}`6gQkroKUr>Jn>bJ3v_vOa3
zf)7>6U&yVX0r<^*NrU$vO@}Xab-&zAs=`Z;oED_gMrnik40=~kX>;K<N`hW#&9D_)
zi_eTtX#XS2v{7aHj`+6d8CLN&>Jhw2kMExY#^xWMQSUKe?y&~LTKFI85wn-bT{^A9
z_fNXhh4d)8z-Mu!CTyD=$JQ!evi8c;Y_a7yn`}vE9r^RDN_v*9lAgyJn#Ou63s`sl
zHY=4kg5S1hTjgF%Qf_6_kPafvLz;=y1!+Cf0;J(cW06LokF8RGO;=p3ld_TBt~6(>
z<P)sWif;i~yewczVq0;pvW#I{m04!8OklGtf5meH*b~YO){g2ZGuc-4N7O~RWeJ-u
zp4*1AANNkPDM~fVvdm}e&{hKKrQ=+Ll%hP&Dx_9yjf`(H;OvlRvJ&}TCQEm+9?EDo
zR9VkfDb3groQEnc*-+_e)*RQPk(Nsywn<73Ybd{guF>u)l&=tV={Y<jy(6BlkX~Q`
z<d=fE1uVa?CO8L?oJhl^r&t>a{t=v0Ekm&10_>IL=<{i$<19t(&PEb!=`87NnLL1S
z33W1ZmWqL|ok+=MVifvt6%aWVb?{s?S#DxG)f*s7($QBE+b(wkuP(tn4zcx?oop*T
zL+vO7SU*b)o2;y6_k#xMkG`Qr$2fK?Untq7C*`Z;x$<`TZP`#dE0dKQl?Rn-#jrHB
zY*bU!sp^;33hSM=fNitwe%qtAeYO*}i!qb!rS@y>M`An1E{T06_FKmU#}>ykj$h*1
z#Epx4Fz#4<LHykKBMBW7o=^DJ+0;3~`L0WGwQ)^#ZFX&Uz3)2ZR@~Wc&Exef@*MN_
z_HOfK_@??c`QA=+B<3XEm3YkG+`q~HucX#VHOaQ*VaXekPo|`#%t+aiay;c?YS+}e
zQtwKW($=J%Oy8EiCu2#*_TM>P%=j$hmrNxyKC?7)bmr8|xtR}UR?`uf6F3pL7=%GZ
ztekaND;DO!3Z?J#OW2v<gm00U--og>ai!pWAAIkTG=Gk3#G@c*UemYO`$n#1yazEN
za;+dLWOC%%0)Oj@$hC^{M<Um+;lFIyhp1ZmuN&sG0P0ubT#2hmD4W9;<G*&84%_}T
zakm%BW+Qhkn}QnA|JI@5e-P2|KZm#;wI*WpX4?&GUHKnB{P+KXM8h`n;fuWdA5jd$
z2&dzn<iMr=0*E!N6eZW7-YlfKVs7+I0OMMW-}!ioW^#G{L*da{fR^Usn1Xo*5W(H>
z>Def!V4Vmr49`GozxB5cg@j8PI+X>V2D367ESh%g)*R4I;$d-g!fWD&_0<dOS|WIP
z609OAi0@5<w>bm;lmIMzS%|X9hL<ge<>LEb&45GtK3zUWPzX(}6);eYFSwN;lB*0~
zZYxJ@a65d@rUNLW6YC6LVpqH)Mc?7?iCNH>`1|5(Y5f7Wfw1S%cjxH4{KH^H8-Zxq
z3N{KBYx*w#Sgg(QYyzu<(RvO3*ND5=EwDFjV1MEYw;&eSik(voB7$S_8fP3VcnR3M
zy5MKnjc;H*%WBxu>?ZaY$NOmTGu_J0ai4X;tm!RVc4-+occ*hv%a$UKbE`<cC~_{2
zoLfiEC6RM!<Xjdxw~3s~Bj+yWxmBdyR;}z)r(d&R?v%-u^QM`%ih7#olAcPB1#@Rp
zrU%Bs*d88UtMNavewuA?h0giLQF>4Mrk3W!2f4gg;bPUObbJ77Oa)@50zEW2ue)Xo
z^r%+$NKhS+u_9v|9m%N3SbIb=7G%`aNG2xG<2k1AL>9^0aWiI1Bom8_eN-glKqj_(
zBol{>BPEiFM<&i{X7HVe$Y{JMO?Xj);j`yLjK_nlckrdG8(B};rK}5Cch04(6IoZr
vrL2zznXod9K}K3jL<Qd+m$H6j6Q^IwCL!w|c`2KWY*J}7J4*BBG4{Uz%nq~b

diff --git a/app/webroot/css/fonts/roboto/Roboto-Medium-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-Medium-webfont.svg
deleted file mode 100644
index 930d33ad7..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-Medium-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoMedium" horiz-adv-x="1164" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="510" />
-<glyph unicode=" "  horiz-adv-x="510" />
-<glyph unicode="&#x09;" horiz-adv-x="510" />
-<glyph unicode="&#xa0;" horiz-adv-x="510" />
-<glyph unicode="!" horiz-adv-x="549" d="M154 0v234h243v-234h-243zM154 491v965h243v-965h-243z" />
-<glyph unicode="&#x22;" horiz-adv-x="781" d="M133 932v524h214v-275l-102 -249h-112zM458 932v524h214v-275l-102 -249h-112z" />
-<glyph unicode="#" horiz-adv-x="1250" d="M60 410v158h261l58 313h-243v159h273l78 416h167l-78 -416h224l78 416h168l-78 -416h208v-159h-238l-58 -313h221v-158h-251l-76 -410h-167l76 410h-225l-76 -410h-167l76 410h-231zM488 568h225l58 313h-225z" />
-<glyph unicode="$" horiz-adv-x="1205" d="M121 431l2 5h235q0 -139 70 -198t177 -59q114 0 175 54t61 147q0 85 -55.5 140.5t-189.5 102.5q-212 68 -318 170.5t-106 279.5q0 167 101 273.5t277 126.5v218h159v-220q174 -23 270 -138t94 -303l-3 -5h-235q0 116 -56 183.5t-157 67.5q-106 0 -157 -54.5t-51 -146.5 q0 -86 53 -138t196 -105q212 -69 316.5 -171t104.5 -279q0 -173 -105.5 -276t-289.5 -122v-195h-159v194q-180 18 -296.5 127t-112.5 321z" />
-<glyph unicode="%" horiz-adv-x="1504" d="M100 1099v77q0 128 82.5 214.5t225.5 86.5q144 0 226.5 -86t82.5 -215v-77q0 -128 -82.5 -213.5t-224.5 -85.5q-144 0 -227 85.5t-83 213.5zM269 1099q0 -64 36.5 -108.5t104.5 -44.5q66 0 101.5 44t35.5 109v77q0 65 -36.5 110t-102.5 45q-67 0 -103 -45t-36 -110v-77z M335 181l711 1138l125 -72l-711 -1138zM800 279v78q0 127 83 213.5t225 86.5q144 0 226.5 -86t82.5 -214v-78q0 -129 -82.5 -214.5t-224.5 -85.5q-144 0 -227 86t-83 214zM969 279q0 -64 37.5 -109t103.5 -45q70 0 104 43.5t34 110.5v78q0 64 -36.5 109t-103.5 45t-103 -45 t-36 -109v-78z" />
-<glyph unicode="&#x26;" horiz-adv-x="1309" d="M62 393q0 120 67 208.5t203 181.5q-73 94 -108 170t-35 156q0 176 102 272t279 96q159 0 258.5 -95.5t99.5 -230.5q0 -101 -48.5 -175.5t-141.5 -144.5l-104 -75l302 -359q40 63 62.5 138t22.5 159h204q0 -138 -37.5 -254.5t-112.5 -206.5l192 -228l-2 -5h-274l-81 95 q-82 -57 -175.5 -86.5t-197.5 -29.5q-217 0 -346 115t-129 299zM305 401q0 -100 63 -164t176 -64q62 0 123 18t116 53l-325 384l-26 -19q-76 -56 -101.5 -108.5t-25.5 -99.5zM417 1112q0 -48 23.5 -98t71.5 -111l109 73q57 37 76.5 77.5t19.5 89.5q0 54 -41.5 96.5 t-109.5 42.5q-70 0 -109.5 -49.5t-39.5 -120.5z" />
-<glyph unicode="'" horiz-adv-x="444" d="M109 924v532h229v-249l-102 -283h-127z" />
-<glyph unicode="(" horiz-adv-x="695" d="M128 576v16q0 394 156.5 670.5t338.5 361.5l6 -1l45 -134q-134 -102 -229.5 -327t-95.5 -568v-20q0 -343 95 -568t230 -334l-45 -128h-6q-183 86 -339 362t-156 670z" />
-<glyph unicode=")" horiz-adv-x="700" d="M17 -328q133 102 229 330t96 572v20q0 340 -98.5 568.5t-226.5 332.5l46 129h6q182 -84 342 -364t160 -668v-16q0 -389 -159.5 -668t-342.5 -364h-6z" />
-<glyph unicode="*" horiz-adv-x="872" d="M70 751l51 164l238 -83l-5 249h169l-2 -257l231 83l51 -167l-238 -73l146 -200l-138 -102l-144 211l-140 -203l-139 99l152 206z" />
-<glyph unicode="+" horiz-adv-x="1141" d="M68 579v222h382v405h236v-405h380v-222h-380v-433h-236v433h-382z" />
-<glyph unicode="," horiz-adv-x="462" d="M54 -281l70 321v198h239v-207l-155 -312h-154z" />
-<glyph unicode="-" horiz-adv-x="910" d="M158 521v196h590v-196h-590z" />
-<glyph unicode="." horiz-adv-x="572" d="M153 0v233h242v-233h-242z" />
-<glyph unicode="/" horiz-adv-x="839" d="M2 -125l573 1581h223l-573 -1581h-223z" />
-<glyph unicode="0" d="M104 521v413q0 251 130 397t347 146t347.5 -146t130.5 -397v-413q0 -252 -129.5 -397t-346.5 -145t-348 145.5t-131 396.5zM347 486q0 -148 62 -230.5t174 -82.5t172.5 82t60.5 231v485q0 146 -62 228.5t-173 82.5q-112 0 -173 -82.5t-61 -228.5v-485z" />
-<glyph unicode="1" d="M199 1232v193l552 52v-1477h-243v1232h-309z" />
-<glyph unicode="2" d="M115 1031q-5 187 123.5 316.5t346.5 129.5q209 0 326.5 -112t117.5 -294q0 -123 -65.5 -231t-215.5 -289l-307 -352l2 -5h630v-194h-939v167l455 526q111 131 154 216t43 163q0 93 -52 151.5t-149 58.5q-113 0 -173 -73t-60 -184h-235z" />
-<glyph unicode="3" d="M107 384l2 6h234q0 -92 67.5 -154.5t173.5 -62.5q110 0 175 65.5t65 168.5q0 124 -60.5 185t-183.5 61h-162v191h162q118 0 170 59t52 165q0 95 -56 154.5t-162 59.5q-98 0 -163 -58.5t-65 -146.5h-233l-2 6q-6 167 127.5 280.5t335.5 113.5q213 0 336.5 -104.5 t123.5 -304.5q0 -100 -54.5 -183.5t-151.5 -130.5q111 -44 170 -132.5t59 -213.5q0 -201 -135 -315t-348 -114q-192 0 -337 108.5t-140 296.5z" />
-<glyph unicode="4" d="M65 472l608 984h249v-937h184v-196h-184v-323h-242v323h-609zM302 519h378v594l-6 1l-23 -56z" />
-<glyph unicode="5" d="M136 378l2 5l228 7q0 -102 61.5 -159.5t160.5 -57.5q114 0 173 77t59 213q0 131 -61 210.5t-174 79.5q-100 0 -148.5 -32t-70.5 -94l-208 17l84 812h768v-210h-566l-44 -371q43 31 102.5 52t131.5 22q203 2 316 -127t113 -357q0 -216 -119 -351t-356 -135 q-192 0 -324.5 103.5t-127.5 295.5z" />
-<glyph unicode="6" d="M117 558v317q0 268 153.5 435t383.5 167q85 0 164 -16.5t142 -43.5l-47 -188q-61 24 -120 37.5t-138 13.5q-133 0 -214.5 -107t-81.5 -283v-76q59 59 140.5 92t179.5 33q187 0 294.5 -129t107.5 -338q0 -221 -129 -357t-341 -136q-215 0 -354.5 155t-139.5 424zM359 545 q0 -174 71 -273t181 -99q107 0 167.5 84t60.5 215q0 128 -63.5 203t-175.5 75q-87 0 -147.5 -31.5t-93.5 -86.5v-87z" />
-<glyph unicode="7" d="M85 1261v195h993v-195q-263 -310 -355.5 -549t-92.5 -541v-171h-243v171q0 315 116.5 570.5t338.5 519.5h-757z" />
-<glyph unicode="8" d="M93 404q0 120 73.5 212t199.5 139q-106 46 -167 130.5t-61 194.5q0 193 126 295t330 102q193 0 315.5 -102.5t122.5 -294.5q0 -110 -59 -194.5t-160 -130.5q120 -47 191.5 -139t71.5 -212q0 -203 -135.5 -314t-344.5 -111q-222 0 -362.5 111t-140.5 314zM336 413 q0 -109 72.5 -174.5t187.5 -65.5q102 0 170 65.5t68 174.5q0 107 -69 175.5t-171 68.5q-112 0 -185 -68.5t-73 -175.5zM381 1071q0 -98 60 -158.5t155 -60.5q84 0 138.5 60.5t54.5 158.5q0 94 -55 152.5t-140 58.5q-96 0 -154.5 -56.5t-58.5 -154.5z" />
-<glyph unicode="9" d="M89 974q0 219 131.5 361t330.5 142q219 0 354.5 -143t135.5 -400v-413q0 -253 -147.5 -397.5t-378.5 -144.5q-77 0 -157.5 16t-150.5 47l39 185q65 -29 127 -41.5t142 -12.5q126 0 204.5 89t78.5 250v105q-48 -67 -117 -101t-150 -34q-207 0 -324.5 131t-117.5 361z M331 974q0 -137 57.5 -220t165.5 -83q87 0 149 36.5t95 95.5v173q0 147 -64.5 226.5t-178.5 79.5q-97 0 -160.5 -87.5t-63.5 -220.5z" />
-<glyph unicode=":" horiz-adv-x="549" d="M153 0v233h242v-233h-242zM153 876v233h242v-233h-242z" />
-<glyph unicode=";" horiz-adv-x="544" d="M154 876v233h242v-233h-242zM105 -281l70 321v198h239v-207l-155 -312h-154z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1041" d="M63 458v193l837 372v-242l-578 -222l-19 -3v-6l19 -3l578 -218v-243z" />
-<glyph unicode="=" horiz-adv-x="1166" d="M145 366v201h862v-201h-862zM145 790v202h862v-202h-862z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1066" d="M128 72v239l605 226l18 2l1 6l-19 4l-605 221v239l864 -372v-193z" />
-<glyph unicode="?" horiz-adv-x="996" d="M47 1100q-3 178 119.5 277.5t316.5 99.5q210 0 327.5 -107t117.5 -297q0 -127 -73.5 -235.5t-185.5 -198.5q-57 -50 -71.5 -95t-14.5 -132h-243q1 143 33 204.5t142 154.5q78 76 124 145.5t46 153.5q0 97 -52.5 150.5t-149.5 53.5q-83 0 -141 -45.5t-58 -134.5h-234z M339 0v233h248v-233h-248z" />
-<glyph unicode="@" horiz-adv-x="1825" d="M91 478q18 424 252 685t613 261q383 0 587 -246t188 -671q-9 -216 -124 -372t-344 -156q-75 0 -129.5 42t-78.5 119q-47 -80 -116 -119.5t-161 -39.5q-133 0 -204.5 119.5t-53.5 315.5q24 256 140.5 411t282.5 155q110 0 177.5 -26t147.5 -80l-3 -4h5l-51 -579 q-8 -101 18 -139t69 -38q119 0 190.5 110.5t79.5 280.5q16 367 -140 572t-484 205q-306 0 -489.5 -221t-198.5 -585q-18 -365 147.5 -575t475.5 -210q87 0 177 20t154 53l38 -130q-67 -42 -170.5 -65.5t-202.5 -23.5q-387 0 -598 249.5t-194 681.5zM721 416 q-10 -133 20 -202t99 -69q59 0 109 24.5t89 87.5q0 8 0.5 16t1.5 20l45 515q-23 9 -49 14.5t-54 5.5q-118 0 -180 -102.5t-81 -309.5z" />
-<glyph unicode="A" horiz-adv-x="1300" d="M32 0l508 1456h231l502 -1456h-251l-111 340h-516l-112 -340h-251zM462 543h383l-187 574h-6z" />
-<glyph unicode="B" horiz-adv-x="1304" d="M153 0v1456h477q241 0 377 -99.5t136 -297.5q0 -96 -54.5 -173t-151.5 -117q140 -23 215.5 -121t75.5 -230q0 -205 -134 -311.5t-370 -106.5h-571zM396 194h328q126 0 194 57.5t68 166.5q0 110 -67 175t-188 69h-13h-322v-468zM396 843h260q113 0 178.5 53.5t65.5 151.5 q0 108 -69 160.5t-201 52.5h-234v-418z" />
-<glyph unicode="C" horiz-adv-x="1300" d="M109 589v277q0 266 156 438.5t407 172.5q256 0 404 -131q144 -128 144 -347v-12l-2 -6h-235q0 146 -79 223.5t-232 77.5q-148 0 -234.5 -117.5t-86.5 -296.5v-279q0 -181 88 -298.5t240 -117.5q149 0 226.5 78t77.5 225h234l2 -6v-12q0 -212 -143 -344 q-147 -136 -397 -135q-254 0 -412 171.5t-158 438.5z" />
-<glyph unicode="D" horiz-adv-x="1372" d="M153 0v1456h481q277 0 450.5 -173t173.5 -445v-221q0 -273 -173.5 -445t-450.5 -172h-481zM396 194h238q175 0 278 118.5t103 304.5v223q0 184 -103 302.5t-278 118.5h-238v-1067z" />
-<glyph unicode="E" horiz-adv-x="1134" d="M153 0v1456h908v-195h-665v-411h570v-195h-570v-461h672v-194h-915z" />
-<glyph unicode="F" horiz-adv-x="1134" d="M153 0v1456h932v-195h-689v-445h587v-195h-587v-621h-243z" />
-<glyph unicode="G" horiz-adv-x="1376" d="M110 576v304q0 264 161 430.5t414 166.5q254 0 396 -128q138 -124 138 -323v-11l-3 -6h-231q0 123 -76.5 198t-219.5 75q-151 0 -243.5 -113t-92.5 -287v-306q0 -176 96.5 -289.5t251.5 -113.5q117 0 185 26.5t103 64.5v301h-305v182h548v-550q-60 -85 -191.5 -151.5 t-339.5 -66.5q-258 0 -424.5 166.5t-166.5 430.5z" />
-<glyph unicode="H" horiz-adv-x="1443" d="M153 0v1456h243v-640h651v640h243v-1456h-243v621h-651v-621h-243z" />
-<glyph unicode="I" horiz-adv-x="589" d="M173 0v1456h243v-1456h-243z" />
-<glyph unicode="J" horiz-adv-x="1130" d="M59 410l2 6h235q0 -124 59.5 -183.5t165.5 -59.5q95 0 155.5 72t60.5 192v1019h242v-1019q0 -210 -127.5 -334t-330.5 -124q-215 0 -341 110q-121 106 -121 305v16z" />
-<glyph unicode="K" horiz-adv-x="1304" d="M153 0v1456h243v-617h95l473 617h285l3 -5l-546 -684l591 -767h-307l-475 630h-119v-630h-243z" />
-<glyph unicode="L" horiz-adv-x="1131" d="M153 0v1456h243v-1262h682v-194h-925z" />
-<glyph unicode="M" horiz-adv-x="1781" d="M153 0v1456h319l418 -1120h6l421 1120h310v-1456h-243v1046l-6 1l-401 -1047h-167l-408 1067l-6 -2v-1065h-243z" />
-<glyph unicode="N" horiz-adv-x="1443" d="M153 0v1456h243l645 -1049l6 2v1047h243v-1456h-243l-645 1049l-6 -2v-1047h-243z" />
-<glyph unicode="O" horiz-adv-x="1402" d="M105 597v262q0 266 163.5 442t425.5 176q267 0 435 -176t168 -442v-262q0 -267 -167.5 -442.5t-435.5 -175.5q-261 0 -425 175.5t-164 442.5zM348 597q0 -184 93 -301.5t253 -117.5q167 0 263.5 117t96.5 302v264q0 182 -97 299t-263 117q-161 0 -253.5 -117t-92.5 -299 v-264z" />
-<glyph unicode="P" horiz-adv-x="1304" d="M153 0v1456h558q241 0 377.5 -124.5t136.5 -327.5q0 -205 -136.5 -328.5t-377.5 -123.5h-315v-552h-243zM396 747h315q135 0 203 72t68 183t-68 185t-203 74h-315v-514z" />
-<glyph unicode="Q" horiz-adv-x="1434" d="M105 597v262q0 266 163.5 442t425.5 176q267 0 435 -176t168 -442v-262q0 -112 -31.5 -211t-90.5 -178l215 -214l-162 -145l-216 213q-69 -41 -149 -62t-169 -21q-261 0 -425 175.5t-164 442.5zM348 597q0 -184 93 -301.5t253 -117.5q167 0 263.5 117t96.5 302v264 q0 182 -97 299t-263 117q-161 0 -253.5 -117t-92.5 -299v-264z" />
-<glyph unicode="R" horiz-adv-x="1303" d="M153 0v1456h501q243 0 376 -110t133 -314q0 -113 -58.5 -194.5t-170.5 -130.5q123 -39 177.5 -127t54.5 -218v-121q0 -64 16 -125t53 -93v-23h-250q-40 33 -51 103t-11 140v117q0 112 -64.5 178t-175.5 66h-287v-604h-243zM396 799h245q146 0 213 56t67 171 q0 110 -66 172.5t-201 62.5h-258v-462z" />
-<glyph unicode="S" horiz-adv-x="1259" d="M101 430l2 6h234q0 -131 90.5 -197.5t220.5 -66.5q129 0 200.5 54.5t71.5 147.5q0 91 -64.5 149t-228.5 104q-235 65 -362.5 170.5t-127.5 275.5q0 176 140 290t360 114q235 -1 377 -127q137 -122 137 -299v-13l-2 -6h-234q0 115 -76.5 183t-203.5 68q-123 0 -189.5 -58 t-66.5 -150q0 -84 73 -138.5t242 -103.5q229 -64 349 -174.5t120 -282.5q0 -181 -142 -289t-373 -108q-222 0 -387 118q-160 115 -160 320v13z" />
-<glyph unicode="T" horiz-adv-x="1202" d="M34 1261v195h1136v-195h-450v-1261h-243v1261h-443z" />
-<glyph unicode="U" horiz-adv-x="1396" d="M134 497v959h243v-959q0 -155 87 -239.5t230 -84.5q148 0 238 84.5t90 239.5v959h243v-959q0 -243 -159.5 -380.5t-411.5 -137.5q-248 0 -404 137.5t-156 380.5z" />
-<glyph unicode="V" horiz-adv-x="1300" d="M15 1456h259l347 -1061l26 -106h6l25 104l348 1063h259l-520 -1456h-231z" />
-<glyph unicode="W" horiz-adv-x="1781" d="M29 1456h255l216 -1049h6l277 1049h214l279 -1050h6l214 1050h256l-346 -1456h-221l-291 1036h-6l-292 -1036h-222z" />
-<glyph unicode="X" horiz-adv-x="1300" d="M50 0l458 734l-448 722h286l304 -538l307 538h288l-448 -722l465 -734h-292l-316 547l-316 -547h-288z" />
-<glyph unicode="Y" horiz-adv-x="1300" d="M26 1456h271l351 -708l351 708h271l-505 -947v-509h-242v524z" />
-<glyph unicode="Z" horiz-adv-x="1196" d="M88 0v152l711 1109h-705v195h993v-146l-713 -1116h739v-194h-1025z" />
-<glyph unicode="[" horiz-adv-x="561" d="M132 -324v2002h408v-190h-165v-1623h165v-189h-408z" />
-<glyph unicode="\" horiz-adv-x="855" d="M21 1456h236l608 -1581h-236z" />
-<glyph unicode="]" horiz-adv-x="561" d="M12 -135h167v1623h-167v190h410v-2002h-410v189z" />
-<glyph unicode="^" horiz-adv-x="875" d="M53 729l299 727h171l298 -727h-205l-165 413l-12 54h-6l-12 -54l-162 -413h-206z" />
-<glyph unicode="_" horiz-adv-x="924" d="M3 0h917v-191h-917v191z" />
-<glyph unicode="`" horiz-adv-x="660" d="M69 1512l2 6h276l184 -266h-202z" />
-<glyph unicode="a" horiz-adv-x="1114" d="M83 305q0 157 124 244.5t349 87.5h189v95q0 85 -49.5 133t-143.5 48q-83 0 -132 -39.5t-49 -102.5l-234 -1l-1 6v14q0 120 114 213q122 99 317 99q189 0 305 -96t116 -276v-481q0 -67 9 -128.5t29 -120.5h-246q-13 41 -21.5 80t-11.5 78q-49 -76 -131 -127.5t-183 -51.5 q-169 0 -259.5 87t-90.5 239zM326 309q0 -62 40.5 -98.5t116.5 -36.5q91 0 164.5 46t97.5 105v160h-193q-106 0 -166 -52.5t-60 -123.5z" />
-<glyph unicode="b" horiz-adv-x="1160" d="M128 0v1560h243v-601q50 69 120 106t163 37q203 0 313.5 -158t110.5 -418v-21q0 -237 -110.5 -381.5t-311.5 -144.5q-102 0 -177 42t-125 122l-29 -143h-197zM371 313q31 -65 86 -100.5t138 -35.5q126 0 183 88.5t57 239.5v21q0 169 -58 273t-184 104q-81 0 -135.5 -36 t-86.5 -100v-454z" />
-<glyph unicode="c" horiz-adv-x="1065" d="M81 523v35q0 234 127 389t360 155q189 0 307 -114q114 -110 114 -277v-11l-2 -6h-220q0 89 -55 151t-144 62q-130 0 -187 -100.5t-57 -248.5v-35q0 -151 56.5 -250.5t188.5 -99.5q83 0 140.5 52t57.5 132h220l2 -6v-9q-1 -146 -121 -253q-124 -110 -299 -110 q-234 0 -361 154.5t-127 389.5z" />
-<glyph unicode="d" horiz-adv-x="1160" d="M83 505v21q0 259 111 417.5t312 158.5q88 0 157.5 -35.5t120.5 -101.5v595h243v-1560h-197l-29 137q-52 -77 -126 -117.5t-171 -40.5q-199 0 -310 145t-111 381zM326 505q0 -150 57.5 -239t182.5 -89q77 0 130.5 33t87.5 94v472q-34 60 -88 93.5t-128 33.5 q-124 0 -183 -104.5t-59 -272.5v-21z" />
-<glyph unicode="e" horiz-adv-x="1072" d="M83 516v40q-1 238 133 392q133 154 342 154h3q218 0 330 -134.5t112 -359.5v-131h-669l-2 -5q4 -133 70 -216t199 -83q99 0 171.5 24t134.5 69l79 -159q-62 -54 -164 -91t-235 -37q-237 0 -370.5 149.5t-133.5 387.5zM338 660l2 -5h423v19q0 104 -48.5 168.5t-153.5 64.5 q-95 0 -152 -68.5t-71 -178.5z" />
-<glyph unicode="f" horiz-adv-x="693" d="M42 902v180h165v126q0 179 97.5 276t273.5 97q35 0 71 -5.5t81 -15.5l-25 -188q-20 4 -44.5 7t-52.5 3q-79 0 -118.5 -45t-39.5 -129v-126h201v-180h-201v-902h-243v902h-165z" />
-<glyph unicode="g" horiz-adv-x="1160" d="M90 505v21q0 259 111 417.5t312 158.5q97 0 170.5 -41.5t124.5 -119.5l24 141h202v-1082q0 -209 -129 -323t-366 -114q-79 0 -170.5 22.5t-165.5 59.5l39 191q62 -31 138.5 -48.5t156.5 -17.5q132 0 193 56.5t61 173.5v111q-51 -65 -120.5 -98.5t-159.5 -33.5 q-199 0 -310 145t-111 381zM332 505q0 -150 58 -239t183 -89q78 0 131.5 32.5t86.5 93.5v474q-34 59 -87.5 92.5t-128.5 33.5q-125 0 -184 -104.5t-59 -272.5v-21z" />
-<glyph unicode="h" horiz-adv-x="1160" d="M125 0v1560h243v-618q54 76 131.5 118t171.5 42q172 0 268.5 -108.5t96.5 -334.5v-659h-243v661q0 127 -49.5 184.5t-147.5 57.5q-78 0 -135 -27.5t-93 -76.5v-799h-243z" />
-<glyph unicode="i" horiz-adv-x="531" d="M144 0v1082h243v-1082h-243zM144 1347v213h243v-213h-243z" />
-<glyph unicode="j" horiz-adv-x="537" d="M-80 -420l14 194q17 -5 42 -8.5t46 -3.5q62 0 97.5 42.5t35.5 132.5v1145h243v-1145q0 -179 -93 -276.5t-259 -97.5q-36 0 -65 4t-61 13zM149 1350v210h243v-210h-243z" />
-<glyph unicode="k" horiz-adv-x="1072" d="M129 0v1560h242v-892h83l293 414h285l-371 -498l412 -584h-283l-329 473h-90v-473h-242z" />
-<glyph unicode="l" horiz-adv-x="531" d="M144 0v1560h243v-1560h-243z" />
-<glyph unicode="m" horiz-adv-x="1781" d="M128 0v1082h222l13 -141q53 77 133 119t185 42q106 0 182 -48t114 -144q50 90 132 141t192 51q163 0 257.5 -113.5t94.5 -343.5v-645h-243v646q0 142 -47.5 199.5t-142.5 57.5q-78 0 -132 -42t-78 -113q0 -15 1 -26t1 -21v-701h-243v646q0 137 -48.5 197t-142.5 60 q-74 0 -125.5 -28.5t-81.5 -80.5v-794h-243z" />
-<glyph unicode="n" horiz-adv-x="1160" d="M126 0v1082h222l14 -156q53 83 133.5 129.5t181.5 46.5q169 0 263.5 -104t94.5 -325v-673h-243v671q0 126 -49 179t-148 53q-78 0 -135 -29.5t-91 -81.5v-792h-243z" />
-<glyph unicode="o" horiz-adv-x="1160" d="M83 530v21q0 242 132.5 396.5t362.5 154.5q233 0 365.5 -154.5t132.5 -396.5v-21q0 -244 -132.5 -397.5t-363.5 -153.5q-232 0 -364.5 154t-132.5 397zM326 530q0 -159 62 -258t192 -99q127 0 190.5 99.5t63.5 257.5v21q0 155 -63.5 255.5t-192.5 100.5 q-127 0 -189.5 -100.5t-62.5 -255.5v-21z" />
-<glyph unicode="p" horiz-adv-x="1160" d="M128 -416v1498h205l24 -136q52 76 125.5 116t170.5 40q200 0 311.5 -158.5t111.5 -417.5v-21q0 -236 -111 -381t-309 -145q-92 0 -163 33t-122 97v-525h-243zM371 291q32 -57 85 -87.5t131 -30.5q124 0 185.5 91.5t61.5 240.5v21q0 166 -62.5 271.5t-186.5 105.5 q-76 0 -129 -32.5t-85 -90.5v-489z" />
-<glyph unicode="q" horiz-adv-x="1160" d="M83 505v21q0 259 111 417.5t312 158.5q94 0 166 -39t123 -112l28 131h197v-1498h-243v518q-50 -61 -118 -92t-155 -31q-199 0 -310 145t-111 381zM326 505q0 -150 57.5 -241t182.5 -91q74 0 125.5 29.5t85.5 85.5v504q-34 54 -86 84.5t-123 30.5q-124 0 -183 -106.5 t-59 -274.5v-21z" />
-<glyph unicode="r" horiz-adv-x="719" d="M128 0v1082h222l16 -157q41 83 105.5 130t148.5 47q22 0 41 -3.5t35 -8.5l-29 -227l-104 4q-71 0 -118.5 -30t-73.5 -85v-752h-243z" />
-<glyph unicode="s" horiz-adv-x="1065" d="M88 335l2 6h226q4 -94 68 -137t156 -43q93 0 144.5 37t51.5 98q0 56 -47.5 92.5t-179.5 65.5q-191 39 -292 115t-101 204q0 136 115 232.5t303 96.5q194 0 312 -100q114 -95 114 -228v-11l-2 -6h-233q0 66 -52 114.5t-139 48.5q-88 0 -134 -40t-46 -98q0 -55 43 -88 t177 -59q199 -40 300 -117.5t101 -207.5q0 -146 -120.5 -238.5t-317.5 -92.5q-211 0 -333 108q-116 103 -116 235v13z" />
-<glyph unicode="t" horiz-adv-x="701" d="M32 902v180h165v263h242v-263h194v-180h-194v-598q0 -67 29 -95.5t77 -28.5q20 0 39 3.5t36 9.5l26 -178q-31 -17 -73.5 -26.5t-88.5 -9.5q-134 0 -210.5 78.5t-76.5 246.5v598h-165z" />
-<glyph unicode="u" horiz-adv-x="1160" d="M123 449v633h242v-635q0 -155 45 -212.5t140 -57.5q88 0 147.5 31.5t93.5 91.5v782h243v-1082h-209l-22 160q-50 -87 -128.5 -134t-181.5 -47q-174 0 -272 114.5t-98 355.5z" />
-<glyph unicode="v" horiz-adv-x="1038" d="M32 1082h251l221 -716l18 -88h6l19 88l215 716h251l-384 -1082h-211z" />
-<glyph unicode="w" horiz-adv-x="1530" d="M37 1082h243l162 -751h6l226 751h177l230 -761h6l158 761h243l-296 -1082h-199l-229 716h-6l-226 -716h-199z" />
-<glyph unicode="x" horiz-adv-x="1038" d="M33 0l350 547l-340 535h276l197 -371l200 371h279l-340 -535l350 -547h-276l-209 380l-209 -380h-278z" />
-<glyph unicode="y" horiz-adv-x="1038" d="M16 1082h265l206 -648l24 -108h6l237 756h266l-448 -1246q-43 -113 -121 -193t-221 -80q-30 0 -64.5 6t-66.5 14l27 188q13 -1 37 -3t36 -2q66 0 105.5 45t64.5 104l40 98z" />
-<glyph unicode="z" horiz-adv-x="1038" d="M85 0v159l546 727h-535v196h842v-154l-552 -734h578v-194h-879z" />
-<glyph unicode="{" horiz-adv-x="687" d="M56 529v178q98 0 145.5 58t47.5 164v203q0 171 82.5 290.5t277.5 174.5l48 -140q-98 -33 -138.5 -117t-40.5 -208v-203q0 -104 -43 -184.5t-130 -125.5q87 -47 130 -127.5t43 -182.5v-203q0 -124 40.5 -208t138.5 -117l-48 -141q-195 55 -277.5 175t-82.5 291v203 q0 104 -47.5 162t-145.5 58z" />
-<glyph unicode="|" horiz-adv-x="514" d="M144 -270v1726h214v-1726h-214z" />
-<glyph unicode="}" horiz-adv-x="687" d="M27 -219q97 33 138.5 117t41.5 208v203q0 105 44.5 185t137.5 124q-93 43 -137.5 123.5t-44.5 187.5v203q0 124 -41.5 208t-138.5 117l48 140q194 -55 277 -174.5t83 -290.5v-203q0 -106 47 -164t147 -58v-178q-100 0 -147 -58t-47 -162v-203q0 -171 -83 -291t-277 -175z " />
-<glyph unicode="~" horiz-adv-x="1361" d="M117 460q0 150 86 252.5t221 102.5q86 0 161.5 -33.5t155.5 -101.5q54 -48 97 -69t90 -21q59 0 102 54.5t43 128.5l171 -23q0 -151 -88 -257t-221 -106q-87 0 -159.5 32.5t-155.5 103.5q-55 46 -99 68t-90 22q-60 0 -102 -51.5t-42 -123.5z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1149" d="M81 523v35q0 212 105 361t301 177v222h200v-230q140 -34 224 -140t84 -254h-228q0 89 -55 151t-144 62q-130 0 -187 -100.5t-57 -248.5v-35q0 -151 56.5 -250.5t188.5 -99.5q83 0 140.5 52t57.5 132h221l2 -5q3 -125 -83 -224.5t-220 -133.5v-239h-200v230 q-196 27 -301 176t-105 362z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1205" d="M81 599v196h155l-9 238q0 207 116 325.5t311 118.5q207 0 321 -108.5t110 -286.5l-2 -6h-235q0 105 -54.5 155.5t-139.5 50.5q-86 0 -135 -65.5t-49 -183.5l9 -238h389v-196h-381l5 -113q0 -82 -22.5 -158t-64.5 -134h726l-1 -194h-986v194h10q47 13 70.5 101.5 t23.5 182.5l-5 121h-162z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1248" d="M26 1456h272l322 -640l323 640h271l-397 -714h276v-147h-355v-143h355v-146h-355v-306h-243v306h-357v146h357v143h-357v147h287z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1604" d="M87 729q0 315 207 531t503 216q295 0 502 -216t207 -531q0 -316 -207.5 -533t-501.5 -217q-296 0 -503 217t-207 533zM209 729q0 -264 171.5 -444.5t416.5 -180.5q244 0 415.5 180.5t171.5 444.5q0 263 -171.5 442.5t-415.5 179.5q-246 0 -417 -179.5t-171 -442.5z M434 669v119q0 173 94.5 280t254.5 107q157 0 245.5 -79.5t84.5 -228.5l-2 -6h-148q0 94 -45 136.5t-135 42.5q-94 0 -144.5 -69t-50.5 -182v-120q0 -115 50.5 -183.5t144.5 -68.5q90 0 134.5 41.5t44.5 137.5h148l2 -6q4 -151 -84 -229.5t-245 -78.5q-160 0 -254.5 106 t-94.5 281z" />
-<glyph unicode="&#xad;" horiz-adv-x="910" d="M158 521v196h590v-196h-590z" />
-<glyph unicode="&#xae;" horiz-adv-x="1604" d="M87 729q0 315 207 531t503 216q295 0 502 -216t207 -531q0 -316 -207.5 -533t-501.5 -217q-296 0 -503 217t-207 533zM209 729q0 -264 171.5 -444.5t416.5 -180.5q244 0 415.5 180.5t171.5 444.5q0 263 -171.5 442.5t-415.5 179.5q-246 0 -417 -179.5t-171 -442.5z M502 316v850h281q151 0 238 -66.5t87 -193.5q0 -59 -30.5 -104t-89.5 -76q62 -28 89.5 -82t27.5 -129v-56q0 -41 3.5 -73.5t13.5 -53.5v-16h-155q-9 21 -11 61.5t-2 82.5v54q0 71 -33.5 105t-109.5 34h-158v-337h-151zM653 787h143q68 0 115 30.5t47 85.5q0 72 -39 101 t-136 29h-130v-246z" />
-<glyph unicode="&#xb4;" horiz-adv-x="689" d="M124 1252l191 266h275l2 -6l-273 -260h-195z" />
-<glyph unicode="&#x2000;" horiz-adv-x="845" />
-<glyph unicode="&#x2001;" horiz-adv-x="1691" />
-<glyph unicode="&#x2002;" horiz-adv-x="845" />
-<glyph unicode="&#x2003;" horiz-adv-x="1691" />
-<glyph unicode="&#x2004;" horiz-adv-x="563" />
-<glyph unicode="&#x2005;" horiz-adv-x="422" />
-<glyph unicode="&#x2006;" horiz-adv-x="281" />
-<glyph unicode="&#x2007;" horiz-adv-x="281" />
-<glyph unicode="&#x2008;" horiz-adv-x="211" />
-<glyph unicode="&#x2009;" horiz-adv-x="338" />
-<glyph unicode="&#x200a;" horiz-adv-x="93" />
-<glyph unicode="&#x2010;" horiz-adv-x="910" d="M158 521v196h590v-196h-590z" />
-<glyph unicode="&#x2011;" horiz-adv-x="910" d="M158 521v196h590v-196h-590z" />
-<glyph unicode="&#x2012;" horiz-adv-x="910" d="M158 521v196h590v-196h-590z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1415" d="M166.398 621v196h1085.49v-196h-1085.49z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1665" d="M171.796 621v196h1335.98v-196h-1335.98z" />
-<glyph unicode="&#x2018;" horiz-adv-x="541" d="M144 912v223l102 321h119v-544h-221z" />
-<glyph unicode="&#x2019;" horiz-adv-x="536" d="M160 912v544h221v-229l-102 -315h-119z" />
-<glyph unicode="&#x201c;" horiz-adv-x="831" d="M122 912v223l102 321h119v-544h-221zM450 912v223l102 321h119v-544h-221z" />
-<glyph unicode="&#x201d;" horiz-adv-x="821" d="M125 912v544h221v-229l-102 -315h-119zM461 912v544h221v-229l-102 -315h-119z" />
-<glyph unicode="&#x2022;" horiz-adv-x="715" d="M136 724v77q0 94 60 154.5t161 60.5q102 0 162.5 -60t60.5 -155v-77q0 -96 -60 -154.5t-162 -58.5q-101 0 -161.5 59t-60.5 154z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1446" d="M153 0v233h242v-233h-242zM596 0v233h242v-233h-242zM1016 0v233h242v-233h-242z" />
-<glyph unicode="&#x202f;" horiz-adv-x="338" />
-<glyph unicode="&#x205f;" horiz-adv-x="422" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1101" d="M75 496v142h146v156h-146v142h146v12q0 241 145.5 385t382.5 144q60 0 118 -8t125 -23l-20 -199q-54 16 -110.5 25.5t-112.5 9.5q-132 0 -208.5 -89.5t-76.5 -242.5v-14h460v-142h-460v-156h460v-142h-460v-2q0 -151 77 -236t210 -85q57 0 113 8.5t108 25.5l20 -197 q-56 -15 -117.5 -23t-123.5 -8q-237 0 -383.5 139.5t-146.5 375.5v2h-146z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1289" d="M100 1361v95h391v-95h-138v-443h-117v443h-136zM565 916v540h137l141 -373h6l142 373h131v-540h-110v317l-6 1l-129 -318h-61l-134 330l-6 -1v-329h-111z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1155" d="M158 621v196h835v-196h-835z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-Medium-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-Medium-webfont.ttf
deleted file mode 100644
index 71ba85ddd911afe478163027dbb5c20a5effbd44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26072
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
Cp_+UE

diff --git a/app/webroot/css/fonts/roboto/Roboto-Medium-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-Medium-webfont.woff
deleted file mode 100644
index f2cce18d96552d617d34550c356176d50eb975c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15192
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
PA6QPQVqaom%=&)-t0g&J

diff --git a/app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.eot
deleted file mode 100644
index fd8482ec25ac6f092683c9b5add645ff445fd22f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31048
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
F{{dPYI%NO=

diff --git a/app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.svg
deleted file mode 100644
index 5ec4d4bf1..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoMediumItalic" horiz-adv-x="1164" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="510" />
-<glyph unicode=" "  horiz-adv-x="510" />
-<glyph unicode="&#x09;" horiz-adv-x="510" />
-<glyph unicode="&#xa0;" horiz-adv-x="510" />
-<glyph unicode="!" horiz-adv-x="549" d="M74 0l35 234h243l-35 -234h-243zM148 491l144 965h243l-144 -965h-243z" />
-<glyph unicode="&#x22;" horiz-adv-x="781" d="M188 932l34 237l40 287h214l-39 -275l-137 -249h-112zM513 932l35 245l39 279h214l-39 -275l-137 -249h-112z" />
-<glyph unicode="#" horiz-adv-x="1250" d="M42 410l23 158h261l105 313h-243l24 159h273l140 416h167l-140 -416h224l140 416h168l-140 -416h208l-24 -159h-238l-105 -313h221l-23 -158h-251l-138 -410h-167l137 410h-224l-138 -410h-167l138 410h-231zM493 568h224l105 313h-224z" />
-<glyph unicode="$" horiz-adv-x="1205" d="M102 436h242q-20 -145 41 -201t170 -56t180 54.5t84 146.5q12 89 -34.5 142.5t-176.5 100.5q-203 68 -294.5 170.5t-66.5 279.5q24 174 139.5 277.5t294.5 122.5l31 218h159l-31 -220q165 -25 248 -141.5t58 -304.5h-242q16 121 -30 186t-148 65t-163 -55t-73 -146 q-13 -89 32 -139.5t182 -103.5q203 -68 293 -170.5t65 -279.5q-25 -181 -143.5 -281.5t-307.5 -117.5l-27 -194h-159l27 194q-173 19 -276.5 129.5t-73.5 323.5z" />
-<glyph unicode="%" horiz-adv-x="1504" d="M185 1099l11 77q19 133 114.5 217t239.5 84q138 0 210 -87t53 -214l-11 -77q-21 -133 -115 -216t-237 -83q-138 0 -211.5 86.5t-53.5 212.5zM282 181l882 1138l114 -72l-882 -1138zM354 1099q-11 -66 19 -109.5t99 -43.5q63 0 106.5 44.5t53.5 108.5l11 77q10 67 -19 111 t-96 44q-64 0 -108.5 -45.5t-54.5 -109.5zM762 279l12 78q19 132 114 216t239 84q138 0 210 -87t54 -213l-12 -78q-21 -133 -114.5 -216.5t-237.5 -83.5q-138 0 -211.5 87t-53.5 213zM931 279q-11 -66 20.5 -110t97.5 -44q67 0 109 44t52 110l12 78q9 67 -20.5 110.5 t-96.5 43.5q-64 0 -108.5 -45.5t-53.5 -108.5z" />
-<glyph unicode="&#x26;" horiz-adv-x="1309" d="M41 393q18 126 97 211t231 179q-58 94 -82.5 170t-11.5 156q27 183 142.5 275.5t294.5 92.5q152 0 240 -96.5t69 -229.5q-17 -105 -74.5 -176.5t-163.5 -143.5l-115 -75l247 -357q50 63 83.5 137.5t46.5 157.5h204q-22 -144 -76 -258.5t-143 -203.5l162 -232h-281l-67 95 q-90 -57 -188 -86.5t-202 -29.5q-209 0 -325 116.5t-88 297.5zM285 401q-16 -103 37.5 -165.5t167.5 -62.5q60 0 123.5 18.5t125.5 54.5l-267 382l-29 -19q-84 -56 -117.5 -108.5t-40.5 -99.5zM504 1112q-8 -49 8.5 -98.5t54.5 -110.5l120 73q63 37 88 77t33 90 q8 56 -26.5 97.5t-103.5 41.5q-67 0 -115.5 -50t-58.5 -120z" />
-<glyph unicode="'" horiz-adv-x="444" d="M163 924l38 267l37 265h229l-35 -249l-142 -283h-127z" />
-<glyph unicode="(" horiz-adv-x="695" d="M134 576l2 16q57 411 248.5 678t390.5 354l6 -1l26 -134q-148 -102 -275.5 -327t-174.5 -568l-3 -20q-50 -358 13 -574t186 -328l-64 -128h-6q-170 86 -287.5 362t-61.5 670z" />
-<glyph unicode=")" horiz-adv-x="700" d="M-104 -328q147 102 274.5 330t176.5 572l3 20q49 354 -16.5 574t-182.5 327l65 129h6q170 -84 290 -364t67 -668l-2 -16q-58 -406 -253 -675t-394 -357l-6 1z" />
-<glyph unicode="*" horiz-adv-x="872" d="M103 751l75 164l226 -83l32 249h169l-40 -257l243 83l26 -167l-249 -73l116 -200l-153 -102l-113 211l-170 -203l-124 99l183 206z" />
-<glyph unicode="+" horiz-adv-x="1141" d="M75 579l33 222h382l61 405h236l-61 -405h380l-33 -222h-380l-65 -433h-236l65 433h-382z" />
-<glyph unicode="," horiz-adv-x="462" d="M-68 -281l118 321l30 198h239l-31 -207l-202 -312h-154z" />
-<glyph unicode="-" horiz-adv-x="910" d="M156 521l30 196h590l-30 -196h-590z" />
-<glyph unicode="." horiz-adv-x="572" d="M73 0l35 233h242l-35 -233h-242z" />
-<glyph unicode="/" horiz-adv-x="839" d="M-97 -125l810 1581h223l-810 -1581h-223z" />
-<glyph unicode="0" d="M102 521l62 413q38 260 188.5 401.5t370.5 141.5q209 0 321 -147.5t75 -395.5l-62 -413q-39 -262 -188.5 -402t-368.5 -140q-209 0 -322.5 146.5t-75.5 395.5zM340 486q-24 -153 26 -233t163 -80q107 0 182.5 83t97.5 230l73 485q22 152 -27 231.5t-162 79.5 q-108 0 -183.5 -83.5t-96.5 -227.5z" />
-<glyph unicode="1" d="M304 1232l29 193l560 52l-222 -1477h-243l185 1232h-309z" />
-<glyph unicode="2" d="M59 0l23 167l529 526q129 131 184 216t66 163q13 96 -30.5 153t-141.5 57q-108 0 -181 -74t-87 -183h-234l-2 6q22 194 167 320t365 126q201 0 306.5 -113t80.5 -293q-19 -128 -96 -230.5t-258 -289.5l-356 -351l2 -6h629l-27 -194h-939z" />
-<glyph unicode="3" d="M85 384l2 6h235q-15 -95 42.5 -156t165.5 -61q106 0 182.5 66.5t92.5 167.5q19 129 -31.5 187.5t-175.5 58.5h-162l7 50l13 83l1 7l8 51h162q114 0 176.5 60t78.5 164q14 98 -32.5 156t-153.5 58q-94 0 -170 -59t-88 -146h-233l-1 6q20 173 168.5 283.5t353.5 110.5 q206 0 316.5 -105.5t81.5 -303.5q-16 -105 -82.5 -187.5t-171.5 -128.5q103 -45 149.5 -133t28.5 -211q-32 -209 -181.5 -319t-365.5 -110q-186 0 -317.5 109.5t-98.5 295.5z" />
-<glyph unicode="4" d="M39 323l17 149l755 984h249l-140 -937h184l-30 -196h-184l-48 -323h-242l48 323h-609zM304 524l3 -5h371l89 592l-6 2l-31 -55z" />
-<glyph unicode="5" d="M112 378l3 5l230 7q-16 -106 36.5 -161.5t152.5 -55.5q110 0 182.5 78t92.5 212q20 135 -28.5 212.5t-162.5 77.5q-96 0 -152 -33t-86 -93l-205 17l205 812h768l-31 -210h-566l-100 -371q49 31 111 52t134 22q203 2 297 -126.5t60 -357.5q-34 -223 -172 -354.5 t-376 -131.5q-185 0 -305.5 104.5t-87.5 294.5z" />
-<glyph unicode="6" d="M121 558l47 317q42 278 218.5 440t409.5 162q82 0 160.5 -16.5t136.5 -43.5l-76 -188q-57 24 -114 37.5t-136 13.5q-128 0 -228.5 -108t-125.5 -282l-11 -71q68 57 154 88.5t184 31.5q180 0 271 -130.5t61 -336.5q-35 -230 -182 -361.5t-362 -131.5q-207 0 -327.5 156 t-79.5 423zM361 545q-28 -181 28 -276.5t168 -95.5q103 0 178 85t95 214q20 133 -31.5 205.5t-165.5 72.5q-84 0 -151 -32.5t-109 -88.5z" />
-<glyph unicode="7" d="M194 1261l29 195h993l-29 -195q-309 -310 -437.5 -549t-173.5 -541l-26 -171h-243l26 171q49 328 200 574.5t418 515.5h-757z" />
-<glyph unicode="8" d="M74 404q18 126 105.5 217.5t221.5 136.5q-99 46 -148.5 130t-32.5 192q30 200 169.5 298.5t346.5 98.5q186 0 296 -103.5t82 -293.5q-18 -115 -89.5 -199.5t-178.5 -127.5q111 -48 169.5 -139.5t41.5 -209.5q-32 -211 -181.5 -318t-362.5 -107q-214 0 -342 112t-97 313z M318 413q-17 -113 45.5 -176.5t178.5 -63.5q98 0 177.5 66t96.5 174q16 111 -42 177.5t-161 66.5q-108 0 -193.5 -69t-101.5 -175zM462 1071q-16 -102 35 -160.5t147 -58.5q81 0 146 61t80 158q14 98 -32 154.5t-132 56.5q-92 0 -161 -57t-83 -154z" />
-<glyph unicode="9" d="M133 42l67 185q61 -29 121 -41.5t140 -12.5q121 0 215.5 89.5t118.5 249.5l15 99q-58 -65 -132 -97t-155 -32q-199 0 -301 132.5t-67 359.5q34 228 185.5 365.5t352.5 137.5q211 0 328.5 -144t79.5 -399l-62 -413q-40 -263 -206.5 -402.5t-400.5 -139.5q-74 0 -154 16 t-145 47zM397 974q-22 -142 23.5 -222.5t154.5 -80.5q84 0 152.5 37.5t111.5 97.5l25 170q23 153 -29.5 229.5t-167.5 76.5q-94 0 -172 -88t-98 -220z" />
-<glyph unicode=":" horiz-adv-x="549" d="M73 0l35 233h242l-35 -233h-242zM204 876l35 233h242l-35 -233h-242z" />
-<glyph unicode=";" horiz-adv-x="544" d="M205 876l35 233h242l-35 -233h-242zM-17 -281l118 321l30 198h239l-31 -207l-202 -312h-154z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1041" d="M52 458l9 61l11 71l9 61l892 372l-36 -242l-611 -222l-20 -3v-6l18 -3l545 -218l-36 -243z" />
-<glyph unicode="=" horiz-adv-x="1166" d="M120 366l30 201h862l-30 -201h-862zM184 790l30 202h862l-30 -202h-862z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1066" d="M59 72l36 239l639 226l19 3v6l-18 3l-571 221l35 239l809 -372l-20 -132l-9 -61z" />
-<glyph unicode="?" horiz-adv-x="996" d="M132 1100q24 178 161.5 277.5t331.5 99.5q202 0 307 -108.5t77 -295.5q-20 -132 -107.5 -237t-216.5 -197q-64 -49 -85.5 -94.5t-34.5 -132.5h-243q23 143 64 204.5t165 154.5q90 77 146 146t69 153q14 100 -30 152t-142 52q-81 0 -147 -45.5t-79 -134.5h-234zM259 0 l35 233h248l-35 -233h-248z" />
-<glyph unicode="@" horiz-adv-x="1825" d="M83 478q82 424 354.5 685t652.5 261q368 0 542 -248.5t95 -668.5q-41 -215 -179.5 -371.5t-367.5 -156.5q-71 0 -120 42.5t-63 119.5q-59 -81 -134.5 -120.5t-167.5 -39.5q-127 0 -183.5 120.5t-9.5 314.5q63 256 202.5 411t305.5 155q106 0 173 -27t136 -79l-4 -4h6 l-138 -579q-23 -101 -3 -139t63 -38q114 0 205 112t124 279q72 367 -53.5 572t-453.5 205q-294 0 -517.5 -223.5t-291.5 -582.5q-73 -365 61 -575t444 -210q83 0 178.5 20.5t163.5 52.5l18 -130q-73 -42 -180 -65.5t-206 -23.5q-372 0 -552.5 252t-99.5 679zM693 214 q20 -69 89 -69q58 0 111.5 24.5t103.5 88.5q1 10 2.5 18t4.5 17l123 515q-23 9 -48 14.5t-53 5.5q-114 0 -193.5 -104t-129.5 -308q-30 -133 -10 -202z" />
-<glyph unicode="A" horiz-adv-x="1300" d="M-48 0l726 1456h231l284 -1456h-251l-60 340h-516l-163 -340h-251zM464 543h382l-100 572l-6 1z" />
-<glyph unicode="B" horiz-adv-x="1304" d="M73 0l218 1456h477q232 0 358 -100q102 -82 101 -227q0 -33 -5 -70q-15 -100 -80 -175.5t-167 -114.5q135 -24 195 -122q46 -74 46 -168q0 -30 -5 -61q-33 -213 -180 -315.5t-387 -102.5h-571zM345 194h328q121 0 200 58t96 166q4 25 4 48q0 80 -45 129q-57 63 -179 67 h-12h-322zM442 843h260q109 0 184.5 54t90.5 151q3 24 3 44q0 78 -47 118q-60 50 -194 51h-234z" />
-<glyph unicode="C" horiz-adv-x="1300" d="M117 589l42 277q41 277 221 444t434 167q248 -1 380 -133q103 -103 103 -261q0 -46 -9 -96l-3 -6h-235q6 39 6 72q0 98 -50 154q-67 75 -222 75q-142 0 -249.5 -119t-133.5 -295l-42 -279q-8 -53 -8 -101q1 -120 51 -201q70 -114 223 -114q143 0 235 79t114 224h233l2 -6 q-30 -228 -195 -359.5t-418 -131.5q-244 0 -382 173q-107 134 -106 323q0 55 9 114z" />
-<glyph unicode="D" horiz-adv-x="1372" d="M73 0l218 1456h481q266 0 419 -174q121 -138 121 -337q0 -52 -8 -107l-33 -221q-43 -283 -239.5 -450t-477.5 -167h-481zM345 194h238q168 0 292 120t153 303l33 223q7 48 7 90q0 129 -64 216q-84 115 -261 115h-238z" />
-<glyph unicode="E" horiz-adv-x="1134" d="M73 0l218 1456h908l-29 -195h-666l-61 -411h571l-30 -195h-570l-69 -461h672l-29 -194h-915z" />
-<glyph unicode="F" horiz-adv-x="1134" d="M73 0l218 1456h932l-29 -195h-690l-66 -445h587l-29 -195h-587l-93 -621h-243z" />
-<glyph unicode="G" horiz-adv-x="1376" d="M116 576l46 304q41 274 225 435.5t440 161.5q245 0 372 -129q99 -101 99 -247q0 -41 -8 -86l-2 -6h-232q4 29 4 55q0 89 -50 145q-64 73 -209 73t-257.5 -114t-138.5 -286l-46 -306q-7 -46 -7 -88q0 -123 60 -205q79 -110 235 -110q111 0 187 27t115 64l45 301h-305 l27 182h548l-82 -550q-73 -85 -214.5 -151.5t-349.5 -66.5q-249 0 -396 168q-115 132 -115 321q0 52 9 108z" />
-<glyph unicode="H" horiz-adv-x="1443" d="M73 0l218 1456h243l-96 -640h651l96 640h243l-218 -1456h-243l93 621h-651l-93 -621h-243z" />
-<glyph unicode="I" horiz-adv-x="589" d="M93 0l218 1456h243l-218 -1456h-243z" />
-<glyph unicode="J" horiz-adv-x="1130" d="M40 411l2 5h236q-5 -35 -5 -65q0 -79 36 -121q50 -57 158 -57q91 0 164 72.5t92 191.5l152 1019h242l-152 -1019q-33 -218 -177.5 -338t-349.5 -120q-207 0 -320 111q-87 85 -87 226q0 45 9 95z" />
-<glyph unicode="K" horiz-adv-x="1240" d="M62 0l218 1456h243l-92 -612h115l480 612h306l2 -5l-611 -726l418 -725h-278l-352 628h-112l-94 -628h-243z" />
-<glyph unicode="L" horiz-adv-x="1131" d="M73 0l218 1456h243l-189 -1262h682l-29 -194h-925z" />
-<glyph unicode="M" horiz-adv-x="1781" d="M73 0l218 1456h319l250 -1120h6l589 1120h310l-218 -1456h-243l156 1045l-5 1l-558 -1046h-167l-248 1066h-6l-160 -1066h-243z" />
-<glyph unicode="N" horiz-adv-x="1443" d="M73 0l218 1456h243l488 -1049l6 1l157 1048h243l-218 -1456h-243l-489 1049l-6 -1l-156 -1048h-243z" />
-<glyph unicode="O" horiz-adv-x="1402" d="M115 597l39 262q41 276 229 447t453 171q256 0 402 -178q116 -141 116 -334q0 -51 -8 -106l-39 -262q-43 -278 -234 -448t-462 -170q-251 0 -393 177q-111 138 -112 329q0 54 9 112zM358 597q-8 -53 -8 -101q0 -122 54 -204q75 -114 237 -114q161 0 278 118.5t145 300.5 l39 264q7 50 7 94q0 125 -58 209q-78 114 -246 113q-155 0 -268.5 -118t-140.5 -298z" />
-<glyph unicode="P" horiz-adv-x="1304" d="M73 0l218 1456h558q233 0 355 -126q98 -101 98 -250q0 -36 -6 -76q-32 -212 -185 -332t-397 -120h-316l-82 -552h-243zM428 747h315q129 0 210.5 73t98.5 182q4 27 4 51q0 81 -44 136q-56 72 -192 72h-315z" />
-<glyph unicode="Q" horiz-adv-x="1434" d="M115 597l39 262q41 276 229 447t453 171q256 0 402 -178q116 -141 116 -334q0 -51 -8 -106l-39 -262q-18 -116 -63.5 -215.5t-114.5 -176.5l180 -211l-184 -145l-182 210q-74 -40 -158 -60t-174 -20q-251 0 -393 177q-112 138 -112 329q0 54 9 112zM358 597 q-8 -53 -8 -101q0 -122 54 -204q75 -114 237 -114q161 0 278 118.5t145 300.5l39 264q7 50 7 94q0 125 -58 209q-78 113 -246 113q-155 0 -268.5 -118t-140.5 -298z" />
-<glyph unicode="R" horiz-adv-x="1303" d="M73 0l218 1456h501q234 0 355 -112q97 -89 97 -236q0 -36 -6 -76q-18 -117 -88 -197.5t-191 -129.5q115 -41 157 -129q30 -62 29 -142q0 -34 -5 -72l-18 -121q-6 -38 -6 -75q0 -26 3 -50q7 -60 39 -93l-3 -23h-250q-34 32 -35 100v13q0 62 9 130l18 117q4 28 4 53 q-1 79 -41 127q-54 64 -166 64h-288l-90 -604h-243zM435 799h246q140 0 218.5 57t95.5 170q4 25 4 48q0 78 -44 126q-56 60 -192 61h-258z" />
-<glyph unicode="S" horiz-adv-x="1251" d="M103 425l2 6h233q-4 -25 -4 -48q0 -103 78 -151q96 -58 238 -59q102 0 180 48.5t90 123.5q3 20 3 38q-1 77 -51 125q-62 60 -237 117q-239 76 -351 185q-89 87 -89 224q0 36 6 75q26 173 172 270.5t357 97.5q240 0 374 -119q106 -94 106 -243q0 -40 -8 -84l-2 -6h-234 q3 20 3 39q0 87 -60 146q-73 72 -209 72q-100 0 -172.5 -49t-82.5 -122q-4 -23 -4 -44q0 -73 47 -115q60 -54 255 -121q235 -76 341 -184q84 -85 84 -223q0 -36 -6 -77q-27 -181 -174 -274.5t-367 -93.5q-236 1 -397 109q-129 87 -129 251q0 40 8 86z" />
-<glyph unicode="T" horiz-adv-x="1202" d="M143 1261l29 195h1136l-29 -195h-450l-189 -1261h-243l189 1261h-443z" />
-<glyph unicode="U" horiz-adv-x="1396" d="M129 497l143 959h243l-143 -959q-6 -41 -7 -76q0 -105 56 -167q74 -82 219 -81q142 0 247.5 85t129.5 239l143 959h243l-143 -959q-39 -253 -216 -385.5t-433 -132.5q-239 1 -379 139q-111 110 -111 283q0 46 8 96z" />
-<glyph unicode="V" horiz-adv-x="1300" d="M153 1456h259l188 -1061l10 -105l6 -1l41 104l507 1063h259l-738 -1456h-231z" />
-<glyph unicode="W" horiz-adv-x="1781" d="M167 1456h255l58 -1050l6 -1l435 1051h214l121 -1051h6l372 1051h256l-564 -1456h-221l-135 1036l-5 1l-449 -1037h-222z" />
-<glyph unicode="X" horiz-adv-x="1300" d="M-30 0l568 734l-340 722h286l224 -538l387 538h288l-556 -722l355 -734h-292l-234 547l-398 -547h-288z" />
-<glyph unicode="Y" horiz-adv-x="1300" d="M164 1456h271l246 -708l456 708h271l-647 -947l-76 -509h-242l78 523z" />
-<glyph unicode="Z" horiz-adv-x="1150" d="M29 152l776 1109h-619l29 195h918l-21 -146l-781 -1116h700l-29 -194h-969z" />
-<glyph unicode="[" horiz-adv-x="561" d="M12 -324l280 2002h408l-27 -190h-165l-227 -1623h165l-26 -189h-408z" />
-<glyph unicode="\" horiz-adv-x="855" d="M159 1456h236l371 -1581h-236z" />
-<glyph unicode="]" horiz-adv-x="561" d="M-108 -324l26 189h167l227 1623h-167l27 190h410l-280 -2002h-410z" />
-<glyph unicode="^" horiz-adv-x="875" d="M82 729l408 727h171l189 -727h-205l-103 413l-4 53l-6 1l-20 -54l-224 -413h-206z" />
-<glyph unicode="_" horiz-adv-x="924" d="M-106 -191l29 191h917l-29 -191h-917z" />
-<glyph unicode="`" horiz-adv-x="660" d="M206 1513l2 5h277l146 -266h-202z" />
-<glyph unicode="a" horiz-adv-x="1114" d="M49 305q24 163 159.5 247.5t363.5 84.5h189l14 95q3 21 3 39q0 59 -32 95q-42 46 -137 47q-80 0 -137 -40t-65 -102l-233 -1l-2 6q13 133 148 229.5t332 96.5q184 0 288 -97q84 -78 83 -207q0 -32 -5 -68l-73 -481q-10 -70 -10 -130t11 -119h-246q-8 38 -10 78 q-1 18 -1 37q0 22 2 43q-61 -76 -150.5 -127.5t-190.5 -51.5q-164 0 -244 88q-63 68 -62 174q0 31 5 64zM292 309q-2 -14 -2 -27q0 -44 27 -72q35 -36 112 -36q88 0 170 47t115 106l24 158h-193q-102 0 -172 -53t-81 -123z" />
-<glyph unicode="b" horiz-adv-x="1160" d="M48 0l234 1560h243l-91 -601q60 69 136 106t169 37q195 0 285 -160q64 -112 64 -273q0 -67 -11 -143l-3 -21q-38 -246 -168 -386t-333 -140q-99 0 -168 43.5t-108 126.5l-52 -149h-197zM338 314q22 -66 71.5 -101.5t132.5 -35.5q121 0 193.5 89.5t95.5 238.5l3 21 q9 65 9 120q0 92 -26 156q-42 101 -169 101q-78 0 -139 -37t-104 -102z" />
-<glyph unicode="c" horiz-adv-x="1065" d="M79 523l6 35q36 243 184.5 393.5t383.5 150.5q183 0 287 -115q81 -89 81 -214q0 -36 -7 -74l-2 -5h-221q3 21 3 40q0 66 -35 113q-45 60 -135 60q-124 0 -199.5 -102t-96.5 -247l-6 -35q-8 -56 -9 -104q-1 -87 27 -149q42 -96 175 -97q80 0 147 52.5t79 131.5h219l2 -6 q-20 -158 -159.5 -265t-316.5 -107q-226 0 -334 156q-82 118 -82 279q0 52 9 109z" />
-<glyph unicode="d" horiz-adv-x="1160" d="M79 505l3 21q40 268 173 422t336 154q86 0 150 -37.5t106 -106.5l91 602h243l-234 -1560h-197l-8 137q-64 -77 -144 -117.5t-177 -40.5q-191 1 -284 147q-68 106 -68 258q0 57 10 121zM322 505q-8 -54 -9 -100q-1 -85 29 -141q44 -86 171 -87q74 0 133 33.5t103 95.5 l71 470q-25 60 -74 93.5t-123 33.5q-119 0 -196.5 -106t-101.5 -271z" />
-<glyph unicode="e" horiz-adv-x="1072" d="M80 516l6 40q37 247 192 397q154 149 365 149h3q209 0 305 -136q71 -101 72 -250q0 -51 -9 -108l-19 -131h-677q-3 -27 -3 -52q0 -105 44 -171q54 -82 188 -81q95 0 174 24.5t146 68.5l55 -159q-70 -54 -177.5 -91t-240.5 -37q-228 0 -344 151q-89 115 -89 279 q0 51 9 107zM358 661l2 -6h421l3 19q5 31 5 59q0 67 -28 111q-39 62 -144 63q-90 0 -159 -69t-100 -177z" />
-<glyph unicode="f" horiz-adv-x="693" d="M97 902l27 180h165l19 126q27 186 138 279.5t289 93.5q33 0 70 -6t79 -15l-53 -188q-19 4 -43.5 7t-52.5 3q-76 0 -124 -45.5t-60 -128.5l-19 -126h201l-27 -180h-201l-135 -902h-243l135 902h-165z" />
-<glyph unicode="g" horiz-adv-x="1160" d="M70 -355l67 191q57 -31 131.5 -48.5t154.5 -17.5q127 0 198.5 57.5t89.5 172.5l16 111q-60 -65 -134.5 -98.5t-164.5 -33.5q-191 0 -284 147q-68 106 -68 258q0 57 10 121l3 21q40 268 173 422t336 154q94 0 161.5 -43.5t108.5 -123.5l46 147h202l-162 -1082 q-33 -217 -177 -327t-384 -110q-77 0 -166.5 22.5t-156.5 59.5zM328 505q-8 -54 -8 -100q0 -85 29 -141q45 -87 171 -87q75 0 134 33.5t103 95.5l71 470q-24 60 -73 93.5t-125 33.5q-120 0 -197.5 -106t-101.5 -271z" />
-<glyph unicode="h" horiz-adv-x="1160" d="M45 0l234 1560h243l-92 -612q65 74 148 114t178 40q166 0 249 -110q59 -78 60 -215q0 -54 -10 -118l-99 -659h-243l99 661q7 44 7 79q1 71 -27 108q-40 55 -141 55q-76 0 -138 -29t-106 -80l-119 -794h-243z" />
-<glyph unicode="i" horiz-adv-x="531" d="M64 0l162 1082h243l-162 -1082h-243zM266 1347l32 213h243l-32 -213h-243z" />
-<glyph unicode="j" horiz-adv-x="537" d="M-223 -420l43 194q17 -5 41.5 -8.5t44.5 -3.5q61 0 103.5 42.5t56.5 132.5l171 1145h243l-171 -1145q-28 -186 -134.5 -280t-274.5 -94q-34 0 -63 4t-60 13zM272 1350l31 210h243l-31 -210h-243z" />
-<glyph unicode="k" horiz-adv-x="1072" d="M49 0l234 1560h242l-134 -892h83l355 414h278l2 -5l-440 -493l324 -584h-283l-258 473h-90l-71 -473h-242z" />
-<glyph unicode="l" horiz-adv-x="531" d="M64 0l234 1560h243l-234 -1560h-243z" />
-<glyph unicode="m" horiz-adv-x="1781" d="M48 0l162 1082h222l-8 -136q64 75 150 115.5t192 40.5q101 0 170.5 -47.5t95.5 -142.5q63 89 153 139.5t201 50.5q158 0 238 -114q56 -80 56 -217q0 -58 -10 -126l-97 -645h-243l97 646q7 52 7 93q0 73 -24 109q-38 54 -135 55q-76 0 -136.5 -43.5t-96.5 -115.5l-5 -43 l-105 -701h-243l97 646q7 49 7 88q1 74 -25 112q-40 58 -135 57q-72 0 -128.5 -30.5t-95.5 -84.5l-118 -788h-243z" />
-<glyph unicode="n" horiz-adv-x="1160" d="M46 0l162 1082h222l-9 -150q66 81 153 125.5t188 44.5q162 0 244 -105q59 -75 59 -210q0 -53 -9 -114l-101 -673h-243l101 671q6 42 6 75q1 72 -27 106q-40 50 -142 51q-76 0 -137 -30.5t-106 -85.5l-118 -787h-243z" />
-<glyph unicode="o" horiz-adv-x="1160" d="M83 530l3 21q37 251 190.5 401t386.5 150q223 0 337 -156q87 -119 87 -287q0 -52 -8 -108l-3 -21q-39 -253 -192 -402t-387 -149q-223 -1 -337 155q-86 117 -86 283q0 54 9 113zM326 530q-9 -57 -9 -106q0 -92 31 -154q47 -96 178 -97q122 0 203 101t105 256l3 21 q8 53 8 100q-1 95 -33 159q-48 98 -178 97q-122 0 -202.5 -102t-102.5 -254z" />
-<glyph unicode="p" horiz-adv-x="1160" d="M-14 -416l224 1498h205l4 -136q63 76 142.5 116t176.5 40q192 0 283 -160q65 -115 65 -276q0 -66 -11 -140l-3 -21q-38 -245 -168.5 -385.5t-330.5 -140.5q-90 0 -156.5 34.5t-108.5 101.5l-79 -531h-243zM334 291q24 -57 73 -87.5t126 -30.5q119 0 196.5 93t100.5 239 l3 21q9 60 9 112q0 96 -30 162q-47 103 -172 103q-73 0 -131.5 -33.5t-101.5 -92.5z" />
-<glyph unicode="q" horiz-adv-x="1160" d="M79 505l3 21q40 268 173 422t336 154q91 0 157 -40.5t107 -116.5l50 137h197l-224 -1498h-243l77 519q-60 -61 -132 -92.5t-159 -31.5q-191 0 -284 147q-68 106 -68 258q0 57 10 121zM322 505q-8 -55 -8 -102q0 -85 28 -142q44 -88 170 -88q72 0 129 31t100 88l75 500 q-26 54 -73.5 84.5t-118.5 30.5q-119 0 -197 -108t-102 -273z" />
-<glyph unicode="r" horiz-adv-x="719" d="M48 0l162 1082h222l-7 -153q53 82 124 127.5t156 45.5q21 0 40.5 -3.5t34.5 -8.5l-64 -227l-103 4q-69 0 -121.5 -31.5t-88.5 -88.5l-112 -747h-243z" />
-<glyph unicode="s" horiz-adv-x="1065" d="M60 335l2 6h227q-1 -13 -2 -24q0 -75 51 -113q58 -43 150 -43q90 0 148 37.5t66 97.5q1 9 1 18q-1 45 -35 75q-42 36 -170 65q-185 39 -276 115q-76 63 -76 163q0 20 3 41q19 141 147 235t317 94q187 0 295 -100q88 -82 89 -190q0 -24 -5 -49l-2 -6h-234q2 12 2 23 q0 54 -38 93q-44 47 -132 47q-84 0 -138 -40.5t-62 -97.5q-1 -10 -1 -19q-1 -44 31 -70q38 -32 170 -58q194 -39 284 -117q75 -65 74 -166q0 -20 -3 -42q-21 -152 -153 -241.5t-331 -89.5q-202 -1 -313 109q-91 89 -91 198q0 24 5 49z" />
-<glyph unicode="t" horiz-adv-x="701" d="M87 902l27 180h165l40 263h242l-40 -263h194l-27 -180h-194l-89 -598q-4 -23 -4 -41q0 -38 17 -56q25 -27 74 -27q19 0 39 3.5t38 9.5l-1 -178q-33 -17 -77 -26.5t-90 -9.5q-131 -1 -197 79q-48 58 -48 162q0 39 7 84l89 598h-165z" />
-<glyph unicode="u" horiz-adv-x="1160" d="M110 449l95 633h242l-95 -635q-10 -64 -10 -112q0 -71 22 -103q36 -54 133 -55q85 0 150 33t109 95l117 777h243l-162 -1082h-209l2 155q-63 -86 -148 -131t-189 -45q-168 -1 -252 115q-59 81 -59 223q0 60 11 132z" />
-<glyph unicode="v" horiz-adv-x="1038" d="M114 1082h251l114 -716l4 -87l6 -1l33 88l322 716h251l-546 -1082h-211z" />
-<glyph unicode="w" horiz-adv-x="1530" d="M119 1082h243l49 -753l6 -1l339 754h177l116 -762h6l272 762h243l-458 -1082h-199l-121 715l-6 1l-334 -716h-199z" />
-<glyph unicode="x" horiz-adv-x="1038" d="M-47 0l432 547l-260 535h276l142 -371l255 371h279l-420 -535l268 -547h-276l-152 380l-266 -380h-278z" />
-<glyph unicode="y" horiz-adv-x="1038" d="M-44 -417l56 188q12 -1 35.5 -3t36.5 -2q63 0 112 46.5t80 102.5l55 97l-233 1070h265l109 -648l7 -108l6 -1l351 757h266l-635 -1246q-60 -113 -150 -193t-233 -80q-28 0 -62.5 6t-65.5 14z" />
-<glyph unicode="z" horiz-adv-x="1038" d="M5 0l24 159l649 722l-2 5h-527l29 196h842l-23 -154l-656 -729l2 -5h570l-29 -194h-879z" />
-<glyph unicode="{" horiz-adv-x="687" d="M55 529l5 37l15 106l5 35q94 0 151.5 59t72.5 163l28 203q24 177 122.5 293.5t303.5 171.5l28 -140q-102 -33 -154.5 -117t-70.5 -208l-28 -203q-16 -109 -70 -189t-148 -124q79 -47 111.5 -127.5t19.5 -179.5l-28 -203q-19 -128 10 -210t123 -115l-67 -141 q-188 55 -254 175t-41 291l28 203q15 107 -24 163.5t-138 56.5z" />
-<glyph unicode="|" horiz-adv-x="514" d="M24 -270l258 1726h214l-258 -1726h-214z" />
-<glyph unicode="}" horiz-adv-x="687" d="M-79 -219q102 33 155 117t71 208l28 203q15 110 71 189.5t156 122.5q-84 44 -119.5 124.5t-20.5 183.5l28 203q18 129 -11 210.5t-123 114.5l68 140q187 -55 252.5 -174.5t41.5 -290.5l-28 -203q-16 -110 23 -166t140 -56l-6 -43l-13 -92l-6 -43q-96 0 -153.5 -59 t-71.5 -161l-28 -203q-25 -177 -123.5 -294t-301.5 -172z" />
-<glyph unicode="~" horiz-adv-x="1361" d="M106 460q22 156 121.5 255.5t235.5 99.5q82 0 155 -34t143 -101q47 -48 87.5 -69t87.5 -21q56 0 108 55t62 128l168 -23q-22 -157 -124 -260t-236 -103q-84 0 -154 33t-142 103q-49 46 -89.5 68t-86.5 22q-58 0 -108.5 -52t-60.5 -123z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1149" d="M79 523l6 35q33 220 159 365.5t327 172.5l34 222h200l-35 -231q132 -36 201.5 -142t47.5 -251h-228q13 93 -32 153t-135 60q-124 0 -199.5 -102t-96.5 -247l-6 -35q-23 -157 18.5 -253.5t174.5 -96.5q80 0 147 52.5t79 131.5h220l2 -6q-16 -129 -116.5 -227.5 t-240.5 -130.5l-36 -238h-200l35 230q-185 29 -271 179t-55 359z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1205" d="M64 0l29 194h10q49 13 85.5 101.5t51.5 182.5l13 121h-162l29 196h155l27 238q32 215 164 329.5t330 114.5q199 0 300 -109.5t71 -285.5l-3 -6h-235q16 110 -30 158t-133 48q-82 0 -143 -66t-78 -183l-26 -238h388l-29 -196h-381l-12 -113q-13 -85 -46.5 -160t-83.5 -132 h725l-30 -194h-986z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1248" d="M104 306l22 146h357l21 143h-357l22 147h287l-292 714h272l226 -641l419 641h271l-504 -714h276l-22 -147h-355l-21 -143h355l-22 -146h-355l-46 -306h-243l46 306h-357z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1604" d="M116 729q49 327 285.5 537t536.5 210q283 0 463.5 -218t133.5 -529q-49 -328 -286 -539t-535 -211q-284 0 -464.5 218.5t-133.5 531.5zM238 729q-41 -274 103 -449.5t392 -175.5q235 0 437.5 182t242.5 443q41 273 -102.5 447.5t-390.5 174.5q-237 0 -440 -181t-242 -441 zM454 669l18 119q26 179 135.5 283t271.5 104q152 0 231 -80.5t53 -228.5l-2 -5h-149q14 97 -24 138t-129 41t-154 -69.5t-79 -181.5l-18 -120q-18 -119 22.5 -185.5t135.5 -66.5q87 0 139 42t66 137h147l2 -6q-19 -156 -117.5 -232t-257.5 -76q-154 0 -235.5 107.5 t-55.5 279.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="910" d="M156 521l30 196h590l-30 -196h-590z" />
-<glyph unicode="&#xae;" horiz-adv-x="1604" d="M116 729q49 327 285.5 537t536.5 210q283 0 463.5 -218t133.5 -529q-49 -328 -286 -539t-535 -211q-284 0 -464.5 218.5t-133.5 531.5zM238 729q-41 -274 103 -449.5t392 -175.5q235 0 437.5 182t242.5 443q41 273 -102.5 447.5t-390.5 174.5q-237 0 -440 -181t-242 -441 zM469 316l128 850h281q146 0 225 -67.5t61 -192.5q-10 -62 -47.5 -107t-100.5 -75q55 -29 75.5 -83t10.5 -126l-8 -56q-7 -43 -8 -74.5t6 -52.5l-3 -16h-155q-5 21 -1.5 59t10.5 85l8 54q11 74 -17 106.5t-105 32.5h-158l-51 -337h-151zM691 787h143q68 0 119.5 30.5 t59.5 85.5q11 75 -22.5 102.5t-132.5 27.5h-130z" />
-<glyph unicode="&#xb4;" horiz-adv-x="689" d="M229 1257l224 261h274l2 -6l-310 -260h-188z" />
-<glyph unicode="&#x2000;" horiz-adv-x="845" />
-<glyph unicode="&#x2001;" horiz-adv-x="1691" />
-<glyph unicode="&#x2002;" horiz-adv-x="845" />
-<glyph unicode="&#x2003;" horiz-adv-x="1691" />
-<glyph unicode="&#x2004;" horiz-adv-x="563" />
-<glyph unicode="&#x2005;" horiz-adv-x="422" />
-<glyph unicode="&#x2006;" horiz-adv-x="281" />
-<glyph unicode="&#x2007;" horiz-adv-x="281" />
-<glyph unicode="&#x2008;" horiz-adv-x="211" />
-<glyph unicode="&#x2009;" horiz-adv-x="338" />
-<glyph unicode="&#x200a;" horiz-adv-x="93" />
-<glyph unicode="&#x2010;" horiz-adv-x="910" d="M156 521l30 196h590l-30 -196h-590z" />
-<glyph unicode="&#x2011;" horiz-adv-x="910" d="M156 521l30 196h590l-30 -196h-590z" />
-<glyph unicode="&#x2012;" horiz-adv-x="910" d="M156 521l30 196h590l-30 -196h-590z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1415" d="M183.298 621l39 196h1085.49l-38.999 -196h-1085.49z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1665" d="M192.596 621l47.999 196h1335.98l-47.999 -196h-1335.98z" />
-<glyph unicode="&#x2018;" horiz-adv-x="541" d="M201 912l33 223l150 321h119l-48 -323l-33 -221h-221z" />
-<glyph unicode="&#x2019;" horiz-adv-x="536" d="M217 912l47 313l34 231h221l-34 -229l-149 -315h-119z" />
-<glyph unicode="&#x201c;" horiz-adv-x="831" d="M179 912l33 223l150 321h119l-48 -323l-33 -221h-221zM507 912l33 223l150 321h119l-48 -323l-33 -221h-221z" />
-<glyph unicode="&#x201d;" horiz-adv-x="821" d="M182 912l47 313l34 231h221l-34 -229l-149 -315h-119zM518 912l47 313l34 231h221l-34 -229l-149 -315h-119z" />
-<glyph unicode="&#x2022;" horiz-adv-x="715" d="M165 724l11 77q15 98 83 156.5t170 58.5q98 0 151.5 -60.5t39.5 -154.5l-11 -77q-16 -99 -83.5 -156t-170.5 -57q-98 0 -151.5 59.5t-38.5 153.5z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1446" d="M73 0l35 233h242l-35 -233h-242zM516 0l35 233h242l-35 -233h-242zM936 0l35 233h242l-35 -233h-242z" />
-<glyph unicode="&#x202f;" horiz-adv-x="338" />
-<glyph unicode="&#x205f;" horiz-adv-x="422" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1101" d="M69 496l22 142h145l24 156h-146l21 142h146l2 12q37 250 202.5 389.5t405.5 139.5q58 0 116.5 -8t121.5 -23l-50 -199q-52 16 -107 25.5t-111 9.5q-127 0 -219.5 -90.5t-114.5 -241.5l-2 -14h459l-21 -142h-460l-23 -156h460l-22 -142h-460v-2q-24 -156 40 -238.5 t199 -82.5q55 0 113.5 8.5t112.5 25.5l-9 -197q-59 -15 -121.5 -23t-124.5 -8q-228 0 -358.5 140.5t-94.5 374.5v2h-146z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1289" d="M224 1361l14 95h391l-14 -95h-138l-66 -443h-117l66 443h-136zM622 916l81 540h137l85 -373h6l198 373h131l-81 -540h-110l47 316l-5 2l-177 -318h-61l-84 330h-6l-50 -330h-111z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1155" d="M171 621l30 196h835l-30 -196h-835z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.ttf
deleted file mode 100644
index f84d5da6db201f82931dccf0eb34d9c227157025..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30828
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
RHWS&50m<x4Ev<~P{{e%!9CiQz

diff --git a/app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-MediumItalic-webfont.woff
deleted file mode 100644
index 52727a162727d79ab4a4578d98be91b85d72c8f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18108
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-Regular-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-Regular-webfont.eot
deleted file mode 100644
index feb9b46f8634322f1624f2e11cd1bb286a69a644..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26220
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
Y!HaBs&kNZEWW8n4>>w>38@|~81GsX!G5`Po

diff --git a/app/webroot/css/fonts/roboto/Roboto-Regular-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-Regular-webfont.svg
deleted file mode 100644
index e4f21cc07..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-Regular-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoRegular" horiz-adv-x="1153" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="509" />
-<glyph unicode=" "  horiz-adv-x="509" />
-<glyph unicode="&#x09;" horiz-adv-x="509" />
-<glyph unicode="&#xa0;" horiz-adv-x="509" />
-<glyph unicode="!" horiz-adv-x="539" d="M171 0v204h198v-204h-198zM171 478v978h197v-978h-197z" />
-<glyph unicode="&#x22;" horiz-adv-x="733" d="M126 936l1 240v280h197v-270l-101 -250h-97zM435 936v520h198v-270l-101 -250h-97z" />
-<glyph unicode="#" horiz-adv-x="1276" d="M70 410v140h264l68 348h-256v142h284l82 416h151l-82 -416h255l82 416h151l-82 -416h199v-142h-226l-68 -348h219v-140h-247l-80 -410h-152l80 410h-255l-80 -410h-151l80 410h-236zM485 550h255l68 348h-255z" />
-<glyph unicode="$" horiz-adv-x="1193" d="M131 424l2 5h190q0 -154 78 -219.5t190 -65.5q129 0 201.5 61.5t72.5 170.5q0 90 -63.5 153.5t-210.5 113.5q-202 61 -305 163t-103 272q0 165 95 269t261 125v221h158v-222q167 -22 259.5 -137t92.5 -308h-196q0 127 -63 206t-174 79q-118 0 -177 -61.5t-59 -168.5 q0 -97 61 -157t219 -114q204 -66 303 -164.5t99 -267.5q0 -172 -103 -273.5t-283 -120.5v-192h-157v191q-172 18 -282 125.5t-106 315.5z" />
-<glyph unicode="%" horiz-adv-x="1498" d="M104 1099v77q0 127 82 214t219 87t219 -86.5t82 -214.5v-77q0 -127 -81.5 -213t-217.5 -86q-138 0 -220.5 86t-82.5 213zM250 1099q0 -74 40.5 -125.5t116.5 -51.5q73 0 113 51t40 126v77q0 74 -40.5 126.5t-114.5 52.5q-75 0 -115 -52.5t-40 -126.5v-77zM349 177 l711 1138l109 -67l-711 -1138zM809 279v78q0 127 82 213.5t219 86.5q136 0 218.5 -86.5t82.5 -213.5v-78q0 -128 -82 -214t-217 -86q-138 0 -220.5 86t-82.5 214zM955 279q0 -75 40.5 -126.5t116.5 -51.5q73 0 113 51.5t40 126.5v78q0 74 -41 126t-114 52q-74 0 -114.5 -52 t-40.5 -126v-78z" />
-<glyph unicode="&#x26;" horiz-adv-x="1276" d="M64 392q0 122 70.5 213.5t210.5 183.5q-78 99 -116 176.5t-38 159.5q0 169 97.5 260.5t268.5 91.5q158 0 257 -91t99 -219q0 -98 -52.5 -169.5t-155.5 -146.5l-109 -80l340 -409q41 65 64 144t23 167h176q0 -132 -39 -244t-113 -201l185 -223l-2 -5h-229l-85 102 q-80 -60 -177 -91.5t-201 -31.5q-217 0 -345.5 115t-128.5 298zM261 392q0 -113 71 -186t206 -73q72 0 142 24.5t132 70.5l-361 435l-40 -29q-91 -68 -120.5 -130t-29.5 -112zM388 1127q0 -53 27 -110.5t81 -125.5l138 95q57 38 77.5 82.5t20.5 98.5q0 61 -48.5 108 t-126.5 47q-81 0 -125 -56.5t-44 -138.5z" />
-<glyph unicode="'" horiz-adv-x="445" d="M126 951l1 265v240h197v-223l-101 -282h-97z" />
-<glyph unicode="(" horiz-adv-x="679" d="M132 582v9q0 394 159 673t334 372l6 -1l38 -116q-137 -107 -238.5 -343t-101.5 -583v-13q0 -347 101 -583t239 -352l-38 -108h-6q-175 93 -334 371.5t-159 673.5z" />
-<glyph unicode=")" horiz-adv-x="687" d="M6 -355q135 105 237.5 345.5t102.5 589.5v13q0 342 -105.5 583.5t-234.5 351.5l38 108h6q174 -93 333.5 -372t159.5 -673v-9q0 -395 -159.5 -673.5t-333.5 -371.5h-6z" />
-<glyph unicode="*" horiz-adv-x="884" d="M88 763l49 154l236 -90l-10 254h161l-10 -260l233 89l48 -156l-242 -68l153 -200l-132 -96l-140 218l-135 -210l-133 92l158 206z" />
-<glyph unicode="+" horiz-adv-x="1162" d="M78 605v178h402v423h197v-423h399v-178h-399v-459h-197v459h-402z" />
-<glyph unicode="," horiz-adv-x="404" d="M48 -258l70 316v163h197v-173l-150 -306h-117z" />
-<glyph unicode="-" horiz-adv-x="923" d="M167 538v154h590v-154h-590z" />
-<glyph unicode="." horiz-adv-x="548" d="M161 0v202h197v-202h-197z" />
-<glyph unicode="/" horiz-adv-x="850" d="M16 -125l608 1581h167l-607 -1581h-168z" />
-<glyph unicode="0" d="M113 514v428q0 245 125.5 390t336.5 145q212 0 338.5 -145t126.5 -390v-428q0 -247 -125.5 -391t-337.5 -144q-211 0 -337.5 144t-126.5 391zM310 474q0 -157 70.5 -249t196.5 -92q128 0 197 91.5t69 249.5v509q0 157 -70 248t-198 91q-127 0 -196 -91t-69 -248v-509z " />
-<glyph unicode="1" d="M195 1271v152l515 54v-1477h-198v1274z" />
-<glyph unicode="2" d="M138 1052q-5 178 119 301.5t337 123.5q195 0 307 -108t112 -279q0 -115 -63.5 -225t-193.5 -276l-367 -430l2 -5h663v-154h-904v135l457 545q122 148 165.5 235.5t43.5 176.5q0 101 -59 165.5t-163 64.5q-129 0 -196.5 -79t-67.5 -197h-190z" />
-<glyph unicode="3" d="M120 378l2 6h188q0 -106 76.5 -178.5t197.5 -72.5q120 0 189 74.5t69 194.5q0 137 -63.5 205t-199.5 68h-162v153h162q132 0 186.5 65.5t54.5 183.5q0 110 -59.5 177.5t-176.5 67.5q-114 0 -188.5 -70.5t-74.5 -176.5h-188l-3 6q-5 164 124 280t330 116q203 0 318 -102.5 t115 -301.5q0 -102 -53.5 -186t-149.5 -131q110 -44 167.5 -133.5t57.5 -216.5q0 -200 -126.5 -313.5t-328.5 -113.5q-186 0 -327.5 109.5t-136.5 289.5z" />
-<glyph unicode="4" d="M72 336v111l613 1009h208v-966h201v-154h-201v-336h-196v336h-625zM283 490h414v683l-6 1l-19 -50z" />
-<glyph unicode="5" d="M157 377l2 6h178q0 -119 68.5 -184.5t177.5 -65.5q125 0 194 88t69 241q0 139 -69.5 225t-193.5 86q-116 0 -168 -35t-77 -108l-163 17l84 809h729v-175h-563l-47 -419q47 35 104 57.5t130 23.5q202 2 316.5 -126.5t114.5 -352.5q0 -219 -117.5 -352t-342.5 -133 q-185 0 -308 101t-118 297z" />
-<glyph unicode="6" d="M137 552v335q0 256 145.5 423t358.5 167q86 0 170 -17t139 -43l-42 -151q-57 25 -120 40.5t-147 15.5q-137 0 -222.5 -117t-85.5 -296v-113q61 61 144.5 96t179.5 35q188 0 297.5 -126t109.5 -331q0 -224 -122.5 -357.5t-330.5 -133.5q-202 0 -338 153.5t-136 419.5z M333 533q0 -185 80.5 -292.5t197.5 -107.5q123 0 189.5 93.5t66.5 243.5q0 142 -71.5 226t-201.5 84q-93 0 -159.5 -39.5t-101.5 -106.5v-101z" />
-<glyph unicode="7" d="M97 1301v155h966v-155q-276 -328 -373 -579t-97 -563v-159h-197v159q0 330 121.5 594.5t351.5 547.5h-772z" />
-<glyph unicode="8" d="M102 400q0 123 76.5 217t206.5 138q-112 42 -177 128.5t-65 200.5q0 191 122.5 292t319.5 101q186 0 305.5 -101.5t119.5 -291.5q0 -114 -64 -200.5t-170 -129.5q124 -43 199 -137t75 -217q0 -201 -130.5 -311t-332.5 -110q-214 0 -349.5 110t-135.5 311zM299 404 q0 -123 80.5 -197t207.5 -74q114 0 190.5 74.5t76.5 196.5q0 119 -77.5 196t-191.5 77q-124 0 -205 -77t-81 -196zM340 1081q0 -111 70 -180t177 -69q97 0 161.5 69t64.5 180q0 105 -65.5 173t-162.5 68q-107 0 -176 -65.5t-69 -175.5z" />
-<glyph unicode="9" d="M93 978q0 220 127 359.5t314 139.5q218 0 350 -137t132 -387v-442q0 -251 -144 -391.5t-371 -140.5q-77 0 -157.5 16t-150.5 47l30 150q66 -32 129.5 -45.5t148.5 -13.5q142 0 229.5 98t87.5 278v124q-48 -71 -119.5 -107.5t-156.5 -36.5q-210 0 -329.5 129.5 t-119.5 359.5zM290 978q0 -150 66 -242.5t186 -92.5q103 0 173.5 47t102.5 120v172q0 163 -73 251.5t-205 88.5q-107 0 -178.5 -95.5t-71.5 -248.5z" />
-<glyph unicode=":" horiz-adv-x="517" d="M161 0v202h197v-202h-197zM161 876v202h197v-202h-197z" />
-<glyph unicode=";" horiz-adv-x="525" d="M162 876v202h197v-202h-197zM99 -258l70 316v163h197v-173l-150 -306h-117z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1040" d="M71 486v149l816 378v-201l-559 -233l-85 -18v-6l85 -19l559 -228v-201z" />
-<glyph unicode="=" d="M152 407v164h834v-164h-834zM152 823v164h834v-164h-834z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1072" d="M136 87v196l598 238l85 17v6l-85 20l-598 234v195l856 -378v-149z" />
-<glyph unicode="?" horiz-adv-x="974" d="M61 1122q-3 161 113.5 258t296.5 97q197 0 306 -100.5t109 -280.5q0 -129 -70.5 -236t-186.5 -219q-54 -54 -65.5 -97t-11.5 -134h-197q1 145 25 201t126 148q99 117 141 180t42 152q0 106 -56.5 163t-161.5 57q-91 0 -155 -49.5t-64 -145.5h-188zM353 0v208h206v-208 h-206z" />
-<glyph unicode="@" horiz-adv-x="1833" d="M114 478q19 423 249 688t602 265q379 0 581.5 -250t185.5 -679q-9 -214 -120 -368.5t-332 -154.5q-73 0 -126 41.5t-76 117.5q-50 -80 -122 -119.5t-168 -39.5q-125 0 -194 120.5t-51 316.5q23 259 137.5 415.5t279.5 156.5q105 0 169 -26t139 -80l-4 -4h6l-51 -585 q-9 -110 21.5 -151.5t81.5 -41.5q123 0 197 113.5t82 288.5q16 382 -144 595.5t-496 213.5q-308 0 -495.5 -231t-202.5 -602q-18 -376 150 -594.5t482 -218.5q88 0 178.5 21.5t152.5 56.5l38 -107q-67 -42 -170.5 -65.5t-202.5 -23.5q-380 0 -587.5 249.5t-189.5 681.5z M720 416q-11 -142 21.5 -216t106.5 -74q64 0 117 24.5t97 87.5q-1 12 -0.5 25.5t2.5 29.5l47 538q-26 12 -54.5 19t-59.5 7q-125 0 -191 -109.5t-86 -331.5z" />
-<glyph unicode="A" horiz-adv-x="1295" d="M43 0l525 1456h169l514 -1456h-201l-128 375h-548l-130 -375h-201zM431 540h435l-212 625h-6z" />
-<glyph unicode="B" horiz-adv-x="1302" d="M170 0v1456h475q228 0 357 -98.5t129 -295.5q0 -94 -58 -168.5t-154 -113.5q143 -20 226.5 -124t83.5 -245q0 -200 -130 -305.5t-352 -105.5h-577zM367 154h380q135 0 209.5 66.5t74.5 188.5q0 121 -76 195t-205 79h-13h-370v-529zM367 837h319q110 0 179 60.5t69 168.5 q0 118 -74.5 176.5t-214.5 58.5h-278v-464z" />
-<glyph unicode="C" horiz-adv-x="1297" d="M118 598v259q0 269 155.5 444.5t402.5 175.5q247 1 393 -131q142 -128 142 -337v-12l-2 -6h-189q0 153 -90 242t-254 89q-165 0 -263 -133t-98 -330v-261q0 -199 98 -332t263 -133q164 0 254 88.5t90 244.5h189l2 -6v-11q0 -198 -144 -332q-148 -138 -391 -138 q-247 0 -402.5 175t-155.5 444z" />
-<glyph unicode="D" horiz-adv-x="1387" d="M170 0v1456h458q285 0 458.5 -175.5t173.5 -453.5v-199q0 -279 -173.5 -453.5t-458.5 -174.5h-458zM367 154h261q202 0 318.5 133t116.5 341v201q0 206 -116.5 339t-318.5 133h-261v-1147z" />
-<glyph unicode="E" horiz-adv-x="1130" d="M170 0v1456h886v-155h-689v-471h598v-155h-598v-521h700v-154h-897z" />
-<glyph unicode="F" horiz-adv-x="1130" d="M170 0v1456h913v-155h-716v-502h614v-155h-614v-644h-197z" />
-<glyph unicode="G" horiz-adv-x="1387" d="M121 578v300q0 265 159 432t410 167q243 0 384 -129q137 -126 137 -319v-11l-2 -6h-189q0 133 -86 221.5t-244 88.5q-167 0 -269 -125t-102 -317v-302q0 -194 108 -319.5t276 -125.5q129 0 204.5 33.5t112.5 79.5v328h-330v154h527v-532q-52 -81 -180.5 -149t-333.5 -68 q-252 0 -417 167t-165 432z" />
-<glyph unicode="H" horiz-adv-x="1441" d="M170 0v1456h197v-658h707v658h197v-1456h-197v643h-707v-643h-197z" />
-<glyph unicode="I" horiz-adv-x="579" d="M190 0v1456h198v-1456h-198z" />
-<glyph unicode="J" horiz-adv-x="1123" d="M79 395l2 6h189q0 -136 63 -202t179 -66q109 0 178 79t69 210v1034h197v-1034q0 -203 -123.5 -323t-320.5 -120q-201 0 -320 107q-113 102 -113 293v16z" />
-<glyph unicode="K" horiz-adv-x="1302" d="M170 0v1456h197v-644h108l540 644h222l2 -5l-590 -689l632 -757l-2 -5h-239l-545 658h-128v-658h-197z" />
-<glyph unicode="L" horiz-adv-x="1126" d="M170 0v1456h197v-1302h710v-154h-907z" />
-<glyph unicode="M" horiz-adv-x="1779" d="M170 0v1456h259l463 -1183h6l465 1183h245v-1456h-197v1091l-6 1l-441 -1092h-137l-454 1128l-6 -1v-1127h-197z" />
-<glyph unicode="N" horiz-adv-x="1442" d="M170 0v1456h197l701 -1111l6 2v1109h197v-1456h-197l-701 1112l-6 -2v-1110h-197z" />
-<glyph unicode="O" horiz-adv-x="1396" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -267 -165.5 -443t-429.5 -176q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128 t-102.5 -328v-261z" />
-<glyph unicode="P" horiz-adv-x="1302" d="M170 0v1456h557q233 0 362.5 -120t129.5 -316q0 -198 -129.5 -317t-362.5 -119h-360v-584h-197zM367 738h360q148 0 221 79.5t73 200.5t-73.5 202t-220.5 81h-360v-563z" />
-<glyph unicode="Q" horiz-adv-x="1427" d="M113 598v259q0 266 159.5 443t414.5 177q264 0 429.5 -176.5t165.5 -443.5v-259q0 -115 -33.5 -217.5t-95.5 -183.5l217 -211l-135 -129l-222 213q-70 -45 -152 -68t-174 -23q-255 0 -414.5 176t-159.5 443zM310 598q0 -202 102.5 -330t274.5 -128q183 0 290.5 127.5 t107.5 330.5v261q0 200 -108 328t-290 128q-172 0 -274.5 -128t-102.5 -328v-261z" />
-<glyph unicode="R" horiz-adv-x="1303" d="M170 0v1455h498q239 0 365 -106t126 -308q0 -112 -58.5 -195t-170.5 -132q120 -39 172.5 -126.5t52.5 -216.5v-137q0 -68 15 -122t52 -88v-24h-203q-39 34 -50 100t-11 136v133q0 118 -69 190t-185 72h-337v-631h-197zM367 786h281q167 0 240.5 63.5t73.5 193.5 q0 123 -71.5 190.5t-222.5 67.5h-301v-515z" />
-<glyph unicode="S" horiz-adv-x="1252" d="M114 413l2 6h188q0 -137 104 -211.5t235 -74.5q140 0 221.5 63t81.5 171q0 99 -71 166t-250 114q-222 55 -346.5 162t-124.5 269q0 171 134 285t348 114q230 -1 366 -131q133 -127 133 -294v-10l-3 -6h-188q0 124 -86.5 205t-221.5 81q-138 0 -211.5 -67t-73.5 -174 q0 -95 80.5 -158.5t261.5 -111.5q220 -57 335 -168t115 -274q0 -176 -138.5 -283t-361.5 -107q-211 0 -373 118q-157 114 -156 304v12z" />
-<glyph unicode="T" horiz-adv-x="1225" d="M37 1301v155h1151v-155h-480v-1301h-197v1301h-474z" />
-<glyph unicode="U" horiz-adv-x="1386" d="M147 489v967h197v-967q0 -167 95.5 -261.5t246.5 -94.5q160 0 260.5 94.5t100.5 261.5v967h197v-967q0 -240 -156 -375t-402 -135q-237 0 -388 135.5t-151 374.5z" />
-<glyph unicode="V" horiz-adv-x="1295" d="M22 1456h214l376 -1074l33 -121h6l33 121l376 1074h213l-541 -1456h-169z" />
-<glyph unicode="W" horiz-adv-x="1763" d="M37 1456h213l212 -951l25 -191l6 -1l34 192l258 951h193l260 -951l34 -195h6l27 195l208 951h214l-352 -1456h-176l-291 1010l-22 131h-6l-21 -131l-295 -1010h-176z" />
-<glyph unicode="X" horiz-adv-x="1295" d="M66 0l472 734l-462 722h236l338 -568l340 568h238l-462 -722l472 -734h-235l-349 578l-350 -578h-238z" />
-<glyph unicode="Y" horiz-adv-x="1295" d="M40 1456h225l380 -740l380 740h225l-511 -944v-512h-196v527z" />
-<glyph unicode="Z" horiz-adv-x="1225" d="M97 0v146l778 1155h-767v155h992v-141l-781 -1161h814v-154h-1036z" />
-<glyph unicode="[" horiz-adv-x="552" d="M143 -312v1976h385v-155h-188v-1666h188v-155h-385z" />
-<glyph unicode="\" horiz-adv-x="846" d="M39 1456h186l608 -1581h-186z" />
-<glyph unicode="]" horiz-adv-x="552" d="M11 -157h189v1666h-189v155h386v-1976h-386v155z" />
-<glyph unicode="^" horiz-adv-x="856" d="M61 729l299 727h134l298 -727h-181l-166 419l-16 70h-6l-16 -70l-163 -419h-183z" />
-<glyph unicode="_" horiz-adv-x="931" d="M4 0h923v-154h-923v154z" />
-<glyph unicode="`" horiz-adv-x="641" d="M82 1512l3 6h230l175 -266h-158z" />
-<glyph unicode="a" horiz-adv-x="1126" d="M106 304q0 155 125.5 242.5t340.5 87.5h214v107q0 95 -58 150.5t-164 55.5q-96 0 -155 -48t-59 -115l-187 -2l-2 6v13q1 110 111 203q118 98 303 98q184 0 296 -93.5t112 -269.5v-521q0 -58 6 -112t22 -106h-203q-10 49 -15.5 86.5t-6.5 75.5q-55 -78 -143.5 -130.5 t-190.5 -52.5q-169 0 -257.5 86.5t-88.5 238.5zM303 300q0 -72 45 -114t133 -42q107 0 193 55t112 126v176h-221q-119 0 -190.5 -60t-71.5 -141z" />
-<glyph unicode="b" horiz-adv-x="1164" d="M143 0v1560h197v-606q51 72 126.5 110t176.5 38q200 0 312 -160t112 -421v-21q0 -234 -112.5 -377.5t-309.5 -143.5q-108 0 -187.5 42.5t-131.5 125.5l-32 -147h-151zM340 309q38 -80 99.5 -125t155.5 -45q139 0 207 99t68 262v21q0 186 -68.5 303.5t-208.5 117.5 q-91 0 -153.5 -44.5t-99.5 -119.5v-469z" />
-<glyph unicode="c" horiz-adv-x="1072" d="M97 520v42q0 229 124.5 384.5t351.5 155.5q181 0 297 -112q112 -108 111 -264v-11l-2 -6h-179q0 99 -64.5 168.5t-162.5 69.5q-145 0 -211.5 -112.5t-66.5 -272.5v-42q0 -163 65.5 -275t212.5 -112q91 0 159 60.5t68 148.5h178l3 -6v-9q0 -135 -120 -239 q-124 -108 -288 -109q-228 0 -352 155t-124 386z" />
-<glyph unicode="d" horiz-adv-x="1164" d="M98 500v21q0 261 111.5 421t312.5 160q95 0 168.5 -35t125.5 -102v595h197v-1560h-151l-30 137q-53 -78 -131 -118t-181 -40q-198 0 -310 143.5t-112 377.5zM295 500q0 -164 67 -262.5t208 -98.5q88 0 148 40t98 112v505q-38 67 -98.5 106.5t-145.5 39.5 q-142 0 -209.5 -117t-67.5 -304v-21z" />
-<glyph unicode="e" horiz-adv-x="1072" d="M97 520v44q0 233 134.5 385.5t328.5 152.5q217 0 325.5 -135t108.5 -359v-104h-692l-3 -5q0 -163 72 -264.5t220 -101.5q100 0 175.5 28.5t129.5 78.5l77 -128q-58 -56 -153 -94.5t-229 -38.5q-233 0 -363.5 149t-130.5 392zM307 664l2 -5h488v16q0 118 -58 195t-179 77 q-103 0 -170.5 -79.5t-82.5 -203.5z" />
-<glyph unicode="f" horiz-adv-x="674" d="M56 936v146h169v137q0 173 90.5 267.5t252.5 94.5q34 0 68.5 -5.5t76.5 -15.5l-24 -150q-18 4 -43.5 7t-53.5 3q-86 0 -128 -51.5t-42 -149.5v-137h196v-146h-196v-936h-197v936h-169z" />
-<glyph unicode="g" horiz-adv-x="1164" d="M108 500v21q0 261 111.5 421t311.5 160q103 0 181 -41.5t131 -119.5l24 141h157v-1088q0 -208 -121 -319.5t-349 -111.5q-78 0 -168.5 21.5t-159.5 58.5l30 153q57 -30 137.5 -48.5t158.5 -18.5q144 0 209.5 65.5t65.5 199.5v123q-53 -68 -127 -103t-171 -35 q-198 0 -309.5 143.5t-111.5 377.5zM305 500q0 -163 67 -262t207 -99q89 0 149 40.5t99 114.5v498q-38 69 -99 109.5t-147 40.5q-141 0 -208.5 -117t-67.5 -304v-21z" />
-<glyph unicode="h" horiz-adv-x="1164" d="M143 0v1560h197v-623q56 78 137.5 121.5t180.5 43.5q173 0 269.5 -104t96.5 -320v-678h-197v680q0 134 -57.5 198t-171.5 64q-88 0 -153 -34.5t-105 -96.5v-811h-197z" />
-<glyph unicode="i" horiz-adv-x="516" d="M159 0v1082h197v-1082h-197zM159 1359v201h197v-201h-197z" />
-<glyph unicode="j" horiz-adv-x="530" d="M-66 -419l14 155q14 -5 40 -8.5t43 -3.5q65 0 103.5 44t38.5 143v1171h197v-1171q0 -167 -86 -257.5t-239 -90.5q-31 0 -56.5 4.5t-54.5 13.5zM167 1363v197h197v-197h-197z" />
-<glyph unicode="k" horiz-adv-x="1050" d="M144 0v1560h197v-904h99l325 426h236l-393 -499l427 -583h-233l-360 499h-101v-499h-197z" />
-<glyph unicode="l" horiz-adv-x="516" d="M159 0v1560h197v-1560h-197z" />
-<glyph unicode="m" horiz-adv-x="1790" d="M143 0v1082h176l14 -142q53 77 134.5 119.5t189.5 42.5t185.5 -50t116.5 -150q52 93 135.5 146.5t195.5 53.5q165 0 261 -113.5t96 -341.5v-647h-197v649q0 160 -55 226.5t-164 66.5q-101 0 -163.5 -70t-73.5 -177v-8v-687h-198v649q0 152 -56.5 222.5t-162.5 70.5 q-90 0 -148 -37t-89 -104v-801h-197z" />
-<glyph unicode="n" horiz-adv-x="1164" d="M143 0v1082h176l14 -161q54 86 135.5 133.5t185.5 47.5q175 0 271 -102.5t96 -316.5v-683h-197v679q0 143 -56.5 203t-172.5 60q-91 0 -154.5 -36.5t-100.5 -102.5v-803h-197z" />
-<glyph unicode="o" horiz-adv-x="1164" d="M97 529v22q0 240 130 395.5t353 155.5q225 0 355.5 -155t130.5 -396v-22q0 -242 -130 -396t-354 -154t-354.5 154.5t-130.5 395.5zM294 529q0 -172 72.5 -284t215.5 -112q141 0 214 112t73 284v22q0 170 -73.5 283t-215.5 113q-141 0 -213.5 -113t-72.5 -283v-22z" />
-<glyph unicode="p" horiz-adv-x="1164" d="M143 -416v1498h151l31 -140q53 78 132 119t184 41q201 0 312.5 -159.5t111.5 -421.5v-21q0 -234 -112 -377.5t-309 -143.5q-100 0 -175.5 33.5t-128.5 100.5v-529h-197zM340 275q37 -67 97 -104.5t147 -37.5q140 0 212 102.5t72 264.5v21q0 184 -72.5 302.5t-213.5 118.5 q-85 0 -145 -38.5t-97 -105.5v-523z" />
-<glyph unicode="q" horiz-adv-x="1164" d="M98 500v21q0 261 111.5 421t312.5 160q98 0 173 -37.5t128 -108.5l28 126h151v-1498h-197v518q-52 -61 -123 -92t-162 -31q-198 0 -310 143.5t-112 377.5zM295 500q0 -164 67.5 -265.5t207.5 -101.5q81 0 138.5 36t96.5 101v546q-39 61 -96.5 96t-136.5 35 q-141 0 -209 -119.5t-68 -306.5v-21z" />
-<glyph unicode="r" horiz-adv-x="717" d="M143 0v1082h176l19 -158q46 84 113.5 131t155.5 47q22 0 42 -3.5t33 -7.5l-27 -183l-101 6q-78 0 -131.5 -37t-82.5 -104v-773h-197z" />
-<glyph unicode="s" horiz-adv-x="1071" d="M109 329l2 6h188q5 -105 78 -153.5t171 -48.5q105 0 164.5 44.5t59.5 113.5q0 65 -49.5 106t-187.5 72q-191 41 -293.5 115t-102.5 198q0 132 112.5 226t291.5 94q184 0 298 -100q109 -96 109 -222v-11l-2 -6h-188q0 70 -61.5 127t-155.5 57q-104 0 -155.5 -47 t-51.5 -112q0 -64 44.5 -99t183.5 -64q199 -42 302 -119t103 -201q0 -144 -116.5 -235t-304.5 -91q-207 0 -326 105q-113 100 -113 232v13z" />
-<glyph unicode="t" horiz-adv-x="690" d="M48 936v146h172v261h197v-261h205v-146h-205v-657q0 -76 31.5 -107t83.5 -31q17 0 38 4.5t35 9.5l27 -135q-22 -18 -65 -29.5t-85 -11.5q-120 0 -191 72.5t-71 227.5v657h-172z" />
-<glyph unicode="u" horiz-adv-x="1164" d="M139 444v638h197v-640q0 -173 51 -238t159 -65q105 0 173.5 42.5t103.5 120.5v780h197v-1082h-177l-13 160q-51 -87 -131 -134t-185 -47q-177 0 -276 113t-99 352z" />
-<glyph unicode="v" horiz-adv-x="1030" d="M46 1082h202l256 -763l17 -76h6l19 76l249 763h201l-398 -1082h-149z" />
-<glyph unicode="w" horiz-adv-x="1550" d="M45 1082h205l170 -688l25 -139h6l26 139l216 688h158l217 -688l28 -155h6l32 155l160 688h206l-314 -1082h-159l-214 659l-41 172h-6l-38 -172l-210 -659h-159z" />
-<glyph unicode="x" horiz-adv-x="1030" d="M46 0l361 547l-351 535h227l227 -399l230 399h230l-351 -535l361 -547h-226l-240 409l-240 -409h-228z" />
-<glyph unicode="y" horiz-adv-x="1030" d="M26 1082h220l228 -681l35 -136h6l266 817h219l-455 -1248q-41 -109 -117.5 -190t-206.5 -81q-24 0 -61 5.5t-57 10.5l20 155q-6 1 35.5 -2t52.5 -3q63 0 103 56t67 124l47 113z" />
-<glyph unicode="z" horiz-adv-x="1030" d="M94 0v138l585 788h-578v156h819v-134l-591 -794h625v-154h-860z" />
-<glyph unicode="{" horiz-adv-x="696" d="M63 543v147q106 0 157.5 61.5t51.5 174.5v206q0 171 82 290.5t277 174.5l40 -117q-110 -35 -156 -125.5t-46 -222.5v-206q0 -105 -42.5 -185t-127.5 -125q85 -46 127.5 -126.5t42.5 -183.5v-205q0 -132 46 -221.5t156 -125.5l-40 -118q-195 55 -277 175t-82 290v205 q0 112 -51.5 174.5t-157.5 62.5z" />
-<glyph unicode="|" horiz-adv-x="507" d="M145 -270v1726h197v-1726h-197z" />
-<glyph unicode="}" horiz-adv-x="696" d="M21 -246q109 36 156 125.5t47 221.5v205q0 107 45 187t139 123q-94 41 -139 121t-45 189v206q0 132 -47 222.5t-156 125.5l41 117q194 -55 276.5 -174.5t82.5 -290.5v-206q0 -113 50.5 -174.5t158.5 -61.5v-147q-108 0 -158.5 -62.5t-50.5 -174.5v-205q0 -170 -82.5 -290 t-276.5 -175z" />
-<glyph unicode="~" horiz-adv-x="1391" d="M128 474q0 136 85.5 232.5t217.5 96.5q88 0 163 -34.5t160 -104.5q58 -51 106 -74t100 -23q66 0 114.5 57t48.5 134l141 -18q0 -137 -87 -238t-217 -101q-90 0 -163.5 33t-158.5 107q-59 48 -108 72t-99 24q-67 0 -114.5 -53t-47.5 -128z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1122" d="M97 520v42q0 202 99 350t282 181v225h198v-227q140 -30 225 -134.5t82 -242.5l-3 -5h-180q0 99 -64.5 168.5t-162.5 69.5q-145 0 -211.5 -112.5t-66.5 -272.5v-42q0 -163 65.5 -275t212.5 -112q91 0 159 60.5t68 148.5h180l2 -5q3 -116 -86 -215t-220 -130v-237h-198v233 q-184 31 -282.5 179t-98.5 353z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1194" d="M70 615v155h158l-10 270q0 204 112 320.5t300 116.5q200 0 310 -104.5t106 -276.5l-2 -6h-190q0 118 -63 175t-161 57q-99 0 -157 -74.5t-58 -207.5l10 -270h418v-155h-413l6 -149q0 -90 -15.5 -171.5t-44.5 -140.5h735l-1 -154h-976v154h10q48 13 72 111t24 201l-6 149 h-164z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1243" d="M30 1456h226l359 -663l360 663h224l-418 -718h312v-123h-383v-167h383v-122h-383v-326h-197v326h-375v122h375v167h-375v123h311z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1604" d="M88 729q0 315 207 531t503 216q295 0 502 -216t207 -531q0 -316 -207.5 -533t-501.5 -217q-296 0 -503 217t-207 533zM209 729q0 -265 171.5 -447t417.5 -182q245 0 417 182t172 447q0 263 -172 444t-417 181q-246 0 -417.5 -181t-171.5 -444zM436 669v119q0 173 94 280 t254 107q157 0 245.5 -79t84.5 -228l-2 -6h-146q0 95 -45.5 138.5t-136.5 43.5q-94 0 -145 -70.5t-51 -184.5v-120q0 -117 51 -187t145 -70q91 0 136 43t45 141h146l2 -6q4 -151 -84 -229.5t-245 -78.5q-160 0 -254 106.5t-94 280.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="923" d="M167 538v154h590v-154h-590z" />
-<glyph unicode="&#xae;" horiz-adv-x="1604" d="M88 729q0 315 207 531t503 216q295 0 502 -216t207 -531q0 -316 -207.5 -533t-501.5 -217q-296 0 -503 217t-207 533zM209 729q0 -266 171.5 -447.5t417.5 -181.5q244 0 416 182t172 447q0 264 -171.5 444.5t-416.5 180.5q-246 0 -417.5 -180.5t-171.5 -444.5zM504 316 v850h280q152 0 238.5 -65.5t86.5 -191.5q0 -62 -33 -109t-96 -78q66 -26 95.5 -79t29.5 -128v-56q0 -41 3.5 -73.5t13.5 -53.5v-16h-153q-9 21 -11 61.5t-2 82.5v54q0 72 -33.5 106t-110.5 34h-159v-338h-149zM653 784h152q65 1 110.5 32.5t45.5 87.5q0 73 -39.5 102.5 t-137.5 29.5h-131v-252z" />
-<glyph unicode="&#xb4;" horiz-adv-x="654" d="M131 1252l185 266h230l2 -6l-269 -260h-148z" />
-<glyph unicode="&#x2000;" horiz-adv-x="846" />
-<glyph unicode="&#x2001;" horiz-adv-x="1693" />
-<glyph unicode="&#x2002;" horiz-adv-x="846" />
-<glyph unicode="&#x2003;" horiz-adv-x="1693" />
-<glyph unicode="&#x2004;" horiz-adv-x="564" />
-<glyph unicode="&#x2005;" horiz-adv-x="423" />
-<glyph unicode="&#x2006;" horiz-adv-x="282" />
-<glyph unicode="&#x2007;" horiz-adv-x="282" />
-<glyph unicode="&#x2008;" horiz-adv-x="211" />
-<glyph unicode="&#x2009;" horiz-adv-x="338" />
-<glyph unicode="&#x200a;" horiz-adv-x="94" />
-<glyph unicode="&#x2010;" horiz-adv-x="923" d="M167 538v154h590v-154h-590z" />
-<glyph unicode="&#x2011;" horiz-adv-x="923" d="M167 538v154h590v-154h-590z" />
-<glyph unicode="&#x2012;" horiz-adv-x="923" d="M167 538v154h590v-154h-590z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1416" d="M179.398 648v155h1085.49v-155h-1085.49z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1660" d="M187.796 648v155h1335.98v-155h-1335.98z" />
-<glyph unicode="&#x2018;" horiz-adv-x="524" d="M145 917v184l101 355h97l-1 -361v-178h-197z" />
-<glyph unicode="&#x2019;" horiz-adv-x="516" d="M160 917l1 343v196h197v-193l-101 -346h-97z" />
-<glyph unicode="&#x201c;" horiz-adv-x="788" d="M123 917v184l101 355h97l-1 -361v-178h-197zM451 917v184l101 355h97l-1 -361v-178h-197z" />
-<glyph unicode="&#x201d;" horiz-adv-x="769" d="M125 917l1 343v196h197v-193l-101 -346h-97zM461 917l1 343v196h197v-193l-101 -346h-97z" />
-<glyph unicode="&#x2022;" horiz-adv-x="695" d="M137 733v60q0 88 56 144t150 56q95 0 151.5 -56t56.5 -144v-60q0 -89 -56 -143.5t-151 -54.5t-151 55t-56 143z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1380" d="M161 0v202h197v-202h-197zM604 0v202h197v-202h-197zM1024 0v202h197v-202h-197z" />
-<glyph unicode="&#x202f;" horiz-adv-x="338" />
-<glyph unicode="&#x205f;" horiz-adv-x="423" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1088" d="M79 512v124h146v166h-146v125h146v15q0 244 141.5 389.5t372.5 145.5q59 0 117.5 -8t124.5 -23l-19 -159q-54 16 -110.5 25.5t-112.5 9.5q-146 0 -231.5 -103t-85.5 -275v-17h492v-125h-492v-166h492v-124h-485l-2 -5q-4 -169 81.5 -271.5t232.5 -102.5q57 0 113 8.5 t108 25.5l19 -157q-56 -15 -117.5 -23t-122.5 -8q-231 0 -373.5 144.5t-142.5 388.5h-146z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1284" d="M103 1374v82h384v-82h-145v-455h-94v455h-145zM565 919v537h116l161 -390h6l162 390h110v-537h-93v343l-6 2l-150 -345h-51l-156 359l-6 -2v-357h-93z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1170" d="M168 648v155h835v-155h-835z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-Regular-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-Regular-webfont.ttf
deleted file mode 100644
index b732d26a5c02b754fe2ab9699c39eff825b90fa0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26024
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-Regular-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-Regular-webfont.woff
deleted file mode 100644
index 18bdd9bccf88eee0dacdb384fae9727cd928c4e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15280
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-Thin-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-Thin-webfont.eot
deleted file mode 100644
index 33aeb8448d44dcbfd86cc61b6f9b2d9fa03f3cf9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26684
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
HkHP-}IfOmA

diff --git a/app/webroot/css/fonts/roboto/Roboto-Thin-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-Thin-webfont.svg
deleted file mode 100644
index c585627c8..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-Thin-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoThin" horiz-adv-x="1121" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="490" />
-<glyph unicode=" "  horiz-adv-x="490" />
-<glyph unicode="&#x09;" horiz-adv-x="490" />
-<glyph unicode="&#xa0;" horiz-adv-x="490" />
-<glyph unicode="!" horiz-adv-x="397" d="M147 0v134h95v-134h-95zM167 478v978h54v-978h-54z" />
-<glyph unicode="&#x22;" horiz-adv-x="610" d="M156 1018l45 268v170h55v-167l-50 -271h-50zM337 1018l46 268v170h54v-167l-50 -271h-50z" />
-<glyph unicode="#" horiz-adv-x="1265" d="M65 410v52h281l95 524h-300v54h310l75 416h56l-76 -416h365l76 416h56l-76 -416h254v-54h-264l-96 -524h285v-52h-294l-75 -410h-56l75 410h-364l-74 -410h-56l74 410h-271zM402 462h363l96 524h-365z" />
-<glyph unicode="$" d="M127 403l2 6h46q0 -199 121.5 -288t289.5 -89q163 0 262 92t99 220q0 130 -79 205.5t-292 152.5q-215 71 -311.5 156t-96.5 252q0 160 104.5 259.5t281.5 106.5v187h55v-187q181 -10 281.5 -120.5t97.5 -303.5l-2 -5h-47q0 166 -95 271.5t-265 105.5q-174 0 -265.5 -91.5 t-91.5 -220.5q0 -131 73.5 -208t297.5 -150q210 -73 309 -158t99 -250q0 -161 -104 -258.5t-277 -107.5v-188h-55v187q-189 6 -316 108t-122 316z" />
-<glyph unicode="%" horiz-adv-x="1527" d="M114 1099v77q0 126 76 213.5t196 87.5q119 0 195 -87.5t76 -213.5v-77q0 -126 -75.5 -212.5t-193.5 -86.5q-122 0 -198 86.5t-76 212.5zM169 1099q0 -100 56.5 -172t162.5 -72q102 0 158 72t56 172v77q0 100 -56.5 173t-159.5 73t-160 -73.5t-57 -172.5v-77zM417 162 l711 1138l45 -31l-711 -1138zM870 279v78q0 125 75.5 212.5t195.5 87.5t196 -87t76 -213v-78q0 -126 -75.5 -213t-194.5 -87q-121 0 -197 87t-76 213zM925 279q0 -101 56 -173t162 -72q103 0 159 72t56 173v78q0 106 -56 175.5t-161 69.5q-103 0 -159.5 -70t-56.5 -175v-78z " />
-<glyph unicode="&#x26;" horiz-adv-x="1247" d="M115 352q0 114 67.5 211t188.5 199l51 41q-82 103 -121 188t-39 176q0 149 81.5 229.5t223.5 80.5q132 0 204 -72t72 -190q0 -84 -38.5 -142.5t-108.5 -114.5l-202 -161l475 -540q54 76 84.5 171t30.5 204h55q0 -125 -35 -227.5t-98 -188.5l185 -211l-2 -5h-60l-157 177 l-8 -8q-3 -3 -4 -5q-90 -89 -188.5 -137t-222.5 -48q-202 0 -318 100.5t-116 272.5zM169 352q0 -134 98 -226.5t282 -92.5q110 0 211 47.5t177 135.5l-449 509q-8 8 -15.5 17t-18.5 22l-52 -41q-137 -118 -185 -205.5t-48 -165.5zM317 1169q0 -79 35 -163t110 -172l209 166 q60 50 88 103.5t28 111.5q0 94 -56.5 151t-163.5 57q-120 0 -185 -72.5t-65 -181.5z" />
-<glyph unicode="'" horiz-adv-x="406" d="M156 1018l45 267v171h55v-169l-50 -269h-50z" />
-<glyph unicode="(" horiz-adv-x="607" d="M148 566v20q0 338 120.5 632.5t290.5 397.5h6l16 -36q-153 -101 -266 -387.5t-113 -602.5v-26q0 -317 113 -603.5t266 -387.5l-16 -36h-6q-172 105 -291.5 390.5t-119.5 638.5z" />
-<glyph unicode=")" horiz-adv-x="623" d="M28 -427q152 101 265.5 387.5t113.5 603.5v26q0 316 -113.5 602.5t-265.5 387.5l16 36h6q169 -103 290 -397.5t121 -632.5v-20q0 -353 -120 -638.5t-291 -390.5h-6z" />
-<glyph unicode="*" horiz-adv-x="856" d="M90 799l18 54l302 -93l-7 324l56 -2l1 -325l292 105l20 -53l-300 -97l189 -257l-47 -33l-182 262l-178 -265l-45 32l184 264z" />
-<glyph unicode="+" horiz-adv-x="1151" d="M73 649v53h462v504h55v-504h481v-53h-481v-503h-55v503h-462z" />
-<glyph unicode="," horiz-adv-x="383" d="M114 -258l67 246v171h54v-167l-70 -250h-51z" />
-<glyph unicode="-" horiz-adv-x="807" d="M99 599v54h590v-54h-590z" />
-<glyph unicode="." horiz-adv-x="439" d="M173 0v130h86v-130h-86z" />
-<glyph unicode="/" horiz-adv-x="782" d="M42 -125l608 1581h59l-608 -1581h-59z" />
-<glyph unicode="0" d="M117 514v428q0 250 116.5 392.5t326.5 142.5q209 0 326.5 -142.5t117.5 -392.5v-428q0 -251 -116 -393t-326 -142q-209 0 -327 142.5t-118 392.5zM171 516q0 -217 101.5 -350t289.5 -133q187 0 287.5 132.5t100.5 350.5v426q0 220 -101 350.5t-289 130.5 q-189 0 -289 -130.5t-100 -350.5v-426z" />
-<glyph unicode="1" d="M194 1347v46l422 84v-1477h-54v1425z" />
-<glyph unicode="2" d="M136 1052q-5 177 111.5 301t311.5 124q179 0 284.5 -102t105.5 -289q0 -121 -78.5 -247t-221.5 -293l-417 -487l2 -5h793v-54h-871v54l497 572q133 154 187 257.5t54 202.5q0 162 -82 249.5t-253 87.5q-179 0 -277 -105t-98 -272h-46z" />
-<glyph unicode="3" d="M109 399l2 6h46q0 -162 118.5 -267t297.5 -105q180 0 280 92.5t100 256.5q0 170 -114.5 251.5t-310.5 81.5h-111v56h111q183 0 288 91t105 224q0 147 -90.5 242t-266.5 95q-162 0 -269 -95t-107 -253h-46l-2 6q-5 177 118.5 286.5t305.5 109.5q188 0 299.5 -106.5 t111.5 -288.5q0 -115 -72.5 -206t-195.5 -131q142 -35 221 -127t79 -232q0 -190 -121 -298.5t-313 -108.5q-185 0 -327 109.5t-137 310.5z" />
-<glyph unicode="4" d="M72 397v30l695 1029h65v-1005h252v-54h-252v-397h-54v397h-706zM156 451h622v929l-6 2l-78 -129z" />
-<glyph unicode="5" d="M184 377l2 6h47q0 -172 96 -261t261 -89q194 0 284.5 107t90.5 322q0 184 -90.5 290t-253.5 106q-160 0 -251.5 -53.5t-131.5 -158.5l-41 16l78 794h690v-53h-641l-61 -618q63 63 137.5 95t219.5 36q174 5 287 -119t113 -333q0 -223 -105 -354t-325 -131 q-177 0 -294 100.5t-112 297.5z" />
-<glyph unicode="6" d="M170 512v448q0 228 127 372.5t316 144.5q78 0 155 -16.5t140 -53.5l-21 -51q-65 37 -126.5 52t-147.5 15q-166 0 -277.5 -126.5t-111.5 -335.5v-299q49 110 155.5 182.5t244.5 72.5q198 0 304.5 -126.5t106.5 -350.5q0 -204 -120.5 -332.5t-310.5 -128.5t-312 145.5 t-122 387.5zM224 513q0 -216 106 -348.5t274 -132.5q169 0 273 117t104 291q0 206 -90 314.5t-274 108.5q-154 0 -273 -103t-119 -244h-1v-3z" />
-<glyph unicode="7" d="M87 1402v54h930v-54q-219 -246 -365 -561t-146 -710v-131h-54v131q0 362 134 683t366 588h-865z" />
-<glyph unicode="8" d="M98 389q0 132 87.5 230.5t230.5 135.5q-125 37 -201 128t-76 213q0 182 122 281.5t310 99.5q177 0 295 -100t118 -281q0 -122 -73.5 -213t-191.5 -128q136 -38 221.5 -136t85.5 -230q0 -192 -130 -301t-323 -109q-206 0 -340.5 108.5t-134.5 301.5zM152 384 q0 -161 120 -256t301 -95q168 0 283 95.5t115 255.5q0 153 -116.5 248.5t-283.5 95.5q-178 0 -298.5 -95.5t-120.5 -248.5zM193 1101q0 -145 108.5 -232t271.5 -87q150 0 253.5 87.5t103.5 231.5q0 142 -105 232t-254 90q-163 0 -270.5 -86.5t-107.5 -235.5z" />
-<glyph unicode="9" d="M95 988q0 206 122.5 347.5t313.5 141.5q196 0 319 -133t123 -381v-503q0 -224 -121 -352.5t-320 -128.5q-71 0 -144 16t-149 47l16 50q66 -32 129.5 -45.5t147.5 -13.5q175 0 277 113t102 312v292q-56 -104 -158.5 -163t-229.5 -59q-189 0 -308.5 133t-119.5 327z M157 988q0 -169 99.5 -288t266.5 -119q149 0 249 79.5t139 193.5v108q0 222 -104.5 341.5t-271.5 119.5q-168 0 -273 -129.5t-105 -305.5z" />
-<glyph unicode=":" horiz-adv-x="364" d="M146 0v130h86v-130h-86zM146 949v130h86v-130h-86z" />
-<glyph unicode=";" horiz-adv-x="364" d="M153 952v130h86v-130h-86zM115 -258l67 246v171h54v-167l-70 -250h-51z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1053" d="M82 515v50l837 378v-58l-661 -308l-119 -37v-6l119 -36l661 -303v-59z" />
-<glyph unicode="=" horiz-adv-x="1142" d="M147 436v54h834v-54h-834zM147 843v54h834v-54h-834z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1053" d="M114 137v59l660 307l118 36v6l-118 37l-660 304v58l836 -378v-50z" />
-<glyph unicode="?" horiz-adv-x="893" d="M98 1122q-2 170 96.5 262.5t253.5 92.5q164 0 258.5 -101t94.5 -266q0 -141 -62.5 -243t-190.5 -217q-69 -53 -84 -101.5t-15 -148.5h-54q1 117 20.5 165.5t104.5 126.5q121 116 174 197.5t53 222.5q0 146 -78 229t-221 83q-142 0 -220 -84.5t-81 -223.5h-46zM391 0v106 h82v-106h-82z" />
-<glyph unicode="@" horiz-adv-x="1902" d="M129 478q18 427 255.5 680t616.5 253q402 0 592.5 -234t173.5 -654q-10 -219 -114 -381.5t-296 -162.5q-83 0 -135 61t-61 169q-55 -114 -139 -172t-193 -58q-136 0 -203 119t-48 318q23 250 144 401t293 151q83 0 135 -27.5t115 -82.5l-49 -565q-11 -152 36.5 -205.5 t107.5 -53.5q158 0 248.5 134.5t101.5 354.5q20 396 -154 613.5t-559 217.5q-336 0 -564.5 -239.5t-248.5 -636.5q-20 -383 174.5 -629.5t551.5 -246.5q87 0 177.5 22t152.5 58l24 -46q-62 -40 -164 -64.5t-194 -24.5q-380 0 -588 249.5t-189 681.5zM632 416 q-19 -167 31.5 -275t163.5 -108q108 0 194 66.5t144 245.5l42 486q-34 39 -82.5 60.5t-112.5 21.5q-142 0 -248 -126.5t-132 -370.5z" />
-<glyph unicode="A" horiz-adv-x="1223" d="M34 0l544 1456h66l545 -1456h-59l-163 435h-711l-163 -435h-59zM276 489h671l-305 815l-28 85h-6l-27 -85z" />
-<glyph unicode="B" horiz-adv-x="1230" d="M200 0v1456h383q226 0 351 -93t125 -280q0 -122 -59.5 -208t-168.5 -115l-1 -6q129 -17 217 -118.5t88 -234.5q0 -191 -123.5 -296t-326.5 -105h-485zM254 54h431q184 0 290 91t106 254q0 144 -107 232t-289 88h-431v-665zM254 773h368q189 3 285.5 81t96.5 233 q0 156 -106.5 235.5t-314.5 79.5h-329v-629z" />
-<glyph unicode="C" horiz-adv-x="1327" d="M144 619v218q0 286 144 463t383 177q227 0 367 -119q136 -116 136 -328v-12l-2 -6h-46q0 197 -122.5 304t-332.5 107q-213 0 -343 -161t-130 -423v-220q0 -265 130 -425.5t343 -160.5q210 0 332.5 103t122.5 310h46l2 -6v-12q0 -214 -136 -330q-140 -118 -367 -119 q-239 0 -383 176.5t-144 463.5z" />
-<glyph unicode="D" horiz-adv-x="1370" d="M200 0v1456h433q251 0 426 -180t175 -459v-178q0 -280 -175 -459.5t-426 -179.5h-433zM254 54h379q227 0 387 166t160 419v181q0 250 -160 416t-387 166h-379v-1348z" />
-<glyph unicode="E" horiz-adv-x="1129" d="M200 0v1456h856v-54h-802v-616h700v-54h-700v-678h802v-54h-856z" />
-<glyph unicode="F" horiz-adv-x="1127" d="M200 0v1456h872v-54h-818v-630h716v-56h-716v-716h-54z" />
-<glyph unicode="G" horiz-adv-x="1429" d="M168 620v238q0 274 151 446.5t393 172.5q233 0 372 -120q133 -116 133 -295v-13l-2 -6h-45q0 167 -119.5 273.5t-338.5 106.5q-221 0 -355.5 -157.5t-134.5 -405.5v-240q0 -260 139 -423.5t368 -163.5q175 0 288.5 57t154.5 131v414h-445v55h499v-494 q-46 -78 -176.5 -147.5t-320.5 -69.5q-250 0 -405.5 178t-155.5 463z" />
-<glyph unicode="H" horiz-adv-x="1438" d="M200 0v1456h54v-707h930v707h54v-1456h-54v695h-930v-695h-54z" />
-<glyph unicode="I" horiz-adv-x="534" d="M240 0v1456h54v-1456h-54z" />
-<glyph unicode="J" horiz-adv-x="1122" d="M93 395l2 6h46q0 -189 95.5 -278.5t282.5 -89.5q153 0 253.5 105t100.5 284v1034h54v-1034q0 -203 -114 -323t-294 -120q-200 0 -315 106q-111 102 -111 293v17z" />
-<glyph unicode="K" horiz-adv-x="1227" d="M200 0v1456h54v-682h198l598 682h64l2 -5l-619 -711l695 -734l-3 -6h-63l-689 721h-183v-721h-54z" />
-<glyph unicode="L" horiz-adv-x="1130" d="M200 0v1456h55v-1402h787v-54h-842z" />
-<glyph unicode="M" horiz-adv-x="1756" d="M200 0v1456h75l606 -1370h6l608 1370h61v-1456h-54v1323l-6 1l-590 -1324h-43l-603 1353l-6 -1v-1352h-54z" />
-<glyph unicode="N" horiz-adv-x="1449" d="M200 0v1456h55l934 -1353l6 2v1351h54v-1456h-54l-934 1356l-6 -2v-1354h-55z" />
-<glyph unicode="O" horiz-adv-x="1364" d="M133 619v218q0 294 145.5 467t402.5 173q256 0 403 -173t147 -467v-218q0 -295 -146 -467.5t-402 -172.5q-257 0 -403.5 172.5t-146.5 467.5zM188 619q0 -270 128.5 -428t366.5 -158t366 157.5t128 428.5v220q0 268 -129 426t-367 158q-237 0 -365 -158t-128 -426v-220z " />
-<glyph unicode="P" horiz-adv-x="1230" d="M200 0v1456h455q226 0 348 -113.5t122 -301.5q0 -190 -121.5 -303t-348.5 -113h-401v-625h-54zM254 679h401q207 0 311.5 103t104.5 257q0 158 -104 260.5t-312 102.5h-401v-723z" />
-<glyph unicode="Q" horiz-adv-x="1364" d="M133 619v218q0 294 145.5 467t402.5 173q256 0 403 -173t147 -467v-218q0 -151 -39.5 -272t-114.5 -205l246 -240l-39 -35l-246 236q-70 -61 -159 -92.5t-196 -31.5q-257 0 -403.5 172.5t-146.5 467.5zM188 619q0 -270 128.5 -428t366.5 -158t366 157.5t128 428.5v220 q0 268 -129 426t-367 158q-237 0 -365 -158t-128 -426v-220z" />
-<glyph unicode="R" horiz-adv-x="1364" d="M195 -1v1456h474q230 0 354 -99.5t124 -290.5q0 -123 -78.5 -223.5t-214.5 -130.5q157 -27 225 -115t68 -225v-137q0 -68 16.5 -122t54.5 -88v-25h-53q-36 41 -54 101.5t-18 135.5v133q0 148 -101.5 231t-289.5 83h-453v-684h-54zM249 737h410q223 0 328.5 94t105.5 234 q0 163 -106.5 249.5t-317.5 86.5h-420v-664z" />
-<glyph unicode="S" horiz-adv-x="1223" d="M89 404l2 6h45q0 -198 146 -287.5t337 -89.5t316 88.5t125 221.5q0 125 -102.5 201.5t-349.5 157.5q-246 75 -362.5 159t-116.5 249q0 164 136.5 265.5t346.5 101.5q218 0 350 -112q129 -109 129 -301v-12l-2 -6h-46q0 163 -120 270t-311 107q-197 0 -313 -92.5 t-116 -218.5t93.5 -204.5t348.5 -153.5q248 -78 369 -162t121 -247q0 -166 -143 -266t-353 -100q-219 1 -377 103q-153 99 -153 309v13z" />
-<glyph unicode="T" horiz-adv-x="1224" d="M57 1402v54h1110v-54h-510v-1402h-54v1402h-546z" />
-<glyph unicode="U" horiz-adv-x="1365" d="M185 489v967h54v-967q0 -207 125.5 -331.5t318.5 -124.5q192 0 317.5 124.5t125.5 331.5v967h54v-967q0 -240 -139 -375t-358 -135q-220 0 -359 135.5t-139 374.5z" />
-<glyph unicode="V" horiz-adv-x="1223" d="M35 1456h59l489 -1314l26 -79h6l26 79l489 1314h59l-544 -1456h-66z" />
-<glyph unicode="W" horiz-adv-x="1855" d="M61 1456h60l302 -1116l63 -236h6l63 236l344 1116h60l342 -1116l62 -236h6l65 236l300 1116h59l-392 -1456h-61l-361 1214l-48 145h-6l-46 -145l-364 -1214h-61z" />
-<glyph unicode="X" horiz-adv-x="1223" d="M53 0l524 743l-504 713h68l469 -671l471 671h67l-503 -713l524 -743h-67l-492 701l-491 -701h-66z" />
-<glyph unicode="Y" horiz-adv-x="1223" d="M36 1456h66l481 -809l26 -50l27 50l483 809h66l-547 -903v-553h-55v553z" />
-<glyph unicode="Z" horiz-adv-x="1224" d="M94 0v44l929 1359h-889v53h964v-38l-930 -1364h962v-54h-1036z" />
-<glyph unicode="[" horiz-adv-x="439" d="M181 -312v1976h283v-54h-229v-1868h229v-54h-283z" />
-<glyph unicode="\" horiz-adv-x="774" d="M57 1456h58l608 -1581h-58z" />
-<glyph unicode="]" horiz-adv-x="439" d="M-8 -258h228v1868h-228v54h283v-1976h-283v54z" />
-<glyph unicode="^" horiz-adv-x="849" d="M91 729l299 727h52l299 -727h-61l-222 543l-40 114h-6l-43 -114l-219 -543h-59z" />
-<glyph unicode="_" horiz-adv-x="845" d="M-1 0h846v-54h-846v54z" />
-<glyph unicode="`" horiz-adv-x="537" d="M103 1513l2 5h89l220 -261l-2 -5h-75z" />
-<glyph unicode="a" horiz-adv-x="1081" d="M92 284q0 136 128.5 228t321.5 92h309v158q0 135 -86.5 210.5t-243.5 75.5q-147 0 -236.5 -71t-89.5 -183l-45 2l-2 5v14q0 117 98 199q104 88 275 88q174 0 279 -88t105 -254v-542q0 -57 6.5 -111t21.5 -107h-60q-13 71 -17.5 106.5t-4.5 76.5v17q-56 -98 -167 -159.5 t-269 -61.5q-151 0 -237 82.5t-86 222.5zM146 280q0 -109 73.5 -178.5t195.5 -69.5q161 0 272.5 71t163.5 203v243h-306q-168 0 -283.5 -77.5t-115.5 -191.5z" />
-<glyph unicode="b" d="M170 304v441v1l2 7v807h54v-668q54 98 146 154t219 56q191 0 299.5 -151.5t108.5 -408.5v-21q0 -250 -108 -396t-298 -146q-127 0 -221.5 51t-147.5 137l-7 -167h-45v295q-1 3 -1.5 5t-0.5 4zM226 263q41 -105 134 -167.5t234 -62.5q171 0 260 132t89 356v21 q0 225 -90 365.5t-261 140.5q-154 0 -240.5 -77t-125.5 -190v-518z" />
-<glyph unicode="c" horiz-adv-x="1039" d="M97 520v42q0 242 117 391t323 149q169 0 285 -98q113 -95 112 -266v-12l-2 -6h-46q0 159 -102 243.5t-247 84.5q-190 0 -288 -136t-98 -350v-42q0 -216 98 -351.5t290 -135.5q137 0 242 75t105 225h46l2 -6v-10q0 -151 -116 -243q-120 -94 -279 -95q-207 0 -324.5 149 t-117.5 392z" />
-<glyph unicode="d" d="M122 521v21q0 257 108 408.5t300 151.5q126 0 218.5 -56.5t147.5 -154.5v669h54v-811v-3q0 -1 1 -1v-441q-1 -2 -1 -3v-2v-299h-52l-2 167q-54 -87 -148 -137.5t-220 -50.5q-191 0 -298.5 146t-107.5 396zM178 521q0 -224 88.5 -356t260.5 -132q141 0 234 63.5t135 169.5 v512q-40 115 -126.5 192.5t-240.5 77.5q-172 0 -261.5 -140.5t-89.5 -365.5v-21z" />
-<glyph unicode="e" horiz-adv-x="1039" d="M97 500v64q0 235 130.5 386.5t328.5 151.5q180 0 287 -118.5t107 -323.5v-83h-799v-13v-64q0 -198 112 -332.5t288 -134.5q97 0 186.5 36t145.5 96l29 -42q-57 -63 -147 -103.5t-214 -40.5q-191 0 -322.5 148t-131.5 373zM159 637l3 -6h734v33q0 167 -91 275.5 t-249 108.5q-168 0 -275.5 -116.5t-121.5 -294.5z" />
-<glyph unicode="f" horiz-adv-x="645" d="M66 1027v55h188v178q0 153 74.5 237t208.5 84q33 0 65.5 -4t62.5 -13l-8 -52q-32 8 -56.5 11.5t-62.5 3.5q-108 0 -169 -71t-61 -196v-178h286v-55h-286v-1027h-54v1027h-188z" />
-<glyph unicode="g" d="M122 521v21q0 257 108 408.5t300 151.5q126 0 218.5 -57t147.5 -156l8 193h46v-333v-3q0 -1 1 -1v-441q-1 -2 -1 -3v-2v-305q0 -206 -108.5 -318.5t-300.5 -112.5q-79 0 -164.5 16.5t-149.5 45.5l16 54q73 -32 141 -47.5t155 -15.5q175 0 265.5 97.5t90.5 280.5v171 q-55 -86 -148.5 -136t-218.5 -50q-191 0 -298.5 146t-107.5 396zM177 521q0 -224 89 -356t261 -132q139 0 232 62.5t136 167.5v518q-40 113 -126.5 190t-239.5 77q-172 0 -262 -140.5t-90 -365.5v-21z" />
-<glyph unicode="h" d="M170 554v35q0 14 2 28v943h54v-703q51 116 148 180.5t236 64.5q169 0 256.5 -107t87.5 -337v-658h-55v660q0 213 -78.5 300.5t-209.5 87.5q-172 0 -265.5 -101t-119.5 -259v-688h-54v554h-2z" />
-<glyph unicode="i" horiz-adv-x="422" d="M185 0v1082h54v-1082h-54zM185 1422v138h54v-138h-54z" />
-<glyph unicode="j" horiz-adv-x="445" d="M-157 -417l13 52q19 -6 46.5 -12t52.5 -6q110 0 170.5 77t60.5 217v1171h54v-1171q0 -167 -75 -257.5t-210 -90.5q-29 0 -55 5t-57 15zM180 1426v134h54v-134h-54z" />
-<glyph unicode="k" horiz-adv-x="969" d="M172 0v1560h54v-953h127l492 475h63l2 -6l-496 -487l534 -584l-2 -5h-63l-509 553h-148v-553h-54z" />
-<glyph unicode="l" horiz-adv-x="422" d="M185 0v1560h54v-1560h-54z" />
-<glyph unicode="m" horiz-adv-x="1836" d="M161 554q0 14 0.5 28t1.5 35v465h47l7 -218q50 113 141 175.5t222 62.5q138 0 225 -69.5t121 -215.5q45 135 141.5 210.5t240.5 75.5q179 0 272 -117t93 -368v-617h-55v619q0 235 -84 332t-224 97q-167 0 -254.5 -98t-112.5 -254q1 -20 2 -40.5t1 -41.5v-615h-55v554h-3 q0 19 0.5 38t2.5 37q-3 230 -86 324.5t-223 94.5q-165 0 -251.5 -95.5t-112.5 -247.5v-705h-55v554h-2z" />
-<glyph unicode="n" d="M169 554q0 19 0.5 38.5t2.5 39.5v450h46l7 -218q50 113 144 175.5t231 62.5q177 0 265.5 -111.5t88.5 -353.5v-637h-54v639q0 225 -80.5 317t-218.5 92q-170 0 -260 -99t-115 -255v-694h-54v554h-3z" />
-<glyph unicode="o" d="M87 520v42q0 238 131.5 389t341.5 151q211 0 342.5 -151t131.5 -389v-42q0 -239 -131.5 -390t-340.5 -151q-211 0 -343 151t-132 390zM141 520q0 -204 114 -345.5t307 -141.5q190 0 304 142t114 345v42q0 199 -115 342.5t-305 143.5q-191 0 -305 -143.5t-114 -342.5v-42z " />
-<glyph unicode="p" d="M170 305v440v1q0 1 2 7v329h42l11 -191q54 98 147 154.5t219 56.5q191 0 299.5 -151.5t108.5 -408.5v-21q0 -250 -108 -396t-298 -146q-126 0 -219.5 50t-147.5 136v-581h-54v712q-1 3 -1.5 5t-0.5 4zM226 264q41 -106 134 -168.5t234 -62.5q171 0 260.5 132t89.5 356v21 q0 225 -90.5 365.5t-261.5 140.5q-154 0 -240.5 -77t-125.5 -190v-517z" />
-<glyph unicode="q" d="M122 521v21q0 257 108 408.5t300 151.5q126 0 218.5 -56.5t147.5 -155.5l5 192h49v-333v-3q0 -1 1 -1v-441q-1 -2 -1 -3v-2v-715h-54v582q-55 -86 -149 -136.5t-219 -50.5q-191 0 -298.5 146t-107.5 396zM178 521q0 -224 88.5 -356t260.5 -132q141 0 234 63.5t135 169.5 v512q-40 115 -126.5 192.5t-240.5 77.5q-172 0 -261.5 -140.5t-89.5 -365.5v-21z" />
-<glyph unicode="r" horiz-adv-x="685" d="M172 0v1082h44l10 -188v-37q45 116 134 180.5t219 64.5q23 0 42.5 -3.5t33.5 -7.5l-6 -48l-70 6q-145 0 -235.5 -93.5t-117.5 -246.5v-709h-54z" />
-<glyph unicode="s" horiz-adv-x="1019" d="M112 269l2 6h44q8 -128 110 -185t241 -57q150 0 238 70t88 162q0 86 -73.5 156.5t-256.5 110.5q-193 41 -279.5 105.5t-86.5 191.5q0 116 98 194.5t264 78.5q179 0 282 -84q98 -80 98 -207v-12l-2 -6h-46q0 106 -89.5 180.5t-242.5 74.5q-152 0 -230 -65.5t-78 -151.5 q0 -85 66 -145t262 -105q181 -42 274.5 -114.5t93.5 -202.5q0 -127 -104 -206t-276 -79q-189 1 -297 85q-101 79 -100 190v15z" />
-<glyph unicode="t" horiz-adv-x="633" d="M29 1027v55h200v292h55v-292h266v-55h-266v-748q0 -133 45 -189.5t119 -56.5q27 0 48 2t58 7l10 -49q-25 -8 -52 -11t-61 -3q-109 0 -165.5 71t-56.5 229v748h-200z" />
-<glyph unicode="u" d="M168 465v617h54v-619q0 -220 81 -325t219 -105q165 0 255.5 80.5t117.5 212.5v756h55v-637h2q0 -13 -1 -25t-1 -28v-392h-45l-8 190q-51 -100 -145 -155.5t-228 -55.5q-167 0 -261.5 118.5t-94.5 367.5z" />
-<glyph unicode="v" horiz-adv-x="978" d="M43 1082h58l334 -853l51 -146h6l52 146l333 853h58l-421 -1081l1 -1h-52z" />
-<glyph unicode="w" horiz-adv-x="1550" d="M83 1082h62l221 -769l56 -222l6 -1l71 223l243 769h55l242 -769l70 -223l6 1l58 222l220 769h63l-315 -1082h-54l-271 813l-45 168h-6l-47 -168l-267 -813h-54z" />
-<glyph unicode="x" horiz-adv-x="978" d="M55 0l400 555l-380 527h68l346 -480l345 480h68l-380 -527l400 -555h-67l-367 508l-366 -508h-67z" />
-<glyph unicode="y" horiz-adv-x="978" d="M43 1082h59l356 -886l40 -108h6l6 16l374 978h60l-481 -1262q-44 -114 -102.5 -185.5t-186.5 -71.5q-19 0 -42 3.5t-34 7.5l9 51q11 -3 33 -6t34 -3q92 0 143.5 54t91.5 160l65 176z" />
-<glyph unicode="z" horiz-adv-x="978" d="M87 0v44l711 983h-680v55h753v-48l-711 -980h770v-54h-843z" />
-<glyph unicode="{" horiz-adv-x="660" d="M73 543v66q128 0 189 72t61 204v247q0 171 73 290.5t246 174.5l15 -45q-143 -46 -211.5 -155.5t-68.5 -264.5v-247q0 -120 -52 -202t-159 -107q107 -26 159 -109t52 -202v-245q0 -154 70.5 -260t214.5 -155l-20 -46q-173 55 -246 173t-73 288v245q0 132 -61 205t-189 73z " />
-<glyph unicode="|" horiz-adv-x="406" d="M181 -270v1726h54v-1726h-54z" />
-<glyph unicode="}" horiz-adv-x="660" d="M0 -395q143 49 213.5 155t70.5 260v245q0 119 51.5 202t159.5 109q-108 25 -159.5 107t-51.5 202v247q0 155 -68.5 264.5t-210.5 155.5l14 45q172 -55 245.5 -174.5t73.5 -290.5v-247q0 -132 61 -204t189 -72v-66q-128 0 -189 -73.5t-61 -204.5v-245q0 -171 -73 -288.5 t-246 -172.5z" />
-<glyph unicode="~" horiz-adv-x="1412" d="M156 474q0 128 73.5 214t188.5 86q86 0 158.5 -39.5t164.5 -120.5q67 -62 125 -90t121 -28q86 0 144.5 70.5t58.5 186.5l61 -13q0 -121 -75.5 -209t-188.5 -88q-87 0 -158.5 38t-162.5 121q-68 59 -127.5 88.5t-120.5 29.5q-89 0 -146 -68t-57 -190z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1110" d="M134 520v42q0 234 110 381.5t305 157.5v217h55v-217q158 -10 264.5 -107.5t103.5 -267.5l-3 -6h-46q0 159 -102 243.5t-247 84.5q-190 0 -288 -136t-98 -350v-42q0 -216 98 -351.5t290 -135.5q137 0 242 75t105 225h46l2 -6q4 -152 -106 -245t-261 -102v-225h-55v225 q-196 11 -305.5 158t-109.5 382z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1150" d="M65 667v54h241l-11 319q0 204 101 320.5t270 116.5q175 0 256 -102t78 -280l-2 -5h-47q0 176 -73.5 254.5t-211.5 78.5q-147 0 -232 -100t-85 -283l11 -319h478v-54h-476l8 -201q0 -125 -36 -235.5t-102 -176.5h808l1 -54h-912v54h10q89 16 133 145.5t44 266.5l-8 201 h-243z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1207" d="M58 1456h65l452 -718l24 -51h5l24 51l451 718h66l-489 -780h424v-55h-452v-240h452v-55h-452v-326h-54v326h-450v55h450v240h-450v55h421z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1666" d="M123 729q0 315 207 531t503 216q295 0 502.5 -216t207.5 -531q0 -316 -207.5 -533t-502.5 -217t-502.5 217t-207.5 533zM179 729q0 -290 191.5 -492.5t462.5 -202.5q269 0 461.5 202.5t192.5 492.5q0 289 -192 490.5t-462 201.5q-271 0 -462.5 -201.5t-191.5 -490.5z M506 669v119q0 172 88.5 279.5t231.5 107.5q139 0 218 -79.5t76 -227.5l-3 -6h-44q0 129 -64 194.5t-183 65.5q-123 0 -194 -95t-71 -238v-120q0 -145 70.5 -238.5t194.5 -93.5q120 0 183 63.5t63 195.5h44l3 -6q3 -150 -75.5 -229t-217.5 -79q-144 0 -232 107t-88 280z" />
-<glyph unicode="&#xad;" horiz-adv-x="807" d="M99 599v54h590v-54h-590z" />
-<glyph unicode="&#xae;" horiz-adv-x="1674" d="M115 729q0 315 207 531t503 216q295 0 502.5 -216t207.5 -531q0 -316 -207.5 -533t-502.5 -217q-296 0 -503 217t-207 533zM170 729q0 -290 192 -492.5t463 -202.5q269 0 461.5 202.5t192.5 492.5q0 289 -192 490.5t-462 201.5q-271 0 -463 -201.5t-192 -490.5zM593 316 v850h239q143 0 216 -61t73 -179q0 -73 -40 -125t-113 -81q70 -22 101 -75.5t31 -129.5v-56q0 -38 4 -71.5t13 -55.5v-16h-59q-10 21 -12 61.5t-2 82.5v54q0 94 -42 134t-142 40h-212v-372h-55zM648 744h205q91 0 152 48t61 135q0 96 -52.5 140t-181.5 44h-184v-367z" />
-<glyph unicode="&#xb4;" horiz-adv-x="511" d="M119 1257l220 261h78l2 -5l-231 -261h-67z" />
-<glyph unicode="&#x2000;" horiz-adv-x="832" />
-<glyph unicode="&#x2001;" horiz-adv-x="1664" />
-<glyph unicode="&#x2002;" horiz-adv-x="832" />
-<glyph unicode="&#x2003;" horiz-adv-x="1664" />
-<glyph unicode="&#x2004;" horiz-adv-x="554" />
-<glyph unicode="&#x2005;" horiz-adv-x="416" />
-<glyph unicode="&#x2006;" horiz-adv-x="277" />
-<glyph unicode="&#x2007;" horiz-adv-x="277" />
-<glyph unicode="&#x2008;" horiz-adv-x="208" />
-<glyph unicode="&#x2009;" horiz-adv-x="332" />
-<glyph unicode="&#x200a;" horiz-adv-x="92" />
-<glyph unicode="&#x2010;" horiz-adv-x="807" d="M99 599v54h590v-54h-590z" />
-<glyph unicode="&#x2011;" horiz-adv-x="807" d="M99 599v54h590v-54h-590z" />
-<glyph unicode="&#x2012;" horiz-adv-x="807" d="M99 599v54h590v-54h-590z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1412" d="M172.898 721v54h1085.49v-54h-1085.49z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1673" d="M179.796 721v54h1335.98v-54h-1335.98z" />
-<glyph unicode="&#x2018;" horiz-adv-x="430" d="M172 1019v166l50 271h50l-46 -267v-170h-54z" />
-<glyph unicode="&#x2019;" horiz-adv-x="430" d="M155 1019l46 268v169h54v-166l-50 -271h-50z" />
-<glyph unicode="&#x201c;" horiz-adv-x="673" d="M172 1019v166l50 271h50l-46 -267v-170h-54zM422 1019v166l50 271h50l-46 -267v-170h-54z" />
-<glyph unicode="&#x201d;" horiz-adv-x="657" d="M186 1019l46 268v169h54v-166l-50 -271h-50zM388 1019l46 268v169h54v-166l-50 -271h-50z" />
-<glyph unicode="&#x2022;" horiz-adv-x="635" d="M155 703v70q0 70 45 115t121 45t122 -45.5t46 -114.5v-70q0 -70 -45.5 -114t-121.5 -44q-77 0 -122 44t-45 114z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1255" d="M211 0v130h86v-130h-86zM595 0v130h86v-130h-86zM964 0v130h86v-130h-86z" />
-<glyph unicode="&#x202f;" horiz-adv-x="332" />
-<glyph unicode="&#x205f;" horiz-adv-x="416" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1060" d="M82 553v55h187v222h-187v56h187v56q0 244 130.5 389.5t342.5 145.5q54 0 107 -8t115 -23v-58q-53 16 -109.5 25.5t-112.5 9.5q-193 0 -306 -128.5t-113 -350.5v-58h593v-56h-593v-222h593v-55h-593v-39q0 -219 114.5 -350t306.5 -131q57 0 113 8.5t107 25.5v-57 q-52 -15 -108 -23t-112 -8q-212 0 -343.5 145t-131.5 390v39h-187z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1247" d="M90 1399v57h384v-57h-158v-480h-56v480h-170zM552 919v537h75l181 -452h6l183 452h69v-537h-55v421l-6 1l-169 -422h-51l-172 436l-6 -1v-435h-55z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1167" d="M163 721v54h835v-54h-835z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-Thin-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-Thin-webfont.ttf
deleted file mode 100644
index 571805d347fc9519e339ed4acba48f69bb48364e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26500
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
b&NrHG-MDqlX}<N~)_r~Qc9@z0kHP-}oM9&=

diff --git a/app/webroot/css/fonts/roboto/Roboto-Thin-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-Thin-webfont.woff
deleted file mode 100644
index 59e9333ee5cf29f892bae73aa12cb146d1c59d11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15568
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
V#6PB?(zCz74n7bLSY#pq{~zM2EgAp-

diff --git a/app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.eot b/app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.eot
deleted file mode 100644
index 123aae82e535b9771c4b63d21753be9800676191..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33324
zcmdtL2Ygh;{x>{x%JyuwB-!-rW<z=*S=c4CM0)Qa2&f=kMFb0ihyo%YTpKFa-noLv
z*-fxui@i5QyrNgptM`hcSG^h($l3S%o3k52tk3^>KcDA)-fU*hIdj^~Z+`RZGpBMD
zW0Nmqj5CRy_{aGXQ7~f6e<XHbs-KPVCoZ_1Gwkxww}1NS1Bs#z8wVT5&S5i=&O>4>
zgH2%b*nGASHw{JE40aZd&cK;+Hi^w<i`fz!pCiuKvTD|~{nrb3)ZwTWKgNnqc&`69
zpNdO4k_VZ>{DTHf7<qc8=Xn%XqBM8#fPsTp6V5O`1jqitV@8ipd*j;)IG)E?+Bbv8
zPwY3~f)VGV-jnJ4=<zjm5AQbLh2y0-KK+cdXDpifkFRFq`0u!9&lwk-=U1kf8yL$Z
zSQO7$H23V(=9;ZI-piOYd+v-Si%{-jET=cNmbqtLG-v%)qhdH7z}Ts-d9!ECI#&2K
z_Af#mSa==^9G|L#al8@7Mf1)+Z)s~<R|}3cJTLRCbIzEt<HIe77+d}l-tRnn#?nRn
ze%{8|#i$SSFPw4q>_SHa>VEN0I3HVd&XV)0XLP%au}e@t{>Gxkvllfv=kH|f(u;BZ
zek6hxdwKmi1Z4K=;IVkF*uE;xIB}3kB|s34-{nYvo<JA6)5h{yCF27IjhMhJ;tY$&
z#hv`j*^3vV%y<LcMJOgShcqqa4#p)#TwTH@<98}s#4cd#*k9N!>{I-{VBfHx#NIkC
zaR)DCU+}Jc5TC|p@{Rlkeha^g{|)&q{9pVBuJa$nQ|L*Yox<$&<oGwNF#aq%IsPAZ
zO8jF{BcuFl=7|4`HO7Bnr{f&jfU`34Z`n}Xb4vV6=El+UEH$3N+(>yyMK~T1|A-BW
zf5iqP4M7@)G!AJ3(nLIQGVYub|AI|JT8VoII_cv1Us22Pgj3>A3mAB@caJE$ot?~_
zOvTxMut@w}Rv-V2^^6~4y>W~>>5t&ayKwc3;+kgWU}>xo^_v*~l%3AJqV!dirlQn=
z(yvhJ6z|-No?-C^nH5*kT`BQ5ag7IU{1Vsw9dP+lJmHe~JEA79;w_(xJHHkAmm>cW
zPiAP33JkU(8SnQ14qpHcUjPnY01jUO249G$EyFd-kuFABfh1$dr=pE+^om=&=SP&J
zh-ZI?V+Wp$*5lbWlohculvS{9z?ul_gW3*Y16dXuf_ri>{KvCAHW9x9HU&RFo64rK
z09%GP1sS(j3w*M&Tvly*$^4ClS)8_S?KZn#lxMJdK%pm|*_&nX`$T`Rcnh|aGJYj}
zfwJFAU*i1#Bz=YZ{=b|)Lj5R#W{UKG`|%&a`nUS{kM8Su{*Pdkd`HK7es4c{J#Fc_
zWM3qYJKx*6JlTIq{7hb-JWg(t<(;=3-{0}so$pK5>({oOVbb~D<U5k(e|FosuK%Zw
zJGbwTj+5<8ZvUvg|8KV|S-(HK{k1;*<1*r!ofC1<&WX5c=R{n#b0V(WIT07`oQNxT
zPQ;}<C*s<j6LIm*iMV>_L|ndeBCg*#krdE5kyOw*k(AIm4aI2x2RI_hT}ZV5y9tsY
z<b_|RcTq;E^Zm*4<n}XMlT697U%RjKbCSo&cXzz^m-mxw(>al>(>ams(>akW)H#uS
z_ZFV0;R#>k>{~*D`-W9Pg6o0w2+m`iK?3>J^t*gLIX?e?yd}8&UjhS?JUb_nL^~&v
zOgkr%cRMGNTstR{WIHF4Y&$2CbUP=Kd^;zS%sVHNj5{ZilshMqoI59yq&p`Qdhifh
zatJj)gqj{g%?_a^he)1|uK^8S1Dd-AG<FSW%o;I14q<#8!uU7@S=$ONsSJ{Kch(ou
z^(e^ar!vX(8p+D4U;P&HHnhI@8}T3G|A|NAKg1u4uZ;f)&FTL5T^Lh;;t$#c{^DQ6
zU;Yyp)0O`;t^-x@kOuZge~IUR8GkqaRs75NP4R=je@F89zjqbryZ8f5!5_546aI|S
zjz#fDh<4)2TcPE+;&;ZMLr=NlQIr%@X}l?(8NV+6ZTzbEMseNW<DZDF0h>-Wrnkpi
zI<_OeJpNStmG}iHKUe=c4vRv3Y}^g(`mH}`YxEcYudy}q_yzG#^vC1>I$nyN{GC72
zYJU9>*dU%9-$Un(wqv^ssQ`)U_klPg&g1Bl_`k(5WEmV$PJAu#C)%61(kO}_ivKfy
z2d;by7~qb-58c(nJkVlO;#E`{KNx>4{&&Fh;rI)5UGh&r)tT%c!S^nww<A4A*FeJ;
zfAP<a9u_rW$?Kty8fQf<jr~N)ceIT^(Xs50_kSO{9q%`;JdT-h@xJ3%{NmVv{`beP
z_%nO3Z2ZYT<9(nHiNDTw8gNUVZQrJLt|wr2JyJUswx9QidtArgkbFj*`b&(uWJ$;E
zFR!Pwzg{ZN{A!Ckw<h_9`1P<8b@+?lU>uOvWxNG+a36LhRw(Qh*}`6t&AQ;nSuuVJ
zE5T1@rTD3^U{vDTD*S9PXjU^btHIAAOqmi)nsvA`gr5~wjtDcc9{AZ{pQr~-?unn1
z^}^2qOGR(sW*_`gVF?)k+A<J7SYPmS!zwZalwdf1X>1G|i+mh@>9CTF$2DXp@d-Og
z2J9qLLCvS(m%*mvmnCc_*{EZYXpbV=qu?#6csD4RpuleI=i%qXRYj-`wNrx8wmi``
zpJ<5$9?}gZVf@lWd(5IevS^P@w8tdclOoz<@6eufv||X~HVi+PXoFX@K^1NA!o)iP
z<&*Hs5cWNbXb%_daf|kF(H<*X$}U2k$r7ZnmH0VPqZHA$<F=(zlvM!gW?@@$0iJ^Z
zA%bGIfMO16Fdo(;f}CHxDS$UkN1xMkyP*F$k_}hn|H9sh6Zn(m*Vqxfm8mzWAzWTy
zY~{Dv9LcyMksn~vf5tHXR2=%LXwgNBm*DCC13(5H$EHj9VL#)ykH#C7o~ni-KWb0b
zQzPYyx-j+{N~l)3Xg6I|it7|$+9m7`b~n41-OnCm&3>Cd&7bAZ^B4My{Wbp6{0{^Q
z3q1$OPD{_dgWV;r+<_~Z-{sHr=l=3a(B)_1PlG!>5#Jr(bzs4P*#~AGIQ_u115*x+
zJy7`ZzK>^owAfF!;XnPyA;Bas=hU_nK_pJfifS@jtTwwN#hL1Id%S7s8NSS{?3~=Z
z`~rWVFj&;3xTLhKyrQzIx~6MwU8r04aHL0l&tARz^lfN7sb7Cs`v(shI&Aoek)uYB
z89Q$Lgo%?*o;>B0sne#PdfMqT{zP5Rm<3p}d2?3JPhLDbxzlmGa;7+1deOxzmMs^%
zt2&<k?R|Z?=;56hJtT`oFm}QiVU?g4wHP&hfqxTNBSYs_YRo%aD<3mi8+O4IjRhMr
zHB-gpK2t>5iYflR8uwObR%yJ_zh84yRB2M>@Nts|2B!q7G`VtqreA9uGdZ9&PN~wA
zO1d==3@n@ckDS-1<lwr=Z8=|0$q5EDwPLb1=z=NY#FQy`o?4kQ?UX9bR2ePg>+p8}
zx@psLG=|5RE2BlCsIk4sQt5H~>uahsYo&h$z2rGO->=DCh6eqbQans!V<vByy<vu*
zc6#Il0#kA}h@)}F5xvl6)XtUT3g9L7O8*|w97m<UMl)ATo9y=w4i1{Jz(3hPYo_rC
zx-Ny@j92?N_y=zoG$Xjdzac1I7u49e$yy_>MEmHqTH|awz&%d!rat>J1A!d>z6}5a
zZW@ZZO-$4c^}}VUl|lc$#LI*J$-~Fz1T;Qn@&+_$XmCT&zhUTx;0&q>HHUJlkBhp&
zgKltB18B$7sR5{Ha8Pi@g3~*;gl_d#q7fUeAg~Ra72IIf{9`8f&S}A!w8|#d$Q%3h
z<HH|u!G|Vtx_BaL?%yzOa&RVUAMBTd4G;DM<QvCLj$w@VKcioa`#Cn6{|qf_cCM%?
zo|s;#p%idI1`&&4NOI7HRE);{IG79CBZFctV=<hm(Bx1vx3B`GLX+xZs*Dm-h-;P_
zjqhugQdtE~F#kSxvn=+T6p33ZqGszsO>#w5UJ*4}4@RxLLJMc_ZW!6RiKSQA6pgu>
z6sCIdbXSvEHhC+gsA8_J)*7=p>slL%gv_!xB==7{Els{QeC^t`{3ChKv1-&6eo6U=
z6h<9YaLyN5OhS!fvc(z-g_=PHZAwK<HQDRx>bT~p(b&GInsQK6T~P^Dkx?tz6*Xbk
zj#9fTYQe4*6-+TI*eCS$AgZ7f71VeO?$eZ(-3_N5c2a4SaSK{SCuDJ=Pw;EEak<H*
znOpEc&DP;^&@s&-PFU##YvPL8R*gU2zL#il4yP7}yp$gpml?@CdG+|raOTPK5$@Qw
zRsYV&sjnnZ38oxG`*YwE8N^}$ScR4zikYcr?0^B!Hm6iX-MOJql&J@!USC~Zv#N-~
z)O-}G3i>03;N!1}26zSF?TrMy0i=*Dk~ts;kb+)HbgIV8GauC7weap6dTiilZ|HF)
zi(B-=5Ar;-{{Ffi>-6i_^|)dfKkGsLI(}0($r0vv=%-T(xBbvfpTlpWgmQsvXT`fJ
zWu}#&cmHIua;kj^Dy1Hbm8-UjrpEG8YlT);7jsj4(n8T3oN?#S8Mg;#yr_4T=vN6n
z2ox(r50;`|OI=Y9cD>m3x}urb^`T#@6Nopt^#kfCt<2TrF7p8IN?lE9rCx7EQwil%
zUQXq5lRK@Xocaho6P1|TqsjGJnLFl4DX6cn*GfH_TCaKBF?&t`$I(o$+Y_@E2I-v7
zt!33SRM_ol;tpS7k*}UW8!}~t>cWw5aY;3g^yLjaWX|X2V7NF~Xfm5Jd^m9OR33~}
z^RuLyy!Rfs^<N(E+BaU?=JS2kloQF>5z7wyZhzpu_ubx$|NhbrU*;EDb|m}ZfAP)g
zo7;9@a>X^H25;MX-_z#D9<zP&%#PO{U3taz!-j6Vck2_j#~(MnPB^2o7vo>4XR6Ob
zJ|e8C0+;!Q#VP>%Xs!8ROaZ8)ndXDdJ&Gz6;7$+hy6s}uZ9d4g-Zjxa2{`s|9o=Dk
zM4igdS`ILNQtKN6ylE~iy(MZvsTrk%T4#z<ze@|WM5|HStHZV3Tw3>*XemldT3Dlt
zakIslmY(Ael$2I?>)wm{pyMC^<4eR~iuR~=d!o7Mt!SnjdwKcwq8s}1P+dkUck*Ci
zaYS@U12_7>%YD2Hdgiyzzi9VHmo2``V^7<8;rXkFxuz|cxgpi=nmTXhrqt8r#ihrt
z;tx7J(TkR>@;K6VE<F#IOvNQG2R3JHNL7Z9T(v!V@yJ#8@4R^KrfX-8oO{*gna6C(
z;)0`p**t31Htph3tMA{rV&0}}&lt7vicRxK+M68zN?C>eDun*fhn>V?Iq0jHpE|5q
zIT*81hxJm>HGONe^nK9`V0r^EJ|i9YnhhN6RqXccQrua&Rox6MB)k*oheir?<9$JL
zoZRdSmf*M@CJ|gk1ssS8kN|6erIX!vZ0y;;yVLjR)hjP?r%W63DPPzB6jvmD#;Du+
zuX4`YyZo6wW74<op1*&pzR8wi>Uq<0E~ixY{c^xytMjz8mfXruzu>X?WplPqz4_*A
z&Odok&pX@xJ@WB0SHCpry=cmm(_h_oW%G<F{78!1T6V!s>7QfoopN8@nLTGNyiU*y
z(0hKFp!bUnYEK-=p!AvwYGC>mDjzi`=y~<m;STtkq~|jZ=TK>9dd{L;0dW@j353}o
z$*6~Y`~CWV!4<dYwbFa0G0?~^Wty|5IYnjlN(I+EHBoP3q?~%#WW3q!(xjHC9e8eS
z(cG>k=9WNqIOSj%O*XsLTM<Jcar2<b>GsrXygr6v>>+H0TN5lJxo2Q`3NF-A1!j9#
zB;+$O*(`Z{=8|G*i(Jba9y8gu>aSNQHP>!RH{E)N6i(x(Nqy%R&2D>Ee=b{pxb5w^
zMSPyri|7N7U$58ly`nwqnP#qOw*0a^(+_i_Jz#)pix~O#77*YjSppvi+b3@BbTv7g
zb{wWq9>b{)ty1b^D5mx~&@fqXq|o^0?R!SUEM_#!iiXKy=8bryl87(EgSIhq@XY&o
zs7k52c4NBfraNlnZu$#PnDmLWr9Qk*HXkb0%qik?+nV(U)AVcF-aV7#npOO6xk~8`
z-S7++Q=khH?$|8M457sV+)1s`<b6>E!^f5Awxx$(Fq#PtFSTe2HI_vsmGFXcs$^7=
zQAZ2LnPMYaZ?dN(Xuaz7$z6P^*KFq{-c{M$UmmI9A&36L4c-2-zw~3dAUvH9ko3pq
zcb}oh1Kgw^_CvO!_?2swA<9FLXf{CXuZddhVAR}n5U)%KGPZprr)XAJRK`H38Ye`S
zhM}$JQ;ikPR;?-3n#~op0@oB=sQj$rut~DX=o+i5Nwq5I8VluAZl`jYdLoHpl4`M2
zpP-QmsQ?mzkOWS#@Ha+8M(|H8dcp9>aA|#a{*!L$u3PzG!k?qM4phAzoMt%HzgZH3
zm>8SVJ`%f<1F~Uw>)LiS;w=hQ(g_)h#kh>IcjDla!7Ed_Ixjn%b(XHTZr^%@`t)q+
zWa(LH6R2cBz=}hjLE@T1gn&d+^e#!BMib0uTclAI>Ev)2_f7}4zsOeM-mxc0w|+yq
z#T6AK?BY;7&X91sc93wfPmdPD>`AQysVOoyz(qpq^t4H7tArZJ<1fZn%cDWJpud}W
zh}X*_dmU?9VXFH19U5~ITMQasmf*=3u$Y~QyBoya;KtOT+?r_KiSJ6trR{uoc<bd<
z1+63BWe+D=DRm|N@n4jPq1LrFhkID4&SRD(7A%w^CJzoGUZVMud2wS2ckg}q#V(B{
z`geO@eq~zW-A^_j4m1|t_2jOf{F1~U;4)9s4;<Df=tuQ$xc}!*be%ii<J&%K(|>xO
z+Q>QL-=tQwQDx_2{Go*ye?nr9a>?ayscFWU%L&*Z;>rn#;wXH&Of-#GJ3+Qpjk}`E
z_Op=WZ9ngB7}mOyPD8}CBnGLbf|el041?4drs#hj=>id!_crsUkHY)Z{?!wX^ir=8
zbpr-45UuB732HQOA({#3yNI<~uw!wN%xQ60QM;TPEoEQS?l>6D1zJTjNi5{`n#CPW
z@sV^9iV!<Bq={fjxX56#X6_4^$6BP5ZeHi~ZP@X^L0^@e!L85lcs$$l=ng$sk~1w~
zsrOB9p0Rb?-g`}teD}tqmwdNF&o+e#cJL;Dr36sFN;b=olSy)q<x~AKu#=Hb^~=b%
zRy3zN%JU(%rCNY9C&<P*AQf4tHKgFAEX$$}$fw|Z5Li>)T2Z~0;n8vgA88j<D|mxs
zh^!={c4!bpRg)4dESe%$XTQE{$5)xzFTZq-ne%gY{+O0=W9*ineN~c=r$4gm`5e!-
zRcqIz<?G)++l0`-t4x1;?XkO}w^XX;M^@jsyX6+sBYWR#UfNtz^vL=b-u@8nC7U8s
zx?;SLm+u-Dvl6yg3~Uh`-(i)|NF{~z8Vq@}jVPnLMzijVT0meR{EJaJto0H?3?~Sl
z=4??(0h3#r6boowlbLd&gf^>_m=xtQ7<e_`B||k!aT4kn<S*(-bh6}5uvs3GL*^jR
zsf#b*Eirdf<gq8+*k)<#74Fq`yDZJQQk}s!<tyqjZ&+W#H}z8GJETj|k9VLSi4GLN
z;ug!JQBM6R@XTvE*yPM}St^=+_B<C_=c6u!*#T;6LcK{v*Fi}`)3jo69%pLx%PgAe
ztbUmq+c*E)8>z9Xmg>@6EnvTzw`F&qfBok%l-irpoKS6I$d5B&rlnQ$n9G}HG!s0{
zP;pq)3A6xGpP;c&_m_By0}y(X;0QtS4ykL-y;~pq(4V*Y-kaVGmpm`UENv_QI{1!j
zc0N%MZ2f5a9==R%+W!9Dr(Qp6o=eW|-gZMnqoV%w_P_O4sh_t39;ss7mBPjv%Or^8
zn-X--t{iOk6lIbY;vo`PRue5xbnMX9rAEgJ)jV1PCg*HvN-aSj#*lYtBXnSAY6<mZ
zHSe%5h+fq00s5OQG;DKt800U*XRb!O6f+u0#E>xDpoOHg(TU*J{y|>y)bK6!dA%;2
zbcg<9L1p7tS3b2X;MWheJpAS<g%51I>qvINwYxX#U#G*a$y>hWnT186F8T2{_4gNU
zinD+0{h1ekdq9tWz5U%iZ<1e-GmuDSHSod#J9f-M*lrGi3j!KIZ?2`(XqJ6sM~ONU
z02tTWYybc#ZEMlYB$_mt%p`YNTuoMs4S+y?91t;_Bq0(e7~-sy8!%uN^tCMdI$%~H
zIR+yh#^1NdcUj_0U(quyoYsTS;c4o!aJaQ?gMR+%)qJV6h{M$=vk~aOO7x!(5tucw
zt;f=-2XlbaR;qjzdaxvrZbc84P&>NTL~Ds?mIMHIIaMfQz$Pdo?Q}9hRt&YQ$N;)G
zsWk%!N2I-e{rQ)9b9w4h+uzCY?pSf@)!uylz;iGBI6nKGhwtRJOy8^bZ`Z%N#P{UA
zSAUzH@z9O8werh1JX2J>Yv~g$FE?M>6fAx2vKQa^VE5KXT5iAn(H5!ujepawx^Cx#
zgpYTlJt+boOV}nBvr%h^56je=E@(|=zD-7JGEHbrX$=`15`<>C(H&sEg)LEY>d%^~
z1)R7kJ*^PLB|v!$`^Wo33)Hh+CUaVPpim$u$WF&2qi-@vX-#noI1ze+I}=70mqhY`
zp5cg>1|jg1j0%PZ%kK8`yr-Yo+hur>e(2?aR}aqYvwXt+KjfDW`p0Fv-kh3q_x)FW
z*3%W-asQohCV#k(d-We$b?d>O0{M0RoX?-*1@q43DNpVE;_k)s{`GJDDESEb0YU4P
zh^v^nKW8p8^qj@=u6R6t3@rX6rKhU|CClVTTqc$Zdp>8Q**bZzyc6;(^EOD_%+2XO
zZXV55NnT-T>$BoqX|7e0EqN(?Sx^17E~X;=ZD<}6Tf>_bhkO~Z$_zeCk}o7V2y#Rs
z$;L>A!-N>eBLVXotK83e>?q~DIUMFULZ}mCDZ<vvkI6KaSOe#g?j=0J&5#`<7U`K4
z=eFHsmF*HLv%VJ(6`8v5u08d&);uytp$@x&)JsMG=VO|J(6pO#Evy8FM1cYspiLQa
zlG$>tK#*s!RV~X!@<4N5DyxHt2y?Q#Ip5gNb7>A7MpGcNr_@9p7{z`X1R1$77cr{?
z<{}VUVR8UbrT-wt#Bmvd41v2dKe_p~donX_ynbZ0Gwcb^*sv-i<FaekJ>jcf?i%M(
zW^Q}*wY#r-_JZy+W}P>4)OmMr+H%MC^+)enumEkkNbhC(TwM)+LSIb3h@q3f_CnEa
z0B&xbR#Ou#H6PS^)kM>=DXfXg#C95LqKyV>_Z{?IF9WqBF0DsPGz+9Q6XwgztVj<*
zRNMCqlua!K%2rgu;?k=d2#bT-=3xOplTDB-iz9}8!JxG=A+87HhE7W?0F3tGyq^^b
zE1B0I#TSi}O89cViVqxJuE$%(oNOBU=-I31cJ0mm4~&@=URyZ2_m+QFj?q8YSL%<q
z{d4pv-iyzk@Kk?y|Gm@nYxUbD@4$2CJwM^Rys3@r^mt$X5#P>_=*9ZX5A?^DpS9$?
zZ=XNHt9yjoUfpsgcfF741x<RMexbff_f!R|OKbU0FZ})TDF33QB2IpHiDDm=iJ;YH
zSkP`tNQ<%(GU&A?g_=#!;!*^RO@J|(C7gyt>pU0*3nzl{^k2R^Vn7v2r5%!qp<%)V
zpxQ|<vr@kM>DAv?<0?Ds0yu;jKsio7Skwmfj5kXv++%`*81Uyr&I#&4=ovvdAoGA+
z!_C#wk$!w|ubFN2pJA%c?GL4zN>%O17_@aHKPcBs;1kg{8GclzEJxeYVQs2r>l3Xb
z5mPXuYEZynA+;_Vq(NCzqm}I=qrR3)814dUcTG^lk*(KJ12tByfzvP-<kX+FY8S@z
z&sv77sW77&%?wg5?_xZoFlbOgp>9SCGtdZEy%uys(5B%L@&@XB8NM`(j#QrE%ScZn
z*4%|KCfvPSNpVRKCTkipbPx<I-OpF<UowrGyjLxjRt~9G^7U`t(5LX7(bg<w@Z_By
zeT;=KdgNoDI{ef<`opSr>WH<0qD$`2HM!=DIU^_Ug;&Fm+?ktw_J9d$Sibe9K;DwR
zBLE-Ht_6SiH|RqdC`GJ@xI->rlUqa-A-BL<VJK`uS}Cv5O8053E}9AOWYlSyu4n<t
zZ=e+c7xD3^CFNkWA_1<!t!ELq;0%F^BS9AixSX(`0&-30F!Vn14!sZMCOt!pzbH>P
zSa~!PLl0JGt-u{siZB2zWEQf6<$FMBnr#kypfq8cAWhGgVNQdkIo!Rtq}W^tzHdr5
z`7$DPMPxt%lPM|g-tE>v1t0hQ2bav`7P;EY$IXBDb^W=LfP;@%@b_1FPC=DapuhUX
zzm}aMow=Wv@spQM|7&HfsjBp<G4r_oxPI)zQ3D@XbPIp$b<@GmVr!m&M+x)@IHsyX
z*2w~u7k;H^N)p4e2(7Yfw6uMir%qs&r7jB9MR3{St!t7vl_hX01;_-#3!K{BFt~ND
z0YMKS=mG>`d3KU)1nY*?W`SVjg1z4byM7G$aZtu^Qdrk4FtQ1V0w1j@?koc#jZu}A
z0#KUT5iuQ*gPIKd1B*G1bJ6d&EVblR>gVeECcb<>UtXMJnYZ>|`sJ$j(ABSW?-|qo
zq2CkcqmS&W@4kD*oxmp=Z`%M1JEp)Hkgz5pp<t}3f|3{v&{5NF<r&htI0*+Bc`&vT
zMjjelCz^I>Y$>V*!XEvhEnuJ+OAz9Xv~<5b*>dco>CzLHw*Ir_LW`<}+qQ(;PD$`m
zs^4zZ&&p0W>IcqYkb;iYBaUGcoRHjS_C#+bY*DBmImw`bDJ>nXPBQ#ns^!<Jg-Xq{
z9DCz5>2+&cw==0m8+x=sBLuv*!*`L6@mI+nW3iIt_!CwV47%n(VF|PaEf|Uhz|8!h
zyikEFI*r2Q(1Ri@uxd!_!sA1a%utD;w;T2;VNp>vKTxWmMFr6VN)@#*Ks7z1phy4}
zf*VgS@COq|gfCHNCQN}!ZlDC?jYR_(ep*F+)Ke(NBWYE}03<ZR03?!C2;s?;p5`+c
zABdR{^k@w3Dk|rv{&?WxGt5%8I&SVi-qjx~DzZ;l{KZziuCLzT%KtmOr~dCJzg;_9
zI_n#r$46Z><BFmZQ_#P1{9OH+AHN;k7(MUyB}4gb5#2ND%BFSC_BHTMJze149Y(*#
z%w%RX`Zgx1Ci0-dvp{@I2}Nz-V^%=ZaH85l(BLlRWJtg+{BGnqB`>e}xR*C+kxbb5
z2$-t{(t^i905kLy#X{y{E9Hjy8|8Al4Kj(Yh9{CdkW2T67sz)l2=5QiJ9g?kRcq@b
zJ$qz~^l;lywCN5Yh=w-FtRaD`urCqY0#8mD1d~qRMAh4^cZo{2TkqifykmcOKXFK)
z9iH6)x?hH8XJ9I8%uRSlW+4YXJOvN;3D1iHCnQX*4gdqP9=RO_ehqA$LJfCn4r29M
z3Yj8U)b1oTjB<f74h6X32C_Jae<xM%c7zDEqr(uX#?pJ-6Pv%zxjB5ZUqANH({o4i
zjcWJGWet<|!Ulb`^_?%y9D8}fmyci-<sH;J1rux&^aVB(V+2bo`dD@dZZ4BP11SZz
z1|g=l_ij>PX&BMEUUXjyx-SLY)a0OCj>-;$u3!fhx4>WF*35!X!bHMDJ}VDG44J(@
zJZG=8ZGhC)Tk;NQJG$pAblxOso2jj5TdwqWTaAH}@++vTiWoPeu5yAFiVlQTki!xJ
zz$W}TN%JwRff^(418h5Tl*z~G92u;a?vLz|y`XDH)*h#6rrYqIRJ=vJ2c{rLYLPDq
z7T`YDTmlxU!0FU>^p3g{JvyTGN&yQ&*_>o=aklJ!X7e{Hm8zNp)FP$DFu6-`a<-ef
zp{rXV>p@vJwUDjdY8aXL!(5V0R>U|N1VuC;YDtA4t=Q{<6C8FKbgdx>h2WtK!SYlB
zz?v~4hVyGoa#f%G;TKHD4pr#qm;l2g_i=UVkuhqybY!nOlplG7aG3Zms3~~O$^?AP
z81e=#(17nWyp!P?#|N@uUQRSR5#BJo^)dkp5gegvBJ@EfUkI?fV_-v~5wbPehzQ1*
z(SV5bf$3EY>9#JWS5ftcxH=S7AHk38qOm8jD?sxtp!r@zSU$&MP8xmLzzjk4i%4E5
zt<gM!$iw%krPV>cBn?Z;uOnliW~*yg(|;jlr4d0dK_9iB$w%kqfeF~?jN`cch0)t&
zcaT}-1VJo@GLjx(RkzvG^70K!6Z#RYx95o?8s98hl#M?02vZZ0|9}u;Ns0(S{_5T>
zB8b1Q4sNb+_b>!nNMzRrs`z-W99}Wq9;nuL=xwc+Oz-CyHviktd5<y@!sdPdnf_8K
z$zHX5G=Ff_GyR9{*Wb`%{K3nf?muGOpdDvz;qdj^KO8;a!G&A6{<MDBkiQg&yr2nL
zn0hZp0En1@2N1uS9hg820pF33#Ez4MG!Qll;7N*Oqgt;&J`9MiWwn4RWPvs~DF=gh
zIE55Ngglx>(r8B!iX`}e48cAj!wa$f#r<cWY|7KW`CMN(eKx=Lg`a)uz{z{`b5w1~
z)OEq)=Rat>O4|C?mZ1Oq(X#|@EEl+ug*XP_MjGLUKZzUV)Pm|7EmPn|E>I!6PRn&g
zi-8+O?YL2s7}V_;kd(l)2?MG+;zkj0BbdYukn-P<%>^!G2aBqb!<ld)D2@cJFD7wZ
zNlkN>3-O@b4?6%P2Ez_OxB=OmL<923n@dPxK8_(F149gv;RFoHJa^KYm2ZuF@@(Ks
z2P_#r|GN%Ivh%WMfg`v4cif@i!QOp#Ceh@t2`t%p_Fn~(h;g?h9#`H{cS6_c&bB2e
zMpjvpVsr<ll$HxjDJ3|E1;H!>kjq@rd|*nN^<YylEg$h;L`BnFq!|kIi6j6%vh}JC
z=u<`!AWfxZ-GM&klmmTA%exZ@0kmj-8L-D*A59Bln_VC6O4Knki>PBMS*=s+wQ@Hu
z=vwRZ(%3SSs%TCOGGlC+gBWQg-AG`^PAAk`vY+q&c+pg@rtQ9JbI(dO-K1CpO7}dQ
z!p&(aA2j(%z1N(D{N{Z>rK>}x@6)Goc%f#E-4N(<=?l5JQ~FQO53DZ<WM_6O$|~!f
zli#KMa)0i^#xZRZq)(q(U*x~A-*_QMY=#_hK4@73=KaKaCgq51vMvfJHr8l;;e$2=
ziF5$03b3nkA<hzZaqQ*;N*!!T-7y+Z!YQRMK)~yxDOErvPj($pDVpCMWiT>EOCeD_
ztnl>wKv7-agaQ~6AR%SXP@fGNL`GNx^$e-hOhHMAxHW!4<u(y2-Xc|-X06!$H?F$X
z{uBQD&Af4@3~qVk?WLzeO;pFvedhKrTq^H7=D+`5cnViD_0L~<W#c*gI#XHEwF4&c
zyUr@eU2xL4DHEm*Sy@<o<IcrXHk4GF0tG9_&Et2US&%ok--JnHW{tfxui)nGeBQXf
zmVtLY2Huqgnq@|$c+3R2X=;LEk^4t6lluozh$ck%0VK%?!=y*l2*?vGN=}9rCM<~*
z)%KW0nPkzWJ>flM<36%hT_*Z!8~9E!-sxjkv6zSYDyf^rq!cFvWUgh_Xc>aI;H{cm
zM-IsjQZYDZ)QRe3B@lji>ncKcrK7;IyCI=|KxBZOP`GVUVP0dhBb9KUM`>%Y5Do=Z
z%K(b!KmbVaiz4Equ&jv=j9nAH#xicfbC2?p0_=9tU-)S6^3!17dGT0%sOq|DOZm~)
zY5!;aC||eW-mYjSV7mjbtwB4jq=S;DEd~*~0ucw)LPM?Nuv{h7x~JEEpPwAI))ptV
z1uiv-!<iOCeq66cpaeuQ4i7JBpGFH9wLn1&ydhoyvn(uBJ9_aVr>R(auveR@AK3p#
zqxfjGFe!Jx2!HvNs9QQB-Gy&KOAU$Y#kkoax*$W)9jc(u0CUUvKTS_oFg;np-7PP)
zW>6`-V<6)0mZ;T(fCvPpwOsJiM4YgrAx0}8o;6v_h{K`y9G5$_bGu?V363AbDPsJ)
zV9K_-+|*ZSZ6hq(2v|p~I*c-jzeLj!julgE9)rq<yrTI=4*3`sIv#wn_Z7LOnLOTm
zXO3wWf2UX5ZGD=uO#|9K>Z58$@A--!Ql=#~N5&{mUd^vLN~U?5t)+q*fu9$%SPG2|
z=;#y)i!nk%J&Ew>3|KIPIN7zf#L7eXC(#`L8PWy%k^%f&saJ2Q?QVW+e|<&U1HDw~
zQ|aZl8Pe@)Tkp0k>4`S7-Ehn%U}^>4WkXbYyH}RbMZC-2?tq03)X`!i9I!COhyYjy
zcP$|{<sHyMxS$~15>{YPKG=`X^A<|e`n63O9~rM|$KI=}lgo}RYuhK48F*`kZZlNi
zZFN$fO>%yr&e&=QXYn@T4<L>rP)7(L5e^00%mZe#Bp*8VhDE+aJ?4@xvs9|1yB8mM
zAfYGp)nAepnl1&+nE*SLa6^zcLWGxq))?U>7Q}!g$<55eT?FD8HW?Mh7-)mA$;dHS
zI)Dsltl?rc)f4r>`(dLs_vPt4$MU&;^mB{;lKGMFPtA$<KO0{yEkgTf4Hbd&8X#i?
zwnTyNKv)s}BLVdjQ7BJGzneidppa^eN*bF|izLRO0JIo)!DoB&C74r!&=VfNOn(W!
zKx*UZ)JAw6seK6UruWDqK3Fpuv=!|&rLtdZuT%}WpVS>P1(>P57zBy-nh5v`wO5W{
zv_}GbrR6iOerDl0`d9i(Ve^RaPeY9UTq?bf7%`$lXm7jT4gy5MAgS#H=o$03BA8B-
zsueWS8C9J>E3hp|G0YahTaSlk2_T2O#^_qgw{&~5&qklAxBiawzVu#OnN)BtU)=Ty
z;dOj#{1vGUdonyvF;27|d`0XK#1jETW+2TJi#*B_7V$%el+Pry`VH<WWtv<=u|lpy
ztdM~lsfo~|D5nrHCdi&Qc<A)U#;M=vt#}*eg2lg*HDwecJNvS)SS&!)SA^n5;Arw9
zMh&ro2b<;I6<!!(dWE7g%vuWiqoGEt*%u9g>x5j<AO>4WT|zz}?N~%RC;T@Eyq#s>
zL<tBVg7qNQLQq$=5=7mX!0<xhGb@M!HkHz0Q%}m(re3s(q3Ae8*Ls57sae@2r9BPO
z#vf8}SlTlgpG!y<4TfO*vU^<-A>8(kfb8W5Ye*uo0}N58OSrorY6KG2dI%Xc2$><#
z0|tH>UQlzIFIe0il1T%F=n9d;(2s<hGf=2R(s<6Zyj!N)bJ!i5-f&lO=f8LS?bP91
z9czWdvA4uc(x7i|yLLqHo=RQA@|%Ai(nWvcE-<~^O-;8I<jkxedeu3Sx@!BB!58KS
z+CJ^o-EJ$d=<m0f^2%H@m+=Yx&dABm%or0MaMh|GZV~-74gK_AQzmB7l~JTRC}D+`
z88Y+@@&MSVs}POLHJJUOF=g5hlEFWrL(}jmOb7!>ga3%uE82&u+JcK=6ChIoi3oPm
zEM%Gzk(d~fiHQ-Jm>AJiMtKaUI`j%cDNzhw1iK4E><Xq#l_mNIrZi(;^bCb6A=V1P
zKB_zFgX|nF#BEKswA^CRSEQFjokkFox4V}l3!_^S=5F|%&0camdy+<PbltSde$uk=
ztbs3I^3W*_cDW?ZT9#?$f!ge?8}IofAls`3?6~gbp1jP=A2rLRZL?=A`s<mu^&g(D
zx9OkHJ9!&7&A*u2|B*hb{}rdKyJZpa7_4F?zk)GQ##(;E$3npV6FwF)#MwIdSf;lA
zHvw{tgmxcG+HpOO98>8TX@KyFIzGyX)&G&t1-#wxwZ!0QG5CCh9G&f+7U=bG*OQ@F
zcv`}Sr$vZvr@<4Q_SQY~#&WY%L;A+%hkx*!Y&<;bnad9$k}6$4eCG?ZhDw(5qdYKc
z<nk`1YS6!=ah!f=Px*k}>!z*YH{4*l?;(D}!drTQuAB`$V+`;$n^kZ`jFZJubA^oP
zi~w;-0-?}2Dr>YXA;RW?nB>%Hc`h<@kt+}WlJ+SvRSACn3lQdzl3Xq@_fiA62ywQw
z;9i)zcEf5&b9@9o3ojP=U{YKVu9}=8Po<m$Esq->nx-O=ccEO%aWz%sl>eeHP)5=h
zt|yE~$Xb{B7@k50&U!7So;AXvX@O-e)ss`yrNS5piQ(`tr{WH!VpzEINHP;W7PVlK
zAp{elR#J?L8KWd=ug~ydK%}MnWV0M3H};8iDI&bpl6k3I%B5#6+Fm|8yo~pgE4yV5
zc=eKpPig4ys2=d(x_5ex$hhI=dp{3I)^u*?UCuj0y7SmR1W@XO&H8&=C(YrT=iS^m
zWK{oE6E9u0fFE6QtNz(X=ufOfBfo_)L0;K66Om)&l@<M12^LZ0$fGzZVGe^=HXypx
zL!DTsd0f#_bSVYKCB3t~TMJGc3NGr$lnz4y9p!YTpifdM?=&D#W&oT#Avka*=?zac
z_61-|5na`!IA96!QGBFuMLOWwjb>$o_EZ*uDOv<{jX^?GCXi-Ihsv4ogHSL4pj^@|
z;ycbPrrC;k%}WnX8)$YM`$V!?226`hf3`8>q^B=_Xz|H>sw91+nj*vQxHHawX#9Z}
zFFj>LRqc4$${V}YTsd>~kly7DWBCnBZm)UV6sRmYfAsuAL~}NR^>;H>LD##1#WHBL
zU=|gObMSDuDaO!zFq($BQxv}epMFB|i>7x_?h@`tCuj(XUg;ErrxHPtGAPb49lpnO
z7r>cDIhFgU9Hvs)1(^j}gv*`gGr$PoG5Gob9$UR;a*F_X1c4Z{Qj7pK6F>zgUeLSI
z@_0_>16TO_<+=*G7SG%4$>I4H{nMMmHz{%?cKclxYd4Ges*7WhqiwL43SKr<AFfz{
zOT{dLH871>V+3l&iWr)!K<>ywyR~dk3u-^YM7Y+YMoZnNxnW2JMwQf&i3dt;G#lZh
z^_?k$8^qNMBN<}yoLZ!vr`h1BrD<{5F3kTibS&5ijiFDIuAp^gnyDn<YRU;@15)`S
zFA%w(a=NA~UDH%cIcPwKU`D8AS%i~a>$Tc?Ewes`Tj;o;UdyjXP%CS6nn5x$b7<ml
zN!Qwl0qbPW8y#j#;%ujr0+-96>_LgpvfRyzJ-w((Fibm~HX?eKNCYuP1YrSXg}JUl
zgi~YU3}{A1I%o!+DE7AFc7j|?%^bMu<iG9D$r|v=#h?=QB=zW0T?gt>6=;2S#Qj;0
z>VXfg-P3ba#tk>!`>%k$KI|`ep?Ukn+1Jg#sd0!wM`k^zHzNjHA8gV0?0Y{T-#V(_
z>WP=GoG(d>Zzd7~9G?ape-At%pQjlTOw8lO9KcY_PW=pvdNQ2JFf@sokqM_B=CMSH
zn1GUGpuf}VgiR0lKxTHD%bD=Z3&jJ0Z!lBQoUeqz19R{+a9NKFdUvug!4gQOks0NR
z$W_X5dy^&KjKVz1L3>Oc#2rk*Qy{_A$8eH57*j7AZJg$byVLT-yn#fY!Y`{@+Dk+)
zn)1<$Qhn5mJEL|`Ar{RxtcT<lr?9IIG7reS*Dw`A%#o*!mn4(2DLj9`JDctv7P6fY
zIm6D&8`s|VacGWI?h3f%9c_cpTYlE?RlSC^EtED7?{!{e{9CuToh-)Oe00Eiz@B2;
zVEGgBBY7ujq>*=0=#!nilcY^01xSUAeiZ+i)HM@6B>`}Vj|d+E*nc^Zwuz)cf(JDp
z`cMe%qj<9UcZKh|Jw2SR^gQ~4`j-tGpo{2x_2GOC>X-^o%SKod1UY~*hzKQ4ug3(^
zn1w2AMTOHuL~3Fd3JDB?*U)8{bQy)^QlQ0%)(r`v07StIqTnH-U~5rmD7(yV^fjV0
zyfy@7NW087n&EGBUI*&{1@4QnMSUX%5zUX)_ojQoS!Z6CzB9Zt=fU;4-K3!iRMk)G
zW^&xJLAmbe**kXH%zf6bP2l~<XjckbYd{_|UV-&0nnLbR6>JlZ#y@a>w%hKEXa?Bo
zq!#rAPbfTG5^0|ahbZP41IG;iUD7qG{+era+Lz(0R!X71QrnCC*+KfG&Erj(#|HBc
zOnO#ZlT_CB9*y1O_(Qe;;!kj{CTszTiOj$BX(z0WMvX;)nI!7i0T<?f8UE6g`7@R}
z<5>HGneJ3ZgDX5>yrVfYtE3caTqtIuZbw8iQ3}l+iiUs|6kP$n0A(iv$`CPTQkxOo
zgdhMCH%f?A7<_^vpr8#QJ`x@n;+mSTuAOltNXPDm+kRFES)7=T3%3jIg|CH_QxU?i
z5c|j$dXi5N5t=#lyF?@cA`$`lAVs&RBnWEKMdXMTLm{U8mX%hautMaOl%o+%VY=nF
zC=N~<6eoszX|JMQtE`XViF6=jQA}P1)$wHqi_5CQvI1GNGC_{oH@wk_OMdeLgHS<j
zCPGyz2vrE;QdS9sDW|`@MsS`GsdCPA!<lN(Ef|t0ejT~+dYnML;0ggTqw5mUCLn0z
zLC{oXP)%mP7uT%0#o74Ybvs6Nw@;5ucks#qSKaw`outUqBI9M*tlDY@{N;`}>gG%3
zsRdsC<~xfnyz=Vx*YOL+ZaQgn+l|th6Z&7$d)h0vdWyYmf0fG9OVft+Ufp~0^Eb5(
zPV$|1A#db!yMb3pzS9w_evAJY`1EJ_PX~1A#B=@-UH(^j&co=#6By3_kll!G69J8a
z-3Z5?U^fK#{?(cNUf-~7c*uTw_;g2kzrWnGFEm#w$7FT>G<xCOk?R^pw5^s_j%~c4
z=j7LJZNoGsNyOy)0B`b_f7#Jrj=^gv2!GmN{tI<a_{)ni0Nc-yzdSeT6a6)RIXtdS
zdAa!*UI>RTNh|(^GJ!G-pBS#8&7bq9NBtBb3cI54t81PPYJ?AJMA9J=fia0fs@kLU
z3YmE##eBc}>Y_>9YAV*>-uvp}Nevc0Xxg(6@r(kKWzh7NhxIS=plBcFUACNeZ>UH4
zPx=RZ%XxQqs}I**HD?3Qf4RI{&0pqk)IXxN#Uz%mpDzCw@Fv^PnF${>*@TF}{L(OF
zkV3)NZ3jCUhN3Fs#$udIGbH#&&1KjYcCygKoIbNKF63}wqiIJV5t0ZSjr<E6P5y#@
zQeC-c;43R1o|3fDJXmq^oUE;z?)elpn(6^NHosi2pDw*@;g6X3@Rl>qg^{M;2w|j|
zJE`pv>2C{Gkd<a+|FzTB-Eyv>N1UynF7ybpF;pgIevoY;AtU^+*%)A^`C}V{?S~(T
zLy#N6BO(e@J1DFk*vLF&I7r2mu2eEHq=?)}IfT!qB0AgDMO^dy#syqS1icGc)MB`w
z4pQo&jS1rd%?<k%;{t?G<4gzpf+2TB$->a2q>J!dGD?f^zYeNFP|V}#=;X)Lj%u3P
zaon6xSW61Qg7C=$UR{wiCtR_o7t9Ga9XBT|IpZ097gxxd&=!#fO)@kDVNJMf0oNDb
zB2)oGCX)UMoOQF!33<YukVdg;h%tdZ##1P&8MYKLmz@~B8_4TUxH#=tO(Y@Z1%6y+
zFm9NBXnLI+iY+{6$l)aG;1Q(p3L`!AUAP5}tzdQ}DM6rz&P%emim?naHI)-9qX}6h
zLj1m~(xa$7pIMzzn&KR|abIY@()005dC_vS($)0zO>OXm5wF3j!17IKR|7@19QUsi
z<@;U#I=O1$OxL<6T<t)|&VKb~izmCZ4%|1IPnL_MXC1+x`GM{y`qgP_PDj5wHKe0o
zou<+m{#%1pL#h?Vq~TH(pLpt(SHGMhb#G|eJ*q)=y}$K=Q%5LLjdaqeo3DMyE_Lns
zgf@PF?EUA151lcFr<fd$g`xUQQ=QJiJqMPRH+Gwzk$KUUi34V3W}7_j$-ReMJ|Q)A
zVAq~i<wJYVO!uw%E1xuQYK8%;x$&>0rRu3z;cbUu^N6Nm^cqGFga!(uhb6DB4$_c7
z1Q{!?knbVCM$5(oSU?Lwpvej72yGV<|IpS84P1b{nJcEuQ^XrsfRqb-=oFo7um+UF
z3}Vd{W)Q?G=jIur5^zKK?4qd|q^L2{z_SIRCoP7|AMMIC8H$V`8Sh-nOO=sIZnNmE
zi!7N%!?UY{a!$B#epkO`5lkYyNdGX>mR46fpfIecwHDKmt`jS|Nwgv=#r9j2o{&?N
zgs(X*6w89FZTS6(nkW7KnD&$R+kStF+em{005LDg5P+nfJhJs_0#Bz9fJA8Q?uHqM
zvvAr@)*?qb%x=Uo5hsM<<QBO{<X+0@nhd%ohP;D%?5L07JW(t+)~3O{UW!daFo72g
zGbw`dT^*0b7)+M{-7J7v1R3N3%pHOZK#dU08HQLQ44(qhw@nLAca)#B>CQbhiz27X
zvO}(~O6&LP6?cva^S7n>ZP$-EX=&puzV!;}tG3my0S<ljqq7z)9lMbRD#u(;CjSgr
z+bHIMX4%ESNRu%Ka3h1*kV`+|Mt=IK?@9@5<kqw$UHZQta{%9R(z%TIJWw9;eJ0%P
zzTk?UZ{(SV@z;B{J<7W&J&$d_mR~1NJo=)TzjiP5APIFlG3J1}zf;Tse3HqSgTEf`
zpR8bqn1c^~yp~Fj#~h?2Vh+|HenRx~|M{4Md;2c%ndb31k(EWJX?%2p9t>ZfW*VX|
z4+AXmkNC$jPi&69AXjbWe>;X13plO3DZc|4ofvZf82!1JgEan;{>}jI;dl0t^q#y=
ze@u)R)LWH`rBvO|52$UeZSV49x<a@T-vfIk^+yIf8`2f55*iDUol@g<u~fnutBoR6
z5QB}`-!@=PBJld@ufG*@YDDk>ToN{lufakW4vZP($Hxq2+}a(2DH&TD5W-=dZ<zFW
z$m_$b{*bX=P_^4$?wGtHGFAV+*T<PAt7PfjHnZ=BOFdQkB!uFeGgni(9oul0OWt$T
zv-m0mDG<J6BR`5Z*fFzR=<kB2kc5bMB-kE|$sM4A!~tPuRNPSsv7(ylF@mWhyhMa7
zU=abcS)M4hoo11~GauV7Nk=V}@*XwP^;oT%h#MHD50(o|J+LCieGESRX4%4~V@jf<
zrrD;l)5t@OS$^a*Cd1v_!-EJ#orcLS>VtC_LKT!D6PeyLAIvm9gupaqP)_9q!X$_M
zIQ$UR8N+#^IWABelR4Fem8=Tdsm(7+1c0M5wbe@lvq2)uDYVl9fLO#m=3|3ZhcFqN
zrnL@}WqJ8^-onf%ra0g5xAa2Kibb;~xC(veT$yv<xmktY*;0Wo&3Emp!_j|tlZvZ9
zxcTskyL>rY&-?NAH|nY*hqnE=?k`3^^wGcP=O<$-+G7mFVj-QZZ^@VnxUdp7tPWx3
zQZme(@Wczu=)<M3uIt~Mp8OdEj>j+22TPMoeV8AsaAFRBVrdI4tEM?a^aj@gHRKW&
zeUQ+loMgqbw?y;M2M}+u7@i{2@;Nrj;g@Uj=D|+ZluJ2+pY0twz*ZkaF?E0!9Uv<<
zyT_YkqhPDQC^0%90|s+}UU2gY@Eg#k$;AZyP^wf2KLczBt8UnqQRrTA?(7NfLf?Y*
z>Gv+mEKHko8THC$PhnQ{A^rT?y*K@M@!eV3_nv?F&b>8Nk^gKzylx}<<oe5gjD8*w
zW8gaen92~VmW6dz5nms*VhCqozA4$>Fyjj(KMPSUn9e08P+%M*&N%8o9pNG&0RT}}
zu(m@t(lXpplNVdr6Lq8r2c01*it#F@kU|Y2`PpQ?&U63y<2H`&b!Nl3O|IUa2NzFR
zKdRR`eI{;j@%?N5Hg<I19#<_+xn%pOvAue&zsSImHF3NAg<8yl+-5{%X!)TiP5cdH
zkQ@}iG(Q->j1`0sFO!NhN-CXERGgt`nW7razb{$<38|pngd6RW=<PnOB1#C6#AHK^
zLZe1+)B0#4bO)tPEJ*V!IOUjn1T^p?5&(~CG8e!)PBxB<1^0k(;7tQEsB|u$&e7EY
zx;lnubifa+A%!b}ALPR}Y^<~njADidAdnoVLJm+10AxepN`=G_vuEW9WfNiPP@-wI
zI-0VSaARYM81i8oE7lcDYfMF4eGznO%j0=cO=k2ua$y(VY&fvfe!LlH9(xFi^?!MR
z_5Js4&)=`!dpG&759mL`d3{^6^^;E=oPxVJ<|;GgB*e)E*gXk)NnuF^b+Hr*O-zHs
z(`;cWu-sZRA*q@X18T~tt7~$z6pNs5ntPv^jhZBLH~jRdLFNzyYHPuy&7U<N<Wd!M
zPDM<Ala+E3M>BJMILx6OGc;724`L~eAk}2G`7(3F5tRT~Q5R<CL&PGpdL$G^P(&~i
zO3dR<tmsElD#alO%(WKV)RpPJA1vP&`M=!$w=1*5Im<V0dLyTZ|HGnp@ukfhA(xuN
zE-tTsIm{dOe)3k+!#BLLOMg22@@4P$Bf>7$D^g|9t}J$|u~LQx%PheImRYQ9kxAf?
zya~ZQBMU1%Dk>EsWRjRnRQ6DmEJj-9J`o_44C7CFX%K<}$E8o`)(AL}GD%<u1MvEY
z>|{_5D{fO3mCJBgdb}CO=SV_%qcuZpLOw@FBhU-6e1dBd4Df?_Yr2I$Q>6E`@O$;Y
zoW!TNRKHZ+uMJ;vv*^8x_;bi>!?k=+<lBhsXsZi_q&JTJfCGIu9|X_ImiSkuBK0}&
zP#+@Fv3?50szy_>W}%pxkLl~pp$aRl&JaRbMTmxEMKzYh$t@D4xirTKVd?=4O~=8e
zt_1<ardPwjSX~qC3QuM-E<G_4ofMOk)xIbprnzG+Lc)diJuzUq2GHypG3nM{NMx$0
z0>h@j-_;m4i01c;x$S<2a4zf{li_K8Ka|_VSOS$bR=A+C1TW#1TE3rG@LWE>rWO;`
z-_<|UZ=74r`$1rm`AZd5`jh&9u+CCX?)7B9dCl65*>Y9dnHOESGu`7`yyCp;y_Hg0
zY}1Atr1$w?evdvve_4M-KLz&5di@>!0=@;Ix0QUIzCge4!r0q)UZ<|Tq-E368y>oJ
zwds~Ee+Q}o*Z$}0YANh$^iyu4pX#u><deVFQ?(({C$*M?%~`#~ZkDmSBw=SAC}*8m
z%~Pwai<W{b1nXe2H-h1huRl4o^&%S7ik4ZeqNkK-9W8R!tEH*7t`{&iL^(9e%sT3{
ztlE$WQ=@@fR)-Z4Wovq>pJrf0$(A4MQe2H5W6@g3G0`BxceIdO^AkG%Ru_8Ffi$>@
zBs#ed(+eQPgo`T>3M~u(*t@!xzYkcS(2;YhdH+rwS<m}k`kxJJ+>TSnoK$PKn7K*r
zWin$4%t3SZ_Go<L<c%q*Q&&CmN8Q;rP#(AZ{E@Tsd}j{pQF>B_D}6*wc*aP5BY$AV
zq%&xKKW85xX0Z}6iz?P`C)qF=vnbY0q*Z%U5VJ@Tge06rC50eDv(JnLVh}UTgCB5d
zq@@4QPx+E7CjHp|F24Nl;M)Jjy;#@eZRu?_TQ<7}u{H0r@u5aq>*Rp+wyD@C+sWq4
zX(X8aC?DlFf$q|Jb|S9&R~DRv&oenI@x-Nxz+z}cJ4Dq22}Mp+Ll^;}Q=5OxI;Cz>
zmVER+o~r-2&4A@+c;EVt?-MIt{pKQiC%69HU~L^1BmR~58LJ9^HYqEdITbH(+<%|`
z9o~mFqkYn5Rm1u&nD>D7U6x@Ddz5n-<%>o6@&YPf&JN-R&YGowlp@~?-LHme_L^qJ
z!t6>#Vv}&AHd_o-Lg;zaLii&>fW1koC#YPr-9BgJ(6KhVeeQ^1W2C1B4Ly0<fI&ki
zPC=bkLtpxct)ew&iW#jiLtkv9wP$3Xr~_gIm64DSD!>_xdEhkbi<Uygvd6Sy58|G{
z6H9Ew6SERLF}Fgjek=-Qk{eVD<c4&}4bBo9$qk5w!_sa^JM^elv7Q#f+bEhrh~<c4
z5DRam(861YbP@}1eK+XoN2mu>T5<~uZ^1W=xnbqtpyg1Znq-liDBt}<&C}Vq)J~I~
z9d<JCAj~S&1#^x{0)BcPVh@`#MV=+{T*~QL6?A_L_mF7^0dI*Vu1KWYWlqa0H)e|f
z#~NLjONwQMGP82?$}8-SR5G`o@Fx&3>W4p(T$aqO1qIU%MIgS2c*VpbSeTKXVBJ`m
zm?#>E9Zb><e4^#Cz;4TKYca2SuiKeDt)YcIcI)5zt<qRa+s;Cfn}Sa~8#%wbCA_4^
zYyT`VNoA3bdh}@H*{;-{F0X#<gPuJ;ij;iT=62Vox_FoGOURG%p?ss#47@jkzki1)
zY;-2pW}t~SQHG8(Ci!5-jWNlG=GxG-b1du(A%&Lgq?nZUxi({3?>2aY3A}+K4-k&8
zVkFYC;|UX-1!t@{1DzL9TP?ev{^8rPMnBr%(}E(F4k<AWcZ_M>YCOw@ayRZsrDr)?
zWY%a`O%^+5d(d|YIslnB+7vU^WpUDp<K@JAEF>l&h6M{mOVF30!9bG{^Z?TV<Y0~j
zV*@Ay=J(1tls~laOD(q#?lJfuV}>s_9T_+#(pUW=bf)Pf^}_mkvX$t5DNFCe`Ezam
z=J!Zo^UXRfRf2K)l=QY@lg*Hvd_?Ohu%A+gfOf3sZGOrk_qRxIi^Y>*{({`yL+OEg
zm^<JOC_Rq8L`gi4p2;5g^wZl<OYQw5E3nYT^u1s#<YsIUK~ihJ(sU{M(t>3C;U3ea
zx)t+y7V3NBL(NyxQ%?9>%M;%ll0X1ypKoIQrJ3x2@*S&D@VRL9Fndw?m`&z4fIgqb
zwn*p1ua_sYRmw_s3SSvNDwnXcq0UT~o$(iO{bFSX?~UzPq$x<<knTX*iu69x2&B9D
zS*#yFD}GGLW22P|*cxmj@(Q-wypUa_ycpl3yup^LHSAjT6t+~Ek2Dv@*R$>FZEUHO
zf#=O+4ayB{wz7aNHGPP4_ajYUSBU$t#r_iICAJyqF?Ax_ro6~@;49HD;@Mwf|3PIW
z76N^k^@TqCEPptDnLL&)l}E<6N?Gg>Xk{JhI88}q6R|xT+X>R;Y$NukQaNbheEx*K
zSAN;pH&?Rp;(DWP`E-x8gH4l<vO&^CY%Y$kmG`g}CMUaB-V;BBv<Js#X)_xJnD&u2
z$1hRWu<Ho+$|S(z5>~4Ko~Bi73&Ga3fnCkx>;t)x`Vy2mv6afvS9c(#8;QMzEg>I8
zn&G}=!n5Btt!D@LgX~A7&!juqkJ2?<mX@<-<=<>I-9yh&iqPJV*@wzi>?z=2$G>rG
z53l2gr03*e@@Dy%GEaG2%~i*#i`4tnhfJlW3rsJV`<k~|>MRdgJ=SG5#pbf*+IrZg
z*_PQpvv0H?acoGbOo=%q=P>6tsgqOJrhe+`;X2Fpg?oVekY}8idAFqvO1m`ehxC5w
zdoyeqV=^wyXvz5A*TZ*#?`mHxb8S}dtdFu^$hjcrQ0^Cb_vQVRKP&%*{Ga?q{tpA2
z3tffZ1WyTmTeP%Gb(f2aoy7x+?<@YWWI@SorKP18mtI`fx9p|zA?12SZpD|C8Nc!C
zRynS6QRTAAHI<K7{(w&hIjZ_rjiO(5kLm-}M`~!e(a2fL8X<`|Fha4mAQGH8_+-Na
zIHt1}Hiz~Uj5o|EK{tqfj_dm-_UVpciG3MsA)lVuSMZIWg^7I?Um&?Qv2S99?D53@
zOSl5xz!o2CKacsb7U>M}L3ckp17(Y_cHv^!^XFoX3_3d)W#{1NEH)cQ$q%`A{5brt
ze;EEkTt5@-pijb|hwlL$|Cs!5ef0g$e@4FJ)2cA9YaZ&m5c7?Wf0o`TTY?%VYv5-W
zqMcMS7d2amv{<xzHrnq;O)o-z9-c(4JPw=j>|CsKJ0I6B#+kElZtw|rpM&yh^iYCM
z#uwmezxKBlh1Ab7!#6VUc_1_T*b2Xi9etXD{!3*pcyT?5_DF-rA_KHO6BdGOtnHr*
z&t5)O8ui19Qpken-!6#xEx~N1GW0KfqpAuusKMN$TJ%mxe19e^zCcrtuQv6<*P8kO
zYZ`!WCt(f1{`g+fK(uc#zLzu<7&M%XU?bTmtoBFWo}zDaPr!GRCgEG(li3ukVNKuW
zp3Y8Xrvbxez^S+fUyi?lT?wwffo+0|TID9pd9-jVw;>ST!Bd3k*Tvni_cXDG;IwK+
zaQPK%J9H&4B33uD|L}D4`3vWF?Rrwz#C8B}>$-Lo$Jo{;j_VTJP-5FHvF)DNh7;RJ
zV%sCJtxs%EGPbpe=hoKR=FFda{^HrQW-OU!oT?jSY`YIq2A;q896A_?dNB3~k6*5V
zfeqIzV<uxV@L#4x2hq27G#5V9lQs@JmrlvUhjFG&W}4z3sL2%rG?RbeZl)++CLyd3
z$0{8oI4XH;HqQ4*9$V<xEOkj7bIqD~P>O$G%=)$j?QPHnc#Z>yDcjo*?KpH?-hODq
bq5ZV>Lnqz)R{LQp4xMX~hf}n)3da5)B&|dU

diff --git a/app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.svg b/app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.svg
deleted file mode 100644
index 90469b364..000000000
--- a/app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Font data copyright Google 2011
-Designer    : Google
-Foundry URL : Googlecom
-</metadata>
-<defs>
-<font id="RobotoThinItalic" horiz-adv-x="1121" >
-<font-face units-per-em="2048" ascent="1536" descent="-512" />
-<missing-glyph horiz-adv-x="490" />
-<glyph unicode=" "  horiz-adv-x="490" />
-<glyph unicode="&#x09;" horiz-adv-x="490" />
-<glyph unicode="&#xa0;" horiz-adv-x="490" />
-<glyph unicode="!" horiz-adv-x="397" d="M67 0l20 134h95l-20 -134h-95zM159 478l146 978h54l-146 -978h-54z" />
-<glyph unicode="&#x22;" horiz-adv-x="610" d="M224 1018l82 268l24 170h55l-24 -167l-87 -271h-50zM405 1018l83 268l24 170h54l-24 -167l-87 -271h-50z" />
-<glyph unicode="#" horiz-adv-x="1265" d="M47 410l7 52h280l174 524h-299l8 54h309l138 416h56l-138 -416h365l138 416h56l-139 -416h255l-8 -54h-265l-174 -524h285l-7 -52h-295l-136 -410h-56l136 410h-363l-136 -410h-56l135 410h-270zM391 462h364l174 524h-365z" />
-<glyph unicode="$" d="M108 404l2 5h47q-29 -207 78.5 -292t279.5 -85q157 0 272 93t133 219q19 135 -48 207.5t-273 150.5q-204 71 -289 156t-62 252q23 166 140.5 262.5t296.5 103.5l27 187h55l-27 -187q173 -10 262 -122.5t63 -306.5h-54q23 173 -56.5 275t-251.5 102q-166 0 -274.5 -92.5 t-125.5 -219.5q-19 -135 43 -209.5t278 -148.5q200 -73 286.5 -158t63.5 -250q-24 -167 -140 -261.5t-292 -104.5l-26 -188h-55l26 188q-183 6 -298 108.5t-81 315.5z" />
-<glyph unicode="%" horiz-adv-x="1527" d="M199 1099l11 77q19 130 107.5 215.5t210.5 85.5q114 0 178.5 -88.5t46.5 -212.5l-11 -77q-20 -130 -107.5 -214.5t-206.5 -84.5q-117 0 -182.5 87.5t-46.5 211.5zM254 1099q-16 -103 30 -173.5t152 -70.5q98 0 167 73t84 171l11 77q16 103 -29.5 174.5t-149.5 71.5 q-98 0 -168.5 -74t-85.5 -172zM361 162l882 1138l40 -31l-881 -1138zM832 279l12 78q18 130 106.5 215t209.5 85q115 0 180 -88t47 -212l-12 -78q-20 -131 -107.5 -215.5t-207.5 -84.5q-116 0 -181.5 87.5t-46.5 212.5zM887 279q-16 -104 29.5 -174.5t151.5 -70.5 q98 0 167 73t85 172l12 78q16 110 -29.5 177.5t-151.5 67.5q-99 0 -168 -70.5t-84 -174.5z" />
-<glyph unicode="&#x26;" horiz-adv-x="1247" d="M88 352q17 118 97 211.5t220 198.5l58 41q-67 102 -93.5 187.5t-12.5 176.5q23 155 115.5 232.5t236.5 77.5q127 0 190 -72.5t46 -189.5q-13 -87 -59 -143t-126 -114l-226 -161l392 -537q67 77 112 171t61 201h55q-21 -131 -69.5 -231t-126.5 -186l158 -215h-67l-130 177 l-14 -13q-104 -89 -210 -137t-229 -48q-194 0 -299 101.5t-79 271.5zM142 352q-21 -139 62.5 -229t269.5 -90q105 0 214 48.5t200 137.5l-371 506q-10 13 -16.5 21.5t-12.5 17.5l-58 -41q-154 -118 -215.5 -205.5t-72.5 -165.5zM412 1169q-13 -81 10 -163.5t85 -171.5 l234 166q68 50 103.5 103.5t44.5 111.5q14 98 -33.5 153t-155.5 55q-115 0 -193.5 -73.5t-94.5 -180.5z" />
-<glyph unicode="'" horiz-adv-x="406" d="M224 1018l82 267l24 171h55l-24 -169l-87 -269h-50z" />
-<glyph unicode="(" horiz-adv-x="607" d="M152 566l3 20q49 351 208.5 638t346.5 392h6l11 -36q-167 -101 -320.5 -387.5t-196.5 -602.5l-4 -26q-47 -329 26 -608.5t214 -382.5l-21 -36l-6 1q-157 104 -237 389.5t-30 638.5z" />
-<glyph unicode=")" horiz-adv-x="623" d="M-107 -427q166 101 319.5 387.5t198.5 603.5l4 26q45 329 -28 608.5t-213 381.5l21 36l6 -1q154 -103 234 -397t33 -632l-3 -20q-52 -367 -209 -644.5t-346 -384.5h-6z" />
-<glyph unicode="*" horiz-adv-x="856" d="M130 799l26 54l288 -93l42 324l55 -2l-47 -325l307 105l12 -53l-314 -97l150 -257l-52 -33l-142 262l-218 -265l-40 32l223 264z" />
-<glyph unicode="+" horiz-adv-x="1151" d="M90 649l8 53h462l76 504h55l-76 -504h481l-8 -53h-481l-75 -503h-55l75 503h-462z" />
-<glyph unicode="," horiz-adv-x="383" d="M-5 -258l104 246l26 171h54l-25 -167l-108 -250h-51z" />
-<glyph unicode="-" horiz-adv-x="807" d="M109 599l8 54h590l-8 -54h-590z" />
-<glyph unicode="." horiz-adv-x="439" d="M93 0l20 130h86l-20 -130h-86z" />
-<glyph unicode="/" horiz-adv-x="782" d="M-57 -125l845 1581h59l-845 -1581h-59z" />
-<glyph unicode="0" d="M114 514l64 428q39 259 175.5 397t348.5 138q201 0 300.5 -144t62.5 -391l-64 -428q-39 -261 -174.5 -398t-347.5 -137q-201 0 -302 144t-63 391zM168 516q-34 -225 47.5 -354t271.5 -129q180 0 303.5 134t156.5 349l64 426q34 228 -47 354.5t-271 126.5 q-181 0 -305 -132t-156 -349z" />
-<glyph unicode="1" d="M316 1347l7 46l435 84l-222 -1477h-54l214 1425z" />
-<glyph unicode="2" d="M81 0l8 54l577 572q155 154 223 257.5t82 202.5q23 167 -46 252t-242 85q-172 0 -288.5 -106t-139.5 -271h-45l-3 6q22 184 154.5 304.5t329.5 120.5q173 0 267 -103t68 -288q-18 -126 -110.5 -246.5t-265.5 -293.5l-484 -486l2 -6h792l-8 -54h-871z" />
-<glyph unicode="3" d="M89 399l3 6h46q-26 -168 76.5 -270t283.5 -102q173 0 290.5 93.5t141.5 255.5q26 177 -74.5 255t-300.5 78h-111l7 44l1 5l1 7h111q175 0 297.5 92t142.5 223q22 151 -53.5 244t-253.5 93q-156 0 -280.5 -96t-147.5 -252h-45l-2 6q23 184 161.5 290t322.5 106 q181 0 279.5 -107.5t71.5 -287.5q-18 -120 -103 -210t-215 -129q134 -36 200 -128t46 -229q-30 -198 -165 -302.5t-330 -104.5q-179 0 -307 110t-94 310z" />
-<glyph unicode="4" d="M52 397l4 30l849 1029h65l-151 -1005h253l-8 -54h-253l-59 -397h-54l59 397h-705zM148 456l3 -5h614l139 928l-5 2l-97 -128z" />
-<glyph unicode="5" d="M160 378l2 5h48q-27 -179 55.5 -264.5t249.5 -85.5q187 0 297 108.5t142 320.5q29 191 -45 293.5t-239 102.5q-154 0 -257.5 -54t-157.5 -158l-39 16l197 794h690l-8 -53h-641l-153 -618q71 63 151 95t225 36q175 5 269.5 -119t63.5 -333q-35 -231 -158 -358t-345 -127 q-171 0 -276 101.5t-71 297.5z" />
-<glyph unicode="6" d="M167 512l67 448q35 237 182.5 377t338.5 140q75 0 151 -17t133 -53l-29 -51q-59 37 -118.5 52t-145.5 15q-160 0 -293.5 -127.5t-164.5 -334.5l-44 -295q64 110 181.5 180.5t256.5 70.5q191 0 281.5 -128t57.5 -349q-32 -212 -170 -336.5t-330 -124.5q-183 0 -286.5 147 t-67.5 386zM221 513q-34 -224 52 -352.5t256 -128.5q162 0 287 118.5t151 289.5q31 213 -42 318t-259 105q-148 0 -285.5 -103.5t-158.5 -243.5h-1v-3z" />
-<glyph unicode="7" d="M217 1402l8 54h930l-8 -54q-256 -246 -449.5 -561t-251.5 -710l-20 -131h-54l20 131q56 376 235 688t455 583h-865z" />
-<glyph unicode="8" d="M76 389q20 138 122.5 235t251.5 133q-117 38 -181.5 128.5t-45.5 210.5q28 189 163.5 285t326.5 96q171 0 276.5 -100.5t78.5 -280.5q-19 -128 -105.5 -217.5t-211.5 -124.5q128 -40 200 -138t53 -227q-30 -199 -174 -304.5t-340 -105.5q-198 0 -320.5 109.5t-93.5 300.5 zM130 384q-26 -167 79.5 -259t288.5 -92q161 0 294 96t157 255q23 159 -78.5 251.5t-270.5 92.5q-171 0 -309.5 -96t-160.5 -248zM278 1101q-23 -151 72 -235t260 -84q144 0 264 88t141 231q22 147 -69 234.5t-242 87.5q-158 0 -281 -87t-145 -235z" />
-<glyph unicode="9" d="M163 988q32 214 174.5 351.5t335.5 137.5q189 0 295 -134t69 -380l-75 -503q-36 -233 -174 -357t-339 -124q-69 0 -141 16.5t-143 46.5l24 50q61 -32 122.5 -45.5t145.5 -13.5q169 0 291 114.5t152 310.5l42 287q-70 -104 -180.5 -160.5t-239.5 -56.5 q-181 0 -284.5 134.5t-74.5 325.5zM225 988q-27 -175 54.5 -291t250.5 -116q143 0 257 81.5t172 195.5l16 104q35 230 -51.5 345.5t-255.5 115.5q-161 0 -289 -130.5t-154 -304.5z" />
-<glyph unicode=":" horiz-adv-x="364" d="M66 0l20 130h86l-20 -130h-86zM207 949l20 130h86l-20 -130h-86z" />
-<glyph unicode=";" horiz-adv-x="364" d="M215 952l20 130h86l-20 -130h-86zM-4 -258l104 246l26 171h54l-25 -167l-108 -250h-51z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1053" d="M79 515l1 8l5 29l2 13l893 378l-8 -58l-707 -308l-125 -37v-6l113 -36l615 -303l-9 -59z" />
-<glyph unicode="=" horiz-adv-x="1142" d="M132 436l9 54h834l-9 -54h-834zM193 843l9 54h834l-9 -54h-834z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1053" d="M55 137l8 59l706 307l125 36v6l-113 37l-614 304l9 58l779 -378l-2 -9h1l-5 -29l-2 -12z" />
-<glyph unicode="?" horiz-adv-x="893" d="M186 1122q24 170 136.5 262.5t267.5 92.5q158 0 240 -102t58 -265q-22 -147 -97.5 -244.5t-224.5 -215.5q-77 -53 -100 -101.5t-37 -148.5h-54q18 116 45 165t124 127q138 116 203 197.5t87 222.5q22 152 -42.5 232t-209.5 80q-136 0 -230.5 -85.5t-117.5 -222.5h-46z M311 0l16 106h82l-16 -106h-82z" />
-<glyph unicode="@" horiz-adv-x="1902" d="M121 478q82 427 357.5 680t654.5 253q386 0 548.5 -237t83.5 -651q-42 -219 -170.5 -381.5t-320.5 -162.5q-80 0 -123.5 61.5t-37.5 169.5q-73 -115 -165.5 -173t-201.5 -58q-131 0 -182.5 120t-3.5 317q60 250 204 401t316 151q80 0 130 -28t104 -82l-134 -565 q-34 -152 5.5 -205.5t99.5 -53.5q152 0 265.5 136t157.5 353q80 396 -61.5 613.5t-526.5 217.5q-324 0 -594.5 -241.5t-349.5 -634.5q-78 -382 79.5 -629t514.5 -247q84 0 179.5 22.5t162.5 57.5l17 -46q-67 -40 -173 -64.5t-198 -24.5q-366 0 -542.5 252t-94.5 679z M604.5 141q34.5 -108 147.5 -108q104 0 202.5 66.5t182.5 243.5l116 488q-29 39 -74.5 60.5t-109.5 21.5q-136 0 -264.5 -127.5t-190.5 -369.5q-44 -167 -9.5 -275z" />
-<glyph unicode="A" horiz-adv-x="1223" d="M-46 0l762 1456h66l327 -1456h-59l-98 435h-711l-228 -435h-59zM269 489h671l-182 815l-15 84l-6 1l-40 -85z" />
-<glyph unicode="B" horiz-adv-x="1230" d="M120 0l218 1456h383q218 0 333 -94q92 -76 93 -210q0 -33 -6 -69q-19 -126 -90.5 -210.5t-185.5 -112.5l-2 -6q127 -16 199 -118q57 -80 57 -179q0 -27 -4 -56q-30 -198 -167 -299.5t-343 -101.5h-485zM182 54h431q177 0 300 92t148 253q4 28 4 54q0 109 -71 177 q-88 84 -263 89h-18h-432zM289 773h368q184 3 295.5 81.5t134.5 232.5q5 33 5 62q0 115 -75 177q-94 76 -304 76h-329z" />
-<glyph unicode="C" horiz-adv-x="1327" d="M157 619l33 218q43 297 212 468.5t411 171.5q219 0 345 -120q98 -93 97 -246q0 -44 -8 -93l-3 -6h-46q7 45 7 85q-1 143 -83 223q-105 104 -318 103q-205 0 -363 -162t-197 -422l-33 -220q-12 -78 -12 -147q-1 -172 75 -284q106 -156 322 -155q203 0 344.5 104t172.5 309 h45l2 -6q-31 -233 -185.5 -347t-386.5 -114q-230 0 -352 178q-90 132 -90 321q0 67 11 141z" />
-<glyph unicode="D" horiz-adv-x="1370" d="M120 0l218 1456h433q242 0 394 -182q120 -144 120 -346q0 -53 -8 -111l-27 -178q-44 -291 -243.5 -465t-453.5 -174h-433zM182 54h379q218 0 407.5 167.5t227.5 417.5l27 181q8 57 8 110q0 186 -104 311q-134 161 -364 161h-379z" />
-<glyph unicode="E" horiz-adv-x="1129" d="M120 0l218 1456h856l-8 -54h-802l-93 -616h701l-8 -54h-701l-101 -678h802l-8 -54h-856z" />
-<glyph unicode="F" horiz-adv-x="1127" d="M120 0l218 1456h872l-8 -54h-818l-95 -630h717l-9 -56h-716l-107 -716h-54z" />
-<glyph unicode="G" horiz-adv-x="1429" d="M181 620l36 238q42 285 217 452t420 167q224 0 348 -121q99 -97 99 -232q0 -36 -7 -75l-2 -6h-46q5 35 5 67q0 127 -82 210q-103 103 -324 103q-213 0 -375.5 -159t-198.5 -404l-36 -240q-11 -71 -11 -135q0 -177 84 -293q114 -159 346 -159q167 0 294 57.5t177 130.5 l62 414h-445l9 55h499l-75 -494q-58 -78 -198.5 -147.5t-330.5 -69.5q-240 0 -374 179q-101 136 -101 331q0 62 10 131z" />
-<glyph unicode="H" horiz-adv-x="1438" d="M120 0l218 1456h54l-106 -707h930l106 707h54l-218 -1456h-54l104 695h-930l-104 -695h-54z" />
-<glyph unicode="I" horiz-adv-x="534" d="M160 0l218 1456h54l-218 -1456h-54z" />
-<glyph unicode="J" horiz-adv-x="1122" d="M72 396l2 5h47q-8 -53 -8 -97q0 -122 60 -185q82 -86 271 -86q148 0 266.5 106t145.5 283l155 1034h54l-155 -1034q-32 -211 -162 -327t-312 -116q-193 0 -296 107q-77 81 -77 214q0 45 9 96z" />
-<glyph unicode="K" horiz-adv-x="1174" d="M101 0l218 1456h54l-102 -682h212l682 682h68l2 -6l-708 -710l531 -740h-68l-517 721h-210l-108 -721h-54z" />
-<glyph unicode="L" horiz-adv-x="1130" d="M120 0l218 1456h55l-210 -1402h787l-8 -54h-842z" />
-<glyph unicode="M" horiz-adv-x="1756" d="M120 0l218 1456h75l401 -1370l6 -1l813 1371h61l-218 -1456h-54l198 1322l-6 2l-788 -1324h-43l-401 1353l-6 -1l-202 -1352h-54z" />
-<glyph unicode="N" horiz-adv-x="1449" d="M120 0l218 1456h55l731 -1354l6 1l203 1353h54l-218 -1456h-54l-731 1356l-6 -1l-203 -1355h-55z" />
-<glyph unicode="O" horiz-adv-x="1364" d="M146 619l33 218q45 305 214.5 472.5t429.5 167.5q247 -1 372 -175q93 -130 93 -324q0 -67 -11 -141l-33 -218q-46 -306 -215.5 -473t-428.5 -167q-246 1 -372 175q-93 129 -93 322q0 67 11 143zM201 619q-12 -82 -12 -152q0 -173 74 -281q105 -152 345 -153 q229 0 385 159.5t197 426.5l33 220q12 79 12 147q1 174 -75 284q-104 152 -346 153q-228 0 -384 -159.5t-196 -424.5z" />
-<glyph unicode="P" horiz-adv-x="1230" d="M120 0l218 1456h455q218 0 327 -115q87 -91 87 -227q0 -35 -6 -73q-29 -197 -166 -306.5t-366 -109.5h-402l-93 -625h-54zM275 679h402q198 0 322.5 104t147.5 256q5 35 5 67q0 117 -69 196q-88 100 -298 100h-401z" />
-<glyph unicode="Q" horiz-adv-x="1364" d="M146 619l33 218q45 305 214.5 472.5t429.5 167.5q247 0 372 -175q93 -129 93 -324q0 -67 -11 -141l-33 -218q-24 -156 -80.5 -277.5t-142.5 -203.5l207 -236l-44 -35l-208 233q-77 -60 -172 -90.5t-204 -30.5q-247 0 -372 175q-93 129 -93 322q0 67 11 143zM201 619 q-12 -82 -12 -152q0 -173 74 -281q105 -153 345 -153q229 0 385 159.5t197 426.5l33 220q12 79 12 147q0 175 -75 284q-105 153 -346 153q-228 0 -384 -159.5t-196 -424.5z" />
-<glyph unicode="R" horiz-adv-x="1364" d="M115 -1l218 1456h474q223 -1 335 -101q91 -81 90 -219q0 -33 -5 -70q-20 -128 -113 -227t-236 -127q148 -28 206 -117q44 -67 44 -160q0 -30 -5 -63l-21 -137q-6 -39 -6 -72q0 -26 4 -50q9 -52 42 -88l-4 -25h-53q-29 41 -39 101q-4 27 -5 57q0 37 7 79l20 133q5 32 5 60 q-1 110 -71 174q-88 80 -278 80h-453l-102 -684h-54zM279 737h411q214 0 338 95.5t145 232.5q5 36 5 68q0 119 -72 185q-93 83 -307 83h-420z" />
-<glyph unicode="S" horiz-adv-x="1224" d="M156 403l2 6h46q-6 -41 -6 -77q0 -146 100 -214q125 -86 311 -85q168 0 298.5 81t147.5 189q5 31 5 59q0 106 -67 171q-84 82 -327 171q-238 84 -342 176q-82 72 -82 199q0 34 6 72q22 151 154 238.5t316 87.5q209 0 329 -114q94 -89 94 -227q0 -39 -8 -83l-3 -6h-46 q5 33 5 64q0 127 -83 209q-103 104 -297 103q-159 0 -275 -81.5t-132 -188.5q-5 -31 -5 -60q1 -103 63 -169q80 -84 323 -170q231 -80 341 -180q90 -81 91 -209q0 -29 -5 -60q-24 -155 -165.5 -240.5t-343.5 -85.5q-202 -1 -342 103q-111 82 -111 235q0 41 8 86z" />
-<glyph unicode="T" horiz-adv-x="1224" d="M187 1402l8 54h1110l-8 -54h-510l-210 -1402h-54l210 1402h-546z" />
-<glyph unicode="U" horiz-adv-x="1365" d="M178 489l145 967h54l-145 -967q-8 -51 -8 -96q0 -147 82 -239q106 -120 302 -121q185 0 332.5 125.5t178.5 330.5l145 967h54l-145 -967q-37 -249 -194 -379.5t-379 -130.5q-212 1 -335 137q-95 106 -95 271q0 48 8 102z" />
-<glyph unicode="V" horiz-adv-x="1223" d="M173 1456h59l292 -1314l14 -78l6 -1l38 79l686 1314h59l-762 -1456h-66z" />
-<glyph unicode="W" horiz-adv-x="1855" d="M199 1456h60l135 -1116l28 -235l6 -1l98 236l511 1116h60l175 -1116l27 -235l6 -1l100 236l467 1116h59l-610 -1456h-61l-179 1214l-26 144l-6 1l-68 -145l-546 -1214h-61z" />
-<glyph unicode="X" horiz-adv-x="1223" d="M-22 5l630 738l-397 713h68l369 -671l571 671h60l2 -5l-605 -708l413 -743h-67l-387 701l-596 -701h-59z" />
-<glyph unicode="Y" horiz-adv-x="1223" d="M174 1456h66l360 -809l19 -50l34 50l604 809h66l-682 -902l-83 -554h-55l83 553z" />
-<glyph unicode="Z" horiz-adv-x="1101" d="M7 0l2 44l1004 1359h-818l8 53h894l-5 -38l-1008 -1364h897l-8 -54h-966z" />
-<glyph unicode="[" horiz-adv-x="439" d="M62 -312l277 1976h283l-8 -54h-229l-261 -1868h229l-8 -54h-283z" />
-<glyph unicode="\" horiz-adv-x="774" d="M195 1456h58l371 -1581h-58z" />
-<glyph unicode="]" horiz-adv-x="439" d="M-127 -312l8 54h228l261 1868h-228l8 54h283l-277 -1976h-283z" />
-<glyph unicode="^" horiz-adv-x="849" d="M120 729l408 727h52l190 -727h-61l-140 543l-23 113l-6 1l-60 -114l-301 -543h-59z" />
-<glyph unicode="_" horiz-adv-x="845" d="M-89 -54l8 54h846l-8 -54h-846z" />
-<glyph unicode="`" horiz-adv-x="537" d="M236 1518h96l187 -266h-82z" />
-<glyph unicode="a" horiz-adv-x="1081" d="M55 284q20 141 161.5 230.5t336.5 89.5h308l24 158q5 31 5 58q0 98 -58 155q-74 73 -234 73q-141 0 -244 -71.5t-120 -182.5l-45 2l-1 5q14 130 129.5 215.5t288.5 85.5q168 0 262 -89q75 -71 76 -190q0 -30 -5 -63l-81 -542q-9 -59 -11 -112q0 -11 -1 -21q0 -42 7 -85 h-60q-2 67 -2 99q1 8 1 14q0 29 6 70l2 16q-70 -98 -190 -159t-278 -61q-146 -1 -222 83q-60 66 -60 165q0 27 5 57zM108 280q-4 -24 -4 -46q0 -80 50 -134q63 -68 186 -68q155 0 279.5 71.5t196.5 201.5l37 244h-306q-162 0 -292.5 -78t-146.5 -191z" />
-<glyph unicode="b" d="M92 0l44 297v7l66 441l2 7l122 808h54l-100 -667q69 97 169.5 153t226.5 56q182 0 272 -153q63 -107 63 -265q0 -67 -11 -142l-3 -21q-39 -259 -167 -400.5t-320 -141.5q-122 0 -210 52t-130 139l-33 -170h-45zM186 262q26 -105 109.5 -167t223.5 -62q164 0 276.5 133.5 t145.5 354.5l3 21q11 78 11 145q0 135 -45 225q-68 136 -241 136q-147 0 -247.5 -78t-158.5 -190z" />
-<glyph unicode="c" horiz-adv-x="1039" d="M95 520l6 42q37 251 175 395.5t346 144.5q164 0 268 -100q81 -77 80 -200q0 -37 -7 -77l-2 -5h-47q5 35 5 67q1 115 -69 179q-88 82 -236 82q-183 0 -305 -138t-154 -348l-6 -42q-10 -68 -10 -128q-1 -136 53 -228q78 -132 272 -131q133 0 251 75t141 225h45l2 -6 q-21 -166 -153.5 -257t-293.5 -91q-198 1 -298 151q-73 110 -73 266q0 59 10 124z" />
-<glyph unicode="d" d="M120 521l3 21q40 267 169 413.5t323 146.5q121 0 206.5 -58t127.5 -157l101 673h54l-122 -810v-4l1 -1l-66 -441l-3 -7l-44 -297h-52l24 167q-68 -86 -169.5 -137t-227.5 -51q-183 -1 -273 147q-63 104 -63 259q0 64 11 136zM176 521q-12 -78 -12 -145q0 -130 46 -215 q68 -128 242 -128q136 0 241.5 65t163.5 171l76 507q-22 115 -97 193.5t-230 78.5q-165 0 -279.5 -142t-147.5 -364z" />
-<glyph unicode="e" horiz-adv-x="1039" d="M92 500l10 64q36 244 187.5 391t351.5 147q174 0 266 -120q69 -90 69 -228q0 -45 -7 -94l-12 -83h-799q0 -3 -1 -7.5t-1 -5.5l-10 -64q-8 -52 -8 -99q0 -139 68 -237q92 -131 270 -131q93 0 190.5 36t161.5 96l22 -42q-65 -63 -161.5 -103.5t-220.5 -40.5 q-182 -1 -296 149q-87 115 -88 274q0 47 8 98zM175 637l2 -6h734l5 33q6 44 6 83q0 117 -55 196q-74 105 -234 105q-161 0 -288.5 -118t-169.5 -293z" />
-<glyph unicode="f" horiz-adv-x="645" d="M140 1027l8 55h188l27 178q24 159 110 240t221 81q32 0 65 -4t61 -13l-16 -52q-31 8 -55 11.5t-62 3.5q-104 0 -178 -71.5t-92 -195.5l-27 -178h286l-8 -55h-286l-154 -1027h-54l154 1027h-188z" />
-<glyph unicode="g" d="M91 -375l24 54q69 -32 134 -47.5t152 -15.5q168 0 277 99t136 279l25 171q-68 -85 -169 -135.5t-225 -50.5q-183 0 -273 147q-63 105 -63 259q0 64 11 136l3 21q40 267 169 413.5t323 146.5q121 0 206.5 -58t127.5 -158l37 196h46l-50 -332q0 -1 0.5 -2.5t0.5 -2.5 l-66 -441l-3 -8l-45 -302q-33 -214 -156 -322.5t-318 -108.5q-76 0 -160.5 16.5t-143.5 45.5zM175 521q-12 -78 -12 -144q0 -131 46 -216q69 -128 243 -128q134 0 239 63.5t163 168.5l78 514q-22 114 -97 191.5t-229 77.5q-165 0 -280 -142t-148 -364z" />
-<glyph unicode="h" d="M92 0l83 554h-2q2 16 5 32.5t7 32.5l141 941h54l-105 -697q68 116 173.5 177.5t246.5 61.5q163 0 237 -108q51 -75 51 -205q0 -59 -10 -131l-99 -658h-55l99 660q11 75 11 134q-1 116 -43 171q-64 83 -198 83q-166 0 -277.5 -104t-162.5 -263l-102 -681h-54z" />
-<glyph unicode="i" horiz-adv-x="422" d="M105 0l162 1082h54l-162 -1082h-54zM318 1422l21 138h54l-21 -138h-54z" />
-<glyph unicode="j" horiz-adv-x="445" d="M-300 -417l21 52q18 -6 45 -12t52 -6q107 0 180.5 78t94.5 216l175 1171h54l-175 -1171q-27 -173 -114 -260.5t-224 -87.5q-28 0 -54 5t-55 15zM314 1426l20 134h54l-20 -134h-54z" />
-<glyph unicode="k" horiz-adv-x="969" d="M92 0l234 1560h54l-143 -953h127l563 475h62l2 -6l-569 -487l451 -589h-70l-426 553h-148l-83 -553h-54z" />
-<glyph unicode="l" horiz-adv-x="422" d="M105 0l234 1560h54l-234 -1560h-54z" />
-<glyph unicode="m" horiz-adv-x="1836" d="M83 0l83 554h-2q2 15 4.5 30.5t6.5 34.5l70 463h47l-24 -211q66 112 165.5 171.5t231.5 59.5t210 -69.5t92 -213.5q64 137 171.5 210.5t254.5 73.5q173 -1 251 -119q53 -81 53 -222q0 -65 -11 -144l-93 -617h-55l93 619q12 84 12 151q-1 126 -45 186q-68 92 -211 92 q-161 0 -265.5 -101t-154.5 -258q-2 -18 -4 -37t-5 -38l-92 -615h-55l83 554h-3q3 21 6.5 41t8.5 40q10 74 10 134q0 131 -47 191q-68 88 -210 88q-160 0 -263 -98.5t-153 -252.5l-105 -697h-55z" />
-<glyph unicode="n" d="M92 0l83 554h-3q3 20 6.5 40t8.5 39l67 449h46l-24 -211q66 112 168.5 171.5t240.5 59.5q170 0 245 -113q51 -77 51 -213q0 -63 -11 -139l-96 -637h-54l96 639q12 81 12 145q0 118 -42 176q-66 88 -208 88q-164 0 -271 -102t-158 -259l-103 -687h-54z" />
-<glyph unicode="o" d="M85 520l6 42q37 247 189 393.5t365 146.5q203 0 315 -152q86 -116 87 -281q0 -51 -9 -107l-6 -42q-38 -248 -189.5 -394.5t-363.5 -146.5q-203 1 -317 153q-86 116 -86 279q0 52 9 109zM139 520q-8 -54 -9 -104q0 -143 70 -245q92 -138 287 -138q182 0 321 143t170 344 l6 42q8 52 8 99q0 142 -70 247q-93 140 -285 140q-183 0 -323 -145t-169 -341z" />
-<glyph unicode="p" d="M30 -416l106 713v8l66 440l2 6l50 331h42l-18 -192q69 99 170 155.5t228 56.5q183 0 272 -153q63 -107 63 -265q0 -66 -11 -142l-3 -21q-39 -259 -167 -400.5t-320 -141.5q-122 0 -209 51.5t-130 137.5l-87 -584h-54zM186 264q25 -106 108.5 -168.5t224.5 -62.5 q164 0 277 133.5t146 354.5l3 21q11 77 11 144q0 134 -46 226q-68 136 -241 136q-148 0 -248.5 -78t-157.5 -191z" />
-<glyph unicode="q" d="M120 521l3 21q40 267 169 413.5t323 146.5q121 0 206.5 -57.5t127.5 -156.5l34 194h49l-50 -331q0 -1 0.5 -3t0.5 -3l-66 -441l-3 -7l-106 -713h-54l87 582q-68 -86 -169.5 -136.5t-226.5 -50.5q-183 0 -273 147q-63 105 -63 259q0 64 11 136zM176 521q-12 -78 -12 -145 q0 -130 46 -215q68 -128 242 -128q135 0 240 64.5t164 170.5l76 510q-22 114 -97 192t-229 78q-165 0 -279.5 -142t-147.5 -364z" />
-<glyph unicode="r" horiz-adv-x="685" d="M92 0l162 1082h44l-18 -188l-4 -24l5 -3q58 112 155 173.5t228 61.5q22 0 42 -3.5t33 -7.5l-14 -48l-69 6q-140 0 -247 -96.5t-158 -250.5l-105 -702h-54z" />
-<glyph unicode="s" horiz-adv-x="1019" d="M75 269l2 6h45q-1 -12 -1 -24q0 -110 85 -161q94 -57 233 -57q144 0 244.5 70.5t113.5 161.5q2 14 2 28q0 71 -53 129q-63 69 -242 110q-186 42 -264 106q-63 52 -63 145q0 22 3 46q16 121 124.5 197t275.5 76q172 0 266 -85q76 -68 76 -168q0 -24 -4 -50l-2 -6h-47 q2 18 2 35q0 88 -65 148q-78 72 -233 72q-146 0 -237 -66.5t-102 -150.5q-2 -15 -2 -30q0 -69 48 -117q58 -58 247 -103q176 -42 259 -115q68 -60 68 -158q0 -21 -3 -44q-19 -132 -132.5 -208.5t-287.5 -76.5q-182 -1 -281 85q-80 69 -80 160q0 22 5 45z" />
-<glyph unicode="t" horiz-adv-x="633" d="M103 1027l8 55h200l44 292h55l-44 -292h266l-8 -55h-266l-112 -748q-8 -50 -8 -90q0 -68 24 -102q36 -54 111 -54q26 0 49 2t58 7l3 -49q-27 -8 -54 -11t-61 -3q-105 0 -153 72q-32 48 -32 133q0 43 8 95l112 748h-200z" />
-<glyph unicode="u" d="M158 465l92 617h54l-93 -619q-12 -80 -12 -145q0 -120 42 -184q65 -100 206 -101q161 0 266 83.5t152 218.5l112 747h55l-96 -637h3q3 16 -3 -18t-9 -46l-57 -381h-45l20 185q-66 -100 -167.5 -153t-236.5 -53q-161 0 -241 120q-54 81 -54 221q0 66 12 145z" />
-<glyph unicode="v" horiz-adv-x="978" d="M125 1082h58l206 -853l29 -146l6 -1l74 147l461 853h58l-583 -1081l1 -1h-52z" />
-<glyph unicode="w" horiz-adv-x="1550" d="M165 1082h62l106 -769l23 -222l6 -1l104 223l358 769h55l127 -769l36 -222l6 -1l92 223l335 769h63l-477 -1082h-54l-149 813l-20 167l-6 1l-72 -168l-389 -813h-54z" />
-<glyph unicode="x" horiz-adv-x="978" d="M-20 5l478 550l-301 527h68l274 -480l417 480h61l2 -5l-454 -522l317 -555h-67l-291 508l-442 -508h-60z" />
-<glyph unicode="y" horiz-adv-x="978" d="M-46 -426l17 51q11 -3 32 -6t33 -3q88 0 150.5 55.5t117.5 158.5l91 176l-270 1076h59l223 -886l24 -108h6l9 16l520 978h60l-670 -1262q-62 -114 -131 -185.5t-197 -71.5q-18 0 -40.5 3.5t-33.5 7.5z" />
-<glyph unicode="z" horiz-adv-x="978" d="M7 0l7 44l853 978l-2 5h-673l8 55h753l-7 -48l-853 -975l2 -5h763l-8 -54h-843z" />
-<glyph unicode="{" horiz-adv-x="660" d="M74 543l3 23l3 20l3 23q123 0 196.5 73t92.5 203l34 247q24 177 112.5 292.5t267.5 167.5l6 -2l7 -38q-150 -46 -234 -155.5t-105 -264.5l-34 -247q-18 -125 -80.5 -206t-174.5 -104q100 -27 142 -110.5t26 -199.5l-34 -245q-23 -159 32.5 -262t194.5 -153l-27 -46 q-166 55 -222.5 173t-31.5 288l34 245q19 136 -31.5 207t-179.5 71z" />
-<glyph unicode="|" horiz-adv-x="406" d="M61 -270l258 1726h54l-258 -1726h-54z" />
-<glyph unicode="}" horiz-adv-x="660" d="M-130 -395q150 49 235 155t107 260l34 245q17 124 79.5 205.5t175.5 106.5q-101 26 -143 108.5t-25 199.5l34 247q23 161 -30 267t-190 153l21 45q165 -55 221 -174.5t32 -290.5l-34 -247q-20 -136 31 -206t180 -70l-3 -23l-3 -20l-3 -23q-123 0 -197 -74.5t-92 -203.5 l-34 -245q-25 -177 -113.5 -291.5t-270.5 -169.5z" />
-<glyph unicode="~" horiz-adv-x="1412" d="M147 474q18 132 102.5 216t201.5 84q82 0 152 -40.5t149 -119.5q59 -62 112.5 -90t116.5 -28q82 0 152.5 71.5t86.5 185.5l60 -13q-18 -126 -105 -211.5t-201 -85.5q-84 0 -152.5 39t-146.5 120q-59 59 -114.5 88.5t-116.5 29.5q-85 0 -154 -68.5t-85 -189.5z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1110" d="M132 520l6 42q36 243 166.5 386.5t329.5 152.5l33 217h55l-33 -217q152 -10 246 -108.5t65 -267.5l-2 -5h-47q24 165 -64.5 246.5t-235.5 81.5q-183 0 -305 -138t-154 -348l-6 -42q-34 -224 43.5 -355.5t271.5 -131.5q133 0 251 75t141 225h45l2 -6q-20 -158 -142.5 -248 t-277.5 -99l-33 -225h-55l33 225q-187 12 -278 160.5t-55 379.5z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1150" d="M49 0l8 54h10q91 16 154.5 145.5t84.5 266.5l23 201h-244l8 54h242l36 319q32 212 149 324.5t288 112.5q168 0 237.5 -104t43.5 -283h-54q27 183 -34.5 258t-201.5 75q-141 0 -244 -101t-130 -282l-36 -319h477l-8 -54h-475l-23 -201q-20 -129 -72 -237.5t-128 -174.5 h808l-7 -54h-912z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1207" d="M93 326l8 55h450l36 240h-450l8 55h421l-370 780h65l345 -718l16 -51h5l32 51l558 718h66l-606 -780h424l-8 -55h-452l-36 -240h452l-8 -55h-452l-49 -326h-54l49 326h-450z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1666" d="M152 729q49 327 286 537t536 210q284 0 464.5 -218t133.5 -529q-49 -328 -286 -539t-536 -211q-284 0 -464.5 218.5t-133.5 531.5zM208 729q-46 -301 115 -498t435 -197q259 0 487 204t271 491q45 300 -116 496t-434 196q-261 0 -488 -203t-270 -489zM526 669l18 119 q26 178 129.5 282.5t248.5 104.5q134 0 204 -80.5t44 -227.5l-3 -5h-45q20 134 -33.5 197t-174.5 63q-119 0 -206.5 -96t-108.5 -237l-18 -120q-23 -150 34 -241t182 -91q116 0 190.5 64t93.5 195h44l2 -6q-20 -156 -109 -232t-230 -76q-138 0 -213 108t-49 279z" />
-<glyph unicode="&#xad;" horiz-adv-x="807" d="M109 599l8 54h590l-8 -54h-590z" />
-<glyph unicode="&#xae;" horiz-adv-x="1674" d="M144 729q49 327 285.5 537t536.5 210q284 0 464.5 -218t133.5 -529q-49 -328 -286 -539t-536 -211q-284 0 -464.5 218.5t-133.5 531.5zM199 729q-46 -301 115.5 -498t435.5 -197q259 0 487 204t271 491q45 300 -116 496t-434 196q-261 0 -488.5 -203t-270.5 -489z M560 316l128 850h239q138 0 204 -61.5t49 -178.5q-12 -77 -59 -127.5t-127 -79.5q65 -23 89.5 -76.5t13.5 -127.5l-8 -56q-7 -40 -7.5 -72.5t5.5 -54.5l-3 -16h-59q-6 21 -2.5 59t10.5 85l8 54q14 97 -21 135.5t-137 38.5h-212l-56 -372h-55zM679 744h206q87 0 157 48.5 t83 134.5q15 99 -30.5 141.5t-175.5 42.5h-184z" />
-<glyph unicode="&#xb4;" horiz-adv-x="511" d="M219 1258l258 260h77l2 -6l-268 -260h-66z" />
-<glyph unicode="&#x2000;" horiz-adv-x="832" />
-<glyph unicode="&#x2001;" horiz-adv-x="1664" />
-<glyph unicode="&#x2002;" horiz-adv-x="832" />
-<glyph unicode="&#x2003;" horiz-adv-x="1664" />
-<glyph unicode="&#x2004;" horiz-adv-x="554" />
-<glyph unicode="&#x2005;" horiz-adv-x="416" />
-<glyph unicode="&#x2006;" horiz-adv-x="277" />
-<glyph unicode="&#x2007;" horiz-adv-x="277" />
-<glyph unicode="&#x2008;" horiz-adv-x="208" />
-<glyph unicode="&#x2009;" horiz-adv-x="332" />
-<glyph unicode="&#x200a;" horiz-adv-x="92" />
-<glyph unicode="&#x2010;" horiz-adv-x="807" d="M109 599l8 54h590l-8 -54h-590z" />
-<glyph unicode="&#x2011;" horiz-adv-x="807" d="M109 599l8 54h590l-8 -54h-590z" />
-<glyph unicode="&#x2012;" horiz-adv-x="807" d="M109 599l8 54h590l-8 -54h-590z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1412" d="M209.298 721l10.3994 54h1085.49l-10.4004 -54h-1085.49z" />
-<glyph unicode="&#x2014;" horiz-adv-x="1673" d="M224.596 721l12.7998 54h1335.98l-12.7998 -54h-1335.98z" />
-<glyph unicode="&#x2018;" horiz-adv-x="430" d="M245 1019l25 166l90 271h50l-86 -267l-25 -170h-54z" />
-<glyph unicode="&#x2019;" horiz-adv-x="430" d="M228 1019l86 268l25 169h54l-24 -166l-91 -271h-50z" />
-<glyph unicode="&#x201c;" horiz-adv-x="673" d="M245 1019l25 166l90 271h50l-86 -267l-25 -170h-54zM495 1019l25 166l90 271h50l-86 -267l-25 -170h-54z" />
-<glyph unicode="&#x201d;" horiz-adv-x="657" d="M259 1019l86 268l25 169h54l-24 -166l-91 -271h-50zM461 1019l86 268l25 169h54l-24 -166l-91 -271h-50z" />
-<glyph unicode="&#x2022;" horiz-adv-x="635" d="M180 703l11 70q11 73 62 116.5t128 43.5q73 0 113.5 -46t30.5 -114l-11 -70q-11 -73 -62.5 -115.5t-127.5 -42.5q-74 0 -114 44.5t-30 113.5z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1255" d="M131 0l20 130h86l-20 -130h-86zM515 0l20 130h86l-20 -130h-86zM884 0l20 130h86l-20 -130h-86z" />
-<glyph unicode="&#x202f;" horiz-adv-x="332" />
-<glyph unicode="&#x205f;" horiz-adv-x="416" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1060" d="M85 553l8 55h187l33 222h-186l8 56h186l9 56q38 253 188.5 394t365.5 141q52 0 105.5 -8t111.5 -23l-9 -58q-51 16 -106 25.5t-111 9.5q-186 0 -322 -130t-168 -349l-9 -58h593l-8 -56h-593l-34 -222h593l-8 -55h-593l-6 -39q-35 -228 59.5 -354.5t289.5 -126.5 q55 0 113.5 8.5t111.5 25.5l-8 -57q-54 -15 -111.5 -23t-113.5 -8q-204 0 -317.5 146.5t-77.5 388.5l6 39h-187z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1247" d="M220 1399l8 57h384l-8 -57h-159l-71 -480h-56l71 480h-169zM610 919l80 537h75l114 -451l6 -1l250 452h69l-80 -537h-55l62 420l-5 2l-232 -422h-51l-107 436h-6l-65 -436h-55z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1167" d="M191 721l8 54h835l-8 -54h-835z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1080" d="M0 1080h1080v-1080h-1080v1080z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.ttf b/app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.ttf
deleted file mode 100644
index b305b7b8a990099c49902ab702566ee6c779f3ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33112
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

diff --git a/app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.woff b/app/webroot/css/fonts/roboto/Roboto-ThinItalic-webfont.woff
deleted file mode 100644
index 4ab4991e9c9a0ad32515c3e7b8cc4753855e8922..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18984
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%0D2`2SpWcd+GAj3U|?(b
z$H~CJp7-y{e^2&q2A~KEXafL@`vy07+BK0+NK{c2#=m>-dGGCXRp7!_f*^qyf(rhL
zgcji-;vY;WL_tIu6$;`>=#-8`lK5{FSE7hY#<&uMB3!t5x``axgo3jW1aZ?sS}0w=
zH-is;eCOPE&f%W#s!L=)y$vYFY8v&r2O0T`Qt3v_`G-Kx(5{w{(Op>9!*<cMV_f3s
zP;q->iZQ76@XF-bfc3AXTUAq=$V*aAR>>CmLmJ4sis6}x*;^?@qr63eT46@<%^Sjq
z1U4-{;X9?6cRJupKj~w>h_B8HeEpE~dQc}z=#>HZ?kWF$Auafr?W2-6a)>1P?zCcC
z0;Ie;?h)8a#yb*$$2->=7YAz3elSh&O~h{L0$fQIp74%Q$ww=7klLar@tJXFc&;|l
zuYUahZH{uW_ZZFD`rK}h!XBMM)ZE~?9zh@Td6UMdn}-dPwpS$0+|x<Cpr<uDX~&!d
z7DDf(jb4nQOz5XOj^)r>cM7x0;>0`!-1oq}>Jq-yDtV9tzo-q=C~Mev4`&~{pO8^I
zxF+X%4cB^38T}5sa)F7kC!8Zi-1iKpGJ}1o1nvM)&WOBt+GAjVgCK@Wj7E%an2s=e
zF;8Ls!;-<WhgF6(h_!%q8S6GS4Yo42W9)Y9t2m4}ws8t^R&lX#32@19S#ZU0RdGGx
z?&1E$)5WX9yNQp9&x`LJe*}LU|04klfgFJsf-Zt@go1<_gjb2Ui8P3O5p@#1BE}^a
zAl4vuK<tyag?O3x1o2H0ZIU*U_oR+Vmr1{oc_F(@_J>@G+%dTy3MvYB6sIT&D7{mT
zQvRS)p{l1^qsFJ^qP9%!j(V2*JPi$v8jTuFJIxbX9$NpjWwc-Eh~a=HIzc)GI#oI?
zI(u}!=rZW?=-TP}fuNp+-UGc~`WyhTtVqrP0RR91h5$eS1po{H0{{X50RRF3761SN
z00FE30{{Vd+I5i4N&;aNh9A=+L0Y;Vq*ah;+n{Aq%aYdqG@2lejT7Q+bUj@_SK+nz
z%*>a~Mh@pY@A-QV?+08mqfV{S1RnGf*JzoQ_>4Bs0oS==6mWxURso-L!*{?JbodGQ
z*NHukB*u)0cgDuCXliZEj+6y+K8o(ZT4J^&HoK!oUwg4O(KCJM<U+29r-El`Hf8Jl
zL>=Xo>U?x!<IRnfjW{WKeY#%zv-=a*Z;xzMuClgqXLi)NwVPMw-dPp5a^11|BiVMo
znOnKa|G#<VlP{T4EtWg~kLq?}>>dD-he3sS+HKCqPJ&?&h2eJ)L=X`K?7esYAE|Z}
zu=n02!Me}{!yQ->%hsE4XT2;hK~cV?Cz(7svzQD9{_=fBlK*m(8NomfMoi>lCJzf%
z^085XokAQqDZ+&t55<&FN*U!;P)QZl)KE(u^)%2(6V0^HN*nET&`B5F^q`^Rr57K5
z0t5*WrjLFG7-WcHMu;%V7*S%x8E1k?rkG}iS>~8$fkl>BW`$MOSZ9Mxw%BHeUG~`L
zfP@&h;+iM!C5Jm6#V97p6|>}tMXZu9HYpIh6pBNfyzt5gpS<zTEzeRUE^+g~mw3$S
z^HWWWXv*lXUQN@Ky3(ucRr-{EWk4BJhLmAtB&)9O>bmvl^f;Y5OeQW*vMX;qt3Pgx
zrBfHbC6@W)2Yb6r2mk<h+S|eSzjXs+FN606j(~`bjEsGe8{OEnBNR6XM0#%!2?8=2
zB4szQX~#q`Y+zAv-N3BvvVl#(br%B*i!cL|Hki)};<GU^!1(MCc?%ey1H@-%Qibvv
zH*i7?;#F|n#CefPdn2=38Ia2Z<npeDbGd<Bo>n-Q3&`b;hjaNrdN07a{6H>W3yd4N
OK|~t>1IIk90000tmS493

diff --git a/app/webroot/css/roboto.css b/app/webroot/css/roboto.css
deleted file mode 100644
index ed70e6010..000000000
--- a/app/webroot/css/roboto.css
+++ /dev/null
@@ -1,191 +0,0 @@
-@font-face {
-    font-family: 'Roboto';
-    src: url('fonts/roboto/Roboto-Regular-webfont.eot');
-    src: url('fonts/roboto/Roboto-Regular-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-Regular-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-Regular-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-Regular-webfont.svg#RobotoRegular') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoItalic';
-    src: url('fonts/roboto/Roboto-Italic-webfont.eot');
-    src: url('fonts/roboto/Roboto-Italic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-Italic-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-Italic-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-Italic-webfont.svg#RobotoItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoBold';
-    src: url('fonts/roboto/Roboto-Bold-webfont.eot');
-    src: url('fonts/roboto/Roboto-Bold-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-Bold-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-Bold-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-Bold-webfont.svg#RobotoBold') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoBoldItalic';
-    src: url('fonts/roboto/Roboto-BoldItalic-webfont.eot');
-    src: url('fonts/roboto/Roboto-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('vRoboto-BoldItalic-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-BoldItalic-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-BoldItalic-webfont.svg#RobotoBoldItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoCondensed';
-    src: url('fonts/roboto/Roboto-Condensed-webfont.eot');
-    src: url('fonts/roboto/Roboto-Condensed-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-Condensed-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-Condensed-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-Condensed-webfont.svg#RobotoCondensed') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoCondensedItalic';
-    src: url('fonts/roboto/Roboto-CondensedItalic-webfont.eot');
-    src: url('fonts/roboto/Roboto-CondensedItalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-CondensedItalic-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-CondensedItalic-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-CondensedItalic-webfont.svg#RobotoCondensedItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoBoldCondensed';
-    src: url('fonts/roboto/Roboto-BoldCondensed-webfont.eot');
-    src: url('fonts/roboto/Roboto-BoldCondensed-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-BoldCondensed-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-BoldCondensed-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-BoldCondensed-webfont.svg#RobotoBoldCondensed') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoBoldCondensedItalic';
-    src: url('fonts/roboto/Roboto-BoldCondensedItalic-webfont.eot');
-    src: url('fonts/roboto/Roboto-BoldCondensedItalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-BoldCondensedItalic-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-BoldCondensedItalic-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-BoldCondensedItalic-webfont.svg#RobotoBoldCondensedItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoThin';
-    src: url('fonts/roboto/Roboto-Thin-webfont.eot');
-    src: url('fonts/roboto/Roboto-Thin-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-Thin-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-Thin-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-Thin-webfont.svg#RobotoThin') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoThinItalic';
-    src: url('fonts/roboto/Roboto-ThinItalic-webfont.eot');
-    src: url('fonts/roboto/Roboto-ThinItalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-ThinItalic-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-ThinItalic-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-ThinItalic-webfont.svg#RobotoThinItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoLight';
-    src: url('fonts/roboto/Roboto-Light-webfont.eot');
-    src: url('fonts/roboto/Roboto-Light-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-Light-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-Light-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-Light-webfont.svg#RobotoLight') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoLightItalic';
-    src: url('fonts/roboto/Roboto-LightItalic-webfont.eot');
-    src: url('fonts/roboto/Roboto-LightItalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-LightItalic-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-LightItalic-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-LightItalic-webfont.svg#RobotoLightItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoMedium';
-    src: url('fonts/roboto/Roboto-Medium-webfont.eot');
-    src: url('fonts/roboto/Roboto-Medium-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-Medium-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-Medium-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-Medium-webfont.svg#RobotoMedium') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoMediumItalic';
-    src: url('fonts/roboto/Roboto-MediumItalic-webfont.eot');
-    src: url('fonts/roboto/Roboto-MediumItalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-MediumItalic-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-MediumItalic-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-MediumItalic-webfont.svg#RobotoMediumItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoBlack';
-    src: url('fonts/roboto/Roboto-Black-webfont.eot');
-    src: url('fonts/roboto/Roboto-Black-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-Black-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-Black-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-Black-webfont.svg#RobotoBlack') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}
-
-@font-face {
-    font-family: 'RobotoBlackItalic';
-    src: url('fonts/roboto/Roboto-BlackItalic-webfont.eot');
-    src: url('fonts/roboto/Roboto-BlackItalic-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/roboto/Roboto-BlackItalic-webfont.woff') format('woff'),
-         url('fonts/roboto/Roboto-BlackItalic-webfont.ttf') format('truetype'),
-         url('fonts/roboto/Roboto-BlackItalic-webfont.svg#RobotoBlackItalic') format('svg');
-    font-weight: normal;
-    font-style: normal;
-
-}

From 1aae9f842412f92250d6fd0a6182f258258c66ee Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 14 Feb 2021 09:54:55 +0100
Subject: [PATCH 141/437] fix: [internal] Remove unused layouts

---
 app/View/Layouts/flash.ctp | 36 --------------
 app/View/Layouts/graph.ctp | 98 --------------------------------------
 2 files changed, 134 deletions(-)
 delete mode 100644 app/View/Layouts/flash.ctp
 delete mode 100644 app/View/Layouts/graph.ctp

diff --git a/app/View/Layouts/flash.ctp b/app/View/Layouts/flash.ctp
deleted file mode 100644
index 566086d0f..000000000
--- a/app/View/Layouts/flash.ctp
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- *
- * PHP 5
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<?php echo $this->Html->charset(); ?>
-<title><?php echo $page_title; ?></title>
-<?php if (Configure::read('debug') == 0) { ?>
-<meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>
-<?php } ?>
-<style><!--
-P { text-align:center; font:bold 1.1em sans-serif }
-A { color:#444; text-decoration:none }
-A:HOVER { text-decoration: underline; color:#44E }
---></style>
-</head>
-<body>
-<p><a href="<?php echo $url; ?>"><?php echo $message; ?></a></p>
-</body>
-</html>
diff --git a/app/View/Layouts/graph.ctp b/app/View/Layouts/graph.ctp
deleted file mode 100644
index 0af1405d6..000000000
--- a/app/View/Layouts/graph.ctp
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta charset="UTF-8">
-<meta content="utf-8" http-equiv="encoding">
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <?php echo $this->Html->charset(); ?>
-    <title>
-        <?php echo $title_for_layout, ' - MISP'; ?>
-    </title>
-    <?php
-        echo $this->Html->meta('icon');
-        //echo $this->Html->css('roboto');
-        echo $this->Html->css('bootstrap'); // see http://twitter.github.io/bootstrap/base-css.html
-        echo $this->Html->css('bootstrap-datepicker');
-        echo $this->Html->css('bootstrap-timepicker');
-        echo $this->Html->css('bootstrap-colorpicker');
-        echo $this->Html->css('main');
-        echo $this->Html->css('print', 'stylesheet', array('media' => 'print'));
-
-        echo $this->fetch('meta');
-        echo $this->fetch('css');
-        echo $this->fetch('script');
-
-        echo $this->Html->script('jquery'); // Include jQuery library
-    ?>
-
-</head>
-<body>
-    <div id="gray_out" class="gray_out"></div>
-        <div id="container">
-            <?php echo $this->element('global_menu');
-                $padding_top = 10;
-                if ($debugMode == 'debugOff') $padding_top = 50;
-            ?>
-        <div class="container-fluid <?php echo $debugMode; ?>" style="padding-top:<?php echo $padding_top; ?>px;width:98%;">
-            <?php
-                $has_flash = false;
-                $flash = array();
-                $flash[] = $this->Session->flash('email');
-                $flash[] = $this->Session->flash();
-                $flash[] = $this->Session->flash('gpg');
-                $flash[] = $this->Session->flash('error');
-                $flash[] = $this->Session->flash('auth');
-                foreach ($flash as $f) {
-                    if ($f) {
-                        echo $f;
-                        $has_flash = true;
-                        continue;
-                    }
-                }
-            ?>
-        </div>
-        <?php
-            $topGap = 50;
-            if (Configure::read('debug') != 0) {
-                $topGap = 10;
-            } else {
-                if ($has_flash) $topGap += 50;
-            }
-        ?>
-        <div style="padding-top:<?php echo $topGap; ?>px !important;">
-            <?php echo $this->fetch('content'); ?>
-        </div>
-    </div>
-    <?php
-    echo $this->element('footer');
-    echo $this->element('sql_dump');
-    echo $this->Html->script('bootstrap');
-    echo $this->Html->script('bootstrap-timepicker');
-    echo $this->Html->script('bootstrap-datepicker');
-    echo $this->Html->script('bootstrap-colorpicker');
-    echo $this->Html->script('misp.js?' . $queryVersion);
-    echo $this->Html->script('keyboard-shortcuts.js?' . $queryVersion);
-    ?>
-    <div id = "ajax_success_container" class="ajax_container">
-        <div id="ajax_success" class="ajax_result ajax_success"></div>
-    </div>
-    <div id = "ajax_fail_container" class="ajax_container">
-        <div id="ajax_fail" class="ajax_result ajax_fail"></div>
-    </div>
-    <div class="loading">
-        <div class="spinner"></div>
-        <div class="loadingText"><?php echo __('Loading');?></div>
-    </div>
-    <?php
-        if ($debugMode == 'debugOff'):
-    ?>
-    <script type="text/javascript">
-        $(window).scroll(function(e) {
-            $('.actions').css('left',-$(window).scrollLeft());
-        });
-    </script>
-    <?php
-        endif;
-    ?>
-</body>
-</html>

From ccbb2e8e9180dd9b5211ad3a937a85d6a33fffdd Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 14 Feb 2021 11:55:24 +0100
Subject: [PATCH 142/437] fix: [internal] Remove unused ServerTag

---
 app/Model/ServerTag.php                       | 43 -------------------
 .../Elements/serverRuleElements/ajaxTags.ctp  | 36 ----------------
 2 files changed, 79 deletions(-)
 delete mode 100644 app/Model/ServerTag.php
 delete mode 100644 app/View/Elements/serverRuleElements/ajaxTags.ctp

diff --git a/app/Model/ServerTag.php b/app/Model/ServerTag.php
deleted file mode 100644
index 06e001647..000000000
--- a/app/Model/ServerTag.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-App::uses('AppModel', 'Model');
-
-class ServerTag extends AppModel
-{
-    public $actsAs = array('Containable');
-
-    public $validate = array(
-        'server_id' => array(
-            'valueNotEmpty' => array(
-                'rule' => array('valueNotEmpty'),
-            ),
-        ),
-        'tag_id' => array(
-            'valueNotEmpty' => array(
-                'rule' => array('valueNotEmpty'),
-            ),
-        ),
-    );
-
-    public $belongsTo = array(
-        'Server',
-        'Tag'
-    );
-
-    public function attachTagToServer($server_id, $tag_id)
-    {
-        $existingAssociation = $this->find('first', array(
-            'recursive' => -1,
-            'conditions' => array(
-                'tag_id' => $tag_id,
-                'server_id' => $server_id
-            )
-        ));
-        if (empty($existingAssociation)) {
-            $this->create();
-            if (!$this->save(array('server_id' => $server_id, 'tag_id' => $tag_id))) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
diff --git a/app/View/Elements/serverRuleElements/ajaxTags.ctp b/app/View/Elements/serverRuleElements/ajaxTags.ctp
deleted file mode 100644
index b339132da..000000000
--- a/app/View/Elements/serverRuleElements/ajaxTags.ctp
+++ /dev/null
@@ -1,36 +0,0 @@
-<div style="width:100%;display:inline-block;">
-    <?php
-        foreach ($tags as $tag): ?>
-            <div style="overflow:hidden;white-space:nowrap;float:left;">
-                <div style="padding-right:0px;float: left;">
-                    <?php if ($isSiteAdmin): ?>
-                        <a href="<?php echo $baseurl;?>/events/index/searchtag:<?php echo h($tag['Tag']['id']); ?>" class="tagFirstHalf" style="background-color:<?php echo h($tag['Tag']['colour']);?>;color:<?php echo $this->TextColour->getTextColour($tag['Tag']['colour']);?>"><?php echo h($tag['Tag']['name']); ?></a>
-                    <?php else: ?>
-                        <a href="<?php echo $baseurl;?>/events/index/searchtag:<?php echo h($tag['Tag']['id']); ?>" class=tag style="background-color:<?php echo h($tag['Tag']['colour']);?>;color:<?php echo $this->TextColour->getTextColour($tag['Tag']['colour']);?>"><?php echo h($tag['Tag']['name']); ?></a>
-                    <?php endif; ?>
-                </div>
-                <div style="padding-left:0px;padding-right:5px;float:left;">
-                    <?php if ($isSiteAdmin): ?>
-                        <?php
-                            echo $this->Form->create('Server', array('id' => 'removeTag_' . h($tag['Tag']['id']),  'url' => $baseurl . '/servers/removeTag/' . h($server['Server']['id']) . '/' . h($tag['Tag']['id']), 'style' => 'margin:0px;'));
-                        ?>
-                        <div title="<?php echo __('Remove tag');?>" role="button" tabindex="0" aria-label="<?php echo __('Remove tag');?>" class="tagSecondHalf useCursorPointer noPrint" onClick="removeServerTag('<?php echo h($server['Server']['id']); ?>', '<?php echo h($tag['Tag']['id']); ?>');">x</div>
-                        <?php
-                            echo $this->Form->end();
-                        ?>
-                    <?php else: ?>
-                        &nbsp;
-                    <?php endif; ?>
-                </div>
-            </div>
-            <?php
-        endforeach;
-    ?>
-        <div style="float:left">
-            <?php if ($isSiteAdmin): ?>
-                <button title="Add a tag" id="addTagButton" class="btn btn-inverse noPrint" style="line-height:10px; padding: 4px 4px;" onClick="getPopup('<?php echo h($server['Server']['id']); ?>', 'tags', 'selectTaxonomy');">+</button>
-            <?php else:?>
-                &nbsp;
-            <?php endif; ?>
-        </div>
-</div>

From f41550ae22f837060aed652fabe9b827d728a7d4 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 16 Feb 2021 08:22:05 +0100
Subject: [PATCH 143/437] chg: [version] bump

---
 VERSION.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.json b/VERSION.json
index 764288e82..01c07ad57 100644
--- a/VERSION.json
+++ b/VERSION.json
@@ -1 +1 @@
-{"major":2, "minor":4, "hotfix":138}
+{"major":2, "minor":4, "hotfix":139}

From 23aedd74118e8e2ffe1a410c057721295e729a54 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 14 Feb 2021 10:24:28 +0100
Subject: [PATCH 144/437] fix: [UI] Object template pagination

---
 .../ajax/view_elements.ctp                    | 41 ++++++-------------
 app/View/ObjectTemplates/view.ctp             | 10 +++--
 2 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/app/View/ObjectTemplateElements/ajax/view_elements.ctp b/app/View/ObjectTemplateElements/ajax/view_elements.ctp
index 423ae47da..e269e0f87 100644
--- a/app/View/ObjectTemplateElements/ajax/view_elements.ctp
+++ b/app/View/ObjectTemplateElements/ajax/view_elements.ctp
@@ -2,15 +2,13 @@
     <ul>
     <?php
         $this->Paginator->options(array(
-                'update' => '#clusters_div',
-                'evalScripts' => true,
-                'before' => '$(".progress").show()',
-                'complete' => '$(".progress").hide()',
+            'data-paginator' => '#ajaxContent',
         ));
 
-        echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
-        echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
-        echo $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
+        $paginator = $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
+        $paginator .= $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
+        $paginator .= $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
+        echo $paginator;
     ?>
     </ul>
 </div>
@@ -25,18 +23,17 @@
         <th><?php echo __('Sane defaults');?></th>
         <th><?php echo __('List of valid Values');?></th>
         <th><?php echo __('Disable correlation');?></th>
-        <th class="actions"><?php echo __('Actions');?></th>
     </tr>
 <?php
   $listItems = array('category', 'sane_default', 'values_list');
     foreach ($list as $k => $item):
 ?>
         <tr>
-            <td class="short bold"><?php echo h($item['ObjectTemplateElement']['object_relation']); ?>&nbsp;</td>
-      <td class="short"><?php echo h($item['ObjectTemplateElement']['type']); ?>&nbsp;</td>
-            <td class="short"><span class="icon-<?php echo $item['ObjectTemplateElement']['multiple'] ? 'ok' : 'remove'; ?>"></span></td>
-      <td class="short"><?php echo h($item['ObjectTemplateElement']['ui-priority']); ?>&nbsp;</td>
-      <td><?php echo h($item['ObjectTemplateElement']['description']); ?>&nbsp;</td>
+            <td class="short bold"><?php echo h($item['ObjectTemplateElement']['object_relation']); ?></td>
+            <td class="short"><?php echo h($item['ObjectTemplateElement']['type']); ?></td>
+            <td class="short"><span class="fa fa-<?php echo $item['ObjectTemplateElement']['multiple'] ? 'check' : 'times'; ?>"></span></td>
+            <td class="short"><?php echo h($item['ObjectTemplateElement']['ui-priority']); ?></td>
+            <td><?php echo h($item['ObjectTemplateElement']['description']); ?></td>
       <?php
         foreach ($listItems as $listItem):
       ?>
@@ -44,7 +41,7 @@
       <?php
             if (!empty($item['ObjectTemplateElement'][$listItem])) {
               foreach ($item['ObjectTemplateElement'][$listItem] as $value) {
-                echo h($value) . '</br>';
+                echo h($value) . '<br>';
               }
             }
       ?>
@@ -52,10 +49,7 @@
       <?php
         endforeach;
       ?>
-            <td class="short"><span class="icon-<?php echo empty($item['ObjectTemplateElement']['disable_correlation']) ? 'remove': 'ok'; ?>">&nbsp;</td>
-            <td class="short action-links">
-                &nbsp;
-            </td>
+            <td class="short"><span class="fa fa-<?php echo empty($item['ObjectTemplateElement']['disable_correlation']) ? 'times': 'check'; ?>"></td>
         </tr>
     <?php
         endforeach;
@@ -68,16 +62,7 @@
 </p>
 <div class="pagination">
     <ul>
-    <?php
-        echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
-        echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
-        echo $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
-    ?>
+    <?= $paginator ?>
     </ul>
 </div>
 
-<script type="text/javascript">
-    $(document).ready(function(){
-    });
-</script>
-<?php echo $this->Js->writeBuffer(); ?>
diff --git a/app/View/ObjectTemplates/view.ctp b/app/View/ObjectTemplates/view.ctp
index 54c892543..c529342e6 100644
--- a/app/View/ObjectTemplates/view.ctp
+++ b/app/View/ObjectTemplates/view.ctp
@@ -1,12 +1,14 @@
 <?php
     $table_data = array();
-    $table_data[] = array('key' => __('Id'), 'value' => $template['ObjectTemplate']['id']);
+    $table_data[] = array('key' => __('ID'), 'value' => $template['ObjectTemplate']['id']);
     $table_data[] = array('key' => __('Name'), 'value' => $template['ObjectTemplate']['name'] ? $template['ObjectTemplate']['name'] : $template['ObjectTemplate']['type']);
     $table_data[] = array('key' => __('Organisation'), 'value' => $template['Organisation']['name']);
     $table_data[] = array('key' => __('UUID'), 'value' => $template['ObjectTemplate']['uuid']);
     $table_data[] = array('key' => __('Version'), 'value' => $template['ObjectTemplate']['version']);
     $table_data[] = array('key' => __('Meta-category'), 'value' => $template['ObjectTemplate']['meta-category']);
-    $table_data[] = array('key' => __('Description'), 'value' => $template['ObjectTemplate']['description']);
+    if (!empty($template['ObjectTemplate']['description'])) {
+        $table_data[] = array('key' => __('Description'), 'value' => $template['ObjectTemplate']['description']);
+    }
     if (!empty($template['ObjectTemplate']['requirements'])) {
         $requirements_contents = array();
         foreach ($template['ObjectTemplate']['requirements'] as $group => $requirements) {
@@ -23,7 +25,7 @@
                 );
             }
         }
-        $table_data[] = array('key' => __('Requirements'), 'html' => implode('<br />', $requirements_contents));
+        $table_data[] = array('key' => __('Requirements'), 'html' => implode('<br>', $requirements_contents));
     }
     echo sprintf(
         '<div class="roles view"><div class="row-fluid"><div class="span8" style="margin:0px;">%s</div></div>%s</div>%s',
@@ -42,7 +44,7 @@
 <?php
     $startingTab = 'all';
 ?>
-$(document).ready(function () {
+$(function () {
     objectTemplateViewContent('<?php echo $startingTab; ?>', '<?php echo h($id);?>');
 });
 </script>

From 8a46933641a3ae3f868ed6a6ccd5eb0969de28ef Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 16 Feb 2021 08:44:36 +0100
Subject: [PATCH 145/437] fix: [event index] changed the galaxy cluster field
 width

- no longer looks like it was sandwiched between two semis
---
 app/View/Elements/Events/eventIndexTable.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/View/Elements/Events/eventIndexTable.ctp b/app/View/Elements/Events/eventIndexTable.ctp
index b2b7f26e3..ff9bd3b00 100644
--- a/app/View/Elements/Events/eventIndexTable.ctp
+++ b/app/View/Elements/Events/eventIndexTable.ctp
@@ -93,7 +93,7 @@
         <td style="width:30px;">
             <a href="<?php echo $baseurl."/events/view/".$event['Event']['id'] ?>"><?php echo $event['Event']['id'];?></a>
         </td>
-        <td class="shortish">
+        <td class="short">
             <?php
                 $galaxies = array();
                 if (!empty($event['GalaxyCluster'])) {

From 1ac21e04c6a6c356cd439f487f3c73c582bb0889 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 15 Feb 2021 18:28:41 +0100
Subject: [PATCH 146/437] chg: [internal] Make Redis connection static

---
 app/Model/AppModel.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index af8202449..7849e9009 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -41,7 +41,8 @@ class AppModel extends Model
 
     public $inserted_ids = array();
 
-    private $__redisConnection = null;
+    /** @var null|Redis */
+    private static $__redisConnection = null;
 
     private $__profiler = array();
 
@@ -2477,8 +2478,8 @@ class AppModel extends Model
      */
     public function setupRedisWithException()
     {
-        if ($this->__redisConnection) {
-            return $this->__redisConnection;
+        if (self::$__redisConnection) {
+            return self::$__redisConnection;
         }
 
         if (!class_exists('Redis')) {
@@ -2503,7 +2504,7 @@ class AppModel extends Model
             throw new Exception("Could not select Redis database $database: {$redis->getLastError()}");
         }
 
-        $this->__redisConnection = $redis;
+        self::$__redisConnection = $redis;
         return $redis;
     }
 

From 08925f46123c8591f23aa5a94966a667e1700614 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 9 Feb 2021 18:29:35 +0100
Subject: [PATCH 147/437] new: [oidc] OpenID Connect authentication

---
 app/Model/User.php                            |   2 +
 .../Component/Auth/OidcAuthenticate.php       | 244 ++++++++++++++++++
 2 files changed, 246 insertions(+)
 create mode 100644 app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php

diff --git a/app/Model/User.php b/app/Model/User.php
index 4395d88c0..e8f70527d 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -7,6 +7,8 @@ App::uses('SendEmail', 'Tools');
 
 /**
  * @property Log $Log
+ * @property Organisation $Organisation
+ * @property Role $Role
  */
 class User extends AppModel
 {
diff --git a/app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php b/app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php
new file mode 100644
index 000000000..2b8cb2cb4
--- /dev/null
+++ b/app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php
@@ -0,0 +1,244 @@
+<?php
+use Jumbojett\OpenIDConnectClient;
+App::uses('BaseAuthenticate', 'Controller/Component/Auth');
+
+/**
+ * Config options:
+ *  - OidcAuth.provider_url
+ *  - OidcAuth.client_id
+ *  - OidcAuth.client_secret
+ *  - OidcAuth.role_mapper
+ *  - OidcAuth.organisation_property (default: `organization`)
+ *  - OidcAuth.roles_property (default: `roles`)
+ *  - OidcAuth.default_org
+ */
+class OidcAuthenticate extends BaseAuthenticate
+{
+    /** @var User|null */
+    private $userModel;
+
+    /**
+     * @param CakeRequest $request
+     * @param CakeResponse $response
+     * @return mixed|void
+     * @throws Exception
+     */
+    public function authenticate(CakeRequest $request, CakeResponse $response)
+    {
+        $oidc = $this->prepareClient();
+
+        if (!$oidc->authenticate()) {
+            throw new Exception("OIDC authentication was not successful.");
+        }
+
+        $mispUsername = $oidc->requestUserInfo('email');
+        $this->log($mispUsername, "Trying login");
+
+        $verifiedClaims = $oidc->getVerifiedClaims();
+        $organisationProperty = $this->getConfig('organisation_property', 'organization');
+        if (property_exists($verifiedClaims, $organisationProperty)) {
+            $organisationName = $verifiedClaims->{$organisationProperty};
+        } else {
+            $organisationName = $this->getConfig('default_org');
+        }
+
+        $roles = [];
+        $roleProperty = $this->getConfig('roles_property', 'roles');
+        if (property_exists($verifiedClaims, $roleProperty)) {
+            $roles = $verifiedClaims->{$roleProperty};
+        }
+
+        $this->settings['fields'] = ['username' => 'email'];
+        $user = $this->_findUser($mispUsername);
+
+        $organisationId = $this->checkOrganization($organisationName, $user, $mispUsername);
+        if (!$organisationId) {
+            return false;
+        }
+
+        $roleId = $this->getUserRole($roles, $mispUsername);
+        if ($roleId === null) {
+            $this->log($mispUsername, 'No role was assigned.');
+            return false;
+        }
+
+        if ($user) {
+            $this->log($mispUsername, 'Found in database.');
+
+            if ($user['org_id'] != $organisationId) {
+                $user['org_id'] = $organisationId;
+                $this->userModel()->updateField($user, 'org_id', $organisationId);
+                $this->log($mispUsername, "User organisation changed from ${user['org_id']} to $organisationId.");
+            }
+
+            if ($user['role_id'] != $roleId) {
+                $user['role_id'] = $roleId;
+                $this->userModel()->updateField($user, 'role_id', $roleId);
+                $this->log($mispUsername, "User role changed from ${user['role_id']} to $roleId.");
+            }
+
+            $this->log($mispUsername, 'Logged in.');
+            return $user;
+        }
+
+        $this->log($mispUsername, 'Not found in database.');
+
+        $userData = [
+            'email' => $mispUsername,
+            'org_id' => $organisationId,
+            'newsread' => time(),
+            'role_id' => $roleId,
+            'change_pw' => 0,
+            'date_created' => time(),
+        ];
+
+        if (!$this->userModel()->save($userData)) {
+            throw new RuntimeException("Could not save user `$mispUsername` to database.");
+        }
+
+        $this->log($mispUsername, "Saved in database with ID {$this->userModel()->id}");
+        $this->log($mispUsername, 'Logged in.');
+        return $this->_findUser($mispUsername);
+    }
+
+    /**
+     * @return OpenIDConnectClient
+     */
+    private function prepareClient()
+    {
+        $providerUrl = $this->getConfig('provider_url');
+        if (!filter_var($providerUrl, FILTER_VALIDATE_URL)) {
+            throw new RuntimeException("Config option `OidcAuth.provider_url` must be valid URL.");
+        }
+
+        // OpenIDConnectClient will append well-know path, so if well-know path is already part of the url, remove it
+        $wellKnownPosition = strpos($providerUrl, '/.well-known/');
+        if ($wellKnownPosition !== false) {
+            $providerUrl = substr($providerUrl, 0, $wellKnownPosition);
+        }
+
+        $clientId = $this->getConfig('client_id');
+        $clientSecret = $this->getConfig('client_secret');
+
+        $oidc = new OpenIDConnectClient($providerUrl, $clientId, $clientSecret);
+        $oidc->setRedirectURL(Configure::read('MISP.baseurl') . '/users/login');
+        return $oidc;
+    }
+
+    /**
+     * @param string $org
+     * @param array|null $user
+     * @param string $mispUsername
+     * @return int
+     * @throws Exception
+     */
+    private function checkOrganization($org, $user, $mispUsername)
+    {
+        if (empty($org)) {
+            $this->log($mispUsername, "Organisation name not provided.");
+            return false;
+        }
+
+        $orgIsUuid = Validation::uuid($org);
+
+        $orgAux = $this->userModel()->Organisation->find('first', [
+            'fields' => ['Organisation.id'],
+            'conditions' => $orgIsUuid ? ['uuid' => mb_strtolower($org)] : ['name' => $org],
+        ]);
+        if (empty($orgAux)) {
+            if ($orgIsUuid) {
+                $this->log($mispUsername, "Could not found organisation with UUID `$org`.");
+                return false;
+            }
+
+            $orgUserId = 1; // By default created by the admin
+            if ($user) {
+                $orgUserId = $user['id'];
+            }
+            $orgId = $this->userModel()->Organisation->createOrgFromName($org, $orgUserId, true);
+            $this->log($mispUsername, "User organisation `$org` created with ID $orgId.");
+        } else {
+            $orgId = $orgAux['Organisation']['id'];
+            $this->log($mispUsername, "User organisation `$org` found with ID $orgId.");
+        }
+        return $orgId;
+    }
+
+    /**
+     * @param array $roles Role list provided by OIDC
+     * @param string $mispUsername
+     * @return int|null Role ID or null if no role matches
+     */
+    private function getUserRole(array $roles, $mispUsername)
+    {
+        $roleMapper = $this->getConfig('role_mapper');
+        if (!is_array($roleMapper)) {
+            throw new RuntimeException("Config option `OidcAuth.role_mapper` must be array.");
+        }
+
+        $roleNameToId = $this->userModel()->Role->find('list', [
+            'fields' => ['Role.name', 'Role.id'],
+        ]);
+        $roleNameToId = array_change_key_case($roleNameToId); // normalize role names to lowercase
+
+        $userRole = null;
+        foreach ($roles as $role) {
+            if (isset($roleMapper[$role])) {
+                $roleId = $roleMapper[$role];
+                if (!is_numeric($roleId)) {
+                    $roleId = mb_strtolower($roleId);
+                    if (isset($roleNameToId[$roleId])) {
+                        $roleId = $roleNameToId[$roleId];
+                    } else {
+                        $this->log($mispUsername, "MISP Role with name `$roleId` not found, skipping.");
+                        continue;
+                    }
+                }
+                if ($userRole === null || $roleId < $userRole) { // role with lower ID wins
+                    $userRole = $roleId;
+                }
+            }
+        }
+
+        return $userRole;
+    }
+
+    /**
+     * @param string $config
+     * @param mixed|null $default
+     * @return mixed
+     */
+    private function getConfig($config, $default = null)
+    {
+        $value = Configure::read("OidcAuth.$config");
+        if (empty($value)) {
+            if ($default === null) {
+                throw new RuntimeException("Config option `OidcAuth.$config` is not set.");
+            }
+            return $default;
+        }
+        return $value;
+    }
+
+    /**
+     * @param string $username
+     * @param string $message
+     */
+    private function log($username, $message)
+    {
+        CakeLog::info("OIDC: User `$username` – $message");
+    }
+
+    /**
+     * @return User
+     */
+    private function userModel()
+    {
+        if (isset($this->userModel)) {
+            return $this->userModel;
+        }
+
+        $this->userModel = ClassRegistry::init($this->settings['userModel']);
+        return $this->userModel;
+    }
+}

From 29e9a5da952c2e2883c38928964bd7353723ce3a Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 9 Dec 2020 19:42:49 +0100
Subject: [PATCH 148/437] new: [UI] Show threat level icons on event index

---
 app/View/Elements/Events/eventIndexTable.ctp | 2 +-
 app/webroot/css/main.css                     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/View/Elements/Events/eventIndexTable.ctp b/app/View/Elements/Events/eventIndexTable.ctp
index ff9bd3b00..9c4947c1a 100644
--- a/app/View/Elements/Events/eventIndexTable.ctp
+++ b/app/View/Elements/Events/eventIndexTable.ctp
@@ -91,7 +91,7 @@
             </td>
         <?php endif; ?>
         <td style="width:30px;">
-            <a href="<?php echo $baseurl."/events/view/".$event['Event']['id'] ?>"><?php echo $event['Event']['id'];?></a>
+            <a href="<?= $baseurl."/events/view/".$event['Event']['id'] ?>" class="threat-level-<?= strtolower($event['ThreatLevel']['name']) ?>"><?= $event['Event']['id'] ?></a>
         </td>
         <td class="short">
             <?php
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 065fa13ed..20d0c2665 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -2621,7 +2621,6 @@ table tr:hover .down-expand-button {
     font-weight: 900;
     -moz-osx-font-smoothing: grayscale;
     -webkit-font-smoothing: antialiased;
-    display: inline-block;
     font-style: normal;
     font-variant: normal;
     text-rendering: auto;

From a7834a291b0e3cc38ceb457551674e91aa930d33 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Tue, 16 Feb 2021 10:59:18 +0100
Subject: [PATCH 149/437] new: [object] Allows updating from an unknown object
 templates

---
 app/Controller/ObjectsController.php |   5 +-
 app/Model/MispObject.php             | 128 ++++++++++++++++-----------
 app/View/Objects/add.ctp             |  20 ++++-
 3 files changed, 97 insertions(+), 56 deletions(-)

diff --git a/app/Controller/ObjectsController.php b/app/Controller/ObjectsController.php
index 5a85b2a50..18430ec86 100644
--- a/app/Controller/ObjectsController.php
+++ b/app/Controller/ObjectsController.php
@@ -376,13 +376,14 @@ class ObjectsController extends AppController
                 'ObjectTemplateElement'
             )
         ));
-        if (empty($template) && !$this->_isRest()) {
-            $this->Flash->error('Object cannot be edited, no valid template found.');
+        if (empty($template) && !$this->_isRest() && !$update_template_available) {
+            $this->Flash->error('Object cannot be edited, no valid template found. ', ['params' => ['url' => sprintf('/objects/edit/%s/1/0', $id), 'urlName' => __('Force update anyway')]]);
             $this->redirect(array('controller' => 'events', 'action' => 'view', $object['Object']['event_id']));
         }
         $templateData = $this->MispObject->resolveUpdatedTemplate($template, $object, $update_template_available);
         $this->set('updateable_attribute', $templateData['updateable_attribute']);
         $this->set('not_updateable_attribute', $templateData['not_updateable_attribute']);
+        $this->set('original_template_unkown', $templateData['original_template_unkown']);
         if (!empty($this->Session->read('object_being_created')) && !empty($this->params['named']['cur_object_tmp_uuid'])) {
             $revisedObjectData = $this->Session->read('object_being_created');
             if ($this->params['named']['cur_object_tmp_uuid'] == $revisedObjectData['cur_object_tmp_uuid']) { // ensure that the passed session data is for the correct object
diff --git a/app/Model/MispObject.php b/app/Model/MispObject.php
index 8d23328e4..853b4eadb 100644
--- a/app/Model/MispObject.php
+++ b/app/Model/MispObject.php
@@ -1233,64 +1233,90 @@ class MispObject extends AppModel
             'updateable_attribute' => false,
             'not_updateable_attribute' => false,
             'newer_template_version' => false,
+            'original_template_unkown' => false,
             'template' => $template
         );
-        if (!empty($template)) {
-            $newer_template = $this->ObjectTemplate->find('first', array(
-                'conditions' => array(
-                    'ObjectTemplate.uuid' => $object['Object']['template_uuid'],
-                    'ObjectTemplate.version >' => $object['Object']['template_version'],
-                ),
-                'recursive' => -1,
-                'contain' => array(
-                    'ObjectTemplateElement'
-                ),
-                'order' => array('ObjectTemplate.version DESC')
-            ));
-            if (!empty($newer_template)) {
-              $toReturn['newer_template_version'] = $newer_template['ObjectTemplate']['version'];
-              // ignore IDs for comparison
-              $cur_template_temp = Hash::remove(Hash::remove($template['ObjectTemplateElement'], '{n}.id'), '{n}.object_template_id');
-              $newer_template_temp = Hash::remove(Hash::remove($newer_template['ObjectTemplateElement'], '{n}.id'), '{n}.object_template_id');
+        $newer_template = $this->ObjectTemplate->find('first', array(
+            'conditions' => array(
+                'ObjectTemplate.uuid' => $object['Object']['template_uuid'],
+                'ObjectTemplate.version >' => $object['Object']['template_version'],
+            ),
+            'recursive' => -1,
+            'contain' => array(
+                'ObjectTemplateElement'
+            ),
+            'order' => array('ObjectTemplate.version DESC')
+        ));
+        $template_difference = array();
+        if (!empty($newer_template)) {
+            $toReturn['newer_template_version'] = !$newer_template['ObjectTemplate']['version'];
+            $newer_template_temp = Hash::remove(Hash::remove($newer_template['ObjectTemplateElement'], '{n}.id'), '{n}.object_template_id');
+            if (!empty($template)) {
+                // ignore IDs for comparison
+                $cur_template_temp = Hash::remove(Hash::remove($template['ObjectTemplateElement'], '{n}.id'), '{n}.object_template_id');
 
-              $template_difference = array();
-              // check how current template is included in the newer
-              foreach ($cur_template_temp as $cur_obj_rel) {
-                  $flag_sim = false;
-                  foreach ($newer_template_temp as $newer_obj_rel) {
-                      $tmp = Hash::diff($cur_obj_rel, $newer_obj_rel);
-                      if (count($tmp) == 0) {
-                          $flag_sim = true;
-                          break;
-                      }
-                  }
-                  if (!$flag_sim) {
-                      $template_difference[] = $cur_obj_rel;
-                  }
-              }
-
-              $toReturn['updateable_attribute'] = $object['Attribute'];
-              $toReturn['not_updateable_attribute'] = array();
-            } else {
-              $toReturn['newer_template_version'] = false;
-            }
-            if (!empty($template_difference)) { // older template not completely embeded in newer
-                foreach ($template_difference as $temp_diff_element) {
-                    foreach ($object['Attribute'] as $i => $attribute) {
-                        if (
-                            $attribute['object_relation'] == $temp_diff_element['object_relation']
-                            && $attribute['type'] == $temp_diff_element['type']
-                        ) { // This attribute cannot be merged automatically
-                            $attribute['merge-possible'] = false;
-                            $toReturn['not_updateable_attribute'][] = $attribute;
-                            unset($toReturn['updateable_attribute'][$i]);
+                // check how current template is included in the newer
+                foreach ($cur_template_temp as $cur_obj_rel) {
+                    $flag_sim = false;
+                    foreach ($newer_template_temp as $newer_obj_rel) {
+                        $tmp = Hash::diff($cur_obj_rel, $newer_obj_rel);
+                        if (count($tmp) == 0) {
+                            $flag_sim = true;
+                            break;
                         }
                     }
+                    if (!$flag_sim) {
+                        $template_difference[] = $cur_obj_rel;
+                    }
+                }
+            } else { // original template unkown
+                $toReturn['original_template_unkown'] = true;
+                $unmatched_attributes = array();
+                foreach ($object['Attribute'] as $i => $attribute) {
+                    $flag_match = false;
+                    foreach ($newer_template_temp as $newer_obj_rel) {
+                        if (
+                            $newer_obj_rel['object_relation'] == $attribute['object_relation'] &&
+                            $newer_obj_rel['type'] == $attribute['type']
+                        ) {
+                            $flag_match = true;
+                            break;
+                        }
+                    }
+                    if (!$flag_match) {
+                        $unmatched_attributes[] = $attribute;
+                    }
+                }
+
+                // simulate unkown template from the attribute
+                foreach ($unmatched_attributes as $unmatched_attribute) {
+                    $template_difference[] = [
+                        'object_relation' => $unmatched_attribute['object_relation'],
+                        'type' => $unmatched_attribute['type']
+                    ];
+                }
+            }
+            $toReturn['updateable_attribute'] = $object['Attribute'];
+            $toReturn['not_updateable_attribute'] = array();
+        } else {
+            $toReturn['newer_template_version'] = false;
+        }
+        if (!empty($template_difference)) { // older template not completely embeded in newer
+            foreach ($template_difference as $temp_diff_element) {
+                foreach ($object['Attribute'] as $i => $attribute) {
+                    if (
+                        $attribute['object_relation'] == $temp_diff_element['object_relation']
+                        && $attribute['type'] == $temp_diff_element['type']
+                    ) { // This attribute cannot be merged automatically
+                        $attribute['merge-possible'] = false;
+                        $toReturn['not_updateable_attribute'][] = $attribute;
+                        unset($toReturn['updateable_attribute'][$i]);
+                    }
                 }
             }
-            if ($update_template_available) { // template version bump requested
-                $toReturn['template'] = $newer_template; // bump the template version
-            }
+        }
+        if ($update_template_available) { // template version bump requested
+            $toReturn['template'] = $newer_template; // bump the template version
         }
         return $toReturn;
     }
diff --git a/app/View/Objects/add.ctp b/app/View/Objects/add.ctp
index 9480f920c..7b7d42d55 100644
--- a/app/View/Objects/add.ctp
+++ b/app/View/Objects/add.ctp
@@ -208,7 +208,7 @@
                     <span style="margin-left: 5px; display: inline-block; font-size: large;"><?php echo __('Current Object state on older template version'); ?></span>
                 </div>
                 <div class="row" style="max-height: 800px; max-width: 800px; overflow: auto; padding: 15px;">
-                    <div style="border: 1px solid #3465a4 ; border-radius: 5px; overflow: hidden;" class="span5">
+                    <div style="border: 1px solid #3465a4 ; border-radius: 5px; overflow: auto;" class="span5">
                         <div class="blueElement" style="padding: 4px 5px;">
                             <div>
                                 <span class="bold"><?php echo __('ID') . ':'; ?></span>
@@ -229,9 +229,22 @@
                             <div style="background-color: #fcf8e3; color: black; padding: 2px; border-radius: 3px;">
                                 <span class="bold"><?php echo __('Template version') . ':'; ?></span>
                                 <span><?php echo h($object['Object']['template_version']); ?></span>
+                                <?php if ($original_template_unkown): ?>
+                                    <span class="label label-important" title="<?= __('The original object\'s template is unkown and some attributes might be lost. Please review carefully'); ?>">
+                                    <?= __('Unkown original template'); ?>
+                                    </span>
+                                <?php endif; ?>
                             </div>
                         </div>
                         <table class="table table-striped table-condensed" style="margin-bottom: 0px;">
+                            <thead>
+                                <tr>
+                                    <th><?= __('Obj. rel.') ?></th>
+                                    <th><?= __('Categ.') ?></th>
+                                    <th><?= __('Type') ?></th>
+                                    <th><?= __('Value') ?></th>
+                                </tr>
+                            </thead>
                             <tbody>
                                 <?php foreach ($not_updateable_attribute as $attribute): ?>
                                     <tr class="error" title="<?php echo __('Can not be merged automatically'); ?>">
@@ -245,7 +258,7 @@
                                         </td>
                                         <td><?php echo h($attribute['category']); ?></td>
                                         <td><?php echo h($attribute['type']); ?></td>
-                                        <td><?php echo h($attribute['value']); ?></td>
+                                        <td style="max-width:100px;" class="ellipsis-overflow"><?php echo h($attribute['value']); ?></td>
                                     </tr>
                                     <?php if (!$attribute['merge-possible']): ?>
                                         <?php
@@ -275,7 +288,7 @@
                                         <td style="white-space: nowrap;"><?php echo h($attribute['object_relation']); ?></td>
                                         <td><?php echo h($attribute['category']); ?></td>
                                         <td><?php echo h($attribute['type']); ?></td>
-                                        <td><?php echo h($attribute['value']); ?></td>
+                                        <td style="max-width:100px;" class="ellipsis-overflow"><?php echo h($attribute['value']); ?></td>
                                     </tr>
                                 <?php endforeach; ?>
                             </tbody>
@@ -401,6 +414,7 @@
             $value_field.val(revised_value);
             $clicked.removeClass('fa-sign-in-alt fa-flip-horizontal').addClass('fa-trash-restore');
         }
+        $matching_row.find('input[type="checkbox"][name$="[save]').first().prop('checked', true).prop('disabled', false)
         $matching_row[0].scrollIntoView(false);
         $matching_row.children().effect('highlight', { queue: false, color: $value_field.val() === selected_value ? '#468847' : '#b94a48' }, 2500, function() { $(this).css('background-color', 'unset'); });
     }

From 4ee48aa1f1dabb6cfa51c1e8e3cd5a38f37bbec0 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 16 Feb 2021 11:14:13 +0100
Subject: [PATCH 150/437] fix: [UI] Showing date and time in user profile

---
 app/View/Users/view.ctp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/View/Users/view.ctp b/app/View/Users/view.ctp
index c29807d9f..44a6482cf 100755
--- a/app/View/Users/view.ctp
+++ b/app/View/Users/view.ctp
@@ -102,12 +102,12 @@
     }
     $table_data[] = array(
         'key' => __('Created'),
-        'value' => $user['User']['date_created'] ? $this->Time->time($user['User']['date_created']) : __('N/A')
+        'html' => $user['User']['date_created'] ? $this->Time->time($user['User']['date_created']) : __('N/A')
     );
     if ($admin_view) {
         $table_data[] = array(
             'key' => __('News read at'),
-            'value' => $user['User']['newsread'] ? $this->Time->time($user['User']['newsread']) : __('N/A')
+            'html' => $user['User']['newsread'] ? $this->Time->time($user['User']['newsread']) : __('N/A')
         );
         $table_data[] = array(
             'key' => __('Disabled'),

From 6fd2c4807abc2232b90d00fd290b0020db83fcaa Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 16 Feb 2021 11:36:11 +0100
Subject: [PATCH 151/437] fix: [dashboard] removed training example left in the
 code

- restricted new module to only 3 user IDs
---
 app/Lib/Dashboard/EventStreamWidget.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/Lib/Dashboard/EventStreamWidget.php b/app/Lib/Dashboard/EventStreamWidget.php
index 86a4efbed..1232854f0 100644
--- a/app/Lib/Dashboard/EventStreamWidget.php
+++ b/app/Lib/Dashboard/EventStreamWidget.php
@@ -85,11 +85,4 @@ class EventStreamWidget
             'fields' => $fields
         ];
 	}
-
-    public function checkpermissions($user) {
-        if (in_array($user['id'], [1, 2, 3])) {
-            return true;
-        }
-        return false;
-    }
 }

From 6149d6e611402fff632705a14f587b3e23967c03 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 16 Feb 2021 11:53:22 +0100
Subject: [PATCH 152/437] fix: [UI] Galaxy pagination

---
 app/View/Galaxies/view.ctp             | 6 +++---
 app/View/GalaxyClusters/ajax/index.ctp | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/View/Galaxies/view.ctp b/app/View/Galaxies/view.ctp
index 194be1375..4a44bb7b2 100644
--- a/app/View/Galaxies/view.ctp
+++ b/app/View/Galaxies/view.ctp
@@ -15,7 +15,7 @@
     }
 ?>
 
-<div class='view'>
+<div class="view">
     <div class="row-fluid">
         <div class="span8">
             <h2>
@@ -26,7 +26,7 @@
             <?php echo $kco; ?>
         </div>
     </div>
-    <div id="clusters_div"></div>
+    <div id="clusters_content"></div>
 </div>
 
 <script type="text/javascript">
@@ -45,7 +45,7 @@ $(function () {
         }
     ?>
     $.get("<?php echo h($uri);?>", function(data) {
-        $("#clusters_div").html(data);
+        $("#clusters_content").html(data);
     }).fail(xhrFailCallback);
 
     var $kco = $('#killChainOrder');
diff --git a/app/View/GalaxyClusters/ajax/index.ctp b/app/View/GalaxyClusters/ajax/index.ctp
index 23e43a48a..b507d3946 100644
--- a/app/View/GalaxyClusters/ajax/index.ctp
+++ b/app/View/GalaxyClusters/ajax/index.ctp
@@ -5,10 +5,8 @@
         }
     }
     echo $this->element('/genericElements/IndexTable/index_table', array(
+        'containerId' => 'clusters',
         'data' => array(
-            'paginatorOptions' => array(
-                'update' => '#clusters_div',
-            ),
             'data' => $list,
             'top_bar' => array(
                 'children' => array(
@@ -316,7 +314,7 @@
 ?>
 
 <script type="text/javascript">
-    $(document).ready(function(){
+    $(function(){
         var passedArgsArray = <?php echo $passedArgs; ?>;
         var galaxyId = "<?php echo h($galaxy_id); ?>";
         if (passedArgsArray['context'] === undefined || passedArgsArray['context'] === "") {
@@ -327,4 +325,3 @@
         });
     });
 </script>
-<?php echo $this->Js->writeBuffer(); ?>

From 104170763892db6679b1c07b90d8262bcf0405aa Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 16 Feb 2021 13:08:29 +0100
Subject: [PATCH 153/437] fix: [feed] edit ignored changes to the header, fixes
 #6780

---
 app/Model/Feed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Feed.php b/app/Model/Feed.php
index 0b149c646..8bbfb36a2 100644
--- a/app/Model/Feed.php
+++ b/app/Model/Feed.php
@@ -1472,7 +1472,7 @@ class Feed extends AppModel
                     }
                 }
                 $this->create();
-                if (!$this->save($feed, true, array('name', 'provider', 'url', 'rules', 'source_format', 'fixed_event', 'delta_merge', 'override_ids', 'publish', 'settings', 'tag_id', 'default', 'lookup_visible'))) {
+                if (!$this->save($feed, true, array('name', 'provider', 'url', 'rules', 'source_format', 'fixed_event', 'delta_merge', 'override_ids', 'publish', 'settings', 'tag_id', 'default', 'lookup_visible', 'headers'))) {
                     $results['fails']++;
                 } else {
                     $results['successes']++;

From b3e90968bc57a4aaf59975228d6a7239ea9e35e6 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 16 Feb 2021 13:09:17 +0100
Subject: [PATCH 154/437] fix: [feeds] feed edit ignored the headers field,
 ffixes #6780

---
 app/Model/Feed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Feed.php b/app/Model/Feed.php
index 0b149c646..8bbfb36a2 100644
--- a/app/Model/Feed.php
+++ b/app/Model/Feed.php
@@ -1472,7 +1472,7 @@ class Feed extends AppModel
                     }
                 }
                 $this->create();
-                if (!$this->save($feed, true, array('name', 'provider', 'url', 'rules', 'source_format', 'fixed_event', 'delta_merge', 'override_ids', 'publish', 'settings', 'tag_id', 'default', 'lookup_visible'))) {
+                if (!$this->save($feed, true, array('name', 'provider', 'url', 'rules', 'source_format', 'fixed_event', 'delta_merge', 'override_ids', 'publish', 'settings', 'tag_id', 'default', 'lookup_visible', 'headers'))) {
                     $results['fails']++;
                 } else {
                     $results['successes']++;

From cc4ef95da216273b8d76b8727fbdb9f812623ed4 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Tue, 16 Feb 2021 15:02:34 +0100
Subject: [PATCH 155/437] new: [objectReference] Allow adding reference across
 extended events

Fix #6255
---
 app/Controller/ObjectReferencesController.php |  4 ++--
 app/Model/Event.php                           |  3 ++-
 app/Model/ObjectReference.php                 | 24 ++++++++++++++++---
 app/webroot/js/event-graph.js                 | 14 ++++++++---
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/app/Controller/ObjectReferencesController.php b/app/Controller/ObjectReferencesController.php
index bf51fd090..223c94a32 100644
--- a/app/Controller/ObjectReferencesController.php
+++ b/app/Controller/ObjectReferencesController.php
@@ -41,7 +41,7 @@ class ObjectReferencesController extends AppController
             'recursive' => -1,
             'contain' => array(
                 'Event' => array(
-                    'fields' => array('Event.id', 'Event.orgc_id', 'Event.user_id')
+                    'fields' => array('Event.id', 'Event.orgc_id', 'Event.user_id', 'Event.extends_uuid')
                 )
             )
         ));
@@ -54,7 +54,7 @@ class ObjectReferencesController extends AppController
             if (!isset($this->request->data['ObjectReference'])) {
                 $this->request->data['ObjectReference'] = $this->request->data;
             }
-            list($referenced_id, $referenced_uuid, $referenced_type) = $this->ObjectReference->getReferencedInfo($this->request->data['ObjectReference']['referenced_uuid'], $object);
+            list($referenced_id, $referenced_uuid, $referenced_type) = $this->ObjectReference->getReferencedInfo($this->request->data['ObjectReference']['referenced_uuid'], $object, true, $this->Auth->user());
             $relationship_type = empty($this->request->data['ObjectReference']['relationship_type']) ? '' : $this->request->data['ObjectReference']['relationship_type'];
             if (!empty($this->request->data['ObjectReference']['relationship_type_select']) && $this->request->data['ObjectReference']['relationship_type_select'] !== 'custom') {
                 $relationship_type = $this->request->data['ObjectReference']['relationship_type_select'];
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 56ea9a4e3..675220caa 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -6444,7 +6444,8 @@ class Event extends AppModel
                 list($referenced_id, $referenced_uuid, $referenced_type) = $this->Object->ObjectReference->getReferencedInfo(
                         $reference['referenced_uuid'],
                         array('Event' => array('id' => $id)),
-                        false
+                        false,
+                        $user
                 );
                 if (!$referenced_id && !$referenced_uuid && !$referenced_type) {
                     continue;
diff --git a/app/Model/ObjectReference.php b/app/Model/ObjectReference.php
index f3740b343..daa0bd4d2 100644
--- a/app/Model/ObjectReference.php
+++ b/app/Model/ObjectReference.php
@@ -265,7 +265,7 @@ class ObjectReference extends AppModel
         return true;
     }
 
-    public function getReferencedInfo($referencedUuid, $object, $strict = true)
+    public function getReferencedInfo($referencedUuid, $object, $strict = true, $user=[])
     {
         $referenced_type = 1;
         $target_object = $this->Object->find('first', array(
@@ -277,7 +277,9 @@ class ObjectReference extends AppModel
             $referenced_id = $target_object['Object']['id'];
             $referenced_uuid = $target_object['Object']['uuid'];
             if ($target_object['Object']['event_id'] != $object['Event']['id']) {
-                throw new NotFoundException('Invalid target. Target has to be within the same event.');
+                if (!$this->checkIfValidExtendedEvent($object, $target_object['Object']['event_id'], $user)) {
+                    throw new NotFoundException('Invalid target. Target has to be within the same event.');
+                }
             }
         } else {
             $target_attribute = $this->Object->Attribute->find('first', array(
@@ -293,7 +295,9 @@ class ObjectReference extends AppModel
                 }
             }
             if ($target_attribute['Attribute']['event_id'] != $object['Event']['id']) {
-                throw new NotFoundException('Invalid target. Target has to be within the same event.');
+                if (!$this->checkIfValidExtendedEvent($object, $target_attribute['Attribute']['event_id'], $user)) {
+                    throw new NotFoundException('Invalid target. Target has to be within the same event.');
+                }
             }
             $referenced_id = $target_attribute['Attribute']['id'];
             $referenced_uuid = $target_attribute['Attribute']['uuid'];
@@ -301,4 +305,18 @@ class ObjectReference extends AppModel
         }
         return array($referenced_id, $referenced_uuid, $referenced_type);
     }
+
+    function checkIfValidExtendedEvent($sourceEvent, $targetEventID, $user) {
+        if ($sourceEvent['Event']['orgc_id'] != $user['org_id']) {
+            return false;
+        }
+        $targetEventFromExtension = $this->Object->Event->find('first', [
+            'conditions' => [
+                'Event.uuid' => $sourceEvent['Event']['extends_uuid'],
+            ],
+            'recursive' => -1,
+            'fields' => ['id']
+        ]);
+        return !empty($targetEventFromExtension) && $targetEventFromExtension['Event']['id'] == $targetEventID;
+    }
 }
diff --git a/app/webroot/js/event-graph.js b/app/webroot/js/event-graph.js
index 92e8e7f21..03b8e7f37 100644
--- a/app/webroot/js/event-graph.js
+++ b/app/webroot/js/event-graph.js
@@ -707,6 +707,7 @@ class EventGraph {
                     id: node.id,
                     uuid: node.uuid,
                     Attribute: node.Attribute,
+                    event_id: node.event_id,
                     label: striped_value,
                     title: label,
                     group: group,
@@ -1614,16 +1615,23 @@ class MispInteraction {
     }
 
     can_create_reference(id) {
-        return this.nodes.get(id).group == "object";
+        var node = this.nodes.get(id)
+        return node.group == "object";
     }
 
     can_be_referenced(id) {
         var res;
-        if (this.nodes.get(id).group == "object") {
+        var node = this.nodes.get(id)
+        if (node.event_id != scope_id) {
+            showMessage('fail', 'Cannot reference a node not belonging in this event')
+            return false;
+        }
+        if (node.group == "object") {
             res = true;
-        } else if (this.nodes.get(id).group.slice(0, 9) == "attribute") {
+        } else if (node.group.slice(0, 9) == "attribute") {
             res = true;
         } else {
+            showMessage('fail', 'This node cannot be referenced')
             res = false;
         }
         return res;

From 423559fd11465c4f07fbd4ab28b794b29eacb310 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 16 Feb 2021 16:10:25 +0100
Subject: [PATCH 156/437] chg: [feed] Simplified code for loading feeds

---
 app/Model/Feed.php | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/app/Model/Feed.php b/app/Model/Feed.php
index 0b149c646..57d163d67 100644
--- a/app/Model/Feed.php
+++ b/app/Model/Feed.php
@@ -997,7 +997,7 @@ class Feed extends AppModel
      * @return bool
      * @throws Exception
      */
-    public function saveFreetextFeedData($feed, $data, $user, $jobId = false)
+    public function saveFreetextFeedData(array $feed, array $data, array $user, $jobId = false)
     {
         $this->Event = ClassRegistry::init('Event');
 
@@ -1040,25 +1040,14 @@ class Feed extends AppModel
             }
         }
         if ($feed['Feed']['fixed_event']) {
-            $existsAttributes = $this->Event->Attribute->find('all', array(
+            $existsAttributesValueToId = $this->Event->Attribute->find('list', array(
                 'conditions' => array(
                     'Attribute.deleted' => 0,
                     'Attribute.event_id' => $event['Event']['id']
                 ),
                 'recursive' => -1,
-                'fields' => array('id', 'value1', 'value2')
+                'fields' => array('value', 'id')
             ));
-            $existsAttributesValueToId = array();
-            foreach ($existsAttributes as $t) {
-                if (!empty($t['Attribute']['value2'])) {
-                    $value = $t['Attribute']['value1'] . '|' . $t['Attribute']['value2'];
-                } else {
-                    $value = $t['Attribute']['value1'];
-                }
-                // Since event values are unique, it is OK to put value into key
-                $existsAttributesValueToId[$value] = $t['Attribute']['id'];
-            }
-            unset($existsAttributes);
 
             // Create event diff. After this cycle, `$data` will contains just attributes that do not exists in current
             // event and in `$existsAttributesValueToId` will contains just attributes that do not exists in current feed.
@@ -1098,7 +1087,6 @@ class Feed extends AppModel
             return true;
         }
 
-        $data = array_values($data);
         $uniqueValues = array();
         foreach ($data as $key => $value) {
             if (isset($uniqueValues[$value['value']])) {

From ad92322560fc5e62e1e1f0fd1449b6e96a55bc10 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 17 Feb 2021 10:58:28 +0100
Subject: [PATCH 157/437] chg: [events:eventGraph] Improved hull algorithm and
 UI

---
 app/Lib/Tools/EventGraphTool.php | 17 ++++++
 app/webroot/js/event-graph.js    | 95 +++++++++++++++++++++-----------
 2 files changed, 80 insertions(+), 32 deletions(-)

diff --git a/app/Lib/Tools/EventGraphTool.php b/app/Lib/Tools/EventGraphTool.php
index ecb4eebf7..5006fff16 100644
--- a/app/Lib/Tools/EventGraphTool.php
+++ b/app/Lib/Tools/EventGraphTool.php
@@ -21,6 +21,7 @@
                 'fields' => array('Tag.id', 'Tag.name'),
                 'sort' => array('lower(Tag.name) asc'),
             ));
+            $this->__extendedEventUUIDMapping = array();
             $this->__extended_view = $extended_view;
             $this->__lookupTables = array(
                 'analysisLevels' => $this->__eventModel->analysisLevels,
@@ -266,6 +267,7 @@
                     'node_type' => 'attribute',
                 );
                 array_push($this->__json['items'], $toPush);
+                $this->__extendedEventUUIDMapping[$toPush['event_id']] = '';
             }
 
             foreach ($object as $obj) {
@@ -290,6 +292,7 @@
                 }
 
                 array_push($this->__json['items'], $toPush);
+                $this->__extendedEventUUIDMapping[$toPush['event_id']] = '';
 
                 foreach ($obj['ObjectReference'] as $rel) {
                     $toPush = array(
@@ -305,6 +308,11 @@
                 }
             }
 
+            if ($this->__extended_view) {
+                $this->fetchEventUUIDFromId();
+                $this->__json['extended_event_uuid_mapping'] = $this->__extendedEventUUIDMapping;
+            }
+
             return $this->__json;
         }
 
@@ -547,4 +555,13 @@
             }
             return $templates;
         }
+
+        public function fetchEventUUIDFromId()
+        {
+            $eventUUIDs = $this->__eventModel->find('list', [
+                'conditions' => ['id' => array_keys($this->__extendedEventUUIDMapping)],
+                'fields' => ['uuid']
+            ]);
+            $this->__extendedEventUUIDMapping = $eventUUIDs;
+        }
     }
diff --git a/app/webroot/js/event-graph.js b/app/webroot/js/event-graph.js
index 03b8e7f37..e90c20d6a 100644
--- a/app/webroot/js/event-graph.js
+++ b/app/webroot/js/event-graph.js
@@ -75,6 +75,7 @@ class EventGraph {
 
         this.extended_event_color_mapping = {};
         this.extended_event_points = {};
+        this.extended_event_uuid_mapping = {};
 
         this.network = new vis.Network(container, data, this.network_options);
         this.add_unreferenced_root_node();
@@ -111,7 +112,7 @@ class EventGraph {
 
             for (var event_id in that.extended_event_points) {
                 if (that.extended_event_color_mapping[event_id] === undefined) {
-                    eventGraph.extended_event_color_mapping[event_id] = stringToRGB(event_id);
+                    eventGraph.extended_event_color_mapping[event_id] = stringToRGB(that.extended_event_uuid_mapping[event_id]);
                 }
                 var chosen_color = eventGraph.extended_event_color_mapping[event_id];
 
@@ -677,6 +678,7 @@ class EventGraph {
         if (hard) {
             this.backup_connection_edges = {};
             this.extended_event_points = {};
+            this.extended_event_uuid_mapping = {};
             this.extended_event_color_mapping = {};
         }
     }
@@ -685,6 +687,8 @@ class EventGraph {
         var that = this;
         that.network_loading(true, loadingText_creating);
 
+        this.extended_event_uuid_mapping = data.extended_event_uuid_mapping;
+
         // New nodes will be automatically added
         // removed references will be deleted
         var node_conf;
@@ -1768,26 +1772,31 @@ class MispInteraction {
 * UTILS
 * ========*/
 function drawExtendedEventHull(ctx, nodes, color, text) {
-    ctx.fillStyle = color+'88';
-    var hull = getHullFromPoints(nodes);
+    ctx.fillStyle = color+'55';
+    ctx.strokeStyle = color+'aa';
+    var centroid = getCentroid(nodes);
+    var hull = getHullFromPoints(nodes, centroid);
+    var hullExtraPoints = []
+    hull.forEach(p => {
+        hullExtraPoints.push(applyAngularOffsetForCentroid(p, centroid, false))
+        hullExtraPoints.push(p)
+        hullExtraPoints.push(applyAngularOffsetForCentroid(p, centroid, true))
+    })
+    centroid = getCentroid(hullExtraPoints);
+    var hullFinal = getHullFromPoints(hullExtraPoints, centroid);
+    hullFinal.push(hullFinal[0])
 
-    var start = hull[0];
-    var end = hull[hull.length-1];
-    var prev = start;
     ctx.beginPath();
-    ctx.moveTo(start.x, start.y);
-    for (var i=1; i<hull.length; i++) {
-        var cur = hull[i];
-        ctx.lineTo(cur.x,cur.y);
-        prev = cur;
+    ctx.moveTo(hullFinal[0].x, hullFinal[0].y);
+    for(var i=1; i<hullFinal.length; i++) {
+        var cp_x_mid = (hullFinal[i-1].x + hullFinal[i].x) / 2;
+        var cp_y_mid = (hullFinal[i-1].y + hullFinal[i].y) / 2;
+        var cp = applyOffsetForCentroid({x: cp_x_mid, y: cp_y_mid}, centroid, 0.2)
+        ctx.quadraticCurveTo(cp.x, cp.y, hullFinal[i].x, hullFinal[i].y);
+        ctx.stroke();
     }
-    ctx.moveTo(end.x, end.y);
-    var centerX = (end.x+start.x)/2;
-    var centerY = (end.y+start.y)/2;
-    ctx.quadraticCurveTo(centerX,centerY,start.x,start.y);
     ctx.fill();
 
-    var centroid = getCentroid(hull);
     ctx.beginPath();
     ctx.font="30px Verdana";
     ctx.fillStyle = getTextColour(color);
@@ -1803,10 +1812,11 @@ function orientation(p, q, r) {
 }
 // Implementation of Gift wrapping algorithm (jarvis march in 2D)
 // Inspired from https://www.geeksforgeeks.org/convex-hull-set-1-jarviss-algorithm-or-wrapping/
-function getHullFromPoints(points) {
+function getHullFromPoints(points, centroid) {
     var n = points.length;
     var l = 0;
     var hull = [];
+    var cur_point;
     // get leftmost point
     for (var i=0; i<n; i++) {
         l = points[l].x > points[i].x ? l : i;
@@ -1815,7 +1825,9 @@ function getHullFromPoints(points) {
     var p = l;
     var q;
     do {
-        hull.push(points[p]);
+        cur_point = points[p]
+        cur_point = applyOffsetForCentroid(cur_point, centroid)
+        hull.push(cur_point);
 
         q = (p+1) % n;
         for (var i=0; i<n; i++) {
@@ -1828,21 +1840,40 @@ function getHullFromPoints(points) {
     return hull;
 }
 function getCentroid(coordList) {
-    var cx = 0;
-    var cy = 0;
-    var a = 0;
-    for (var i=0; i<coordList.length; i++) {
-        var ci = coordList[i];
-        var cj = i+1 == coordList.length ? coordList[0] : coordList[i+1]; // j = i+1 AND loop around
-        var mul = (ci.x*cj.y - cj.x*ci.y);
-        cx += (ci.x + cj.x)*mul;
-        cy += (ci.y + cj.y)*mul;
-        a += mul;
+    var centroid = {x: 0, y: 0};
+    coordList.forEach(function(point) {
+        centroid.x += point.x;
+        centroid.y += point.y;
+    })
+    centroid.x = centroid.x / coordList.length;
+    centroid.y = centroid.y / coordList.length;
+    return centroid;
+}
+function applyOffsetForCentroid(point, centroid, ratio) {
+    ratio = ratio === undefined ? 1.0 : ratio;
+    var DEFAULT_OFFSET_X = 45 * ratio;
+    var DEFAULT_OFFSET_Y = 22 * ratio;
+    var slope = (point.y - centroid.y) / (point.x - centroid.x);
+    var angle = Math.atan(slope);
+    var sign = point.x > centroid.x ? 1 : -1;
+    var newPoint = {
+        x: point.x + Math.cos(angle) * DEFAULT_OFFSET_X * sign,
+        y: point.y + Math.sin(angle) * DEFAULT_OFFSET_Y * sign,
     }
-    a = a / 2;
-    cx = cx / (6*a);
-    cy = cy / (6*a);
-    return {x: cx, y: cy};
+    return newPoint;
+}
+function applyAngularOffsetForCentroid(point, centroid, left) {
+    var DEFAULT_ANGULAR_OFFSET = 2;
+    var DEFAULT_OFFSET = 40;
+    var slope = (point.y - centroid.y) / (point.x - centroid.x);
+    var angle = Math.atan(slope);
+    angle = angle + ((left ? 1 : -1) * DEFAULT_ANGULAR_OFFSET);
+    var sign = point.x > centroid.x ? 1 : -1
+    var newPoint = {
+        x: point.x + Math.cos(angle) * DEFAULT_OFFSET * sign,
+        y: point.y + Math.sin(angle) * DEFAULT_OFFSET * sign,
+    }
+    return newPoint;
 }
 
 function generate_background_shortcuts(shortcut_text) {

From 58d0900ae0e0196def04a695754db3b866ea7c2e Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 17 Feb 2021 12:25:00 +0100
Subject: [PATCH 158/437] fix: [events:eventGraph] Make sure to include
 event_id for attribute nodes

---
 app/webroot/js/event-graph.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/webroot/js/event-graph.js b/app/webroot/js/event-graph.js
index e90c20d6a..86a92beb2 100644
--- a/app/webroot/js/event-graph.js
+++ b/app/webroot/js/event-graph.js
@@ -766,6 +766,7 @@ class EventGraph {
                 node_conf = {
                     id: node.id,
                     uuid: node.uuid,
+                    event_id: node.event_id,
                     label: striped_value,
                     title: label,
                     group: group,
@@ -1795,6 +1796,7 @@ function drawExtendedEventHull(ctx, nodes, color, text) {
         ctx.quadraticCurveTo(cp.x, cp.y, hullFinal[i].x, hullFinal[i].y);
         ctx.stroke();
     }
+    ctx.stroke();
     ctx.fill();
 
     ctx.beginPath();

From a2a1dca26c82bfbb7d49db5cd1416bceaf5151a9 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 17 Feb 2021 12:26:28 +0100
Subject: [PATCH 159/437] fix: [event] Provide text for missing referenced
 elements

- The event might not contain the referenced elements if they belong to
an extended event
---
 app/Model/Event.php                                    | 10 ++++++++++
 app/View/Elements/Events/View/row_object_reference.ctp |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 675220caa..be0f6ab68 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -6830,6 +6830,16 @@ class Event extends AppModel
                         $reference[$field] = $found[$field];
                     }
                     $event['Object'][$k]['ObjectReference'][$k2][$type] = $reference;
+                } else { // object / attribute might be from an extended event
+                    $otherEventText = __('%s from another event', $reference['referenced_type'] == 0 ? 'Attribute' : 'Object');
+                    $event['Object'][$k]['ObjectReference'][$k2][$type] = [
+                        'name' => '',
+                        'meta-category' => $otherEventText,
+                        'category' => $otherEventText,
+                        'type' => '',
+                        'value' => '',
+                        'uuid' => $reference['referenced_uuid']
+                    ];
                 }
             }
         }
diff --git a/app/View/Elements/Events/View/row_object_reference.ctp b/app/View/Elements/Events/View/row_object_reference.ctp
index 5c76ec5f1..b84525e61 100644
--- a/app/View/Elements/Events/View/row_object_reference.ctp
+++ b/app/View/Elements/Events/View/row_object_reference.ctp
@@ -34,7 +34,7 @@
   foreach ($object['ObjectReference'] as $reference):
     if (isset($reference['Object'])) {
       $uuid = $reference['Object']['uuid'];
-      $output = ' (' . $reference['Object']['name'] . ': ' . $reference['Object']['name'] . ')';
+      $output = ' (' . $reference['Object']['meta-category'] . ': ' . $reference['Object']['name'] . ')';
       $objectType = 'Object';
     } else {
       $uuid = $reference['Attribute']['uuid'];

From 065449b33e3f2e7eaab585d251e0192d53efd479 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 17 Feb 2021 13:05:34 +0100
Subject: [PATCH 160/437] chg: [dashboard] added to the root level of the top
 menu

---
 app/View/Elements/global_menu.ctp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp
index cb0316bda..b843398f8 100755
--- a/app/View/Elements/global_menu.ctp
+++ b/app/View/Elements/global_menu.ctp
@@ -118,6 +118,11 @@
                     ),
                 )
             ),
+            array(
+                'type' => 'root',
+                'text' => __('Dashboard'),
+                'url' => $baseurl . '/dashboards'
+            ),
             array(
                 'type' => 'root',
                 'text' => __('Galaxies'),
@@ -174,7 +179,6 @@
             array(
                 'type' => 'root',
                 'text' => __('Global Actions'),
-                'url' => $baseurl . '/dashboards',
                 'children' => array(
                     array(
                         'text' => __('News'),
@@ -192,10 +196,6 @@
                         'text' => __('Set Setting'),
                         'url' => $baseurl . '/user_settings/setSetting'
                     ),
-                    array(
-                        'text' => __('Dashboard'),
-                        'url' => $baseurl . '/dashboards'
-                    ),
                     array(
                         'text' => __('Organisations'),
                         'url' => $baseurl . '/organisations/index',

From df6c68ad8843de27186d0a4ba9d177f07dab5762 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 17 Feb 2021 13:06:05 +0100
Subject: [PATCH 161/437] new: [devshell] added a new shell for developer
 related tasks

- 1 task currently, cleanFeedDefault
  - runs some cleanup on the feed definition file to remove local IDs etc
---
 app/Console/Command/DevShell.php | 49 ++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 app/Console/Command/DevShell.php

diff --git a/app/Console/Command/DevShell.php b/app/Console/Command/DevShell.php
new file mode 100644
index 000000000..2a6bc911c
--- /dev/null
+++ b/app/Console/Command/DevShell.php
@@ -0,0 +1,49 @@
+<?php
+class DevShell extends AppShell {
+
+    public $uses = [];
+
+    public function cleanFeedDefault() {
+        $this->out(__('Massaging the feed metadata file.'));
+        $data = file_get_contents(APP . 'files/feed-metadata/defaults.json');
+        if (empty($data)) {
+            $this->stdout->styles('error');
+            $this->out(__('Could not read the defaults.json file at %s. Exiting', APP . 'files/feed-metadata/defaults.json'));
+        } else {
+            $data = json_decode($data, true);
+            $validFields = [
+                'Feed' => [
+                    'name', 'provider', 'url', 'rules', 'enabled', 'distribution',
+                    'default', 'source_format', 'fixed_event', 'delta_merge',
+                    'publish', 'override_ids', 'settings', 'input_source',
+                    'delete_local_file', 'lookup_visible'
+                ],
+                'Tag' => [
+                    'name', 'colour', 'exportable', 'hide_tag'
+                ]
+            ];
+            foreach ($data as $k => $feedData) {
+                $temp = [];
+                foreach ($validFields as $scope => $fieldNames) {
+                    foreach ($fieldNames as $fieldName) {
+                        if (isset($feedData[$scope][$fieldName])) {
+                            $temp[$scope][$fieldName] = $feedData[$scope][$fieldName];
+                        }
+                    }
+                }
+                $data[$k] = $temp;
+            }
+            if (!empty($data)) {
+                file_put_contents(APP . 'files/feed-metadata/defaults.json', json_encode($data, JSON_PRETTY_PRINT));
+                $this->out(__(
+                    'Done. The feed definitions contain %s feeds and can be found at %s.',
+                    count($data),
+                    APP . 'files/feed-metadata/defaults.json'
+                ));
+            } else {
+                $this->stdout->styles('error');
+                $this->out(__('Something went wrong.'));
+            }
+        }
+    }
+}

From 8233f0f6143472be376ab31ea7ca6d18d670b5fd Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 17 Feb 2021 13:06:55 +0100
Subject: [PATCH 162/437] fix: [feed defaults] removed a bunch of feeds and
 clarified the description of some, fixes #7006

---
 app/files/feed-metadata/defaults.json | 3116 +++++++++++--------------
 1 file changed, 1301 insertions(+), 1815 deletions(-)

diff --git a/app/files/feed-metadata/defaults.json b/app/files/feed-metadata/defaults.json
index 68ab37ef2..8e10ea6a6 100644
--- a/app/files/feed-metadata/defaults.json
+++ b/app/files/feed-metadata/defaults.json
@@ -1,1854 +1,1340 @@
 [
-  {
-    "Feed": {
-      "id": "1",
-      "name": "CIRCL OSINT Feed",
-      "provider": "CIRCL",
-      "url": "https://www.circl.lu/doc/misp/feed-osint",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": true,
-      "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": "1495871949"
-    }
-  },
-  {
-    "Feed": {
-      "id": "2",
-      "name": "The Botvrij.eu Data",
-      "provider": "Botvrij.eu",
-      "url": "https://www.botvrij.eu/data/feed-osint",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": true,
-      "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": "1495871957"
-    }
-  },
-  {
-    "Feed": {
-      "id": "5",
-      "name": "blockrules of rules.emergingthreats.net",
-      "provider": "rules.emergingthreats.net",
-      "url": "https://rules.emergingthreats.net/blockrules/compromised-ips.txt",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "5123",
-      "publish": false,
-      "override_ids": true,
-      "settings": "{\"csv\":{\"value\":\"1\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": false,
-      "cache_timestamp": "1495871959"
+    {
+        "Feed": {
+            "name": "CIRCL OSINT Feed",
+            "provider": "CIRCL",
+            "url": "https:\/\/www.circl.lu\/doc\/misp\/feed-osint",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": true,
+            "source_format": "misp",
+            "fixed_event": false,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\"\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "7",
-      "name": "malwaredomainlist",
-      "provider": "malwaredomainlist",
-      "url": "https://panwdbl.appspot.com/lists/mdl.txt",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "5196",
-      "publish": false,
-      "override_ids": true,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\"\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1495871961"
+    {
+        "Feed": {
+            "name": "The Botvrij.eu Data",
+            "provider": "Botvrij.eu",
+            "url": "https:\/\/www.botvrij.eu\/data\/feed-osint",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": true,
+            "source_format": "misp",
+            "fixed_event": false,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\"\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "8",
-      "name": "Tor exit nodes",
-      "provider": "TOR Node List from dan.me.uk",
-      "url": "https://www.dan.me.uk/torlist/?exit",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "5599",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\"\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1495871962"
+    {
+        "Feed": {
+            "name": "blockrules of rules.emergingthreats.net",
+            "provider": "rules.emergingthreats.net",
+            "url": "https:\/\/rules.emergingthreats.net\/blockrules\/compromised-ips.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "0",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": true,
+            "settings": "{\"csv\":{\"value\":\"1\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "9",
-      "name": "Tor ALL nodes",
-      "provider": "TOR Node List from dan.me.uk",
-      "url": "https://www.dan.me.uk/torlist/",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "5602",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\"\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1495871962"
+    {
+        "Feed": {
+            "name": "Tor exit nodes",
+            "provider": "TOR Node List from dan.me.uk - careful, this feed applies a lock-out after each pull. This is shared with the \"Tor ALL nodes\" feed.",
+            "url": "https:\/\/www.dan.me.uk\/torlist\/?exit",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "0",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\"\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "10",
-      "name": "cybercrime-tracker.net - all",
-      "provider": "cybercrime-tracker.net",
-      "url": "https://cybercrime-tracker.net/all.php",
-      "rules": "",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "5654",
-      "publish": false,
-      "override_ids": false,
-      "settings": "\"{\\\"csv\\\":{\\\"value\\\":\\\"\\\"}}\"",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": false,
-      "cache_timestamp": "1495871964"
+    {
+        "Feed": {
+            "name": "Tor ALL nodes",
+            "provider": "TOR Node List from dan.me.uk - careful, this feed applies a lock-out after each pull. This is shared with the \"Tor exit nodes\" feed.",
+            "url": "https:\/\/www.dan.me.uk\/torlist\/",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "0",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\"\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "11",
-      "name": "Phishtank online valid phishing",
-      "provider": "Phishtank",
-      "url": "https://data.phishtank.com/data/online-valid.csv",
-      "rules": "",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "5655",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\\/^http:\\\\\\/\\\\\\/www.phishtank.com\\/i\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": false,
-      "cache_timestamp": "1495871979"
+    {
+        "Feed": {
+            "name": "cybercrime-tracker.net - all",
+            "provider": "cybercrime-tracker.net",
+            "url": "https:\/\/cybercrime-tracker.net\/all.php",
+            "rules": "",
+            "enabled": true,
+            "distribution": "0",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": false,
+            "settings": "\"{\\\"csv\\\":{\\\"value\\\":\\\"\\\"}}\"",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "12",
-      "name": "listdynamic dns providers",
-      "provider": "http://dns-bh.sagadc.org",
-      "url": "http://dns-bh.sagadc.org/dynamic_dns.txt",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "5698",
-      "publish": true,
-      "override_ids": true,
-      "settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\"#\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1495871980"
-    }
-  },
-  {
-    "Feed": {
-      "id": "13",
-      "name": "ip-filter.blf - labs.snort.org",
-      "provider": "https://labs.snort.org",
-      "url": "https://labs.snort.org/feeds/ip-filter.blf",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "5798",
-      "publish": true,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": false,
-      "cache_timestamp": "1495871980"
+    {
+        "Feed": {
+            "name": "Phishtank online valid phishing",
+            "provider": "Phishtank",
+            "url": "https:\/\/data.phishtank.com\/data\/online-valid.csv",
+            "rules": "",
+            "enabled": true,
+            "distribution": "0",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\\\/^http:\\\\\\\/\\\\\\\/www.phishtank.com\\\/i\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "15",
-      "name": "longtail.it.marist.edu",
-      "provider": "longtail.it.marist.edu",
-      "url": "http://longtail.it.marist.edu/honey/current-ip-addresses.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "5873",
-      "publish": true,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": false,
-      "cache_timestamp": "1495871981"
+    {
+        "Feed": {
+            "name": "ip-block-list - snort.org",
+            "provider": "https:\/\/snort.org",
+            "url": "https:\/\/snort.org\/downloads\/ip-block-list",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "0",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": true,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "16",
-      "name": "longtail.it.marist.edu 7 days",
-      "provider": "longtail.it.marist.edu",
-      "url": "http://longtail.it.marist.edu/honey/last-7-days-ip-addresses.txt",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "5874",
-      "publish": true,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1495871982"
+    {
+        "Feed": {
+            "name": "diamondfox_panels",
+            "provider": "pan-unit42",
+            "url": "https:\/\/raw.githubusercontent.com\/pan-unit42\/iocs\/master\/diamondfox\/diamondfox_panels.txt",
+            "rules": "",
+            "enabled": true,
+            "distribution": "0",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": true,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "18",
-      "name": "diamondfox_panels",
-      "provider": "pan-unit42",
-      "url": "https://raw.githubusercontent.com/pan-unit42/iocs/master/diamondfox/diamondfox_panels.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "5887",
-      "publish": true,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": false,
-      "cache_timestamp": "1495871983"
+    {
+        "Feed": {
+            "name": "pop3gropers",
+            "provider": "home.nuug.no",
+            "url": "https:\/\/home.nuug.no\/~peter\/pop3gropers.txt",
+            "rules": "",
+            "enabled": true,
+            "distribution": "0",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": true,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "27",
-      "name": "pop3gropers",
-      "provider": "home.nuug.no",
-      "url": "https://home.nuug.no/~peter/pop3gropers.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "7610",
-      "publish": true,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": false,
-      "cache_timestamp": "1495871997"
+    {
+        "Feed": {
+            "name": "Feodo IP Blocklist",
+            "provider": "abuse.ch",
+            "url": "https:\/\/feodotracker.abuse.ch\/downloads\/ipblocklist.csv",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "30",
-      "name": "Feodo IP Blocklist",
-      "provider": "abuse.ch",
-      "url": "https://feodotracker.abuse.ch/downloads/ipblocklist.csv",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "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\":\"2\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1495872685"
-    }
-  },
-  {
-    "Feed": {
-      "id": "33",
-      "name": "OpenPhish url list",
-      "provider": "openphish.com",
-      "url": "https://openphish.com/feed.txt",
-      "rules": "",
-      "enabled": false,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "0",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true
+    {
+        "Feed": {
+            "name": "OpenPhish url list",
+            "provider": "openphish.com",
+            "url": "https:\/\/openphish.com\/feed.txt",
+            "rules": "",
+            "enabled": false,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "34",
-      "name": "firehol_level1",
-      "provider": "iplists.firehol.org",
-      "url": "https://raw.githubusercontent.com/ktsaou/blocklist-ipsets/master/firehol_level1.netset",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "0",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true
+    {
+        "Feed": {
+            "name": "firehol_level1",
+            "provider": "iplists.firehol.org",
+            "url": "https:\/\/raw.githubusercontent.com\/ktsaou\/blocklist-ipsets\/master\/firehol_level1.netset",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "36",
-      "name": "IPs from High-Confidence DGA-Based C&Cs Actively Resolving",
-      "provider": "osint.bambenekconsulting.com",
-      "url": "https://osint.bambenekconsulting.com/feeds/c2-ipmasterlist-high.txt",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "0",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true
+    {
+        "Feed": {
+            "name": "IPs from High-Confidence DGA-Based C&Cs Actively Resolving - requires a valid license",
+            "provider": "osint.bambenekconsulting.com",
+            "url": "https:\/\/osint.bambenekconsulting.com\/feeds\/c2-ipmasterlist-high.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "37",
-      "name": "Domains from High-Confidence DGA-based C&C Domains Actively Resolving",
-      "provider": "osint.bambenekconsulting.com",
-      "url": "https://osint.bambenekconsulting.com/feeds/c2-dommasterlist-high.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "0",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true
+    {
+        "Feed": {
+            "name": "Domains from High-Confidence DGA-based C&C Domains Actively Resolving",
+            "provider": "osint.bambenekconsulting.com",
+            "url": "https:\/\/osint.bambenekconsulting.com\/feeds\/c2-dommasterlist-high.txt",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "38",
-      "name": "ci-badguys.txt",
-      "provider": "cinsscore.com",
-      "url": "https://cinsscore.com/list/ci-badguys.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "0",
-      "publish": false,
-      "override_ids": true,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true
+    {
+        "Feed": {
+            "name": "ci-badguys.txt",
+            "provider": "cinsscore.com",
+            "url": "https:\/\/cinsscore.com\/list\/ci-badguys.txt",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": true,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "39",
-      "name": "alienvault reputation generic",
-      "provider": ".alienvault.com",
-      "url": "https://reputation.alienvault.com/reputation.generic",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "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\":\"1\",\"delimiter\":\" \"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true
+    {
+        "Feed": {
+            "name": "alienvault reputation generic",
+            "provider": ".alienvault.com",
+            "url": "https:\/\/reputation.alienvault.com\/reputation.generic",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\" \"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "40",
-      "name": "blocklist.de/lists/all.txt",
-      "provider": "blocklist.de",
-      "url": "https://lists.blocklist.de/lists/all.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "cache_timestamp": "1498046540"
+    {
+        "Feed": {
+            "name": "blocklist.de\/lists\/all.txt",
+            "provider": "blocklist.de",
+            "url": "https:\/\/lists.blocklist.de\/lists\/all.txt",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "41",
-      "name": "VNC RFB",
-      "provider": "dataplane.org",
-      "url": "https://dataplane.org/vncrfb.txt",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "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": false,
-      "cache_timestamp": "1498061187"
+    {
+        "Feed": {
+            "name": "VNC RFB",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/vncrfb.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "42",
-      "name": "sshpwauth.txt",
-      "provider": "dataplane.org",
-      "url": "https://dataplane.org/sshpwauth.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "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,
-      "cache_timestamp": "1498061355"
+    {
+        "Feed": {
+            "name": "sshpwauth.txt",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/sshpwauth.txt",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "43",
-      "name": "sipregistration",
-      "provider": "dataplane.org",
-      "url": "https://dataplane.org/sipregistration.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "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,
-      "cache_timestamp": "1498061706"
+    {
+        "Feed": {
+            "name": "sipregistration",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/sipregistration.txt",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "44",
-      "name": "sipquery",
-      "provider": "dataplane.org",
-      "url": "https://dataplane.org/sipquery.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "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,
-      "cache_timestamp": "1498061776"
+    {
+        "Feed": {
+            "name": "sipquery",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/sipquery.txt",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "45",
-      "name": "sipinvitation",
-      "provider": "dataplane.org",
-      "url": "https://dataplane.org/sipinvitation.txt",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "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,
-      "cache_timestamp": "1498061932"
+    {
+        "Feed": {
+            "name": "sipinvitation",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/sipinvitation.txt",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "46",
-      "name": "All current domains belonging to known malicious DGAs",
-      "provider": "osint.bambenekconsulting.com",
-      "url": "https://osint.bambenekconsulting.com/feeds/dga-feed-high.csv",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "0",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true
+    {
+        "Feed": {
+            "name": "All current domains belonging to known malicious DGAs",
+            "provider": "osint.bambenekconsulting.com",
+            "url": "https:\/\/osint.bambenekconsulting.com\/feeds\/dga-feed-high.csv",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "54",
-      "name": "VXvault - URL List",
-      "provider": "VXvault",
-      "url": "http://vxvault.net/URL_List.php",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true
-    }
-  },
-  {
-    "Feed": {
-      "id": "55",
-      "name": "abuse.ch SSL IPBL",
-      "provider": "abuse.ch",
-      "url": "https://sslbl.abuse.ch/blacklist/sslipblacklist.csv",
-      "rules": "",
-      "enabled": true,
-      "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\":\"2\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1514750886"
-    }
-  },
-  {
-    "Feed": {
-      "id": "56",
-      "name": "abuse.ch Dyre SSL IPBL",
-      "provider": "abuse.ch",
-      "url": "https://sslbl.abuse.ch/blacklist/dyre_sslipblacklist.csv",
-      "rules": "",
-      "enabled": true,
-      "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\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1514750887"
-    }
-  },
-  {
-    "Feed": {
-      "id": "57",
-      "name": "http://cybercrime-tracker.net",
-      "provider": "http://cybercrime-tracker.net hashlist",
-      "url": "https://cybercrime-tracker.net/ccamlist.php",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "cache_timestamp": "1514750887"
-    }
-  },
-  {
-    "Feed": {
-      "id": "58",
-      "name": "http://cybercrime-tracker.net",
-      "provider": "http://cybercrime-tracker.net gatelist",
-      "url": "https://cybercrime-tracker.net/ccamgate.php",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "cache_timestamp": "1514750887"
-    }
-  },
-  {
-    "Feed": {
-      "id": "60",
-      "name": "blocklist.greensnow.co",
-      "provider": "greensnow.co",
-      "url": "https://blocklist.greensnow.co/greensnow.txt",
-      "rules": "",
-      "enabled": true,
-      "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\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "cache_timestamp": "1514750889"
-    }
-  },
-  {
-    "Feed": {
-      "id": "64",
-      "name": "This list contains all domains - A list for administrators to prevent mining in networks",
-      "provider": "ZeroDot1 - CoinBlockerLists",
-      "url": "https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/list.txt?inline=false",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": ""
-    }
-  },
-  {
-    "Feed": {
-      "id": "65",
-      "name": "This list contains all optional domains - An additional list for administrators",
-      "provider": "ZeroDot1 - CoinBlockerLists",
-      "url": "https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/list_optional.txt?inline=false",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": ""
-    }
-  },
-  {
-    "Feed": {
-      "id": "66",
-      "name": "This list contains all browser mining domains - A list to prevent browser mining only",
-      "provider": "ZeroDot1 - CoinBlockerLists",
-      "url": "https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/list_browser.txt?inline=false",
-      "rules": "",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": ""
-    }
-  },
-  {
-    "Feed": {
-      "id": "69",
-      "name": "URLHaus Malware URLs",
-      "provider": "Abuse.ch",
-      "url": "https://urlhaus.abuse.ch/downloads/csv/",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "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": ""
+    {
+        "Feed": {
+            "name": "VXvault - URL List",
+            "provider": "VXvault",
+            "url": "http:\/\/vxvault.net\/URL_List.php",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "70",
-      "name": "CyberCure - IP Feed",
-      "provider": "www.cybercure.ai",
-      "url": "https://api.cybercure.ai/feed/get_ips?type=csv",
-      "rules": "",
-      "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\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": false,
-      "headers": ""
-    }
-  },
-  {
-    "Feed": {
-      "id": "71",
-      "name": "CyberCure - Blocked URL Feed",
-      "provider": "www.cybercure.ai",
-      "url": "https://api.cybercure.ai/feed/get_url?type=csv",
-      "rules": "",
-      "enabled": true,
-      "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\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": false,
-      "headers": ""
-    }
-  },
-  {
-    "Feed": {
-      "id": "72",
-      "name": "CyberCure - Hash Feed",
-      "provider": "www.cybercure.ai",
-      "url": "https://api.cybercure.ai/feed/get_hash?type=csv",
-      "rules": "",
-      "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\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": false,
-      "headers": ""
-    }
-  },
-  {
-    "Feed": {
-      "id": "75",
-      "name": "ipspamlist",
-      "provider": "ipspamlist",
-      "url": "http://www.ipspamlist.com/public_feeds.csv",
-      "rules": "",
-      "enabled": true,
-      "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": "76",
-      "name": "mirai.security.gives",
-      "provider": "security.gives",
-      "url": "https://mirai.security.gives/data/ip_list.txt",
-      "rules": "",
-      "enabled": false,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "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
-    }
-  },
-  {
-    "Feed": {
-      "id": "79",
-      "name": "malsilo.domain",
-      "provider": "MalSilo",
-      "url": "https://malsilo.gitlab.io/feeds/dumps/domain_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": "87",
-      "name": "malshare.com - current all",
-      "provider": "malshare.com",
-      "url": "https://malshare.com/daily/malshare.current.all.txt",
-      "rules": "",
-      "enabled": false,
-      "distribution": "3",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cached_elements": 3936
-    }
-  },
-  {
-    "Feed": {
-      "id": "89",
-      "name": "Benkow.cc RAT",
-      "provider": "benkow.cc",
-      "url": "https://benkow.cc/export_rat.php",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": false,
-      "distribution": "0",
-      "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,4\",\"delimiter\":\";\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cached_elements": 2531,
-      "coverage_by_other_feeds": "11.62%"
-    }
-  },
-  {
-    "Feed": {
-      "id": "90",
-      "name": "Panels Tracker",
-      "provider": "Benkow.cc",
-      "url": "https://benkow.cc/export.php",
-      "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,4\",\"delimiter\":\";\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cache_timestamp": "1563533153"
-    }
-  },
-  {
-    "Feed": {
-      "id": "106",
-      "name": "IPsum (aggregation of all feeds) - level 1 - lot of false positives",
-      "provider": "IPsum",
-      "url": "https://raw.githubusercontent.com/stamparm/ipsum/master/levels/1.txt",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": false,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "2945",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cache_timestamp": "1568901057"
+    {
+        "Feed": {
+            "name": "abuse.ch SSL IPBL",
+            "provider": "abuse.ch",
+            "url": "https:\/\/sslbl.abuse.ch\/blacklist\/sslblacklist.csv",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"2\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
     },
-    "Tag": {
-      "id": "2945",
-      "name": "osint:source-type=\"automatic-collection\"",
-      "colour": "#005b9d",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "107",
-      "name": "IPsum (aggregation of all feeds) - level 2 - medium false positives",
-      "provider": "IPsum",
-      "url": "https://raw.githubusercontent.com/stamparm/ipsum/master/levels/2.txt",
-      "rules": "",
-      "enabled": false,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cache_timestamp": "1568901068"
+    {
+        "Feed": {
+            "name": "abuse.ch Dyre SSL IPBL",
+            "provider": "abuse.ch",
+            "url": "https:\/\/sslbl.abuse.ch\/blacklist\/dyre_sslipblacklist.csv",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004577",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "108",
-      "name": "IPsum (aggregation of all feeds) - level 3 - low false positives",
-      "provider": "IPsum",
-      "url": "https://raw.githubusercontent.com/stamparm/ipsum/master/levels/3.txt",
-      "rules": "",
-      "enabled": false,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cache_timestamp": "1568901071"
+    {
+        "Feed": {
+            "name": "http:\/\/cybercrime-tracker.net",
+            "provider": "http:\/\/cybercrime-tracker.net hashlist",
+            "url": "https:\/\/cybercrime-tracker.net\/ccamlist.php",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004577",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "109",
-      "name": "IPsum (aggregation of all feeds) - level 4 - very low false positives",
-      "provider": "IPsum",
-      "url": "https://raw.githubusercontent.com/stamparm/ipsum/master/levels/4.txt",
-      "rules": "",
-      "enabled": false,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cache_timestamp": "1568901072"
+    {
+        "Feed": {
+            "name": "http:\/\/cybercrime-tracker.net",
+            "provider": "http:\/\/cybercrime-tracker.net gatelist",
+            "url": "https:\/\/cybercrime-tracker.net\/ccamgate.php",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004577",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "110",
-      "name": "IPsum (aggregation of all feeds) - level 5 - ultra false positives",
-      "provider": "IPsum",
-      "url": "https://raw.githubusercontent.com/stamparm/ipsum/master/levels/5.txt",
-      "rules": "",
-      "enabled": false,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cache_timestamp": "1568901073"
+    {
+        "Feed": {
+            "name": "blocklist.greensnow.co",
+            "provider": "greensnow.co",
+            "url": "https:\/\/blocklist.greensnow.co\/greensnow.txt",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"1\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004577",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "111",
-      "name": "IPsum (aggregation of all feeds) - level 6 - no false positives",
-      "provider": "IPsum",
-      "url": "https://raw.githubusercontent.com/stamparm/ipsum/master/levels/6.txt",
-      "rules": "",
-      "enabled": false,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cache_timestamp": "1568901073"
+    {
+        "Feed": {
+            "name": "This list contains all domains - A list for administrators to prevent mining in networks",
+            "provider": "ZeroDot1 - CoinBlockerLists",
+            "url": "https:\/\/gitlab.com\/ZeroDot1\/CoinBlockerLists\/raw\/master\/list.txt?inline=false",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004577",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "112",
-      "name": "IPsum (aggregation of all feeds) - level 7 - no false positives",
-      "provider": "IPsum",
-      "url": "https://raw.githubusercontent.com/stamparm/ipsum/master/levels/7.txt",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": false,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cache_timestamp": "1568901074"
+    {
+        "Feed": {
+            "name": "This list contains all optional domains - An additional list for administrators",
+            "provider": "ZeroDot1 - CoinBlockerLists",
+            "url": "https:\/\/gitlab.com\/ZeroDot1\/CoinBlockerLists\/raw\/master\/list_optional.txt?inline=false",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004577",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "113",
-      "name": "IPsum (aggregation of all feeds) - level 8 - no false positives",
-      "provider": "IPsum",
-      "url": "https://raw.githubusercontent.com/stamparm/ipsum/master/levels/8.txt",
-      "rules": "",
-      "enabled": false,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "freetext",
-      "fixed_event": true,
-      "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": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cache_timestamp": "1568901074"
+    {
+        "Feed": {
+            "name": "This list contains all browser mining domains - A list to prevent browser mining only",
+            "provider": "ZeroDot1 - CoinBlockerLists",
+            "url": "https:\/\/gitlab.com\/ZeroDot1\/CoinBlockerLists\/raw\/master\/list_browser.txt?inline=false",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004577",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "114",
-      "name": "DigitalSide Threat-Intel OSINT Feed",
-      "provider": "osint.digitalside.it",
-      "url": "https://osint.digitalside.it/Threat-Intel/digitalside-misp-feed/",
-      "rules": "",
-      "enabled": false,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "0",
-      "default": false,
-      "source_format": "misp",
-      "fixed_event": true,
-      "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,
-      "headers": "",
-      "caching_enabled": false,
-      "force_to_ids": false,
-      "cache_timestamp": "1568901075"
-    }
-  },
-  {
-    "Feed": {
-      "id": "115",
-      "name": "Metasploit exploits with CVE assigned",
-      "provider": "eCrimeLabs",
-      "url": "https://feeds.ecrimelabs.net/data/metasploit-cve",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "event_id": "0",
-      "publish": true,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "headers": "",
-      "caching_enabled": true,
-      "force_to_ids": false,
-      "cache_timestamp": "1571206806"
+    {
+        "Feed": {
+            "name": "URLHaus Malware URLs",
+            "provider": "Abuse.ch",
+            "url": "https:\/\/urlhaus.abuse.ch\/downloads\/csv\/",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004577",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "116",
-      "name": "Malware Bazaar",
-      "provider": "abuse.ch",
-      "url": "https://bazaar.abuse.ch/export/txt/md5/full/",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]},\"url_params\":\"\"}",
-      "enabled": false,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": false,
-      "event_id": "0",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\\/^#.*\\/i\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": true,
-      "headers": "",
-      "caching_enabled": false,
-      "force_to_ids": false,
-      "cache_timestamp": "1571206806"
+    {
+        "Feed": {
+            "name": "CyberCure - IP Feed",
+            "provider": "www.cybercure.ai",
+            "url": "https:\/\/api.cybercure.ai\/feed\/get_ips?type=csv",
+            "rules": "",
+            "enabled": false,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004577",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
-  {
-    "Feed": {
-      "id": "117",
-      "name": "PhishScore",
-      "provider": "PhishStats",
-      "url": "https://phishstats.info/phish_score.csv",
-      "rules": "",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "csv",
-      "fixed_event": true,
-      "delta_merge": true,
-      "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
+    {
+        "Feed": {
+            "name": "CyberCure - Blocked URL Feed",
+            "provider": "www.cybercure.ai",
+            "url": "https:\/\/api.cybercure.ai\/feed\/get_url?type=csv",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        }
     },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
+    {
+        "Feed": {
+            "name": "CyberCure - Hash Feed",
+            "provider": "www.cybercure.ai",
+            "url": "https:\/\/api.cybercure.ai\/feed\/get_hash?type=csv",
+            "rules": "",
+            "enabled": false,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "ipspamlist",
+            "provider": "ipspamlist",
+            "url": "http:\/\/www.ipspamlist.com\/public_feeds.csv",
+            "rules": "",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
+    },
+    {
+        "Feed": {
+            "name": "mirai.security.gives",
+            "provider": "security.gives",
+            "url": "https:\/\/mirai.security.gives\/data\/ip_list.txt",
+            "rules": "",
+            "enabled": false,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
+    },
+    {
+        "Feed": {
+            "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",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
+    },
+    {
+        "Feed": {
+            "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",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
+    },
+    {
+        "Feed": {
+            "name": "malsilo.domain",
+            "provider": "MalSilo",
+            "url": "https:\/\/malsilo.gitlab.io\/feeds\/dumps\/domain_list.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": false,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
+    },
+    {
+        "Feed": {
+            "name": "malshare.com - current all",
+            "provider": "malshare.com",
+            "url": "https:\/\/malshare.com\/daily\/malshare.current.all.txt",
+            "rules": "",
+            "enabled": false,
+            "distribution": "3",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
+    },
+    {
+        "Feed": {
+            "name": "Benkow.cc RAT",
+            "provider": "benkow.cc",
+            "url": "https:\/\/benkow.cc\/export_rat.php",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": false,
+            "distribution": "0",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3,4\",\"delimiter\":\";\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
+    },
+    {
+        "Feed": {
+            "name": "Panels Tracker",
+            "provider": "Benkow.cc",
+            "url": "https:\/\/benkow.cc\/export.php",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": false,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3,4\",\"delimiter\":\";\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        }
+    },
+    {
+        "Feed": {
+            "name": "IPsum (aggregation of all feeds) - level 1 - lot of false positives",
+            "provider": "IPsum",
+            "url": "https:\/\/raw.githubusercontent.com\/stamparm\/ipsum\/master\/levels\/1.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": false,
+            "distribution": "0",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"automatic-collection\"",
+            "colour": "#005b9d",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "IPsum (aggregation of all feeds) - level 2 - medium false positives",
+            "provider": "IPsum",
+            "url": "https:\/\/raw.githubusercontent.com\/stamparm\/ipsum\/master\/levels\/2.txt",
+            "rules": "",
+            "enabled": false,
+            "distribution": "0",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004577",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "IPsum (aggregation of all feeds) - level 3 - low false positives",
+            "provider": "IPsum",
+            "url": "https:\/\/raw.githubusercontent.com\/stamparm\/ipsum\/master\/levels\/3.txt",
+            "rules": "",
+            "enabled": false,
+            "distribution": "0",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004577",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "IPsum (aggregation of all feeds) - level 4 - very low false positives",
+            "provider": "IPsum",
+            "url": "https:\/\/raw.githubusercontent.com\/stamparm\/ipsum\/master\/levels\/4.txt",
+            "rules": "",
+            "enabled": false,
+            "distribution": "0",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004577",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "IPsum (aggregation of all feeds) - level 5 - ultra false positives",
+            "provider": "IPsum",
+            "url": "https:\/\/raw.githubusercontent.com\/stamparm\/ipsum\/master\/levels\/5.txt",
+            "rules": "",
+            "enabled": false,
+            "distribution": "0",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004577",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "IPsum (aggregation of all feeds) - level 6 - no false positives",
+            "provider": "IPsum",
+            "url": "https:\/\/raw.githubusercontent.com\/stamparm\/ipsum\/master\/levels\/6.txt",
+            "rules": "",
+            "enabled": false,
+            "distribution": "0",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004577",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "IPsum (aggregation of all feeds) - level 7 - no false positives",
+            "provider": "IPsum",
+            "url": "https:\/\/raw.githubusercontent.com\/stamparm\/ipsum\/master\/levels\/7.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": false,
+            "distribution": "0",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004577",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "IPsum (aggregation of all feeds) - level 8 - no false positives",
+            "provider": "IPsum",
+            "url": "https:\/\/raw.githubusercontent.com\/stamparm\/ipsum\/master\/levels\/8.txt",
+            "rules": "",
+            "enabled": false,
+            "distribution": "0",
+            "default": false,
+            "source_format": "freetext",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004577",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "DigitalSide Threat-Intel OSINT Feed",
+            "provider": "osint.digitalside.it",
+            "url": "https:\/\/osint.digitalside.it\/Threat-Intel\/digitalside-misp-feed\/",
+            "rules": "",
+            "enabled": false,
+            "distribution": "0",
+            "default": false,
+            "source_format": "misp",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "Metasploit exploits with CVE assigned",
+            "provider": "eCrimeLabs",
+            "url": "https:\/\/feeds.ecrimelabs.net\/data\/metasploit-cve",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "0",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": true,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004577",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "Malware Bazaar",
+            "provider": "abuse.ch",
+            "url": "https:\/\/bazaar.abuse.ch\/export\/txt\/md5\/full\/",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]},\"url_params\":\"\"}",
+            "enabled": false,
+            "distribution": "0",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\\\/^#.*\\\/i\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004577",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "PhishScore",
+            "provider": "PhishStats",
+            "url": "https:\/\/phishstats.info\/phish_score.csv",
+            "rules": "",
+            "enabled": true,
+            "distribution": "0",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": true,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": true
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
     }
-  }
 ]

From 2b98a1c025088fae561d35cd799bce3155e6b016 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 17 Feb 2021 13:43:17 +0100
Subject: [PATCH 163/437] fix: [event] Fix retreiving selected referenced
 element data

---
 app/Controller/ObjectReferencesController.php | 19 +++++++++++++++++--
 app/webroot/js/misp.js                        |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/Controller/ObjectReferencesController.php b/app/Controller/ObjectReferencesController.php
index 223c94a32..4db3940ae 100644
--- a/app/Controller/ObjectReferencesController.php
+++ b/app/Controller/ObjectReferencesController.php
@@ -96,8 +96,16 @@ class ObjectReferencesController extends AppController
             if ($this->_isRest()) {
                 return $this->RestResponse->describe('ObjectReferences', 'add', false, $this->response->type());
             } else {
-                $event = $this->ObjectReference->Object->Event->find('first', array(
-                    'conditions' => array('Event.id' => $object['Event']['id']),
+                $events = $this->ObjectReference->Object->Event->find('all', array(
+                    'conditions' => array(
+                        'OR' => array(
+                            'Event.id' => $object['Event']['id'],
+                            'AND' => array(
+                                'Event.uuid' => $object['Event']['extends_uuid'],
+                                $this->ObjectReference->Object->Event->createEventConditions($this->Auth->user())
+                            )
+                        ),
+                    ),
                     'recursive' => -1,
                     'fields' => array('Event.id'),
                     'contain' => array(
@@ -115,6 +123,13 @@ class ObjectReferencesController extends AppController
                         )
                     )
                 ));
+                if (!empty($events)) {
+                    $event = $events[0];
+                }
+                for ($i=1; $i < count($events); $i++) { 
+                    $event['Attribute'] = array_merge($event['Attribute'], $events[$i]['Attribute']);
+                    $event['Object'] = array_merge($event['Object'], $events[$i]['Object']);
+                }
                 $toRearrange = array('Attribute', 'Object');
                 foreach ($toRearrange as $d) {
                     if (!empty($event[$d])) {
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index f9377f717..0e880f03b 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -4738,7 +4738,7 @@ function add_basic_auth() {
 
 function changeObjectReferenceSelectOption(selected, additionalData) {
     var uuid = selected;
-    var type = additionalData.type;
+    var type = additionalData.itemOptions[uuid].type;
     $('#ObjectReferenceReferencedUuid').val(uuid);
     if (type == "Attribute") {
         $('#targetData').html("");

From 0c1019bc5e8c019c2797fb60de418aef05d46b83 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 17 Feb 2021 15:15:08 +0100
Subject: [PATCH 164/437] fix: [dashboard] Saving an invalid JSON shows an
 error.

Fix #6975
---
 app/webroot/js/misp.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index f9377f717..e064c51cd 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -5327,7 +5327,12 @@ function queryDeprecatedEndpointUsage() {
 function submitDashboardForm(id) {
     var configData = $('#DashboardConfig').val();
     if (configData != '') {
-        configData = JSON.parse(configData);
+        try {
+            configData = JSON.parse(configData);
+        } catch (error) {
+            showMessage('fail', error.message)
+            return
+        }
     } else {
         configData = {};
     }

From b1501e6f4d8c23a85dcf10e1609af6a1c911acb2 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 17 Feb 2021 16:56:19 +0100
Subject: [PATCH 165/437] chg: [UI] Do not show description if is empty for
 galaxy cluster popover

---
 app/View/Elements/galaxyQuickViewMini.ctp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/View/Elements/galaxyQuickViewMini.ctp b/app/View/Elements/galaxyQuickViewMini.ctp
index 7df7338e7..76d064aac 100644
--- a/app/View/Elements/galaxyQuickViewMini.ctp
+++ b/app/View/Elements/galaxyQuickViewMini.ctp
@@ -9,7 +9,7 @@
     <?php
         foreach ($galaxy['GalaxyCluster'] as $cluster):
             $cluster_fields = array();
-            if (isset($cluster['description'])) {
+            if (!empty($cluster['description'])) {
                 $cluster_fields[] = array('key' => 'description', 'value' => $cluster['description']);
             }
             if (isset($cluster['meta']['synonyms'])) {
@@ -28,7 +28,7 @@
                     }
                 }
             }
-            $popover_data = sprintf('<h4 class="blue bold">%s</h4>', h($cluster['value']));
+            $popover_data = '<h4 class="blue bold">' . h($cluster['value']) . '</h4>';
             foreach ($cluster_fields as $cluster_field) {
                 $key = sprintf('<span class="blue bold">%s</span>', Inflector::humanize(h($cluster_field['key'])));
                 if (is_array($cluster_field['value'])) {

From 5ef077d0ff05a319c56b6bf892addd6533a79c29 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 17 Feb 2021 16:56:51 +0100
Subject: [PATCH 166/437] chg: [UI] Do not show refs for galaxy cluster
 popover, becasue links are not clickable

---
 app/View/Elements/galaxyQuickViewMini.ctp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/View/Elements/galaxyQuickViewMini.ctp b/app/View/Elements/galaxyQuickViewMini.ctp
index 76d064aac..bdff55da3 100644
--- a/app/View/Elements/galaxyQuickViewMini.ctp
+++ b/app/View/Elements/galaxyQuickViewMini.ctp
@@ -33,15 +33,7 @@
                 $key = sprintf('<span class="blue bold">%s</span>', Inflector::humanize(h($cluster_field['key'])));
                 if (is_array($cluster_field['value'])) {
                     if ($cluster_field['key'] === 'refs') {
-                        $value = array();
-                        foreach ($cluster_field['value'] as $k => $v) {
-                            $v_name = $v;
-                            if (strlen($v_name) > 30) {
-                                $v_name = substr($v, 0, 30) . '...';
-                            }
-                            $value[$k] = '<a href="' . h($v) . '" title="' . h($v) . '">' . h($v_name) . '</a>';
-                        }
-                        $value_contents = implode("<br>", $value);
+                        continue;
                     } else if ($cluster_field['key'] === 'country') {
                         $value = array();
                         foreach ($cluster_field['value'] as $k => $v) {

From ffc3b14f76719f3928ee203248fdadf877ae74d4 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 17 Feb 2021 16:58:16 +0100
Subject: [PATCH 167/437] chg: [UI] Do not create links for galaxy cluster
 source popover

Links are not clickable in popovers
---
 app/View/Elements/galaxyQuickViewMini.ctp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/View/Elements/galaxyQuickViewMini.ctp b/app/View/Elements/galaxyQuickViewMini.ctp
index bdff55da3..c35f85f21 100644
--- a/app/View/Elements/galaxyQuickViewMini.ctp
+++ b/app/View/Elements/galaxyQuickViewMini.ctp
@@ -44,11 +44,7 @@
                         $value_contents = nl2br(h(implode("\n", $cluster_field['value'])), false);
                     }
                 } else {
-                     if ($cluster_field['key'] === 'source' && filter_var($cluster_field['value'], FILTER_VALIDATE_URL)) {
-                         $value_contents = '<a href="' . h($cluster_field['value']) . '">' . h($cluster_field['value']) . '</a>';
-                     } else {
-                        $value_contents = h($cluster_field['value']);
-                     }
+                    $value_contents = h($cluster_field['value']);
                 }
                 $value = sprintf('<span class="black">%s</span>', $value_contents);
                 $popover_data .= "<span>$key: $value</span><br>";

From df66521e1918905bcfed2d2fe8ebb78cca71f48f Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 17 Feb 2021 18:51:52 +0100
Subject: [PATCH 168/437] chg: [galaxy] Make Galaxy cluster description
 optional

---
 app/Model/GalaxyCluster.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index b6ce931d2..89b6323b3 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -24,15 +24,10 @@ class GalaxyCluster extends AppModel
                 'rule' => array('stringNotEmpty')
             )
         ),
-        'description' => array(
-            'stringNotEmpty' => array(
-                'rule' => array('stringNotEmpty')
-            )
-        ),
         'uuid' => array(
             'uuid' => array(
-                'rule' => array('custom', '/^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/'),
-                'message' => 'Please provide a valid UUID'
+                'rule' => 'uuid',
+                'message' => 'Please provide a valid RFC 4122 UUID'
             ),
             'unique' => array(
                 'rule' => 'isUnique',

From ea50250f401e7496f8c7f6e49dff39dff8c3519d Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 18 Feb 2021 10:02:46 +0100
Subject: [PATCH 169/437] fix: [feed defaults] Removed some required properties
 in the validation schema

- Propoerties like IDs are instance dependant and therefore are not
necessary
---
 app/files/feed-metadata/schema.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/files/feed-metadata/schema.json b/app/files/feed-metadata/schema.json
index 19a225b38..ce859a77f 100644
--- a/app/files/feed-metadata/schema.json
+++ b/app/files/feed-metadata/schema.json
@@ -87,20 +87,16 @@
         }
       },
       "required": [
-        "id",
         "name",
         "provider",
         "url",
         "rules",
         "enabled",
         "distribution",
-        "sharing_group_id",
-        "tag_id",
         "default",
         "source_format",
         "fixed_event",
         "delta_merge",
-        "event_id",
         "publish",
         "override_ids",
         "settings",
@@ -133,11 +129,9 @@
         }
       },
       "required": [
-        "id",
         "name",
         "colour",
         "exportable",
-        "org_id",
         "hide_tag"
       ]
     }

From 23461541ff22b9eeff531203561c3ce7d62f193e Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 18 Feb 2021 10:32:40 +0100
Subject: [PATCH 170/437] fix: [tools] misp-wipe updated list of table to
 truncate

---
 tools/misp-wipe/misp-wipe.sql | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/tools/misp-wipe/misp-wipe.sql b/tools/misp-wipe/misp-wipe.sql
index f7eccb053..4644dba68 100644
--- a/tools/misp-wipe/misp-wipe.sql
+++ b/tools/misp-wipe/misp-wipe.sql
@@ -1,14 +1,23 @@
 -- Clear tables that should be empty
+TRUNCATE `attachment_scans`;
 TRUNCATE `attributes`;
 TRUNCATE `attribute_tags`;
 TRUNCATE `cake_sessions`;
+TRUNCATE `cerebrates`;
+TRUNCATE `correlation_exclusions`;
 TRUNCATE `correlations`;
+TRUNCATE `dashboards`;
+TRUNCATE `decaying_model_mappings`;
+TRUNCATE `decaying_models`;
 TRUNCATE `events`;
-TRUNCATE `event_blacklists`;
+TRUNCATE `event_blocklists`;
 TRUNCATE `event_delegations`;
 TRUNCATE `event_graph`;
+TRUNCATE `event_locks`;
+TRUNCATE `event_reports`;
 TRUNCATE `event_tags`;
 TRUNCATE `favourite_tags`;
+TRUNCATE `inbox`;
 TRUNCATE `jobs`;
 TRUNCATE `logs`;
 TRUNCATE `notification_logs`;
@@ -17,7 +26,7 @@ TRUNCATE `object_references`;
 TRUNCATE `object_relationships`;
 TRUNCATE `object_templates`;
 TRUNCATE `object_template_elements`;
-TRUNCATE `org_blacklists`;
+TRUNCATE `org_blocklists`;
 TRUNCATE `posts`;
 TRUNCATE `rest_client_histories`;
 TRUNCATE `servers`;
@@ -26,6 +35,8 @@ TRUNCATE `shadow_attribute_correlations`;
 TRUNCATE `sharing_groups`;
 TRUNCATE `sharing_group_orgs`;
 TRUNCATE `sharing_group_servers`;
+TRUNCATE `sightingdb_orgs`;
+TRUNCATE `sightingdbs`;
 TRUNCATE `sightings`;
 TRUNCATE `tag_collections`;
 TRUNCATE `tag_collection_tags`;
@@ -34,7 +45,7 @@ TRUNCATE `threads`;
 TRUNCATE `bruteforces`;
 TRUNCATE `news`;
 TRUNCATE `template_tags`;
-TRUNCATE `whitelist`;
+TRUNCATE `allowedlist`;
 TRUNCATE `event_locks`;
 TRUNCATE `fuzzy_correlate_ssdeep`;
 TRUNCATE `tasks`;
@@ -48,9 +59,11 @@ TRUNCATE `warninglists`;
 TRUNCATE `warninglist_entries`;
 TRUNCATE `warninglist_types`;
 TRUNCATE `galaxies`;
+TRUNCATE `galaxy_cluster_blocklists`;
+TRUNCATE `galaxy_cluster_relation_tags`;
+TRUNCATE `galaxy_cluster_relations`;
 TRUNCATE `galaxy_clusters`;
 TRUNCATE `galaxy_elements`;
-TRUNCATE `galaxy_reference`;
 TRUNCATE `noticelists`;
 TRUNCATE `noticelist_entries`;
 TRUNCATE `decaying_models`;

From ec8012c83f48a48435af54ab7d15bcac2e4c9800 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 18 Feb 2021 14:11:34 +0100
Subject: [PATCH 171/437] fix: [galaxy] Fix undefined variable when capturing
 clusters

---
 app/Model/GalaxyCluster.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index b6ce931d2..804f57b3d 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -792,7 +792,8 @@ class GalaxyCluster extends AppModel
                 }
             }
             if ($savedCluster['GalaxyCluster']['published']) {
-                $this->publishRouter($user, $savedCluster['GalaxyCluster']['id'], $passAlong=$server['Server']['id']);
+                $passAlong = isset($server['Server']['id']) ? $server['Server']['id'] : null;
+                $this->publishRouter($user, $savedCluster['GalaxyCluster']['id'], $passAlong);
             }
         } else {
             $results['failed']++;

From 6a91bb832b5342e16e45792f16616a6457fa01b8 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 18 Feb 2021 11:50:55 +0100
Subject: [PATCH 172/437] new: [UI] Show tag info in taxonomy view

---
 app/Controller/TaxonomiesController.php | 15 ++++++++-------
 app/View/Taxonomies/view.ctp            | 12 ++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/Controller/TaxonomiesController.php b/app/Controller/TaxonomiesController.php
index 6b9be18d8..95f611b09 100644
--- a/app/Controller/TaxonomiesController.php
+++ b/app/Controller/TaxonomiesController.php
@@ -101,14 +101,15 @@ class TaxonomiesController extends AppController
         $params = $customPagination->applyRulesOnArray($taxonomy['entries'], $params, 'taxonomies');
         if ($this->_isRest()) {
             return $this->RestResponse->viewData($taxonomy, $this->response->type());
-        } else {
-            $this->set('entries', $taxonomy['entries']);
-            $this->set('urlparams', $urlparams);
-            $this->set('passedArgs', json_encode($passedArgs));
-            $this->set('passedArgsArray', $passedArgs);
-            $this->set('taxonomy', $taxonomy['Taxonomy']);
-            $this->set('id', $id);
         }
+
+        $this->set('entries', $taxonomy['entries']);
+        $this->set('urlparams', $urlparams);
+        $this->set('passedArgs', json_encode($passedArgs));
+        $this->set('passedArgsArray', $passedArgs);
+        $this->set('taxonomy', $taxonomy['Taxonomy']);
+        $this->set('id', $id);
+        $this->set('title_for_layout', __('%s Taxonomy Library', h(strtoupper($taxonomy['Taxonomy']['namespace']))));
     }
 
     public function enable($id)
diff --git a/app/View/Taxonomies/view.ctp b/app/View/Taxonomies/view.ctp
index d89bf545f..ca4f51337 100644
--- a/app/View/Taxonomies/view.ctp
+++ b/app/View/Taxonomies/view.ctp
@@ -1,5 +1,5 @@
 <div class="taxonomy view">
-    <h2><?php echo h(strtoupper($taxonomy['namespace'])) . ' ' . __('Taxonomy Library');?></h2>
+    <h2><?= __('%s Taxonomy Library', h(strtoupper($taxonomy['namespace'])));?></h2>
     <div class="row-fluid"><div class="span8" style="margin:0">
 <?php
 $enabled = $taxonomy['enabled'] ? '<span class="green">'. __('Yes') . '</span>&nbsp;&nbsp;' : '<span class="red">' . __('No') . '</span>&nbsp;&nbsp;';
@@ -76,12 +76,12 @@ echo $this->element('genericElements/viewMetaTable', ['table_data' => $tableData
                 </td>
             <?php endif; ?>
                 <td id="tag_<?php echo h($k); ?>" class="short"><?php echo h($item['tag']); ?></td>
-                <td><?php echo h($item['expanded']); ?>&nbsp;</td>
+                <td><?php echo h($item['expanded']); ?></td>
                 <td class="short">
                     <?php echo isset($item['numerical_value']) ? h($item['numerical_value']) : ''; ?>&nbsp;
                     <?php if(isset($item['original_numerical_value'])): ?>
                         <i
-                            class="<?= $this->FontAwesome->getClass('exclamation-triangle') ?> fa-exclamation-triangle"
+                            class="<?= $this->FontAwesome->getClass('exclamation-triangle') ?>"
                             title="<?= __('Numerical value overridden by userSetting.&#10;Original numerical_value = %s', h($item['original_numerical_value'])) ?>"
                             data-value-overriden="1"
                         ></i>
@@ -91,7 +91,7 @@ echo $this->element('genericElements/viewMetaTable', ['table_data' => $tableData
                 <?php
                     if ($item['existing_tag']) {
                 ?>
-                    <a href='<?php echo $baseurl."/events/index/searchtag:". h($item['existing_tag']['Tag']['id']);?>'><?php echo h($item['events']);?></a>
+                    <a href="<?= $baseurl."/events/index/searchtag:". h($item['existing_tag']['Tag']['id']);?>"><?php echo h($item['events']);?></a>
                 <?php
                     } else {
                         echo __('N/A');
@@ -102,7 +102,7 @@ echo $this->element('genericElements/viewMetaTable', ['table_data' => $tableData
                 <?php
                     if ($item['existing_tag']):
                 ?>
-                        <a href='<?php echo $baseurl."/attributes/search/tags:". h($item['existing_tag']['Tag']['id']);?>'><?php echo h($item['attributes']);?></a>
+                        <a href="<?= $baseurl."/attributes/search/tags:". h($item['existing_tag']['Tag']['id']);?>"><?php echo h($item['attributes']);?></a>
                 <?php
                     else:
                         echo __('N/A');
@@ -120,7 +120,7 @@ echo $this->element('genericElements/viewMetaTable', ['table_data' => $tableData
                             $url = $baseurl . '/events/index/searchtag:' .  h($item['existing_tag']['Tag']['id']);
                             if ($isAclTagger) $url = $baseurl . '/tags/edit/' .  h($item['existing_tag']['Tag']['id']);
                 ?>
-                        <a href="<?php echo $url;?>" class="<?php echo $isAclTagger ? 'tagFirstHalf' : 'tag' ?>" style="background-color:<?php echo h($item['existing_tag']['Tag']['colour']);?>;color:<?php echo $this->TextColour->getTextColour($item['existing_tag']['Tag']['colour']);?>"><?php echo h($item['existing_tag']['Tag']['name']); ?></a>
+                        <a href="<?php echo $url;?>" data-tag-id="<?= h($item['existing_tag']['Tag']['id']) ?>" class="<?php echo $isAclTagger ? 'tag tagFirstHalf' : 'tag' ?>" style="background-color:<?php echo h($item['existing_tag']['Tag']['colour']);?>;color:<?php echo $this->TextColour->getTextColour($item['existing_tag']['Tag']['colour']);?>"><?php echo h($item['existing_tag']['Tag']['name']); ?></a>
                 <?php
                         endif;
                         echo '&nbsp;' . $this->Html->link('', array('controller' => 'tags', 'action' => 'viewGraph', $item['existing_tag']['Tag']['id']), array('class' => 'fa fa-share-alt black', 'title' => __('View correlation graph'), 'aria-label' => __('View correlation graph')));

From a225ac4483687251b4ae0b5853d6ffa34814a66d Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 18 Feb 2021 15:02:22 +0100
Subject: [PATCH 173/437] fix: [Event] Correctly save references after sync

---
 app/Model/Event.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 56ea9a4e3..e728ae28e 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -4104,6 +4104,7 @@ class Event extends AppModel
                     if (isset($object['ObjectReference'])) {
                         foreach ($object['ObjectReference'] as $objectRef) {
                             $nothingToChange = false;
+                            $objectRef['source_uuid'] = $object['uuid'];
                             $result = $this->Object->ObjectReference->captureReference($objectRef, $this->id, $user, $this->Log, $force, $nothingToChange);
                             if ($result && !$nothingToChange) {
                                 $changed = true;

From 3b61527ec5928eef7e48086b6b81207c484a1cf8 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 18 Feb 2021 15:18:40 +0100
Subject: [PATCH 174/437] fix: [objectReference] Make sure to save source_uuid
 field as well

---
 app/Controller/ObjectReferencesController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Controller/ObjectReferencesController.php b/app/Controller/ObjectReferencesController.php
index bf51fd090..c7970018b 100644
--- a/app/Controller/ObjectReferencesController.php
+++ b/app/Controller/ObjectReferencesController.php
@@ -66,6 +66,7 @@ class ObjectReferencesController extends AppController
                 'comment' => !empty($this->request->data['ObjectReference']['comment']) ? $this->request->data['ObjectReference']['comment'] : '',
                 'event_id' => $object['Event']['id'],
                 'object_uuid' => $object['Object']['uuid'],
+                'source_uuid' => $object['Object']['uuid'],
                 'object_id' => $objectId,
                 'referenced_type' => $referenced_type,
                 'uuid' => CakeText::uuid()

From 4913171ff51b5689b0925520213a0b5f8467baa7 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 18 Feb 2021 15:20:15 +0100
Subject: [PATCH 175/437] fix: [objectReference] Make sure to bump timestamp

---
 app/Model/ObjectReference.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/ObjectReference.php b/app/Model/ObjectReference.php
index f3740b343..1e9f7741c 100644
--- a/app/Model/ObjectReference.php
+++ b/app/Model/ObjectReference.php
@@ -45,7 +45,7 @@ class ObjectReference extends AppModel
         if (empty($this->data['ObjectReference']['uuid'])) {
             $this->data['ObjectReference']['uuid'] = CakeText::uuid();
         }
-        if (empty($this->data['ObjectReference']['uuid'])) {
+        if (empty($this->data['ObjectReference']['timestamp'])) {
             $date = new DateTime();
             $this->data['ObjectReference']['timestamp'] = $date->getTimestamp();
         }

From 309db2a37a957795ef0b416b032ad8acbc7a3898 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 18 Feb 2021 15:42:00 +0100
Subject: [PATCH 176/437] chg: [objectReference] Added objectReference/view
 endpoint

---
 app/Controller/ObjectReferencesController.php | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/Controller/ObjectReferencesController.php b/app/Controller/ObjectReferencesController.php
index c7970018b..b5e709949 100644
--- a/app/Controller/ObjectReferencesController.php
+++ b/app/Controller/ObjectReferencesController.php
@@ -201,5 +201,30 @@ class ObjectReferencesController extends AppController
 
     public function view($id)
     {
+        if (Validation::uuid($id)) {
+            $temp = $this->ObjectReference->find('first', array(
+                'recursive' => -1,
+                'fields' => array('ObjectReference.id'),
+                'conditions' => array('ObjectReference.uuid' => $id)
+            ));
+            if (empty($temp)) {
+                throw new NotFoundException('Invalid object reference');
+            }
+            $id = $temp['ObjectReference']['id'];
+        } elseif (!is_numeric($id)) {
+            throw new NotFoundException(__('Invalid object reference'));
+        }
+        $objectReference = $this->ObjectReference->find('first', array(
+            'conditions' => array('ObjectReference.id' => $id),
+            'recursive' => -1,
+        ));
+        if (empty($objectReference)) {
+            throw new NotFoundException(__('Invalid object reference.'));
+        }
+        $event = $this->ObjectReference->Object->Event->fetchSimpleEvent($this->Auth->user(), $objectReference['ObjectReference']['event_id'], ['contain' => ['Orgc']]);
+        if (!$event) {
+            throw new NotFoundException(__('Invalid event'));
+        }
+        return $this->RestResponse->viewData($objectReference, 'application/json');
     }
 }

From 557a5468151cf6cdc90241cb225b03fb3640df83 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Thu, 18 Feb 2021 17:08:21 +0100
Subject: [PATCH 177/437] Adds 'List Auth Keys' button to Administration in
 global menu

---
 app/View/Elements/global_menu.ctp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp
index b843398f8..0e76159dd 100755
--- a/app/View/Elements/global_menu.ctp
+++ b/app/View/Elements/global_menu.ctp
@@ -335,6 +335,10 @@
                         'text' => __('List Users'),
                         'url' => $baseurl . '/admin/users/index'
                     ),
+                    array(
+                        'text' => __('List Auth Keys'),
+                        'url' => $baseurl . '/auth_keys/index'
+                    ),
                     array(
                         'text' => __('List User Settings'),
                         'url' => $baseurl . '/user_settings/index/user_id:all'

From 8342f4e8b4fb1062495e9d0ba2984f46ef8163db Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 11 Dec 2020 08:54:40 +0100
Subject: [PATCH 178/437] new: [security] Security audit

---
 app/Controller/ServersController.php          |  40 +-
 app/Lib/Tools/SecurityAudit.php               | 505 ++++++++++++++++++
 app/Lib/Tools/SyncTool.php                    |  35 +-
 .../Elements/healthElements/diagnostics.ctp   |  32 ++
 4 files changed, 591 insertions(+), 21 deletions(-)
 create mode 100644 app/Lib/Tools/SecurityAudit.php

diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 8609a3b00..15fc82b03 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -2,6 +2,7 @@
 App::uses('AppController', 'Controller');
 App::uses('Xml', 'Utility');
 App::uses('AttachmentTool', 'Tools');
+App::uses('SecurityAudit', 'Tools');
 
 /**
  * @property Server $Server
@@ -1116,10 +1117,13 @@ class ServersController extends AppController
                     $attachmentScan = ['status' => false, 'error' => $e->getMessage()];
                 }
 
-                $view = compact('gpgStatus', 'sessionErrors', 'proxyStatus', 'sessionStatus', 'zmqStatus', 'stixVersion', 'cyboxVersion', 'mixboxVersion', 'maecVersion', 'stix2Version', 'pymispVersion', 'moduleStatus', 'yaraStatus', 'gpgErrors', 'proxyErrors', 'zmqErrors', 'stixOperational', 'stix', 'moduleErrors', 'moduleTypes', 'dbDiagnostics', 'dbSchemaDiagnostics', 'redisInfo', 'attachmentScan');
+                $securityAudit = (new SecurityAudit())->run($this->Server);
+
+                $view = compact('gpgStatus', 'sessionErrors', 'proxyStatus', 'sessionStatus', 'zmqStatus', 'stixVersion', 'cyboxVersion', 'mixboxVersion', 'maecVersion', 'stix2Version', 'pymispVersion', 'moduleStatus', 'yaraStatus', 'gpgErrors', 'proxyErrors', 'zmqErrors', 'stixOperational', 'stix', 'moduleErrors', 'moduleTypes', 'dbDiagnostics', 'dbSchemaDiagnostics', 'redisInfo', 'attachmentScan', 'securityAudit');
             } else {
                 $view = [];
             }
+
             // check whether the files are writeable
             $writeableDirs = $this->Server->writeableDirsDiagnostics($diagnostic_errors);
             $writeableFiles = $this->Server->writeableFilesDiagnostics($diagnostic_errors);
@@ -1139,27 +1143,27 @@ class ServersController extends AppController
                 $worker_array = $this->Server->workerDiagnostics($workerIssueCount);
             }
             $this->set('worker_array', $worker_array);
-            if ($tab == 'download' || $this->_isRest()) {
+            if ($tab === 'download' || $this->_isRest()) {
                 foreach ($dumpResults as $key => $dr) {
                     unset($dumpResults[$key]['description']);
                 }
                 $dump = array(
-                        'version' => $version,
-                        'phpSettings' => $phpSettings,
-                        'gpgStatus' => $gpgErrors[$gpgStatus['status']],
-                        'proxyStatus' => $proxyErrors[$proxyStatus],
-                        'zmqStatus' => $zmqStatus,
-                        'stix' => $stix,
-                        'moduleStatus' => $moduleStatus,
-                        'writeableDirs' => $writeableDirs,
-                        'writeableFiles' => $writeableFiles,
-                        'readableFiles' => $readableFiles,
-                        'dbDiagnostics' => $dbDiagnostics,
-                        'dbSchemaDiagnostics' => $dbSchemaDiagnostics,
-                        'redisInfo' => $redisInfo,
-                        'finalSettings' => $dumpResults,
-                        'extensions' => $extensions,
-                        'workers' => $worker_array
+                    'version' => $version,
+                    'phpSettings' => $phpSettings,
+                    'gpgStatus' => $gpgErrors[$gpgStatus['status']],
+                    'proxyStatus' => $proxyErrors[$proxyStatus],
+                    'zmqStatus' => $zmqStatus,
+                    'stix' => $stix,
+                    'moduleStatus' => $moduleStatus,
+                    'writeableDirs' => $writeableDirs,
+                    'writeableFiles' => $writeableFiles,
+                    'readableFiles' => $readableFiles,
+                    'dbDiagnostics' => $dbDiagnostics,
+                    'dbSchemaDiagnostics' => $dbSchemaDiagnostics,
+                    'redisInfo' => $redisInfo,
+                    'finalSettings' => $dumpResults,
+                    'extensions' => $extensions,
+                    'workers' => $worker_array
                 );
                 foreach ($dump['finalSettings'] as $k => $v) {
                     if (!empty($v['redacted'])) {
diff --git a/app/Lib/Tools/SecurityAudit.php b/app/Lib/Tools/SecurityAudit.php
new file mode 100644
index 000000000..f97aaeed7
--- /dev/null
+++ b/app/Lib/Tools/SecurityAudit.php
@@ -0,0 +1,505 @@
+<?php
+App::uses('SyncTool', 'Tools');
+
+class SecurityAudit
+{
+    const STRONG_PASSWORD_LENGTH = 17;
+
+    /**
+     * @param Server $server
+     * @return array
+     */
+    public function run(Server $server)
+    {
+        $output = [];
+
+        foreach (['config.php', 'database.php', 'email.php'] as $configFile) {
+            $perms = fileperms(CONFIG . $configFile);
+            if ($perms & 0x0004) {
+                $output['File permissions'][] = ['error', __('%s config file is readable for any user.', $configFile)];
+            }
+        }
+
+        $redisPassword = Configure::read('MISP.redis_password');
+        if (empty($redisPassword)) {
+            $output['Redis'][] = ['error', __('Redis password not set.')];
+        } else if (strlen($redisPassword) < 32) { // for Redis, password should be stronger
+            $output['Redis'][] = [
+                'warning',
+                __('Redis password is too short, should be at least 32 chars long.'),
+                'https://redis.io/topics/security#authentication-feature',
+            ];
+        }
+
+        $databasePassword = ConnectionManager::getDataSource('default')->config['password'];
+        if (empty($databasePassword)) {
+            $output['Database'][] = ['error', __('Database password not set.')];
+        } else if (strlen($databasePassword) < self::STRONG_PASSWORD_LENGTH) {
+            $output['Database'][] = ['warning', __('Database password is too short, should be at least %s chars long.', self::STRONG_PASSWORD_LENGTH)];
+        }
+
+        $passwordPolicyLength = Configure::read('Security.password_policy_length') ?: $server->serverSettings['Security']['password_policy_length']['value'];
+        if ($passwordPolicyLength < 8) {
+            $output['Password'][] = ['error', __('Minimum password length is set to %s, that too short.', $passwordPolicyLength)];
+        } elseif ($passwordPolicyLength < 12) {
+            $output['Password'][] = ['warning', __('Minimum password length is set to %s, consider raising to at least 12 characters.', $passwordPolicyLength)];
+        }
+
+        if (empty(Configure::read('Security.require_password_confirmation'))) {
+            $output['Password'][] = [
+                'warning',
+                __('Password confirmation is not enabled. %s', $server->serverSettings['Security']['require_password_confirmation']['description']),
+            ];
+        }
+        if (!empty(Configure::read('Security.auth')) && !Configure::read('Security.auth_enforced')) {
+            $output['Login'][] = [
+                'hint',
+                __('External authentication is enabled, but local accounts will still work. You can disable logging with local accounts by setting `Security.auth_enforced` to `true`.'),
+            ];
+        }
+
+        if (empty(Configure::read('Security.disable_browser_cache'))) {
+            $output['Browser'][] = [
+                'warning',
+                __('Browser cache is enabled. Attacker can obtain sensitive data from user cache. You can disable cache by setting `Security.disable_browser_cache` to `false`.'),
+            ];
+        }
+        if (empty(Configure::read('Security.check_sec_fetch_site_header'))) {
+            $output['Browser'][] = [
+                'warning',
+                __('MISP server is not checking `Sec-Fetch` HTTP headers. This is protection against CSRF for moder browsers. You can enable this checks by setting `Security.check_sec_fetch_site_header` to `true`.'),
+            ];
+        }
+        if (Configure::read('Security.disable_form_security')) {
+            $output['Browser'][] = ['error', __('Disabling form security is never a good idea.')];
+        }
+
+        if (empty(Configure::read('Security.advanced_authkeys'))) {
+            $output['Auth Key'][] = ['warning', __('Consider enabling Advanced Auth Keys, that provides higher security.')];
+        }
+        if (Configure::read('Security.allow_unsafe_apikey_named_param')) {
+            $output['Auth Key'][] = ['error', __('It is possible to pass API key in URL, so the key can be logged by proxies.')];
+        }
+        if (empty(Configure::read('Security.do_not_log_authkeys'))) {
+            $output['Auth Key'][] = ['warning', __('Auth Key logging is not disabled. Auth Keys in cleartext can be visible in Audit log.')];
+        }
+
+        $salt = Configure::read('Security.salt');
+        if (empty($salt)) {
+            $output['Security salt'][] = ['error', __('Salt is not set.')];
+        } else if (strlen($salt) < 32) {
+            $output['Security salt'][] = ['warning', __('Salt is too short, should contains at least 32 characters.')];
+        } else if ($salt === "Rooraenietu8Eeyo<Qu2eeNfterd-dd+") {
+            $output['Security salt'][] = ['error', __('Salt is set to default value.')];
+        }
+
+        if (empty(Configure::read('MISP.log_client_ip'))) {
+            $output['Logging'][] = ['warning', __('Logging client IP in audit log is disabled. Logging IP address can help to solve potential security breaches.')];
+        }
+        if (empty(Configure::read('MISP.log_user_ips'))) {
+            $output['Logging'][] = ['warning', __('Logging client IP in Redis is disabled. Logging IP address can help to solve potential security breaches.')];
+        }
+        if (Configure::read('MISP.log_user_ips') && Configure::read('Security.advanced_authkeys') && empty(Configure::read('MISP.log_user_ips_authkeys'))) {
+            $output['Logging'][] = [
+                'hint',
+                __('You can enable advanced logging of authkey usage by setting `MISP.log_user_ips_authkeys` to `true`.'),
+            ];
+        }
+        if (empty(Configure::read('Security.username_in_response_header'))) {
+            $output['Logging'][] = [
+                'hint',
+                __('Passing user information to response headers is disabled. This can be useful for logging user info at reverse proxy level. You can enable that by setting `Security.username_in_response_header` to `true`.'),
+            ];
+        }
+
+        if (empty(Configure::read('MISP.attachment_scan_module'))) {
+            $output['Attachment scanning'][] = ['hint', __('Module for scanning attachment for viruses is not defined.')];
+        }
+
+        if (Configure::read('debug')) {
+            $output['Debug'][] = ['error', __('Debug mode is enabled for all users.')];
+        }
+
+        if (Configure::read('Proxy.host')) {
+            $proxyPassword = Configure::read('Proxy.password');
+            if (empty($proxyPassword)) {
+                $output['Proxy'][] = ['error', __('Proxy password is empty.')];
+            } else if (strlen($proxyPassword) < self::STRONG_PASSWORD_LENGTH) {
+                $output['Proxy'][] = ['warning', __('Proxy password is too short, should be at least %s chars long.', self::STRONG_PASSWORD_LENGTH)];
+            }
+        }
+
+        if (Configure::read('Security.rest_client_enable_arbitrary_urls')) {
+            $output['REST client'][] = [
+                'hint',
+                __('Users can use REST client to query any remote URL. This is generally not a good idea if your instance is public.')
+            ];
+        }
+
+        if (Configure::read('Plugins.ZeroMQ_enable')) {
+            $zeroMqPassword = Configure::read('Plugins.ZeroMQ_password');
+            if (empty($zeroMqPassword)) {
+                $output['ZeroMQ'][] = ['error', __('ZeroMQ password is not set.')];
+            } else if (strlen($zeroMqPassword) < self::STRONG_PASSWORD_LENGTH) {
+                $output['ZeroMQ'][] = ['warning', __('ZeroMQ password is too short, should be at least %s chars long.', self::STRONG_PASSWORD_LENGTH)];
+            }
+
+            $redisPassword = Configure::read('Plugins.ZeroMQ_redis_password');
+            if (empty($redisPassword)) {
+                $output['ZeroMQ'][] = ['error', __('Redis password is not set.')];
+            } else if (strlen($redisPassword) < 32) { // for Redis, password should be stronger
+                $output['ZeroMQ'][] = [
+                    'warning',
+                    __('Redis password is too short, should be at least 32 chars long.'),
+                    'https://redis.io/topics/security#authentication-feature',
+                ];
+            }
+        }
+
+        $this->email($output);
+
+        if (!Configure::read('Security.hide_organisation_index_from_users')) {
+            $output['MISP'][] = [
+                'hint',
+                __('Any user can see list of all organisations. You can disable that by setting `Security.hide_organisation_index_from_users` to `true`. %s', $server->serverSettings['Security']['hide_organisation_index_from_users']['description']),
+            ];
+        }
+        if (!Configure::read('Security.hide_organisations_in_sharing_groups')) {
+            $output['MISP'][] = [
+                'hint',
+                __('Any user can see list of all organisations in sharing group that user can see. You can disable that by setting `Security.hide_organisations_in_sharing_groups` to `true`. %s', $server->serverSettings['Security']['hide_organisations_in_sharing_groups']['description']),
+            ];
+        }
+
+        $this->feeds($output);
+        $this->remoteServers($output);
+
+        try {
+            $cakeVersion = $this->getCakeVersion();
+            if (version_compare($cakeVersion, '2.10.21', '<')) {
+                $output['Dependencies'][] = ['warning', __('CakePHP version %s is outdated.', $cakeVersion)];
+            }
+        } catch (RuntimeException $e) {}
+
+        if (version_compare(PHP_VERSION, '7.3.0', '<')) {
+            $output['PHP'][] = [
+                'warning',
+                __('PHP version %s is not supported anymore. It can be still supported by your distribution. ', PHP_VERSION),
+                'https://www.php.net/supported-versions.php'
+            ];
+        } else if (version_compare(PHP_VERSION, '7.4.0', '<')) {
+            $output['PHP'][] = [
+                'hint',
+                __('PHP version 7.3 will be not supported after 6 Dec 2021. Event after that date can be still supported by your distribution.'),
+                'https://www.php.net/supported-versions.php'
+            ];
+        }
+        if (ini_get('session.use_strict_mode') != 1) {
+            $output['PHP'][] = [
+                'warning',
+                __('Session strict mode is disable.'),
+                'https://www.php.net/manual/en/session.configuration.php#ini.session.use-strict-mode',
+            ];
+        }
+        if (empty(ini_get('session.cookie_httponly'))) {
+            $output['PHP'][] = ['error', __('Session cookie is not set as HTTP only. Session cookie can be access from JavaScript.')];
+        }
+        if (!in_array(strtolower(ini_get('session.cookie_samesite')), ['strict', 'lax'])) {
+            $output['PHP'][] = [
+                'error',
+                __('Session cookie SameSite parameter is not defined or set to None.'),
+                'https://developer.mozilla.org/en-us/docs/Web/HTTP/Headers/Set-Cookie/SameSite',
+            ];
+        }
+        $sidLength = ini_get('session.sid_length');
+        if ($sidLength !== false && $sidLength < 32) {
+            $output['PHP'][] = [
+                'warning',
+                __('Session ID length is set to %s, at least 32 is recommended.', $sidLength),
+                'https://www.php.net/manual/en/session.configuration.php#ini.session.sid-length',
+            ];
+        }
+        $sidBits = ini_get('session.sid_bits_per_character');
+        if ($sidBits !== false && $sidBits <= 4) {
+            $output['PHP'][] = [
+                'warning',
+                __('Session ID bit per character is set to %s, at least 5 is recommended.', $sidBits),
+                'https://www.php.net/manual/en/session.configuration.php#ini.session.sid-bits-per-character',
+            ];
+        }
+
+        $this->system($server, $output);
+
+        return $output;
+    }
+
+    private function feeds(array &$output)
+    {
+        /** @var Feed $feed */
+        $feed = ClassRegistry::init('Feed');
+        $enabledFeeds = $feed->find('list', [
+            'conditions' => [
+                'input_source' => 'network',
+                'OR' => [
+                    'enabled' => true,
+                    'caching_enabled' => true,
+                ]
+            ],
+            'fields' => ['name', 'url'],
+        ]);
+        foreach ($enabledFeeds as $feedName => $feedUrl) {
+            if (substr($feedUrl, 0, strlen('http://')) === 'http://') {
+                $output['Feeds'][] = ['warning', __('Feed %s uses insecure (HTTP) connection.', $feedName)];
+            }
+        }
+    }
+
+    private function remoteServers(array &$output)
+    {
+        /** @var Server $server */
+        $server = ClassRegistry::init('Server');
+        $enabledServers = $server->find('all', [
+            'conditions' => ['OR' => [
+                'push' => true,
+                'pull' => true,
+                'push_sightings' => true,
+                'caching_enabled' => true,
+            ]],
+            'fields' => ['id', 'name', 'url', 'self_signed', 'cert_file', 'client_cert_file'],
+        ]);
+        foreach ($enabledServers as $enabledServer) {
+            if (substr($enabledServer['Server']['url'], 0, strlen('http://')) === 'http://') {
+                $output['Remote servers'][] = ['warning', __('Server %s uses insecure (HTTP) connection.', $enabledServer['Server']['name'])];
+            } else if ($enabledServer['Server']['self_signed']) {
+                $output['Remote servers'][] = ['warning', __('Server %s uses self signed certificate. This is considered insecure.', $enabledServer['Server']['name'])];
+            }
+
+            try {
+                $parsed = SyncTool::getServerClientCertificateInfo($enabledServer);
+                if (isset($parsed['public_key_size_ok']) && !$parsed['public_key_size_ok']) {
+                    $algo = $parsed['public_key_type'] . " " . $parsed['public_key_size'];
+                    $output['Remote servers'][] = ['warning', __('Server %s uses weak client certificate (%s).', $enabledServer['Server']['name'], $algo)];
+                }
+            } catch (Exception $e) {}
+
+            try {
+                $parsed = SyncTool::getServerCaCertificateInfo($enabledServer);
+                if (isset($parsed['public_key_size_ok']) && !$parsed['public_key_size_ok']) {
+                    $algo = $parsed['public_key_type'] . " " . $parsed['public_key_size'];
+                    $output['Remote servers'][] = ['warning', __('Server %s uses weak CA certificate (%s).', $enabledServer['Server']['name'], $algo)];
+                }
+            } catch (Exception $e) {}
+        }
+    }
+
+    private function email(array &$output)
+    {
+        $canSignPgp = Configure::read('GnuPG.sign');
+        $canSignSmime = Configure::read('SMIME.enabled') &&
+            !empty(Configure::read('SMIME.cert_public_sign')) &&
+            !empty(Configure::read('SMIME.key_sign'));
+
+        if (!$canSignPgp && !$canSignSmime) {
+            $output['Email'][] = [
+                'warning',
+                __('Email signing (PGP or S/MIME) is not enabled.')
+            ];
+        }
+
+        if ($canSignPgp) {
+            $gpgKeyPassword = Configure::read('GnuPG.password');
+            if (empty($gpgKeyPassword)) {
+                $output['Email'][] = ['error', __('PGP private key password is empty.')];
+            } else if (strlen($gpgKeyPassword) < self::STRONG_PASSWORD_LENGTH) {
+                $output['Email'][] = ['warning', __('PGP private key password is too short, should be at least %s chars long.', self::STRONG_PASSWORD_LENGTH)];
+            }
+        }
+
+        if (!Configure::read('GnuPG.bodyonlyencrypted')) {
+            $output['Email'][] = [
+                'hint',
+                __('Full email body with all event information will be send even without encryption.')
+            ];
+        }
+
+        if ($canSignPgp && !Configure::read('GnuPG.obscure_subject')) {
+            $output['Email'][] = [
+                'hint',
+                __('Even for encrypted emails, email subject will be send unencrypted. You can change that behaviour by setting `GnuPG.obscure_subject` to `true`.'),
+            ];
+        }
+
+        App::uses('CakeEmail', 'Network/Email');
+        $email = new CakeEmail();
+        $emailConfig = $email->config();
+        if ($emailConfig['transport'] === 'Smtp' && $emailConfig['port'] == 25 && !$emailConfig['tls']) {
+            $output['Email'][] = [
+                'warning',
+                __('STARTTLS is not enabled.'),
+                'https://en.wikipedia.org/wiki/Opportunistic_TLS',
+            ];
+        }
+    }
+
+    private function system(Server $server, array &$output)
+    {
+        $kernelBuildTime = $this->getKernelBuild();
+        if ($kernelBuildTime) {
+            $diff = (new DateTime())->diff($kernelBuildTime);
+            $diffDays = $diff->format('a');
+            if ($diffDays > 300) {
+                $output['System'][] = [
+                    'warning',
+                    __('Kernel build time is since %s days ago. This usually means that the system kernel is not updated.', $diffDays),
+                ];
+            }
+        }
+
+        // uptime
+        try {
+            $since = $this->execute(['uptime', '-s']);
+            $since = new DateTime($since);
+            $diff = (new DateTime())->diff($since);
+            $diffDays = $diff->format('a');
+            if ($diffDays > 100) {
+                $output['System'][] = [
+                    'warning',
+                    __('Uptime of this server is %s days. This usually means that the system kernel is outdated.', $diffDays),
+                ];
+            }
+        } catch (Exception $e) {
+        }
+
+        // Python version
+        try {
+            $pythonVersion = $this->execute([$server->getPythonVersion(), '-V']);
+            $parts = explode(' ', $pythonVersion);
+            if ($parts[0] !== 'Python') {
+                throw new Exception("Invalid python version response: $pythonVersion");
+            }
+
+            if (version_compare($parts[1], '3.6', '<')) {
+                $output['System'][] = [
+                    'warning',
+                    __('You are using Python %s. This version is not supported anymore, but it can be still supported by your distribution.'),
+                    'https://endoflife.date/python',
+                ];
+            } else if (version_compare($parts[1], '3.7', '<')) {
+                $output['System'][] = [
+                    'hint',
+                    __('You are using Python %s. This version will be not supported after 23 Dec 2021, but it can be still supported by your distribution.'),
+                    'https://endoflife.date/python',
+                ];
+            }
+        } catch (Exception $e) {
+        }
+
+        $ubuntuVersion = $this->getUbuntuVersion();
+        if ($ubuntuVersion) {
+            if (in_array($ubuntuVersion, ['14.04', '19.10'])) {
+                $output['System'][] = [
+                    'warning',
+                    __('You are using Ubuntu %s. This version doesn\'t have security support anymore.', $ubuntuVersion),
+                    'https://endoflife.date/ubuntu',
+                ];
+            } else if (in_array($ubuntuVersion, ['16.04'])) {
+                $output['System'][] = [
+                    'hint',
+                    __('You are using Ubuntu %s. This version will be not supported after 02 Apr 2021.', $ubuntuVersion),
+                    'https://endoflife.date/ubuntu',
+                ];
+            }
+        }
+    }
+
+    private function getKernelBuild()
+    {
+        if (!php_uname('s') !== 'Linux') {
+            return false;
+        }
+
+        $version = php_uname('v');
+        if (substr($version, 0, 7) !== '#1 SMP ') {
+            return false;
+        }
+        $buildTime = substr($version, 7);
+        return new DateTime($buildTime);
+    }
+
+    private function getUbuntuVersion()
+    {
+        if (!php_uname('s') !== 'Linux') {
+            return false;
+        }
+        if (!is_readable('/etc/os-release')) {
+            return false;
+        }
+        $content = file_get_contents('/etc/os-release');
+        if ($content === false) {
+            return false;
+        }
+        $parsed = parse_ini_string($content);
+        if ($parsed === false) {
+            return false;
+        }
+        if (!isset($parsed['NAME'])) {
+            return false;
+        }
+        if ($parsed['NAME'] !== 'Ubuntu') {
+            return false;
+        }
+        if (!isset($parsed['VERSION_ID'])) {
+            return false;
+        }
+        return $parsed['VERSION_ID'];
+    }
+
+    /**
+     * @return string
+     */
+    private function getCakeVersion()
+    {
+        $filePath = APP . 'Lib/cakephp/lib/Cake/VERSION.txt';
+        $version = file_get_contents($filePath);
+        if (!$version) {
+            throw new RuntimeException("Could not open CakePHP version file '$filePath'.");
+        }
+        foreach (explode("\n", $version) as $line) {
+            if ($line[0] === '/') {
+                continue;
+            }
+            return trim($line);
+        }
+        throw new RuntimeException("CakePHP version not found in file '$filePath'.");
+    }
+
+    private function execute(array $command)
+    {
+        $descriptorspec = [
+            1 => ["pipe", "w"], // stdout
+            2 => ["pipe", "w"], // stderr
+        ];
+
+        $command = implode(' ', $command);
+        $process = proc_open($command, $descriptorspec, $pipes);
+        if (!$process) {
+            throw new Exception("Command '$command' could be started.");
+        }
+
+        $stdout = stream_get_contents($pipes[1]);
+        if ($stdout === false) {
+            throw new Exception("Could not get STDOUT of command.");
+        }
+        fclose($pipes[1]);
+
+        $stderr = stream_get_contents($pipes[2]);
+        fclose($pipes[2]);
+
+        $returnCode = proc_close($process);
+        if ($returnCode !== 0) {
+            throw new Exception("Command '$command' return error code $returnCode. STDERR: '$stderr', STDOUT: '$stdout'");
+        }
+
+        return $stdout;
+    }
+}
diff --git a/app/Lib/Tools/SyncTool.php b/app/Lib/Tools/SyncTool.php
index 4f3d87974..b59a192b6 100644
--- a/app/Lib/Tools/SyncTool.php
+++ b/app/Lib/Tools/SyncTool.php
@@ -92,6 +92,35 @@ class SyncTool
         return self::getClientCertificateInfo($certificateContent);
     }
 
+    /**
+     * @param array $server
+     * @return array|void
+     * @throws Exception
+     */
+    public static function getServerCaCertificateInfo(array $server)
+    {
+        if (!$server['Server']['cert_file']) {
+            return;
+        }
+
+        $caCertificate = new File(APP . "files" . DS . "certs" . DS . $server['Server']['id'] . '.pem');
+        if (!$caCertificate->exists()) {
+            throw new Exception("Certificate file '{$caCertificate->pwd()}' doesn't exists.");
+        }
+
+        $certificateContent = $caCertificate->read();
+        if ($certificateContent === false) {
+            throw new Exception("Could not read '{$caCertificate->pwd()}' file with certificate.");
+        }
+
+        $certificate = openssl_x509_read($certificateContent);
+        if (!$certificate) {
+            throw new Exception("Couldn't read certificate: " . openssl_error_string());
+        }
+
+        return self::parseCertificate($certificate);
+    }
+
     /**
      * @param string $certificateContent PEM encoded certificate and private key.
      * @return array
@@ -101,11 +130,11 @@ class SyncTool
     {
         $certificate = openssl_x509_read($certificateContent);
         if (!$certificate) {
-            throw new Exception("Could't parse certificate: " . openssl_error_string());
+            throw new Exception("Couldn't read certificate: " . openssl_error_string());
         }
         $privateKey = openssl_pkey_get_private($certificateContent);
         if (!$privateKey) {
-            throw new Exception("Could't get private key from certificate: " . openssl_error_string());
+            throw new Exception("Couldn't get private key from certificate: " . openssl_error_string());
         }
         $verify = openssl_x509_check_private_key($certificate, $privateKey);
         if (!$verify) {
@@ -123,7 +152,7 @@ class SyncTool
     {
         $parsed = openssl_x509_parse($certificate);
         if (!$parsed) {
-            throw new Exception("Could't get parse X.509 certificate: " . openssl_error_string());
+            throw new Exception("Couldn't get parse X.509 certificate: " . openssl_error_string());
         }
         $currentTime = new DateTime();
         $output = [
diff --git a/app/View/Elements/healthElements/diagnostics.ctp b/app/View/Elements/healthElements/diagnostics.ctp
index 855bd1815..404b249c2 100644
--- a/app/View/Elements/healthElements/diagnostics.ctp
+++ b/app/View/Elements/healthElements/diagnostics.ctp
@@ -115,6 +115,38 @@
         ?>
     </div>
 
+    <h3><?= __('Security Audit') ?></h3>
+    <?php if (empty($securityAudit)):
+        echo __('Congratulation, your instance pass all security checks.');
+    else: ?>
+    <table class="table table-condensed table-bordered" style="width: 40vw">
+        <thead>
+        <tr>
+            <th><?= __('Area') ?></th>
+            <th><?= __('Level') ?></th>
+            <th><?= __('Message') ?></th>
+        </tr>
+        </thead>
+        <tbody>
+        <?php foreach ($securityAudit as $field => $errors): foreach ($errors as $error): list($level, $message) = $error; ?>
+        <tr>
+            <?php if (isset($field)): ?><th rowspan="<?= count($errors) ?>" style="white-space: nowrap;"><?= h($field) ?></th><?php unset($field); endif; ?>
+            <td style="text-align: center">
+                <?php if ($level === 'error'): ?>
+                <i class="red fa fa-times" role="img" aria-label="<?= __('Error') ?>" title="<?= __('Error') ?>"></i>
+                <?php elseif ($level === 'warning'): ?>
+                <i class="fas fa-exclamation-triangle" style="color: #c09853;" role="img" aria-label="<?= __('Warning') ?>" title="<?= __('Warning') ?>"></i>
+                <?php elseif ($level === 'hint'): ?>
+                <i class="fas fa-lightbulb" style="color: #FCC111" role="img" aria-label="<?= __('Hint') ?>"  title="<?= __('Hint') ?>"></i>
+                <?php endif; ?>
+            </td>
+            <td><?= h($message) ?><?php if (isset($error[2])): ?> <a href="<?= h($error[2]) ?>"><?= __('More info') ?></a><?php endif; ?></td>
+        </tr>
+        <?php endforeach; endforeach; ?>
+        </tbody>
+    </table>
+    <?php endif; ?>
+
     <h3><?php echo __('PHP Settings');?></h3>
     <?php
         $phpcolour = 'green';

From bf004ad52d83b8452418309236fd59382263a460 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 10 Feb 2021 22:17:09 +0100
Subject: [PATCH 179/437] chg: [internal] Simplified
 ServersController::serverSettings

---
 app/Controller/ServersController.php | 499 +++++++++++++--------------
 app/Model/Server.php                 |   9 +-
 2 files changed, 243 insertions(+), 265 deletions(-)

diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 15fc82b03..77f26b040 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -939,256 +939,254 @@ class ServersController extends AppController
 
     public function serverSettings($tab=false)
     {
-        if (!$this->_isSiteAdmin()) {
-            throw new MethodNotAllowedException();
+        if (!$this->request->is('get')) {
+            throw new MethodNotAllowedException('Just GET method is allowed.');
         }
-        if ($this->request->is('Get')) {
-            $tabs = array(
-                    'MISP' => array('count' => 0, 'errors' => 0, 'severity' => 5),
-                    'Encryption' => array('count' => 0, 'errors' => 0, 'severity' => 5),
-                    'Proxy' => array('count' => 0, 'errors' => 0, 'severity' => 5),
-                    'Security' => array('count' => 0, 'errors' => 0, 'severity' => 5),
-                    'Plugin' => array('count' => 0, 'errors' => 0, 'severity' => 5)
-            );
-            $writeableErrors = array(0 => __('OK'), 1 => __('not found'), 2 => __('is not writeable'));
-            $readableErrors = array(0 => __('OK'), 1 => __('not readable'));
-            $gpgErrors = array(0 => __('OK'), 1 => __('FAIL: settings not set'), 2 => __('FAIL: Failed to load GnuPG'), 3 => __('FAIL: Issues with the key/passphrase'), 4 => __('FAIL: sign failed'));
-            $proxyErrors = array(0 => __('OK'), 1 => __('not configured (so not tested)'), 2 => __('Getting URL via proxy failed'));
-            $zmqErrors = array(0 => __('OK'), 1 => __('not enabled (so not tested)'), 2 => __('Python ZeroMQ library not installed correctly.'), 3 => __('ZeroMQ script not running.'));
-            $stixOperational = array(0 => __('Some of the libraries related to STIX are not installed. Make sure that all libraries listed below are correctly installed.'), 1 => __('OK'));
-            $stixVersion = array(0 => __('Incorrect STIX version installed, found $current, expecting $expected'), 1 => __('OK'));
-            $stix2Version = array(0 => __('Incorrect STIX2 version installed, found $current, expecting $expected'), 1 => __('OK'));
-            $cyboxVersion = array(0 => __('Incorrect CyBox version installed, found $current, expecting $expected'), 1 => __('OK'));
-            $mixboxVersion = array(0 => __('Incorrect mixbox version installed, found $current, expecting $expected'), 1 => __('OK'));
-            $maecVersion = array(0 => __('Incorrect maec version installed, found $current, expecting $expected'), 1 => __('OK'));
-            $pymispVersion = array(0 => __('Incorrect PyMISP version installed, found $current, expecting $expected'), 1 => __('OK'));
-            $sessionErrors = array(0 => __('OK'), 1 => __('High'), 2 => __('Alternative setting used'), 3 => __('Test failed'));
-            $moduleErrors = array(0 => __('OK'), 1 => __('System not enabled'), 2 => __('No modules found'));
+        $tabs = array(
+            'MISP' => array('count' => 0, 'errors' => 0, 'severity' => 5),
+            'Encryption' => array('count' => 0, 'errors' => 0, 'severity' => 5),
+            'Proxy' => array('count' => 0, 'errors' => 0, 'severity' => 5),
+            'Security' => array('count' => 0, 'errors' => 0, 'severity' => 5),
+            'Plugin' => array('count' => 0, 'errors' => 0, 'severity' => 5)
+        );
+        $writeableErrors = array(0 => __('OK'), 1 => __('not found'), 2 => __('is not writeable'));
+        $readableErrors = array(0 => __('OK'), 1 => __('not readable'));
+        $gpgErrors = array(0 => __('OK'), 1 => __('FAIL: settings not set'), 2 => __('FAIL: Failed to load GnuPG'), 3 => __('FAIL: Issues with the key/passphrase'), 4 => __('FAIL: sign failed'));
+        $proxyErrors = array(0 => __('OK'), 1 => __('not configured (so not tested)'), 2 => __('Getting URL via proxy failed'));
+        $zmqErrors = array(0 => __('OK'), 1 => __('not enabled (so not tested)'), 2 => __('Python ZeroMQ library not installed correctly.'), 3 => __('ZeroMQ script not running.'));
+        $stixOperational = array(0 => __('Some of the libraries related to STIX are not installed. Make sure that all libraries listed below are correctly installed.'), 1 => __('OK'));
+        $stixVersion = array(0 => __('Incorrect STIX version installed, found $current, expecting $expected'), 1 => __('OK'));
+        $stix2Version = array(0 => __('Incorrect STIX2 version installed, found $current, expecting $expected'), 1 => __('OK'));
+        $cyboxVersion = array(0 => __('Incorrect CyBox version installed, found $current, expecting $expected'), 1 => __('OK'));
+        $mixboxVersion = array(0 => __('Incorrect mixbox version installed, found $current, expecting $expected'), 1 => __('OK'));
+        $maecVersion = array(0 => __('Incorrect maec version installed, found $current, expecting $expected'), 1 => __('OK'));
+        $pymispVersion = array(0 => __('Incorrect PyMISP version installed, found $current, expecting $expected'), 1 => __('OK'));
+        $sessionErrors = array(0 => __('OK'), 1 => __('High'), 2 => __('Alternative setting used'), 3 => __('Test failed'));
+        $moduleErrors = array(0 => __('OK'), 1 => __('System not enabled'), 2 => __('No modules found'));
 
-            $finalSettings = $this->Server->serverSettingsRead();
-            $issues = array(
-                'errors' => array(
-                        0 => array(
-                                'value' => 0,
-                                'description' => __('MISP will not operate correctly or will be unsecure until these issues are resolved.')
-                        ),
-                        1 => array(
-                                'value' => 0,
-                                'description' => __('Some of the features of MISP cannot be utilised until these issues are resolved.')
-                        ),
-                        2 => array(
-                                'value' => 0,
-                                'description' => __('There are some optional tweaks that could be done to improve the looks of your MISP instance.')
-                        ),
+        $finalSettings = $this->Server->serverSettingsRead();
+        $issues = array(
+            'errors' => array(
+                0 => array(
+                    'value' => 0,
+                    'description' => __('MISP will not operate correctly or will be unsecure until these issues are resolved.')
                 ),
-                'deprecated' => array(),
-                'overallHealth' => 3,
-            );
-            $dumpResults = array();
-            $tempArray = array();
-            foreach ($finalSettings as $k => $result) {
-                if ($result['level'] == 3) {
-                    $issues['deprecated']++;
+                1 => array(
+                    'value' => 0,
+                    'description' => __('Some of the features of MISP cannot be utilised until these issues are resolved.')
+                ),
+                2 => array(
+                    'value' => 0,
+                    'description' => __('There are some optional tweaks that could be done to improve the looks of your MISP instance.')
+                ),
+            ),
+            'deprecated' => array(),
+            'overallHealth' => 3,
+        );
+        $dumpResults = array();
+        $tempArray = array();
+        foreach ($finalSettings as $k => $result) {
+            if ($result['level'] == 3) {
+                $issues['deprecated']++;
+            }
+            $tabs[$result['tab']]['count']++;
+            if (isset($result['error']) && $result['level'] < 3) {
+                $issues['errors'][$result['level']]['value']++;
+                if ($result['level'] < $issues['overallHealth']) {
+                    $issues['overallHealth'] = $result['level'];
                 }
-                $tabs[$result['tab']]['count']++;
-                if (isset($result['error']) && $result['level'] < 3) {
-                    $issues['errors'][$result['level']]['value']++;
-                    if ($result['level'] < $issues['overallHealth']) {
-                        $issues['overallHealth'] = $result['level'];
-                    }
-                    $tabs[$result['tab']]['errors']++;
-                    if ($result['level'] < $tabs[$result['tab']]['severity']) {
-                        $tabs[$result['tab']]['severity'] = $result['level'];
-                    }
-                }
-                if (isset($result['optionsSource']) && is_callable($result['optionsSource'])) {
-                    $result['options'] = $result['optionsSource']();
-                }
-                $dumpResults[] = $result;
-                if ($result['tab'] == $tab) {
-                    if (isset($result['subGroup'])) {
-                        $tempArray[$result['subGroup']][] = $result;
-                    } else {
-                        $tempArray['general'][] = $result;
-                    }
+                $tabs[$result['tab']]['errors']++;
+                if ($result['level'] < $tabs[$result['tab']]['severity']) {
+                    $tabs[$result['tab']]['severity'] = $result['level'];
                 }
             }
-            $finalSettings = $tempArray;
-            // Diagnostics portion
-            $diagnostic_errors = 0;
-            App::uses('File', 'Utility');
-            App::uses('Folder', 'Utility');
-            if ($tab === 'files') {
-                $files = $this->__manageFiles();
-                $this->set('files', $files);
+            if (isset($result['optionsSource']) && is_callable($result['optionsSource'])) {
+                $result['options'] = $result['optionsSource']();
             }
-            // Only run this check on the diagnostics tab
-            if ($tab === 'diagnostics' || $tab === 'download' || $this->_isRest()) {
-                $php_ini = php_ini_loaded_file();
-                $this->set('php_ini', $php_ini);
-
-                $attachmentTool = new AttachmentTool();
-                try {
-                    $advanced_attachments = $attachmentTool->checkAdvancedExtractionStatus($this->Server->getPythonVersion());
-                } catch (Exception $e) {
-                    $this->log($e->getMessage(), LOG_NOTICE);
-                    $advanced_attachments = false;
+            $dumpResults[] = $result;
+            if ($result['tab'] == $tab) {
+                if (isset($result['subGroup'])) {
+                    $tempArray[$result['subGroup']][] = $result;
+                } else {
+                    $tempArray['general'][] = $result;
                 }
-
-                $this->set('advanced_attachments', $advanced_attachments);
-                // check if the current version of MISP is outdated or not
-                $version = $this->__checkVersion();
-                $this->set('version', $version);
-                $gitStatus = $this->Server->getCurrentGitStatus();
-                $this->set('branch', $gitStatus['branch']);
-                $this->set('commit', $gitStatus['commit']);
-                $this->set('latestCommit', $gitStatus['latestCommit']);
-
-                $phpSettings = array(
-                    'max_execution_time' => array(
-                        'explanation' => 'The maximum duration that a script can run (does not affect the background workers). A too low number will break long running scripts like comprehensive API exports',
-                        'recommended' => 300,
-                        'unit' => 'seconds',
-                    ),
-                    'memory_limit' => array(
-                        'explanation' => 'The maximum memory that PHP can consume. It is recommended to raise this number since certain exports can generate a fair bit of memory usage',
-                        'recommended' => 2048,
-                        'unit' => 'MB'
-                    ),
-                    'upload_max_filesize' => array(
-                        'explanation' => 'The maximum size that an uploaded file can be. It is recommended to raise this number to allow for the upload of larger samples',
-                        'recommended' => 50,
-                        'unit' => 'MB'
-                    ),
-                    'post_max_size' => array(
-                        'explanation' => 'The maximum size of a POSTed message, this has to be at least the same size as the upload_max_filesize setting',
-                        'recommended' => 50,
-                        'unit' => 'MB'
-                    )
-                );
-
-                foreach ($phpSettings as $setting => $settingArray) {
-                    $phpSettings[$setting]['value'] = $this->Server->getIniSetting($setting);
-                    if ($phpSettings[$setting]['value'] && $settingArray['unit'] && $settingArray['unit'] === 'MB') {
-                        // convert basic unit to M
-                        $phpSettings[$setting]['value'] = (int) floor($phpSettings[$setting]['value'] / 1024 / 1024);
-                    }
-                }
-                $this->set('phpSettings', $phpSettings);
-
-                if ($version && (!$version['upToDate'] || $version['upToDate'] == 'older')) {
-                    $diagnostic_errors++;
-                }
-
-                // check if the STIX and Cybox libraries are working and the correct version using the test script stixtest.py
-                $stix = $this->Server->stixDiagnostics($diagnostic_errors, $stixVersion, $cyboxVersion, $mixboxVersion, $maecVersion, $stix2Version, $pymispVersion);
-
-                $yaraStatus = $this->Server->yaraDiagnostics($diagnostic_errors);
-
-                // if GnuPG is set up in the settings, try to encrypt a test message
-                $gpgStatus = $this->Server->gpgDiagnostics($diagnostic_errors);
-
-                // if the message queue pub/sub is enabled, check whether the extension works
-                $zmqStatus = $this->Server->zmqDiagnostics($diagnostic_errors);
-
-                // if Proxy is set up in the settings, try to connect to a test URL
-                $proxyStatus = $this->Server->proxyDiagnostics($diagnostic_errors);
-
-                // get the DB diagnostics
-                $dbDiagnostics = $this->Server->dbSpaceUsage();
-                $dbSchemaDiagnostics = $this->Server->dbSchemaDiagnostic();
-
-                $redisInfo = $this->Server->redisInfo();
-
-                $moduleTypes = array('Enrichment', 'Import', 'Export', 'Cortex');
-                foreach ($moduleTypes as $type) {
-                    $moduleStatus[$type] = $this->Server->moduleDiagnostics($diagnostic_errors, $type);
-                }
-
-                // check the size of the session table
-                $sessionCount = 0;
-                $sessionStatus = $this->Server->sessionDiagnostics($diagnostic_errors, $sessionCount);
-                $this->set('sessionCount', $sessionCount);
-
-                $this->loadModel('AttachmentScan');
-                try {
-                    $attachmentScan = ['status' => true, 'software' => $this->AttachmentScan->diagnostic()];
-                } catch (Exception $e) {
-                    $attachmentScan = ['status' => false, 'error' => $e->getMessage()];
-                }
-
-                $securityAudit = (new SecurityAudit())->run($this->Server);
-
-                $view = compact('gpgStatus', 'sessionErrors', 'proxyStatus', 'sessionStatus', 'zmqStatus', 'stixVersion', 'cyboxVersion', 'mixboxVersion', 'maecVersion', 'stix2Version', 'pymispVersion', 'moduleStatus', 'yaraStatus', 'gpgErrors', 'proxyErrors', 'zmqErrors', 'stixOperational', 'stix', 'moduleErrors', 'moduleTypes', 'dbDiagnostics', 'dbSchemaDiagnostics', 'redisInfo', 'attachmentScan', 'securityAudit');
-            } else {
-                $view = [];
             }
-
-            // check whether the files are writeable
-            $writeableDirs = $this->Server->writeableDirsDiagnostics($diagnostic_errors);
-            $writeableFiles = $this->Server->writeableFilesDiagnostics($diagnostic_errors);
-            $readableFiles = $this->Server->readableFilesDiagnostics($diagnostic_errors);
-            $extensions = $this->Server->extensionDiagnostics();
-
-            // check if the encoding is not set to utf8
-            $dbEncodingStatus = $this->Server->databaseEncodingDiagnostics($diagnostic_errors);
-
-            $view = array_merge($view, compact('diagnostic_errors', 'tabs', 'tab', 'issues', 'finalSettings', 'writeableErrors', 'readableErrors', 'writeableDirs', 'writeableFiles', 'readableFiles', 'extensions', 'dbEncodingStatus'));
-            $this->set($view);
-
-            $workerIssueCount = 4;
-            $worker_array = array();
-            if (Configure::read('MISP.background_jobs')) {
-                $workerIssueCount = 0;
-                $worker_array = $this->Server->workerDiagnostics($workerIssueCount);
-            }
-            $this->set('worker_array', $worker_array);
-            if ($tab === 'download' || $this->_isRest()) {
-                foreach ($dumpResults as $key => $dr) {
-                    unset($dumpResults[$key]['description']);
-                }
-                $dump = array(
-                    'version' => $version,
-                    'phpSettings' => $phpSettings,
-                    'gpgStatus' => $gpgErrors[$gpgStatus['status']],
-                    'proxyStatus' => $proxyErrors[$proxyStatus],
-                    'zmqStatus' => $zmqStatus,
-                    'stix' => $stix,
-                    'moduleStatus' => $moduleStatus,
-                    'writeableDirs' => $writeableDirs,
-                    'writeableFiles' => $writeableFiles,
-                    'readableFiles' => $readableFiles,
-                    'dbDiagnostics' => $dbDiagnostics,
-                    'dbSchemaDiagnostics' => $dbSchemaDiagnostics,
-                    'redisInfo' => $redisInfo,
-                    'finalSettings' => $dumpResults,
-                    'extensions' => $extensions,
-                    'workers' => $worker_array
-                );
-                foreach ($dump['finalSettings'] as $k => $v) {
-                    if (!empty($v['redacted'])) {
-                        $dump['finalSettings'][$k]['value'] = '*****';
-                    }
-                }
-                $this->response->body(json_encode($dump, JSON_PRETTY_PRINT));
-                $this->response->type('json');
-                $this->response->download('MISP.report.json');
-                return $this->response;
-            }
-
-            $priorities = array(0 => 'Critical', 1 => 'Recommended', 2 => 'Optional', 3 => 'Deprecated');
-            $this->set('priorities', $priorities);
-            $this->set('workerIssueCount', $workerIssueCount);
-            $priorityErrorColours = array(0 => 'red', 1 => 'yellow', 2 => 'green');
-            $this->set('priorityErrorColours', $priorityErrorColours);
-            $this->set('phpversion', phpversion());
-            $this->set('phpmin', $this->phpmin);
-            $this->set('phprec', $this->phprec);
-            $this->set('phptoonew', $this->phptoonew);
-            $this->set('pythonmin', $this->pythonmin);
-            $this->set('pythonrec', $this->pythonrec);
-            $this->set('pymisp', $this->pymisp);
         }
+        $finalSettings = $tempArray;
+        // Diagnostics portion
+        $diagnostic_errors = 0;
+        App::uses('File', 'Utility');
+        App::uses('Folder', 'Utility');
+        if ($tab === 'files') {
+            $files = $this->Server->grabFiles();
+            $this->set('files', $files);
+        }
+        // Only run this check on the diagnostics tab
+        if ($tab === 'diagnostics' || $tab === 'download' || $this->_isRest()) {
+            $php_ini = php_ini_loaded_file();
+            $this->set('php_ini', $php_ini);
+
+            $attachmentTool = new AttachmentTool();
+            try {
+                $advanced_attachments = $attachmentTool->checkAdvancedExtractionStatus($this->Server->getPythonVersion());
+            } catch (Exception $e) {
+                $this->log($e->getMessage(), LOG_NOTICE);
+                $advanced_attachments = false;
+            }
+
+            $this->set('advanced_attachments', $advanced_attachments);
+            // check if the current version of MISP is outdated or not
+            $version = $this->__checkVersion();
+            $this->set('version', $version);
+            $gitStatus = $this->Server->getCurrentGitStatus();
+            $this->set('branch', $gitStatus['branch']);
+            $this->set('commit', $gitStatus['commit']);
+            $this->set('latestCommit', $gitStatus['latestCommit']);
+
+            $phpSettings = array(
+                'max_execution_time' => array(
+                    'explanation' => 'The maximum duration that a script can run (does not affect the background workers). A too low number will break long running scripts like comprehensive API exports',
+                    'recommended' => 300,
+                    'unit' => 'seconds',
+                ),
+                'memory_limit' => array(
+                    'explanation' => 'The maximum memory that PHP can consume. It is recommended to raise this number since certain exports can generate a fair bit of memory usage',
+                    'recommended' => 2048,
+                    'unit' => 'MB'
+                ),
+                'upload_max_filesize' => array(
+                    'explanation' => 'The maximum size that an uploaded file can be. It is recommended to raise this number to allow for the upload of larger samples',
+                    'recommended' => 50,
+                    'unit' => 'MB'
+                ),
+                'post_max_size' => array(
+                    'explanation' => 'The maximum size of a POSTed message, this has to be at least the same size as the upload_max_filesize setting',
+                    'recommended' => 50,
+                    'unit' => 'MB'
+                )
+            );
+
+            foreach ($phpSettings as $setting => $settingArray) {
+                $phpSettings[$setting]['value'] = $this->Server->getIniSetting($setting);
+                if ($phpSettings[$setting]['value'] && $settingArray['unit'] && $settingArray['unit'] === 'MB') {
+                    // convert basic unit to M
+                    $phpSettings[$setting]['value'] = (int) floor($phpSettings[$setting]['value'] / 1024 / 1024);
+                }
+            }
+            $this->set('phpSettings', $phpSettings);
+
+            if ($version && (!$version['upToDate'] || $version['upToDate'] == 'older')) {
+                $diagnostic_errors++;
+            }
+
+            // check if the STIX and Cybox libraries are working and the correct version using the test script stixtest.py
+            $stix = $this->Server->stixDiagnostics($diagnostic_errors, $stixVersion, $cyboxVersion, $mixboxVersion, $maecVersion, $stix2Version, $pymispVersion);
+
+            $yaraStatus = $this->Server->yaraDiagnostics($diagnostic_errors);
+
+            // if GnuPG is set up in the settings, try to encrypt a test message
+            $gpgStatus = $this->Server->gpgDiagnostics($diagnostic_errors);
+
+            // if the message queue pub/sub is enabled, check whether the extension works
+            $zmqStatus = $this->Server->zmqDiagnostics($diagnostic_errors);
+
+            // if Proxy is set up in the settings, try to connect to a test URL
+            $proxyStatus = $this->Server->proxyDiagnostics($diagnostic_errors);
+
+            // get the DB diagnostics
+            $dbDiagnostics = $this->Server->dbSpaceUsage();
+            $dbSchemaDiagnostics = $this->Server->dbSchemaDiagnostic();
+
+            $redisInfo = $this->Server->redisInfo();
+
+            $moduleTypes = array('Enrichment', 'Import', 'Export', 'Cortex');
+            foreach ($moduleTypes as $type) {
+                $moduleStatus[$type] = $this->Server->moduleDiagnostics($diagnostic_errors, $type);
+            }
+
+            // check the size of the session table
+            $sessionCount = 0;
+            $sessionStatus = $this->Server->sessionDiagnostics($diagnostic_errors, $sessionCount);
+            $this->set('sessionCount', $sessionCount);
+
+            $this->loadModel('AttachmentScan');
+            try {
+                $attachmentScan = ['status' => true, 'software' => $this->AttachmentScan->diagnostic()];
+            } catch (Exception $e) {
+                $attachmentScan = ['status' => false, 'error' => $e->getMessage()];
+            }
+
+            $securityAudit = (new SecurityAudit())->run($this->Server);
+
+            $view = compact('gpgStatus', 'sessionErrors', 'proxyStatus', 'sessionStatus', 'zmqStatus', 'stixVersion', 'cyboxVersion', 'mixboxVersion', 'maecVersion', 'stix2Version', 'pymispVersion', 'moduleStatus', 'yaraStatus', 'gpgErrors', 'proxyErrors', 'zmqErrors', 'stixOperational', 'stix', 'moduleErrors', 'moduleTypes', 'dbDiagnostics', 'dbSchemaDiagnostics', 'redisInfo', 'attachmentScan', 'securityAudit');
+        } else {
+            $view = [];
+        }
+
+        // check whether the files are writeable
+        $writeableDirs = $this->Server->writeableDirsDiagnostics($diagnostic_errors);
+        $writeableFiles = $this->Server->writeableFilesDiagnostics($diagnostic_errors);
+        $readableFiles = $this->Server->readableFilesDiagnostics($diagnostic_errors);
+        $extensions = $this->Server->extensionDiagnostics();
+
+        // check if the encoding is not set to utf8
+        $dbEncodingStatus = $this->Server->databaseEncodingDiagnostics($diagnostic_errors);
+
+        $view = array_merge($view, compact('diagnostic_errors', 'tabs', 'tab', 'issues', 'finalSettings', 'writeableErrors', 'readableErrors', 'writeableDirs', 'writeableFiles', 'readableFiles', 'extensions', 'dbEncodingStatus'));
+        $this->set($view);
+
+        $workerIssueCount = 4;
+        $worker_array = array();
+        if (Configure::read('MISP.background_jobs')) {
+            $workerIssueCount = 0;
+            $worker_array = $this->Server->workerDiagnostics($workerIssueCount);
+        }
+        $this->set('worker_array', $worker_array);
+        if ($tab === 'download' || $this->_isRest()) {
+            foreach ($dumpResults as $key => $dr) {
+                unset($dumpResults[$key]['description']);
+            }
+            $dump = array(
+                'version' => $version,
+                'phpSettings' => $phpSettings,
+                'gpgStatus' => $gpgErrors[$gpgStatus['status']],
+                'proxyStatus' => $proxyErrors[$proxyStatus],
+                'zmqStatus' => $zmqStatus,
+                'stix' => $stix,
+                'moduleStatus' => $moduleStatus,
+                'writeableDirs' => $writeableDirs,
+                'writeableFiles' => $writeableFiles,
+                'readableFiles' => $readableFiles,
+                'dbDiagnostics' => $dbDiagnostics,
+                'dbSchemaDiagnostics' => $dbSchemaDiagnostics,
+                'redisInfo' => $redisInfo,
+                'finalSettings' => $dumpResults,
+                'extensions' => $extensions,
+                'workers' => $worker_array
+            );
+            foreach ($dump['finalSettings'] as $k => $v) {
+                if (!empty($v['redacted'])) {
+                    $dump['finalSettings'][$k]['value'] = '*****';
+                }
+            }
+            $this->response->body(json_encode($dump, JSON_PRETTY_PRINT));
+            $this->response->type('json');
+            $this->response->download('MISP.report.json');
+            return $this->response;
+        }
+
+        $priorities = array(0 => 'Critical', 1 => 'Recommended', 2 => 'Optional', 3 => 'Deprecated');
+        $this->set('priorities', $priorities);
+        $this->set('workerIssueCount', $workerIssueCount);
+        $priorityErrorColours = array(0 => 'red', 1 => 'yellow', 2 => 'green');
+        $this->set('priorityErrorColours', $priorityErrorColours);
+        $this->set('phpversion', phpversion());
+        $this->set('phpmin', $this->phpmin);
+        $this->set('phprec', $this->phprec);
+        $this->set('phptoonew', $this->phptoonew);
+        $this->set('pythonmin', $this->pythonmin);
+        $this->set('pythonrec', $this->pythonrec);
+        $this->set('pymisp', $this->pymisp);
     }
 
     public function startWorker($type)
@@ -1254,9 +1252,6 @@ class ServersController extends AppController
 
     private function __checkVersion()
     {
-        if (!$this->_isSiteAdmin()) {
-            throw new MethodNotAllowedException();
-        }
         App::uses('SyncTool', 'Tools');
         $syncTool = new SyncTool();
         try {
@@ -1369,10 +1364,8 @@ class ServersController extends AppController
         $this->set('title_for_layout', __('Event ID translator'));
     }
 
-    public function getSubmodulesStatus() {
-        if (!$this->_isSiteAdmin()) {
-            throw new MethodNotAllowedException();
-        }
+    public function getSubmodulesStatus()
+    {
         $this->set('submodules', $this->Server->getSubmodulesGitStatus());
         $this->render('ajax/submoduleStatus');
     }
@@ -1391,9 +1384,6 @@ class ServersController extends AppController
 
     public function serverSettingsEdit($setting_name, $id = false, $forceSave = false)
     {
-        if (!$this->_isSiteAdmin()) {
-            throw new MethodNotAllowedException();
-        }
         if (!isset($setting_name)) {
             throw new MethodNotAllowedException();
         }
@@ -1525,15 +1515,6 @@ class ServersController extends AppController
         $this->redirect(array('controller' => 'servers', 'action' => 'serverSettings', 'workers'));
     }
 
-    private function __manageFiles()
-    {
-        if (!$this->_isSiteAdmin()) {
-            throw new MethodNotAllowedException();
-        }
-        $files = $this->Server->grabFiles();
-        return $files;
-    }
-
     public function deleteFile($type, $filename)
     {
         if (!$this->_isSiteAdmin()) {
diff --git a/app/Model/Server.php b/app/Model/Server.php
index d868cc129..0f0cde2ad 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -3767,17 +3767,14 @@ class Server extends AppModel
         return true;
     }
 
-    public function getLatestGitRemote()
-    {
-        return exec('timeout 3 git ls-remote https://github.com/MISP/MISP | head -1 | sed "s/HEAD//"');
-    }
-
     public function getCurrentGitStatus()
     {
+        $latestCommit = exec('timeout 3 git ls-remote https://github.com/MISP/MISP | head -1 | sed "s/HEAD//"');
+
         $status = array();
         $status['commit'] = exec('git rev-parse HEAD');
         $status['branch'] = $this->getCurrentBranch();
-        $status['latestCommit'] = $this->getLatestGitremote();
+        $status['latestCommit'] = $latestCommit;
         return $status;
     }
 

From dd3d3f43bf80b01f317a65737fe3c7bc52b2020d Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 17 Feb 2021 17:00:50 +0100
Subject: [PATCH 180/437] chg: [UI] Remove authors from galaxy cluster popover

---
 app/View/Elements/galaxyQuickViewMini.ctp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/View/Elements/galaxyQuickViewMini.ctp b/app/View/Elements/galaxyQuickViewMini.ctp
index c35f85f21..064a565a3 100644
--- a/app/View/Elements/galaxyQuickViewMini.ctp
+++ b/app/View/Elements/galaxyQuickViewMini.ctp
@@ -18,12 +18,9 @@
             if (isset($cluster['source'])) {
                 $cluster_fields[] = array('key' => 'source', 'value' => $cluster['source']);
             }
-            if (isset($cluster['authors'])) {
-                $cluster_fields[] = array('key' => 'authors', 'value' => $cluster['authors']);
-            }
             if (!empty($cluster['meta'])) {
                 foreach ($cluster['meta'] as $metaKey => $metaField) {
-                    if ($metaKey != 'synonyms') {
+                    if (!in_array($metaKey, ['synonyms', 'refs'], true)) {
                         $cluster_fields[] = array('key' => $metaKey, 'value' => $metaField);
                     }
                 }
@@ -32,9 +29,7 @@
             foreach ($cluster_fields as $cluster_field) {
                 $key = sprintf('<span class="blue bold">%s</span>', Inflector::humanize(h($cluster_field['key'])));
                 if (is_array($cluster_field['value'])) {
-                    if ($cluster_field['key'] === 'refs') {
-                        continue;
-                    } else if ($cluster_field['key'] === 'country') {
+                    if ($cluster_field['key'] === 'country') {
                         $value = array();
                         foreach ($cluster_field['value'] as $k => $v) {
                             $value[] = $this->Icon->countryFlag($v) . '&nbsp;' . h($v);

From c1399b36f9b8132c63f899d94fd31b6690ec23cb Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 28 Jan 2021 21:15:33 +0100
Subject: [PATCH 181/437] new: [UI] Event locks for background jobs and
 automatic tools

---
 app/Controller/Component/ACLComponent.php |   4 +-
 app/Controller/EventsController.php       |  61 ++++++--
 app/Model/Event.php                       |  26 +++-
 app/Model/EventLock.php                   | 161 +++++++++++++++-------
 app/View/Events/view.ctp                  |   2 +-
 app/webroot/js/misp.js                    |   8 +-
 6 files changed, 194 insertions(+), 68 deletions(-)

diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php
index d31769222..e26f2d367 100644
--- a/app/Controller/Component/ACLComponent.php
+++ b/app/Controller/Component/ACLComponent.php
@@ -262,7 +262,9 @@ class ACLComponent extends Component
                     'viewEventAttributes' => array('*'),
                     'viewGraph' => array('*'),
                     'viewGalaxyMatrix' => array('*'),
-                    'xml' => array('*')
+                    'xml' => array('*'),
+                'addEventLock' => ['perm_auth'],
+                'removeEventLock' => ['perm_auth'],
             ),
             'favouriteTags' => array(
                 'toggle' => array('*'),
diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index f7e871e3a..9c115dd91 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -5280,9 +5280,43 @@ class EventsController extends AppController
         }
     }
 
+    public function addEventLock($id)
+    {
+        if (!$this->request->is('post')) {
+            throw new MethodNotAllowedException('This endpoint requires a POST request.');
+        }
+
+        $event = $this->Event->fetchSimpleEvent($this->Auth->User(), $id);
+        if (empty($event)) {
+            throw new MethodNotAllowedException(__('Invalid Event'));
+        }
+        if (!$this->__canModifyEvent($event)) {
+            throw new UnauthorizedException(__('You do not have permission to do that.'));
+        }
+
+        $this->loadModel('EventLock');
+        $lockId = $this->EventLock->insertLockApi($event['Event']['id'], $this->Auth->user());
+        return $this->RestResponse->viewData(['lock_id' => $lockId], $this->response->type());
+    }
+
+    public function removeEventLock($id, $lockId)
+    {
+        if (!$this->request->is('post')) {
+            throw new MethodNotAllowedException('This endpoint requires a POST request.');
+        }
+
+        $event = $this->Event->fetchSimpleEvent($this->Auth->User(), $id);
+        if (empty($event)) {
+            throw new MethodNotAllowedException(__('Invalid Event'));
+        }
+
+        $this->loadModel('EventLock');
+        $deleted = $this->EventLock->deleteApiLock($event['Event']['id'], $lockId, $this->Auth->user());
+        return $this->RestResponse->viewData(['deleted' => $deleted], $this->response->type());
+    }
+
     public function checkLocks($id)
     {
-        $this->loadModel('EventLock');
         $event = $this->Event->find('first', array(
             'recursive' => -1,
             'conditions' => array('Event.id' => $id),
@@ -5290,29 +5324,34 @@ class EventsController extends AppController
         ));
         $locks = array();
         if (!empty($event) && ($event['Event']['orgc_id'] == $this->Auth->user('org_id') || $this->_isSiteAdmin())) {
+            $this->loadModel('EventLock');
             $locks = $this->EventLock->checkLock($this->Auth->user(), $id);
         }
         if (!empty($locks)) {
             $temp = $locks;
             $locks = array();
             foreach ($temp as $t) {
-                if ($t['User']['id'] !== $this->Auth->user('id')) {
+                if ($t['type'] === 'user' && $t['User']['id'] !== $this->Auth->user('id')) {
                     if (!$this->_isSiteAdmin() && $t['User']['org_id'] != $this->Auth->user('org_id')) {
-                        continue;
+                        $locks[] = __('another user');
+                    } else {
+                        $locks[] = $t['User']['email'];
                     }
-                    $locks[] = $t['User']['email'];
+                } else if ($t['type'] === 'job') {
+                    $locks[] = __('background job');
+                } else if ($t['type'] === 'api') {
+                    $locks[] = __('external tool');
                 }
             }
         }
-        // TODO: i18n
-        if (!empty($locks)) {
-            $message = sprintf('Warning: Your view on this event might not be up to date as it is currently being edited by: %s', implode(', ', $locks));
-            $this->set('message', $message);
-            $this->layout = false;
-            $this->render('/Events/ajax/event_lock');
-        } else {
+        if (empty($locks)) {
             return $this->RestResponse->viewData('', $this->response->type(), false, true);
         }
+
+        $message = __('Warning: Your view on this event might not be up to date as it is currently being edited by: %s', implode(', ', $locks));
+        $this->set('message', $message);
+        $this->layout = false;
+        $this->render('/Events/ajax/event_lock');
     }
 
     public function getEditStrategy($id)
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 95a962c3b..30fc9088a 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -3619,9 +3619,6 @@ class Event extends AppModel
     // Low level function to add an Event based on an Event $data array
     public function _add(array &$data, $fromXml, array $user, $org_id = 0, $passAlong = null, $fromPull = false, $jobId = null, &$created_id = 0, &$validationErrors = array())
     {
-        if ($jobId) {
-            App::uses('AuthComponent', 'Controller/Component');
-        }
         if (Configure::read('MISP.enableEventBlocklisting') !== false && isset($data['Event']['uuid'])) {
             $this->EventBlocklist = ClassRegistry::init('EventBlocklist');
             if ($this->EventBlocklist->isBlocked($data['Event']['uuid'])) {
@@ -3799,6 +3796,12 @@ class Event extends AppModel
         );
         $saveResult = $this->save(array('Event' => $data['Event']), array('fieldList' => $fieldList['Event']));
         if ($saveResult) {
+            if ($jobId) {
+                /** @var EventLock $eventLock */
+                $eventLock = ClassRegistry::init('EventLock');
+                $eventLock->insertLockBackgroundJob($this->id, $jobId);
+            }
+
             if ($passAlong) {
                 if ($server['Server']['publish_without_email'] == 0) {
                     $st = "enabled";
@@ -3927,6 +3930,10 @@ class Event extends AppModel
                     }
                 }
             }
+            if ($jobId) {
+                $eventLock->deleteBackgroundJobLock($this->id, $jobId);
+            }
+
             return true;
         } else {
             $validationErrors['Event'] = $this->validationErrors;
@@ -4051,6 +4058,11 @@ class Event extends AppModel
         $saveResult = $this->save(array('Event' => $data['Event']), array('fieldList' => $fieldList));
         $this->Log = ClassRegistry::init('Log');
         if ($saveResult) {
+            if ($jobId) {
+                /** @var EventLock $eventLock */
+                $eventLock = ClassRegistry::init('EventLock');
+                $eventLock->insertLockBackgroundJob($data['Event']['id'], $jobId);
+            }
             $validationErrors = array();
             if (isset($data['Event']['Attribute'])) {
                 $data['Event']['Attribute'] = array_values($data['Event']['Attribute']);
@@ -4177,6 +4189,9 @@ class Event extends AppModel
                 }
                 $this->publish($existingEvent['Event']['id']);
             }
+            if ($jobId) {
+                $eventLock->deleteBackgroundJobLock($data['Event']['id'], $jobId);
+            }
             return true;
         }
         return $this->validationErrors;
@@ -6087,6 +6102,10 @@ class Event extends AppModel
         $ontheflyattributes = array();
         $i = 0;
         if ($jobId) {
+            /** @var EventLock $eventLock */
+            $eventLock = ClassRegistry::init('EventLock');
+            $eventLock->insertLockBackgroundJob($event['Event']['id'], $jobId);
+
             $this->Job = ClassRegistry::init('Job');
             $total = count($attributeSources);
         }
@@ -6194,6 +6213,7 @@ class Event extends AppModel
             $message = $saved . ' ' . $messageScopeSaved . ' created' . $emailResult . '.';
         }
         if ($jobId) {
+            $eventLock->deleteBackgroundJobLock($event['Event']['id'], $jobId);
             $this->Job->saveStatus($jobId, true, __('Processing complete. %s', $message));
         }
         if (!empty($returnRawResults)) {
diff --git a/app/Model/EventLock.php b/app/Model/EventLock.php
index a0fd2807a..790c2b801 100644
--- a/app/Model/EventLock.php
+++ b/app/Model/EventLock.php
@@ -1,65 +1,132 @@
 <?php
 App::uses('AppModel', 'Model');
+
+// Table `event_locks` is not used anymore
 class EventLock extends AppModel
 {
-    public $useTable = 'event_locks';
+    // In seconds
+    const DEFAULT_TTL = 900;
 
-    public $recursive = -1;
-
-    public $actsAs = array(
-            'Containable',
-    );
-
-    public $belongsTo = array(
-            'User' => array(
-                'className' => 'User',
-                'foreignKey' => 'user_id',
-            )
-    );
-
-
-    public $validate = array(
-    );
-
-    public function beforeValidate($options = array())
+    /**
+     * @param array $user
+     * @param int $eventId
+     * @return bool True if insert was successful.
+     */
+    public function insertLock(array $user, $eventId)
     {
-        parent::beforeValidate();
-        return true;
+        return $this->insertLockToRedis("misp:event_lock:$eventId:user:{$user['id']}", [
+            'type' => 'user',
+            'timestamp' => time(),
+            'User' => [
+                'id' => $user['id'],
+                'org_id' => $user['org_id'],
+                'email' => $user['email'],
+            ]
+        ]);
     }
 
-    public function insertLock($user, $eventId)
+    /**
+     * @param int $eventId
+     * @param int $jobId
+     * @return bool True if insert was successful.
+     */
+    public function insertLockBackgroundJob($eventId, $jobId)
     {
-        $date = new DateTime();
-        $lock = array(
-            'timestamp' => $date->getTimestamp(),
+        return $this->insertLockToRedis("misp:event_lock:$eventId:job:$jobId", [
+            'type' => 'job',
+            'timestamp' => time(),
+            'job_id' => $jobId,
+        ]);
+    }
+
+    /**
+     * @param int $eventId
+     * @return int|null Lock ID
+     */
+    public function insertLockApi($eventId, array $user)
+    {
+        $rand = mt_rand();
+        if ($this->insertLockToRedis("misp:event_lock:$eventId:api:{$user['id']}:$rand", [
+            'type' => 'api',
             'user_id' => $user['id'],
-            'event_id' => $eventId
-        );
-        $this->deleteAll(array('user_id' => $user['id']));
-        $this->create();
-        return $this->save($lock);
+            'timestamp' => time(),
+        ])) {
+            return $rand;
+        }
+        return null;
     }
 
-    public function checkLock($user, $eventId)
+    /**
+     * @param int $eventId
+     * @param int $jobId
+     * @return null
+     */
+    public function deleteBackgroundJobLock($eventId, $jobId)
     {
-        $this->cleanupLock($user, $eventId);
-        $locks = $this->find('all', array(
-            'recursive' => -1,
-            'contain' => array('User.email', 'User.org_id', 'User.id'),
-            'conditions' => array(
-                'event_id' => $eventId
-            )
-        ));
-        return $locks;
+        try {
+            $redis = $this->setupRedisWithException();
+        } catch (Exception $e) {
+            return false;
+        }
+
+        $deleted = $redis->del("misp:event_lock:$eventId:job:$jobId");
+        return $deleted > 0;
     }
 
-    // If a lock has been active for 15 minutes, delete it
-    public function cleanupLock()
+    /**
+     * @param string $key
+     * @param array $data
+     * @return bool
+     */
+    private function insertLockToRedis($key, array $data)
     {
-        $date = new DateTime();
-        $timestamp = $date->getTimestamp();
-        $timestamp -= 900;
-        $this->deleteAll(array('timestamp <' => $timestamp));
-        return true;
+        try {
+            $redis = $this->setupRedisWithException();
+        } catch (Exception $e) {
+            return false;
+        }
+
+        return $redis->setex($key, self::DEFAULT_TTL, json_encode($data));
+    }
+
+    /**
+     * @param int $eventId
+     * @param int $lockId
+     * @return bool
+     */
+    public function deleteApiLock($eventId, $lockId, array $user)
+    {
+        try {
+            $redis = $this->setupRedisWithException();
+        } catch (Exception $e) {
+            return false;
+        }
+
+        $deleted = $redis->del("misp:event_lock:$eventId:api:{$user['id']}:$lockId");
+        return $deleted > 0;
+    }
+
+    /**
+     * @param array $user
+     * @param int $eventId
+     * @return array[]
+     * @throws JsonException
+     */
+    public function checkLock(array $user, $eventId)
+    {
+        try {
+            $redis = $this->setupRedisWithException();
+        } catch (Exception $e) {
+            return [];
+        }
+
+        $keys = $redis->keys("misp:event_lock:$eventId:*");
+        if (empty($keys)) {
+            return [];
+        }
+
+        return array_map(function ($value) {
+            return $this->jsonDecode($value);
+        }, $redis->mget($keys));
     }
 }
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index 38dd83e15..f4f00b60b 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -540,7 +540,7 @@
 <script type="text/javascript">
 var showContext = false;
 $(function () {
-    queryEventLock('<?php echo h($event['Event']['id']); ?>', '<?php echo h($me['org_id']); ?>');
+    queryEventLock('<?php echo h($event['Event']['id']); ?>');
     popoverStartup();
 
     $("th, td, dt, div, span, li").tooltip({
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 2c7af2eeb..35a7c3d4c 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -4998,16 +4998,14 @@ $(document.body).on('click', 'a[data-paginator]', function (e) {
     });
 });
 
-function queryEventLock(event_id, user_org_id) {
+function queryEventLock(event_id) {
     if (tabIsActive) {
         $.ajax({
             url: baseurl + "/events/checkLocks/" + event_id,
             type: "get",
             success: function(data, statusText, xhr) {
                  if (xhr.status == 200) {
-                     if ($('#event_lock_warning').length != 0) {
-                         $('#event_lock_warning').remove();
-                     }
+                     $('#event_lock_warning').remove();
                      if (data != '') {
                          $('#main-view-container').append(data);
                      }
@@ -5015,7 +5013,7 @@ function queryEventLock(event_id, user_org_id) {
             }
         });
     }
-    setTimeout(function() { queryEventLock(event_id, user_org_id); }, 5000);
+    setTimeout(function() { queryEventLock(event_id); }, 5000);
 }
 
 function checkIfLoggedIn() {

From 0e2e5bdbe1f18fe89edbe5a4786e4d28820d1640 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 19 Feb 2021 08:59:54 +0100
Subject: [PATCH 182/437] chg: [restResponse] Return role_id along with its
 name

---
 app/Controller/Component/RestResponseComponent.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Controller/Component/RestResponseComponent.php b/app/Controller/Component/RestResponseComponent.php
index 44558d8b9..b971b28d7 100644
--- a/app/Controller/Component/RestResponseComponent.php
+++ b/app/Controller/Component/RestResponseComponent.php
@@ -1890,10 +1890,13 @@ class RestResponseComponent extends Component
     }
     private function __overwriteRoleId($scope, $action, &$field) {
         $this->{$scope} = ClassRegistry::init("Role");
-        $roles = $this->{$scope}->find('column', array(
-            'fields' => array('name')
+        $roles = $this->{$scope}->find('list', array(
+            'fields' => array('id', 'name')
         ));
-        $field['values'] = $roles;
+        $field['values'] = [];
+        foreach ($roles as $id => $name) {
+            $field['values'][] = ['label' => $name, 'value' => $id];
+        }
     }
     private function __overwriteSeen($scope, $action, &$field) {
         if ($action == 'restSearch') {

From 8d9d0e64119a3543b43265fea3dfc864acafdf86 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 19 Feb 2021 09:00:45 +0100
Subject: [PATCH 183/437] fix: [restClient] Make sure to split value on strings

Fix #7032
---
 app/Controller/AppController.php | 2 +-
 app/webroot/js/restClient.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 4e1526cbe..55cf99b5f 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -25,7 +25,7 @@ class AppController extends Controller
 
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
 
-    private $__queryVersion = '125';
+    private $__queryVersion = '126';
     public $pyMispVersion = '2.4.138';
     public $phpmin = '7.2';
     public $phprec = '7.4';
diff --git a/app/webroot/js/restClient.js b/app/webroot/js/restClient.js
index 6c8a7b657..531d7d5f0 100644
--- a/app/webroot/js/restClient.js
+++ b/app/webroot/js/restClient.js
@@ -466,7 +466,7 @@ function findPropertyFromValue(token) {
 
 function findMatchingHints(str, allHints) {
     allHints = allHints.map(function(str) {
-        var strArray = typeof str === "object" ? str.value.split('&quot;') : str.split('&quot;')
+        var strArray = typeof str === "object" ? String(str.value).split('&quot;') : str.split('&quot;')
         return {
             text: strArray.join('\\\"'), // transforms quoted elements into escaped quote
             renderText: typeof str === "object" ? str.label : strArray.join('\"'),

From 600b6085b59896ed66c01ea5afd0127a8668f8e1 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 19 Feb 2021 09:11:17 +0100
Subject: [PATCH 184/437] chg: [objectReference] Renamed function

---
 app/Model/ObjectReference.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Model/ObjectReference.php b/app/Model/ObjectReference.php
index 2d7edd009..274f6d2f3 100644
--- a/app/Model/ObjectReference.php
+++ b/app/Model/ObjectReference.php
@@ -277,8 +277,8 @@ class ObjectReference extends AppModel
             $referenced_id = $target_object['Object']['id'];
             $referenced_uuid = $target_object['Object']['uuid'];
             if ($target_object['Object']['event_id'] != $object['Event']['id']) {
-                if (!$this->checkIfValidExtendedEvent($object, $target_object['Object']['event_id'], $user)) {
-                    throw new NotFoundException('Invalid target. Target has to be within the same event.');
+                if (!$this->isValidExtendedEventForReference($object, $target_object['Object']['event_id'], $user)) {
+                    throw new NotFoundException('Invalid target. Target has to be within the same event or extending it.');
                 }
             }
         } else {
@@ -295,8 +295,8 @@ class ObjectReference extends AppModel
                 }
             }
             if ($target_attribute['Attribute']['event_id'] != $object['Event']['id']) {
-                if (!$this->checkIfValidExtendedEvent($object, $target_attribute['Attribute']['event_id'], $user)) {
-                    throw new NotFoundException('Invalid target. Target has to be within the same event.');
+                if (!$this->isValidExtendedEventForReference($object, $target_attribute['Attribute']['event_id'], $user)) {
+                    throw new NotFoundException('Invalid target. Target has to be within the same event or extending it.');
                 }
             }
             $referenced_id = $target_attribute['Attribute']['id'];
@@ -306,7 +306,7 @@ class ObjectReference extends AppModel
         return array($referenced_id, $referenced_uuid, $referenced_type);
     }
 
-    function checkIfValidExtendedEvent($sourceEvent, $targetEventID, $user) {
+    function isValidExtendedEventForReference($sourceEvent, $targetEventID, $user) {
         if ($sourceEvent['Event']['orgc_id'] != $user['org_id']) {
             return false;
         }

From ba13f9db04c8a8ea16be63693db38a9ba34fed92 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 19 Feb 2021 09:53:32 +0100
Subject: [PATCH 185/437] chg: [genericPicker] Allow using picker for galaxy
 matrixes

---
 app/Controller/GalaxiesController.php   |  1 +
 app/View/Helper/GenericPickerHelper.php | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/Controller/GalaxiesController.php b/app/Controller/GalaxiesController.php
index a3e38fcad..7cf55d54b 100644
--- a/app/Controller/GalaxiesController.php
+++ b/app/Controller/GalaxiesController.php
@@ -296,6 +296,7 @@ class GalaxiesController extends AppController
             } else { // should use matrix instead
                 $param = array(
                     'name' => $galaxy['Galaxy']['name'],
+                    'value' => $this->baseurl . "/galaxies/selectCluster/" . $target_id . '/' . $target_type . '/' . $galaxy['Galaxy']['id'] . '/local:' . $local . '/eventid:' . $eventid,
                     'functionName' => sprintf(
                         "getMatrixPopup('%s', '%s', '%s/local:%s/eventid:%s')",
                         $target_type,
diff --git a/app/View/Helper/GenericPickerHelper.php b/app/View/Helper/GenericPickerHelper.php
index cac77f06a..a6064ee0e 100644
--- a/app/View/Helper/GenericPickerHelper.php
+++ b/app/View/Helper/GenericPickerHelper.php
@@ -44,16 +44,16 @@ class GenericPickerHelper extends AppHelper {
         return $option_html;
     }
 
-    function add_link_params($param, $defaults=array()) {
+    function add_link_params($param, $defaults=array(), $ignoreFunction=false) {
         $param_html = ' ';
-        if (isset($param['functionName'])) {
+        if (!$ignoreFunction && isset($param['functionName'])) {
             $param_html .= sprintf('onclick="execAndClose(this, %s)" ', h($param['functionName']));
         } else { // fallback to default submit function
-            if ($defaults['functionName'] !== '') {
+            if (!$ignoreFunction && $defaults['functionName'] !== '') {
                 $param_html .= 'onclick="submitFunction(this, ' . h($defaults['functionName']) . ')" ';
                 $param_html .= sprintf('onclick="submitFunction(this, %s)" ', h($defaults['functionName']));
             } else {
-                $param_html .= sprintf('data-endpoint="%s" onclick="fetchRequestedData(this)" ', h($param['value']));
+                $param_html .= sprintf('data-endpoint="%s" onclick="fetchRequestedData(this); event.stopPropagation(); return false;" ', h($param['value']));;
             }
         }
 
@@ -86,6 +86,12 @@ class GenericPickerHelper extends AppHelper {
         if (isset($param['isMatrix']) && $param['isMatrix']) {
             $span = '<span style="position: absolute; font-size: 8px; top: 2px;" class="fa fa-th" title="' . __('Start the galaxy matrix picker') . '"></span>';
             $pill_html .= $span;
+            $span = sprintf(
+                '<button class="btn btn-mini" style="float: right; display: inline-block; margin-left: 16px; margin-top: -4px; margin-right: -5px;" %s>%s</button>',
+                $this->add_link_params($param, $defaults, true),
+                '<span class="fa fa-list" title="' . __('Use the picker instead') . '"></span>'
+            );
+            $pill_html .= $span;
         }
         $pill_html .= '</a>';
         $pill_html .= '</li>';

From 31e5a4638f1e952438e23234457b0f3ebfd3364a Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 19 Feb 2021 12:25:54 +0100
Subject: [PATCH 186/437] fix: [galaxy] Missing variable when editing relation

---
 .../GalaxyClusterRelationsController.php      |  7 ++++--
 app/Model/GalaxyClusterRelation.php           | 22 +++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/Controller/GalaxyClusterRelationsController.php b/app/Controller/GalaxyClusterRelationsController.php
index 66e16f242..cd3ce24e0 100644
--- a/app/Controller/GalaxyClusterRelationsController.php
+++ b/app/Controller/GalaxyClusterRelationsController.php
@@ -1,6 +1,9 @@
 <?php
 App::uses('AppController', 'Controller');
 
+/**
+ * @property GalaxyClusterRelation $GalaxyClusterRelation
+ */
 class GalaxyClusterRelationsController extends AppController
 {
     public $components = array('Session', 'RequestHandler');
@@ -174,8 +177,7 @@ class GalaxyClusterRelationsController extends AppController
                 }
             }
         }
-        $existingRelations = $this->GalaxyClusterRelation->getExistingRelationships();
-        $this->set('existingRelations', $existingRelations);
+        $this->set('existingRelations', $this->GalaxyClusterRelation->getExistingRelationships());
         $this->set('distributionLevels', $distributionLevels);
         $this->set('initialDistribution', $initialDistribution);
         $this->set('sharingGroups', $sgs);
@@ -264,6 +266,7 @@ class GalaxyClusterRelationsController extends AppController
             }
         }
         $this->request->data = $existingRelation;
+        $this->set('existingRelations', $this->GalaxyClusterRelation->getExistingRelationships());
         $this->set('distributionLevels', $distributionLevels);
         $this->set('initialDistribution', $initialDistribution);
         $this->set('sharingGroups', $sgs);
diff --git a/app/Model/GalaxyClusterRelation.php b/app/Model/GalaxyClusterRelation.php
index a749972b5..6aa79bdb8 100644
--- a/app/Model/GalaxyClusterRelation.php
+++ b/app/Model/GalaxyClusterRelation.php
@@ -145,20 +145,18 @@ class GalaxyClusterRelation extends AppModel
 
     public function getExistingRelationships()
     {
-        $this->ObjectRelationship = ClassRegistry::init('ObjectRelationship');
-        $existingRelationships = $this->find('list', array(
+        $existingRelationships = $this->find('column', array(
             'recursive' => -1,
-            'fields' => array('referenced_galaxy_cluster_type', 'referenced_galaxy_cluster_type'),
-            'group' => array('referenced_galaxy_cluster_type')
-        ), false, false);
-        $existingRelationships = array_values($existingRelationships);
-        $objectRelationships = $this->ObjectRelationship->find('all', array(
-            'recursive' => -1,
-            'fields' => array('name')
+            'fields' => array('referenced_galaxy_cluster_type'),
+            'unique' => true,
         ));
-        $objectRelationships = Hash::extract($objectRelationships, '{n}.ObjectRelationship.name');
-        $relationShips = array_unique(array_merge($existingRelationships, $objectRelationships));
-        return $relationShips;
+        $this->ObjectRelationship = ClassRegistry::init('ObjectRelationship');
+        $objectRelationships = $this->ObjectRelationship->find('column', array(
+            'recursive' => -1,
+            'fields' => array('name'),
+            'unique' => true,
+        ));
+        return array_unique(array_merge($existingRelationships, $objectRelationships));
     }
 
     public function deleteRelations($conditions)

From 2779077cbdbae33c913ee4fd8f6a52a20a898585 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 19 Feb 2021 14:26:43 +0100
Subject: [PATCH 187/437] fix: [attributes] full_group_by fix for statistics.
 Fix #7014

---
 app/Controller/AttributesController.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index 9424792be..eb46297ca 100644
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -2582,9 +2582,10 @@ class AttributesController extends AppController
         }
         $totalAttributes = $this->Attribute->find('count', array());
         $attributes = $this->Attribute->find('all', array(
-                'recursive' => -1,
-                'fields' => array($type, 'COUNT(id) as attribute_count'),
-                'group' => array($type)
+            'recursive' => -1,
+            'fields' => array($type, 'COUNT(id) as attribute_count'),
+            'group' => array($type),
+            'order' => ''
         ));
         $results = array();
         foreach ($attributes as $attribute) {

From 09118be762e4556d6e55b6e62c288858760f6eaf Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 19 Feb 2021 15:14:02 +0100
Subject: [PATCH 188/437] fix: [js] Remove async default value

---
 app/webroot/js/misp.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index f8040deb8..56c41ae35 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -1833,11 +1833,10 @@ function getPopup(id, context, target, admin, popupType) {
     if (id != '') url += "/" + id;
     if (popupType == '' || typeof popupType == 'undefined') popupType = '#popover_form';
     $.ajax({
-        beforeSend: function (XMLHttpRequest) {
+        beforeSend: function () {
             $(".loading").show();
         },
         dataType:"html",
-        async: true,
         cache: false,
         success:function (data, textStatus) {
             $(".loading").hide();
@@ -1868,7 +1867,6 @@ function popoverPopup(clicked, id, context, target, admin) {
     // actual request //
     $.ajax({
         dataType:"html",
-        async: true,
         cache: false,
         success:function (data, textStatus) {
             if (popover.options.content !== data) {
@@ -1961,7 +1959,6 @@ function simplePopup(url, requestType, data) {
             $(".loading").show();
         },
         dataType:"html",
-        async: true,
         cache: false,
         success:function (data, textStatus) {
             $(".loading").hide();
@@ -4386,7 +4383,6 @@ function checkAttachments() {
 
 function loadTagTreemap() {
     $.ajax({
-        async:true,
         beforeSend: function (XMLHttpRequest) {
             $(".loading").show();
         },
@@ -4404,7 +4400,6 @@ function loadTagTreemap() {
 
 function quickEditEvent(id, field) {
     $.ajax({
-        async:true,
         beforeSend: function (XMLHttpRequest) {
             $(".loading").show();
         },

From 88bfa53b8736040ebf308ddfaec399105a649c23 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 19 Feb 2021 15:16:56 +0100
Subject: [PATCH 189/437] chg: [js] Use proper message when remote server
 returns 401

---
 app/webroot/js/misp.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 56c41ae35..dae3189ee 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -35,7 +35,9 @@ function rgb2hex(rgb) {
 }
 
 function xhrFailCallback(xhr) {
-    if (xhr.status === 403 || xhr.status === 405) {
+    if (xhr.status === 401) {
+        showMessage('fail', 'Unauthorized. Please reload page to log again.');
+    } else if (xhr.status === 403 || xhr.status === 405) {
         showMessage('fail', 'Not allowed.');
     } else if (xhr.status === 404) {
         showMessage('fail', 'Resource not found.');

From 59d97832c57bb50cb88859445fc380c1069c2780 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 19 Feb 2021 15:38:03 +0100
Subject: [PATCH 190/437] fix: [js] Use error callback for relevant ajax calls

---
 app/webroot/js/misp.js | 547 +++++++++++++----------------------------
 1 file changed, 166 insertions(+), 381 deletions(-)

diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index dae3189ee..b3087bc6a 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -46,6 +46,23 @@ function xhrFailCallback(xhr) {
     }
 }
 
+function xhr(options) {
+    options.beforeSend = options.beforeSend || function() {
+        $(".loading").show();
+    };
+    options.complete = options.complete || function() {
+        $(".loading").hide();
+    }
+    options.error = options.error || xhrFailCallback;
+    options.cache = options.cache || false;
+
+    if (!options.url.startsWith('http://') && !options.url.startsWith('https://')) {
+        options.url = baseurl + options.url;
+    }
+
+    return $.ajax(options);
+}
+
 function deleteObject(type, action, id) {
     var url = baseurl + "/" + type + "/" + action + "/" + id;
     $.get(url, function(data) {
@@ -72,7 +89,7 @@ function fetchAddSightingForm(type, attribute_id, onvalue) {
     $.get(url, function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
-    });
+    }).fail(xhrFailCallback);
 }
 
 function flexibleAddSighting(clicked, type, attribute_id, event_id, placement) {
@@ -103,7 +120,7 @@ function publishPopup(id, type, scope) {
     $.get(baseurl + "/" + scope + "/" + action + "/" + id, function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
-    });
+    }).fail(xhrFailCallback);
 }
 
 function delegatePopup(id) {
@@ -167,12 +184,9 @@ function submitDeletion(context_id, action, type, id) {
     var context = 'event';
     if (type == 'template_elements') context = 'template';
     var formData = $('#PromptForm').serialize();
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         data: formData,
-        success:function (data, textStatus) {
+        success:function (data) {
             if (type == 'eventGraph') {
                 showMessage('success', 'Network has been deleted');
                 reset_graph_history();
@@ -186,9 +200,8 @@ function submitDeletion(context_id, action, type, id) {
             $("#confirmation_box").fadeOut();
             $("#gray_out").fadeOut();
         },
-        type:"post",
-        cache: false,
-        url: baseurl + "/" + type + "/" + action + "/" + id,
+        type: "post",
+        url: "/" + type + "/" + action + "/" + id,
     });
 }
 
@@ -200,10 +213,7 @@ function removeSighting(caller) {
         context = 'event';
     }
     var formData = $('#PromptForm').serialize();
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         data: formData,
         success:function (data, textStatus) {
             handleGenericAjaxResponse(data);
@@ -211,15 +221,14 @@ function removeSighting(caller) {
             updateIndex(id, 'event');
             $.get(baseurl + "/sightings/listSightings/" + rawid + "/" + context + org, function(data) {
                 $("#sightingsData").html(data);
-            });
+            }).fail(xhrFailCallback);
         },
         complete:function() {
             $(".loading").hide();
             $("#confirmation_box").fadeOut();
         },
         type:"post",
-        cache: false,
-        url: baseurl + "/sightings/quickDelete/" + id + "/" + rawid + "/" + context,
+        url: "/sightings/quickDelete/" + id + "/" + rawid + "/" + context,
     });
 }
 
@@ -264,12 +273,9 @@ function toggleSetting(e, setting, id) {
     }
     $(dataDiv).val(id);
     var formData = $(formID).serialize();
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         data: formData,
-        success:function (data, textStatus) {
+        success:function (data) {
             var result = data;
             if (result.success) {
                 var setting = false;
@@ -285,7 +291,7 @@ function toggleSetting(e, setting, id) {
         complete:function() {
             $.get(replacementForm, function(data) {
                 $('#hiddenFormDiv').html(data);
-            });
+            }).fail(xhrFailCallback);
             $(".loading").hide();
             $("#confirmation_box").fadeOut();
             $("#gray_out").fadeOut();
@@ -293,8 +299,7 @@ function toggleSetting(e, setting, id) {
         error:function() {
             handleGenericAjaxResponse({'saved':false, 'errors':['Request failed due to an unexpected error.']});
         },
-        type:"post",
-        cache: false,
+        type: "post",
         url: $(formID).attr('action'),
     });
 }
@@ -308,11 +313,7 @@ function initiatePasswordReset(id) {
 
 function submitPasswordReset(id) {
     var formData = $('#PromptForm').serialize();
-    var url = baseurl + "/users/initiatePasswordReset/" + id;
-    $.ajax({
-        beforeSend: function () {
-            $(".loading").show();
-        },
+    xhr({
         data: formData,
         success: function (data) {
             handleGenericAjaxResponse(data);
@@ -323,8 +324,7 @@ function submitPasswordReset(id) {
             $("#gray_out").fadeOut();
         },
         type: "post",
-        cache: false,
-        url: url,
+        url: "/users/initiatePasswordReset/" + id,
     });
 }
 
@@ -337,22 +337,14 @@ function submitMessageForm(url, form, target) {
 }
 
 function submitGenericForm(url, form, target) {
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         data: $('#' + form).serialize(),
         success:function (data, textStatus) {
             $('#top').html(data);
             showMessage("success", "Message added.");
         },
-        complete:function() {
-            $(".loading").hide();
-        },
-        error: xhrFailCallback,
-        type:"post",
-        cache: false,
-        url:url,
+        type: "post",
+        url: url,
     });
 }
 
@@ -377,12 +369,9 @@ function toggleCorrelation(id, skip_reload) {
     if (typeof skip_reload === "undefined") {
         skip_reload = false;
     }
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         data: $('#PromptForm').serialize(),
-        success:function (data, textStatus) {
+        success:function (data) {
             handleGenericAjaxResponse(data, skip_reload);
             $("#correlation_toggle_" + id).prop('checked', !$("#correlation_toggle_" + id).is(':checked'));
         },
@@ -392,8 +381,7 @@ function toggleCorrelation(id, skip_reload) {
             $("#gray_out").fadeOut();
         },
         type:"post",
-        cache: false,
-        url: baseurl + '/attributes/toggleCorrelation/' + id,
+        url: '/attributes/toggleCorrelation/' + id,
     });
 }
 
@@ -401,10 +389,7 @@ function toggleToIDS(id, skip_reload) {
     if (typeof skip_reload === "undefined") {
         skip_reload = false;
     }
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         data: $('#PromptForm').serialize(),
         success:function (data, textStatus) {
             handleGenericAjaxResponse(data, skip_reload);
@@ -416,8 +401,7 @@ function toggleToIDS(id, skip_reload) {
             $("#gray_out").fadeOut();
         },
         type:"post",
-        cache: false,
-        url: baseurl + '/attributes/editField/' + id ,
+        url: '/attributes/editField/' + id ,
     });
 }
 
@@ -440,17 +424,12 @@ function updateIndex(id, context, newPage) {
         div = "#attributes_div";
     }
     if (context == 'template') {
-        url = baseurl + "/template_elements/index/" + id;
+        url = "/template_elements/index/" + id;
         div = "#templateElements";
     }
-    $.ajax({
-        beforeSend: function () {
-            $(".loading").show();
-        },
-        dataType:"html",
-        cache: false,
-        success:function (data, textStatus) {
-            $(".loading").hide();
+    xhr({
+        dataType: "html",
+        success:function (data) {
             $(div).html(data);
             if (typeof genericPopupCallback !== "undefined") {
                 genericPopupCallback("success");
@@ -487,6 +466,7 @@ function updateAttributeFieldOnSuccess(name, type, id, field, event) {
             }
             popoverStartup(); // reactive popovers
         },
+        error: xhrFailCallback,
         url: baseurl + "/attributes/fetchViewValue/" + id + "/" + field,
     });
 }
@@ -510,6 +490,7 @@ function updateObjectFieldOnSuccess(name, type, id, field, event) {
                 $('#' + type + '_' + id + '_' + 'timestamp_solid').html(data);
             }
         },
+        error: xhrFailCallback,
         url: baseurl + "/objects/fetchViewValue/" + id + "/" + field,
     });
 }
@@ -529,21 +510,13 @@ function activateField(type, id, field, event) {
     }
     var name = '#' + type + '_' + id + '_' + field;
     var container_name = '#' + containerName + '_' + id + '_' + field;
-    $.ajax({
-        beforeSend: function() {
-            $(".loading").show();
-        },
+    xhr({
         dataType: "html",
-        cache: false,
         success: function (data) {
             $(container_name + '_placeholder').html(data);
             postActivationScripts(name, type, id, field, event);
         },
-        url: baseurl + "/" + objectType + "/fetchEditForm/" + id + "/" + field,
-        complete: function() {
-            $(".loading").hide();
-        },
-        error: xhrFailCallback
+        url: "/" + objectType + "/fetchEditForm/" + id + "/" + field,
     });
 }
 
@@ -624,8 +597,8 @@ function addSighting(type, attribute_id, event_id) {
                 updateIndex(event_id, 'event');
             }
         },
-        error: function() {
-            showMessage('fail', 'Request failed for an unknown reason.');
+        error: function(xhr) {
+            xhrFailCallback(xhr);
             updateIndex(event_id, 'event');
         },
         type: "post",
@@ -668,8 +641,8 @@ function submitForm(type, id, field, context) {
         success:function (data, textStatus) {
             handleAjaxEditResponse(data, name, type, id, field, context);
         },
-        error:function() {
-            showMessage('fail', 'Request failed for an unknown reason.');
+        error:function(xhr) {
+            xhrFailCallback(xhr);
             updateIndex(context, 'event');
         },
         type:"post",
@@ -678,7 +651,7 @@ function submitForm(type, id, field, context) {
     $(name + '_field').unbind("keyup");
     $(name + '_form').unbind("focusout");
     return false;
-};
+}
 
 function quickSubmitTagForm(selected_tag_ids, addData) {
     var event_id = addData.id;
@@ -686,35 +659,30 @@ function quickSubmitTagForm(selected_tag_ids, addData) {
     if (undefined != addData['local'] && addData['local']) {
         localFlag = '/local:1';
     }
-    url = baseurl + "/events/addTag/" + event_id + localFlag;
+    var url = baseurl + "/events/addTag/" + event_id + localFlag;
     fetchFormDataAjax(url, function(formData) {
         $('body').append($('<div id="temp"/>').html(formData));
         $('#temp #EventTag').val(JSON.stringify(selected_tag_ids));
-        $.ajax({
+        xhr({
             data: $('#EventAddTagForm').serialize(),
-            cache: false,
-            beforeSend: function (XMLHttpRequest) {
-                $(".loading").show();
-            },
-            success:function (data, textStatus) {
+            success: function (data) {
                 loadEventTags(event_id);
                 loadGalaxies(event_id, 'event');
                 handleGenericAjaxResponse(data);
             },
-            error:function() {
+            error: function() {
                 showMessage('fail', 'Could not add tag.');
                 loadEventTags(event_id);
                 loadGalaxies(event_id, 'event');
             },
-            complete:function() {
-                $('#temp').remove();
+            complete: function() {
                 $("#popover_form").fadeOut();
                 $("#gray_out").fadeOut();
                 $(".loading").hide();
                 $('#temp').remove();
             },
-            type:"post",
-            url:url
+            type: "post",
+            url: url
         });
     });
 }
@@ -725,19 +693,16 @@ function quickSubmitAttributeTagForm(selected_tag_ids, addData) {
     if (undefined != addData['local'] && addData['local']) {
         localFlag = '/local:1';
     }
-    url = baseurl + "/attributes/addTag/" + attribute_id + localFlag;
+    var url = baseurl + "/attributes/addTag/" + attribute_id + localFlag;
     fetchFormDataAjax(url, function(formData) {
         $('body').append($('<div id="temp"/>').html(formData));
         $('#temp #AttributeTag').val(JSON.stringify(selected_tag_ids));
         if (attribute_id == 'selected') {
             $('#AttributeAttributeIds').val(getSelected());
         }
-        $.ajax({
+        xhr({
             data: $('#AttributeAddTagForm').serialize(),
-            beforeSend: function (XMLHttpRequest) {
-                $(".loading").show();
-            },
-            success:function (data, textStatus) {
+            success:function (data) {
                 if (attribute_id == 'selected') {
                     updateIndex(0, 'event');
                 } else {
@@ -773,7 +738,7 @@ function quickSubmitTagCollectionTagForm(selected_tag_ids, addData) {
     fetchFormDataAjax(url, function(formData) {
         $('body').append($('<div id="temp"/>').html(formData));
         $('#temp #TagCollectionTag').val(JSON.stringify(selected_tag_ids));
-        $.ajax({
+        xhr({
             data: $('#TagCollectionAddTagForm').serialize(),
             beforeSend: function (XMLHttpRequest) {
                 $(".loading").show();
@@ -809,7 +774,6 @@ function refreshTagCollectionRow(tag_collection_id) {
             $('[data-row-id="' + tag_collection_id + '"]').replaceWith(data);
         }
     });
-
 }
 
 function handleAjaxEditResponse(data, name, type, id, field, event) {
@@ -934,7 +898,7 @@ function multiSelectDeleteEvents() {
     $.get(baseurl + "/events/delete/" + JSON.stringify(selected), function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
-    });
+    }).fail(xhrFailCallback);
 }
 
 function multiSelectToggleFeeds(on, cache) {
@@ -950,7 +914,7 @@ function multiSelectToggleFeeds(on, cache) {
     $.get(baseurl + "/feeds/toggleSelected/" + on + "/" + cache + "/" + JSON.stringify(selected), function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
-    });
+    }).fail(xhrFailCallback);
 }
 
 function multiSelectDeleteEventBlocklist(on, cache) {
@@ -966,7 +930,7 @@ function multiSelectDeleteEventBlocklist(on, cache) {
     $.get(baseurl + "/eventBlocklists/massDelete?ids=" + JSON.stringify(selected), function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
-    });
+    }).fail(xhrFailCallback);
 }
 
 function multiSelectAction(event, context) {
@@ -1009,14 +973,10 @@ function multiSelectAction(event, context) {
         } else {
             var url = baseurl + "/" + settings[context]["controller"] + "/" + settings[context]["action"] + "Selected/" + event;
         }
-        $.ajax({
+        xhr({
             data: formData,
-            cache: false,
             type:"POST",
             url: url,
-            beforeSend: function () {
-                $(".loading").show();
-            },
             success: function (data) {
                 updateIndex(event, 'event');
                 var result = handleGenericAjaxResponse(data);
@@ -1024,10 +984,6 @@ function multiSelectAction(event, context) {
                     eventUnpublish();
                 }
             },
-            complete: function () {
-                $(".loading").hide();
-            },
-            error: xhrFailCallback,
         });
     }
     return false;
@@ -1043,7 +999,7 @@ function addSelectedTaxonomies(taxonomy) {
     $.get(baseurl + "/taxonomies/taxonomyMassConfirmation/"+taxonomy, function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
-    });
+    }).fail(xhrFailCallback);
 }
 
 function proposeObjectsFromSelectedAttributes(clicked, event_id) {
@@ -1055,14 +1011,14 @@ function hideSelectedTags(taxonomy) {
 	$.get(baseurl + "/taxonomies/taxonomyMassHide/"+taxonomy, function(data) {
 		$("#confirmation_box").html(data);
 		openPopup("#confirmation_box");
-	});
+	}).fail(xhrFailCallback);
 }
 
 function unhideSelectedTags(taxonomy) {
 	$.get(baseurl + "/taxonomies/taxonomyMassUnhide/"+taxonomy, function(data) {
 		$("#confirmation_box").html(data);
 		openPopup("#confirmation_box");
-	});
+	}).fail(xhrFailCallback);
 }
 
 function submitMassTaxonomyTag() {
@@ -1102,7 +1058,7 @@ function loadEventTags(id) {
     $.ajax({
         dataType:"html",
         cache: false,
-        success:function (data, textStatus) {
+        success:function (data) {
             $(".eventTagContainer").html(data);
         },
         url: baseurl + "/tags/showEventTag/" + id,
@@ -1113,7 +1069,7 @@ function loadGalaxies(id, scope) {
     $.ajax({
         dataType:"html",
         cache: false,
-        success:function (data, textStatus) {
+        success:function (data) {
             if (scope == 'event') {
                 $("#galaxies_div").html(data);
             } else if (scope == 'attribute') {
@@ -1128,7 +1084,7 @@ function loadTagCollectionTags(id) {
     $.ajax({
         dataType:"html",
         cache: false,
-        success:function (data, textStatus) {
+        success:function (data) {
             $(".tagCollectionTagContainer").html(data);
         },
         url: baseurl + "/tags/showEventTag/" + id,
@@ -1139,21 +1095,14 @@ function removeEventTag(event, tag) {
     var answer = confirm("Are you sure you want to remove this tag from the event?");
     if (answer) {
         var formData = $('#removeTag_' + tag).serialize();
-        $.ajax({
-            beforeSend: function (XMLHttpRequest) {
-                $(".loading").show();
-            },
+        xhr({
             data: formData,
             type:"POST",
-            cache: false,
-            url: baseurl + "/events/removeTag/" + event + '/' + tag,
-            success:function (data, textStatus) {
+            url: "/events/removeTag/" + event + '/' + tag,
+            success:function (data) {
                 loadEventTags(event);
                 handleGenericAjaxResponse(data);
             },
-            complete:function() {
-                $(".loading").hide();
-            }
         });
     }
     return false;
@@ -1163,9 +1112,10 @@ function loadAttributeTags(id) {
     $.ajax({
         dataType:"html",
         cache: false,
-        success:function (data, textStatus) {
+        success:function (data) {
             $("#Attribute_"+id+"_tr .attributeTagContainer").html(data);
         },
+        error: xhrFailCallback,
         url: baseurl + "/tags/showAttributeTag/" + id
     });
 }
@@ -1173,20 +1123,16 @@ function loadAttributeTags(id) {
 function removeObjectTagPopup(clicked, context, object, tag) {
     $.get(baseurl + "/" + context + "s/removeTag/" + object + '/' + tag, function(data) {
         openPopover(clicked, data);
-    });
+    }).fail(xhrFailCallback);
 }
 
 function removeObjectTag(context, object, tag) {
     var formData = $('#PromptForm').serialize();
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         data: formData,
         type:"POST",
-        cache: false,
-        url: baseurl + "/" + context.toLowerCase() + "s/removeTag/" + object + '/' + tag,
-        success:function (data, textStatus) {
+        url: "/" + context.toLowerCase() + "s/removeTag/" + object + '/' + tag,
+        success:function (data) {
             $("#confirmation_box").fadeOut();
             $("#gray_out").fadeOut();
             if (context == 'Attribute') {
@@ -1198,9 +1144,6 @@ function removeObjectTag(context, object, tag) {
             }
             handleGenericAjaxResponse(data);
         },
-        complete:function() {
-            $(".loading").hide();
-        }
     });
     return false;
 }
@@ -1352,7 +1295,7 @@ function submitPopoverForm(context_id, referer, update_context_id, modal, popove
                 updateIndex(update_context_id, 'event');
                 $.get(baseurl + "/sightings/listSightings/" + id + "/attribute", function(data) {
                     $("#sightingsData").html(data);
-                });
+                }).fail(xhrFailCallback);
                 $('.sightingsToggle').removeClass('btn-primary');
                 $('.sightingsToggle').addClass('btn-inverse');
                 $('#sightingsListAllToggle').removeClass('btn-inverse');
@@ -1403,7 +1346,6 @@ function handleAjaxModalResponse(response, context_id, url, referer, context, co
         }
         var savedArray = saveValuesForPersistance();
         $.ajax({
-            async:true,
             dataType:"html",
             success:function (data, textStatus) {
                 $('#genericModal').remove();
@@ -1445,7 +1387,6 @@ function handleAjaxPopoverResponse(response, context_id, url, referer, context,
     } else {
         var savedArray = saveValuesForPersistance();
         $.ajax({
-            async:true,
             dataType:"html",
             success:function (data, textStatus) {
                 $("#popover_form").html(data);
@@ -1503,17 +1444,12 @@ function toggleHistogramType(type, old) {
 }
 
 function updateHistogram(selected) {
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         dataType:"html",
-        cache: false,
-        success:function (data, textStatus) {
-            $(".loading").hide();
+        success:function (data) {
             $("#histogram").html(data);
         },
-        url: baseurl + "/users/histogram/" + selected,
+        url: "/users/histogram/" + selected,
     });
 }
 
@@ -1562,18 +1498,13 @@ function tagFieldChange() {
     $("#addTagField").hide();
 }
 
-function appendTemplateTag(selected_id) {
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
-        dataType:"html",
-        cache: false,
-        success:function (data, textStatus) {
-            $(".loading").hide();
+function appendTemplateTag(selected_id)     {
+    xhr({
+        dataType: "html",
+        success: function (data) {
             $("#tags").append(data);
         },
-        url: baseurl + "/tags/viewTag/" + selected_id,
+        url: "/tags/viewTag/" + selected_id,
     });
     updateSelectedTags();
 }
@@ -1607,8 +1538,7 @@ function saveElementSorting(order) {
         data: order,
         dataType:"json",
         contentType: "application/json",
-        cache: false,
-        success:function (data, textStatus) {
+        success:function (data) {
             handleGenericAjaxResponse(data);
         },
         type:"post",
@@ -1870,13 +1800,13 @@ function popoverPopup(clicked, id, context, target, admin) {
     $.ajax({
         dataType:"html",
         cache: false,
-        success:function (data, textStatus) {
+        success:function (data) {
             if (popover.options.content !== data) {
                 popover.options.content =  data;
                 $clicked.popover('show');
             }
         },
-        error:function(jqXHR, textStatus, errorThrown ) {
+        error:function(jqXHR ) {
             var errorJSON = '';
             try {
                 errorJSON = JSON.parse(jqXHR.responseText);
@@ -1927,17 +1857,11 @@ function submitPopover(clicked) {
         $form = $('[data-dismissid="' + dismissid + '"]').closest('form');
     }
     if ($form.data('ajax')) {
-        $.ajax({
+        xhr({
             data: $form.serialize(),
-            beforeSend: function (XMLHttpRequest) {
-                $(".loading").show();
-            },
-            success:function (data, textStatus) {
+            success:function () {
                 location.reload();
             },
-            error:function() {
-                showMessage('fail', 'Could not perform query.');
-            },
             complete:function() {
                 $(".loading").hide();
                 $("#popover_form").fadeOut();
@@ -1956,19 +1880,13 @@ function simplePopup(url, requestType, data) {
     requestType = requestType === undefined ? 'GET' : requestType
     data = data === undefined ? [] : data
     $("#gray_out").fadeIn();
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         dataType:"html",
-        cache: false,
-        success:function (data, textStatus) {
-            $(".loading").hide();
+        success:function (data) {
             $("#popover_form").html(data);
             openPopup("#popover_form");
         },
         error:function(xhr) {
-            $(".loading").hide();
             $("#gray_out").fadeOut();
             xhrFailCallback(xhr);
         },
@@ -2302,19 +2220,13 @@ function runIndexQuickFilterFixed(preserveParams, url, target) {
     }
 
     if (target !== undefined) {
-        $.ajax({
-            beforeSend: function () {
-                $(".loading").show();
-            },
+        xhr({
             success: function (data) {
                 $(target).html(data);
             },
             error: function() {
                 showMessage('fail', 'Could not fetch the requested data.');
             },
-            complete: function() {
-                $(".loading").hide();
-            },
             type: "get",
             url: url
         });
@@ -2611,20 +2523,14 @@ function serverSettingsActivateField(setting, id) {
     resetForms();
     $('.inline-field-placeholder').hide();
     var fieldName = "#setting_" + getSubGroupFromSetting(setting) + "_" + id;
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         dataType:"html",
-        cache: false,
-        success:function (data, textStatus) {
-            $(".loading").hide();
-            $(fieldName + "_placeholder").html(data);
+        success: function (data) {
+            $(fieldName + "_placeholder").html(data).show();
             $(fieldName + "_solid").hide();
-            $(fieldName + "_placeholder").show();
             serverSettingsPostActivationScripts(fieldName, setting, id);
         },
-        url: baseurl + "/servers/serverSettingsEdit/" + setting + "/" + id,
+        url: "/servers/serverSettingsEdit/" + setting + "/" + id,
     });
 }
 
@@ -2836,21 +2742,13 @@ function freetextImportResultsSubmit(id, count) {
     }
     $("#AttributeJsonObject").val(JSON.stringify(attributeArray));
     var formData = $(".mainForm").serialize();
-    $.ajax({
+    xhr({
         type: "post",
-        cache: false,
-        url: baseurl + "/events/saveFreeText/" + id,
+        url: "/events/saveFreeText/" + id,
         data: formData,
-        beforeSend: function () {
-            $(".loading").show();
-        },
         success: function () {
             window.location = baseurl + '/events/view/' + id;
         },
-        complete: function() {
-            $(".loading").hide();
-        },
-        error: xhrFailCallback,
     });
 }
 
@@ -3041,41 +2939,27 @@ function moduleResultsSubmit(id) {
     }
     $("#EventJsonObject").val(JSON.stringify(data_collected));
     var formData = $('.mainForm').serialize();
-    $.ajax({
+    xhr({
         type: "post",
-        cache: false,
-        url: baseurl + "/events/handleModuleResults/" + id,
+        url: "/events/handleModuleResults/" + id,
         data: formData,
-        beforeSend: function () {
-            $(".loading").show();
-        },
         success: function () {
             window.location = baseurl + '/events/view/' + id;
         },
-        complete: function() {
-            $(".loading").hide();
-        },
-        error: xhrFailCallback,
     });
 }
 
 function objectTemplateViewContent(context, id) {
-    var url = baseurl + "/objectTemplateElements/viewElements/" + id + "/" + context;
-    $.ajax({
+    var url = "/objectTemplateElements/viewElements/" + id + "/" + context;
+    xhr({
         url: url,
         type:'GET',
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
         error: function(){
-            $('#ajaxContent').html('An error has occured, please reload the page.');
+            $('#ajaxContent').html('An error has occurred, please reload the page.');
         },
         success: function(response){
             $('#ajaxContent').html(response);
         },
-        complete: function() {
-            $(".loading").hide();
-        },
     });
 
 }
@@ -3090,21 +2974,15 @@ function organisationViewContent(context, id) {
     } else if (context === 'sharing_groups') {
         action = "/sharing_groups/index/searchorg:";
     }
-    $.ajax({
-        url: baseurl + action + id,
+    xhr({
+        url: action + id,
         type:'GET',
-        beforeSend: function () {
-            $(".loading").show();
-        },
         error: function(){
-            $('#ajaxContent').html('An error has occured, please reload the page.');
+            $('#ajaxContent').html('An error has occurred, please reload the page.');
         },
         success: function(response){
             $('#ajaxContent').html(response);
         },
-        complete: function() {
-            $(".loading").hide();
-        },
     });
 }
 
@@ -3395,7 +3273,7 @@ function runOnDemandAction(element, url, target, postFormField) {
         url: url,
         type: type,
         data: data,
-        beforeSend: function (XMLHttpRequest) {
+        beforeSend: function () {
             $(elementContainer).html('Running...');
         },
         error: function(response) {
@@ -3615,22 +3493,13 @@ function getTextColour(hex) {
 function gpgSelect(fingerprint) {
     $("#popover_form").fadeOut();
     $("#gray_out").fadeOut();
-    $.ajax({
+    xhr({
         type: "get",
-        url: baseurl + "/users/fetchGpgKey/" + fingerprint,
-        beforeSend: function () {
-            $(".loading").show();
-        },
+        url: "/users/fetchGpgKey/" + fingerprint,
         success: function (data) {
             $("#UserGpgkey").val(data);
             showMessage('success', "Key found!");
         },
-        error: function (data, textStatus, errorThrown) {
-            showMessage('fail', textStatus + ": " + errorThrown);
-        },
-        complete: function () {
-            $(".loading").hide();
-        },
     });
 }
 
@@ -3640,23 +3509,16 @@ function lookupPGPKey(emailFieldName) {
 }
 
 function zeroMQServerAction(action) {
-    $.ajax({
+    xhr({
         type: "get",
-        url: baseurl + "/servers/" + action + "ZeroMQServer/",
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+        url: "/servers/" + action + "ZeroMQServer/",
         success: function (data) {
-            $(".loading").hide();
             if (action !== 'status') {
                 window.location.reload();
             } else {
                 $("#confirmation_box").html(data);
                 openPopup("#confirmation_box");
             }
-        },
-        error: function (data, textStatus, errorThrown) {
-            showMessage('fail', textStatus + ": " + errorThrown);
         }
     });
 }
@@ -3847,19 +3709,14 @@ function filterAttributes(filter, event_id) {
         url += filter.length > 0 ? "/searchFor:" + filter : "";
     }
     if (deleted) url += '/deleted:true';
-    $.ajax({
+    xhr({
         type: "get",
         url: url,
-        beforeSend: function() {
-            $(".loading").show();
-        },
         success: function(data) {
             $("#attributes_div").html(data);
-            $(".loading").hide();
         },
         error: function() {
             showMessage('fail', 'Something went wrong - could not fetch attributes.');
-            $(".loading").hide();
         }
     });
 }
@@ -3903,21 +3760,15 @@ function pivotObjectReferences(url, uuid) {
     }
 
     url += '/focus:' + uuid;
-    $.ajax({
+    xhr({
         type: "get",
         url: url,
-        beforeSend: function () {
-            $(".loading").show();
-        },
         success: function (data) {
             $("#attributes_div").html(data);
         },
         error: function() {
             showMessage('fail', 'Something went wrong - could not fetch attributes.');
         },
-        complete: function() {
-            $(".loading").hide();
-        }
     });
 }
 
@@ -3950,15 +3801,9 @@ function toggleBoolFilter(url, param) {
 
     url += buildFilterURL(res);
     url = url.replace(/view\//i, 'viewEventAttributes/');
-    $.ajax({
+    xhr({
         type: "get",
         url: url,
-        beforeSend: function () {
-            $(".loading").show();
-        },
-        complete: function () {
-            $(".loading").hide();
-        },
         success:function (data) {
             $("#attributes_div").html(data);
             querybuilderTool = undefined;
@@ -4133,25 +3978,17 @@ function showEnrichmentPopover(type, id) {
 
 // add the same as below for click popup
 $(document).on("click", ".eventViewAttributePopup", function() {
-    clearTimeout(hoverEnrichmentPopoverTimer); // stop potentional popover loading
+    clearTimeout(hoverEnrichmentPopoverTimer); // stop potential popover loading
 
     var type = $(this).attr('data-object-type');
     var id = $(this).attr('data-object-id');
     if (!(type + "_" + id in ajaxResults["persistent"])) { // not in cache
-        $.ajax({
-            beforeSend: function() {
-                $(".loading").show();
-            },
+        xhr({
             success: function (html) {
                 ajaxResults["persistent"][type + "_" + id] = html; // save to cache
                 showEnrichmentPopover(type, id);
             },
-            error: xhrFailCallback,
-            complete: function() {
-                $(".loading").hide();
-            },
-            cache: false,
-            url: baseurl + "/attributes/hoverEnrichment/" + id + "/1",
+            url: "/attributes/hoverEnrichment/" + id + "/1",
         });
     } else {
         showEnrichmentPopover(type, id);
@@ -4188,15 +4025,10 @@ function serverOwnerOrganisationChange(host_org_id) {
 }
 
 function requestAPIAccess() {
-    url = baseurl + "/users/request_API/";
-    $.ajax({
+    xhr({
         type:"get",
-        url:url,
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+        url: "/users/request_API/",
         success:function (data) {
-            $(".loading").hide();
             handleGenericAjaxResponse(data);
         },
         error:function() {
@@ -4361,10 +4193,7 @@ function checkOrphanedAttributes() {
 }
 
 function checkAttachments() {
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         success:function (data, textStatus) {
             var color = 'red';
             var text = ' (Bad links detected)';
@@ -4374,46 +4203,28 @@ function checkAttachments() {
             }
             $("#orphanedFileCount").html('<span class="' + color + '">' + data + text + '</span>');
         },
-        complete:function() {
-            $(".loading").hide();
-        },
         type:"get",
-        cache: false,
-        url: baseurl + "/attributes/checkAttachments/",
+        url: "/attributes/checkAttachments/",
     });
 }
 
 function loadTagTreemap() {
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         success:function (data, textStatus) {
             $(".treemapdiv").html(data);
         },
-        complete:function() {
-            $(".loading").hide();
-        },
         type:"get",
-        cache: false,
-        url: baseurl + "/users/tagStatisticsGraph",
+        url: "/users/tagStatisticsGraph",
     });
 }
 
 function quickEditEvent(id, field) {
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
-        success:function (data, textStatus) {
+    xhr({
+        success:function (data) {
             $("#" + field + "Field").html(data);
         },
-        complete:function() {
-            $(".loading").hide();
-        },
         type:"get",
-        cache: false,
-        url: baseurl + "/events/quickEdit/" + id + "/" + field,
+        url: "/events/quickEdit/" + id + "/" + field,
     });
 }
 
@@ -4449,7 +4260,7 @@ $('#eventToggleButtons button').click(function() {
         if (loadUrl) {
             $.get(loadUrl, function(data) {
                 $('#' + element + '_div').html(data);
-            });
+            }).fail(xhrFailCallback);
         }
     }
 });
@@ -4525,7 +4336,7 @@ function checkAndSetPublishedInfo(skip_reload) {
                 $('.published').addClass('hidden');
                 $('.not-published').removeClass('hidden');
             }
-        });
+        }).fail(xhrFailCallback);
     }
 }
 
@@ -4556,7 +4367,7 @@ function closeScreenshot() {
 function loadSightingGraph(id, scope) {
     $.get(baseurl + "/sightings/viewSightings/" + id + "/" + scope, function(data) {
         $("#sightingsData").html(data);
-    });
+    }).fail(xhrFailCallback)
 }
 
 function checkRolePerms() {
@@ -4576,19 +4387,15 @@ function updateMISP() {
     $.get(baseurl + "/servers/update", function(data) {
         $("#confirmation_box").html(data);
         openPopup("#confirmation_box");
-    });
+    }).fail(xhrFailCallback)
 }
 
 function submitMISPUpdate() {
     var formData = $('#PromptForm').serialize();
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         data: formData,
-        success:function (data, textStatus) {
-            $('#gitResult').text(data);
-            $('#gitResult').removeClass('hidden');
+        success:function (data) {
+            $('#gitResult').text(data).removeClass('hidden');
         },
         complete:function() {
             $(".loading").hide();
@@ -4596,8 +4403,7 @@ function submitMISPUpdate() {
             $("#gray_out").fadeOut();
         },
         type:"post",
-        cache: false,
-        url: baseurl + "/servers/update",
+        url: "/servers/update",
     });
 }
 
@@ -4851,25 +4657,18 @@ $(document).ready(function() {
         $.get(url + '/' + id, function(data) {
             $('#popover_form').html(data);
             openPopup('#popover_form');
-        });
+        }).fail(xhrFailCallback)
     });
     $('.servers_default_role_checkbox').click(function() {
         var id = $(this).data("id");
         var state = $(this).is(":checked");
         $(".servers_default_role_checkbox").not(this).attr('checked', false);
-        $.ajax({
-            beforeSend: function (XMLHttpRequest) {
-                $(".loading").show();
-            },
-            success:function (data, textStatus) {
+        xhr({
+            success:function (data) {
                 handleGenericAjaxResponse(data);
             },
-            complete:function() {
-                $(".loading").hide();
-            },
             type:"get",
-            cache: false,
-            url: baseurl + '/admin/roles/set_default/' + (state ? id : ""),
+            url: '/admin/roles/set_default/' + (state ? id : ""),
         });
     });
     $('.add_object_attribute_row').click(function() {
@@ -4883,7 +4682,7 @@ $(document).ready(function() {
             $('#row_' + object_relation + '_expand').before($(data).fadeIn()).html();
             var $added_row = $('#row_' + object_relation + '_expand').prev().prev();
             $added_row.find('select.Attribute_value_select option:first').attr('disabled', true);
-        });
+        }).fail(xhrFailCallback);
     });
     $('.quickToggleCheckbox').toggle(function() {
         var url = $(this).data('checkbox-url');
@@ -4999,13 +4798,7 @@ $(document.body).on('click', '.quickSelect', function() {
 $(document.body).on('click', 'a[data-paginator]', function (e) {
     e.preventDefault();
     var paginatorTarget = $(this).attr('data-paginator');
-    $.ajax({
-        beforeSend: function () {
-            $(".loading").show();
-        },
-        complete: function () {
-            $(".loading").hide();
-        },
+    xhr({
         dataType: "html",
         success: function (data) {
             $(paginatorTarget).html(data);
@@ -5075,19 +4868,19 @@ function syntaxHighlightJson(json, indent) {
     json = JSON.stringify(json, undefined, indent);
     json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/(?:\r\n|\r|\n)/g, '<br>').replace(/ /g, '&nbsp;');
     return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
-            var cls = 'json_number';
-            if (/^"/.test(match)) {
-                    if (/:$/.test(match)) {
-                            cls = 'json_key';
-                    } else {
-                            cls = 'json_string';
-                    }
-            } else if (/true|false/.test(match)) {
-                    cls = 'json_boolean';
-            } else if (/null/.test(match)) {
-                    cls = 'json_null';
-            }
-            return '<span class="' + cls + '">' + match + '</span>';
+        var cls = 'json_number';
+        if (/^"/.test(match)) {
+                if (/:$/.test(match)) {
+                        cls = 'json_key';
+                } else {
+                        cls = 'json_string';
+                }
+        } else if (/true|false/.test(match)) {
+                cls = 'json_boolean';
+        } else if (/null/.test(match)) {
+                cls = 'json_null';
+        }
+        return '<span class="' + cls + '">' + match + '</span>';
     });
 }
 
@@ -5218,7 +5011,6 @@ function generic_picker_move(scope, direction) {
     }
 }
 
-
 function submit_feed_overlap_tool(feedId) {
     var result = {"Feed": [], "Server": []};
     $('#FeedLeft').children().each(function() {
@@ -5227,10 +5019,7 @@ function submit_feed_overlap_tool(feedId) {
     $('#ServerLeft').children().each(function() {
         result.Server.push($(this).val());
     });
-    $.ajax({
-        beforeSend: function (XMLHttpRequest) {
-            $(".loading").show();
-        },
+    xhr({
         data: result,
         success:function (data, textStatus) {
             if (!isNaN(data)) {
@@ -5243,12 +5032,8 @@ function submit_feed_overlap_tool(feedId) {
         error:function() {
             handleGenericAjaxResponse({'saved':false, 'errors':['Could not complete the requested action.']});
         },
-        complete:function() {
-            $(".loading").hide();
-        },
         type:"post",
-        cache: false,
-        url: baseurl + "/feeds/feedCoverage/" + feedId,
+        url: "/feeds/feedCoverage/" + feedId,
     });
 }
 
@@ -5256,7 +5041,7 @@ function fetchFormDataAjax(url, callback, errorCallback) {
     var formData = false;
     $.ajax({
         data: '[]',
-        success:function (data, textStatus) {
+        success:function (data) {
             callback(data);
         },
         error:function() {
@@ -5462,7 +5247,7 @@ function setHomePage() {
     $.ajax({
         type: 'GET',
         url: baseurl + '/userSettings/setHomePage',
-        success:function (data, textStatus) {
+        success:function (data) {
             $('#ajax_hidden_container').html(data);
             var currentPage = $('#setHomePage').data('current-page');
             $('#UserSettingPath').val(currentPage);
@@ -5470,7 +5255,7 @@ function setHomePage() {
                 type: 'POST',
                 url: baseurl + '/userSettings/setHomePage',
                 data: $('#UserSettingSetHomePageForm').serialize(),
-                success:function (data, textStatus) {
+                success:function (data) {
                     showMessage('success', 'Homepage set.');
                     $('#setHomePage').addClass('orange');
                 },

From 7b3be9362b0e6d2bfaa0c4ebf76257d174349cfc Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 19 Feb 2021 15:53:00 +0100
Subject: [PATCH 191/437] fix: [dashboard] Saving an invalid JSON when
 importing templates shows an error

---
 app/View/Dashboards/import.ctp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/View/Dashboards/import.ctp b/app/View/Dashboards/import.ctp
index 5e6acec1f..5162693cb 100644
--- a/app/View/Dashboards/import.ctp
+++ b/app/View/Dashboards/import.ctp
@@ -17,9 +17,21 @@
             ),
             'submit' => array(
                 'action' => 'import',
-                'ajaxSubmit' => "$('#DashboardImportForm').submit();"
+                'ajaxSubmit' => "submitImportDashboardForm()"
             ),
             'description' => __('Import a configuration JSON as exported from another MISP instance.')
         )
     ));
 ?>
+<script>
+function submitImportDashboardForm() {
+    var $form = $('#DashboardImportForm')
+    var json = $form.find('textarea[name="data[Dashboard][value]"]').val()
+    try {
+        json = JSON.parse(json)
+        $form.submit()
+    } catch (error) {
+        showMessage('fail', error.message)
+    }
+}
+</script>

From 2cde2970ded80369bb8909e4bcbf05bed011da14 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 19 Feb 2021 16:01:20 +0100
Subject: [PATCH 192/437] chg: [UI] Make different forms nicer

---
 .../Elements/genericElements/Form/genericForm.ctp     |  2 +-
 app/webroot/css/main.css                              | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/View/Elements/genericElements/Form/genericForm.ctp b/app/View/Elements/genericElements/Form/genericForm.ctp
index e27614500..e78638efe 100644
--- a/app/View/Elements/genericElements/Form/genericForm.ctp
+++ b/app/View/Elements/genericElements/Form/genericForm.ctp
@@ -51,7 +51,7 @@
                     }
                     $params['class'] = $class;
                 } else {
-                    if (!empty($fieldData['type']) && $fieldData['type'] != 'checkbox') {
+                    if (!empty($fieldData['type']) && ($fieldData['type'] !== 'checkbox' || $fieldData['type'] !== 'radio')) {
                         $params['class'] = 'span6';
                     }
                 }
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index ea37dab5e..0d2b5e537 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -2745,3 +2745,14 @@ td.rotate + td:not(.rotate) {
 #RoleAdminEditForm .role-permissions div.input {
    width: 160px;
 }
+
+/*
+Query builder
+ */
+.query-builder .rule-value-container label {
+    margin-right: 5px;
+}
+
+.query-builder .rule-value-container label input {
+    margin-top: 0;
+}

From 50575cbb8b61923fb5674482fe80aeba5a8aede2 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 19 Feb 2021 16:01:49 +0100
Subject: [PATCH 193/437] fix: [securityAudit] Display python version

---
 app/Lib/Tools/SecurityAudit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Lib/Tools/SecurityAudit.php b/app/Lib/Tools/SecurityAudit.php
index f97aaeed7..ff14faec6 100644
--- a/app/Lib/Tools/SecurityAudit.php
+++ b/app/Lib/Tools/SecurityAudit.php
@@ -381,13 +381,13 @@ class SecurityAudit
             if (version_compare($parts[1], '3.6', '<')) {
                 $output['System'][] = [
                     'warning',
-                    __('You are using Python %s. This version is not supported anymore, but it can be still supported by your distribution.'),
+                    __('You are using Python %s. This version is not supported anymore, but it can be still supported by your distribution.', $parts[1]),
                     'https://endoflife.date/python',
                 ];
             } else if (version_compare($parts[1], '3.7', '<')) {
                 $output['System'][] = [
                     'hint',
-                    __('You are using Python %s. This version will be not supported after 23 Dec 2021, but it can be still supported by your distribution.'),
+                    __('You are using Python %s. This version will be not supported after 23 Dec 2021, but it can be still supported by your distribution.', $parts[1]),
                     'https://endoflife.date/python',
                 ];
             }

From 4903e22f4c6172c91c4615fd4c10f53067d08e27 Mon Sep 17 00:00:00 2001
From: Andras Iklody <andras.iklody@gmail.com>
Date: Fri, 19 Feb 2021 16:33:48 +0100
Subject: [PATCH 194/437] fix: [ACL] opened up postTest to all roles

---
 app/Controller/Component/ACLComponent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php
index 73c481740..571595872 100644
--- a/app/Controller/Component/ACLComponent.php
+++ b/app/Controller/Component/ACLComponent.php
@@ -503,7 +503,7 @@ class ACLComponent extends Component
                     'import' => array(),
                     'index' => array(),
                     'ondemandAction' => array(),
-                    'postTest' => array('perm_sync'),
+                    'postTest' => array('*'),
                     'previewEvent' => array(),
                     'previewIndex' => array(),
                     'compareServers' => [],

From 55685bb236b1d84815c1daa81f94cf3367b7de12 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 19 Feb 2021 16:35:39 +0100
Subject: [PATCH 195/437] chg: [UI] Nicer Object pre-save review

---
 app/View/Objects/revise_object.ctp | 159 +++++++++++++----------------
 1 file changed, 69 insertions(+), 90 deletions(-)

diff --git a/app/View/Objects/revise_object.ctp b/app/View/Objects/revise_object.ctp
index e36bd42d2..499945e0e 100644
--- a/app/View/Objects/revise_object.ctp
+++ b/app/View/Objects/revise_object.ctp
@@ -1,3 +1,19 @@
+<?php
+if ($data['Object']['distribution'] != 4) {
+    $distribution = $distributionLevels[$data['Object']['distribution']];
+} else {
+    $distribution = $sharing_groups[$data['Object']['sharing_group_id']];
+}
+$tableData = [
+    ['key' => __('Name'), 'value' => $template['ObjectTemplate']['name']],
+    ['key' => __('Template version'), 'value' => $template['ObjectTemplate']['version']],
+    ['key' => __('Meta-category'), 'value' => $template['ObjectTemplate']['meta-category']],
+    ['key' => __('Distribution'), 'value' => $distribution],
+    ['key' => __('Comment'), 'value' => $data['Object']['comment']],
+    ['key' => __('First seen'), 'value' => $data['Object']['first_seen']],
+    ['key' => __('Last seen'), 'value' => $data['Object']['last_seen']],
+];
+?>
 <div class="form">
   <h3><?php echo __('Object pre-save review');?></h3>
   <p><?php echo __('Make sure that the below Object reflects your expectation before submitting it.');?></p>
@@ -18,7 +34,7 @@
     $formSettings['value'] = $cur_object_tmp_uuid;
     echo $this->Form->input('cur_object_tmp_uuid', $formSettings);
   ?>
-    <div class='hidden'>
+    <div class="hidden">
   <?php
     echo $this->Form->input('mergeIntoObject', array(
         'value' => 0,
@@ -26,97 +42,62 @@
     ));
   ?>
   </div>
-    <div style="margin-bottom:20px;">
-      <table class="table table-condensed table-striped">
-        <tbody>
+    <div class="row-fluid">
+        <div class="span8" style="margin-bottom: 2em">
+            <?= $this->element('genericElements/viewMetaTable', ['table_data' => $tableData]); ?>
+        </div>
+        <table id="attribute_table" class="table table-condensed table-striped">
+          <thead>
           <tr>
-            <td class="bold"><?php echo __('Name');?></td>
-            <td><?php echo h($template['ObjectTemplate']['name']); ?></td>
+            <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>
           </tr>
-          <tr>
-            <td class="bold"><?php echo __('Meta-category');?></td>
-            <td><?php echo h($template['ObjectTemplate']['meta-category']); ?></td>
-          </tr>
-          <tr>
-            <td class="bold"><?php echo __('Distribution');?></td>
-            <td><?php
-              if ($data['Object']['distribution'] != 4) {
-                echo $distributionLevels[$data['Object']['distribution']];
-              } else {
-                echo h($sharing_groups[$data['Object']['sharing_group_id']]);
-              }
-            ?></td>
-          </tr>
-          <tr>
-              <td class="bold"><?php echo __('Template version');?></td>
-              <td><?php echo h($template['ObjectTemplate']['version']); ?></td>
-          </tr>
-          <tr>
-            <td class="bold"><?php echo __('Comment');?></td>
-            <td><?php echo h($data['Object']['comment']); ?></td>
-          </tr>
-          <tr>
-            <td class="bold"><?php echo __('First seen');?></td>
-            <td><?php echo h($data['Object']['first_seen']); ?></td>
-          </tr>
-          <tr>
-            <td class="bold"><?php echo __('Last seen');?></td>
-            <td><?php echo h($data['Object']['last_seen']); ?></td>
-          </tr>
-          <tr>
-            <table id="attribute_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
-                  $simple_flattened_attribute = array();
-                  $simple_flattened_attribute_noval = array();
-                  $attributeFields = array('category', 'type', 'value', 'to_ids' , 'comment', 'uuid', 'distribution');
-                  if (!empty($data['Attribute'])):
-                    foreach ($data['Attribute'] as $id => $attribute):
-                      $cur_flat = h($attribute['object_relation']) . '.' . h($attribute['type']) . '.' .h($attribute['value']);
-                      $cur_flat_noval = h($attribute['object_relation']) . '.' . h($attribute['type']);
-                      $simple_flattened_attribute[$cur_flat] = $id;
-                      $simple_flattened_attribute_noval[$cur_flat_noval] = $id;
-                      echo sprintf('<tr data-curflat="%s" data-curflatnoval="%s">', h($cur_flat), h($cur_flat_noval));
-                      echo '<td>' . h($attribute['object_relation']) . '</td>';
-                      foreach ($attributeFields as $field) {
-                          if ($field === 'distribution') {
-                              if ($attribute['distribution'] != 4) {
-                                  $attribute[$field] = $distributionLevels[$attribute['distribution']];
-                              } else {
-                                  $attribute[$field] = $sharing_groups[$attribute['sharing_group_id']];
-                              }
-                          } else if ($field === 'to_ids') {
-                              $attribute[$field] = $attribute[$field] ? __('Yes') : __('No');
-                          }
-                          if (isset($attribute[$field])) {
-                              if (isset($attribute['validation'][$field])) {
-                                  echo '<td>' . h($attribute[$field]) . ' <i class="fas fa-times red" title="' . h(implode(', ', $attribute['validation'][$field])) . '"></i></td>';
-                              } else {
-                                  echo '<td>' . h($attribute[$field]) . '</td>';
-                              }
+          </thead>
+          <tbody>
+            <?php
+              $simple_flattened_attribute = array();
+              $simple_flattened_attribute_noval = array();
+              $attributeFields = array('category', 'type', 'value', 'to_ids' , 'comment', 'uuid', 'distribution');
+              if (!empty($data['Attribute'])):
+                foreach ($data['Attribute'] as $id => $attribute):
+                  $cur_flat = h($attribute['object_relation']) . '.' . h($attribute['type']) . '.' .h($attribute['value']);
+                  $cur_flat_noval = h($attribute['object_relation']) . '.' . h($attribute['type']);
+                  $simple_flattened_attribute[$cur_flat] = $id;
+                  $simple_flattened_attribute_noval[$cur_flat_noval] = $id;
+                  echo sprintf('<tr data-curflat="%s" data-curflatnoval="%s">', h($cur_flat), h($cur_flat_noval));
+                  echo '<td>' . h($attribute['object_relation']) . '</td>';
+                  foreach ($attributeFields as $field) {
+                      if ($field === 'distribution') {
+                          if ($attribute['distribution'] != 4) {
+                              $attribute[$field] = $distributionLevels[$attribute['distribution']];
                           } else {
-                              echo '<td></td>';
+                              $attribute[$field] = $sharing_groups[$attribute['sharing_group_id']];
                           }
+                      } else if ($field === 'to_ids') {
+                          $attribute[$field] = $attribute[$field] ? __('Yes') : __('No');
                       }
-                      echo '</tr>';
-                    endforeach;
-                  endif;
-                ?>
-              </tbody>
-            </table>
-          </tr>
-        </tbody>
-      </table>
+                      if (isset($attribute[$field])) {
+                          if (isset($attribute['validation'][$field])) {
+                              echo '<td>' . h($attribute[$field]) . ' <i class="fas fa-times red" title="' . h(implode(', ', $attribute['validation'][$field])) . '"></i></td>';
+                          } else {
+                              echo '<td>' . h($attribute[$field]) . '</td>';
+                          }
+                      } else {
+                          echo '<td></td>';
+                      }
+                  }
+                  echo '</tr>';
+                endforeach;
+              endif;
+            ?>
+          </tbody>
+        </table>
     </div>
 
     <?= $this->Form->button($action === 'add' ? __('Create new object') : __('Update object'), array('class' => 'btn btn-primary')); ?>
@@ -209,6 +190,4 @@ $(document).ready(function() {
     );
 });
 </script>
-<?php
-    echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addObject', 'event' => $event));
-?>
+<?= $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addObject', 'event' => $event));

From 4e48d937aa4d781090da2ebd2550b945002cb367 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 19 Feb 2021 16:36:46 +0100
Subject: [PATCH 196/437] chg: [UI] Put type under name for object add form

---
 app/View/Elements/Objects/object_add_attributes.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/View/Elements/Objects/object_add_attributes.ctp b/app/View/Elements/Objects/object_add_attributes.ctp
index 18fdbec12..710f26980 100644
--- a/app/View/Elements/Objects/object_add_attributes.ctp
+++ b/app/View/Elements/Objects/object_add_attributes.ctp
@@ -39,7 +39,7 @@
       if (!empty($template['ObjectTemplate']['requirements']['required']) && in_array($element['object_relation'], $template['ObjectTemplate']['requirements']['required'])) {
         echo '<span class="red" style="vertical-align: super;font-size: 8px;margin-left: 2px;" title="' . __('Required') . '"><i class="fas fa-asterisk"></i></span>';
       }
-      echo ' :: ' . h($element['type']) . '';
+      echo '<br>' . h($element['type']);
     ?>
   </td>
   <td>

From baa0deef0f5ad4082ed7205ddf7062e4768cf09a Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 19 Feb 2021 16:46:56 +0100
Subject: [PATCH 197/437] chg: [server] DBSchemaDiagnostic consider nullable
 inconsistencies as critical

---
 app/Model/Server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index 0f0cde2ad..de937e64e 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -2854,7 +2854,7 @@ class Server extends AppModel
         $allowedlistFields = array(
             'users' => array('external_auth_required', 'external_auth_key'),
         );
-        $nonCriticalColumnElements = array('is_nullable', 'collation_name');
+        $nonCriticalColumnElements = array('collation_name');
         $dbDiff = array();
         // perform schema comparison for tables
         foreach($dbExpectedSchema as $tableName => $columns) {

From c522631ce829d5848dd167d2b46143a190deb7ee Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 19 Feb 2021 17:29:06 +0100
Subject: [PATCH 198/437] fix: [server] Caching a server ensures that the
 returned data is an actual UUID

---
 app/Model/Server.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index d868cc129..a8214a1b9 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -4140,6 +4140,10 @@ class Server extends AppModel
                 $data = explode(PHP_EOL, trim($data));
                 foreach ($data as $entry) {
                     list($value, $uuid) = explode(',', $entry);
+                    if (!Validation::uuid($uuid)) {
+                        $continue = false;
+                        break;
+                    }
                     if (!empty($value)) {
                         $redis->sAdd('misp:server_cache:' . $server['Server']['id'], $value);
                         $redis->sAdd('misp:server_cache:combined', $value);

From 80ec77eec292f1fd42d9fcfc68e743763290fb8e Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Fri, 19 Feb 2021 18:16:33 +0100
Subject: [PATCH 199/437] new: [type] new dkim and dkim-signature attribute
 type

---
 app/Model/Attribute.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index a94a38fd9..6e8c70895 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -1097,6 +1097,8 @@ class Attribute extends AppModel
             case 'github-repository':
             case 'github-organisation':
             case 'twitter-id':
+            case 'dkim':
+            case 'dkim-signature':
             case 'favicon-mmh3':
             case 'chrome-extension-id':
             case 'mobile-application-id':
@@ -4625,7 +4627,7 @@ class Attribute extends AppModel
             ),
             'Network activity' => array(
                 'desc' => __('Information about network traffic generated by the malware'),
-                'types' => array('ip-src', 'ip-dst', 'ip-dst|port', 'ip-src|port', 'port', 'hostname', 'domain', 'domain|ip', 'mac-address', 'mac-eui-64', 'email', 'email-dst', 'email-src', 'eppn', 'url', 'uri', 'user-agent', 'http-method', 'AS', 'snort', 'pattern-in-file', 'filename-pattern','stix2-pattern', 'pattern-in-traffic', 'attachment', 'comment', 'text', 'x509-fingerprint-md5', 'x509-fingerprint-sha1', 'x509-fingerprint-sha256', 'ja3-fingerprint-md5', 'jarm-fingerprint', 'hassh-md5', 'hasshserver-md5', 'other', 'hex', 'cookie', 'hostname|port', 'bro', 'zeek', 'anonymised', 'community-id', 'email-subject', 'favicon-mmh3')
+                'types' => array('ip-src', 'ip-dst', 'ip-dst|port', 'ip-src|port', 'port', 'hostname', 'domain', 'domain|ip', 'mac-address', 'mac-eui-64', 'email', 'email-dst', 'email-src', 'eppn', 'url', 'uri', 'user-agent', 'http-method', 'AS', 'snort', 'pattern-in-file', 'filename-pattern','stix2-pattern', 'pattern-in-traffic', 'attachment', 'comment', 'text', 'x509-fingerprint-md5', 'x509-fingerprint-sha1', 'x509-fingerprint-sha256', 'ja3-fingerprint-md5', 'jarm-fingerprint', 'hassh-md5', 'hasshserver-md5', 'other', 'hex', 'cookie', 'hostname|port', 'bro', 'zeek', 'anonymised', 'community-id', 'email-subject', 'favicon-mmh3', 'dkim', 'dkim-signature')
             ),
             'Payload type' => array(
                 'desc' => __('Information about the final payload(s)'),
@@ -4834,6 +4836,8 @@ class Attribute extends AppModel
             'github-organisation' => array('desc' => __('A github organisation'), 'default_category' => 'Social network', 'to_ids' => 0),
             'jabber-id' => array('desc' => __('Jabber ID'), 'default_category' => 'Social network', 'to_ids' => 0),
             'twitter-id' => array('desc' => __('Twitter ID'), 'default_category' => 'Social network', 'to_ids' => 0),
+            'dkim' => array('desc' => __('DKIM public key'), 'default_category' => 'Network activity', 'to_ids' => 0),
+            'dkim-signature'=> array('desc' => __('DKIM signature'), 'default_category' => 'Network activity', 'to_ids' => 0),
             'first-name' => array('desc' => __('First name of a natural person'), 'default_category' => 'Person', 'to_ids' => 0),
             'middle-name' => array('desc' => __('Middle name of a natural person'), 'default_category' => 'Person', 'to_ids' => 0),
             'last-name' => array('desc' => __('Last name of a natural person'), 'default_category' => 'Person', 'to_ids' => 0),

From 5654b536bd20ae8e27c2ffd82142c51ec41bc65f Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 19 Feb 2021 19:41:12 +0100
Subject: [PATCH 200/437] fix: [caching] monkey-patching a client side MISP bug
 causing the caching to loop endlessly

- MISP caching can run into an endless loop if errors are returned for whatever reason
- This patch handles the specific case when the remote MISP requests an attribute range for caching that has an offset beyond the highest ID (should never happen)

- It's a dirty fix but should have nearly no impact on performance whilst resolving the issue
---
 app/Controller/AppController.php | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 4e1526cbe..a84bba45a 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -1346,6 +1346,18 @@ class AppController extends Controller
         }
         $elementCounter = 0;
         $renderView = false;
+        $responseType = empty($this->$scope->validFormats[$returnFormat][0]) ? 'json' : $this->$scope->validFormats[$returnFormat][0];
+        // halt execution if we were to query for items above the ID. Blocks the endless caching bug
+        if (!empty($filters['page']) && !empty($filters['returnFormat']) && $filters['returnFormat'] === 'cache') {
+            if ($this->__cachingOverflow($filters, $scope)) {
+                $filename = $this->RestSearch->getFilename($filters, $scope, $responseType);
+                return $this->RestResponse->viewData('', $responseType, false, true, $filename, [
+                    'X-Result-Count' => 0,
+                    'X-Export-Module-Used' => $returnFormat,
+                    'X-Response-Format' => $responseType
+                ]);
+            }
+        }
         $final = $this->$scope->restSearch($user, $returnFormat, $filters, false, false, $elementCounter, $renderView);
         if (!empty($renderView) && !empty($final)) {
             $this->layout = false;
@@ -1355,12 +1367,29 @@ class AppController extends Controller
             }
             $this->render('/Events/module_views/' . $renderView);
         } else {
-            $responseType = $this->$scope->validFormats[$returnFormat][0];
             $filename = $this->RestSearch->getFilename($filters, $scope, $responseType);
             return $this->RestResponse->viewData($final, $responseType, false, true, $filename, array('X-Result-Count' => $elementCounter, 'X-Export-Module-Used' => $returnFormat, 'X-Response-Format' => $responseType));
         }
     }
 
+    /**
+     * Halt execution if we were to query for items above the ID. Blocks the endless caching bug.
+     *
+     * @param array $filters
+     * @param string $scope
+     * @return bool
+     */
+    private function __cachingOverflow($filters, $scope)
+    {
+        $offset = ($filters['page'] * (empty($filters['limit']) ? 60 : $filters['limit'])) + 1;
+        $max_id = $this->$scope->query(sprintf('SELECT max(id) as max_id from %s;', Inflector::tableize($scope)));
+        $max_id = intval($max_id[0][0]['max_id']);
+        if ($max_id < $offset) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Returns true if user can modify given event.
      *

From c63468fd2f82efedce375da4839215c0fc48f050 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 19 Feb 2021 20:33:00 +0100
Subject: [PATCH 201/437] fix: [restsearch] fixed a bug introduced via the new
 page/limit filters

---
 app/Model/Event.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index e728ae28e..291fad727 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -6925,13 +6925,15 @@ class Event extends AppModel
         }
         $this->Allowedlist = ClassRegistry::init('Allowedlist');
         $separator = $exportTool->separator($exportToolParams);
+        unset($filters['page']);
+        unset($filters['limit']);
         foreach ($eventids_chunked as $chunk) {
             $filters['eventid'] = $chunk;
             if (!empty($filters['tags']['NOT'])) {
                 $filters['blockedAttributeTags'] = $filters['tags']['NOT'];
                 unset($filters['tags']['NOT']);
             }
-            $result = $this->fetchEvent($user, $filters,true);
+            $result = $this->fetchEvent($user, $filters, true);
             $result = $this->Allowedlist->removeAllowedlistedFromArray($result, false);
             foreach ($result as $event) {
                 if ($jobId && $i % 10 == 0) {

From 170ea2c64d9803bb52960d61f4a42b041f461cb6 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 19 Feb 2021 22:43:38 +0100
Subject: [PATCH 202/437] fix: [galaxy] GalaxyClusterRelation doesn't have Org
 and Orgc

---
 app/Controller/EventsController.php         | 3 +--
 app/Controller/GalaxiesController.php       | 3 +--
 app/Lib/Tools/ClusterRelationsGraphTool.php | 9 ++++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 0c5377b08..2a4ac84e1 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -4669,8 +4669,7 @@ class EventsController extends AppController
         $this->loadModel('GalaxyCluster');
         $clusters = $this->GalaxyCluster->fetchGalaxyClusters($this->Auth->user(), array('conditions' => array('GalaxyCluster.id' => $clusterIds)), $full=true);
         App::uses('ClusterRelationsGraphTool', 'Tools');
-        $grapher = new ClusterRelationsGraphTool();
-        $grapher->construct($this->Auth->user(), $this->GalaxyCluster);
+        $grapher = new ClusterRelationsGraphTool($this->Auth->user(), $this->GalaxyCluster);
         $relations = $grapher->getNetwork($clusters, $keepNotLinkedClusters=true, $includeReferencingRelation=true);
         if ($this->_isRest()) {
             return $this->RestResponse->viewData($relations, $this->response->type());
diff --git a/app/Controller/GalaxiesController.php b/app/Controller/GalaxiesController.php
index 7cf55d54b..15e609fc6 100644
--- a/app/Controller/GalaxiesController.php
+++ b/app/Controller/GalaxiesController.php
@@ -586,8 +586,7 @@ class GalaxiesController extends AppController
             'conditions' => array('Galaxy.id' => $galaxyId)
         ));
         App::uses('ClusterRelationsGraphTool', 'Tools');
-        $grapher = new ClusterRelationsGraphTool();
-        $grapher->construct($this->Auth->user(), $this->Galaxy->GalaxyCluster);
+        $grapher = new ClusterRelationsGraphTool($this->Auth->user(), $this->Galaxy->GalaxyCluster);
         $relations = $grapher->getNetwork($clusters);
         if ($this->_isRest()) {
             return $this->RestResponse->viewData($relations, $this->response->type());
diff --git a/app/Lib/Tools/ClusterRelationsGraphTool.php b/app/Lib/Tools/ClusterRelationsGraphTool.php
index 9585c3931..0cf558ced 100644
--- a/app/Lib/Tools/ClusterRelationsGraphTool.php
+++ b/app/Lib/Tools/ClusterRelationsGraphTool.php
@@ -1,15 +1,14 @@
 <?php
     class ClusterRelationsGraphTool
     {
-        private $GalaxyCluster = false;
-        private $user = false;
+        private $GalaxyCluster;
+        private $user;
         private $lookup = array();
 
-        public function construct($user, $GalaxyCluster)
+        public function __construct(array $user, GalaxyCluster $GalaxyCluster)
         {
             $this->GalaxyCluster = $GalaxyCluster;
             $this->user = $user;
-            return true;
         }
         
         /**
@@ -75,7 +74,7 @@
                         'conditions' => array(
                             'referenced_galaxy_cluster_uuid' => $cluster['GalaxyCluster']['uuid']
                         ),
-                        'contain' => array('Org', 'Orgc', 'SharingGroup'),
+                        'contain' => array('SharingGroup'),
                     ));
                     if (!empty($referencingRelations)) {
                         foreach ($referencingRelations as $relation) {

From feefa591e9e864701c487c66ba6d7f065fd30b50 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Sat, 20 Feb 2021 17:56:38 +0100
Subject: [PATCH 203/437] chg: [PyMISP] updated

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index 9316420dc..2ceb38c74 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 9316420dc028a1ffc541986fc08793e669f2165e
+Subproject commit 2ceb38c741f9432432114998d0c0f8fa36686083

From 2d97eb9f4d437712384da7fe09b89a0561f96a8b Mon Sep 17 00:00:00 2001
From: Patrizio Tufarolo <patrizio@tufarolo.eu>
Date: Sun, 21 Feb 2021 01:46:52 +0100
Subject: [PATCH 204/437] fix: [server] Add application/x-pie-executable to the
 list of accepted mimetypes in testForBinExec

---
 app/Model/Server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index a8214a1b9..0ce5cabae 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -1536,7 +1536,7 @@ class Server extends AppModel
             return true;
         }
         if (is_executable($value)) {
-            if (finfo_file($finfo, $value) == "application/x-executable" || finfo_file($finfo, $value) == "application/x-sharedlib") {
+            if (finfo_file($finfo, $value) == "application/x-executable" || finfo_file($finfo, $value) == "application/x-pie-executable" || finfo_file($finfo, $value) == "application/x-sharedlib") {
                 finfo_close($finfo);
                 return true;
             } else {

From 7d9251e7ad63eaf744717ac32c2c1db3c75f9998 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Sun, 21 Feb 2021 07:30:47 +0100
Subject: [PATCH 205/437] fix: [schema feed] remove non-required fields in feed
 format

---
 app/files/feed-metadata/schema.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/files/feed-metadata/schema.json b/app/files/feed-metadata/schema.json
index 19a225b38..ce859a77f 100644
--- a/app/files/feed-metadata/schema.json
+++ b/app/files/feed-metadata/schema.json
@@ -87,20 +87,16 @@
         }
       },
       "required": [
-        "id",
         "name",
         "provider",
         "url",
         "rules",
         "enabled",
         "distribution",
-        "sharing_group_id",
-        "tag_id",
         "default",
         "source_format",
         "fixed_event",
         "delta_merge",
-        "event_id",
         "publish",
         "override_ids",
         "settings",
@@ -133,11 +129,9 @@
         }
       },
       "required": [
-        "id",
         "name",
         "colour",
         "exportable",
-        "org_id",
         "hide_tag"
       ]
     }

From bc04f6966d83cd8c17716e21fb51b2e5032fcc74 Mon Sep 17 00:00:00 2001
From: eCrimeLabs <rand@ecrime.dk>
Date: Sun, 21 Feb 2021 14:50:43 +0100
Subject: [PATCH 206/437] Fix for #7040 and #7039

The following commit contains the fix for ZeroMQ only listening on 0.0.0.0
---
 app/Lib/Tools/PubSubTool.php         | 1 +
 app/Model/Server.php                 | 9 +++++++++
 app/files/scripts/mispzmq/mispzmq.py | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/Lib/Tools/PubSubTool.php b/app/Lib/Tools/PubSubTool.php
index d6a53ab41..a33080821 100644
--- a/app/Lib/Tools/PubSubTool.php
+++ b/app/Lib/Tools/PubSubTool.php
@@ -273,6 +273,7 @@ class PubSubTool
             'redis_password' => '',
             'redis_database' => '1',
             'redis_namespace' => 'mispq',
+            'host' => '127.0.0.1',
             'port' => '50000',
             'username' => null,
             'password' => null,
diff --git a/app/Model/Server.php b/app/Model/Server.php
index a8214a1b9..e1c977123 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -6220,6 +6220,15 @@ class Server extends AppModel
                     'type' => 'boolean',
                     'afterHook' => 'zmqAfterHook',
                 ),
+                'ZeroMQ_host' => array(
+                    'level' => 2,
+                    'description' => __('The host that the pub/sub feature will use.'),
+                    'value' => '127.0.0.1',
+                    'errorMessage' => '',
+                    'test' => 'testForEmpty',
+                    'type' => 'string',
+                    'afterHook' => 'zmqAfterHook',
+                ),
                 'ZeroMQ_port' => array(
                     'level' => 2,
                     'description' => __('The port that the pub/sub feature will use.'),
diff --git a/app/files/scripts/mispzmq/mispzmq.py b/app/files/scripts/mispzmq/mispzmq.py
index 7325822db..f9b08e9a5 100644
--- a/app/files/scripts/mispzmq/mispzmq.py
+++ b/app/files/scripts/mispzmq/mispzmq.py
@@ -102,8 +102,8 @@ class MispZmq:
         self.socket = context.socket(zmq.PUB)
         if self.settings["username"]:
             self.socket.plain_server = True  # must come before bind
-        self.socket.bind("tcp://*:{}".format(self.settings["port"]))
-        self._logger.debug("ZMQ listening on tcp://*:{}".format(self.settings["port"]))
+        self.socket.bind("tcp://{}:{}".format(self.settings["host"], self.settings["port"]))
+        self._logger.debug("ZMQ listening on tcp://{}:{}".format(self.settings["host"], self.settings["port"]))
 
         if self._logger.isEnabledFor(logging.DEBUG):
             monitor = self.socket.get_monitor_socket()

From 131c9e15ce288eee752e2eff031f07dc27e4b375 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <pinoy.jeroen@gmail.com>
Date: Sun, 21 Feb 2021 22:27:08 +0000
Subject: [PATCH 207/437] chg: Add can access check for correlation exclusions
 menu entry

---
 app/View/Elements/global_menu.ctp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp
index 0e76159dd..60feef643 100755
--- a/app/View/Elements/global_menu.ctp
+++ b/app/View/Elements/global_menu.ctp
@@ -170,10 +170,11 @@
                         'text' => __('List Noticelists'),
                         'url' => $baseurl . '/noticelists/index'
                     ),
-                    [
+                    array(
                         'text' => __('List Correlation Exclusions'),
-                        'url' => $baseurl . '/correlation_exclusions/index'
-                    ]
+			'url' => $baseurl . '/correlation_exclusions/index',
+			'requirement' => $canAccess('correlation_exclusions', 'index'),
+                    )
                 )
             ),
             array(

From 28b6a9066be345623677f5f5fef859bf815f9819 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 21 Feb 2021 16:26:02 +0100
Subject: [PATCH 208/437] chg: [internal] Faster fetching galaxy clusters when
 fetching event

---
 app/Controller/EventsController.php     |  23 ++---
 app/Lib/Tools/DistributionGraphTool.php |   1 +
 app/Model/Event.php                     | 114 +++++++++++++++++++++++-
 app/Model/GalaxyCluster.php             |  31 +++++--
 app/Model/GalaxyClusterRelation.php     |   1 -
 5 files changed, 147 insertions(+), 23 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 0c5377b08..761961a6a 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -1025,7 +1025,17 @@ class EventsController extends AppController
         if (isset($filters['focus'])) {
             $this->set('focus', $filters['focus']);
         }
-        $conditions = array('eventid' => $id);
+        $conditions = [
+            'eventid' => $id,
+            'includeFeedCorrelations' => true,
+            'includeWarninglistHits' => true,
+            'fetchFullClusters' => false,
+            'includeAllTags' => true,
+            'includeGranularCorrelations' => true,
+            'includeEventCorrelations' => false,
+            'noEventReports' => true, // event reports for view are loaded dynamically
+            'noSightings' => true,
+        ];
         if (isset($filters['extended'])) {
             $conditions['extended'] = 1;
             $this->set('extended', 1);
@@ -1048,21 +1058,11 @@ class EventsController extends AppController
         if (isset($filters['toIDS']) && $filters['toIDS'] != 0) {
             $conditions['to_ids'] = $filters['toIDS'] == 2 ? 0 : 1;
         }
-        $conditions['includeFeedCorrelations'] = true;
-        $conditions['includeWarninglistHits'] = true;
         if (!isset($filters['includeServerCorrelations'])) {
             $conditions['includeServerCorrelations'] = 1;
-            if ($this->_isRest()) {
-                $conditions['includeServerCorrelations'] = 0;
-            }
         } else {
             $conditions['includeServerCorrelations'] = $filters['includeServerCorrelations'];
         }
-        $conditions['includeAllTags'] = true;
-        $conditions['includeGranularCorrelations'] = 1;
-        $conditions['includeEventCorrelations'] = false;
-        $conditions['noEventReports'] = true; // event reports for view are loaded dynamically
-        $conditions['noSightings'] = true;
         if (!empty($filters['includeRelatedTags'])) {
             $this->set('includeRelatedTags', 1);
             $conditions['includeRelatedTags'] = 1;
@@ -1512,6 +1512,7 @@ class EventsController extends AppController
             $conditions['includeAllTags'] = true;
             $conditions['noEventReports'] = true; // event reports for view are loaded dynamically
             $conditions['noSightings'] = true;
+            $conditions['fetchFullClusters'] = false;
         }
         $deleted = 0;
         if (isset($this->params['named']['deleted'])) {
diff --git a/app/Lib/Tools/DistributionGraphTool.php b/app/Lib/Tools/DistributionGraphTool.php
index 2f44debbc..edcd34fb4 100644
--- a/app/Lib/Tools/DistributionGraphTool.php
+++ b/app/Lib/Tools/DistributionGraphTool.php
@@ -116,6 +116,7 @@ class DistributionGraphTool
             'noShadowAttributes' => true,
             'noEventReports' => true,
             'noSightings' => true,
+            'excludeGalaxy' => true,
             'includeEventCorrelations' => false,
             'extended' => $this->__extended_view,
         ));
diff --git a/app/Model/Event.php b/app/Model/Event.php
index c03cbba42..1869bdbd4 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -1843,7 +1843,7 @@ class Event extends AppModel
             'eventsExtendingUuid',
             'extended',
             'excludeGalaxy',
-            'includeCustomGalaxyCluster',
+            'includeCustomGalaxyCluster', // not used
             'includeRelatedTags',
             'excludeLocalTags',
             'includeDecayScore',
@@ -1863,6 +1863,9 @@ class Event extends AppModel
         if (!isset($options['includeEventCorrelations'])) {
             $options['includeEventCorrelations'] = true;
         }
+        if (!isset($options['fetchFullClusters'])) {
+            $options['fetchFullClusters'] = true;
+        }
         foreach ($possibleOptions as $opt) {
             if (!isset($options[$opt])) {
                 $options[$opt] = false;
@@ -2209,6 +2212,7 @@ class Event extends AppModel
             }
             $this->__attachReferences($event, $fields);
             $this->__attachTags($event, $justExportableTags);
+            $this->__attachGalaxies($event, $user, $options['excludeGalaxy'], $options['fetchFullClusters']);
             $event = $this->Orgc->attachOrgs($event, $fieldsOrg);
             if (!$options['sgReferenceOnly'] && $event['Event']['sharing_group_id']) {
                 $event['SharingGroup'] = $sharingGroupData[$event['Event']['sharing_group_id']]['SharingGroup'];
@@ -2230,7 +2234,6 @@ class Event extends AppModel
                 }
                 $event['User']['email'] = $userEmail;
             }
-            $event = $this->massageTags($user, $event, 'Event', $options['excludeGalaxy']);
             // Let's find all the related events and attach it to the event itself
             if ($options['includeEventCorrelations']) {
                 $results[$eventKey]['RelatedEvent'] = $this->getRelatedEvents($user, $event['Event']['id'], $sgids);
@@ -2279,7 +2282,6 @@ class Event extends AppModel
                         unset($event['Attribute'][$key]);
                         continue;
                     }
-                    $event['Attribute'][$key] = $this->massageTags($user, $event['Attribute'][$key], 'Attribute', $options['excludeGalaxy']);
                     if ($attribute['category'] === 'Financial fraud') {
                         $event['Attribute'][$key] = $this->Attribute->attachValidationWarnings($event['Attribute'][$key]);
                     }
@@ -2381,6 +2383,104 @@ class Event extends AppModel
         return $results;
     }
 
+    /**
+     * Attach galaxy clusters to event and attributes.
+     * @param array $event
+     * @param array $user
+     * @param bool $excludeGalaxy
+     * @param bool $fetchFullCluster
+     */
+    private function __attachGalaxies(array &$event, array $user, $excludeGalaxy, $fetchFullCluster)
+    {
+        $galaxyTags = [];
+        $event['Galaxy'] = [];
+        if (!$excludeGalaxy && isset($event['EventTag'])) {
+            foreach ($event['EventTag'] as $eventTag) {
+                if ($eventTag['Tag']['is_galaxy']) {
+                    $galaxyTags[$eventTag['Tag']['id']] = $eventTag['Tag']['name'];
+                }
+            }
+        }
+        if (isset($event['Attribute'])) {
+            foreach ($event['Attribute'] as &$attribute) {
+                $attribute['Galaxy'] = [];
+                if (!$excludeGalaxy && isset($attribute['AttributeTag'])) {
+                    foreach ($attribute['AttributeTag'] as $attributeTag) {
+                        if ($attributeTag['Tag']['is_galaxy']) {
+                            $galaxyTags[$attributeTag['Tag']['id']] = $attributeTag['Tag']['name'];
+                        }
+                    }
+                }
+            }
+        }
+
+        if ($excludeGalaxy || empty($galaxyTags)) {
+            return;
+        }
+
+        $this->GalaxyCluster = ClassRegistry::init('GalaxyCluster');
+        $clusters = $this->GalaxyCluster->getClusters($galaxyTags, $user, true, $fetchFullCluster);
+
+        if (empty($clusters)) {
+            return;
+        }
+
+        $clustersByTagNames = [];
+        foreach ($clusters as $cluster) {
+            $clustersByTagNames[mb_strtolower($cluster['GalaxyCluster']['tag_name'])] = $cluster['GalaxyCluster'];
+        }
+        unset($clusters);
+
+        if (isset($event['EventTag'])) {
+            foreach ($event['EventTag'] as $etk => $eventTag) {
+                if (!$eventTag['Tag']['is_galaxy']) {
+                    continue;
+                }
+                $tagName = mb_strtolower($eventTag['Tag']['name']);
+                if (isset($clustersByTagNames[$tagName])) {
+                    $cluster = $clustersByTagNames[$tagName];
+                    $galaxyId = $cluster['Galaxy']['id'];
+                    $cluster['local'] = isset($eventTag['local']) ? $eventTag['local'] : false;
+                    if (isset($event['Galaxy'][$galaxyId])) {
+                        unset($cluster['Galaxy']);
+                        $event['Galaxy'][$galaxyId]['GalaxyCluster'][] = $cluster;
+                    } else {
+                        $event['Galaxy'][$galaxyId] = $cluster['Galaxy'];
+                        unset($cluster['Galaxy']);
+                        $event['Galaxy'][$galaxyId]['GalaxyCluster'] = [$cluster];
+                    }
+                }
+            }
+            $event['Galaxy'] = array_values($event['Galaxy']);
+        }
+        if (isset($event['Attribute'])) {
+            foreach ($event['Attribute'] as &$attribute) {
+                if (isset($attribute['AttributeTag'])) {
+                    foreach ($attribute['AttributeTag'] as $attributeTag) {
+                        if (!$attributeTag['Tag']['is_galaxy']) {
+                            continue;
+                        }
+                        $tagName = mb_strtolower($attributeTag['Tag']['name']);
+                        if (isset($clustersByTagNames[$tagName])) {
+                            $cluster = $clustersByTagNames[$tagName];
+                            $galaxyId = $cluster['Galaxy']['id'];
+                            $cluster['local'] = isset($attributeTag['local']) ? $attributeTag['local'] : false;
+                            if (isset($attribute['Galaxy'][$galaxyId])) {
+                                unset($cluster['Galaxy']);
+                                $attribute['Galaxy'][$galaxyId]['GalaxyCluster'][] = $cluster;
+                            } else {
+                                $attribute['Galaxy'][$galaxyId] = $cluster['Galaxy'];
+                                unset($cluster['Galaxy']);
+                                $attribute['Galaxy'][$galaxyId]['GalaxyCluster'] = [$cluster];
+                            }
+                        }
+                    }
+                    $attribute['Galaxy'] = array_values($attribute['Galaxy']);
+                }
+            }
+        }
+    }
+
     private function __cacheRelatedEventTags($eventTagCache, array $relatedAttribute, $excludeLocalTags)
     {
         if (!isset($eventTagCache[$relatedAttribute['id']])) {
@@ -6795,9 +6895,13 @@ class Event extends AppModel
             foreach ($event['EventTag'] as $etk => $eventTag) {
                 $tag = $this->__getCachedTag($eventTag['tag_id'], $justExportable);
                 if ($tag !== null) {
+                    $tag['local'] = empty($eventTag['local']) ? 0 : 1;
                     $event['EventTag'][$etk]['Tag'] = $tag;
+                } else {
+                    unset($event['EventTag'][$etk]);
                 }
             }
+            $event['EventTag'] = array_values($event['EventTag']);
         }
         if (!empty($event['Attribute'])) {
             foreach ($event['Attribute'] as $ak => $attribute) {
@@ -6805,9 +6909,13 @@ class Event extends AppModel
                     foreach ($attribute['AttributeTag'] as $atk => $attributeTag) {
                         $tag = $this->__getCachedTag($attributeTag['tag_id'], $justExportable);
                         if ($tag !== null) {
+                            $tag['local'] = empty($attributeTag['local']) ? 0 : 1;
                             $event['Attribute'][$ak]['AttributeTag'][$atk]['Tag'] = $tag;
+                        } else {
+                            unset($event['Attribute'][$ak]['AttributeTag'][$atk]);
                         }
                     }
+                    $event['Attribute'][$ak]['AttributeTag'] = array_values($event['Attribute'][$ak]['AttributeTag']);
                 }
             }
         }
diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 54e88fa21..2c4d04a01 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -2,6 +2,9 @@
 App::uses('AppModel', 'Model');
 App::uses('TmpFileTool', 'Tools');
 
+/**
+ * @property Tag $Tag
+ */
 class GalaxyCluster extends AppModel
 {
     public $useTable = 'galaxy_clusters';
@@ -905,21 +908,33 @@ class GalaxyCluster extends AppModel
      * @param bool $fetchFullCluster
      * @return array
      */
-    public function getClusters(array $namesOrIds, array $user, $postProcess = true)
+    public function getClusters(array $namesOrIds, array $user, $postProcess = true, $fetchFullCluster = true)
     {
-        $conditions = array();
         if (count(array_filter($namesOrIds, 'is_numeric')) === count($namesOrIds)) { // all elements are numeric
-            $conditions[] = array('GalaxyCluster.id' => $namesOrIds);
+            $conditions = array('GalaxyCluster.id' => $namesOrIds);
         } else {
-            $conditions[] = array('LOWER(GalaxyCluster.tag_name)' => array_map('strtolower', $namesOrIds));
+            $conditions = array('LOWER(GalaxyCluster.tag_name)' => array_map('strtolower', $namesOrIds));
         }
-        $clusters = $this->fetchGalaxyClusters($user, array(
-            'conditions' => $conditions,
-        ), true);
+
+        $options = ['conditions' => $conditions];
+        if (!$fetchFullCluster) {
+            $options['contain'] = ['Galaxy'];
+        }
+
+        $clusters = $this->fetchGalaxyClusters($user, $options, $fetchFullCluster);
 
         if (!empty($clusters) && $postProcess) {
+            $tagNames = array_map('strtolower', array_column(array_column($clusters, 'GalaxyCluster'), 'tag_name'));
+            $tagIds = $this->Tag->find('list', [
+                'conditions' => ['LOWER(Tag.name)' => $tagNames],
+                'recursive' => -1,
+                'fields' => array('Tag.name', 'Tag.id'),
+            ]);
+            $tagIds = array_change_key_case($tagIds);
+
             foreach ($clusters as $k => $cluster) {
-                $clusters[$k] = $this->postprocess($cluster);
+                $tagName = strtolower($cluster['GalaxyCluster']['tag_name']);
+                $clusters[$k] = $this->postprocess($cluster, isset($tagIds[$tagName]) ? $tagIds[$tagName] : null);
             }
         }
 
diff --git a/app/Model/GalaxyClusterRelation.php b/app/Model/GalaxyClusterRelation.php
index 6aa79bdb8..1f046409e 100644
--- a/app/Model/GalaxyClusterRelation.php
+++ b/app/Model/GalaxyClusterRelation.php
@@ -85,7 +85,6 @@ class GalaxyClusterRelation extends AppModel
         if (!$user['Role']['perm_site_admin']) {
             $alias = $this->alias;
             $sgids = $this->Event->cacheSgids($user, true);
-            $gcids = $this->SourceCluster->cacheGalaxyClusterIDs($user);
             $gcOwnerIds = $this->SourceCluster->cacheGalaxyClusterOwnerIDs($user);
             $conditionsRelations['AND']['OR'] = [
                 "${alias}.galaxy_cluster_id" => $gcOwnerIds,

From e7b7f5c18eb2a53ff418f8f601642fe9719c113d Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 22 Feb 2021 08:53:13 +0100
Subject: [PATCH 209/437] new: [api] When creating object, allow to mark tag as
 local

---
 app/Model/AttributeTag.php | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/Model/AttributeTag.php b/app/Model/AttributeTag.php
index e3a71f3c9..9894d7844 100644
--- a/app/Model/AttributeTag.php
+++ b/app/Model/AttributeTag.php
@@ -118,27 +118,43 @@ class AttributeTag extends AppModel
         }
     }
 
-    public function handleAttributeTag($attribute_id, $event_id, $tag)
+    public function handleAttributeTag($attribute_id, $event_id, array $tag)
     {
         if (empty($tag['deleted'])) {
-            $this->attachTagToAttribute($attribute_id, $event_id, $tag['id']);
+            $local = isset($tag['local']) ? $tag['local'] : false;
+            $this->attachTagToAttribute($attribute_id, $event_id, $tag['id'], $local);
         } else {
             $this->detachTagFromAttribute($attribute_id, $event_id, $tag['id']);
         }
     }
 
-    public function attachTagToAttribute($attribute_id, $event_id, $tag_id)
+    /**
+     * @param int $attribute_id
+     * @param int $event_id
+     * @param int $tag_id
+     * @param bool $local
+     * @return bool
+     * @throws Exception
+     */
+    public function attachTagToAttribute($attribute_id, $event_id, $tag_id, $local = false)
     {
         $existingAssociation = $this->find('first', array(
             'recursive' => -1,
+            'fields' => ['id'],
             'conditions' => array(
                 'tag_id' => $tag_id,
                 'attribute_id' => $attribute_id
             )
         ));
         if (empty($existingAssociation)) {
+            $data = [
+                'attribute_id' => $attribute_id,
+                'event_id' => $event_id,
+                'tag_id' => $tag_id,
+                'local' => $local ? 1 : 0,
+            ];
             $this->create();
-            if (!$this->save(array('attribute_id' => $attribute_id, 'event_id' => $event_id, 'tag_id' => $tag_id))) {
+            if (!$this->save($data)) {
                 return false;
             }
         }
@@ -149,6 +165,7 @@ class AttributeTag extends AppModel
     {
         $existingAssociation = $this->find('first', array(
             'recursive' => -1,
+            'fields' => ['id'],
             'conditions' => array(
                 'tag_id' => $tag_id,
                 'event_id' => $event_id,

From aed61504c8f18cc4c4c805149a880023109b51f8 Mon Sep 17 00:00:00 2001
From: adammchugh <34958726+adammchugh@users.noreply.github.com>
Date: Mon, 22 Feb 2021 22:06:59 +1030
Subject: [PATCH 210/437] Inclusion of full-name under person

Proposing the inclusion of full-name under person to allow for better capture and correlation of full names of identified persons in events. Particularly where there are multiple identities within an event which may create confusion with multiple first-name and last-name entries.
---
 app/Model/Attribute.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 6e8c70895..a2798edcc 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -1033,6 +1033,7 @@ class Attribute extends AppModel
             case 'first-name':
             case 'middle-name':
             case 'last-name':
+            case 'full-name':
                 $returnValue = true;
                 break;
             case 'link':
@@ -4659,7 +4660,7 @@ class Attribute extends AppModel
             ),
             'Person' => array(
                 'desc' => __('A human being - natural person'),
-                'types' => array('first-name', 'middle-name', 'last-name', 'date-of-birth', 'place-of-birth', 'gender', 'passport-number', 'passport-country', 'passport-expiration', 'redress-number', 'nationality', 'visa-number', 'issue-date-of-the-visa', 'primary-residence', 'country-of-residence', 'special-service-request', 'frequent-flyer-number', 'travel-details', 'payment-details', 'place-port-of-original-embarkation', 'place-port-of-clearance', 'place-port-of-onward-foreign-destination', 'passenger-name-record-locator-number', 'comment', 'text', 'other', 'phone-number', 'identity-card-number', 'anonymised', 'email', 'pgp-public-key', 'pgp-private-key')
+                'types' => array('first-name', 'middle-name', 'last-name', 'full-name', 'date-of-birth', 'place-of-birth', 'gender', 'passport-number', 'passport-country', 'passport-expiration', 'redress-number', 'nationality', 'visa-number', 'issue-date-of-the-visa', 'primary-residence', 'country-of-residence', 'special-service-request', 'frequent-flyer-number', 'travel-details', 'payment-details', 'place-port-of-original-embarkation', 'place-port-of-clearance', 'place-port-of-onward-foreign-destination', 'passenger-name-record-locator-number', 'comment', 'text', 'other', 'phone-number', 'identity-card-number', 'anonymised', 'email', 'pgp-public-key', 'pgp-private-key')
             ),
             'Other' => array(
                 'desc' => __('Attributes that are not part of any other category or are meant to be used as a component in MISP objects in the future'),
@@ -4841,6 +4842,7 @@ class Attribute extends AppModel
             'first-name' => array('desc' => __('First name of a natural person'), 'default_category' => 'Person', 'to_ids' => 0),
             'middle-name' => array('desc' => __('Middle name of a natural person'), 'default_category' => 'Person', 'to_ids' => 0),
             'last-name' => array('desc' => __('Last name of a natural person'), 'default_category' => 'Person', 'to_ids' => 0),
+            'full-name' => array('desc' => __('Full name of a natural person'), 'default_category' => 'Person', 'to_ids' => 0),
             'date-of-birth' => array('desc' => __('Date of birth of a natural person (in YYYY-MM-DD format)'), 'default_category' => 'Person', 'to_ids' => 0),
             'place-of-birth' => array('desc' => __('Place of birth of a natural person'), 'default_category' => 'Person', 'to_ids' => 0),
             'gender' => array('desc' => __('The gender of a natural person (Male, Female, Other, Prefer not to say)'), 'default_category' => 'Person', 'to_ids' => 0),

From 0e280c443faaef46457b6963862eb322524460cc Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 22 Feb 2021 14:16:43 +0100
Subject: [PATCH 211/437] fix: [API] password reset was broken for admins

---
 app/Controller/UsersController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index 5ba9cef94..765d5891c 100644
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -937,8 +937,8 @@ class UsersController extends AppController
                     }
                 }
                 if (
-                    isset($this->request->data['User']['enable_password']) && $this->request->data['User']['enable_password'] != '0' &&
-                    isset($this->request->data['User']['password']) && "" != $this->request->data['User']['password']
+                    (!empty($this->request->data['User']['enable_password']) || $this->_isRest()) &&
+                    !empty($this->request->data['User']['password'])
                 ) {
                     $fields[] = 'password';
                     if ($this->_isRest() && !isset($this->request->data['User']['confirm_password'])) {

From 7b0067d3814ced6602cda967943a31fc2741aaaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <Rafiot@users.noreply.github.com>
Date: Mon, 22 Feb 2021 14:21:46 +0100
Subject: [PATCH 212/437] Update misp-wipe.sql

Rename whitelist -> allowedlist / blacklist -> blocklist
---
 tools/misp-wipe/misp-wipe.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/misp-wipe/misp-wipe.sql b/tools/misp-wipe/misp-wipe.sql
index f7eccb053..8585e9d28 100644
--- a/tools/misp-wipe/misp-wipe.sql
+++ b/tools/misp-wipe/misp-wipe.sql
@@ -4,7 +4,7 @@ TRUNCATE `attribute_tags`;
 TRUNCATE `cake_sessions`;
 TRUNCATE `correlations`;
 TRUNCATE `events`;
-TRUNCATE `event_blacklists`;
+TRUNCATE `event_blocklists`;
 TRUNCATE `event_delegations`;
 TRUNCATE `event_graph`;
 TRUNCATE `event_tags`;
@@ -17,7 +17,7 @@ TRUNCATE `object_references`;
 TRUNCATE `object_relationships`;
 TRUNCATE `object_templates`;
 TRUNCATE `object_template_elements`;
-TRUNCATE `org_blacklists`;
+TRUNCATE `org_blocklists`;
 TRUNCATE `posts`;
 TRUNCATE `rest_client_histories`;
 TRUNCATE `servers`;
@@ -34,7 +34,7 @@ TRUNCATE `threads`;
 TRUNCATE `bruteforces`;
 TRUNCATE `news`;
 TRUNCATE `template_tags`;
-TRUNCATE `whitelist`;
+TRUNCATE `allowedlist`;
 TRUNCATE `event_locks`;
 TRUNCATE `fuzzy_correlate_ssdeep`;
 TRUNCATE `tasks`;

From 0ba05044bf374892c4e4ea5967ca3f265937acc3 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 22 Feb 2021 20:30:36 +0100
Subject: [PATCH 213/437] fix: [internal] Really disable password change

---
 app/Controller/UsersController.php | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index 765d5891c..f93d27316 100644
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -922,23 +922,13 @@ class UsersController extends AppController
                         continue;
                     }
                     if ($field != 'password') {
-                        array_push($fields, $field);
-                    }
-                }
-                $fieldsOldValues = array();
-                foreach ($fields as $field) {
-                    if ($field == 'enable_password') {
-                        continue;
-                    }
-                    if ($field != 'confirm_password') {
-                        $fieldsOldValues[$field] = $this->User->field($field);
-                    } else {
-                        $fieldsOldValues[$field] = $this->User->field('password');
+                        $fields[] = $field;
                     }
                 }
                 if (
                     (!empty($this->request->data['User']['enable_password']) || $this->_isRest()) &&
-                    !empty($this->request->data['User']['password'])
+                    !empty($this->request->data['User']['password']) &&
+                    $this->__canChangePassword()
                 ) {
                     $fields[] = 'password';
                     if ($this->_isRest() && !isset($this->request->data['User']['confirm_password'])) {
@@ -958,6 +948,12 @@ class UsersController extends AppController
                     }
                 }
                 $fields[] = 'date_modified'; // time will be inserted in `beforeSave` action
+
+                $fieldsOldValues = $this->User->find('first', [
+                    'recursive' => -1,
+                    'conditions' => ['id' => $id],
+                ])['User'];
+
                 if ($this->User->save($this->request->data, true, $fields)) {
                     // newValues to array
                     $fieldsNewValues = array();
@@ -967,7 +963,7 @@ class UsersController extends AppController
                         }
                         if ($field !== 'confirm_password') {
                             $newValue = $this->data['User'][$field];
-                            if (gettype($newValue) == 'array') {
+                            if (is_array($newValue)) {
                                 $newValueStr = '';
                                 $cP = 0;
                                 foreach ($newValue as $newValuePart) {
@@ -989,6 +985,9 @@ class UsersController extends AppController
                     // compare
                     $fieldsResult = array();
                     foreach ($fields as $field) {
+                        if ($field === 'date_modified') {
+                            continue;
+                        }
                         if (isset($fieldsOldValues[$field]) && $fieldsOldValues[$field] != $fieldsNewValues[$field]) {
                             if ($field != 'confirm_password' && $field != 'enable_password') {
                                 $fieldsResult[$field] = array($fieldsOldValues[$field], $fieldsNewValues[$field]);

From b9b13c56def0e251654478ab6951ac05e8189735 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 23 Feb 2021 08:28:42 +0100
Subject: [PATCH 214/437] fix: [internal] perm_tag_editor can just create tags

---
 app/Controller/TagsController.php | 70 ++++++++++---------------------
 app/Model/Role.php                |  2 +-
 2 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/app/Controller/TagsController.php b/app/Controller/TagsController.php
index 44d4bc2b2..202983b2e 100644
--- a/app/Controller/TagsController.php
+++ b/app/Controller/TagsController.php
@@ -139,9 +139,6 @@ class TagsController extends AppController
 
     public function add()
     {
-        if (!$this->_isSiteAdmin() && !$this->userRole['perm_tag_editor']) {
-            throw new NotFoundException('You don\'t have permission to do that.');
-        }
         if ($this->request->is('post')) {
             if (!isset($this->request->data['Tag'])) {
                 $this->request->data = array('Tag' => $this->request->data);
@@ -192,31 +189,22 @@ class TagsController extends AppController
         } elseif ($this->_isRest()) {
             return $this->RestResponse->describe('Tag', 'add', false, $this->response->type());
         }
-        $this->loadModel('Organisation');
-        $temp = $this->Organisation->find('all', array(
+
+        $orgs = $this->Tag->Organisation->find('list', array(
             'conditions' => array('local' => 1),
             'fields' => array('id', 'name'),
-            'recursive' => -1
+            'order' => 'name',
         ));
-        $orgs = array(0 => 'Unrestricted');
-        if (!empty($temp)) {
-            foreach ($temp as $org) {
-                $orgs[$org['Organisation']['id']] = $org['Organisation']['name'];
-            }
-        }
+        $orgs = [0 => 'Unrestricted'] + $orgs;
         $this->set('orgs', $orgs);
-        $users = array(0 => 'Unrestricted');
+
         if ($this->_isSiteAdmin()) {
-            $temp = $this->Organisation->User->find('all', array(
+            $users = $this->Tag->User->find('list', array(
                 'conditions' => array('disabled' => 0),
                 'fields' => array('id', 'email'),
-                'recursive' => -1
+                'order' => 'email',
             ));
-            if (!empty($temp)) {
-                foreach ($temp as $user) {
-                    $users[$user['User']['id']] = $user['User']['email'];
-                }
-            }
+            $users = [0 => 'Unrestricted'] + $users;
             $this->set('users', $users);
         }
     }
@@ -247,9 +235,6 @@ class TagsController extends AppController
                 throw new NotFoundException('Invalid tag');
             }
         }
-        if (!$this->_isSiteAdmin()) {
-            throw new NotFoundException('You don\'t have permission to do that.');
-        }
         if ($this->request->is('post') || $this->request->is('put')) {
             if (!isset($this->request->data['Tag'])) {
                 $this->request->data = array('Tag' => $this->request->data);
@@ -280,41 +265,28 @@ class TagsController extends AppController
         } elseif ($this->_isRest()) {
             return $this->RestResponse->describe('Tag', 'edit', false, $this->response->type());
         }
-        $this->loadModel('Organisation');
-        $temp = $this->Organisation->find('all', array(
+
+        $orgs = $this->Tag->Organisation->find('list', array(
             'conditions' => array('local' => 1),
             'fields' => array('id', 'name'),
-            'recursive' => -1
+            'order' => 'name',
         ));
-        $orgs = array(0 => 'Unrestricted');
-        if (!empty($temp)) {
-            foreach ($temp as $org) {
-                $orgs[$org['Organisation']['id']] = $org['Organisation']['name'];
-            }
-        }
+        $orgs = [0 => 'Unrestricted'] + $orgs;
         $this->set('orgs', $orgs);
-        $users = array(0 => 'Unrestricted');
-        if ($this->_isSiteAdmin()) {
-            $temp = $this->Organisation->User->find('all', array(
-                'conditions' => array('disabled' => 0),
-                'fields' => array('id', 'email'),
-                'recursive' => -1
-            ));
-            if (!empty($temp)) {
-                foreach ($temp as $user) {
-                    $users[$user['User']['id']] = $user['User']['email'];
-                }
-            }
-            $this->set('users', $users);
-        }
+
+        $users = $this->Tag->User->find('list', array(
+            'conditions' => array('disabled' => 0),
+            'fields' => array('id', 'email'),
+            'order' => 'email',
+        ));
+        $users = [0 => 'Unrestricted'] + $users;
+        $this->set('users', $users);
+
         $this->request->data = $this->Tag->read(null, $id);
     }
 
     public function delete($id)
     {
-        if (!$this->_isSiteAdmin()) {
-            throw new NotFoundException('You don\'t have permission to do that.');
-        }
         if (!$this->request->is('post')) {
             throw new MethodNotAllowedException();
         }
diff --git a/app/Model/Role.php b/app/Model/Role.php
index c43e0ab3c..a48e7703e 100644
--- a/app/Model/Role.php
+++ b/app/Model/Role.php
@@ -107,7 +107,7 @@ class Role extends AppModel
             'id' => 'RolePermTagEditor',
             'text' => 'Tag Editor',
             'readonlyenabled' => false,
-            'title' => 'This permission gives users the ability to create, modify or remove tags.'
+            'title' => 'This permission gives users the ability to create tags.'
         ),
         'perm_template' => array(
             'id' => 'RolePermTemplate',

From 33f31cd55dcd989c73fd798929d236d04a3d0019 Mon Sep 17 00:00:00 2001
From: Fredrik Soderblom <fredrik@storedsafe.com>
Date: Tue, 23 Feb 2021 14:51:48 +0100
Subject: [PATCH 215/437] fix: syntax error in constructTaxonomyInfo()

---
 app/webroot/js/misp.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index f9377f717..13e2c233f 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -5617,19 +5617,19 @@ $('body').on('click', '.hex-value-convert', function() {
         if (tagData.TaxonomyPredicate.description) {
             $predicate.append($('<p/>').css("margin-bottom", "5px").append(
                 $('<strong/>').text('Description: '),
-                $('<span/>').text(tagData.TaxonomyPredicate.description),
+                $('<span/>').text(tagData.TaxonomyPredicate.description)
             ));
         }
         if (tagData.TaxonomyPredicate.TaxonomyEntry && tagData.TaxonomyPredicate.TaxonomyEntry[0].numerical_value) {
             $predicate.append($('<p/>').css("margin-bottom", "5px").append(
                 $('<strong/>').text('Numerical value: '),
-                $('<span/>').text(tagData.TaxonomyPredicate.TaxonomyEntry[0].numerical_value),
+                $('<span/>').text(tagData.TaxonomyPredicate.TaxonomyEntry[0].numerical_value)
             ));
         }
         var $meta = $('<div/>').append(
             $('<h3/>').text('Taxonomy: ' + tagData.Taxonomy.namespace.toUpperCase()),
             $('<p/>').css("margin-bottom", "5px").append(
-                $('<span/>').text(tagData.Taxonomy.description),
+                $('<span/>').text(tagData.Taxonomy.description)
             )
         )
         return $('<div/>').append($predicate, $meta)

From d38e2175d54772dca5e166252550ba9fe6b7db87 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 23 Feb 2021 22:06:29 +0100
Subject: [PATCH 216/437] fix: [internal] Include cluster elements for user
 interface

---
 app/Model/GalaxyCluster.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 2c4d04a01..837060e8e 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -918,7 +918,7 @@ class GalaxyCluster extends AppModel
 
         $options = ['conditions' => $conditions];
         if (!$fetchFullCluster) {
-            $options['contain'] = ['Galaxy'];
+            $options['contain'] = ['Galaxy', 'GalaxyElement'];
         }
 
         $clusters = $this->fetchGalaxyClusters($user, $options, $fetchFullCluster);

From 6d27fc278fe40ca76aa30c30200c729375f48285 Mon Sep 17 00:00:00 2001
From: Patrizio Tufarolo <patriziotufarolo@users.noreply.github.com>
Date: Wed, 24 Feb 2021 07:58:56 +0100
Subject: [PATCH 217/437] fix: ui  _ function does not exist, l10n function is
 __

---
 app/View/Servers/ajax/submoduleStatus.ctp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/View/Servers/ajax/submoduleStatus.ctp b/app/View/Servers/ajax/submoduleStatus.ctp
index c9b047ad7..70c28c0fc 100644
--- a/app/View/Servers/ajax/submoduleStatus.ctp
+++ b/app/View/Servers/ajax/submoduleStatus.ctp
@@ -29,7 +29,7 @@
                         $class = 'warning';
                     }
                     $versionText = __('Outdated version');
-                    $versionText .= sprintf(_(' (%s days, %s hours older than super project)'), $status['timeDiff']->format('%a'), $status['timeDiff']->format('%h'));
+                    $versionText .= sprintf(__(' (%s days, %s hours older than super project)'), $status['timeDiff']->format('%a'), $status['timeDiff']->format('%h'));
                     break;
                 case 'younger':
                     $class = 'warning';
@@ -65,7 +65,7 @@
     </tbody>
 </table>
 <div id="submoduleGitResultDiv" class="hidden">
-    <strong><?php echo _('Update result:'); ?></strong>
+    <strong><?php echo __('Update result:'); ?></strong>
     <div class="apply_css_arrow">
         <pre id="submoduleGitResult" class="green bold" style="margin-left: 10px;"></pre>
     </div>

From 5449b753b380eac889a73e477dad1a7c528de897 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 23 Feb 2021 15:14:40 +0100
Subject: [PATCH 218/437] chg: [internal] New method
 Taxonomy::splitTagToComponents

---
 app/Model/Taxonomy.php | 85 ++++++++++++++++++++++++++++--------------
 1 file changed, 56 insertions(+), 29 deletions(-)

diff --git a/app/Model/Taxonomy.php b/app/Model/Taxonomy.php
index 6d902cdc1..aeb895f9b 100644
--- a/app/Model/Taxonomy.php
+++ b/app/Model/Taxonomy.php
@@ -540,7 +540,12 @@ class Taxonomy extends AppModel
 
     public function getTaxonomyForTag($tagName, $metaOnly = false, $fullTaxonomy = false)
     {
-        if (preg_match('/^([^:="]+):([^:="]+)="([^:="]+)"$/i', $tagName, $matches)) {
+        $splits = $this->splitTagToComponents($tagName);
+        if ($splits === null) {
+            return false; // not taxonomy tag
+        }
+
+        if (isset($splits['value'])) {
             $contain = array(
                 'TaxonomyPredicate' => array(
                     'TaxonomyEntry' => array()
@@ -548,32 +553,15 @@ class Taxonomy extends AppModel
             );
             if (!$fullTaxonomy) {
                 $contain['TaxonomyPredicate']['conditions'] = array(
-                    'LOWER(TaxonomyPredicate.value)' => mb_strtolower($matches[2]),
+                    'LOWER(TaxonomyPredicate.value)' => mb_strtolower($splits['predicate']),
                 );
                 $contain['TaxonomyPredicate']['TaxonomyEntry']['conditions'] = array(
-                    'LOWER(TaxonomyEntry.value)' => mb_strtolower($matches[3]),
+                    'LOWER(TaxonomyEntry.value)' => mb_strtolower($splits['value']),
                 );
             }
             $taxonomy = $this->find('first', array(
                 'recursive' => -1,
-                'conditions' => array('LOWER(Taxonomy.namespace)' => mb_strtolower($matches[1])),
-                'contain' => $contain
-            ));
-            if ($metaOnly && !empty($taxonomy)) {
-                return array('Taxonomy' => $taxonomy['Taxonomy']);
-            }
-            return $taxonomy;
-        } elseif (preg_match('/^[^:="]+:[^:="]+$/i', $tagName)) {
-            $pieces = explode(':', $tagName);
-            $contain = array('TaxonomyPredicate' => array());
-            if (!$fullTaxonomy) {
-                $contain['TaxonomyPredicate']['conditions'] = array(
-                    'LOWER(TaxonomyPredicate.value)' => mb_strtolower($pieces[1])
-                );
-            }
-            $taxonomy = $this->find('first', array(
-                'recursive' => -1,
-                'conditions' => array('LOWER(Taxonomy.namespace)' => mb_strtolower($pieces[0])),
+                'conditions' => array('LOWER(Taxonomy.namespace)' => mb_strtolower($splits['namespace'])),
                 'contain' => $contain
             ));
             if ($metaOnly && !empty($taxonomy)) {
@@ -581,20 +569,39 @@ class Taxonomy extends AppModel
             }
             return $taxonomy;
         } else {
-            return false;
+            $contain = array('TaxonomyPredicate' => array());
+            if (!$fullTaxonomy) {
+                $contain['TaxonomyPredicate']['conditions'] = array(
+                    'LOWER(TaxonomyPredicate.value)' => mb_strtolower($splits['predicate'])
+                );
+            }
+            $taxonomy = $this->find('first', array(
+                'recursive' => -1,
+                'conditions' => array('LOWER(Taxonomy.namespace)' => mb_strtolower($splits['namespace'])),
+                'contain' => $contain
+            ));
+            if ($metaOnly && !empty($taxonomy)) {
+                return array('Taxonomy' => $taxonomy['Taxonomy']);
+            }
+            return $taxonomy;
         }
     }
 
-    // Remove the value for triple component tags or the predicate for double components tags
+    /**
+     * Remove the value for triple component tags or the predicate for double components tags
+     * @param string $tagName
+     * @return string
+     */
     public function stripLastTagComponent($tagName)
     {
-        $shortenedTag = '';
-        if (preg_match('/^[^:="]+:[^:="]+="[^:="]+"$/i', $tagName)) {
-            $shortenedTag = explode('=', $tagName)[0];
-        } elseif (preg_match('/^[^:="]+:[^:="]+$/i', $tagName)) {
-            $shortenedTag = explode(':', $tagName)[0];
+        $splits = $this->splitTagToComponents($tagName);
+        if ($splits === null) {
+            return '';
         }
-        return $shortenedTag;
+        if (isset($splits['value'])) {
+            return $splits['namespace'] . ':' . $splits['predicate'];
+        }
+        return $splits['namespace'];
     }
 
     public function checkIfNewTagIsAllowedByTaxonomy($newTagName, $tagNameList=array())
@@ -678,4 +685,24 @@ class Taxonomy extends AppModel
         }
         return $conflictingTaxonomy;
     }
+
+    /**
+     * @param string $tag
+     * @return array|null
+     */
+    public function splitTagToComponents($tag)
+    {
+        preg_match('/^([^:="]+):([^:="]+)(="([^:="]+"))?$/i', $tag, $matches);
+        if (empty($matches)) {
+            return null; // tag is not in taxonomy format
+        }
+        $splits = [
+            'namespace' => $matches[1],
+            'predicate' => $matches[2],
+        ];
+        if (isset($matches[4])) {
+            $splits['value'] = $matches[4];
+        }
+        return $splits;
+    }
 }

From 7d8fdc25a4b67a33e1d8bea512bda93ea9173abd Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 24 Feb 2021 08:13:45 +0100
Subject: [PATCH 219/437] chg: [internal] Check missing taxonomies at one place

---
 app/Controller/EventsController.php          |  2 +-
 app/Controller/TagsController.php            |  2 +-
 app/Model/Event.php                          | 61 ++++++++++++--------
 app/View/Elements/Events/eventIndexTable.ctp |  2 +-
 app/View/Elements/ajaxTags.ctp               | 23 ++------
 app/View/Events/view.ctp                     |  2 +-
 6 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index af9a93699..30b167791 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -1479,7 +1479,7 @@ class EventsController extends AppController
         $this->set('includeSightingdb', (!empty($filters['includeSightingdb']) && Configure::read('Plugin.Sightings_sighting_db_enable')));
         $this->set('relatedEventCorrelationCount', $relatedEventCorrelationCount);
         $this->set('oldest_timestamp', $oldest_timestamp);
-        $this->set('required_taxonomies', $this->Event->getRequiredTaxonomies());
+        $this->set('missingTaxonomies', $this->Event->missingTaxonomies($event));
         $this->set('orgTable', $orgTable);
         $this->set('currentUri', $attributeUri);
         $this->set('filters', $filters);
diff --git a/app/Controller/TagsController.php b/app/Controller/TagsController.php
index 44d4bc2b2..1351b5733 100644
--- a/app/Controller/TagsController.php
+++ b/app/Controller/TagsController.php
@@ -392,7 +392,7 @@ class TagsController extends AppController
         $event = $this->Tag->EventTag->Event->massageTags($this->Auth->user(), $event, 'Event', false, true);
 
         $this->set('tags', $event['EventTag']);
-        $this->set('required_taxonomies', $this->Tag->EventTag->Event->getRequiredTaxonomies());
+        $this->set('missingTaxonomies', $this->Tag->EventTag->Event->missingTaxonomies($event));
         $tagConflicts = $this->Taxonomy->checkIfTagInconsistencies($event['EventTag']);
         $this->set('tagConflicts', $tagConflicts);
         $this->set('event', $event);
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 1869bdbd4..9901a429d 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -7192,42 +7192,31 @@ class Event extends AppModel
         return true;
     }
 
-    public function getRequiredTaxonomies()
+    private function getRequiredTaxonomies()
     {
         $this->Taxonomy = ClassRegistry::init('Taxonomy');
-        $required_taxonomies = $this->Taxonomy->find('list', array(
-            'recursive' => -1,
+        return $this->Taxonomy->find('column', array(
             'conditions' => array('Taxonomy.required' => 1, 'Taxonomy.enabled' => 1),
             'fields' => array('Taxonomy.namespace')
         ));
-        return $required_taxonomies;
+    }
+
+    public function missingTaxonomies(array $event)
+    {
+        $requiredTaxonomies = $this->getRequiredTaxonomies();
+        return $this->checkMissingTaxonomies($requiredTaxonomies, $event['EventTag']);
     }
 
     public function checkIfPublishable($id)
     {
-        $required_taxonomies = $this->getRequiredTaxonomies();
-        if (!empty($required_taxonomies)) {
-            $tags = $this->EventTag->find('all', array(
+        $requiredTaxonomies = $this->getRequiredTaxonomies();
+        if (!empty($requiredTaxonomies)) {
+            $eventTags = $this->EventTag->find('all', array(
                 'conditions' => array('EventTag.event_id' => $id),
                 'recursive' => -1,
-                'contain' => array('Tag')
+                'contain' => array('Tag' => ['fields' => ['name']])
             ));
-            $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;
-                }
-            }
+            $missing = $this->checkMissingTaxonomies($requiredTaxonomies, $eventTags);
             if (!empty($missing)) {
                 return $missing;
             }
@@ -7235,6 +7224,30 @@ class Event extends AppModel
         return true;
     }
 
+    /**
+     * @param array $requiredTaxonomies
+     * @param array $eventTags
+     * @return array
+     */
+    private function checkMissingTaxonomies(array $requiredTaxonomies, array $eventTags)
+    {
+        $missing = [];
+        foreach ($requiredTaxonomies as $requiredTaxonomy) {
+            $found = false;
+            foreach ($eventTags as $tag) {
+                $splits = $this->Taxonomy->splitTagToComponents($tag['Tag']['name']);
+                if ($splits !== null && $splits['namespace'] === $requiredTaxonomy) {
+                    $found = true;
+                    break;
+                }
+            }
+            if (!$found) {
+                $missing[] = $requiredTaxonomy;
+            }
+        }
+        return $missing;
+    }
+
     public function harvestSubqueryElements($options)
     {
         $acceptedRules = array(
diff --git a/app/View/Elements/Events/eventIndexTable.ctp b/app/View/Elements/Events/eventIndexTable.ctp
index ff9bd3b00..911afa155 100644
--- a/app/View/Elements/Events/eventIndexTable.ctp
+++ b/app/View/Elements/Events/eventIndexTable.ctp
@@ -127,7 +127,7 @@
                             'event' => $event,
                             'tags' => $event['EventTag'],
                             'tagAccess' => false,
-                            'required_taxonomies' => false,
+                            'missingTaxonomies' => false,
                             'columnised' => true,
                             'static_tags_only' => 1,
                             'tag_display_style' => Configure::check('MISP.full_tags_on_event_index') ? Configure::read('MISP.full_tags_on_event_index') : 1
diff --git a/app/View/Elements/ajaxTags.ctp b/app/View/Elements/ajaxTags.ctp
index 0199fb099..692b6f790 100644
--- a/app/View/Elements/ajaxTags.ctp
+++ b/app/View/Elements/ajaxTags.ctp
@@ -6,24 +6,11 @@
     switch ($scope) {
         case 'event':
             $id = h($event['Event']['id']);
-            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)
-                    );
-                }
+            if (!empty($missingTaxonomies)) {
+                echo __(
+                    'Missing taxonomies: <span class="red bold">%s</span><br>',
+                    implode(', ', $missingTaxonomies)
+                );
             }
             break;
         case 'attribute':
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index 90c19a505..88b81702e 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -106,7 +106,7 @@
                         'event' => $event,
                         'tags' => $event['EventTag'],
                         'tagAccess' => ($isSiteAdmin || $mayModify || $me['org_id'] == $event['Event']['orgc_id']),
-                        'required_taxonomies' => $required_taxonomies,
+                        'missingTaxonomies' => $missingTaxonomies,
                         'tagConflicts' => $tagConflicts
                     )
                 )

From bb1be01293a4deac6956249a9b6bd9a339f0057a Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 24 Feb 2021 09:47:58 +0100
Subject: [PATCH 220/437] fix: [sync] Undefined index when pushing sightings

---
 app/Model/Server.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index c577d020c..7ced041a7 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -754,16 +754,16 @@ class Server extends AppModel
         }
         if ($all) {
             if ($scope === 'sightings') {
+                // Used when pushing: return just eventUuids that has sightings newer than remote server
                 $this->Event = ClassRegistry::init('Event');
                 $localEvents = $this->Event->find('list', array(
-                    'recursive' => -1,
                     'fields' => array('Event.uuid', 'Event.sighting_timestamp'),
                     'conditions' => array('Event.uuid' => array_column($eventArray, 'uuid'))
                 ));
 
-                $eventUuids = array();
+                $eventUuids = [];
                 foreach ($eventArray as $event) {
-                    if (!isset($localEvents[$event['uuid']]) && $localEvents[$event['uuid']] > $event['sighting_timestamp']) {
+                    if (isset($localEvents[$event['uuid']]) && $localEvents[$event['uuid']] > $event['sighting_timestamp']) {
                         $eventUuids[] = $event['uuid'];
                     }
                 }

From b8fafd1318066dc2a692564b137142d1b4e52e39 Mon Sep 17 00:00:00 2001
From: StefanKelm <StefanKelm@users.noreply.github.com>
Date: Wed, 24 Feb 2021 13:31:50 +0100
Subject: [PATCH 221/437] Update resolved_misp_format.ctp

slight rewording
---
 app/View/Events/resolved_misp_format.ctp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/View/Events/resolved_misp_format.ctp b/app/View/Events/resolved_misp_format.ctp
index 58ab1ba7d..b20321d6b 100644
--- a/app/View/Events/resolved_misp_format.ctp
+++ b/app/View/Events/resolved_misp_format.ctp
@@ -77,8 +77,8 @@
                     )
                 );
             }
-            $table_data[] = array('key' => __('#Resolved Attributes'), 'value' => $count);
-            $table_data[] = array('key' => __('#Resolved Reports'), 'value' => $report_count);
+            $table_data[] = array('key' => __('# of resolved Attributes'), 'value' => $count);
+            $table_data[] = array('key' => __('# of resolved Reports'), 'value' => $report_count);
             echo $this->element('genericElements/viewMetaTable', array('table_data' => $table_data));
         }
         $attributeFields = array('category', 'type', 'value', 'uuid');

From 94ef325a7761e817361ef20e5b91647af28fec80 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 24 Feb 2021 16:52:44 +0100
Subject: [PATCH 222/437] fix: [UI] Fetch GalaxyElements for event index

---
 app/Controller/EventsController.php |  4 ++--
 app/Model/GalaxyCluster.php         | 16 ++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 30b167791..3a64d2f49 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -767,7 +767,7 @@ class EventsController extends AppController
                             }
                         }
                     }
-                    $events = $this->GalaxyCluster->attachClustersToEventIndex($this->Auth->user(), $events, false, false);
+                    $events = $this->GalaxyCluster->attachClustersToEventIndex($this->Auth->user(), $events, false);
                 }
                 foreach ($events as $key => $event) {
                     if (empty($event['SharingGroup']['name'])) {
@@ -830,7 +830,7 @@ class EventsController extends AppController
         if (Configure::read('MISP.showDiscussionsCountOnIndex')) {
             $events = $this->Event->attachDiscussionsCountToEvents($this->Auth->user(), $events);
         }
-        $events = $this->GalaxyCluster->attachClustersToEventIndex($this->Auth->user(), $events, true, false);
+        $events = $this->GalaxyCluster->attachClustersToEventIndex($this->Auth->user(), $events, true);
 
         if ($this->params['ext'] === 'csv') {
             App::uses('CsvExport', 'Export');
diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 837060e8e..2928860ee 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -1404,17 +1404,16 @@ class GalaxyCluster extends AppModel
     /**
      * @param array $user
      * @param array $events
-     * @param bool $replace
-     * @param bool $fetchFullCluster
+     * @param bool $replace Remove galaxy cluster tags
      * @return array
      */
-    public function attachClustersToEventIndex(array $user, array $events, $replace = false, $fetchFullCluster = true)
+    public function attachClustersToEventIndex(array $user, array $events, $replace = false)
     {
         $clusterTagNames = [];
         foreach ($events as $event) {
             foreach ($event['EventTag'] as $eventTag) {
                 if ($eventTag['Tag']['is_galaxy']) {
-                    $clusterTagNames[strtolower($eventTag['Tag']['name'])] = true;
+                    $clusterTagNames[$eventTag['Tag']['id']] = strtolower($eventTag['Tag']['name']);
                 }
             }
         }
@@ -1424,12 +1423,10 @@ class GalaxyCluster extends AppModel
         }
 
         $options = [
-            'conditions' => ['LOWER(GalaxyCluster.tag_name)' => array_keys($clusterTagNames)],
+            'conditions' => ['LOWER(GalaxyCluster.tag_name)' => $clusterTagNames],
+            'contain' => ['Galaxy', 'GalaxyElement'],
         ];
-        if (!$fetchFullCluster) {
-            $options['contain'] = ['Galaxy'];
-        }
-        $clusters = $this->fetchGalaxyClusters($user, $options, $fetchFullCluster);
+        $clusters = $this->fetchGalaxyClusters($user, $options);
 
         $clustersByTagName = [];
         foreach ($clusters as $cluster) {
@@ -1444,7 +1441,6 @@ class GalaxyCluster extends AppModel
                 $tagName = strtolower($eventTag['Tag']['name']);
                 if (isset($clustersByTagName[$tagName])) {
                     $cluster = $this->postprocess($clustersByTagName[$tagName], $eventTag['Tag']['id']);
-                    $cluster['GalaxyCluster']['tag_id'] = $eventTag['Tag']['id'];
                     $cluster['GalaxyCluster']['local'] = $eventTag['local'];
                     $events[$k]['GalaxyCluster'][] = $cluster['GalaxyCluster'];
                     if ($replace) {

From 46ac09aacbf873a53dff305ac7e35f052b923423 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 24 Feb 2021 16:59:57 +0100
Subject: [PATCH 223/437] fix: [internal] Bad merge that prevents language
 change

---
 app/webroot/index.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/webroot/index.php b/app/webroot/index.php
index 59971c6b7..da9846b6c 100644
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@@ -18,18 +18,6 @@
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-// This is GovCERT.CZ modified method to make translation faster
-function __($singular, $args = null) {
-    if (!$singular) {
-        return null;
-    }
-
-    App::uses('I18n', 'I18n');
-    // Enforce english translation to make everything faster
-    $translated = I18n::translate($singular, null, null, I18n::LC_MESSAGES, null, 'eng');
-    $arguments = func_get_args();
-    return I18n::insertArgs($translated, array_slice($arguments, 1));
-}
 /**
  * Use the DS to separate the directories in other defines
  */

From 792ec55700fae6489b61ce04a3ca40931d39d97b Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 24 Feb 2021 18:05:59 +0100
Subject: [PATCH 224/437] chg: [ineternal] Opimise
 GalaxyCluster::fetchGalaxyClusters when full is True

---
 app/Model/GalaxyCluster.php         | 71 ++++++++++++++++++++---------
 app/Model/GalaxyClusterRelation.php | 15 ------
 2 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 837060e8e..471baff03 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -4,6 +4,7 @@ App::uses('TmpFileTool', 'Tools');
 
 /**
  * @property Tag $Tag
+ * @property GalaxyClusterRelation $GalaxyClusterRelation
  */
 class GalaxyCluster extends AppModel
 {
@@ -967,7 +968,6 @@ class GalaxyCluster extends AppModel
         return $conditions;
     }
 
-
     /**
      * fetchGalaxyClusters Very flexible, it's basically a replacement for find, with the addition that it restricts access based on user
      *
@@ -988,7 +988,7 @@ class GalaxyCluster extends AppModel
                 'GalaxyElement',
                 'GalaxyClusterRelation' => array(
                     'conditions' => $this->GalaxyClusterRelation->buildConditions($user, false),
-                    'GalaxyClusterRelationTag' => array('Tag'),
+                    'GalaxyClusterRelationTag',
                     'SharingGroup',
                 ),
                 'Orgc',
@@ -1031,6 +1031,44 @@ class GalaxyCluster extends AppModel
         if (empty($clusters)) {
             return $clusters;
         }
+
+        if ($full) {
+            $clusterIds = array_column(array_column($clusters, 'GalaxyCluster'), 'id');
+            $targetingClusterRelations = $this->TargetingClusterRelation->fetchRelations($user, array(
+                'contain' => array(
+                    'GalaxyClusterRelationTag',
+                    'SharingGroup',
+                ),
+                'conditions' => array(
+                    'TargetingClusterRelation.referenced_galaxy_cluster_id' => $clusterIds,
+                )
+            ));
+
+            $tagsToFetch = Hash::extract($clusters, "{n}.GalaxyClusterRelation.{n}.GalaxyClusterRelationTag.{n}.tag_id");
+            $tagsToFetch = array_merge($tagsToFetch, Hash::extract($targetingClusterRelations, "GalaxyClusterRelationTag.{n}.tag_id"));
+
+            $tags = $this->GalaxyClusterRelation->GalaxyClusterRelationTag->Tag->find('all', [
+                'conditions' => ['id' => array_unique($tagsToFetch)],
+                'recursive' => -1,
+            ]);
+            $tags = array_column(array_column($tags, 'Tag'), null, 'id');
+
+            foreach ($targetingClusterRelations as $k => $targetingClusterRelation) {
+                if (!empty($targetingClusterRelation['GalaxyClusterRelationTag'])) {
+                    foreach ($targetingClusterRelation['GalaxyClusterRelationTag'] as $relationTag) {
+                        if (isset($tags[$relationTag['tag_id']])) {
+                            $targetingClusterRelation['TargetingClusterRelation']['Tag'][] = $tags[$relationTag['tag_id']];
+                        }
+                    }
+                }
+                unset($targetingClusterRelation['GalaxyClusterRelationTag']);
+                if (!empty($targetingClusterRelation['SharingGroup']['id'])) {
+                    $targetingClusterRelation['TargetingClusterRelation']['SharingGroup'] = $targetingClusterRelation['SharingGroup'];
+                }
+                $targetingClusterRelations[$k] = $targetingClusterRelation['TargetingClusterRelation'];
+            }
+        }
+
         $this->Event = ClassRegistry::init('Event');
         $sharingGroupData = $this->Event->__cacheSharingGroupData($user, false);
         foreach ($clusters as $i => $cluster) {
@@ -1042,31 +1080,22 @@ class GalaxyCluster extends AppModel
                     if (!empty($relation['sharing_group_id']) && isset($sharingGroupData[$relation['sharing_group_id']])) {
                         $clusters[$i]['GalaxyClusterRelation'][$j]['SharingGroup'] = $sharingGroupData[$relation['sharing_group_id']]['SharingGroup'];
                     }
+                    foreach ($relation['GalaxyClusterRelationTag'] as $relationTag) {
+                        if (isset($tags[$relationTag['tag_id']])) {
+                            $clusters[$i]['GalaxyClusterRelation'][$j]['Tag'][] = $tags[$relationTag['tag_id']];
+                        }
+                    }
+                    unset($clusters[$i]['GalaxyClusterRelation'][$j]['GalaxyClusterRelationTag']);
                 }
             }
-            if ($full && isset($cluster['GalaxyCluster']['id'])) {
-                $targetingClusterRelations = $this->TargetingClusterRelation->fetchRelations($user, array(
-                    'contain' => array(
-                        'GalaxyClusterRelationTag' => array('Tag'),
-                        'SharingGroup',
-                    ),
-                    'conditions' => array(
-                        'TargetingClusterRelation.referenced_galaxy_cluster_id' => $cluster['GalaxyCluster']['id']
-                    )
-                ));
-                foreach ($targetingClusterRelations as $k => $targetingClusterRelation) {
-                    if (!empty($targetingClusterRelation['GalaxyClusterRelationTag'])) {
-                        $targetingClusterRelation['TargetingClusterRelation']['Tag'] = Hash::extract($targetingClusterRelation['GalaxyClusterRelationTag'], '{n}.Tag');
+            if ($full) {
+                foreach ($targetingClusterRelations as $targetingClusterRelation) {
+                    if ($targetingClusterRelation['referenced_galaxy_cluster_id'] == $cluster['GalaxyCluster']['id']) {
+                        $clusters[$i]['TargetingClusterRelation'][] = $targetingClusterRelation;
                     }
-                    if (!empty($targetingClusterRelation['SharingGroup']['id'])) {
-                        $targetingClusterRelation['TargetingClusterRelation']['SharingGroup'] = $targetingClusterRelation['SharingGroup'];
-                    }
-                    $targetingClusterRelations[$k] = $targetingClusterRelation['TargetingClusterRelation'];
                 }
-                $clusters[$i]['TargetingClusterRelation'] = $targetingClusterRelations;
             }
             $clusters[$i] = $this->arrangeData($clusters[$i]);
-            $clusters[$i] = $this->GalaxyClusterRelation->massageRelationTag($clusters[$i]);
             $clusters[$i] = $this->TargetingClusterRelation->massageRelationTag($clusters[$i]);
         }
         return $clusters;
diff --git a/app/Model/GalaxyClusterRelation.php b/app/Model/GalaxyClusterRelation.php
index 1f046409e..3055ed2aa 100644
--- a/app/Model/GalaxyClusterRelation.php
+++ b/app/Model/GalaxyClusterRelation.php
@@ -163,21 +163,6 @@ class GalaxyClusterRelation extends AppModel
         $this->deleteAll($conditions, false, false);
     }
 
-    public function massageRelationTag($cluster)
-    {
-        if (!empty($cluster['GalaxyCluster'][$this->alias])) {
-            foreach ($cluster['GalaxyCluster'][$this->alias] as $k => $relation) {
-                if (!empty($relation['GalaxyClusterRelationTag'])) {
-                    foreach ($relation['GalaxyClusterRelationTag'] as $relationTag) {
-                        $cluster['GalaxyCluster'][$this->alias][$k]['Tag'][] = $relationTag['Tag'];
-                    }
-                }
-                unset($cluster['GalaxyCluster'][$this->alias][$k]['GalaxyClusterRelationTag']);
-            }
-        }
-        return $cluster;
-    }
-
     /**
      * saveRelations
      *

From bc4d5c35def2248711ec9a726d86aaf4daac6bc1 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 24 Feb 2021 20:28:37 +0100
Subject: [PATCH 225/437] chg: [internal] When caching feed, save progress to
 db less often

---
 app/Model/Feed.php | 4 ++--
 app/Model/Job.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Model/Feed.php b/app/Model/Feed.php
index 4d9cdb8af..037bc3dd8 100644
--- a/app/Model/Feed.php
+++ b/app/Model/Feed.php
@@ -1226,7 +1226,7 @@ class Feed extends AppModel
         $md5Values = array_map('md5', array_column($values, 'value'));
 
         $redis->del('misp:feed_cache:' . $feedId);
-        foreach (array_chunk($md5Values, 1000) as $k => $chunk) {
+        foreach (array_chunk($md5Values, 5000) as $k => $chunk) {
             $pipe = $redis->multi(Redis::PIPELINE);
             if (method_exists($redis, 'sAddArray')) {
                 $redis->sAddArray('misp:feed_cache:' . $feedId, $chunk);
@@ -1238,7 +1238,7 @@ class Feed extends AppModel
                 }
             }
             $pipe->exec();
-            $this->jobProgress($jobId, __('Feed %s: %s/%s values cached.', $feedId, $k * 1000, count($md5Values)));
+            $this->jobProgress($jobId, __('Feed %s: %s/%s values cached.', $feedId, $k * 5000, count($md5Values)));
         }
         $redis->set('misp:feed_cache_timestamp:' . $feedId, time());
         return true;
diff --git a/app/Model/Job.php b/app/Model/Job.php
index ecb8a846c..9193a2366 100644
--- a/app/Model/Job.php
+++ b/app/Model/Job.php
@@ -92,7 +92,7 @@ class Job extends AppModel
             }
         }
         try {
-            if ($this->save($jobData)) {
+            if ($this->save($jobData, ['atomic' => false])) {
                 return true;
             }
             $this->log("Could not save progress for job $jobId because of validation errors: " . json_encode($this->validationErrors), LOG_NOTICE);

From add5882d8b9bbc1de1b21d137e723d01be1e6dce Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 24 Feb 2021 20:45:19 +0100
Subject: [PATCH 226/437] fix: [sync] Fixed a critical issue causing sharing
 groups to lose orgs/instance information on sync when using non sync users on
 a pull

---
 app/Model/SharingGroup.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Model/SharingGroup.php b/app/Model/SharingGroup.php
index 7245fb9d1..e3250767c 100644
--- a/app/Model/SharingGroup.php
+++ b/app/Model/SharingGroup.php
@@ -153,7 +153,6 @@ class SharingGroup extends AppModel
         } else {
             return array();
         }
-
         if ($scope === 'full') {
             $sgs = $this->find('all', array(
                 'contain' => array('SharingGroupServer' => array('Server'), 'SharingGroupOrg' => array('Organisation'), 'Organisation'),
@@ -164,7 +163,9 @@ class SharingGroup extends AppModel
         } elseif ($scope === 'simplified') {
             $fieldsOrg = array('id', 'name', 'uuid');
             $fieldsServer = array('id', 'url', 'name');
-            $permissionTree = ($user['Role']['perm_site_admin'] || $user['Role']['perm_sync']) ? 1 : 0;
+            //$permissionTree = ($user['Role']['perm_site_admin'] || $user['Role']['perm_sync']) ? 1 : 0;
+            //Temporary fix: read only users used for pulling were stripping organisation data from sharing groups
+            $permissionTree = 1;
             $fieldsSharingGroup = array(
                 array(
                     'fields' => array(

From c8ac7694502efab3b322c7d382d1b067fb038c1a Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Thu, 25 Feb 2021 07:45:50 +0100
Subject: [PATCH 227/437] chg: [misp-objects] updated to the latest version

---
 app/files/misp-objects | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/misp-objects b/app/files/misp-objects
index 36994fda1..e764ed698 160000
--- a/app/files/misp-objects
+++ b/app/files/misp-objects
@@ -1 +1 @@
-Subproject commit 36994fda1ef423e6141d2a3582fed3e6219dbf59
+Subproject commit e764ed6983bac3a3171fe1a649176224d1abbf0a

From 4c92cd4fe61bc33382f9a45857d4bfa0b4fa1686 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 25 Feb 2021 08:03:53 +0100
Subject: [PATCH 228/437] fix: [internal] Bad 7085

---
 app/Model/GalaxyCluster.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 471baff03..a058d14b2 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -1096,7 +1096,6 @@ class GalaxyCluster extends AppModel
                 }
             }
             $clusters[$i] = $this->arrangeData($clusters[$i]);
-            $clusters[$i] = $this->TargetingClusterRelation->massageRelationTag($clusters[$i]);
         }
         return $clusters;
     }

From 657253ea72788b2cd006b1c6e0cd64c99bd3b6d4 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 25 Feb 2021 08:38:40 +0100
Subject: [PATCH 229/437] fix: [UI] Pagination for event reports in event view

---
 .../genericElements/IndexTable/index_table.ctp     | 12 +++++++-----
 app/View/EventReports/ajax/indexForEvent.ctp       | 14 ++++++--------
 app/View/Events/view.ctp                           |  6 +++---
 app/View/GalaxyClusters/view.ctp                   |  6 ++----
 app/View/GalaxyElements/ajax/index.ctp             | 12 ++++--------
 5 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/app/View/Elements/genericElements/IndexTable/index_table.ctp b/app/View/Elements/genericElements/IndexTable/index_table.ctp
index 7e04c247e..bb317c6b4 100644
--- a/app/View/Elements/genericElements/IndexTable/index_table.ctp
+++ b/app/View/Elements/genericElements/IndexTable/index_table.ctp
@@ -35,13 +35,15 @@
             }
         }
     }
+
+    $paginationData = !empty($data['paginatorOptions']) ? $data['paginatorOptions'] : [];
+    if ($ajax && isset($containerId)) {
+        $paginationData['data-paginator'] = "#{$containerId}_content";
+    }
+    $this->Paginator->options($paginationData);
+
     $skipPagination = isset($data['skip_pagination']) ? $data['skip_pagination'] : 0;
     if (!$skipPagination) {
-        $paginationData = !empty($data['paginatorOptions']) ? $data['paginatorOptions'] : array();
-        if ($ajax && isset($containerId)) {
-            $paginationData['data-paginator'] = "#{$containerId}_content";
-        }
-        $this->Paginator->options($paginationData);
         $paginatonLinks = $this->element('/genericElements/IndexTable/pagination_links');
         echo $paginatonLinks;
     }
diff --git a/app/View/EventReports/ajax/indexForEvent.ctp b/app/View/EventReports/ajax/indexForEvent.ctp
index a224b4413..127c2ed35 100644
--- a/app/View/EventReports/ajax/indexForEvent.ctp
+++ b/app/View/EventReports/ajax/indexForEvent.ctp
@@ -4,9 +4,7 @@
     <?php endif; ?>
     <?php
         echo $this->element('/genericElements/IndexTable/index_table', array(
-            'paginatorOptions' => array(
-                'update' => '#eventreport_index_div',
-            ),
+            'containerId' => 'eventreport',
             'data' => array(
                 'data' => $reports,
                 'top_bar' => array(
@@ -165,7 +163,7 @@
 
         $('#eventReportSelectors a.btn').click(function(e) {
             e.preventDefault()
-            $("#eventreport_index_div").empty()
+            $("#eventreport_content").empty()
                 .append(
                     $('<div></div>')
                         .css({'text-align': 'center', 'font-size': 'large', 'margin': '5px 0'})
@@ -173,7 +171,7 @@
                 )
             var url = $(this).attr('href')
             $.get(url, function(data) {
-                $("#eventreport_index_div").html(data);
+                $("#eventreport_content").html(data);
             });
         });
     })
@@ -183,7 +181,7 @@
         $.ajax({
             dataType: "html",
             beforeSend: function() {
-                $("#eventreport_index_div").empty()
+                $("#eventreport_content").empty()
                 .append(
                     $('<div></div>')
                         .css({'text-align': 'center', 'font-size': 'large', 'margin': '5px 0'})
@@ -191,10 +189,10 @@
                 )
             },
             success:function (data) {
-                $("#eventreport_index_div").html(data);
+                $("#eventreport_content").html(data);
             },
             error: function (jqXHR, textStatus, errorThrown) {
-                $("#eventreport_index_div").empty().text('<?= __('Failed to load Event report table')?>')
+                $("#eventreport_content").empty().text('<?= __('Failed to load Event report table')?>')
                 showMessage('fail', textStatus + ": " + errorThrown);
             },
             url:url
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index 88b81702e..f604f344d 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -527,7 +527,7 @@
     </div>
     <div id="eventreport_div" style="display: none;">
         <span class="report-title-section"><?php echo __('Event Reports');?></span>
-        <div id="eventreport_index_div"></div>
+        <div id="eventreport_content"></div>
     </div>
     <div id="clusterrelation_div" class="info_container_eventgraph_network" style="display: none;" data-fullscreen="false">
     </div>
@@ -554,8 +554,8 @@ $(function () {
     });
 
     $.get("<?php echo $baseurl; ?>/eventReports/index/event_id:<?= h($event['Event']['id']); ?>/index_for_event:1<?= $extended ? '/extended_event:1' : ''?>", function(data) {
-        $("#eventreport_index_div").html(data);
-        if ($('#eventreport_index_div table tbody > tr').length) { // open if contain a report
+        $("#eventreport_content").html(data);
+        if ($('#eventreport_content table tbody > tr').length) { // open if contain a report
             $('#eventreport_toggle').click()
         }
     });
diff --git a/app/View/GalaxyClusters/view.ctp b/app/View/GalaxyClusters/view.ctp
index 8bda994c8..cf91eff31 100755
--- a/app/View/GalaxyClusters/view.ctp
+++ b/app/View/GalaxyClusters/view.ctp
@@ -96,14 +96,12 @@
     <div class="row-fuild">
         <div id="relations_container"></div>
     </div>
-    <div class="">
-        <div id="elements_div"></div>
-    </div>
+    <div id="elements_content"></div>
 </div>
 <script type="text/javascript">
 $(function () {
     $.get("<?= $baseurl ?>/galaxy_elements/index/<?php echo $cluster['GalaxyCluster']['id']; ?>", function(data) {
-        $("#elements_div").html(data);
+        $("#elements_content").html(data);
     });
     $.get("<?= $baseurl ?>/galaxy_clusters/viewGalaxyMatrix/<?php echo $cluster['GalaxyCluster']['id']; ?>", function(data) {
         $("#matrix_container").html(data);
diff --git a/app/View/GalaxyElements/ajax/index.ctp b/app/View/GalaxyElements/ajax/index.ctp
index 20872e342..24290c49b 100644
--- a/app/View/GalaxyElements/ajax/index.ctp
+++ b/app/View/GalaxyElements/ajax/index.ctp
@@ -1,9 +1,7 @@
 <?php
 $indexOptions = array(
+    'containerId' => 'elements',
     'data' => array(
-        'paginatorOptions' => array(
-            'update' => '#elements_div',
-        ),
         'data' => $elements,
         'top_bar' => array(
             'children' => array(
@@ -16,7 +14,7 @@ $indexOptions = array(
                             'onClickParams' => [
                                 h($clusterId) . '/context:all',
                                 $baseurl . '/galaxy_elements/index',
-                                '#elements_div'
+                                '#elements_content'
                             ],
                         ),
                         array(
@@ -26,7 +24,7 @@ $indexOptions = array(
                             'onClickParams' => [
                                 h($clusterId) . '/context:JSONView',
                                 $baseurl . '/galaxy_elements/index',
-                                '#elements_div'
+                                '#elements_content'
                             ],
                         ),
                     )
@@ -87,8 +85,6 @@ echo $this->element('/genericElements/IndexTable/index_table', $indexOptions);
 if ($context == 'JSONView') {
     echo sprintf('<div id="elementJSONDiv" class="well well-small">%s</div>', json_encode($JSONElements));
 }
-
-echo $this->Js->writeBuffer();
 ?>
 
 <script>
@@ -96,4 +92,4 @@ echo $this->Js->writeBuffer();
     if ($jsondiv.length > 0) {
         $jsondiv.html(syntaxHighlightJson($jsondiv.text(), 8));
     }
-</script>
\ No newline at end of file
+</script>

From 494e5b58af5074a1ef861b77ddc933ee0fede899 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 25 Feb 2021 11:11:59 +0100
Subject: [PATCH 230/437] fix: [internal] Incorrect tag three components split

---
 app/Model/Taxonomy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Taxonomy.php b/app/Model/Taxonomy.php
index aeb895f9b..be8b86e2e 100644
--- a/app/Model/Taxonomy.php
+++ b/app/Model/Taxonomy.php
@@ -692,7 +692,7 @@ class Taxonomy extends AppModel
      */
     public function splitTagToComponents($tag)
     {
-        preg_match('/^([^:="]+):([^:="]+)(="([^:="]+"))?$/i', $tag, $matches);
+        preg_match('/^([^:="]+):([^:="]+)(="([^:="]+)")?$/i', $tag, $matches);
         if (empty($matches)) {
             return null; // tag is not in taxonomy format
         }

From 64879b836e9185cc6e983135f5450c6c647ef4d9 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Thu, 25 Feb 2021 11:37:37 +0100
Subject: [PATCH 231/437] new: [CLI] check if updates are done yet or not

usage:

- /var/www/MISP/app/Console/cake Admin updatesDone [blocking]
- returns True or False based on whether it is done
- When the blocking parameter is set, it will not return until all updates are done
---
 app/Console/Command/AdminShell.php |  7 +++++++
 app/Model/AdminSetting.php         | 17 +++++++++++++++++
 app/Model/AppModel.php             |  4 ++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/Console/Command/AdminShell.php b/app/Console/Command/AdminShell.php
index c6c9a757d..c494dc8a5 100644
--- a/app/Console/Command/AdminShell.php
+++ b/app/Console/Command/AdminShell.php
@@ -671,4 +671,11 @@ class AdminShell extends AppShell
         $this->Job->saveField('message', 'Job done.');
         $this->Job->saveField('status', 4);
     }
+
+    public function updatesDone()
+    {
+        $blocking = !empty($this->args[0]);
+        $done = $this->AdminSetting->updatesDone($blocking);
+        $this->out($done ? 'True' : 'False');
+    }
 }
diff --git a/app/Model/AdminSetting.php b/app/Model/AdminSetting.php
index 968c039b9..ef1de4bb7 100644
--- a/app/Model/AdminSetting.php
+++ b/app/Model/AdminSetting.php
@@ -43,4 +43,21 @@ class AdminSetting extends AppModel
             return false;
         }
     }
+
+
+
+    public function updatesDone($blocking = false)
+    {
+        if ($blocking) {
+            $continue = false;
+            while ($continue == false) {
+                $db_version = $this->find('first', array('conditions' => array('setting' => 'db_version')));
+                $continue = empty($this->findUpgrades($db_version['AdminSetting']['value']));
+            }
+            return true;
+        } else {
+            $db_version = $this->find('first', array('conditions' => array('setting' => 'db_version')));
+            return empty($this->findUpgrades($db_version['AdminSetting']['value']));
+        }
+    }
 }
diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index af8202449..1bb8814a4 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -2003,7 +2003,7 @@ class AppModel extends Model
                 }
             }
             $db_version = $db_version[0];
-            $updates = $this->__findUpgrades($db_version['AdminSetting']['value']);
+            $updates = $this->findUpgrades($db_version['AdminSetting']['value']);
             if ($processId) {
                 $job = $this->Job->find('first', array(
                     'conditions' => array('Job.id' => $processId)
@@ -2348,7 +2348,7 @@ class AppModel extends Model
         }
     }
 
-    private function __findUpgrades($db_version)
+    public function findUpgrades($db_version)
     {
         $updates = array();
         if (strpos($db_version, '.')) {

From 266b28086933da34c4be575a43aa8b155b00b097 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 25 Feb 2021 11:54:49 +0100
Subject: [PATCH 232/437] fix: [internal] Correctly save log

---
 app/Model/SharingGroup.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Model/SharingGroup.php b/app/Model/SharingGroup.php
index 7245fb9d1..55b0a49c3 100644
--- a/app/Model/SharingGroup.php
+++ b/app/Model/SharingGroup.php
@@ -604,18 +604,18 @@ class SharingGroup extends AppModel
                 $authorisedToSave = $this->checkIfAuthorisedToSave($user, $sg);
             }
             if (!$user['Role']['perm_site_admin'] &&
-                !($user['Role']['perm_sync'] && $syncLocal ) &&
+                !($user['Role']['perm_sync'] && $syncLocal) &&
                 !$authorisedToSave
             ) {
                 $this->Log->create();
                 $entry = array(
-                        'org' => $user['Organisation']['name'],
-                        'model' => 'SharingGroup',
-                        'model_id' => $sg['SharingGroup']['uuid'],
-                        'email' => $user['email'],
-                        'action' => 'error',
-                        'user_id' => $user['id'],
-                        'title' => 'Tried to save a sharing group but the user does not belong to it.'
+                    'org' => $user['Organisation']['name'],
+                    'model' => 'SharingGroup',
+                    'model_id' => 0,
+                    'email' => $user['email'],
+                    'action' => 'error',
+                    'user_id' => $user['id'],
+                    'title' => "Tried to save a sharing group with UUID '{$sg['SharingGroup']['uuid']}' but the user does not belong to it."
                 );
                 $this->Log->save($entry);
                 return false;

From 7ce4a8a3053166be6fcb2fbe4c7737f8624d9081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Fortemps?= <loic.fortemps@gmail.com>
Date: Thu, 25 Feb 2021 13:17:26 +0100
Subject: [PATCH 233/437] fix: [email_otp] skip OTP for disabled users

---
 app/Controller/UsersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index 765d5891c..830870592 100644
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -1138,7 +1138,7 @@ class UsersController extends AppController
         }
         if ($this->request->is('post') && Configure::read('Security.email_otp_enabled')) {
             $user = $this->Auth->identify($this->request, $this->response);
-            if ($user) {
+            if ($user && !$user['disabled']) {
               $this->Session->write('email_otp_user', $user);
               return $this->redirect('email_otp');
             }

From 08f42118413a9407f2cd0c6ba70fc34cc87673e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Fortemps?= <loic.fortemps@gmail.com>
Date: Thu, 25 Feb 2021 13:30:49 +0100
Subject: [PATCH 234/437] fix: [email_otp] Trim value for increased UX

---
 app/Controller/UsersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index 765d5891c..943f8cf6f 100644
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -1693,7 +1693,7 @@ class UsersController extends AppController
 
         if ($this->request->is('post') && isset($this->request->data['User']['otp'])) {
             $stored_otp = $redis->get('misp:otp:' . $user_id);
-            if (!empty($stored_otp) && $this->request->data['User']['otp'] == $stored_otp) {
+            if (!empty($stored_otp) && trim($this->request->data['User']['otp']) == $stored_otp) {
                 // we invalidate the previously generated OTP
                 $redis->del('misp:otp:' . $user_id);
                 // We login the user with CakePHP

From 70049971d8cca8a4d917773ce9135c936d8b1580 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 25 Feb 2021 20:17:05 +0100
Subject: [PATCH 235/437] fix: [internal] Empty object when getting event info
 for event report

---
 app/Model/EventReport.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Model/EventReport.php b/app/Model/EventReport.php
index 89c1d4baf..d496f7201 100644
--- a/app/Model/EventReport.php
+++ b/app/Model/EventReport.php
@@ -463,15 +463,17 @@ class EventReport extends AppModel
         $objects = [];
         $templateConditions = [];
         foreach ($event['Object'] as $k => $object) {
-            foreach ($object['Attribute'] as &$objectAttribute) {
-                unset($objectAttribute['ShadowAttribute']);
-                $objectAttribute['object_uuid'] = $object['uuid'];
-                $attributes[$objectAttribute['uuid']] = $objectAttribute;
+            if (isset($object['Attribute'])) {
+                foreach ($object['Attribute'] as &$objectAttribute) {
+                    unset($objectAttribute['ShadowAttribute']);
+                    $objectAttribute['object_uuid'] = $object['uuid'];
+                    $attributes[$objectAttribute['uuid']] = $objectAttribute;
 
-                foreach ($objectAttribute['AttributeTag'] as $at) {
-                    $allTagNames[$at['Tag']['name']] = $at['Tag'];
+                    foreach ($objectAttribute['AttributeTag'] as $at) {
+                        $allTagNames[$at['Tag']['name']] = $at['Tag'];
+                    }
+                    $this->Event->Attribute->removeGalaxyClusterTags($objectAttribute);
                 }
-                $this->Event->Attribute->removeGalaxyClusterTags($objectAttribute);
             }
             $objects[$object['uuid']] = $object;
 

From 14b9463fb55fe7894a52b9f14d263f35c175fae2 Mon Sep 17 00:00:00 2001
From: Golbark <loic.fortemps@gmail.com>
Date: Fri, 26 Feb 2021 09:59:57 +0100
Subject: [PATCH 236/437] fix: [sync] prevent local tags from being pulled

---
 app/Model/Server.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index 7ced041a7..871a46b48 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -286,6 +286,14 @@ class Server extends AppModel
                     $event['Event']['distribution'] = '1';
                     break;
             }
+            // We remove local tags obtained via pull
+            if (isset($event['Event']['Tag'])) {
+                foreach ($event['Event']['Tag'] as $key => $a) {
+                    if ($a['local']) {
+                        unset($event['Event']['Tag'][$key]);
+                    }
+                }
+            }
             if (isset($event['Event']['Attribute']) && !empty($event['Event']['Attribute'])) {
                 foreach ($event['Event']['Attribute'] as $key => $a) {
                     switch ($a['distribution']) {
@@ -296,6 +304,14 @@ class Server extends AppModel
                             $event['Event']['Attribute'][$key]['distribution'] = '1';
                             break;
                     }
+                    // We remove local tags obtained via pull
+                    if (isset($a['Tag'])) {
+                        foreach ($a['Tag'] as $k => $v) {
+                            if ($v['local']) {
+                                unset($event['Event']['Attribute'][$key]['Tag'][$k]);
+                            }
+                        }
+                    }
                 }
             }
             if (isset($event['Event']['Object']) && !empty($event['Event']['Object'])) {
@@ -318,6 +334,14 @@ class Server extends AppModel
                                     $event['Event']['Object'][$i]['Attribute'][$j]['distribution'] = '1';
                                     break;
                             }
+                            // We remove local tags obtained via pull
+                            if (isset($a['Tag'])) {
+                                foreach ($a['Tag'] as $k => $v) {
+                                    if ($v['local']) {
+                                        unset($event['Event']['Object'][$i]['Attribute'][$j]['Tag'][$k]);
+                                    }
+                                }
+                            }
                         }
                     }
                 }

From 60dd660565907c5047b51dbef13f2312066f10f7 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 26 Feb 2021 10:49:15 +0100
Subject: [PATCH 237/437] chg: [UI] Disable sync XHR

---
 app/webroot/js/misp.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 1dd0117d8..2664d58ad 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -740,9 +740,6 @@ function quickSubmitTagCollectionTagForm(selected_tag_ids, addData) {
         $('#temp #TagCollectionTag').val(JSON.stringify(selected_tag_ids));
         xhr({
             data: $('#TagCollectionAddTagForm').serialize(),
-            beforeSend: function (XMLHttpRequest) {
-                $(".loading").show();
-            },
             success:function (data, textStatus) {
                 handleGenericAjaxResponse(data);
                 refreshTagCollectionRow(tag_collection_id);
@@ -5038,10 +5035,9 @@ function submit_feed_overlap_tool(feedId) {
 }
 
 function fetchFormDataAjax(url, callback, errorCallback) {
-    var formData = false;
     $.ajax({
         data: '[]',
-        success:function (data) {
+        success: function (data) {
             callback(data);
         },
         error:function() {
@@ -5050,8 +5046,7 @@ function fetchFormDataAjax(url, callback, errorCallback) {
                 errorCallback();
             }
         },
-        async: false,
-        type:"get",
+        type: "get",
         cache: false,
         url: url
     });

From 8a3144f112aab80b0dcc6bd533810d251173d8f5 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 25 Feb 2021 22:04:50 +0100
Subject: [PATCH 238/437] new: [security] Content-Security-Policy support

---
 app/Controller/AppController.php          | 53 +++++++++++++++++++++--
 app/Controller/Component/ACLComponent.php |  1 +
 app/Controller/ServersController.php      | 24 ++++++++++
 3 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 5ae01bd80..c2fa205d3 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -123,6 +123,9 @@ class AppController extends Controller
         if (Configure::read('Security.disable_browser_cache')) {
             $this->response->disableCache();
         }
+        if (!$this->_isRest()) {
+            $this->__contentSecurityPolicy();
+        }
         $this->response->header('X-XSS-Protection', '1; mode=block');
 
         if (!empty($this->params['named']['sql'])) {
@@ -314,11 +317,11 @@ class AppController extends Controller
             $this->__accessMonitor($user);
 
         } else {
-            $pre_auth_actions = array('login', 'register', 'getGpgPublicKey');
+            $preAuthActions = array('login', 'register', 'getGpgPublicKey');
             if (!empty(Configure::read('Security.email_otp_enabled'))) {
-                $pre_auth_actions[] = 'email_otp';
+                $preAuthActions[] = 'email_otp';
             }
-            if (!$this->_isControllerAction(['users' => $pre_auth_actions])) {
+            if (!$this->_isControllerAction(['users' => $preAuthActions, 'servers' => ['cspReport']])) {
                 if (!$this->request->is('ajax')) {
                     $this->Session->write('pre_login_requested_url', $this->here);
                 }
@@ -685,6 +688,50 @@ class AppController extends Controller
         }
     }
 
+    /**
+     * Generate Content-Security-Policy HTTP header
+     */
+    private function __contentSecurityPolicy()
+    {
+        $default = [
+            'default-src' => "'self' data: 'unsafe-inline' 'unsafe-eval'",
+            'style-src' => "'self' 'unsafe-inline'",
+            'object-src' => "'none'",
+            'frame-ancestors' => "'none'",
+            'worker-src' => "'none'",
+            'child-src' => "'none'",
+            'frame-src' => "'none'",
+            'base-uri' => "'self'",
+            'img-src' => "'self' data:",
+            'font-src' => "'self'",
+            'form-action' => "'self'",
+            'connect-src' => "'self'",
+            'manifest-src' => "'none'",
+            'report-uri' => '/servers/cspReport',
+        ];
+        if (env('HTTPS')) {
+            $default['upgrade-insecure-requests'] = null;
+        }
+        $custom = Configure::read('Security.csp');
+        if ($custom === false) {
+            return;
+        }
+        if (is_array($custom)) {
+            $default = $default + $custom;
+        }
+        $header = [];
+        foreach ($default as $key => $value) {
+            if ($value !== false) {
+                if ($value === null) {
+                    $header[] = $key;
+                } else {
+                    $header[] = "$key $value";
+                }
+            }
+        }
+        $this->response->header('Content-Security-Policy', implode('; ', $header));
+    }
+
     private function __rateLimitCheck()
     {
         $info = array();
diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php
index 0eb81c1a4..fb398c910 100644
--- a/app/Controller/Component/ACLComponent.php
+++ b/app/Controller/Component/ACLComponent.php
@@ -533,6 +533,7 @@ class ACLComponent extends Component
                     'uploadFile' => array(),
                     'viewDeprecatedFunctionUse' => array(),
                     'killAllWorkers' => ['perm_site_admin'],
+                'cspReport' => ['*'],
             ),
             'shadowAttributes' => array(
                     'accept' => array('perm_add'),
diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index b1c9c8972..7e07d5b3d 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -35,8 +35,11 @@ class ServersController extends AppController
 
     public function beforeFilter()
     {
+        $this->Auth->allow(['cspReport']); // cspReport must work without authentication
+
         parent::beforeFilter();
         $this->Security->unlockedActions[] = 'getApiInfo';
+        $this->Security->unlockedActions[] = 'cspReport';
         // permit reuse of CSRF tokens on some pages.
         switch ($this->request->params['action']) {
             case 'push':
@@ -2419,6 +2422,27 @@ misp.direct_call(relative_path, body)
         }
     }
 
+    public function cspReport()
+    {
+        if (!$this->request->is('post')) {
+            throw new MethodNotAllowedException('This action expects a POST request.');
+        }
+
+        $report = $this->Server->jsonDecode($this->request->input());
+        if (!isset($report['csp-report'])) {
+            throw new RuntimeException("Invalid report");
+        }
+
+        $message = 'CSP reported violation';
+        $ipHeader = Configure::read('MISP.log_client_ip_header') ?: 'REMOTE_ADDR';
+        if (isset($_SERVER[$ipHeader])) {
+            $message .= ' from IP ' . $_SERVER[$ipHeader];
+        }
+        $this->log("$message: " . json_encode($report['csp-report'], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+
+        return new CakeResponse(['statusCodes' => 204]);
+    }
+
     public function viewDeprecatedFunctionUse()
     {
         $data = $this->Deprecation->getDeprecatedAccessList($this->Server);

From 19ef63f521e64d33b666c9e38ef853726445b0cc Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Sat, 27 Feb 2021 10:24:40 +0100
Subject: [PATCH 239/437] chg: [taxonomies] updated to the latest version

---
 app/files/taxonomies | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/taxonomies b/app/files/taxonomies
index 82fbe9b0a..75a9cdca8 160000
--- a/app/files/taxonomies
+++ b/app/files/taxonomies
@@ -1 +1 @@
-Subproject commit 82fbe9b0a8ac0e8f52c447fb5e49ccb31d4e6374
+Subproject commit 75a9cdca81fff723c519948dcdd4fdfc912fc135

From 8cf1bbb9a9c100e4a274e05e99a336a9ebfa795d Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sat, 27 Feb 2021 16:54:23 +0100
Subject: [PATCH 240/437] chg: [oidc] Use first match as user role

---
 .../Controller/Component/Auth/OidcAuthenticate.php  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php b/app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php
index 2b8cb2cb4..5031c65c9 100644
--- a/app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php
+++ b/app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php
@@ -63,18 +63,18 @@ class OidcAuthenticate extends BaseAuthenticate
         }
 
         if ($user) {
-            $this->log($mispUsername, 'Found in database.');
+            $this->log($mispUsername, "Found in database with ID {$user['id']}.");
 
             if ($user['org_id'] != $organisationId) {
                 $user['org_id'] = $organisationId;
                 $this->userModel()->updateField($user, 'org_id', $organisationId);
-                $this->log($mispUsername, "User organisation changed from ${user['org_id']} to $organisationId.");
+                $this->log($mispUsername, "User organisation changed from {$user['org_id']} to $organisationId.");
             }
 
             if ($user['role_id'] != $roleId) {
                 $user['role_id'] = $roleId;
                 $this->userModel()->updateField($user, 'role_id', $roleId);
-                $this->log($mispUsername, "User role changed from ${user['role_id']} to $roleId.");
+                $this->log($mispUsername, "User role changed from {$user['role_id']} to $roleId.");
             }
 
             $this->log($mispUsername, 'Logged in.');
@@ -171,6 +171,7 @@ class OidcAuthenticate extends BaseAuthenticate
      */
     private function getUserRole(array $roles, $mispUsername)
     {
+        $this->log($mispUsername, 'Provided roles: ' . implode(', ', $roles));
         $roleMapper = $this->getConfig('role_mapper');
         if (!is_array($roleMapper)) {
             throw new RuntimeException("Config option `OidcAuth.role_mapper` must be array.");
@@ -194,13 +195,11 @@ class OidcAuthenticate extends BaseAuthenticate
                         continue;
                     }
                 }
-                if ($userRole === null || $roleId < $userRole) { // role with lower ID wins
-                    $userRole = $roleId;
-                }
+                return $roleId; // first match wins
             }
         }
 
-        return $userRole;
+        return null;
     }
 
     /**

From ec63f58d364f6a2d5a662b875248695c2ca2b832 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Sat, 27 Feb 2021 18:08:36 +0000
Subject: [PATCH 241/437] chg: Add small description of what org blocklist
 does. Fix #4363

---
 app/View/OrgBlocklists/add.ctp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/View/OrgBlocklists/add.ctp b/app/View/OrgBlocklists/add.ctp
index e87bd8f56..94f04f677 100644
--- a/app/View/OrgBlocklists/add.ctp
+++ b/app/View/OrgBlocklists/add.ctp
@@ -2,7 +2,8 @@
 <?php echo $this->Form->create('OrgBlocklist');?>
     <fieldset>
         <legend><?php echo __('Add Organisation Blocklist Entries');?></legend>
-        <p><?php echo __('Simply paste a list of all the organisation UUIDs that you wish to block from being entered.');?></p>
+        <p><?php echo __('Blocklisting an organisation prevents the creation of any event by that organisation on this instance as well as syncing of that organisation\'s events to this instance. It does not prevent a local user of the blocklisted organisation from logging in and editing or viewing data.');?></p>
+        <p><?php echo __('Paste a list of all the organisation UUIDs that you want to add to the blocklist below (one per line).');?></p>
     <?php
         echo $this->Form->input('uuids', array(
                 'type' => 'textarea',

From 8bcdd5b0536e91769e80045f969db2b86be1fb24 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Sat, 27 Feb 2021 18:36:46 +0000
Subject: [PATCH 242/437] chg: [UI] correct edit org blocklist entries view

---
 app/View/OrgBlocklists/edit.ctp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/View/OrgBlocklists/edit.ctp b/app/View/OrgBlocklists/edit.ctp
index 6a2387d09..c5be566cd 100644
--- a/app/View/OrgBlocklists/edit.ctp
+++ b/app/View/OrgBlocklists/edit.ctp
@@ -1,8 +1,7 @@
 <div class="orgBlocklist form">
 <?php echo $this->Form->create('OrgBlocklist');?>
     <fieldset>
-        <legend><?php echo __('Edit Event Blocklist Entries');?></legend>
-        <p><?php echo __('List of all the event UUIDs that you wish to block from being entered.');?></p>
+        <legend><?php echo __('Edit Organisation Blocklist Entries');?></legend>
     <?php
         echo $this->Form->input('uuids', array(
                 'type' => 'textarea',

From 37dd3038b1956ad5f652cbbfa5a41919cb47b468 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 25 Feb 2021 16:17:52 +0100
Subject: [PATCH 243/437] new: [oidc] Readme

---
 app/Plugin/OidcAuth/README.md | 49 +++++++++++++++++++++++++++++++++++
 app/composer.json             |  3 ++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 app/Plugin/OidcAuth/README.md

diff --git a/app/Plugin/OidcAuth/README.md b/app/Plugin/OidcAuth/README.md
new file mode 100644
index 000000000..7a1534b97
--- /dev/null
+++ b/app/Plugin/OidcAuth/README.md
@@ -0,0 +1,49 @@
+# MISP OpenID Connect Authentication
+
+This plugin provides ability to use OpenID as Single sign-on for login users to MISP.
+When plugin is enabled, users are direcly redirected to SSO provider and it is not possible
+to login with passwords stored in MISP.
+
+## Usage
+
+1. Install required library using composer
+
+```
+cd app
+php composer.phar require jumbojett/openid-connect-php
+```
+
+2. Enable in `app/Config/config.php`
+
+```php
+$config = array(
+    ...
+    'Security' => array(
+        ...
+        'auth' => 'array('OidcAuth.Oidc')',
+    ),
+    ...
+```
+
+3. Configure in `app/Config/config.php` (replace variables in `{{ }}` with your values)
+
+```php
+$config = array(
+    ...
+    'OidcAuth' = [
+        'provider_url' => '{{ OIDC_PROVIDER }}',
+        'client_id' => '{{ OIDC_CLIENT_ID }}',
+        'client_secret' => '{{ OIDC_CLIENT_SECRET }}',
+        'role_mapper' => [ // if user has multiple roles, first role that match will be assigned to user
+            'misp-user' => 3, // User
+            'misp-admin' => 1, // Admin
+        ],
+        'default_org' => '{{ MISP_ORG }}',
+    ],
+    ...
+```
+
+## Caveats
+
+* When user is blocked in SSO (IdM), he/she will be not blocked in MISP. He could not log in, but users authentication keys will still work and also he/she will still receive all emails. 
+
diff --git a/app/composer.json b/app/composer.json
index ac492b7f4..b4f89ce75 100644
--- a/app/composer.json
+++ b/app/composer.json
@@ -29,7 +29,8 @@
         "ext-bcmath": "For faster validating IBAN numbers",
         "ext-rdkafka": "Required for publishing events to Kafka broker",
         "elasticsearch/elasticsearch": "For logging to elasticsearch",
-        "aws/aws-sdk-php": "To upload samples to S3"
+        "aws/aws-sdk-php": "To upload samples to S3",
+        "jumbojett/openid-connect-php": "For OIDC authentication"
     },
     "config": {
         "vendor-dir": "Vendor",

From 2e817c8ed8be6208216efc665b39da5e551bf023 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 1 Mar 2021 15:56:04 +0100
Subject: [PATCH 244/437] fix: [galaxyClusterRelations] Bump cluster's
 timestamp after performing CRUD on relations

---
 app/Controller/GalaxyClusterRelationsController.php | 3 +++
 app/Model/GalaxyCluster.php                         | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/Controller/GalaxyClusterRelationsController.php b/app/Controller/GalaxyClusterRelationsController.php
index cd3ce24e0..03cd45ad4 100644
--- a/app/Controller/GalaxyClusterRelationsController.php
+++ b/app/Controller/GalaxyClusterRelationsController.php
@@ -148,6 +148,7 @@ class GalaxyClusterRelationsController extends AppController
             
             if (empty($errors)) {
                 $message = __('Relationship added.');
+                $this->GalaxyClusterRelation->SourceCluster->touchTimestamp($clusterSource['SourceCluster']['id']);
                 $this->GalaxyClusterRelation->SourceCluster->unpublish($clusterSource['SourceCluster']['id']);
             } else {
                 $message = __('Relationship could not be added.');
@@ -242,6 +243,7 @@ class GalaxyClusterRelationsController extends AppController
 
             if (empty($errors)) {
                 $message = __('Relationship added.');
+                $this->GalaxyClusterRelation->SourceCluster->touchTimestamp($clusterSource['SourceCluster']['id']);
                 $this->GalaxyClusterRelation->SourceCluster->unpublish($clusterSource['SourceCluster']['id']);
             } else {
                 $message = __('Relationship could not be added.');
@@ -285,6 +287,7 @@ class GalaxyClusterRelationsController extends AppController
             $clusterSource = $this->GalaxyClusterRelation->SourceCluster->fetchIfAuthorized($this->Auth->user(), $relation['GalaxyClusterRelation']['galaxy_cluster_uuid'], array('edit', 'publish'), $throwErrors=true, $full=false);
             $result = $this->GalaxyClusterRelation->delete($id, true);
             if ($result) {
+                $this->GalaxyClusterRelation->SourceCluster->touchTimestamp($clusterSource['SourceCluster']['id']);
                 $this->GalaxyClusterRelation->SourceCluster->unpublish($clusterSource['SourceCluster']['id']);
                 $message = __('Galaxy cluster relationship successfuly deleted.');
                 if ($this->_isRest()) {
diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index a058d14b2..3ee47c772 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -564,6 +564,15 @@ class GalaxyCluster extends AppModel
         ), array('fieldList' => array('published', 'deleted', 'version')));
     }
 
+    public function touchTimestamp($id)
+    {
+        $version = (new DateTime())->getTimestamp();
+        return $this->save(array(
+            'id' => $id,
+            'version' => $version,
+        ), array('fieldList' => array('version')));
+    }
+
     /**
      * uploadClusterToServersRouter Upload the cluster to all remote servers
      *

From 6a646edf0157aaacd6b34ebb90504b95fc03d447 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 1 Mar 2021 15:57:17 +0100
Subject: [PATCH 245/437] fix: [galaxyCluster] Revoke relations on sync

- Relationships are now re-build from scratch for the cluster being sync
- This cancels any modification done locally (which should not have
happened in the first place)
---
 app/Model/GalaxyCluster.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 3ee47c772..7685e1c45 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -794,6 +794,7 @@ class GalaxyCluster extends AppModel
                 $this->GalaxyElement->captureElements($user, $cluster['GalaxyCluster']['GalaxyElement'], $savedCluster['GalaxyCluster']['id']);
             }
             if (!empty($cluster['GalaxyCluster']['GalaxyClusterRelation'])) {
+                $this->GalaxyClusterRelation->deleteAll(array('GalaxyClusterRelation.galaxy_cluster_id' => $savedCluster['GalaxyCluster']['id']));
                 $saveResult = $this->GalaxyClusterRelation->captureRelations($user, $savedCluster, $cluster['GalaxyCluster']['GalaxyClusterRelation'], $fromPull=$fromPull);
                 if ($saveResult['failed'] > 0) {
                     $results['errors'][] = __('Issues while capturing relations have been logged.');

From 98ec79db60c3b710869ec115cb9de77eb77584e3 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 1 Mar 2021 16:55:40 +0100
Subject: [PATCH 246/437] chg: [internal] Set cookie name just when no name is
 set

---
 app/Controller/AppController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index c2fa205d3..e8b175373 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -1260,7 +1260,7 @@ class AppController extends Controller
 
     private function __sessionMassage()
     {
-        if (!empty(Configure::read('MISP.uuid'))) {
+        if (empty(Configure::read('Session.cookie')) && !empty(Configure::read('MISP.uuid'))) {
             Configure::write('Session.cookie', 'MISP-' . Configure::read('MISP.uuid'));
         }
         if (!empty(Configure::read('Session.cookieTimeout')) || !empty(Configure::read('Session.timeout'))) {

From 99ca948555e41ad1fc7d297bae4cd4bc44040bc0 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 1 Mar 2021 19:37:32 +0100
Subject: [PATCH 247/437] new: [UI] Render galaxy cluster description as
 markdown

---
 app/View/GalaxyClusters/view.ctp   | 172 +++++++++++++++--------------
 app/View/Helper/MarkdownHelper.php |  27 +++++
 2 files changed, 119 insertions(+), 80 deletions(-)
 create mode 100644 app/View/Helper/MarkdownHelper.php

diff --git a/app/View/GalaxyClusters/view.ctp b/app/View/GalaxyClusters/view.ctp
index cf91eff31..b57d4d184 100755
--- a/app/View/GalaxyClusters/view.ctp
+++ b/app/View/GalaxyClusters/view.ctp
@@ -1,85 +1,85 @@
 <?php
-    echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'galaxies', 'menuItem' => 'view_cluster'));
-
-    $extendedFromHtml = '';
-    if (!empty($cluster['GalaxyCluster']['extended_from'])) {
-        $element = $this->element('genericElements/IndexTable/Fields/links', array(
-            'url' => $baseurl . '/galaxy_clusters/view/',
-            'row' => $cluster,
-            'field' => array(
-                'data_path' => 'GalaxyCluster.extended_from.GalaxyCluster.id',
-                'title' => sprintf(__('%s (version: %s)'), $cluster['GalaxyCluster']['extended_from']['GalaxyCluster']['value'], $cluster['GalaxyCluster']['extends_version'])
-            ),
-        ));
-        $extendedFromHtml = sprintf('<ul><li>%s</li></ul>', $element);
-    }
-    if ($newVersionAvailable) {
-        $extendedFromHtml .= sprintf('<div class="alert alert-warning">%s</div>', sprintf(__('New version available! <a href="%s">Update cluster to version <b>%s</b></a>'),
-            '/galaxy_clusters/updateCluster/' . $cluster['GalaxyCluster']['id'],
-            h($cluster['GalaxyCluster']['extended_from']['GalaxyCluster']['version'])
-        ));
-    }
-
-    $extendedByHtml = '';
-    $extendByLinks = array();
-    foreach ($cluster['GalaxyCluster']['extended_by'] as $extendCluster) {
-        $element = $this->element('genericElements/IndexTable/Fields/links', array(
-            'url' => '/galaxy_clusters/view/',
-            'row' => $extendCluster,
-            'field' => array(
-                'data_path' => 'GalaxyCluster.id',
-                'title' => sprintf(__('%s (parent version: %s)'), $extendCluster['GalaxyCluster']['value'], $extendCluster['GalaxyCluster']['extends_version'])
-            ),
-        ));
-        $extendByLinks[] = sprintf('<li>%s</li>', $element);
-    }
-    if (!empty($extendByLinks)) {
-        $extendedByHtml = sprintf('<ul>%s</ul>', implode('', $extendByLinks));
-    }
-
-    $table_data = array();
-    $table_data[] = array('key' => __('Cluster ID'), 'value' => $cluster['GalaxyCluster']['id']);
-    $table_data[] = array('key' => __('Name'), 'value' => $cluster['GalaxyCluster']['value']);
-    $table_data[] = array('key' => __('Parent Galaxy'), 'value' => $cluster['GalaxyCluster']['Galaxy']['name'] ? $cluster['GalaxyCluster']['Galaxy']['name'] : $cluster['GalaxyCluster']['Galaxy']['type']);
-    $table_data[] = array('key' => __('Description'), 'value' => $cluster['GalaxyCluster']['description']);
-    $table_data[] = array('key' => __('Published'), 'boolean' => $cluster['GalaxyCluster']['published'], 'class' => (!$cluster['GalaxyCluster']['published'] ? 'background-red bold': ''));
-    $table_data[] = array('key' => __('Default'), 'boolean' => $cluster['GalaxyCluster']['default'], 'class' => (!$cluster['GalaxyCluster']['published'] ? 'black': 'black'));
-    $table_data[] = array('key' => __('Version'), 'value' => $cluster['GalaxyCluster']['version']);
-    $table_data[] = array('key' => __('UUID'), 'value' => $cluster['GalaxyCluster']['uuid'], 'value_class' => 'quickSelect');
-    $table_data[] = array('key' => __('Collection UUID'), 'value' => $cluster['GalaxyCluster']['collection_uuid'], 'value_class' => 'quickSelect');
-    $table_data[] = array(
-        'key' => __('Source'),
-        'html' => filter_var($cluster['GalaxyCluster']['source'], FILTER_VALIDATE_URL) ?
-            '<a href="' . $cluster['GalaxyCluster']['source'] . '" rel="noreferrer noopener">' . h($cluster['GalaxyCluster']['source']) :
-            h($cluster['GalaxyCluster']['source']),
-    );
-    $table_data[] = array('key' => __('Authors'), 'value' => !empty($cluster['GalaxyCluster']['authors']) ? implode(', ', $cluster['GalaxyCluster']['authors']) : __('N/A'));
-    $table_data[] = array('key' => __('Distribution'), 'element' => 'genericElements/IndexTable/Fields/distribution_levels', 'element_params' => array(
-        'row' => $cluster['GalaxyCluster'],
-        'field' => array('data_path' => 'distribution')
+$extendedFromHtml = '';
+if (!empty($cluster['GalaxyCluster']['extended_from'])) {
+    $element = $this->element('genericElements/IndexTable/Fields/links', array(
+        'url' => $baseurl . '/galaxy_clusters/view/',
+        'row' => $cluster,
+        'field' => array(
+            'data_path' => 'GalaxyCluster.extended_from.GalaxyCluster.id',
+            'title' => sprintf(__('%s (version: %s)'), $cluster['GalaxyCluster']['extended_from']['GalaxyCluster']['value'], $cluster['GalaxyCluster']['extends_version'])
+        ),
     ));
-    $table_data[] = array(
-        'key' => __('Owner Organisation'),
-        'html' => $this->OrgImg->getOrgImg(array('name' => $cluster['GalaxyCluster']['Org']['name'], 'id' => $cluster['GalaxyCluster']['Org']['id'], 'size' => 18), true),
-    );
-    $table_data[] = array(
-        'key' => __('Creator Organisation'),
-        'html' => $this->OrgImg->getOrgImg(array('name' => $cluster['GalaxyCluster']['Orgc']['name'], 'id' => $cluster['GalaxyCluster']['Orgc']['id'], 'size' => 18), true),
-    );
-    $table_data[] = array('key' => __('Connector tag'), 'value' => $cluster['GalaxyCluster']['tag_name']);
-    $table_data[] = array('key' => __('Events'), 'html' => isset($cluster['GalaxyCluster']['tag_count']) ?
-                        sprintf('<a href="%s">%s</a>',
-                            sprintf('%s/events/index/searchtag:%s', $baseurl, h($cluster['GalaxyCluster']['tag_id'])),
-                            __n('%s event', '%s events', $cluster['GalaxyCluster']['tag_count'], h($cluster['GalaxyCluster']['tag_count']))
-                        ):
-                        '<span>0</span>'
-                    );
-    if (!empty($extendedFromHtml)) {
-        $table_data[] = array('key' => __('Forked From'), 'html' => $extendedFromHtml);
-    }
-    if (!empty($extendedByHtml)) {
-        $table_data[] = array('key' => __('Forked By'), 'html' => $extendedByHtml);
-    }
+    $extendedFromHtml = sprintf('<ul><li>%s</li></ul>', $element);
+}
+if ($newVersionAvailable) {
+    $extendedFromHtml .= sprintf('<div class="alert alert-warning">%s</div>', sprintf(__('New version available! <a href="%s">Update cluster to version <b>%s</b></a>'),
+        '/galaxy_clusters/updateCluster/' . $cluster['GalaxyCluster']['id'],
+        h($cluster['GalaxyCluster']['extended_from']['GalaxyCluster']['version'])
+    ));
+}
+
+$extendedByHtml = '';
+$extendByLinks = array();
+foreach ($cluster['GalaxyCluster']['extended_by'] as $extendCluster) {
+    $element = $this->element('genericElements/IndexTable/Fields/links', array(
+        'url' => '/galaxy_clusters/view/',
+        'row' => $extendCluster,
+        'field' => array(
+            'data_path' => 'GalaxyCluster.id',
+            'title' => sprintf(__('%s (parent version: %s)'), $extendCluster['GalaxyCluster']['value'], $extendCluster['GalaxyCluster']['extends_version'])
+        ),
+    ));
+    $extendByLinks[] = sprintf('<li>%s</li>', $element);
+}
+if (!empty($extendByLinks)) {
+    $extendedByHtml = sprintf('<ul>%s</ul>', implode('', $extendByLinks));
+}
+
+$description = $this->Markdown->cleanup($cluster['GalaxyCluster']['description']);
+
+$table_data = array();
+$table_data[] = array('key' => __('Cluster ID'), 'value' => $cluster['GalaxyCluster']['id']);
+$table_data[] = array('key' => __('Name'), 'value' => $cluster['GalaxyCluster']['value']);
+$table_data[] = array('key' => __('Parent Galaxy'), 'value' => $cluster['GalaxyCluster']['Galaxy']['name'] ? $cluster['GalaxyCluster']['Galaxy']['name'] : $cluster['GalaxyCluster']['Galaxy']['type']);
+$table_data[] = array('key' => __('Description'), 'value' => $description, 'value_class' => 'md');
+$table_data[] = array('key' => __('Published'), 'boolean' => $cluster['GalaxyCluster']['published'], 'class' => (!$cluster['GalaxyCluster']['published'] ? 'background-red bold': ''));
+$table_data[] = array('key' => __('Default'), 'boolean' => $cluster['GalaxyCluster']['default'], 'class' => (!$cluster['GalaxyCluster']['published'] ? 'black': 'black'));
+$table_data[] = array('key' => __('Version'), 'value' => $cluster['GalaxyCluster']['version']);
+$table_data[] = array('key' => __('UUID'), 'value' => $cluster['GalaxyCluster']['uuid'], 'value_class' => 'quickSelect');
+$table_data[] = array('key' => __('Collection UUID'), 'value' => $cluster['GalaxyCluster']['collection_uuid'], 'value_class' => 'quickSelect');
+$table_data[] = array(
+    'key' => __('Source'),
+    'html' => filter_var($cluster['GalaxyCluster']['source'], FILTER_VALIDATE_URL) ?
+        '<a href="' . $cluster['GalaxyCluster']['source'] . '" rel="noreferrer noopener">' . h($cluster['GalaxyCluster']['source']) :
+        h($cluster['GalaxyCluster']['source']),
+);
+$table_data[] = array('key' => __('Authors'), 'value' => !empty($cluster['GalaxyCluster']['authors']) ? implode(', ', $cluster['GalaxyCluster']['authors']) : __('N/A'));
+$table_data[] = array('key' => __('Distribution'), 'element' => 'genericElements/IndexTable/Fields/distribution_levels', 'element_params' => array(
+    'row' => $cluster['GalaxyCluster'],
+    'field' => array('data_path' => 'distribution')
+));
+$table_data[] = array(
+    'key' => __('Owner Organisation'),
+    'html' => $this->OrgImg->getOrgImg(array('name' => $cluster['GalaxyCluster']['Org']['name'], 'id' => $cluster['GalaxyCluster']['Org']['id'], 'size' => 18), true),
+);
+$table_data[] = array(
+    'key' => __('Creator Organisation'),
+    'html' => $this->OrgImg->getOrgImg(array('name' => $cluster['GalaxyCluster']['Orgc']['name'], 'id' => $cluster['GalaxyCluster']['Orgc']['id'], 'size' => 18), true),
+);
+$table_data[] = array('key' => __('Connector tag'), 'value' => $cluster['GalaxyCluster']['tag_name']);
+$table_data[] = array('key' => __('Events'), 'html' => isset($cluster['GalaxyCluster']['tag_count']) ?
+                    sprintf('<a href="%s">%s</a>',
+                        sprintf('%s/events/index/searchtag:%s', $baseurl, h($cluster['GalaxyCluster']['tag_id'])),
+                        __n('%s event', '%s events', $cluster['GalaxyCluster']['tag_count'], h($cluster['GalaxyCluster']['tag_count']))
+                    ):
+                    '<span>0</span>'
+                );
+if (!empty($extendedFromHtml)) {
+    $table_data[] = array('key' => __('Forked From'), 'html' => $extendedFromHtml);
+}
+if (!empty($extendedByHtml)) {
+    $table_data[] = array('key' => __('Forked By'), 'html' => $extendedByHtml);
+}
 ?>
 <div class='view'>
     <div class="row-fluid">
@@ -98,6 +98,12 @@
     </div>
     <div id="elements_content"></div>
 </div>
+<?= $this->element('genericElements/assetLoader', array(
+    'js' => array(
+        'markdown-it',
+    ),
+));
+?>
 <script type="text/javascript">
 $(function () {
     $.get("<?= $baseurl ?>/galaxy_elements/index/<?php echo $cluster['GalaxyCluster']['id']; ?>", function(data) {
@@ -110,4 +116,10 @@ $(function () {
         $("#relations_container").html(data);
     });
 });
+
+md = window.markdownit('default');
+md.disable(['image'])
+var $md = $('.md');
+$md.html(md.render($md.text()));
 </script>
+<?= $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'galaxies', 'menuItem' => 'view_cluster'));
diff --git a/app/View/Helper/MarkdownHelper.php b/app/View/Helper/MarkdownHelper.php
new file mode 100644
index 000000000..ae9318428
--- /dev/null
+++ b/app/View/Helper/MarkdownHelper.php
@@ -0,0 +1,27 @@
+<?php
+App::uses('AppHelper', 'View/Helper');
+
+class MarkdownHelper extends AppHelper
+{
+    /**
+     * Converts markdown formatted string to text
+     * @param string $string
+     * @return string
+     */
+    public function toText($string)
+    {
+        $string = $this->cleanup($string);
+        // Remove markdown style links
+        $string = preg_replace('/\[([^]]+)]\([^)]+\)/', '$1', $string);
+        // Remove citations
+        $string = preg_replace('/\(Citation: [^)]+\)/', '', $string);
+        return $string;
+    }
+
+    public function cleanup($string)
+    {
+        // Remove <code> blocks and replace by ticks
+        $string = preg_replace('/<code>([^<]+)<\/code>/', '`$1`', $string);
+        return $string;
+    }
+}

From ce98ce48acdb80938ac8ccaac782795fcdcd7f01 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 1 Mar 2021 19:48:54 +0100
Subject: [PATCH 248/437] chg: [UI] Do not show published for default galaxy
 clusters

---
 app/View/GalaxyClusters/view.ctp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/View/GalaxyClusters/view.ctp b/app/View/GalaxyClusters/view.ctp
index b57d4d184..f7d869b04 100755
--- a/app/View/GalaxyClusters/view.ctp
+++ b/app/View/GalaxyClusters/view.ctp
@@ -42,8 +42,14 @@ $table_data[] = array('key' => __('Cluster ID'), 'value' => $cluster['GalaxyClus
 $table_data[] = array('key' => __('Name'), 'value' => $cluster['GalaxyCluster']['value']);
 $table_data[] = array('key' => __('Parent Galaxy'), 'value' => $cluster['GalaxyCluster']['Galaxy']['name'] ? $cluster['GalaxyCluster']['Galaxy']['name'] : $cluster['GalaxyCluster']['Galaxy']['type']);
 $table_data[] = array('key' => __('Description'), 'value' => $description, 'value_class' => 'md');
-$table_data[] = array('key' => __('Published'), 'boolean' => $cluster['GalaxyCluster']['published'], 'class' => (!$cluster['GalaxyCluster']['published'] ? 'background-red bold': ''));
-$table_data[] = array('key' => __('Default'), 'boolean' => $cluster['GalaxyCluster']['default'], 'class' => (!$cluster['GalaxyCluster']['published'] ? 'black': 'black'));
+if (!$cluster['GalaxyCluster']['default']) {
+    $table_data[] = [
+        'key' => __('Published'),
+        'boolean' => $cluster['GalaxyCluster']['published'],
+        'class' => !$cluster['GalaxyCluster']['published'] ? 'background-red bold' : ''
+    ];
+}
+$table_data[] = array('key' => __('Default'), 'boolean' => $cluster['GalaxyCluster']['default'], 'class' => 'black');
 $table_data[] = array('key' => __('Version'), 'value' => $cluster['GalaxyCluster']['version']);
 $table_data[] = array('key' => __('UUID'), 'value' => $cluster['GalaxyCluster']['uuid'], 'value_class' => 'quickSelect');
 $table_data[] = array('key' => __('Collection UUID'), 'value' => $cluster['GalaxyCluster']['collection_uuid'], 'value_class' => 'quickSelect');

From 6f74097c37abdca908748cef4bbe0cb5257325f7 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 1 Mar 2021 22:41:38 +0100
Subject: [PATCH 249/437] chg: [optimise] Faster loading galaxy cluster index

---
 app/Controller/GalaxiesController.php       |   2 +-
 app/Controller/GalaxyClustersController.php | 116 ++++++++++----------
 app/Model/GalaxyCluster.php                 |  27 ++++-
 3 files changed, 84 insertions(+), 61 deletions(-)

diff --git a/app/Controller/GalaxiesController.php b/app/Controller/GalaxiesController.php
index 15e609fc6..917a6fe01 100644
--- a/app/Controller/GalaxiesController.php
+++ b/app/Controller/GalaxiesController.php
@@ -558,8 +558,8 @@ class GalaxiesController extends AppController
         if (empty($clusters)) {
             throw new MethodNotAllowedException('Invalid Galaxy.');
         }
+        $this->Galaxy->GalaxyCluster->attachExtendByInfo($this->Auth->user(), $clusters);
         foreach ($clusters as $k => $cluster) {
-            $clusters[$k] = $this->Galaxy->GalaxyCluster->attachExtendByInfo($this->Auth->user(), $clusters[$k]);
             $clusters[$k] = $this->Galaxy->GalaxyCluster->attachExtendFromInfo($this->Auth->user(), $clusters[$k]);
         }
         $galaxy = $this->Galaxy->find('first', array(
diff --git a/app/Controller/GalaxyClustersController.php b/app/Controller/GalaxyClustersController.php
index db5ef3108..dcd313c7d 100644
--- a/app/Controller/GalaxyClustersController.php
+++ b/app/Controller/GalaxyClustersController.php
@@ -96,62 +96,64 @@ class GalaxyClustersController extends AppController
                 )
             );
             return $this->RestResponse->viewData($clusters, $this->response->type());
-        } else {
-            $this->paginate['conditions']['AND'][] = $contextConditions;
-            $this->paginate['conditions']['AND'][] = $searchConditions;
-            $this->paginate['conditions']['AND'][] = $aclConditions;
-            $this->paginate['contain'] = array_merge($this->paginate['contain'], array('Org', 'Orgc', 'SharingGroup', 'GalaxyClusterRelation', 'TargetingClusterRelation'));
-            $clusters = $this->paginate();
-
-            $tagIds = array();
-            foreach ($clusters as $k => $cluster) {
-                $clusters[$k] = $this->GalaxyCluster->attachExtendByInfo($this->Auth->user(), $clusters[$k]);
-                $clusters[$k] = $this->GalaxyCluster->attachExtendFromInfo($this->Auth->user(), $clusters[$k]);
-                $clusters[$k]['GalaxyCluster']['relation_counts'] = array(
-                    'out' => count($clusters[$k]['GalaxyClusterRelation']),
-                    'in' => count($clusters[$k]['TargetingClusterRelation']),
-                );
-
-                if (isset($cluster['Tag']['id'])) {
-                    $tagIds[] = $cluster['Tag']['id'];
-                    $clusters[$k]['GalaxyCluster']['tag_id'] = $cluster['Tag']['id'];
-                }
-                $clusters[$k]['GalaxyCluster']['synonyms'] = array();
-                foreach ($cluster['GalaxyElement'] as $element) {
-                    $clusters[$k]['GalaxyCluster']['synonyms'][] = $element['value'];
-                }
-                $clusters[$k]['GalaxyCluster']['event_count'] = 0; // real number is assigned later
-            }
-
-            $eventCountsForTags = $this->GalaxyCluster->Tag->EventTag->countForTags($tagIds, $this->Auth->user());
-
-            $this->loadModel('Sighting');
-            $csvForTags = $this->Sighting->tagsSparkline($tagIds, $this->Auth->user(), '0');
-            foreach ($clusters as $k => $cluster) {
-                if (isset($cluster['GalaxyCluster']['tag_id'])) {
-                    if (isset($csvForTags[$cluster['GalaxyCluster']['tag_id']])) {
-                        $clusters[$k]['csv'] = $csvForTags[$cluster['GalaxyCluster']['tag_id']];
-                    }
-                    if (isset($eventCountsForTags[$cluster['GalaxyCluster']['tag_id']])) {
-                        $clusters[$k]['GalaxyCluster']['event_count'] = $eventCountsForTags[$cluster['GalaxyCluster']['tag_id']];
-                    }
-                }
-            }
-            $customClusterCount = $this->GalaxyCluster->fetchGalaxyClusters($this->Auth->user(), [
-                'count' => true,
-                'conditions' => [
-                    'AND' => [$searchConditions, $aclConditions],
-                    'GalaxyCluster.default' => 0,
-                ]
-            ]);
-            $this->loadModel('Attribute');
-            $distributionLevels = $this->Attribute->distributionLevels;
-            unset($distributionLevels[5]);
-            $this->set('distributionLevels', $distributionLevels);
-            $this->set('list', $clusters);
-            $this->set('galaxy_id', $galaxyId);
-            $this->set('custom_cluster_count', $customClusterCount);
         }
+
+        $this->paginate['conditions']['AND'][] = $contextConditions;
+        $this->paginate['conditions']['AND'][] = $searchConditions;
+        $this->paginate['conditions']['AND'][] = $aclConditions;
+        $this->paginate['contain'] = array_merge($this->paginate['contain'], array('Org', 'Orgc', 'SharingGroup', 'GalaxyClusterRelation', 'TargetingClusterRelation'));
+        $clusters = $this->paginate();
+
+        $this->GalaxyCluster->attachExtendByInfo($this->Auth->user(), $clusters);
+
+        $tagIds = array();
+        foreach ($clusters as $k => $cluster) {
+            $clusters[$k] = $this->GalaxyCluster->attachExtendFromInfo($this->Auth->user(), $clusters[$k]);
+            $clusters[$k]['GalaxyCluster']['relation_counts'] = array(
+                'out' => count($clusters[$k]['GalaxyClusterRelation']),
+                'in' => count($clusters[$k]['TargetingClusterRelation']),
+            );
+
+            if (isset($cluster['Tag']['id'])) {
+                $tagIds[] = $cluster['Tag']['id'];
+                $clusters[$k]['GalaxyCluster']['tag_id'] = $cluster['Tag']['id'];
+            }
+            $clusters[$k]['GalaxyCluster']['synonyms'] = array();
+            foreach ($cluster['GalaxyElement'] as $element) {
+                $clusters[$k]['GalaxyCluster']['synonyms'][] = $element['value'];
+            }
+            $clusters[$k]['GalaxyCluster']['event_count'] = 0; // real number is assigned later
+        }
+
+        $eventCountsForTags = $this->GalaxyCluster->Tag->EventTag->countForTags($tagIds, $this->Auth->user());
+
+        $this->loadModel('Sighting');
+        $csvForTags = $this->Sighting->tagsSparkline($tagIds, $this->Auth->user(), '0');
+        foreach ($clusters as $k => $cluster) {
+            if (isset($cluster['GalaxyCluster']['tag_id'])) {
+                if (isset($csvForTags[$cluster['GalaxyCluster']['tag_id']])) {
+                    $clusters[$k]['csv'] = $csvForTags[$cluster['GalaxyCluster']['tag_id']];
+                }
+                if (isset($eventCountsForTags[$cluster['GalaxyCluster']['tag_id']])) {
+                    $clusters[$k]['GalaxyCluster']['event_count'] = $eventCountsForTags[$cluster['GalaxyCluster']['tag_id']];
+                }
+            }
+        }
+        $customClusterCount = $this->GalaxyCluster->fetchGalaxyClusters($this->Auth->user(), [
+            'count' => true,
+            'conditions' => [
+                'AND' => [$searchConditions, $aclConditions],
+                'GalaxyCluster.default' => 0,
+            ]
+        ]);
+        $this->loadModel('Attribute');
+        $distributionLevels = $this->Attribute->distributionLevels;
+        unset($distributionLevels[5]);
+        $this->set('distributionLevels', $distributionLevels);
+        $this->set('list', $clusters);
+        $this->set('galaxy_id', $galaxyId);
+        $this->set('custom_cluster_count', $customClusterCount);
+
         if ($this->request->is('ajax')) {
             $this->layout = 'ajax';
             $this->render('ajax/index');
@@ -179,7 +181,9 @@ class GalaxyClustersController extends AppController
         if ($this->_isRest()) {
             return $this->RestResponse->viewData($cluster, $this->response->type());
         } else {
-            $cluster = $this->GalaxyCluster->attachExtendByInfo($this->Auth->user(), $cluster);
+            $clusters = [$cluster];
+            $this->GalaxyCluster->attachExtendByInfo($this->Auth->user(), $clusters);
+            $cluster = $clusters[0];
             $cluster = $this->GalaxyCluster->attachExtendFromInfo($this->Auth->user(), $cluster);
             $this->set('id', $id);
             $this->set('galaxy', ['Galaxy' => $cluster['GalaxyCluster']['Galaxy']]);
diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 5ea05df2d..482c2d737 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -822,11 +822,30 @@ class GalaxyCluster extends AppModel
         return $element;
     }
 
-    public function attachExtendByInfo($user, $cluster)
+    /**
+     * @param array $user
+     * @param array $clusters
+     * @return void
+     */
+    public function attachExtendByInfo(array $user, array &$clusters)
     {
-        $extensions = $this->fetchGalaxyClusters($user, array('conditions' => array('extends_uuid' => $cluster['GalaxyCluster']['uuid'])));
-        $cluster['GalaxyCluster']['extended_by'] = $extensions;
-        return $cluster;
+        if (empty($clusters)) {
+            return;
+        }
+
+        $clusterUuids = array_column(array_column($clusters, 'GalaxyCluster'), 'uuid');
+        $extensions = $this->fetchGalaxyClusters($user, [
+            'conditions' => ['extends_uuid' => $clusterUuids],
+        ]);
+        foreach ($clusters as &$cluster) {
+            $extendedBy = [];
+            foreach ($extensions as $extension) {
+                if ($cluster['GalaxyCluster']['uuid'] === $extension['GalaxyCluster']['extends_uuid']) {
+                    $extendedBy[] = $extension;
+                }
+            }
+            $cluster['GalaxyCluster']['extended_by'] = $extendedBy;
+        }
     }
 
     public function attachExtendFromInfo($user, $cluster)

From 6654eff47eaecd14bd19040c4f74b612c19b59ad Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Mon, 1 Mar 2021 22:03:20 +0000
Subject: [PATCH 250/437] chg: [UI] Add small description of what event block
 rules do

---
 app/View/Servers/event_block_rule.ctp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/View/Servers/event_block_rule.ctp b/app/View/Servers/event_block_rule.ctp
index 53289ce02..cff740ecf 100644
--- a/app/View/Servers/event_block_rule.ctp
+++ b/app/View/Servers/event_block_rule.ctp
@@ -5,6 +5,7 @@
         'form' => $this->Form,
         'data' => array(
             'title' => __('Set event block rules'),
+            'description' => __('Event block rules allow you to add a simple tag filter to block events from being added or synced. Events with a tag that matches any of the tags in the rule list will be blocked. It is not possible to add more complex rules with boolean logic (NOT, AND).'),
             'model' => $modelForForm,
             'fields' => array(
                 array(

From ce88fd3ac271f6459c9356ef78bd0631b5abf156 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 1 Mar 2021 23:31:53 +0100
Subject: [PATCH 251/437] fix: [sharing group] saving fixed

invalid boolean operator when encoding the local org
---
 app/Model/SharingGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/SharingGroup.php b/app/Model/SharingGroup.php
index 46ac1dab8..3c52731e2 100644
--- a/app/Model/SharingGroup.php
+++ b/app/Model/SharingGroup.php
@@ -621,7 +621,7 @@ class SharingGroup extends AppModel
         }
         unset($sg['Organisation']);
         $creatorOrgFound = $this->captureSGOrgs($user, $sg, $sg_id, $forceUpdate);
-        $creatorOrgFound = $this->captureSGServers($user, $sg, $sg_id, $forceUpdate) && $creatorOrgFound;
+        $creatorOrgFound = $this->captureSGServers($user, $sg, $sg_id, $forceUpdate) || $creatorOrgFound;
         if (!$creatorOrgFound && !empty($server)) {
             $this->captureCreatorOrg($user, $sg_id);
         }

From 1727a748ebe1ffd41fce8f6574d734ce8c0efdf9 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 1 Mar 2021 23:32:25 +0100
Subject: [PATCH 252/437] fix: [pull] invalid internal vs external server
 lookup when deciding whether to pull local tags

---
 app/Model/Event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 5365fa2c3..44e9fc34a 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -1372,7 +1372,7 @@ class Event extends AppModel
             $response = $HttpSocket->post($uri, $data, $request);
         } else {
             $uri = $url . '/events/view/' . $eventId . '/deleted[]:0/deleted[]:1/excludeGalaxy:1';
-            if (!empty($server['Server']['internal'])) {
+            if (empty($server['Server']['internal'])) {
                 $uri = $uri . '/excludeLocalTags:1';
             }
             $response = $HttpSocket->get($uri, [], $request);

From 498d6215e34a685bb1cac6ec3b0c4bb972df05fe Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 1 Mar 2021 23:33:04 +0100
Subject: [PATCH 253/437] chg: [genericForm] added description field to the
 explanation

---
 app/View/Elements/genericElements/Form/genericForm.ctp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/View/Elements/genericElements/Form/genericForm.ctp b/app/View/Elements/genericElements/Form/genericForm.ctp
index e27614500..62c8c0c35 100644
--- a/app/View/Elements/genericElements/Form/genericForm.ctp
+++ b/app/View/Elements/genericElements/Form/genericForm.ctp
@@ -4,6 +4,7 @@
      *
      * Simply pass a JSON with the following keys set:
      * - model: The model used to create the form (such as Attribute, Event)
+     * - description: text description of the form
      * - fields: an array with each element generating an input field
      *     - field is the actual field name (such as org_id, name, etc) which is required
      *     - optional fields: default, type, options, placeholder, label - these are passed directly to $this->Form->input(),

From 11c89e5c0ae84b204bf698561e6a894b4c6c8d1b Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 1 Mar 2021 23:41:33 +0100
Subject: [PATCH 254/437] fix: [tag index] remove sorting on count fields

- doesn't work anyway
---
 app/View/Tags/index.ctp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/View/Tags/index.ctp b/app/View/Tags/index.ctp
index 674aa35cd..81fb58294 100644
--- a/app/View/Tags/index.ctp
+++ b/app/View/Tags/index.ctp
@@ -83,7 +83,6 @@
                 ],
                 [
                     'name' => __('Tagged events'),
-                    'sort' => 'Tag.count',
                     'class' => 'short',
                     'element' => 'count',
                     'data_path' => 'Tag.count',
@@ -91,7 +90,6 @@
                 ],
                 [
                     'name' => __('Tagged attributes'),
-                    'sort' => 'Tag.attribute_count',
                     'class' => 'short',
                     'element' => 'count',
                     'data_path' => 'Tag.attribute_count',

From ca13fee271ad126832c88896776f3050a6c06e64 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 1 Mar 2021 23:47:01 +0100
Subject: [PATCH 255/437] fix: [security] sharing group all org flag too lax

- the all org flag was used as a trigger to make the sharing group obejct itself viewable to all local organisations
- even if the all org flag was set for an instance other than the local one

- as reported by Jeroen Pinoy
---
 app/Model/SharingGroupServer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/SharingGroupServer.php b/app/Model/SharingGroupServer.php
index f96ed5e60..18a7f334f 100644
--- a/app/Model/SharingGroupServer.php
+++ b/app/Model/SharingGroupServer.php
@@ -98,7 +98,7 @@ class SharingGroupServer extends AppModel
     public function checkIfAuthorised($id)
     {
         $sg = $this->find('first', array(
-                'conditions' => array('sharing_group_id' => $id, 'all_orgs' => 1),
+                'conditions' => array('sharing_group_id' => $id, 'all_orgs' => 1, 'server_id' => 0),
                 'recursive' => -1,
                 'fields' => array('id'),
         ));

From 76a2727583abc9fd6405217c11ae6b0efa7046ee Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 2 Mar 2021 00:09:37 +0100
Subject: [PATCH 256/437] fix: [sharing groups] Allow users to see events they
 own, even if their organisation is not explicitly mentioned in the SG

- however, show a clear message that this is the case
- in-line with the rest of the ACL
---
 app/Model/Event.php      | 30 +++++++++++++++++-------------
 app/View/Events/view.ctp | 27 +++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 3a2f45b95..eae81f0a7 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -1483,23 +1483,23 @@ class Event extends AppModel
         if (!$user['Role']['perm_site_admin']) {
             $sgids = $this->cacheSgids($user, true);
             $unpublishedPrivate = Configure::read('MISP.unpublishedprivate');
-            $conditions['AND']['OR'] = array(
+            $conditions['AND']['OR'] = [
                 'Event.org_id' => $user['org_id'],
-                array(
-                    'AND' => array(
+                [
+                    'AND' => [
                         'Event.distribution >' => 0,
                         'Event.distribution <' => 4,
-                        $unpublishedPrivate ? array('Event.published' => 1) : array(),
-                    ),
-                ),
-                array(
-                    'AND' => array(
+                        $unpublishedPrivate ? array('Event.published' => 1) : [],
+                    ],
+                ],
+                [
+                    'AND' => [
                         'Event.sharing_group_id' => $sgids,
                         'Event.distribution' => 4,
-                        $unpublishedPrivate ? array('Event.published' => 1) : array(),
-                    )
-                )
-            );
+                        $unpublishedPrivate ? array('Event.published' => 1) : [],
+                    ]
+                ]
+            ];
         }
         return $conditions;
     }
@@ -2189,6 +2189,7 @@ class Event extends AppModel
         }
 
         foreach ($results as $eventKey => &$event) {
+            /*
             if ($event['Event']['distribution'] == 4 && !in_array($event['Event']['sharing_group_id'], $sgids)) {
                 $this->Log = ClassRegistry::init('Log');
                 $this->Log->create();
@@ -2205,6 +2206,7 @@ class Event extends AppModel
                 unset($results[$eventKey]); // Current user cannot access sharing_group associated to this event
                 continue;
             }
+            */
             if ($options['includeWarninglistHits'] || $options['enforceWarninglist']) {
                 $eventWarnings = $this->Warninglist->attachWarninglistToAttributes($event['Attribute']);
                 $this->Warninglist->attachWarninglistToAttributes($event['ShadowAttribute']);
@@ -2215,7 +2217,9 @@ class Event extends AppModel
             $this->__attachGalaxies($event, $user, $options['excludeGalaxy'], $options['fetchFullClusters']);
             $event = $this->Orgc->attachOrgs($event, $fieldsOrg);
             if (!$options['sgReferenceOnly'] && $event['Event']['sharing_group_id']) {
-                $event['SharingGroup'] = $sharingGroupData[$event['Event']['sharing_group_id']]['SharingGroup'];
+                if (!empty($sharingGroupData[$event['Event']['sharing_group_id']]['SharingGroup'])) {
+                    $event['SharingGroup'] = $sharingGroupData[$event['Event']['sharing_group_id']]['SharingGroup'];
+                }
             }
 
             // Include information about event creator user email. This information is included for:
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index f604f344d..b52438a09 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -124,6 +124,25 @@
                 'value_class' => 'threat-level-' . strtolower($event['ThreatLevel']['name']),
             );
         }
+        $sharingGroupHtml = false;
+        $hideDistributionGraph = false;
+        if ($event['Event']['distribution'] == 4) {
+            if (!empty($event['SharingGroup'])) {
+                $sharingGroupHtml = sprintf(
+                    '<a href="%s%s">%s</a>',
+                    $baseurl . '/sharing_groups/view/',
+                    h($event['SharingGroup']['id']),
+                    h($event['SharingGroup']['name'])
+                );
+            } else {
+                $sharingGroupHtml = sprintf(
+                    '<span class="red bold">%s</span>: %s',
+                    __('Undisclosed sharing group'),
+                    __('your organisation is the local owner of this event, however it is not explicitly listed in the sharing group.')
+                );
+                $hideDistributionGraph = true;
+            }
+        }
         $table_data[] = array(
             'key' => __('Analysis'),
             'key_title' => $eventDescriptions['analysis']['desc'],
@@ -135,19 +154,19 @@
             'html' => sprintf(
                 '%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'])) :
+                    $sharingGroupHtml :
                     h($distributionLevels[$event['Event']['distribution']]),
-                sprintf(
+                $hideDistributionGraph ? '' : sprintf(
                     '<span id="distribution_graph_bar" style="margin-left: 5px;" data-object-id="%s" data-object-context="event"></span>',
                     h($event['Event']['id'])
                 ),
-                sprintf(
+                $hideDistributionGraph ? '' : 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(
+                $hideDistributionGraph ? '' : 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'

From 55d695bd10dfb62bb47a9dba1721ac5cb12705a8 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 2 Mar 2021 10:04:32 +0100
Subject: [PATCH 257/437] chg: [UI] Use Page Visibility API

---
 app/View/Jobs/index.ctp        | 2 +-
 app/View/Layouts/dashboard.ctp | 9 ---------
 app/View/Layouts/default.ctp   | 8 --------
 app/webroot/js/misp.js         | 4 ++--
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/app/View/Jobs/index.ctp b/app/View/Jobs/index.ctp
index fd1fd4b30..162e9a22d 100644
--- a/app/View/Jobs/index.ctp
+++ b/app/View/Jobs/index.ctp
@@ -32,7 +32,7 @@
 
         function queueInterval(k, id) {
             intervalArray[k] = setInterval(function() {
-                if (tabIsActive) {
+                if (!document.hidden) {
                     $.getJSON('<?php echo $baseurl; ?>/jobs/getGenerateCorrelationProgress/' + id, function(data) {
                         var x = document.getElementById("bar" + id);
                         x.style.width = data+"%";
diff --git a/app/View/Layouts/dashboard.ctp b/app/View/Layouts/dashboard.ctp
index 839d0dad8..479080ccb 100644
--- a/app/View/Layouts/dashboard.ctp
+++ b/app/View/Layouts/dashboard.ctp
@@ -102,7 +102,6 @@
     <?php
         endif;
     ?>
-        var tabIsActive = true;
         var baseurl = '<?php echo $baseurl; ?>';
         var here = '<?php
                 if (substr($this->params['action'], 0, 6) === 'admin_') {
@@ -111,13 +110,6 @@
                     echo $baseurl . '/' . h($this->params['controller']) . '/' . h($this->params['action']);
                 }
             ?>';
-        $(document).ready(function(){
-            $(window).blur(function() {
-                tabIsActive = false;
-            });
-            $(window).focus(function() {
-                tabIsActive = true;
-            });
         <?php
             if (!Configure::read('MISP.disable_auto_logout') and $me):
         ?>
@@ -125,7 +117,6 @@
         <?php
             endif;
         ?>
-        });
     </script>
 </body>
 </html>
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index 3b79002e4..cea81bbc7 100644
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -98,7 +98,6 @@
     <?php
         endif;
     ?>
-        var tabIsActive = true;
         var baseurl = '<?php echo $baseurl; ?>';
         var here = '<?php
                 if (substr($this->params['action'], 0, 6) === 'admin_') {
@@ -107,12 +106,6 @@
                     echo $baseurl . '/' . h($this->params['controller']) . '/' . h($this->params['action']);
                 }
             ?>';
-        $(function(){
-            $(window).blur(function() {
-                tabIsActive = false;
-            }).focus(function() {
-                tabIsActive = true;
-            });
         <?php
             if (!Configure::read('MISP.disable_auto_logout') && isset($me) && $me):
         ?>
@@ -120,7 +113,6 @@
         <?php
             endif;
         ?>
-        });
     </script>
 </body>
 </html>
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 2664d58ad..24e4f0880 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -4808,7 +4808,7 @@ $(document.body).on('click', 'a[data-paginator]', function (e) {
 });
 
 function queryEventLock(event_id) {
-    if (tabIsActive) {
+    if (!document.hidden) {
         $.ajax({
             url: baseurl + "/events/checkLocks/" + event_id,
             type: "get",
@@ -4826,7 +4826,7 @@ function queryEventLock(event_id) {
 }
 
 function checkIfLoggedIn() {
-    if (tabIsActive) {
+    if (!document.hidden) {
         $.get(baseurl + "/users/checkIfLoggedIn.json")
             .fail(function (xhr) {
                 if (xhr.status === 403) {

From 4bcf270233fb7eec07a70ea7dfbe120d61115c00 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 2 Mar 2021 10:54:39 +0100
Subject: [PATCH 258/437] chg: [UI] Simplify keyboard-shortcuts.js

---
 app/View/Elements/global_menu.ctp             |  1 -
 app/View/Events/index.ctp                     |  1 -
 app/View/Events/view.ctp                      |  1 -
 app/View/Layouts/default.ctp                  |  5 +-
 .../js/keyboard-shortcuts-definition.js       | 61 +++++++++++++++++++
 app/webroot/js/keyboard-shortcuts.js          | 39 ++----------
 app/webroot/shortcuts/event_index.json        |  9 ---
 app/webroot/shortcuts/event_view.json         | 24 --------
 app/webroot/shortcuts/global_menu.json        | 15 -----
 9 files changed, 68 insertions(+), 88 deletions(-)
 create mode 100644 app/webroot/js/keyboard-shortcuts-definition.js
 delete mode 100644 app/webroot/shortcuts/event_index.json
 delete mode 100644 app/webroot/shortcuts/event_view.json
 delete mode 100644 app/webroot/shortcuts/global_menu.json

diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp
index 60feef643..1935e0c87 100755
--- a/app/View/Elements/global_menu.ctp
+++ b/app/View/Elements/global_menu.ctp
@@ -526,4 +526,3 @@
     </ul>
   </div>
 </div>
-<input type="hidden" class="keyboardShortcutsConfig" value="/shortcuts/global_menu.json" />
diff --git a/app/View/Events/index.ctp b/app/View/Events/index.ctp
index cacdfb804..f54efefbe 100644
--- a/app/View/Events/index.ctp
+++ b/app/View/Events/index.ctp
@@ -127,6 +127,5 @@
     echo $this->Html->css('distribution-graph');
     echo $this->Html->script('network-distribution-graph');
 ?>
-<input type="hidden" class="keyboardShortcutsConfig" value="/shortcuts/event_index.json" />
 <?php
     if (!$ajax) echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'index'));
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index f604f344d..06be58a8c 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -561,4 +561,3 @@ $(function () {
     });
 });
 </script>
-<input type="hidden" value="/shortcuts/event_view.json" class="keyboardShortcutsConfig" />
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index 3b79002e4..572ff527f 100644
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -33,7 +33,7 @@
         ));
     ?>
 </head>
-<body>
+<body data-controller="<?= h($this->params['controller']) ?>" data-action="<?= h($this->params['action']) ?>">
     <div id="popover_form" class="ajax_popover_form"></div>
     <div id="popover_form_large" class="ajax_popover_form ajax_popover_form_large"></div>
     <div id="popover_form_x_large" class="ajax_popover_form ajax_popover_form_x_large"></div>
@@ -71,7 +71,8 @@
             'bootstrap-datepicker',
             'bootstrap-colorpicker',
             'misp',
-            'keyboard-shortcuts'
+            'keyboard-shortcuts-definition',
+            'keyboard-shortcuts',
         )
     ));
     echo $this->element('footer');
diff --git a/app/webroot/js/keyboard-shortcuts-definition.js b/app/webroot/js/keyboard-shortcuts-definition.js
new file mode 100644
index 000000000..bd6acbe3f
--- /dev/null
+++ b/app/webroot/js/keyboard-shortcuts-definition.js
@@ -0,0 +1,61 @@
+function getShortcutsDefinition() {
+    var shortcuts = [
+        {
+            "key": "l",
+            "description": "Go to event list",
+            "action": function () {
+                document.location.href = baseurl + '/events/index';
+            }
+        },
+        {
+            "key": "e",
+            "description": "Go to add event page",
+            "action": function () {
+                document.location.href = baseurl + '/events/add';
+            }
+        }
+    ];
+
+    var $body = $(document.body);
+    if ($body.data('controller') === 'events' && $body.data('action') === 'view') {
+        shortcuts.push({
+            "key": "t",
+            "description": "Open the tag selection modal",
+            "action": function () {
+                $('.addTagButton').first().click();
+            }
+        });
+        shortcuts.push({
+            "key": "f",
+            "description": "Open the freetext import modal",
+            "action": function () {
+                $('#freetext-button').click();
+            }
+        });
+        shortcuts.push({
+            "key": "a",
+            "description": "Add an attribute",
+            "action": function () {
+                $('#create-button').click();
+            }
+        });
+        shortcuts.push({
+            "key": "s",
+            "description": "Focus the filter attribute bar",
+            "action": function () {
+                $('#quickFilterField').focus();
+            }
+        });
+    }
+
+    if ($body.data('controller') === 'events' && $body.data('action') === 'index') {
+        shortcuts.push({
+            "key": "s",
+            "description": "Focus the filter events bar",
+            "action": function () {
+                $('#quickFilterField').focus();
+            }
+        });
+    }
+    return shortcuts;
+}
diff --git a/app/webroot/js/keyboard-shortcuts.js b/app/webroot/js/keyboard-shortcuts.js
index 1895bf0b0..0375a15ec 100644
--- a/app/webroot/js/keyboard-shortcuts.js
+++ b/app/webroot/js/keyboard-shortcuts.js
@@ -21,13 +21,7 @@ let keyboardShortcutsManager = {
 	init() {
 		/* Codacy comment to notify that baseurl is a read-only global variable. */
 		/* global baseurl */
-		let shortcutURIs = [];
-		for(let keyboardShortcutElement of $('.keyboardShortcutsConfig')) {
-			shortcutURIs.push(keyboardShortcutElement.value);
-			this.ajaxGet(baseurl + keyboardShortcutElement.value).then((response) => {
-				this.mapKeyboardShortcuts(JSON.parse(response));
-			});
-		}
+		this.mapKeyboardShortcuts(getShortcutsDefinition());
 		this.setKeyboardListener();
 	},
 
@@ -61,7 +55,7 @@ let keyboardShortcutsManager = {
 	 * @param {} config The shortcut JSON list: [{key: string, description: string, action: string(eval-able JS code)}]
 	 */
 	mapKeyboardShortcuts(config) {
-		for(let shortcut of config.shortcuts) {
+		for(let shortcut of config) {
 			this.shortcutKeys.set(shortcut.key, shortcut);
 		}
 		this.addShortcutListToHTML();
@@ -76,39 +70,14 @@ let keyboardShortcutsManager = {
 		window.onkeyup = (keyboardEvent) => {
 			if(this.shortcutKeys.has(keyboardEvent.key)) {
 				let activeElement = document.activeElement.tagName;
-				if( !this.ESCAPED_TAG_NAMES.includes(activeElement)) {
-					eval(this.shortcutKeys.get(keyboardEvent.key).action);
+				if(!this.ESCAPED_TAG_NAMES.includes(activeElement)) {
+					this.shortcutKeys.get(keyboardEvent.key).action();
 				}
 			} else if(this.NAVIGATION_KEYS.includes(keyboardEvent.key)) {
 				window.dispatchEvent(new CustomEvent(this.EVENTS[keyboardEvent.key], {detail: keyboardEvent}));
 			}
 		}
 	},
-
-	/**
-	 * Queries the given URL with a GET request and returns a Promise
-	 * that resolves when the response arrives.
-	 * @param string url The URL to fetch.
-	 */
-	ajaxGet(url) {
-		return new Promise(function(resolve, reject) {
-			let req = new XMLHttpRequest();
-			req.open("GET", url);
-			req.onload = function() {
-				if (req.status === 200) {
-					resolve(req.response);
-				} else {
-					reject(new Error(req.statusText));
-				}
-			};
-
-			req.onerror = function() {
-				reject(new Error("Network error"));
-			};
-
-			req.send();
-		});
-	}
 }
 
 // Inits the keyboard shortcut manager's main routine.
diff --git a/app/webroot/shortcuts/event_index.json b/app/webroot/shortcuts/event_index.json
deleted file mode 100644
index 15e6fa1cb..000000000
--- a/app/webroot/shortcuts/event_index.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"shortcuts": [
-		{
-			"key": "s",
-			"description": "Focus the filter events bar",
-			"action": "$('#quickFilterField').focus()"
-		}
-	]
-}
\ No newline at end of file
diff --git a/app/webroot/shortcuts/event_view.json b/app/webroot/shortcuts/event_view.json
deleted file mode 100644
index c411c8802..000000000
--- a/app/webroot/shortcuts/event_view.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"shortcuts": [
-		{
-			"key": "t",
-			"description": "Open the tag selection modal",
-			"action": "$('.addTagButton').first().click()"
-		},
-		{
-			"key": "f",
-			"description": "Open the freetext import modal",
-			"action": "$('#freetext-button').click()"
-		},
-		{
-			"key": "a",
-			"description": "Add an attribute",
-			"action": "$('#create-button').click()"
-		},
-		{
-			"key": "s",
-			"description": "Focus the filter attribute bar",
-			"action": "$('#quickFilterField').focus()"
-		}
-	]
-}
diff --git a/app/webroot/shortcuts/global_menu.json b/app/webroot/shortcuts/global_menu.json
deleted file mode 100644
index 6ee3ca893..000000000
--- a/app/webroot/shortcuts/global_menu.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"shortcuts": [
-		{
-			"key": "l",
-			"description": "Go to event list",
-			"action": "document.location.href = baseurl + '/events/index'"
-		},
-		{
-			"key": "e",
-			"description": "Go to add event page",
-			"action": "document.location.href = baseurl + '/events/add'"
-		}
-	]
-}
-

From d16172ca61a010d2e2b6995be53a2affe8f59110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Tue, 2 Mar 2021 12:42:37 +0100
Subject: [PATCH 259/437] chg: Bump PyMISP

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index 2ceb38c74..4a2367ec9 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 2ceb38c741f9432432114998d0c0f8fa36686083
+Subproject commit 4a2367ec965d70d84a0091ea3a6978916a7df25a

From 66e371a19c36c2d1e860cc3943153b5922357453 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 2 Mar 2021 13:03:54 +0100
Subject: [PATCH 260/437] fix: [comments] updated for two recent changes in the
 code

---
 app/Model/Event.php              | 1 +
 app/Model/SharingGroupServer.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index eae81f0a7..ed9fbcead 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -2190,6 +2190,7 @@ class Event extends AppModel
 
         foreach ($results as $eventKey => &$event) {
             /*
+            // REMOVING THIS FOR NOW - users should see data they own, even if they're not in the sharing group.
             if ($event['Event']['distribution'] == 4 && !in_array($event['Event']['sharing_group_id'], $sgids)) {
                 $this->Log = ClassRegistry::init('Log');
                 $this->Log->create();
diff --git a/app/Model/SharingGroupServer.php b/app/Model/SharingGroupServer.php
index 18a7f334f..6a1e56e51 100644
--- a/app/Model/SharingGroupServer.php
+++ b/app/Model/SharingGroupServer.php
@@ -94,7 +94,7 @@ class SharingGroupServer extends AppModel
         return $sgs;
     }
 
-    // pass a sharing group ID, returns true if it has an attached server object with "all_orgs" ticked
+    // pass a sharing group ID, returns true if it has the local server object attached with "all_orgs" set
     public function checkIfAuthorised($id)
     {
         $sg = $this->find('first', array(

From 62537961f0f1caafe171d977b5af2643137726e4 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 2 Mar 2021 14:44:41 +0100
Subject: [PATCH 261/437] fix: [internal] Undefined index when importing from
 module

---
 app/Controller/AppController.php    | 4 ++--
 app/Controller/EventsController.php | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index c2fa205d3..63c388cb1 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -1453,10 +1453,10 @@ class AppController extends Controller
         if ($this->userRole['perm_site_admin']) {
             return true;
         }
-        if ($this->userRole['perm_modify_org'] && $event['Event']['orgc_id'] == $this->Auth->user('org_id')) {
+        if ($this->userRole['perm_modify_org'] && $event['Event']['orgc_id'] == $this->Auth->user()['org_id']) {
             return true;
         }
-        if ($this->userRole['perm_modify'] && $event['Event']['user_id'] == $this->Auth->user('id')) {
+        if ($this->userRole['perm_modify'] && $event['Event']['user_id'] == $this->Auth->user()['id']) {
             return true;
         }
         return false;
diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 3a64d2f49..829853d94 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -4938,6 +4938,7 @@ class EventsController extends AppController
         if (!$event) {
             throw new NotFoundException(__('Invalid event.'));
         }
+        $mayModify = $this->__canModifyEvent($event);
         $eventId = $event['Event']['id'];
 
         $this->loadModel('Module');
@@ -5108,7 +5109,7 @@ class EventsController extends AppController
         $this->set('module', $module);
         $this->set('eventId', $eventId);
         $this->set('event', $event);
-        $this->set('mayModify', $this->__canModifyEvent($event));
+        $this->set('mayModify', $mayModify);
     }
 
     public function exportModule($module, $id, $standard = false)

From c8533ead788ad08aa5995c1bb84eaeb31e3d5198 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 2 Mar 2021 18:04:49 +0100
Subject: [PATCH 262/437] chg: [internal] Cleanup code that is resposible for
 fetching server setting

---
 app/Model/Server.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index f9d07cc92..554addd56 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -4,6 +4,7 @@ App::uses('GpgTool', 'Tools');
 
 /**
  * @property-read array $serverSettings
+ * @property Organisation $Organisation
  */
 class Server extends AppModel
 {
@@ -1235,16 +1236,23 @@ class Server extends AppModel
         return true;
     }
 
+    /**
+     * @return array
+     */
     public function getCurrentServerSettings()
     {
-        $this->Module = ClassRegistry::init('Module');
         $serverSettings = $this->serverSettings;
         $moduleTypes = array('Enrichment', 'Import', 'Export', 'Cortex');
         $serverSettings = $this->readModuleSettings($serverSettings, $moduleTypes);
         return $serverSettings;
     }
 
-    private function readModuleSettings($serverSettings, $moduleTypes)
+    /**
+     * @param array $serverSettings
+     * @param array $moduleTypes
+     * @return array
+     */
+    private function readModuleSettings(array $serverSettings, array $moduleTypes)
     {
         $this->Module = ClassRegistry::init('Module');
         foreach ($moduleTypes as $moduleType) {
@@ -1253,12 +1261,12 @@ class Server extends AppModel
                 foreach ($results as $module => $data) {
                     foreach ($data as $result) {
                         $setting = array('level' => 1, 'errorMessage' => '');
-                        if ($result['type'] == 'boolean') {
+                        if ($result['type'] === 'boolean') {
                             $setting['test'] = 'testBool';
                             $setting['type'] = 'boolean';
                             $setting['description'] = __('Enable or disable the %s module.', $module);
                             $setting['value'] = false;
-                        } elseif ($result['type'] == 'orgs') {
+                        } elseif ($result['type'] === 'orgs') {
                             $setting['description'] = __('Restrict the %s module to the given organisation.', $module);
                             $setting['value'] = 0;
                             $setting['test'] = 'testLocalOrg';
@@ -1335,15 +1343,11 @@ class Server extends AppModel
 
     public function serverSettingsRead($unsorted = false)
     {
-        $this->Module = ClassRegistry::init('Module');
         $serverSettings = $this->getCurrentServerSettings();
         $currentSettings = Configure::read();
-        if (Configure::read('Plugin.Enrichment_services_enable')) {
-            $this->readModuleSettings($serverSettings, array('Enrichment'));
-        }
         $finalSettingsUnsorted = $this->__serverSettingsRead($serverSettings, $currentSettings);
         foreach ($finalSettingsUnsorted as $key => $temp) {
-            if (in_array($temp['tab'], array_keys($this->__settingTabMergeRules))) {
+            if (isset($this->__settingTabMergeRules[$temp['tab']])) {
                 $finalSettingsUnsorted[$key]['tab'] = $this->__settingTabMergeRules[$temp['tab']];
             }
         }

From 7431beefa12bff1807dee5351dae9e6586e2c5a9 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Tue, 2 Mar 2021 22:03:05 +0000
Subject: [PATCH 263/437] chg: [UI] fix keyboard shortcut manager popup
 triangle

---
 app/View/Elements/footer.ctp         |  2 +-
 app/webroot/js/keyboard-shortcuts.js | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/View/Elements/footer.ctp b/app/View/Elements/footer.ctp
index 387c8d56f..dacd6c010 100644
--- a/app/View/Elements/footer.ctp
+++ b/app/View/Elements/footer.ctp
@@ -1,5 +1,5 @@
 <div class="footer <?php echo $debugMode;?>">
-    <div id="shortcutsListContainer" class="<?php echo $debugMode ? 'hidden': ''; ?>">
+    <div id="shortcutsListContainer" class="<?php echo $debugMode == 'debugOn' ? 'hidden': ''; ?>">
         <div id="triangle"></div>
         <div id="shortcutsList">
             <span> <?php echo __('Keyboard shortcuts for this page'); ?>:</span><br>
diff --git a/app/webroot/js/keyboard-shortcuts.js b/app/webroot/js/keyboard-shortcuts.js
index 1895bf0b0..56db0de2d 100644
--- a/app/webroot/js/keyboard-shortcuts.js
+++ b/app/webroot/js/keyboard-shortcuts.js
@@ -111,9 +111,9 @@ let keyboardShortcutsManager = {
 	}
 }
 
-// Inits the keyboard shortcut manager's main routine.
-$(document).ready(() => keyboardShortcutsManager.init());
-
-// Inits the click event on the keyboard shortcut triangle at the bottom of the screen.
-$('#triangle').click(keyboardShortcutsManager.onTriangleClick);
+// Inits the keyboard shortcut manager's main routine and the click event on the keyboard shortcut triangle at the bottom of the screen.
+$(document).ready(function(){
+        keyboardShortcutsManager.init();
+        $('#triangle').click(keyboardShortcutsManager.onTriangleClick);
+});
 

From f83fc6ca248f8c2ba49d704b8eb4993a1502fc04 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 2 Mar 2021 23:42:54 +0100
Subject: [PATCH 264/437] fix: [sharing groups] fixed regression with updating
 local sharing groups

---
 app/Model/SharingGroup.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Model/SharingGroup.php b/app/Model/SharingGroup.php
index ea89684af..d00288d06 100644
--- a/app/Model/SharingGroup.php
+++ b/app/Model/SharingGroup.php
@@ -649,10 +649,12 @@ class SharingGroup extends AppModel
             return false;
         }
         if (empty($sg['modified']) || $sg['modified'] > $existingSG['SharingGroup']['modified']) {
-            $isLocalSync = $user['Role']['perm_sync'] && !empty($existingSG['SharingGroup']['local']);
+            // consider the local field being set to be equivalent to an event's locked == 0 state
+            $isUpdatableBySync = $user['Role']['perm_sync'] && empty($existingSG['SharingGroup']['local']);
+            // TODO: reconsider this, org admins will be blocked from legitimate edits if they have sync permissions.
+            // We need a mechanism to check whether we're in sync context.
             $isSGOwner = !$user['Role']['perm_sync'] && $existingSG['org_id'] == $user['org_id'];
-            if ($isLocalSync || $isSGOwner || $user['Role']['perm_site_admin']) {
-                $sg_id = (int)$existingSG['SharingGroup']['id'];
+            if ($isUpdatableBySync || $isSGOwner || $user['Role']['perm_site_admin']) {
                 $editedSG = $existingSG['SharingGroup'];
                 $attributes = ['name', 'releasability', 'description', 'created', 'modified', 'active', 'roaming'];
                 foreach ($attributes as $a) {
@@ -679,7 +681,7 @@ class SharingGroup extends AppModel
      * @return int || false
      */
     public function captureSGNew($user, $sg, $syncLocal)
-    {    
+    {
         // check if current user is contained in the SG and we are in a local sync setup
         if (!empty($sg['uuid'])) {
             if (isset($this->__sgAuthorisationCache['save'][boolval($syncLocal)][$sg['uuid']])) {

From 7f9afb84e758652e37dd004fa9aba33e1c70f9da Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 3 Mar 2021 00:19:46 +0100
Subject: [PATCH 265/437] fix: [Sharing groups] capturing a sharing group
 correctly ignores the incoming data's active flag when editing

- based on PR #7101 by @lfortemps
---
 app/Model/SharingGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/SharingGroup.php b/app/Model/SharingGroup.php
index d00288d06..e150bf197 100644
--- a/app/Model/SharingGroup.php
+++ b/app/Model/SharingGroup.php
@@ -656,7 +656,7 @@ class SharingGroup extends AppModel
             $isSGOwner = !$user['Role']['perm_sync'] && $existingSG['org_id'] == $user['org_id'];
             if ($isUpdatableBySync || $isSGOwner || $user['Role']['perm_site_admin']) {
                 $editedSG = $existingSG['SharingGroup'];
-                $attributes = ['name', 'releasability', 'description', 'created', 'modified', 'active', 'roaming'];
+                $attributes = ['name', 'releasability', 'description', 'created', 'modified', 'roaming'];
                 foreach ($attributes as $a) {
                     if (isset($sg[$a])) {
                         $editedSG[$a] = $sg[$a];

From 78a48ddc8789fde1c9af445158a52043d976b763 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 3 Mar 2021 00:29:57 +0100
Subject: [PATCH 266/437] new: [server shell] list servers, fixes #7115

- simple human readable listing
- kept the old weird JSON producing listServers intact
---
 app/Console/Command/ServerShell.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/Console/Command/ServerShell.php b/app/Console/Command/ServerShell.php
index 870672625..05ac12536 100644
--- a/app/Console/Command/ServerShell.php
+++ b/app/Console/Command/ServerShell.php
@@ -14,6 +14,26 @@ class ServerShell extends AppShell
     public $uses = array('Server', 'Task', 'Job', 'User', 'Feed');
     public $tasks = array('ConfigLoad');
 
+    public function list()
+    {
+        $this->ConfigLoad->execute();
+        $res = ['servers'=>[]];
+        $servers = $this->Server->find('all', [
+            'fields' => ['Server.id', 'Server.name', 'Server.url'],
+            'recursive' => 0
+        ]);
+        foreach ($servers as $server) {
+            echo sprintf(
+                '%sServer #%s :: %s :: %s',
+                PHP_EOL,
+                $server['Server']['id'],
+                $server['Server']['name'],
+                $server['Server']['url']
+            );
+        }
+        echo PHP_EOL;
+    }
+
     public function listServers()
     {
         $this->ConfigLoad->execute();

From 98ecf68541a1534419daf7da8249644f434a6e01 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 3 Mar 2021 01:18:34 +0100
Subject: [PATCH 267/437] chg: [version] bump

---
 VERSION.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.json b/VERSION.json
index 01c07ad57..5d3d5ea23 100644
--- a/VERSION.json
+++ b/VERSION.json
@@ -1 +1 @@
-{"major":2, "minor":4, "hotfix":139}
+{"major":2, "minor":4, "hotfix":140}

From 2e4ff3837783ed71c4c15cf05414e72801928df4 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Wed, 3 Mar 2021 07:45:06 +0100
Subject: [PATCH 268/437] chg: [misp-objects] updated to the latest version

---
 app/files/misp-objects | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/misp-objects b/app/files/misp-objects
index e764ed698..e1f01f674 160000
--- a/app/files/misp-objects
+++ b/app/files/misp-objects
@@ -1 +1 @@
-Subproject commit e764ed6983bac3a3171fe1a649176224d1abbf0a
+Subproject commit e1f01f674fbaeb5f5af13b15f9b87ede9bcc1291

From 874ec66c9bcaa702013f390eb638b4fd679212c2 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 22 Feb 2021 10:33:16 +0100
Subject: [PATCH 269/437] chg: [schema] Convert GalaxyCluster tag name to case
 insensitive

---
 INSTALL/MYSQL.sql           | 2 +-
 app/Model/AppModel.php      | 3 +++
 app/Model/GalaxyCluster.php | 8 ++++----
 db_schema.json              | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/INSTALL/MYSQL.sql b/INSTALL/MYSQL.sql
index 4c0dee91e..8ffd9e0dc 100644
--- a/INSTALL/MYSQL.sql
+++ b/INSTALL/MYSQL.sql
@@ -455,7 +455,7 @@ CREATE TABLE IF NOT EXISTS `galaxy_clusters` (
   `collection_uuid` varchar(255) COLLATE utf8_bin NOT NULL,
   `type` varchar(255) COLLATE utf8_bin NOT NULL,
   `value` text COLLATE utf8_bin NOT NULL,
-  `tag_name` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
+  `tag_name` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
   `description` text COLLATE utf8_bin NOT NULL,
   `galaxy_id` int(11) NOT NULL,
   `source` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index 3348e9ecc..6c7f225b1 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -1568,6 +1568,9 @@ class AppModel extends Model
                     INDEX `value` (`value`(255))
                 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;";
                 break;
+            case 66:
+                $sqlArray[] = "ALTER TABLE `galaxy_clusters` MODIFY COLUMN `tag_name` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '';";
+                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;';
diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 18960ca15..0fb8d4d30 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -915,7 +915,7 @@ class GalaxyCluster extends AppModel
             if (!$isGalaxyTag) {
                 return null;
             }
-            $conditions = array('LOWER(GalaxyCluster.tag_name)' => strtolower($name));
+            $conditions = array('GalaxyCluster.tag_name' => $name);
         }
         $cluster = $this->fetchGalaxyClusters($user, array(
             'conditions' => $conditions,
@@ -943,7 +943,7 @@ class GalaxyCluster extends AppModel
         if (count(array_filter($namesOrIds, 'is_numeric')) === count($namesOrIds)) { // all elements are numeric
             $conditions = array('GalaxyCluster.id' => $namesOrIds);
         } else {
-            $conditions = array('LOWER(GalaxyCluster.tag_name)' => array_map('strtolower', $namesOrIds));
+            $conditions = array('GalaxyCluster.tag_name' => $namesOrIds);
         }
 
         $options = ['conditions' => $conditions];
@@ -1470,7 +1470,7 @@ class GalaxyCluster extends AppModel
         foreach ($events as $event) {
             foreach ($event['EventTag'] as $eventTag) {
                 if ($eventTag['Tag']['is_galaxy']) {
-                    $clusterTagNames[$eventTag['Tag']['id']] = strtolower($eventTag['Tag']['name']);
+                    $clusterTagNames[$eventTag['Tag']['id']] = $eventTag['Tag']['name'];
                 }
             }
         }
@@ -1480,7 +1480,7 @@ class GalaxyCluster extends AppModel
         }
 
         $options = [
-            'conditions' => ['LOWER(GalaxyCluster.tag_name)' => $clusterTagNames],
+            'conditions' => ['GalaxyCluster.tag_name' => $clusterTagNames],
             'contain' => ['Galaxy', 'GalaxyElement'],
         ];
         $clusters = $this->fetchGalaxyClusters($user, $options);
diff --git a/db_schema.json b/db_schema.json
index f2427a0c0..86641ec5f 100644
--- a/db_schema.json
+++ b/db_schema.json
@@ -2356,7 +2356,7 @@
                 "data_type": "varchar",
                 "character_maximum_length": "255",
                 "numeric_precision": null,
-                "collation_name": "utf8_bin",
+                "collation_name": "utf8_unicode_ci",
                 "column_type": "varchar(255)",
                 "column_default": "",
                 "extra": ""

From e3b2a0a40cf62485d80015e567764c4ebab331c4 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 22 Feb 2021 13:56:30 +0100
Subject: [PATCH 270/437] chg: [schema] Add index for EventReport.event_id

---
 INSTALL/MYSQL.sql      |  3 ++-
 app/Model/AppModel.php | 12 +++++++-----
 db_schema.json         |  3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/INSTALL/MYSQL.sql b/INSTALL/MYSQL.sql
index 8ffd9e0dc..284128120 100644
--- a/INSTALL/MYSQL.sql
+++ b/INSTALL/MYSQL.sql
@@ -243,7 +243,8 @@ CREATE TABLE IF NOT EXISTS event_reports (
     `deleted` tinyint(1) NOT NULL DEFAULT 0,
     PRIMARY KEY (id),
     CONSTRAINT u_uuid UNIQUE (uuid),
-    INDEX `name` (`name`)
+    INDEX `name` (`name`),
+    INDEX `event_id` (`event_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- --------------------------------------------------------
diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index 6c7f225b1..60c220c87 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -1570,6 +1570,7 @@ class AppModel extends Model
                 break;
             case 66:
                 $sqlArray[] = "ALTER TABLE `galaxy_clusters` MODIFY COLUMN `tag_name` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '';";
+                $indexArray[] = ['event_reports', 'event_id'];
                 break;
             case 'fixNonEmptySharingGroupID':
                 $sqlArray[] = 'UPDATE `events` SET `sharing_group_id` = 0 WHERE `distribution` != 4;';
@@ -1824,18 +1825,19 @@ class AppModel extends Model
         }
     }
 
-    private function __addIndex($table, $field, $length = false)
+    private function __addIndex($table, $field, $length = null, $unique = false)
     {
         $dataSourceConfig = ConnectionManager::getDataSource('default')->config;
         $dataSource = $dataSourceConfig['datasource'];
         $this->Log = ClassRegistry::init('Log');
+        $index = $unique ? 'UNIQUE INDEX' : 'INDEX';
         if ($dataSource == 'Database/Postgres') {
-            $addIndex = "CREATE INDEX idx_" . $table . "_" . $field . " ON " . $table . " (" . $field . ");";
+            $addIndex = "CREATE $index idx_" . $table . "_" . $field . " ON " . $table . " (" . $field . ");";
         } else {
             if (!$length) {
-                $addIndex = "ALTER TABLE `" . $table . "` ADD INDEX `" . $field . "` (`" . $field . "`);";
+                $addIndex = "ALTER TABLE `" . $table . "` ADD $index `" . $field . "` (`" . $field . "`);";
             } else {
-                $addIndex = "ALTER TABLE `" . $table . "` ADD INDEX `" . $field . "` (`" . $field . "`(" . $length . "));";
+                $addIndex = "ALTER TABLE `" . $table . "` ADD $index `" . $field . "` (`" . $field . "`(" . $length . "));";
             }
         }
         $result = true;
@@ -1844,7 +1846,7 @@ class AppModel extends Model
         try {
             $this->query($addIndex);
         } catch (Exception $e) {
-            $duplicate = (strpos($e->getMessage(), '1061') !== false);
+            $duplicate = strpos($e->getMessage(), '1061') !== false;
             $errorMessage = $e->getMessage();
             $result = false;
         }
diff --git a/db_schema.json b/db_schema.json
index 86641ec5f..80cdb3c39 100644
--- a/db_schema.json
+++ b/db_schema.json
@@ -7654,7 +7654,8 @@
         "event_reports": {
             "id": true,
             "uuid": true,
-            "name": false
+            "name": false,
+            "event_id": false
         },
         "event_tags": {
             "id": true,

From 599819f7f9cdae2e5d9d3a32caa9f25e1a5a2d7c Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sat, 27 Feb 2021 11:13:47 +0100
Subject: [PATCH 271/437] new: [authkeys] Allowed IPs

---
 app/Controller/AppController.php              |  95 +++++++++----
 app/Controller/AuthKeysController.php         |  30 +++-
 app/Controller/Component/CRUDComponent.php    |  31 +++--
 app/Controller/ServersController.php          |   6 +-
 app/Lib/Tools/CidrTool.php                    |  20 +++
 app/Model/AppModel.php                        |   5 +-
 app/Model/AuthKey.php                         | 101 +++++++++++---
 app/Model/Log.php                             |   6 +-
 app/View/AuthKeys/add.ctp                     |  11 +-
 app/View/AuthKeys/index.ctp                   |  16 ++-
 app/View/AuthKeys/view.ctp                    | 129 +++++++++---------
 .../IndexTable/Fields/datetime.ctp            |  41 +++---
 .../SingleViews/Fields/customField.ctp        |   1 +
 app/webroot/css/main.css                      |   6 +-
 app/webroot/js/misp.js                        |   3 +-
 db_schema.json                                |  13 +-
 tests/testlive_security.py                    |  23 ++++
 17 files changed, 380 insertions(+), 157 deletions(-)
 create mode 100644 app/View/Elements/genericElements/SingleViews/Fields/customField.ctp

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 63c388cb1..7601603a4 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -125,8 +125,8 @@ class AppController extends Controller
         }
         if (!$this->_isRest()) {
             $this->__contentSecurityPolicy();
+            $this->response->header('X-XSS-Protection', '1; mode=block');
         }
-        $this->response->header('X-XSS-Protection', '1; mode=block');
 
         if (!empty($this->params['named']['sql'])) {
             $this->sql_dump = intval($this->params['named']['sql']);
@@ -446,22 +446,9 @@ class AppController extends Controller
                 } else {
                     // User not authenticated correctly
                     // reset the session information
-                    $redis = $this->User->setupRedis();
-                    // Do not log every fail, but just once per hour
-                    if ($redis && !$redis->exists('misp:auth_fail_throttling:' . $authKeyToStore)) {
-                        $redis->setex('misp:auth_fail_throttling:' . $authKeyToStore, 3600, 1);
+                    if ($this->_shouldLog($authKeyToStore)) {
                         $this->loadModel('Log');
-                        $this->Log->create();
-                        $log = array(
-                            'org' => 'SYSTEM',
-                            'model' => 'User',
-                            'model_id' => 0,
-                            'email' => 'SYSTEM',
-                            'action' => 'auth_fail',
-                            'title' => "Failed authentication using API key ($authKeyToStore)",
-                            'change' => null,
-                        );
-                        $this->Log->save($log);
+                        $this->Log->createLogEntry('SYSTEM', 'auth_fail', 'User', 0, "Failed authentication using API key ($authKeyToStore)");
                     }
                     $this->Session->destroy();
                 }
@@ -548,8 +535,10 @@ class AppController extends Controller
         }
 
         if ($user['disabled']) {
-            $this->Log = ClassRegistry::init('Log');
-            $this->Log->createLogEntry($user, 'auth_fail', 'User', $user['id'], 'Login attempt by disabled user.');
+            if ($this->_shouldLog('disabled:' . $user['id'])) {
+                $this->Log = ClassRegistry::init('Log');
+                $this->Log->createLogEntry($user, 'auth_fail', 'User', $user['id'], 'Login attempt by disabled user.');
+            }
 
             $this->Auth->logout();
             if ($this->_isRest()) {
@@ -565,11 +554,33 @@ class AppController extends Controller
         if (isset($user['authkey_expiration']) && $user['authkey_expiration']) {
             $time = isset($_SERVER['REQUEST_TIME']) ? $_SERVER['REQUEST_TIME'] : time();
             if ($user['authkey_expiration'] < $time) {
+                if ($this->_shouldLog('expired:' . $user['authkey_id'])) {
+                    $this->Log = ClassRegistry::init('Log');
+                    $this->Log->createLogEntry($user, 'auth_fail', 'User', $user['id'], "Login attempt by expired auth key {$user['authkey_id']}.");
+                }
                 $this->Auth->logout();
                 throw new ForbiddenException('Auth key is expired');
             }
         }
 
+        if (!empty($user['allowed_ips'])) {
+            App::uses('CidrTool', 'Tools');
+            $cidrTool = new CidrTool($user['allowed_ips']);
+            $remoteIp = $this->_remoteIp();
+            if ($remoteIp === null) {
+                $this->Auth->logout();
+                throw new ForbiddenException('Auth key is limited to IP address, but IP address not found');
+            }
+            if (!$cidrTool->contains($remoteIp)) {
+                if ($this->_shouldLog('not_allowed_ip:' . $user['authkey_id'] . ':' . $remoteIp)) {
+                    $this->Log = ClassRegistry::init('Log');
+                    $this->Log->createLogEntry($user, 'auth_fail', 'User', $user['id'], "Login attempt from not allowed IP address for auth key {$user['authkey_id']}.");
+                }
+                $this->Auth->logout();
+                throw new ForbiddenException('It is not possible to use this Auth key from your IP address');
+            }
+        }
+
         $isUserRequest = !$this->_isRest() && !$this->request->is('ajax') && !$this->_isAutomation();
         // Next checks makes sense just for user direct HTTP request, so skip REST and AJAX calls
         if (!$isUserRequest) {
@@ -632,7 +643,7 @@ class AppController extends Controller
             return;
         }
 
-        $remoteAddress = trim($_SERVER['REMOTE_ADDR']);
+        $remoteAddress = $this->_remoteIp();
 
         $pipe = $redis->multi(Redis::PIPELINE);
         // keep for 30 days
@@ -680,11 +691,7 @@ class AppController extends Controller
                 $change .= PHP_EOL . 'Request body: ' . $payload;
             }
             $this->Log = ClassRegistry::init('Log');
-            try {
-                $this->Log->createLogEntry($user, 'request', 'User', $user['id'], 'Paranoid log entry', $change);
-            } catch (Exception $e) {
-                // When `MISP.log_skip_db_logs_completely` is enabled, Log::createLogEntry method throws exception
-            }
+            $this->Log->createLogEntry($user, 'request', 'User', $user['id'], 'Paranoid log entry', $change);
         }
     }
 
@@ -1500,17 +1507,47 @@ class AppController extends Controller
             throw new RuntimeException("User with ID {$sessionUser['id']} not exists.");
         }
         if (isset($sessionUser['authkey_id'])) {
+            // Reload authkey
             $this->loadModel('AuthKey');
-            if (!$this->AuthKey->exists($sessionUser['authkey_id'])) {
+            $authKey = $this->AuthKey->find('first', [
+                'conditions' => ['id' => $sessionUser['authkey_id'], 'user_id' => $user['id']],
+                'fields' => ['id', 'expiration', 'allowed_ips'],
+                'recursive' => -1,
+            ]);
+            if (empty($authKey)) {
                 throw new RuntimeException("Auth key with ID {$sessionUser['authkey_id']} not exists.");
             }
+            $user['authkey_id'] = $authKey['AuthKey']['id'];
+            $user['authkey_expiration'] = $authKey['AuthKey']['expiration'];
+            $user['allowed_ips'] = $authKey['AuthKey']['allowed_ips'];
         }
-        foreach (['authkey_id', 'authkey_expiration', 'logged_by_authkey'] as $copy) {
-            if (isset($sessionUser[$copy])) {
-                $user[$copy] = $sessionUser[$copy];
-            }
+        if (isset($sessionUser['logged_by_authkey'])) {
+            $user['logged_by_authkey'] = $sessionUser['logged_by_authkey'];
         }
         $this->Auth->login($user);
         return $user;
     }
+
+    /**
+     * @return string|null
+     */
+    protected function _remoteIp()
+    {
+        $ipHeader = Configure::read('MISP.log_client_ip_header') ?: 'REMOTE_ADDR';
+        return isset($_SERVER[$ipHeader]) ? trim($_SERVER[$ipHeader]) : null;
+    }
+
+    /**
+     * @param string $key
+     * @return bool Returns true if the same log defined by $key was not stored in last hour
+     */
+    protected function _shouldLog($key)
+    {
+        $redis = $this->User->setupRedis();
+        if ($redis && !$redis->exists('misp:auth_fail_throttling:' . $key)) {
+            $redis->setex('misp:auth_fail_throttling:' . $key, 3600, 1);
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/app/Controller/AuthKeysController.php b/app/Controller/AuthKeysController.php
index b90bb2fa4..47e1fef57 100644
--- a/app/Controller/AuthKeysController.php
+++ b/app/Controller/AuthKeysController.php
@@ -71,8 +71,34 @@ class AuthKeysController extends AppController
 
     public function edit($id)
     {
-        $this->set('metaGroup', 'admin');
-        $this->set('metaAction', 'authkeys_edit');
+        $this->CRUD->edit($id, [
+            'conditions' => $this->__prepareConditions(),
+            'afterFind' => function (array $authKey) {
+                unset($authKey['AuthKey']['authkey']);
+                if (is_array($authKey['AuthKey']['allowed_ips'])) {
+                    $authKey['AuthKey']['allowed_ips'] = implode("\n", $authKey['AuthKey']['allowed_ips']);
+                }
+                $authKey['AuthKey']['expiration'] = date('Y-m-d H:i:s', $authKey['AuthKey']['expiration']);
+                return $authKey;
+            },
+            'fields' => ['comment', 'allowed_ips', 'expiration'],
+        ]);
+        if ($this->IndexFilter->isRest()) {
+            return $this->restResponsePayload;
+        }
+        $this->set('dropdownData', [
+            'user' => $this->User->find('list', [
+                'sort' => ['username' => 'asc'],
+                'conditions' => ['id' => $this->request->data['AuthKey']['user_id']],
+            ])
+        ]);
+        $this->set('menuData', [
+            'menuList' => $this->_isSiteAdmin() ? 'admin' : 'globalActions',
+            'menuItem' => 'authKeyAdd',
+        ]);
+        $this->set('edit', true);
+        $this->set('validity', Configure::read('Security.advanced_authkeys_validity'));
+        $this->render('add');
     }
 
     public function add($user_id = false)
diff --git a/app/Controller/Component/CRUDComponent.php b/app/Controller/Component/CRUDComponent.php
index 1e682c197..5a63087c4 100644
--- a/app/Controller/Component/CRUDComponent.php
+++ b/app/Controller/Component/CRUDComponent.php
@@ -145,13 +145,21 @@ class CRUDComponent extends Component
         if (empty($id)) {
             throw new NotFoundException(__('Invalid %s.', $modelName));
         }
-        $data = $this->Controller->{$modelName}->find('first',
-            isset($params['get']) ? $params['get'] : [
-                'recursive' => -1,
-                'conditions' => [
-                    'id' => $id
-            ]
-        ]);
+        $query = isset($params['get']) ? $params['get'] : [
+            'recursive' => -1,
+            'conditions' => [
+                'id' => $id
+            ],
+        ];
+        if (!empty($params['conditions'])) {
+            $query['conditions']['AND'][] = $params['conditions'];
+        }
+        /** @var Model $model */
+        $model = $this->Controller->{$modelName};
+        $data = $model->find('first', $query);
+        if (isset($params['afterFind'])) {
+            $data = $params['afterFind']($data);
+        }
         if ($this->Controller->request->is('post') || $this->Controller->request->is('put')) {
             $input = $this->Controller->request->data;
             if (empty($input[$modelName])) {
@@ -171,7 +179,10 @@ class CRUDComponent extends Component
                     $data[$modelName][$field] = $fieldData;
                 }
             }
-            if ($this->Controller->{$modelName}->save($data)) {
+            if (isset($params['beforeSave'])) {
+                $data = $params['beforeSave']($data);
+            }
+            if ($model->save($data)) {
                 $message = __('%s updated.', $modelName);
                 if ($this->Controller->IndexFilter->isRest()) {
                     $this->Controller->restResponsePayload = $this->Controller->RestResponse->viewData($data, 'json');
@@ -182,7 +193,9 @@ class CRUDComponent extends Component
                 }
             } else {
                 if ($this->Controller->IndexFilter->isRest()) {
-
+                    $controllerName = $this->Controller->params['controller'];
+                    $actionName = $this->Controller->params['action'];
+                    $this->Controller->restResponsePayload = $this->Controller->RestResponse->saveFailResponse($controllerName, $actionName, false, $model->validationErrors, 'json');
                 }
             }
         } else {
diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 7e07d5b3d..52a95d388 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -2434,9 +2434,9 @@ misp.direct_call(relative_path, body)
         }
 
         $message = 'CSP reported violation';
-        $ipHeader = Configure::read('MISP.log_client_ip_header') ?: 'REMOTE_ADDR';
-        if (isset($_SERVER[$ipHeader])) {
-            $message .= ' from IP ' . $_SERVER[$ipHeader];
+        $remoteIp = $this->_remoteIp();
+        if ($remoteIp) {
+            $message .= ' from IP ' . $remoteIp;
         }
         $this->log("$message: " . json_encode($report['csp-report'], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 
diff --git a/app/Lib/Tools/CidrTool.php b/app/Lib/Tools/CidrTool.php
index faf978f3d..b21351c0c 100644
--- a/app/Lib/Tools/CidrTool.php
+++ b/app/Lib/Tools/CidrTool.php
@@ -66,6 +66,26 @@ class CidrTool
         return $match;
     }
 
+    /**
+     * @param string $cidr
+     * @return bool
+     */
+    public static function validate($cidr)
+    {
+        $parts = explode('/', $cidr, 2);
+        $ipBytes = inet_pton($parts[0]);
+        if ($ipBytes === false) {
+            return false;
+        }
+
+        $maximumNetmask = strlen($ipBytes) === 4 ? 32 : 128;
+        if (isset($parts[1]) && ($parts[1] > $maximumNetmask || $parts[1] < 0)) {
+            return false; // Netmask part of CIDR is invalid
+        }
+
+        return true;
+    }
+
     /**
      * Using solution from https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpFoundation/IpUtils.php
      *
diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index 60c220c87..3f4e0d216 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -89,7 +89,7 @@ class AppModel extends Model
         45 => false, 46 => false, 47 => false, 48 => false, 49 => false, 50 => false,
         51 => false, 52 => false, 53 => false, 54 => false, 55 => false, 56 => false,
         57 => false, 58 => false, 59 => false, 60 => false, 61 => false, 62 => false,
-        63 => true, 64 => false, 65 => false
+        63 => true, 64 => false, 65 => false, 66 => false, 67 => false,
     );
 
     public $advanced_updates_description = array(
@@ -1572,6 +1572,9 @@ class AppModel extends Model
                 $sqlArray[] = "ALTER TABLE `galaxy_clusters` MODIFY COLUMN `tag_name` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '';";
                 $indexArray[] = ['event_reports', 'event_id'];
                 break;
+            case 67:
+                $sqlArray[] = "ALTER TABLE `auth_keys` ADD `allowed_ips` text DEFAULT NULL;";
+                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;';
diff --git a/app/Model/AuthKey.php b/app/Model/AuthKey.php
index f4711b6b7..50de35909 100644
--- a/app/Model/AuthKey.php
+++ b/app/Model/AuthKey.php
@@ -1,6 +1,7 @@
 <?php
 App::uses('AppModel', 'Model');
 App::uses('RandomTool', 'Tools');
+App::uses('CidrTool', 'Tools');
 
 /**
  * @property User $User
@@ -26,7 +27,6 @@ class AuthKey extends AppModel
     // massage the data before we send it off for validation before saving anything
     public function beforeValidate($options = array())
     {
-        //parent::beforeValidate();
         if (empty($this->data['AuthKey']['id'])) {
             if (empty($this->data['AuthKey']['uuid'])) {
                 $this->data['AuthKey']['uuid'] = CakeText::uuid();
@@ -42,22 +42,66 @@ class AuthKey extends AppModel
             $this->data['AuthKey']['authkey_end'] = substr($authkey, -4);
             $this->data['AuthKey']['authkey_raw'] = $authkey;
             $this->authkey_raw = $authkey;
+        }
 
-            $validity = Configure::read('Security.advanced_authkeys_validity');
-            if (empty($this->data['AuthKey']['expiration'])) {
-                $this->data['AuthKey']['expiration'] = $validity ? strtotime("+$validity days") : 0;
+        if (!empty($this->data['AuthKey']['allowed_ips'])) {
+            if (is_string($this->data['AuthKey']['allowed_ips'])) {
+                $this->data['AuthKey']['allowed_ips'] = trim($this->data['AuthKey']['allowed_ips']);
+                if (empty($this->data['AuthKey']['allowed_ips'])) {
+                    $this->data['AuthKey']['allowed_ips'] = [];
+                } else {
+                    $this->data['AuthKey']['allowed_ips'] = explode("\n", $this->data['AuthKey']['allowed_ips']);
+                    $this->data['AuthKey']['allowed_ips'] = array_map('trim', $this->data['AuthKey']['allowed_ips']);
+                }
+            }
+            if (!is_array($this->data['AuthKey']['allowed_ips'])) {
+                $this->invalidate('allowed_ips', 'Allowed IPs must be array');
+            }
+            foreach ($this->data['AuthKey']['allowed_ips'] as $cidr) {
+                if (!CidrTool::validate($cidr)) {
+                    $this->invalidate('allowed_ips', "$cidr is not valid IP range");
+                }
+            }
+        }
+
+        $creationTime = isset($this->data['AuthKey']['created']) ? $this->data['AuthKey']['created'] : time();
+        $validity = Configure::read('Security.advanced_authkeys_validity');
+        if (empty($this->data['AuthKey']['expiration'])) {
+            $this->data['AuthKey']['expiration'] = $validity ? strtotime("+$validity days", $creationTime) : 0;
+        } else {
+            $expiration = is_numeric($this->data['AuthKey']['expiration']) ?
+                (int)$this->data['AuthKey']['expiration'] :
+                strtotime($this->data['AuthKey']['expiration']);
+
+            if ($expiration === false) {
+                $this->invalidate('expiration', __('Expiration must be in YYYY-MM-DD format.'));
+            }
+            if ($validity && $expiration > strtotime("+$validity days", $creationTime)) {
+                $this->invalidate('expiration', __('Maximal key validity is %s days.', $validity));
+            }
+            $this->data['AuthKey']['expiration'] = $expiration;
+        }
+
+        return true;
+    }
+
+    public function afterFind($results, $primary = false)
+    {
+        foreach ($results as $key => $val) {
+            if (isset($val['AuthKey']['allowed_ips'])) {
+                $results[$key]['AuthKey']['allowed_ips'] = $this->jsonDecode($val['AuthKey']['allowed_ips']);
+            }
+        }
+        return $results;
+    }
+
+    public function beforeSave($options = array())
+    {
+        if (isset($this->data['AuthKey']['allowed_ips'])) {
+            if (empty($this->data['AuthKey']['allowed_ips'])) {
+                $this->data['AuthKey']['allowed_ips'] = null;
             } else {
-                $expiration = is_numeric($this->data['AuthKey']['expiration']) ?
-                    (int)$this->data['AuthKey']['expiration'] :
-                    strtotime($this->data['AuthKey']['expiration']);
-
-                if ($expiration === false) {
-                    $this->invalidate('expiration', __('Expiration must be in YYYY-MM-DD format.'));
-                }
-                if ($validity && $expiration > strtotime("+$validity days")) {
-                    $this->invalidate('expiration', __('Maximal key validity is %s days.', $validity));
-                }
-                $this->data['AuthKey']['expiration'] = $expiration;
+                $this->data['AuthKey']['allowed_ips'] = json_encode($this->data['AuthKey']['allowed_ips']);
             }
         }
         return true;
@@ -71,9 +115,9 @@ class AuthKey extends AppModel
     {
         $start = substr($authkey, 0, 4);
         $end = substr($authkey, -4);
-        $existing_authkeys = $this->find('all', [
+        $possibleAuthkeys = $this->find('all', [
             'recursive' => -1,
-            'fields' => ['id', 'authkey', 'user_id', 'expiration'],
+            'fields' => ['id', 'authkey', 'user_id', 'expiration', 'allowed_ips'],
             'conditions' => [
                 'OR' => [
                     'expiration >' => time(),
@@ -84,12 +128,13 @@ class AuthKey extends AppModel
             ]
         ]);
         $passwordHasher = $this->getHasher();
-        foreach ($existing_authkeys as $existing_authkey) {
-            if ($passwordHasher->check($authkey, $existing_authkey['AuthKey']['authkey'])) {
-                $user = $this->User->getAuthUser($existing_authkey['AuthKey']['user_id']);
+        foreach ($possibleAuthkeys as $possibleAuthkey) {
+            if ($passwordHasher->check($authkey, $possibleAuthkey['AuthKey']['authkey'])) {
+                $user = $this->User->getAuthUser($possibleAuthkey['AuthKey']['user_id']);
                 if ($user) {
-                    $user['authkey_id'] = $existing_authkey['AuthKey']['id'];
-                    $user['authkey_expiration'] = $existing_authkey['AuthKey']['expiration'];
+                    $user['authkey_id'] = $possibleAuthkey['AuthKey']['id'];
+                    $user['authkey_expiration'] = $possibleAuthkey['AuthKey']['expiration'];
+                    $user['allowed_ips'] = $possibleAuthkey['AuthKey']['allowed_ips'];
                 }
                 return $user;
             }
@@ -175,6 +220,18 @@ class AuthKey extends AppModel
         return $output;
     }
 
+    /**
+     * When key is modified, update `date_modified` for user that was assigned to that key, so session data
+     * will be realoaded.
+     * @see AppController::_refreshAuth
+     */
+    public function afterSave($created, $options = array())
+    {
+        parent::afterSave($created, $options);
+        $userId = $this->data['AuthKey']['user_id'];
+        $this->User->updateAll(['date_modified' => time()], ['User.id' => $userId]);
+    }
+
     /**
      * When key is deleted, update after `date_modified` for user that was assigned to that key, so session data
      * will be realoaded and canceled.
diff --git a/app/Model/Log.php b/app/Model/Log.php
index 1cf7aee90..19b7aeb64 100644
--- a/app/Model/Log.php
+++ b/app/Model/Log.php
@@ -199,7 +199,7 @@ class Log extends AppModel
      * @param int $modelId
      * @param string $title
      * @param string|array $change
-     * @return array
+     * @return array|null
      * @throws Exception
      * @throws InvalidArgumentException
      */
@@ -238,6 +238,10 @@ class Log extends AppModel
         ));
 
         if (!$result) {
+            if ($action === 'request' && !empty(Configure::read('MISP.log_paranoid_skip_db'))) {
+                return null;
+            }
+
             throw new Exception("Cannot save log because of validation errors: " . json_encode($this->validationErrors));
         }
 
diff --git a/app/View/AuthKeys/add.ctp b/app/View/AuthKeys/add.ctp
index 62e5a40db..a3cd94042 100644
--- a/app/View/AuthKeys/add.ctp
+++ b/app/View/AuthKeys/add.ctp
@@ -1,7 +1,7 @@
 <?php
 echo $this->element('genericElements/Form/genericForm', [
     'data' => [
-        'title' => __('Add auth key'),
+        'title' => isset($edit) ? __('Edit auth key') : __('Add auth key'),
         'description' => __('Auth keys are used for API access. A user can have more than one authkey, so if you would like to use separate keys per tool that queries MISP, add additional keys. Use the comment field to make identifying your keys easier.'),
         'fields' => [
             [
@@ -13,7 +13,14 @@ echo $this->element('genericElements/Form/genericForm', [
             [
                 'field' => 'comment',
                 'label' => __('Comment'),
-                'class' => 'span6'
+                'class' => 'span6',
+                'rows' => 4,
+            ],
+            [
+                'field' => 'allowed_ips',
+                'label' => __('Allowed IPs'),
+                'class' => 'span6',
+                'rows' => 4,
             ],
             [
                 'field' => 'expiration',
diff --git a/app/View/AuthKeys/index.ctp b/app/View/AuthKeys/index.ctp
index 127132961..77c3ab45f 100644
--- a/app/View/AuthKeys/index.ctp
+++ b/app/View/AuthKeys/index.ctp
@@ -63,12 +63,17 @@
                     'data_path' => 'AuthKey.last_used',
                     'element' => 'datetime',
                     'requirements' => $keyUsageEnabled,
+                    'empty' => __('Never'),
                 ],
                 [
                     'name' => __('Comment'),
                     'sort' => 'AuthKey.comment',
                     'data_path' => 'AuthKey.comment',
                 ],
+                [
+                    'name' => __('Allowed IPs'),
+                    'data_path' => 'AuthKey.allowed_ips',
+                ],
             ],
             'title' => empty($ajax) ? __('Authentication key Index') : false,
             'description' => empty($ajax) ? __('A list of API keys bound to a user.') : false,
@@ -80,7 +85,16 @@
                         'AuthKey.id'
                     ),
                     'icon' => 'eye',
-                    'dbclickAction' => true
+                    'dbclickAction' => true,
+                    'title' => 'View auth key',
+                ],
+                [
+                    'url' => $baseurl . '/auth_keys/edit',
+                    'url_params_data_paths' => array(
+                        'AuthKey.id'
+                    ),
+                    'icon' => 'edit',
+                    'title' => 'Edit auth key',
                 ],
                 [
                     'onclick' => sprintf(
diff --git a/app/View/AuthKeys/view.ctp b/app/View/AuthKeys/view.ctp
index 37f786371..43b79780b 100644
--- a/app/View/AuthKeys/view.ctp
+++ b/app/View/AuthKeys/view.ctp
@@ -15,65 +15,72 @@ if (isset($keyUsage)) {
     $uniqueIps = null;
 }
 
-echo $this->element(
-    'genericElements/SingleViews/single_view',
-    [
-        'title' => 'Auth key view',
-        'data' => $data,
-        'fields' => [
-            [
-                'key' => __('ID'),
-                'path' => 'AuthKey.id'
-            ],
-            [
-                'key' => __('UUID'),
-                'path' => 'AuthKey.uuid',
-            ],
-            [
-                'key' => __('Auth Key'),
-                'path' => 'AuthKey',
-                'type' => 'authkey'
-            ],
-            [
-                'key' => __('User'),
-                'path' => 'User.id',
-                'pathName' => 'User.email',
-                'model' => 'users',
-                'type' => 'model'
-            ],
-            [
-                'key' => __('Comment'),
-                'path' => 'AuthKey.comment'
-            ],
-            [
-                'key' => __('Created'),
-                'path' => 'AuthKey.created',
-                'type' => 'datetime'
-            ],
-            [
-                'key' => __('Expiration'),
-                'path' => 'AuthKey.expiration',
-                'type' => 'expiration'
-            ],
-            [
-                'key' => __('Key usage'),
-                'type' => 'sparkline',
-                'path' => 'AuthKey.id',
-                'csv' => [
-                    'data' => $keyUsageCsv,
-                ],
-                'requirement' => isset($keyUsage),
-            ],
-            [
-                'key' => __('Last used'),
-                'raw' => $lastUsed ? $this->Time->time($lastUsed) : __('Not used yet'),
-                'requirement' => isset($keyUsage),
-            ],
-            [
-                'key' => __('Unique IPs'),
-                'raw' => $uniqueIps,
-                'requirement' => isset($keyUsage),
-            ]
+echo $this->element('genericElements/SingleViews/single_view', [
+    'title' => 'Auth key view',
+    'data' => $data,
+    'fields' => [
+        [
+            'key' => __('ID'),
+            'path' => 'AuthKey.id'
         ],
-    ]
-);
+        [
+            'key' => __('UUID'),
+            'path' => 'AuthKey.uuid',
+        ],
+        [
+            'key' => __('Auth Key'),
+            'path' => 'AuthKey',
+            'type' => 'authkey'
+        ],
+        [
+            'key' => __('User'),
+            'path' => 'User.id',
+            'pathName' => 'User.email',
+            'model' => 'users',
+            'type' => 'model'
+        ],
+        [
+            'key' => __('Comment'),
+            'path' => 'AuthKey.comment'
+        ],
+        [
+            'key' => __('Allowed IPs'),
+            'type' => 'custom',
+            'function' => function (array $data) {
+                if (is_array($data['AuthKey']['allowed_ips'])) {
+                    return implode("<br>", array_map('h', $data['AuthKey']['allowed_ips']));
+                }
+                return __('All');
+            }
+        ],
+        [
+            'key' => __('Created'),
+            'path' => 'AuthKey.created',
+            'type' => 'datetime'
+        ],
+        [
+            'key' => __('Expiration'),
+            'path' => 'AuthKey.expiration',
+            'type' => 'expiration'
+        ],
+        [
+            'key' => __('Key usage'),
+            'type' => 'sparkline',
+            'path' => 'AuthKey.id',
+            'csv' => [
+                'data' => $keyUsageCsv,
+            ],
+            'requirement' => isset($keyUsage),
+        ],
+        [
+            'key' => __('Last used'),
+            'raw' => $lastUsed ? $this->Time->time($lastUsed) : __('Not used yet'),
+            'requirement' => isset($keyUsage),
+        ],
+        [
+            'key' => __('Unique IPs'),
+            'raw' => $uniqueIps,
+            'requirement' => isset($keyUsage),
+        ]
+    ],
+]);
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/datetime.ctp b/app/View/Elements/genericElements/IndexTable/Fields/datetime.ctp
index 34d3f3bbf..b78c98c5a 100644
--- a/app/View/Elements/genericElements/IndexTable/Fields/datetime.ctp
+++ b/app/View/Elements/genericElements/IndexTable/Fields/datetime.ctp
@@ -1,26 +1,27 @@
 <?php
-    $data = Hash::extract($row, $field['data_path']);
-    if (is_array($data)) {
-        if (count($data) > 1) {
-            $data = implode(', ', $data);
+$data = Hash::extract($row, $field['data_path']);
+if (is_array($data)) {
+    if (count($data) > 1) {
+        $data = implode(', ', $data);
+    } else {
+        if (count($data) > 0) {
+            $data = $data[0];
         } else {
-            if (count($data) > 0) {
-                $data = $data[0];
-            } else {
-                $data = '';
-            }
+            $data = '';
         }
     }
-    if (empty($data) && !empty($field['empty'])) {
-        $data = $field['empty'];
-    }
+}
+if (empty($data) && !empty($field['empty'])) {
+    $data = $field['empty'];
+} else {
     $data = $this->Time->time($data);
-    if (!empty($field['onClick'])) {
-        $data = sprintf(
-            '<span onClick="%s">%s</span>',
-            $field['onClick'],
-            $data
-        );
-    }
-    echo $data;
+}
+if (!empty($field['onClick'])) {
+    $data = sprintf(
+        '<span onClick="%s">%s</span>',
+        $field['onClick'],
+        $data
+    );
+}
+echo $data;
 
diff --git a/app/View/Elements/genericElements/SingleViews/Fields/customField.ctp b/app/View/Elements/genericElements/SingleViews/Fields/customField.ctp
new file mode 100644
index 000000000..a056047b4
--- /dev/null
+++ b/app/View/Elements/genericElements/SingleViews/Fields/customField.ctp
@@ -0,0 +1 @@
+<?= $field['function']($data);
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 0d2b5e537..7a260d31b 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -174,13 +174,11 @@ td.searchLabelCancel{
 
 form .error-message {
     border-color: #b94a48;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
     background-color: #f2dede;
+    padding: 0 5px;
 }
 
-
 /* Form */
 div.form,
 div.index,
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 24e4f0880..b0f688361 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -5298,7 +5298,8 @@ function submitGenericFormInPlace() {
             $('#genericModal').modal('hide').remove();
             $('body').append(data);
             $('#genericModal').modal();
-        }
+        },
+        error: xhrFailCallback,
     });
 }
 
diff --git a/db_schema.json b/db_schema.json
index 80cdb3c39..03dbe7b97 100644
--- a/db_schema.json
+++ b/db_schema.json
@@ -483,6 +483,17 @@
                 "column_type": "text",
                 "column_default": null,
                 "extra": ""
+            },
+            {
+                "column_name": "allowed_ips",
+                "is_nullable": "YES",
+                "data_type": "text",
+                "character_maximum_length": "65535",
+                "numeric_precision": null,
+                "collation_name": "utf8mb4_unicode_ci",
+                "column_type": "text",
+                "column_default": null,
+                "extra": ""
             }
         ],
         "bruteforces": [
@@ -7975,5 +7986,5 @@
             "id": true
         }
     },
-    "db_version": "65"
+    "db_version": "67"
 }
diff --git a/tests/testlive_security.py b/tests/testlive_security.py
index 766746b5d..f794c9137 100644
--- a/tests/testlive_security.py
+++ b/tests/testlive_security.py
@@ -562,6 +562,29 @@ class TestSecurity(unittest.TestCase):
 
             self.__delete_advanced_authkey(auth_key["id"])
 
+    def test_advanced_authkeys_invalid_ip(self):
+        with self.__setting("Security.advanced_authkeys", True):
+            auth_key = self.__create_advanced_authkey(self.test_usr.id, {
+                "allowed_ips": ["1.2.3.4"],
+            })
+
+            # Try to login
+            with self.assertRaises(PyMISPError):
+                PyMISP(url, auth_key["authkey_raw"])
+
+            self.__delete_advanced_authkey(auth_key["id"])
+
+    def test_advanced_authkeys_allow_all(self):
+        with self.__setting("Security.advanced_authkeys", True):
+            auth_key = self.__create_advanced_authkey(self.test_usr.id, {
+                "allowed_ips": ["0.0.0.0/0"],
+            })
+
+            # Try to login
+            PyMISP(url, auth_key["authkey_raw"])
+
+            self.__delete_advanced_authkey(auth_key["id"])
+
     def test_authkey_keep_session(self):
         with self.__setting( "Security.authkey_keep_session", True):
             logged_in = PyMISP(url, self.test_usr.authkey)

From ab84aecc48a7c3b755288c1ea4d1f940a9a38d60 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 1 Mar 2021 15:25:18 +0100
Subject: [PATCH 272/437] new: [authkeys] Copy key info when resetting key

---
 app/Controller/Component/ACLComponent.php |  2 +-
 app/Controller/UsersController.php        | 16 +++---
 app/Model/AuthKey.php                     | 67 ++++++++++++++++++-----
 app/Model/User.php                        |  7 +--
 4 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php
index fb398c910..783329be2 100644
--- a/app/Controller/Component/ACLComponent.php
+++ b/app/Controller/Component/ACLComponent.php
@@ -687,7 +687,7 @@ class ACLComponent extends Component
                     'register' => array('*'),
                     'registrations' => array('perm_site_admin'),
                     'resetAllSyncAuthKeys' => array(),
-                    'resetauthkey' => array('*'),
+                    'resetauthkey' => ['AND' => ['self_management_enabled', 'perm_auth']],
                     'request_API' => array('*'),
                     'routeafterlogin' => array('*'),
                     'statistics' => array('*'),
diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index 966eb329f..3d3c47d04 100644
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -1294,24 +1294,22 @@ class UsersController extends AppController
 
     public function resetauthkey($id = null, $alert = false)
     {
-        if (!$this->_isAdmin() && Configure::read('MISP.disableUserSelfManagement')) {
-            throw new MethodNotAllowedException('User self-management has been disabled on this instance.');
-        }
         if (!$this->request->is('post') && !$this->request->is('put')) {
             throw new MethodNotAllowedException(__('This functionality is only accessible via POST requests.'));
         }
-        if ($id == 'me') {
+        if ($id === 'me') {
             $id = $this->Auth->user('id');
+            // Reset just current auth key
+            $keyId = isset($this->Auth->user()['authkey_id']) ? $this->Auth->user()['authkey_id'] : null;
+        } else {
+            $keyId = null;
         }
-        if (!$this->userRole['perm_auth']) {
-            throw new MethodNotAllowedException(__('Invalid action.'));
-        }
-        $newkey = $this->User->resetauthkey($this->Auth->user(), $id, $alert);
+        $newkey = $this->User->resetauthkey($this->Auth->user(), $id, $alert, $keyId);
         if ($newkey === false) {
             throw new MethodNotAllowedException(__('Invalid user.'));
         }
         if (!$this->_isRest()) {
-            $this->Flash->success(__('New authkey generated.', true));
+            $this->Flash->success(__('New authkey generated.'));
             $this->redirect($this->referer());
         } else {
             return $this->RestResponse->saveSuccessResponse('User', 'resetauthkey', $id, $this->response->type(), 'Authkey updated: ' . $newkey);
diff --git a/app/Model/AuthKey.php b/app/Model/AuthKey.php
index 50de35909..5dbfb8ac2 100644
--- a/app/Model/AuthKey.php
+++ b/app/Model/AuthKey.php
@@ -142,26 +142,67 @@ class AuthKey extends AppModel
         return false;
     }
 
-    public function resetauthkey($id)
+    /**
+     * @param int $userId
+     * @param int|null $keyId
+     * @return false|string
+     * @throws Exception
+     */
+    public function resetAuthKey($userId, $keyId = null)
     {
-        $existing_authkeys = $this->find('all', [
-            'recursive' => -1,
-            'conditions' => [
-                'user_id' => $id
-            ]
-        ]);
-        foreach ($existing_authkeys as $key) {
-            $key['AuthKey']['expiration'] = time();
-            $this->save($key);
+        $time = time();
+
+        if ($keyId) {
+            $currentAuthkey = $this->find('first', [
+                'recursive' => -1,
+                'conditions' => [
+                    'id' => $keyId,
+                    'user_id' => $userId,
+                ],
+            ]);
+            if (empty($currentAuthkey)) {
+                throw new RuntimeException("Key with ID $keyId for user with ID $userId not found.");
+            }
+            $currentAuthkey['AuthKey']['expiration'] = $time;
+            if (!$this->save($currentAuthkey)) {
+                throw new RuntimeException("Key with ID $keyId could not be saved.");
+            }
+            $comment = __("Created by resetting auth key %s\n%s", $keyId, $currentAuthkey['AuthKey']['comment']);
+            $allowedIps = isset($currentAuthkey['AuthKey']['allowed_ips']) ? $currentAuthkey['AuthKey']['allowed_ips'] : [];
+            return $this->createnewkey($userId, $comment, $allowedIps);
+        } else {
+            $existingAuthkeys = $this->find('all', [
+                'recursive' => -1,
+                'conditions' => [
+                    'OR' => [
+                        'expiration >' => $time,
+                        'expiration' => 0
+                    ],
+                    'user_id' => $userId
+                ]
+            ]);
+            foreach ($existingAuthkeys as $key) {
+                $key['AuthKey']['expiration'] = $time;
+                $this->save($key);
+            }
+            return $this->createnewkey($userId);
         }
-        return $this->createnewkey($id);
     }
 
-    public function createnewkey($id)
+    /**
+     * @param int $userId
+     * @param string $comment
+     * @param array $allowedIps
+     * @return false|string
+     * @throws Exception
+     */
+    public function createnewkey($userId, $comment = '', array $allowedIps = [])
     {
         $newKey = [
             'authkey' => (new RandomTool())->random_str(true, 40),
-            'user_id' => $id
+            'user_id' => $userId,
+            'comment' => $comment,
+            'allowed_ips' => empty($allowedIps) ? null : $allowedIps,
         ];
         $this->create();
         if ($this->save($newKey)) {
diff --git a/app/Model/User.php b/app/Model/User.php
index e8f70527d..ca505519c 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -1106,7 +1106,7 @@ class User extends AppModel
         return $results;
     }
 
-    public function resetauthkey($user, $id, $alert = false)
+    public function resetauthkey($user, $id, $alert = false, $keyId = null)
     {
         $this->id = $id;
         if (!$id || !$this->exists($id)) {
@@ -1123,8 +1123,7 @@ class User extends AppModel
             $this->extralog(
                     $user,
                     'reset_auth_key',
-                    sprintf(
-                        __('Authentication key for user %s (%s) updated.'),
+                    __('Authentication key for user %s (%s) updated.',
                         $updatedUser['User']['id'],
                         $updatedUser['User']['email']
                     ),
@@ -1133,7 +1132,7 @@ class User extends AppModel
             );
         } else {
             $this->AuthKey = ClassRegistry::init('AuthKey');
-            $newkey = $this->AuthKey->resetauthkey($id);
+            $newkey = $this->AuthKey->resetAuthKey($id, $keyId);
         }
         if ($alert) {
             $baseurl = Configure::read('MISP.external_baseurl');

From 27eb90f3d56b04cc6e23a55e95fe069b82bb3983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 3 Mar 2021 09:46:40 +0100
Subject: [PATCH 273/437] chg: [PyMISP] Bump before release

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index 4a2367ec9..fe87d4293 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 4a2367ec965d70d84a0091ea3a6978916a7df25a
+Subproject commit fe87d4293bac938f9601ea44b6738fba0f3586da

From 12dec25144aea5dc3ba243ccc3d37e69454bdb2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 3 Mar 2021 10:23:45 +0100
Subject: [PATCH 274/437] chg: [PyMISP] Fix tests

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index fe87d4293..ef9efce5c 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit fe87d4293bac938f9601ea44b6738fba0f3586da
+Subproject commit ef9efce5c348379ceeaacf91b604d6cde5190e6c

From 9923e30c848d40e03d0b143b101345b5240103c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 3 Mar 2021 10:41:50 +0100
Subject: [PATCH 275/437] chg: [PyMISP] Bump version

---
 PyMISP                           | 2 +-
 app/Controller/AppController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PyMISP b/PyMISP
index ef9efce5c..39a7b8242 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit ef9efce5c348379ceeaacf91b604d6cde5190e6c
+Subproject commit 39a7b8242f0d3022276d417ec334bb46b890ff23
diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 5d46a29ac..4c919f55d 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -26,7 +26,7 @@ class AppController extends Controller
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
 
     private $__queryVersion = '126';
-    public $pyMispVersion = '2.4.138';
+    public $pyMispVersion = '2.4.140';
     public $phpmin = '7.2';
     public $phprec = '7.4';
     public $phptoonew = '8.0';

From 0207b93858008861e62ba19cdc5e3f2b1ce35e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 3 Mar 2021 09:46:40 +0100
Subject: [PATCH 276/437] chg: [PyMISP] Bump before release

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index 4a2367ec9..fe87d4293 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 4a2367ec965d70d84a0091ea3a6978916a7df25a
+Subproject commit fe87d4293bac938f9601ea44b6738fba0f3586da

From 5a35a2877a5cd9c859782b8868cc78b72d6e2658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 3 Mar 2021 10:23:45 +0100
Subject: [PATCH 277/437] chg: [PyMISP] Fix tests

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index fe87d4293..ef9efce5c 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit fe87d4293bac938f9601ea44b6738fba0f3586da
+Subproject commit ef9efce5c348379ceeaacf91b604d6cde5190e6c

From 9f18cec0ca48533eb8e590717cd1e00232a179a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 3 Mar 2021 10:41:50 +0100
Subject: [PATCH 278/437] chg: [PyMISP] Bump version

---
 PyMISP                           | 2 +-
 app/Controller/AppController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PyMISP b/PyMISP
index ef9efce5c..39a7b8242 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit ef9efce5c348379ceeaacf91b604d6cde5190e6c
+Subproject commit 39a7b8242f0d3022276d417ec334bb46b890ff23
diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index c2fa205d3..277549902 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -26,7 +26,7 @@ class AppController extends Controller
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
 
     private $__queryVersion = '126';
-    public $pyMispVersion = '2.4.138';
+    public $pyMispVersion = '2.4.140';
     public $phpmin = '7.2';
     public $phprec = '7.4';
     public $phptoonew = '8.0';

From 6a553d39da44a43eae02fc7a6fd374152eed311f Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 3 Mar 2021 13:37:08 +0100
Subject: [PATCH 279/437] fix: [OIDC] Change algo how roles are assigned to
 users

---
 .../Component/Auth/OidcAuthenticate.php       | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php b/app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php
index 5031c65c9..4ec5befbe 100644
--- a/app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php
+++ b/app/Plugin/OidcAuth/Controller/Component/Auth/OidcAuthenticate.php
@@ -72,9 +72,9 @@ class OidcAuthenticate extends BaseAuthenticate
             }
 
             if ($user['role_id'] != $roleId) {
-                $user['role_id'] = $roleId;
                 $this->userModel()->updateField($user, 'role_id', $roleId);
                 $this->log($mispUsername, "User role changed from {$user['role_id']} to $roleId.");
+                $user['role_id'] = $roleId;
             }
 
             $this->log($mispUsername, 'Logged in.');
@@ -182,20 +182,18 @@ class OidcAuthenticate extends BaseAuthenticate
         ]);
         $roleNameToId = array_change_key_case($roleNameToId); // normalize role names to lowercase
 
-        $userRole = null;
-        foreach ($roles as $role) {
-            if (isset($roleMapper[$role])) {
-                $roleId = $roleMapper[$role];
-                if (!is_numeric($roleId)) {
-                    $roleId = mb_strtolower($roleId);
-                    if (isset($roleNameToId[$roleId])) {
-                        $roleId = $roleNameToId[$roleId];
+        foreach ($roleMapper as $oidcRole => $mispRole) {
+            if (in_array($oidcRole, $roles, true)) {
+                if (!is_numeric($mispRole)) {
+                    $mispRole = mb_strtolower($mispRole);
+                    if (isset($roleNameToId[$mispRole])) {
+                        $mispRole = $roleNameToId[$mispRole];
                     } else {
-                        $this->log($mispUsername, "MISP Role with name `$roleId` not found, skipping.");
+                        $this->log($mispUsername, "MISP Role with name `$mispRole` not found, skipping.");
                         continue;
                     }
                 }
-                return $roleId; // first match wins
+                return $mispRole; // first match wins
             }
         }
 

From eb75b5c39592b469fd25124bc79ed9a12e00c569 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 3 Mar 2021 15:22:37 +0100
Subject: [PATCH 280/437] fix: [csp] Custom policies

---
 app/Controller/AppController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 277549902..d2b4d434b 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -717,7 +717,7 @@ class AppController extends Controller
             return;
         }
         if (is_array($custom)) {
-            $default = $default + $custom;
+            $default = $custom + $default;
         }
         $header = [];
         foreach ($default as $key => $value) {

From 7695b52f0f541867b31652e218de65db90a24b8e Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 3 Mar 2021 17:19:07 +0100
Subject: [PATCH 281/437] chg: [csp] Report only by default

---
 app/Controller/AppController.php | 3 ++-
 app/Lib/Tools/SecurityAudit.php  | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index d2b4d434b..7397c2082 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -729,7 +729,8 @@ class AppController extends Controller
                 }
             }
         }
-        $this->response->header('Content-Security-Policy', implode('; ', $header));
+        $header = Configure::read('Security.csp_enforce') ? 'Content-Security-Policy' : 'Content-Security-Policy-Report-Only';
+        $this->response->header($header, implode('; ', $header));
     }
 
     private function __rateLimitCheck()
diff --git a/app/Lib/Tools/SecurityAudit.php b/app/Lib/Tools/SecurityAudit.php
index ff14faec6..1d87b221b 100644
--- a/app/Lib/Tools/SecurityAudit.php
+++ b/app/Lib/Tools/SecurityAudit.php
@@ -61,7 +61,7 @@ class SecurityAudit
         if (empty(Configure::read('Security.disable_browser_cache'))) {
             $output['Browser'][] = [
                 'warning',
-                __('Browser cache is enabled. Attacker can obtain sensitive data from user cache. You can disable cache by setting `Security.disable_browser_cache` to `false`.'),
+                __('Browser cache is enabled. Attacker can obtain sensitive data from user cache. You can disable cache by setting `Security.disable_browser_cache` to `true`.'),
             ];
         }
         if (empty(Configure::read('Security.check_sec_fetch_site_header'))) {
@@ -70,6 +70,13 @@ class SecurityAudit
                 __('MISP server is not checking `Sec-Fetch` HTTP headers. This is protection against CSRF for moder browsers. You can enable this checks by setting `Security.check_sec_fetch_site_header` to `true`.'),
             ];
         }
+        if (empty(Configure::read('Security.csp_enforce'))) {
+            $output['Browser'][] = [
+                'warning',
+                __('Content security policies (CSP) are not enforced. Consider enabling them by setting `Security.csp_enforce` to `true`.'),
+                'https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP',
+            ];
+        }
         if (Configure::read('Security.disable_form_security')) {
             $output['Browser'][] = ['error', __('Disabling form security is never a good idea.')];
         }

From 440eb2372ca8ebda4ba4df8663379a6833ad8be4 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 3 Mar 2021 18:28:18 +0100
Subject: [PATCH 282/437] fix: [csp] Incorrect variable name

---
 app/Controller/AppController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 7397c2082..5d920105d 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -729,8 +729,8 @@ class AppController extends Controller
                 }
             }
         }
-        $header = Configure::read('Security.csp_enforce') ? 'Content-Security-Policy' : 'Content-Security-Policy-Report-Only';
-        $this->response->header($header, implode('; ', $header));
+        $headerName = Configure::read('Security.csp_enforce') ? 'Content-Security-Policy' : 'Content-Security-Policy-Report-Only';
+        $this->response->header($headerName, implode('; ', $header));
     }
 
     private function __rateLimitCheck()

From 0d69f84c39a75c2ae918d97554c4675005e03fbd Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 3 Mar 2021 17:02:31 +0100
Subject: [PATCH 283/437] new: [test] Password change

---
 tests/testlive_security.py | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/tests/testlive_security.py b/tests/testlive_security.py
index 766746b5d..31870d396 100644
--- a/tests/testlive_security.py
+++ b/tests/testlive_security.py
@@ -54,8 +54,11 @@ def login(url: str, email: str, password: str) -> requests.Session:
     r.raise_for_status()
 
     parsed = fromstring(r.text)
-    form = parsed.forms[0]
 
+    if len(parsed.forms) != 1:
+        raise Exception("Login form not found in: " + r.text)
+
+    form = parsed.forms[0]
     form_fields = form.fields
 
     login_form = {}
@@ -637,6 +640,28 @@ class TestSecurity(unittest.TestCase):
         # Password should be still the same
         self.assertIsInstance(login(url, self.test_usr.email, self.test_usr_password), requests.Session)
 
+    def test_change_pw_by_site_admin(self):
+        old_password = self.test_usr_password
+        new_password = str(uuid.uuid4())
+        check_response(self.admin_misp_connector.update_user({"password": new_password}, self.test_usr.id))
+
+        self.assertFalse(login(url, self.test_usr.email, old_password), "Old password should not works")
+        self.assertIsInstance(login(url, self.test_usr.email, new_password), requests.Session)
+
+        # Set password back to original
+        self.admin_misp_connector.update_user({"password": old_password}, self.test_usr.id)
+
+    def test_change_pw_by_org_admin(self):
+        old_password = self.test_usr_password
+        new_password = str(uuid.uuid4())
+        check_response(self.org_admin_misp_connector.update_user({"password": new_password}, self.test_usr.id))
+
+        self.assertFalse(login(url, self.test_usr.email, old_password), "Old password should not works")
+        self.assertIsInstance(login(url, self.test_usr.email, new_password), requests.Session)
+
+        # Set password back to original
+        self.org_admin_misp_connector.update_user({"password": old_password}, self.test_usr.id)
+
     def test_change_pw_disabled_by_org_admin(self):
         with self.__setting("MISP.disable_user_password_change", True):
             self.org_admin_misp_connector.update_user({"password": str(uuid.uuid4())}, self.test_usr.id)
@@ -897,7 +922,7 @@ class TestSecurity(unittest.TestCase):
         config["Security"]["auth_enforced"] = True
         with self.__setting(config):
             # Form login should not work when shibb is enforced, because form doesn't exists
-            with self.assertRaises(IndexError):
+            with self.assertRaises(Exception):
                 login(url, self.test_usr.email, self.test_usr_password)
 
     def test_shibb_enforced_api_login(self):

From 2a8ba9020fde4deaae0d190b3ca9ae561ee23040 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 3 Mar 2021 20:06:25 +0100
Subject: [PATCH 284/437] new: [internal] Security setting force_https

---
 app/Controller/AppController.php | 37 +++++++++++++++++++++-----------
 app/Lib/Tools/SecurityAudit.php  | 11 ++++++++--
 app/Model/Server.php             |  9 ++++++++
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 68349da20..0c7888b4a 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -94,26 +94,19 @@ class AppController extends Controller
     public function beforeFilter()
     {
         $this->_setupBaseurl();
-        $this->Auth->loginRedirect = $this->baseurl. '/users/routeafterlogin';
+        $this->Auth->loginRedirect = $this->baseurl . '/users/routeafterlogin';
 
         $customLogout = Configure::read('Plugin.CustomAuth_custom_logout');
         $this->Auth->logoutRedirect = $customLogout ?: ($this->baseurl . '/users/login');
 
         $this->__sessionMassage();
-        if (Configure::read('Security.allow_cors')) {
-            // Add CORS headers
-            $this->response->cors($this->request,
-                    explode(',', Configure::read('Security.cors_origins')),
-                    ['*'],
-                    ['Origin', 'Content-Type', 'Authorization', 'Accept']);
 
-            if ($this->request->is('options')) {
-                // Stop here!
-                // CORS only needs the headers
-                $this->response->send();
-                $this->_stop();
-            }
+        // If server is running behind reverse proxy, PHP will not recognize that user is accessing site by HTTPS connection.
+        // By setting `Security.force_https` to `true`, session cookie will be set as Secure and CSP headers will upgrade insecure requests.
+        if (Configure::read('Security.force_https')) {
+            $_SERVER['HTTPS'] = 'on';
         }
+        $this->__cors();
         if (Configure::read('Security.check_sec_fetch_site_header')) {
             $secFetchSite = $this->request->header('Sec-Fetch-Site');
             if ($secFetchSite !== false && $secFetchSite !== 'same-origin' && ($this->request->is('post') || $this->request->is('put') || $this->request->is('ajax'))) {
@@ -740,6 +733,24 @@ class AppController extends Controller
         $this->response->header($header, implode('; ', $header));
     }
 
+    private function __cors()
+    {
+        if (Configure::read('Security.allow_cors')) {
+            // Add CORS headers
+            $this->response->cors($this->request,
+                explode(',', Configure::read('Security.cors_origins')),
+                ['*'],
+                ['Origin', 'Content-Type', 'Authorization', 'Accept']);
+
+            if ($this->request->is('options')) {
+                // Stop here!
+                // CORS only needs the headers
+                $this->response->send();
+                $this->_stop();
+            }
+        }
+    }
+
     private function __rateLimitCheck()
     {
         $info = array();
diff --git a/app/Lib/Tools/SecurityAudit.php b/app/Lib/Tools/SecurityAudit.php
index 1d87b221b..bb9491e84 100644
--- a/app/Lib/Tools/SecurityAudit.php
+++ b/app/Lib/Tools/SecurityAudit.php
@@ -77,8 +77,15 @@ class SecurityAudit
                 'https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP',
             ];
         }
-        if (Configure::read('Security.disable_form_security')) {
-            $output['Browser'][] = ['error', __('Disabling form security is never a good idea.')];
+        if (!env('HTTPS') && strpos(Configure::read('MISP.baseurl'), 'https://') === 0) {
+            $output['Browser'][] = [
+                'error',
+                __('MISP base URL is set to https://, but MISP things that the connection is insecure. This usually happens when server is running behind reverse proxy. By setting `Security.force_https` to `true`, session cookie will be set as Secure and CSP headers will upgrade insecure requests.'),
+            ];
+        }
+        $sessionConfig = Configure::read('Session');
+        if (isset($sessionConfig['ini']['session.cookie_secure']) && !$sessionConfig['ini']['session.cookie_secure']) {
+            $output['Browser'][] = ['error', __('Setting session cookie is not secure is never good idea.')];
         }
 
         if (empty(Configure::read('Security.advanced_authkeys'))) {
diff --git a/app/Model/Server.php b/app/Model/Server.php
index e0dc2c339..d7aacbd96 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -5693,6 +5693,15 @@ class Server extends AppModel
                     'type' => 'boolean',
                     'null' => true,
                 ],
+                'force_https' => [
+                    'level' => self::SETTING_OPTIONAL,
+                    'description' => __('If enabled, MISP server will consider all requests as secure. This is usually useful when you run MISP behind reverse proxy that terminates HTTPS.'),
+                    'value' => false,
+                    'errorMessage' => '',
+                    'test' => 'testBool',
+                    'type' => 'boolean',
+                    'null' => true,
+                ],
                 'email_otp_enabled' => array(
                     'level'=> 2,
                     'description' => __('Enable two step authentication with a OTP sent by email. Requires e-mailing to be enabled. Warning: You cannot use it in combination with external authentication plugins.'),

From 96e349f47fd4c6947c158d387708c58dc6f06d52 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 3 Mar 2021 19:00:48 +0100
Subject: [PATCH 285/437] chg: [csp] Add Security.csp_enforce to server setting

---
 app/Model/Server.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index c4c938583..54999faca 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -5574,6 +5574,14 @@ class Server extends AppModel
                     'type' => 'boolean',
                     'null' => true
                 ),
+                'csp_enforce' => [
+                    'level' => self::SETTING_CRITICAL,
+                    'description' => __('Enforce CSP. Content Security Policy (CSP) is an added layer of security that helps to detect and mitigate certain types of attacks, including Cross Site Scripting (XSS) and data injection attacks. When disabled, violations will be just logged.'),
+                    'value' => false,
+                    'errorMessage' => '',
+                    'test' => 'testBool',
+                    'type' => 'boolean',
+                ],
                 'salt' => array(
                     'level' => 0,
                     'description' => __('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.'),

From e77d9fcd491ef342a2f0edc77d743cb48dc573a1 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 3 Mar 2021 10:01:36 +0100
Subject: [PATCH 286/437] fix: [internal] PHP warnings when pivoting

---
 app/Controller/EventsController.php | 63 +++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 8 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 3a64d2f49..cadb0f441 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -1224,6 +1224,11 @@ class EventsController extends AppController
         $this->render('/Elements/eventattribute');
     }
 
+    /**
+     * @param array $event
+     * @param bool $continue
+     * @param int $fromEvent
+     */
     private function __viewUI($event, $continue, $fromEvent)
     {
         $this->loadModel('Taxonomy');
@@ -1278,9 +1283,9 @@ class EventsController extends AppController
         // set the pivot data
         $this->helpers[] = 'Pivot';
         if ($continue) {
-            $data = $this->__continuePivoting($event['Event']['id'], $event['Event']['info'], $event['Event']['date'], $fromEvent);
+            $this->__continuePivoting($event['Event']['id'], $event['Event']['info'], $event['Event']['date'], $fromEvent);
         } else {
-            $data = $this->__startPivoting($event['Event']['id'], $event['Event']['info'], $event['Event']['date']);
+            $this->__startPivoting($event['Event']['id'], $event['Event']['info'], $event['Event']['date']);
         }
         $pivot = $this->Session->read('pivot_thread');
         $this->__arrangePivotVertical($pivot);
@@ -1626,24 +1631,61 @@ class EventsController extends AppController
         $this->__viewUI($event, $continue, $fromEvent);
     }
 
+    /**
+     * @param int $id
+     * @param string $info
+     * @param string $date
+     */
     private function __startPivoting($id, $info, $date)
     {
-        $this->Session->write('pivot_thread', null);
-        $initial_pivot = array('id' => $id, 'info' => $info, 'date' => $date, 'depth' => 0, 'height' => 0, 'children' => array(), 'deletable' => true);
-        $this->Session->write('pivot_thread', $initial_pivot);
+        $initialPivot = [
+            'id' => $id,
+            'info' => $info,
+            'date' => $date,
+            'depth' => 0,
+            'height' => 0,
+            'children' => [],
+            'deletable' => true,
+        ];
+        $this->Session->write('pivot_thread', $initialPivot);
     }
 
+    /**
+     * @param int $id
+     * @param string $info
+     * @param string $date
+     * @param int $fromEvent
+     */
     private function __continuePivoting($id, $info, $date, $fromEvent)
     {
         $pivot = $this->Session->read('pivot_thread');
-        $newPivot = array('id' => $id, 'info' => $info, 'date' => $date, 'depth' => null, 'children' => array(), 'deletable' => true);
+        if (!is_array($pivot)) {
+            $this->__startPivoting($id, $info, $date);
+            return;
+        }
+
+        $newPivot = [
+            'id' => $id,
+            'info' => $info,
+            'date' => $date,
+            'depth' => null,
+            'children' => [],
+            'deletable' => true,
+        ];
         if (!$this->__checkForPivot($pivot, $id)) {
             $pivot = $this->__insertPivot($pivot, $fromEvent, $newPivot, 0);
         }
         $this->Session->write('pivot_thread', $pivot);
     }
 
-    private function __insertPivot($pivot, $oldId, $newPivot, $depth)
+    /**
+     * @param array $pivot
+     * @param int $oldId
+     * @param array $newPivot
+     * @param int $depth
+     * @return array
+     */
+    private function __insertPivot(array $pivot, $oldId, array $newPivot, $depth)
     {
         $depth++;
         if ($pivot['id'] == $oldId) {
@@ -1659,7 +1701,12 @@ class EventsController extends AppController
         return $pivot;
     }
 
-    private function __checkForPivot($pivot, $id)
+    /**
+     * @param array $pivot
+     * @param int $id
+     * @return bool
+     */
+    private function __checkForPivot(array $pivot, $id)
     {
         if ($id == $pivot['id']) {
             return true;

From 74c38f1d345050e220120663d486eb6f276524cc Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 4 Mar 2021 12:56:17 +0100
Subject: [PATCH 287/437] chg: [diagnostics] Show Redis memory fragmentation

---
 app/View/Elements/healthElements/diagnostics.ctp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/View/Elements/healthElements/diagnostics.ctp b/app/View/Elements/healthElements/diagnostics.ctp
index 404b249c2..9f3fb74c4 100644
--- a/app/View/Elements/healthElements/diagnostics.ctp
+++ b/app/View/Elements/healthElements/diagnostics.ctp
@@ -293,6 +293,7 @@
         <b><?= __('Memory allocator') ?>:</b> <?= $redisInfo['mem_allocator'] ?><br>
         <b><?= __('Memory usage') ?>:</b> <?= $redisInfo['used_memory_human'] ?>B<br>
         <b><?= __('Peak memory usage') ?>:</b> <?= $redisInfo['used_memory_peak_human'] ?>B<br>
+        <b><?= __('Fragmentation ratio') ?>:</b> <?= $redisInfo['mem_fragmentation_ratio'] ?>B<br>
         <b><?= __('Total system memory') ?>:</b> <?= $redisInfo['total_system_memory_human'] ?>B
         <?php elseif ($redisInfo['extensionVersion']): ?>
         <span class="red bold">Redis is not available. <?= $redisInfo['connection_error'] ?></span>

From 1b50258d0426037058ef86462096c4b264b034c1 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 4 Mar 2021 12:56:39 +0100
Subject: [PATCH 288/437] fix: [diagnostics] Typo in security audit message

---
 app/Lib/Tools/SecurityAudit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Lib/Tools/SecurityAudit.php b/app/Lib/Tools/SecurityAudit.php
index bb9491e84..86c65c49e 100644
--- a/app/Lib/Tools/SecurityAudit.php
+++ b/app/Lib/Tools/SecurityAudit.php
@@ -85,7 +85,7 @@ class SecurityAudit
         }
         $sessionConfig = Configure::read('Session');
         if (isset($sessionConfig['ini']['session.cookie_secure']) && !$sessionConfig['ini']['session.cookie_secure']) {
-            $output['Browser'][] = ['error', __('Setting session cookie is not secure is never good idea.')];
+            $output['Browser'][] = ['error', __('Setting session cookie as not secure is never good idea.')];
         }
 
         if (empty(Configure::read('Security.advanced_authkeys'))) {

From 6ed50c3812f2a4cc5361d27245fa09dd906425b7 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 4 Mar 2021 12:56:58 +0100
Subject: [PATCH 289/437] fix: [UI] Remove warning about old PHP a Python

---
 app/View/Elements/healthElements/diagnostics.ctp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/View/Elements/healthElements/diagnostics.ctp b/app/View/Elements/healthElements/diagnostics.ctp
index 9f3fb74c4..d2cb1b8f0 100644
--- a/app/View/Elements/healthElements/diagnostics.ctp
+++ b/app/View/Elements/healthElements/diagnostics.ctp
@@ -188,7 +188,6 @@
     <p><span class="bold"><?php echo __('PHP ini path');?></span>:… <span class="green"><?php echo h($php_ini); ?></span><br />
     <span class="bold"><?php echo __('PHP Version');?> (><?php echo $phprec; ?> <?php echo __('recommended');?>): </span><span class="<?php echo $phpversions['web']['phpcolour']; ?>"><?php echo h($phpversions['web']['phpversion']) . ' (' . $phpversions['web']['phptext'] . ')';?></span><br />
     <span class="bold"><?php echo __('PHP CLI Version');?> (><?php echo $phprec; ?> <?php echo __('recommended');?>): </span><span class="<?php echo $phpversions['cli']['phpcolour']; ?>"><?php echo h($phpversions['cli']['phpversion']) . ' (' . $phpversions['cli']['phptext'] . ')';?></span></p>
-    <p class="red bold"><?php echo __('Please note that the support for Python versions below 3.6 and below PHP 7.2 has been dropped as of 2020-01-01 and are henceforth considered unsupported. More info: ');?><a href="https://secure.php.net/supported-versions.php">PHP</a>, <a href="https://www.python.org/dev/peps/pep-0373">Python</a>.</p>
     <p><?php echo __('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.');?></p>
     <?php
         foreach ($phpSettings as $settingName => &$phpSetting):

From 37f1e1c49895fc2699cc69f3d43b725f5bab04e2 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 4 Mar 2021 12:58:39 +0100
Subject: [PATCH 290/437] fix: [UI] Diagnostics box

---
 .../Elements/healthElements/diagnostics.ctp   | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/View/Elements/healthElements/diagnostics.ctp b/app/View/Elements/healthElements/diagnostics.ctp
index d2cb1b8f0..54851af8e 100644
--- a/app/View/Elements/healthElements/diagnostics.ctp
+++ b/app/View/Elements/healthElements/diagnostics.ctp
@@ -235,9 +235,8 @@
         </tbody>
     </table>
 
-    <?php
-        echo '<div style="width:400px;">';
-        echo $this->element('/genericElements/IndexTable/index_table', array(
+    <div style="width:400px;">
+    <?= $this->element('/genericElements/IndexTable/index_table', array(
             'data' => array(
                 'data' => $dbDiagnostics,
                 'skip_pagination' => 1,
@@ -265,25 +264,27 @@
                 'description' => __('Size of each individual table on disk, along with the size that can be freed via SQL optimize. Make sure that you always have at least 3x the size of the largest table in free space in order for the update scripts to work as expected.')
             )
         ));
-        echo '</div>';
     ?>
-        <h4><?php echo __('Schema status');?></h4>
-        <div id="schemaStatusDiv" style="width: 70vw; padding-left: 10px;">
-            <?php echo $this->element('/healthElements/db_schema_diagnostic', array(
-                'checkedTableColumn' => $dbSchemaDiagnostics['checked_table_column'],
-                'dbSchemaDiagnostics' => $dbSchemaDiagnostics['diagnostic'],
-                'expectedDbVersion' => $dbSchemaDiagnostics['expected_db_version'],
-                'actualDbVersion' => $dbSchemaDiagnostics['actual_db_version'],
-                'error' => $dbSchemaDiagnostics['error'],
-                'remainingLockTime' => $dbSchemaDiagnostics['remaining_lock_time'],
-                'updateFailNumberReached' => $dbSchemaDiagnostics['update_fail_number_reached'],
-                'updateLocked' => $dbSchemaDiagnostics['update_locked'],
-                'dataSource' => $dbSchemaDiagnostics['dataSource'],
-                'columnPerTable' => $dbSchemaDiagnostics['columnPerTable'],
-                'dbIndexDiagnostics' => $dbSchemaDiagnostics['diagnostic_index'],
-                'indexes' => $dbSchemaDiagnostics['indexes'],
-            )); ?>
-        </div>
+    </div>
+
+    <h4><?php echo __('Schema status');?></h4>
+    <div id="schemaStatusDiv" style="width: 70vw; padding-left: 10px;">
+        <?= $this->element('/healthElements/db_schema_diagnostic', array(
+            'checkedTableColumn' => $dbSchemaDiagnostics['checked_table_column'],
+            'dbSchemaDiagnostics' => $dbSchemaDiagnostics['diagnostic'],
+            'expectedDbVersion' => $dbSchemaDiagnostics['expected_db_version'],
+            'actualDbVersion' => $dbSchemaDiagnostics['actual_db_version'],
+            'error' => $dbSchemaDiagnostics['error'],
+            'remainingLockTime' => $dbSchemaDiagnostics['remaining_lock_time'],
+            'updateFailNumberReached' => $dbSchemaDiagnostics['update_fail_number_reached'],
+            'updateLocked' => $dbSchemaDiagnostics['update_locked'],
+            'dataSource' => $dbSchemaDiagnostics['dataSource'],
+            'columnPerTable' => $dbSchemaDiagnostics['columnPerTable'],
+            'dbIndexDiagnostics' => $dbSchemaDiagnostics['diagnostic_index'],
+            'indexes' => $dbSchemaDiagnostics['indexes'],
+        )); ?>
+    </div>
+
     <h3><?= __("Redis info") ?></h3>
     <div class="diagnostics-box">
         <b><?= __('PHP extension version') ?>:</b> <?= $redisInfo['extensionVersion'] ?: ('<span class="red bold">' . __('Not installed.') . '</span>') ?><br>
@@ -432,10 +433,11 @@
     </div>
     <h3><?php echo __('Module System');?></h3>
     <p><?php echo __('This tool tests the various module systems and whether they are reachable based on the module settings.');?></p>
+    <div class="diagnostics-box">
     <?php
         foreach ($moduleTypes as $type):
     ?>
-        <div class="diagnostics-box">
+
             <?php
                 $colour = 'red';
                 if (isset($moduleErrors[$moduleStatus[$type]])) {
@@ -448,10 +450,11 @@
                 }
                 echo $type . __(' module system') . '…<span style="color:' . $colour . ';">' . $message . '</span>';
             ?>
-        </div>
     <?php
         endforeach;
     ?>
+    </div>
+
     <h3><?php echo __('Session table');?></h3>
     <p><?php echo __('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.');?></p>
     <div class="diagnostics-box">

From 65fb06fccf5032d5bd08e0bf38ffe3931be06ff0 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 4 Mar 2021 16:11:55 +0100
Subject: [PATCH 291/437] chg: [UI] Nicer pivots

---
 app/View/Elements/pivot.ctp     |  13 +--
 app/View/Helper/PivotHelper.php | 147 +++++++++++++++-----------------
 app/webroot/css/tree.css        |  48 +++++------
 3 files changed, 98 insertions(+), 110 deletions(-)

diff --git a/app/View/Elements/pivot.ctp b/app/View/Elements/pivot.ctp
index 47c2561d2..5de84306b 100644
--- a/app/View/Elements/pivot.ctp
+++ b/app/View/Elements/pivot.ctp
@@ -1,14 +1,7 @@
-<?php
-    echo $this->Html->css('tree');
-?>
+<?= $this->Html->css('tree'); ?>
 <div>
     <div class="tree">
-        <span style="white-space:nowrap;">
-            <?php
-                echo $this->Pivot->convertPivotToHTML($pivot, $event['Event']['id']);
-            ?>
-        </span>
-    </div>
-    <div style="clear:both">
+        <?= $this->Pivot->convertPivotToHTML($pivot, $event['Event']['id']); ?>
     </div>
+    <div style="clear:both"></div>
 </div>
diff --git a/app/View/Helper/PivotHelper.php b/app/View/Helper/PivotHelper.php
index 95a67fecc..f3c1932ce 100644
--- a/app/View/Helper/PivotHelper.php
+++ b/app/View/Helper/PivotHelper.php
@@ -1,82 +1,77 @@
 <?php
 App::uses('AppHelper', 'View/Helper');
 
-    class PivotHelper extends AppHelper {
-
-        private function __doConvert($pivot, $currentEvent, $activeText=false) {
-            $data = null;
-            $text = $pivot['id'] . ': ';
-            $active = '';
-            $pivot['info'] = h($pivot['info']);
-            // Truncate string if longer than (11 - length of event id) chars to fit the pivot bubble
-            if (strlen($pivot['info']) > (11 - strlen((string)$pivot['id'])) && strlen($pivot['info']) > 9) {
-                $text .= mb_substr($pivot['info'], 0, 6) . '...';
-            } else {
-                $text .= $pivot['info'];
-            }
-
-            // Colour the text white if it is a highlighted pivot element
-            $pivotType = 'pivotText';
-            $pivotSpanType = '';
-            if ($activeText) {
-                $pivotType = 'pivotTextBlue';
-                $pivotSpanType = 'pivotSpanBlue';
-            }
-
-            $data[] = '<span class ="'.$pivotSpanType.'">';
-            if ($pivot['deletable']) {
-                $data[] = '<a class="pivotDelete icon-remove" href="' . h(Configure::read('MISP.baseurl')) . '/events/removePivot/' . $pivot['id'] . '/' . $currentEvent . '" title="' . __('Remove pivot') . ' "></a>';
-            }
-            $data[] = '<a class="' . $pivotType . '" href="' . h(Configure::read('MISP.baseurl')) . '/events/view/' . $pivot['id'] . '/1/' . $currentEvent . '" title="' . h($pivot['info']) . ' (' . $pivot['date'] . ')">' . h($text) . '</a>';
-            $data[] = '</span>';
-            if (!empty($pivot['children'])) {
-                foreach ($pivot['children'] as $k => $v) {
-                    $extra = '';
-                    if ($v['id'] == $currentEvent) {
-                        $active = ' activePivot';
-                    }
-                    if ($k > 0) {
-                        $pixelDifference = $pivot['children'][$k]['height'] - $pivot['children'][$k-1]['height'];
-                        $lineDifference = $pixelDifference / 50;
-                        $extra = ' distance' . $lineDifference;
-                    }
-                    $data[] = '<div class="pivotElement' . $extra . $active . '" style="top:' . $pivot['children'][$k]['height'] . 'px;">';
-                    if ($active != '') $temp = $this->__doConvert($v, $currentEvent, true);
-                    else $temp = $this->__doConvert($v, $currentEvent);
-                    $data = array_merge($data, $temp);
-                    $data[] = '</div>';
-                    $active = '';
-                }
-            }
-            return $data;
+class PivotHelper extends AppHelper
+{
+    public function convertPivotToHTML(array $pivot, $currentEvent)
+    {
+        $lookingAtRoot = false;
+        $pivotType = '';
+        if ($pivot['id'] == $currentEvent) {
+            $lookingAtRoot = true;
+            $pivotType = ' activePivot';
         }
-
-        public function convertPivotToHTML($pivot, $currentEvent) {
-            $lookingAtRoot = false;
-            $pivotType = '';
-            if ($pivot['id'] == $currentEvent) {
-                $lookingAtRoot = true;
-                $pivotType = ' activePivot';
-            }
-            $temp = $this->__doConvert($pivot, $currentEvent, $lookingAtRoot);
-            $height = $this->__findMaxHeight($pivot);
-            $height = $height + 50;
-            $data = array('<div class="pivotElement firstPivot ' . $pivotType . '" style="height:' . $height . 'px;">');
-            $data = array_merge($data, $temp);
-            $data = array_merge($data, array('</div>'));
-            foreach ($data as $k => $v) {
-                echo ($v);
-            }
-        }
-
-        private function __findMaxHeight($pivot) {
-            $height = $pivot['height'];
-            $heightToAdd = 0;
-            $temp = 0;
-            foreach ($pivot['children'] as $k => $v) {
-                $temp = $this->__findMaxHeight($v);
-                if ($temp > $heightToAdd) $heightToAdd = $temp;
-            }
-            return $height + $heightToAdd;
+        $temp = $this->__doConvert($pivot, $currentEvent, $lookingAtRoot);
+        $height = $this->__findMaxHeight($pivot);
+        $height = $height + 50;
+        echo '<div class="pivotElement firstPivot ' . $pivotType . '" style="height:' . $height . 'px;">';
+        foreach ($temp as $v) {
+            echo $v;
         }
+        echo '</div>';
     }
+
+    private function __doConvert($pivot, $currentEvent, $activeText=false)
+    {
+        $data = null;
+        $info = h($pivot['info']);
+        $text = $pivot['id'] . ': ' . $info;
+        $active = '';
+
+        // Colour the text white if it is a highlighted pivot element
+        $pivotType = 'pivotText';
+        $pivotSpanType = '';
+        if ($activeText) {
+            $pivotType = 'pivotTextBlue';
+            $pivotSpanType = 'pivotSpanBlue';
+        }
+
+        $data[] = '<span class="'.$pivotSpanType.'">';
+        if ($pivot['deletable']) {
+            $data[] = '<a class="pivotDelete fa fa-times" href="' . h(Configure::read('MISP.baseurl')) . '/events/removePivot/' . $pivot['id'] . '/' . $currentEvent . '" title="' . __('Remove pivot') . '"></a>';
+        }
+        $data[] = '<a class="' . $pivotType . '" href="' . h(Configure::read('MISP.baseurl')) . '/events/view/' . $pivot['id'] . '/1/' . $currentEvent . '" title="' . $info . ' (' . $pivot['date'] . ')">' . $text . '</a>';
+        $data[] = '</span>';
+        if (!empty($pivot['children'])) {
+            foreach ($pivot['children'] as $k => $v) {
+                $extra = '';
+                if ($v['id'] == $currentEvent) {
+                    $active = ' activePivot';
+                }
+                if ($k > 0) {
+                    $pixelDifference = $pivot['children'][$k]['height'] - $pivot['children'][$k-1]['height'];
+                    $lineDifference = $pixelDifference / 50;
+                    $extra = ' distance' . $lineDifference;
+                }
+                $data[] = '<div class="pivotElement' . $extra . $active . '" style="top:' . $pivot['children'][$k]['height'] . 'px;">';
+                if ($active != '') $temp = $this->__doConvert($v, $currentEvent, true);
+                else $temp = $this->__doConvert($v, $currentEvent);
+                $data = array_merge($data, $temp);
+                $data[] = '</div>';
+                $active = '';
+            }
+        }
+        return $data;
+    }
+
+    private function __findMaxHeight(array $pivot)
+    {
+        $height = $pivot['height'];
+        $heightToAdd = 0;
+        foreach ($pivot['children'] as $v) {
+            $temp = $this->__findMaxHeight($v);
+            if ($temp > $heightToAdd) $heightToAdd = $temp;
+        }
+        return $height + $heightToAdd;
+    }
+}
diff --git a/app/webroot/css/tree.css b/app/webroot/css/tree.css
index e87560ba2..03c7cfc44 100644
--- a/app/webroot/css/tree.css
+++ b/app/webroot/css/tree.css
@@ -1,6 +1,7 @@
 .tree {
 	width: 100%;
 	position: relative;
+	white-space: nowrap;
 }
 
 .tree div:not(:nth-of-type(1))::before {
@@ -8,8 +9,8 @@
 	position: absolute;
 	left: -15px;
 	border-bottom: 1px solid #ccc;
-	border-top: 0px solid #ccc;
-	border-right: 0px solid #ccc;
+	border-top: 0 solid #ccc;
+	border-right: 0 solid #ccc;
 	border-left: 1px solid #ccc;
 	width: 15px;
 }
@@ -49,10 +50,10 @@
  	height: 350px;
  }
 
- .distance8::before {
+.distance8::before {
  	top: -385px;
  	height: 400px;
- }
+}
 
 .distance9::before {
  	top: -435px;
@@ -66,15 +67,15 @@
 
 .tree div:last-of-type::before {
 	border-bottom-left-radius: 7px;
-	-webkit-bottom-left-border-radius: 7px;
-	-moz-border-bottom-left-radius: 7px;
 }
 
 .tree div:first-of-type::before {
 	content: '';
-	position: absolute; top: 15px; left: -34px;
+	position: absolute;
+	top: 15px; left: -34px;
 	border-top: 1px solid #ccc;
-	width: 35px; height: 20px;
+	width: 35px;
+	height: 20px;
 }
 
 .firstPivot::before {
@@ -82,31 +83,27 @@
 }
 
 .firstPivot {
-	left:0px;
-	top:0px;
+	left: 0;
+	top: 0;
 }
 
-.tree div span{
+.tree div span {
 	border: 1px solid #ccc;
-	padding-left:5px;
-	padding-right:5px;
-	padding-top:4px;
-	padding-bottom:2px;
-	width: 105px;
-
+	padding: 4px 5px 2px;
+	width: 130px;
 	display: inline-block;
 	border-radius: 7px;
-	-webkit-border-radius: 7px;
-	-moz-border-radius: 7px;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
-.tree .pivotElement div{
+.tree .pivotElement div {
 	position: absolute;
-	left: 150px;
+	left: 175px;
 }
 
 .pivotDelete {
-	vertical-align: text-top;
+	color: black;
 }
 
 .pivotText {
@@ -126,6 +123,9 @@
 .pivotSpanBlue {
 	background-color: #0088cc;
 	border-radius: 7px;
-	-webkit-border-radius: 7px;
-	-moz-border-radius: 7px;
+	color: white;
+}
+
+.pivotSpanBlue a, .pivotSpanBlue a:hover {
+	color: white;
 }

From 2e7bd05b94be580f1e8c0d3268dd1e49b47bacb6 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 4 Mar 2021 16:47:17 +0100
Subject: [PATCH 292/437] fix: [UI] Add attribute checkboxes

---
 app/View/Elements/genericElements/Form/genericForm.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/View/Elements/genericElements/Form/genericForm.ctp b/app/View/Elements/genericElements/Form/genericForm.ctp
index 5a112ca53..78031d932 100644
--- a/app/View/Elements/genericElements/Form/genericForm.ctp
+++ b/app/View/Elements/genericElements/Form/genericForm.ctp
@@ -52,7 +52,7 @@
                     }
                     $params['class'] = $class;
                 } else {
-                    if (!empty($fieldData['type']) && ($fieldData['type'] !== 'checkbox' || $fieldData['type'] !== 'radio')) {
+                    if (!empty($fieldData['type']) && ($fieldData['type'] !== 'checkbox' && $fieldData['type'] !== 'radio')) {
                         $params['class'] = 'span6';
                     }
                 }

From 27e58bbb2dae6c0cc5853ba9110b56181a02044d Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 13 Jan 2021 23:15:04 +0100
Subject: [PATCH 293/437] chg: [sync] Do not decode body if is empty

---
 app/Lib/Tools/HttpSocketExtended.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Lib/Tools/HttpSocketExtended.php b/app/Lib/Tools/HttpSocketExtended.php
index 2147ea8a8..30ab5d2c2 100644
--- a/app/Lib/Tools/HttpSocketExtended.php
+++ b/app/Lib/Tools/HttpSocketExtended.php
@@ -32,6 +32,10 @@ class HttpSocketResponseExtended extends HttpSocketResponse
     {
         parent::parseResponse($message);
 
+        if ($this->body === '') {
+            return; // skip decoding body if is empty
+        }
+
         $contentEncoding = $this->getHeader('Content-Encoding');
         if ($contentEncoding === 'gzip' && function_exists('gzdecode')) {
             $this->body = gzdecode($this->body);

From 921583f24da7548393178713e8be123b15a22885 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 4 Mar 2021 18:29:26 +0100
Subject: [PATCH 294/437] chg: [sync] Code cleanup

---
 app/Model/AppModel.php | 6 +++---
 app/Model/Event.php    | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index 3348e9ecc..59e72a86c 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -2719,26 +2719,26 @@ class AppModel extends Model
 
     /**
      * @param array $server
+     * @param string $model
      * @return array[]
      * @throws JsonException
      */
     protected function setupSyncRequest(array $server, $model = 'Server')
     {
         $version = implode('.', $this->checkMISPVersion());
+        $commit = $this->checkMIPSCommit();
         $request = array(
             'header' => array(
                 'Authorization' => $server[$model]['authkey'],
                 'Accept' => 'application/json',
                 'Content-Type' => 'application/json',
                 'MISP-version' => $version,
+                'User-Agent' => 'MISP ' . $version . (empty($commit) ? '' : ' - #' . $commit),
             )
         );
-
-        $commit = $this->checkMIPSCommit();
         if ($commit) {
             $request['header']['commit'] = $commit;
         }
-        $request['header']['User-Agent'] = 'MISP ' . $version . (empty($commit) ? '' : ' - #' . $commit);
         return $request;
     }
 
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 9901a429d..acfe52b35 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -4467,13 +4467,11 @@ class Event extends AppModel
         $elevatedUser = array(
             'Role' => array(
                 'perm_site_admin' => 1,
-                'perm_sync' => 1
+                'perm_sync' => 1,
+                'perm_audit' => 0,
             ),
             'org_id' => $eventOrgcId['Event']['orgc_id']
         );
-        $elevatedUser['Role']['perm_site_admin'] = 1;
-        $elevatedUser['Role']['perm_sync'] = 1;
-        $elevatedUser['Role']['perm_audit'] = 0;
         $event = $this->fetchEvent($elevatedUser, array('eventid' => $id, 'metadata' => 1));
         if (empty($event)) {
             return true;

From 5113ae34c7af41cc4182a2b80b02166dcb427edd Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 4 Mar 2021 18:46:57 +0100
Subject: [PATCH 295/437] fix: [internal] Warning when object has no attributes

---
 app/Model/Event.php  | 12 +++++++-----
 app/Model/Server.php |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index ed9fbcead..735475829 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -7340,7 +7340,7 @@ class Event extends AppModel
     /**
      * extractAllTagNames Returns all tag names attached to any elements in an event
      *
-     * @param  mixed $event
+     * @param  array $event
      * @return array All tag names in the event
      */
     public function extractAllTagNames(array $event)
@@ -7370,10 +7370,12 @@ class Event extends AppModel
         }
         if (!empty($event['Object'])) {
             foreach ($event['Object'] as $object) {
-                foreach ($object['Attribute'] as $attribute) {
-                    foreach ($attribute['AttributeTag'] as $attributeTag) {
-                        $tagName = $attributeTag['Tag']['name'];
-                        $tags[$tagName] = $tagName;
+                if (!empty($object['Attribute'])) {
+                    foreach ($object['Attribute'] as $attribute) {
+                        foreach ($attribute['AttributeTag'] as $attributeTag) {
+                            $tagName = $attributeTag['Tag']['name'];
+                            $tags[$tagName] = $tagName;
+                        }
                     }
                 }
             }
diff --git a/app/Model/Server.php b/app/Model/Server.php
index 1b05ef2b1..91014add8 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -1125,7 +1125,7 @@ class Server extends AppModel
      * @param  array $server
      * @param  array $user
      * @param  string|int $technique Either the 'full' string or the event id
-     * @param  bool  $event
+     * @param  array|bool  $event
      * @return array List of successfully pushed clusters
      */
     public function syncGalaxyClusters($HttpSocket, array $server, array $user, $technique='full', $event=false)

From a43a62577a41c82492349366ff4ff2dc7a137b80 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Thu, 4 Mar 2021 20:10:14 +0000
Subject: [PATCH 296/437] chg: [restClient:querybuilder] fix remove tag from
 object template

---
 app/Controller/Component/RestResponseComponent.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/Controller/Component/RestResponseComponent.php b/app/Controller/Component/RestResponseComponent.php
index b971b28d7..c7eb9a167 100644
--- a/app/Controller/Component/RestResponseComponent.php
+++ b/app/Controller/Component/RestResponseComponent.php
@@ -270,10 +270,9 @@ class RestResponseComponent extends Component
                 'optional' => array('name', 'colour', 'exportable', 'hide_tag', 'org_id', 'user_id'),
                 'params' => array('tag_id')
             ),
-            'removeTag' => array(
-                'description' => "POST a request object in JSON format to this API to create detach a tag from an event. #FIXME Function does not exists",
-                'mandatory' => array('event', 'tag'),
-                'params' => array('tag_id')
+            'removeTagFromObject' => array(
+                'description' => "Untag an event or attribute. Tag can be the id or the name.",
+                'mandatory' => array('uuid', 'tag')
             ),
             'attachTagToObject' => array(
                 'description' => "Attach a Tag to an object, refenced by an UUID. Tag can either be a tag id or a tag name.",

From 5d2ae28a585064f30582a31d6adf76f8b46f6354 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 4 Mar 2021 21:33:33 +0100
Subject: [PATCH 297/437] fix: [UI] Module diagnostics view

---
 .../Elements/healthElements/diagnostics.ctp   | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/View/Elements/healthElements/diagnostics.ctp b/app/View/Elements/healthElements/diagnostics.ctp
index 54851af8e..79078a7f5 100644
--- a/app/View/Elements/healthElements/diagnostics.ctp
+++ b/app/View/Elements/healthElements/diagnostics.ctp
@@ -293,7 +293,7 @@
         <b><?= __('Memory allocator') ?>:</b> <?= $redisInfo['mem_allocator'] ?><br>
         <b><?= __('Memory usage') ?>:</b> <?= $redisInfo['used_memory_human'] ?>B<br>
         <b><?= __('Peak memory usage') ?>:</b> <?= $redisInfo['used_memory_peak_human'] ?>B<br>
-        <b><?= __('Fragmentation ratio') ?>:</b> <?= $redisInfo['mem_fragmentation_ratio'] ?>B<br>
+        <b><?= __('Fragmentation ratio') ?>:</b> <?= $redisInfo['mem_fragmentation_ratio'] ?><br>
         <b><?= __('Total system memory') ?>:</b> <?= $redisInfo['total_system_memory_human'] ?>B
         <?php elseif ($redisInfo['extensionVersion']): ?>
         <span class="red bold">Redis is not available. <?= $redisInfo['connection_error'] ?></span>
@@ -435,23 +435,18 @@
     <p><?php echo __('This tool tests the various module systems and whether they are reachable based on the module settings.');?></p>
     <div class="diagnostics-box">
     <?php
-        foreach ($moduleTypes as $type):
-    ?>
-
-            <?php
-                $colour = 'red';
-                if (isset($moduleErrors[$moduleStatus[$type]])) {
-                    $message = $moduleErrors[$moduleStatus[$type]];
-                } else {
-                    $message = h($moduleStatus[$type]);
-                }
-                if ($moduleStatus[$type] === 0) {
-                    $colour = 'green';
-                }
-                echo $type . __(' module system') . '…<span style="color:' . $colour . ';">' . $message . '</span>';
-            ?>
-    <?php
-        endforeach;
+        foreach ($moduleTypes as $type) {
+            $colour = 'red';
+            if (isset($moduleErrors[$moduleStatus[$type]])) {
+                $message = $moduleErrors[$moduleStatus[$type]];
+            } else {
+                $message = h($moduleStatus[$type]);
+            }
+            if ($moduleStatus[$type] === 0) {
+                $colour = 'green';
+            }
+            echo $type . __(' module system') . '…<span style="color:' . $colour . ';">' . $message . '</span><br>';
+        }
     ?>
     </div>
 

From f723a313f7dfdbca10e606d9049fb417ee601c61 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 5 Mar 2021 00:33:15 +0100
Subject: [PATCH 298/437] fix: [UI] fix broken checkbox layout in generic Form
 builder forms

---
 app/View/Elements/genericElements/Form/genericForm.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/View/Elements/genericElements/Form/genericForm.ctp b/app/View/Elements/genericElements/Form/genericForm.ctp
index 5a112ca53..78031d932 100644
--- a/app/View/Elements/genericElements/Form/genericForm.ctp
+++ b/app/View/Elements/genericElements/Form/genericForm.ctp
@@ -52,7 +52,7 @@
                     }
                     $params['class'] = $class;
                 } else {
-                    if (!empty($fieldData['type']) && ($fieldData['type'] !== 'checkbox' || $fieldData['type'] !== 'radio')) {
+                    if (!empty($fieldData['type']) && ($fieldData['type'] !== 'checkbox' && $fieldData['type'] !== 'radio')) {
                         $params['class'] = 'span6';
                     }
                 }

From 29518586c510fe5073ee921b2000e9a1c3d80972 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 5 Mar 2021 00:33:15 +0100
Subject: [PATCH 299/437] fix: [UI] fix broken checkbox layout in generic Form
 builder forms

---
 app/View/Elements/genericElements/Form/genericForm.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/View/Elements/genericElements/Form/genericForm.ctp b/app/View/Elements/genericElements/Form/genericForm.ctp
index 5a112ca53..78031d932 100644
--- a/app/View/Elements/genericElements/Form/genericForm.ctp
+++ b/app/View/Elements/genericElements/Form/genericForm.ctp
@@ -52,7 +52,7 @@
                     }
                     $params['class'] = $class;
                 } else {
-                    if (!empty($fieldData['type']) && ($fieldData['type'] !== 'checkbox' || $fieldData['type'] !== 'radio')) {
+                    if (!empty($fieldData['type']) && ($fieldData['type'] !== 'checkbox' && $fieldData['type'] !== 'radio')) {
                         $params['class'] = 'span6';
                     }
                 }

From 6c89e0219c388122d86abb47771059bc2baa6840 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 5 Mar 2021 01:00:41 +0100
Subject: [PATCH 300/437] fix: [UI] event matrix heatmap view correctly
 flattens the event

- object attributes were excluded
---
 app/Model/AttributeTag.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Model/AttributeTag.php b/app/Model/AttributeTag.php
index 9894d7844..e80a763d3 100644
--- a/app/Model/AttributeTag.php
+++ b/app/Model/AttributeTag.php
@@ -88,7 +88,7 @@ class AttributeTag extends AppModel
     {
         $this->delete($id);
     }
-    
+
     /**
      * handleAttributeTags
      *
@@ -248,9 +248,12 @@ class AttributeTag extends AppModel
             }
         } else {
             $allowed_tag_lookup_table = array_flip($allowedTags);
-            $attributes = $this->Attribute->fetchAttributes($user, array('conditions' => array(
-                'Attribute.event_id' => $eventId
-            )));
+            $attributes = $this->Attribute->fetchAttributes($user, array(
+                'conditions' => array(
+                    'Attribute.event_id' => $eventId
+                ),
+                'flatten' => 1
+            ));
             $scores = array('scores' => array(), 'maxScore' => 0);
             foreach ($attributes as $attribute) {
                 foreach ($attribute['AttributeTag'] as $tag) {

From 128587350d8d696f11f828968f48d3be27f8f21e Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 5 Mar 2021 01:00:41 +0100
Subject: [PATCH 301/437] fix: [UI] event matrix heatmap view correctly
 flattens the event

- object attributes were excluded
---
 app/Model/AttributeTag.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Model/AttributeTag.php b/app/Model/AttributeTag.php
index 9894d7844..e80a763d3 100644
--- a/app/Model/AttributeTag.php
+++ b/app/Model/AttributeTag.php
@@ -88,7 +88,7 @@ class AttributeTag extends AppModel
     {
         $this->delete($id);
     }
-    
+
     /**
      * handleAttributeTags
      *
@@ -248,9 +248,12 @@ class AttributeTag extends AppModel
             }
         } else {
             $allowed_tag_lookup_table = array_flip($allowedTags);
-            $attributes = $this->Attribute->fetchAttributes($user, array('conditions' => array(
-                'Attribute.event_id' => $eventId
-            )));
+            $attributes = $this->Attribute->fetchAttributes($user, array(
+                'conditions' => array(
+                    'Attribute.event_id' => $eventId
+                ),
+                'flatten' => 1
+            ));
             $scores = array('scores' => array(), 'maxScore' => 0);
             foreach ($attributes as $attribute) {
                 foreach ($attribute['AttributeTag'] as $tag) {

From cc9b50fb8e414ac214608142f06fea3d6a7aa80c Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 5 Mar 2021 10:13:16 +0100
Subject: [PATCH 302/437] fix: [sync] Warning when sync object without
 attributes

---
 app/Model/Event.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 78c39e09f..08395868a 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -3533,11 +3533,13 @@ class Event extends AppModel
                         continue;
                     }
                 }
-                foreach ($o['Attribute'] as $k2 => $a) {
-                    if (isset($a['distribution']) && $a['distribution'] == 4) {
-                        $data['Event']['Object'][$k]['Attribute'][$k2] = $this->captureSGForElement($a, $user, $server);
-                        if ($data['Event']['Object'][$k]['Attribute'][$k2] === false) {
-                            unset($data['Event']['Object'][$k]['Attribute'][$k2]);
+                if (!empty($o['Attribute'])) {
+                    foreach ($o['Attribute'] as $k2 => $a) {
+                        if (isset($a['distribution']) && $a['distribution'] == 4) {
+                            $data['Event']['Object'][$k]['Attribute'][$k2] = $this->captureSGForElement($a, $user, $server);
+                            if ($data['Event']['Object'][$k]['Attribute'][$k2] === false) {
+                                unset($data['Event']['Object'][$k]['Attribute'][$k2]);
+                            }
                         }
                     }
                 }

From fe1034b461d763de3335316d68cac2464177a748 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 5 Mar 2021 11:56:32 +0100
Subject: [PATCH 303/437] fix: [Freetext import] handle end of sentence periods
 and brackets better, fixes #7163

---
 app/Lib/Tools/ComplexTypeTool.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Lib/Tools/ComplexTypeTool.php b/app/Lib/Tools/ComplexTypeTool.php
index 71569b10c..8d6cb01be 100644
--- a/app/Lib/Tools/ComplexTypeTool.php
+++ b/app/Lib/Tools/ComplexTypeTool.php
@@ -217,6 +217,10 @@ class ComplexTypeTool
         $iocArray = array_merge($iocArray, $this->__returnOddElements($quotedText));
         $resultArray = array();
         foreach ($iocArray as $ioc) {
+            // remove trailing .
+            $ioc = rtrim($ioc, '.');
+            // remove brackets if enclosed
+            $ioc = trim($ioc, '()');
             $ioc = str_replace("\xc2\xa0", '', $ioc); // remove non breaking space
             $ioc = trim($ioc, $charactersToTrim);
             $ioc = preg_replace('/\p{C}+/u', '', $ioc);

From 4a4722a30c24a556e382581c2ce8df432a5bae33 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 5 Mar 2021 12:20:39 +0100
Subject: [PATCH 304/437] chg: [security audit] removed sharing group
 recommendation and fixed grammar

- the hide sharing group org setting is actively harmful, we should definitely not promote it
---
 app/Lib/Tools/SecurityAudit.php | 60 +++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/app/Lib/Tools/SecurityAudit.php b/app/Lib/Tools/SecurityAudit.php
index 1d87b221b..6a32a32c5 100644
--- a/app/Lib/Tools/SecurityAudit.php
+++ b/app/Lib/Tools/SecurityAudit.php
@@ -40,7 +40,7 @@ class SecurityAudit
 
         $passwordPolicyLength = Configure::read('Security.password_policy_length') ?: $server->serverSettings['Security']['password_policy_length']['value'];
         if ($passwordPolicyLength < 8) {
-            $output['Password'][] = ['error', __('Minimum password length is set to %s, that too short.', $passwordPolicyLength)];
+            $output['Password'][] = ['error', __('Minimum password length is set to %s, it is highly advised to increase it.', $passwordPolicyLength)];
         } elseif ($passwordPolicyLength < 12) {
             $output['Password'][] = ['warning', __('Minimum password length is set to %s, consider raising to at least 12 characters.', $passwordPolicyLength)];
         }
@@ -54,20 +54,20 @@ class SecurityAudit
         if (!empty(Configure::read('Security.auth')) && !Configure::read('Security.auth_enforced')) {
             $output['Login'][] = [
                 'hint',
-                __('External authentication is enabled, but local accounts will still work. You can disable logging with local accounts by setting `Security.auth_enforced` to `true`.'),
+                __('External authentication is enabled, but local accounts will still work. You can disable the ability to log in via local accounts by setting `Security.auth_enforced` to `true`.'),
             ];
         }
 
         if (empty(Configure::read('Security.disable_browser_cache'))) {
             $output['Browser'][] = [
                 'warning',
-                __('Browser cache is enabled. Attacker can obtain sensitive data from user cache. You can disable cache by setting `Security.disable_browser_cache` to `true`.'),
+                __('Browser cache is enabled. An attacker could obtain sensitive data from the user cache. You can disable the cache by setting `Security.disable_browser_cache` to `true`.'),
             ];
         }
         if (empty(Configure::read('Security.check_sec_fetch_site_header'))) {
             $output['Browser'][] = [
                 'warning',
-                __('MISP server is not checking `Sec-Fetch` HTTP headers. This is protection against CSRF for moder browsers. You can enable this checks by setting `Security.check_sec_fetch_site_header` to `true`.'),
+                __('The MISP server is not checking `Sec-Fetch` HTTP headers. This is a protection mechanism against CSRF used by modern browsers. You can enable this check by setting `Security.check_sec_fetch_site_header` to `true`.'),
             ];
         }
         if (empty(Configure::read('Security.csp_enforce'))) {
@@ -77,50 +77,57 @@ class SecurityAudit
                 'https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP',
             ];
         }
-        if (Configure::read('Security.disable_form_security')) {
-            $output['Browser'][] = ['error', __('Disabling form security is never a good idea.')];
+        if (!env('HTTPS') && strpos(Configure::read('MISP.baseurl'), 'https://') === 0) {
+            $output['Browser'][] = [
+                'error',
+                __('MISP base URL is set to https://, but MISP thinks that the connection is insecure. This usually happens when a server is running behind a reverse proxy. By setting `Security.force_https` to `true`, session cookies will be set as Secure and CSP headers will upgrade insecure requests.'),
+            ];
+        }
+        $sessionConfig = Configure::read('Session');
+        if (isset($sessionConfig['ini']['session.cookie_secure']) && !$sessionConfig['ini']['session.cookie_secure']) {
+            $output['Browser'][] = ['error', __('Setting session cookies as not secure is never a good idea.')];
         }
 
         if (empty(Configure::read('Security.advanced_authkeys'))) {
-            $output['Auth Key'][] = ['warning', __('Consider enabling Advanced Auth Keys, that provides higher security.')];
+            $output['Auth Key'][] = ['warning', __('Consider enabling Advanced Auth Keys, they provide increased security by only storing the API key hashes.')];
         }
         if (Configure::read('Security.allow_unsafe_apikey_named_param')) {
-            $output['Auth Key'][] = ['error', __('It is possible to pass API key in URL, so the key can be logged by proxies.')];
+            $output['Auth Key'][] = ['error', __('It is possible to pass API keys via the URL, meaning that the keys can be logged by proxies.')];
         }
         if (empty(Configure::read('Security.do_not_log_authkeys'))) {
-            $output['Auth Key'][] = ['warning', __('Auth Key logging is not disabled. Auth Keys in cleartext can be visible in Audit log.')];
+            $output['Auth Key'][] = ['warning', __('Auth Key logging is not disabled. Auth Keys in cleartext can be visible in the Audit log.')];
         }
 
         $salt = Configure::read('Security.salt');
         if (empty($salt)) {
             $output['Security salt'][] = ['error', __('Salt is not set.')];
         } else if (strlen($salt) < 32) {
-            $output['Security salt'][] = ['warning', __('Salt is too short, should contains at least 32 characters.')];
+            $output['Security salt'][] = ['warning', __('Salt is too short, should contain at least 32 characters.')];
         } else if ($salt === "Rooraenietu8Eeyo<Qu2eeNfterd-dd+") {
-            $output['Security salt'][] = ['error', __('Salt is set to default value.')];
+            $output['Security salt'][] = ['error', __('Salt is set to the default value.')];
         }
 
         if (empty(Configure::read('MISP.log_client_ip'))) {
             $output['Logging'][] = ['warning', __('Logging client IP in audit log is disabled. Logging IP address can help to solve potential security breaches.')];
         }
         if (empty(Configure::read('MISP.log_user_ips'))) {
-            $output['Logging'][] = ['warning', __('Logging client IP in Redis is disabled. Logging IP address can help to solve potential security breaches.')];
+            $output['Logging'][] = ['warning', __('Logging client IP in Redis is disabled. Logging IP addresses can help investigate potential security breaches.')];
         }
         if (Configure::read('MISP.log_user_ips') && Configure::read('Security.advanced_authkeys') && empty(Configure::read('MISP.log_user_ips_authkeys'))) {
             $output['Logging'][] = [
                 'hint',
-                __('You can enable advanced logging of authkey usage by setting `MISP.log_user_ips_authkeys` to `true`.'),
+                __('You can enable the logging of advanced authkeys by setting `MISP.log_user_ips_authkeys` to `true`.'),
             ];
         }
         if (empty(Configure::read('Security.username_in_response_header'))) {
             $output['Logging'][] = [
                 'hint',
-                __('Passing user information to response headers is disabled. This can be useful for logging user info at reverse proxy level. You can enable that by setting `Security.username_in_response_header` to `true`.'),
+                __('Passing user information to response headers is disabled. This can be useful for logging user info at the reverse proxy level. You can enable it by setting `Security.username_in_response_header` to `true`.'),
             ];
         }
 
         if (empty(Configure::read('MISP.attachment_scan_module'))) {
-            $output['Attachment scanning'][] = ['hint', __('Module for scanning attachment for viruses is not defined.')];
+            $output['Attachment scanning'][] = ['hint', __('No module for scanning attachments for viruses is currently defined.')];
         }
 
         if (Configure::read('debug')) {
@@ -139,7 +146,7 @@ class SecurityAudit
         if (Configure::read('Security.rest_client_enable_arbitrary_urls')) {
             $output['REST client'][] = [
                 'hint',
-                __('Users can use REST client to query any remote URL. This is generally not a good idea if your instance is public.')
+                __('Users can use the REST client to query any remote URL. This is generally not a good idea if your instance is public.')
             ];
         }
 
@@ -165,6 +172,8 @@ class SecurityAudit
 
         $this->email($output);
 
+        /*
+         * These settings are dangerous and break both the transparency and potential introduce sync issues
         if (!Configure::read('Security.hide_organisation_index_from_users')) {
             $output['MISP'][] = [
                 'hint',
@@ -177,6 +186,7 @@ class SecurityAudit
                 __('Any user can see list of all organisations in sharing group that user can see. You can disable that by setting `Security.hide_organisations_in_sharing_groups` to `true`. %s', $server->serverSettings['Security']['hide_organisations_in_sharing_groups']['description']),
             ];
         }
+        */
 
         $this->feeds($output);
         $this->remoteServers($output);
@@ -197,19 +207,19 @@ class SecurityAudit
         } else if (version_compare(PHP_VERSION, '7.4.0', '<')) {
             $output['PHP'][] = [
                 'hint',
-                __('PHP version 7.3 will be not supported after 6 Dec 2021. Event after that date can be still supported by your distribution.'),
+                __('PHP version 7.3 will not be supported after 6 Dec 2021. Even beyond that date, it can be still supported by your distribution.'),
                 'https://www.php.net/supported-versions.php'
             ];
         }
         if (ini_get('session.use_strict_mode') != 1) {
             $output['PHP'][] = [
                 'warning',
-                __('Session strict mode is disable.'),
+                __('Session strict mode is disabled.'),
                 'https://www.php.net/manual/en/session.configuration.php#ini.session.use-strict-mode',
             ];
         }
         if (empty(ini_get('session.cookie_httponly'))) {
-            $output['PHP'][] = ['error', __('Session cookie is not set as HTTP only. Session cookie can be access from JavaScript.')];
+            $output['PHP'][] = ['error', __('Session cookie is not set as HTTP only. Session cookie can be accessed from JavaScript.')];
         }
         if (!in_array(strtolower(ini_get('session.cookie_samesite')), ['strict', 'lax'])) {
             $output['PHP'][] = [
@@ -325,14 +335,14 @@ class SecurityAudit
         if (!Configure::read('GnuPG.bodyonlyencrypted')) {
             $output['Email'][] = [
                 'hint',
-                __('Full email body with all event information will be send even without encryption.')
+                __('Full email body with all event information will be sent, even without encryption.')
             ];
         }
 
         if ($canSignPgp && !Configure::read('GnuPG.obscure_subject')) {
             $output['Email'][] = [
                 'hint',
-                __('Even for encrypted emails, email subject will be send unencrypted. You can change that behaviour by setting `GnuPG.obscure_subject` to `true`.'),
+                __('Even for encrypted emails, the email subject will be sent unencrypted. You can change that behaviour by setting `GnuPG.obscure_subject` to `true`.'),
             ];
         }
 
@@ -357,7 +367,7 @@ class SecurityAudit
             if ($diffDays > 300) {
                 $output['System'][] = [
                     'warning',
-                    __('Kernel build time is since %s days ago. This usually means that the system kernel is not updated.', $diffDays),
+                    __('Kernel build time was s days ago. This usually means that the system kernel is not updated.', $diffDays),
                 ];
             }
         }
@@ -394,7 +404,7 @@ class SecurityAudit
             } else if (version_compare($parts[1], '3.7', '<')) {
                 $output['System'][] = [
                     'hint',
-                    __('You are using Python %s. This version will be not supported after 23 Dec 2021, but it can be still supported by your distribution.', $parts[1]),
+                    __('You are using Python %s. This version will not be supported beyond 23 Dec 2021, but it can be that it is still supported by your distribution.', $parts[1]),
                     'https://endoflife.date/python',
                 ];
             }
@@ -406,7 +416,7 @@ class SecurityAudit
             if (in_array($ubuntuVersion, ['14.04', '19.10'])) {
                 $output['System'][] = [
                     'warning',
-                    __('You are using Ubuntu %s. This version doesn\'t have security support anymore.', $ubuntuVersion),
+                    __('You are using Ubuntu %s. This version doesn\'t receive security support anymore.', $ubuntuVersion),
                     'https://endoflife.date/ubuntu',
                 ];
             } else if (in_array($ubuntuVersion, ['16.04'])) {
@@ -490,7 +500,7 @@ class SecurityAudit
         $command = implode(' ', $command);
         $process = proc_open($command, $descriptorspec, $pipes);
         if (!$process) {
-            throw new Exception("Command '$command' could be started.");
+            throw new Exception("Command '$command' could not be started.");
         }
 
         $stdout = stream_get_contents($pipes[1]);

From 91b82178a5455aa1d4c1aff3621ea6b81c0388d6 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Fri, 5 Mar 2021 16:16:27 +0100
Subject: [PATCH 305/437] fix: [SG] allow saving sharing groups with empty
 releasabiltiy tags, fixes #7165

---
 app/Model/SharingGroup.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Model/SharingGroup.php b/app/Model/SharingGroup.php
index e150bf197..057a49f71 100644
--- a/app/Model/SharingGroup.php
+++ b/app/Model/SharingGroup.php
@@ -713,12 +713,12 @@ class SharingGroup extends AppModel
         $this->create();
         $newSG = array();
         $date = date('Y-m-d H:i:s');
-        if (empty($sg['name']) || empty($sg['releasability'])) {
+        if (empty($sg['name'])) {
             return false;
         }
         $newSG = [
             'name' => $sg['name'],
-            'releasability' => $sg['releasability'],
+            'releasability' => !isset($sg['releasability']) ? '' : $sg['releasability'],
             'description' => !isset($sg['description']) ? '' : $sg['description'],
             'uuid' => !isset($sg['uuid']) ? CakeText::uuid() : $sg['uuid'],
             'organisation_uuid' => !isset($sg['organisation_uuid']) ? $user['Organisation']['uuid'] : $sg['organisation_uuid'],

From 9e50fe8617c05bee0314464d43870aaa620471f8 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 5 Mar 2021 18:54:50 +0100
Subject: [PATCH 306/437] chg: [UI] Make some parts of MISP nicer

---
 app/webroot/css/main.css                          | 11 +++++++++--
 app/webroot/css/markdownEditor/markdownEditor.css |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 7a260d31b..0f9a9e76e 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -47,9 +47,16 @@ h3{
     font-size: 18px;
     line-height: 20px;
 }
-pre {
-    font-size: 11px;
 
+code {
+    padding: 0;
+    border: 0;
+    background: transparent;
+    font-size: .875em;
+}
+
+pre {
+    font-size: 12px;
 }
 
 .ellipsis-overflow {
diff --git a/app/webroot/css/markdownEditor/markdownEditor.css b/app/webroot/css/markdownEditor/markdownEditor.css
index b1fa60391..e58a0e753 100644
--- a/app/webroot/css/markdownEditor/markdownEditor.css
+++ b/app/webroot/css/markdownEditor/markdownEditor.css
@@ -58,7 +58,7 @@
 #viewer-container {
     margin: 0 0;
     justify-content: center;
-    padding: 7px 15px;
+    padding: 10px 15px;
     overflow-y: auto;
     box-shadow: inset 0 2px 6px #eee;
 }

From d52db986212872308379f85838ffa526da49aae6 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 5 Mar 2021 18:55:31 +0100
Subject: [PATCH 307/437] chg: [UI] It is 2021! Removed -moz and -webkit
 specific CSS properties

---
 app/webroot/css/main.css | 103 ++++++---------------------------------
 1 file changed, 14 insertions(+), 89 deletions(-)

diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index 0f9a9e76e..f5a9680f0 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -39,11 +39,11 @@ form button.btn[disabled] {
     float:none;
 }*/
 
-h2{
+h2 {
     font-size: 25px;
     clear:both;
 }
-h3{
+h3 {
     font-size: 18px;
     line-height: 20px;
 }
@@ -75,9 +75,7 @@ pre {
 
 .navbar-lab .navbar-inner{
     background: #FF9900;
-    -webkit-border-radius: 0px !important;
-    -moz-border-radius: 0px !important;
-    border-radius: 0px !important;
+    border-radius: 0 !important;
 }
 
 .navbar-lab .nav > li > a{
@@ -85,8 +83,6 @@ pre {
 }
 
 .navbar-inner{
-    -webkit-border-radius: 0px !important;
-    -moz-border-radius: 0px !important;
     border-radius: 0px !important;
 }
 
@@ -604,8 +600,6 @@ dd {
     height: 100%;
     position: absolute;
     padding: 0;
-    -webkit-border-radius: 10px;
-    -moz-border-radius: 10px;
     border-radius: 10px;
     background: rgba(0,0,0,0.25);
     box-shadow: 0 2px 6px rgba(0,0,0,0.5), inset 0 1px rgba(255,255,255,0.3), inset 0 10px rgba(255,255,255,0.1), inset 0 10px 20px rgba(255,255,255,0.3), inset 0 -15px 30px rgba(0,0,0,0.3);
@@ -686,10 +680,8 @@ dd {
 .quote {
     margin: 0 10px;
     margin-bottom: 10px;
-    -moz-border-radius: 0px;
-    -webkit-border-radius: 0px;
     background: #f2f6f8 none;
-    border-radius: 0px;
+    border-radius: 0;
     border: 1px solid #417394;
     position: relative;
     top: 0;
@@ -698,7 +690,6 @@ dd {
 
 .loading {
     display: none;
-    text-color: #0088cc;
     position: fixed;
     top: 50%;
     left: 50%;
@@ -713,27 +704,17 @@ dd {
     left: 13px;
 }
 .toggle {
-    border-radius: 0px !important;
-    -webkit-border-radius: 0px !important;
-    -moz-border-radius: 0px !important;
+    border-radius: 0 !important;
 }
 
 .toggle-left {
-    border-bottom-right-radius: 0px !important;
-    -webkit-bottom-right-radius: 0px !important;
-    -moz-border-bottom-right-radius: 0px !important;
-    border-top-right-radius: 0px !important;
-    -webkit-top-right-radius: 0px !important;
-    -moz-border-top-right-radius: 0px !important;
+    border-bottom-right-radius: 0 !important;
+    border-top-right-radius: 0 !important;
 }
 
 .toggle-right {
-    border-bottom-left-radius: 0px !important;
-    -webkit-bottom-left-radius: 0px !important;
-    -moz-border-bottom-left-radius: 0px !important;
-    border-top-left-radius: 0px !important;
-    -webkit-top-left-radius: 0px !important;
-    -moz-border-top-left-radius: 0px !important;
+    border-bottom-left-radius: 0 !important;
+    border-top-left-radius: 0 !important;
 }
 
 .spinner {
@@ -741,9 +722,6 @@ dd {
    width:60px;
    margin:0 auto;
    position:relative;
-   -webkit-animation: rotation .6s infinite linear;
-   -moz-animation: rotation .6s infinite linear;
-   -o-animation: rotation .6s infinite linear;
    animation: rotation .6s infinite linear;
    border:6px solid rgba(0,174,239,.15);
    border-radius:100%;
@@ -807,20 +785,12 @@ a.proposal_link_red:hover {
 }
 
 .tag:first-child {
-    -webkit-border-top-left-radius: 3px;
-    -moz-border-top-left-radius: 3px;
     border-top-left-radius: 3px;
-    -webkit-border-bottom-left-radius: 3px;
-    -moz-border-bottom-left-radius: 3px;
     border-bottom-left-radius: 3px;
 }
 
 .tag:last-child {
-    -webkit-border-top-right-radius: 3px;
-    -moz-border-top-right-radius: 3px;
     border-top-right-radius: 3px;
-    -webkit-border-bottom-right-radius: 3px;
-    -moz-border-bottom-right-radius: 3px;
     border-bottom-right-radius: 3px;
     margin-right:2px;
 }
@@ -844,11 +814,7 @@ a.proposal_link_red:hover {
     font-size: 12px;
     font-weight: bold;
     line-height: 14px;
-    -webkit-border-top-left-radius: 3px;
-    -moz-border-top-left-radius: 3px;
     border-top-left-radius: 3px;
-    -webkit-border-bottom-left-radius: 3px;
-    -moz-border-bottom-left-radius: 3px;
     border-bottom-left-radius: 3px;
     box-shadow: 3px 3px 3px #888888;
 }
@@ -859,11 +825,7 @@ a.proposal_link_red:hover {
     font-size: 12px;
     font-weight: bold;
     line-height: 14px;
-    -webkit-border-top-right-radius: 3px;
-    -moz-border-top-right-radius: 3px;
     border-top-right-radius: 3px;
-    -webkit-border-bottom-right-radius: 3px;
-    -moz-border-bottom-right-radius: 3px;
     border-bottom-right-radius: 3px;
     box-shadow: 3px 3px 3px #888888;
     background-color:black;
@@ -876,8 +838,6 @@ a.proposal_link_red:hover {
     font-size: 12px;
     font-weight: bold;
     line-height: 14px;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
     border-radius: 3px;
     box-shadow: 3px 3px 3px #888888;
 }
@@ -1251,8 +1211,6 @@ li .generic-picker-item-element-check {
     padding-left:10px;
     padding-right:10px;
     border-radius: 6px;
-    -webkit-border-radius: 6px;
-    -moz-border-radius: 6px;
     box-shadow: 2px 2px 2px #888888;
 }
 
@@ -1557,11 +1515,9 @@ span.success {
 .attributehistogramBar {
     overflow: hidden;
     height:13px;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
     border-radius: 2px;
     box-shadow: 2px 2px 2px #888888;
-    margin-left:0px;
+    margin-left:0;
 }
 
 .attributehistogram-left-table {
@@ -1587,8 +1543,6 @@ span.success {
     display:inline-block;
     width:10px;
     height:10px;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
     border-radius: 2px;
     box-shadow: 1px 1px 1px #888888;
 }
@@ -1634,10 +1588,7 @@ span.success {
     margin: 0 0 15px 0;
     background-color: #FFFFFF;
     padding:0px !important;
-    padding-right:0px !important;
     border: 1px solid black !important;
-    -webkit-radius: 8px;
-    -moz-border-radius: 8px;
     border-radius: 8px;
 }
 
@@ -1726,9 +1677,7 @@ span.success {
     color:white;
     font-weight:bold;
     height:25px;
-    -moz-border-radius: 0px;
-    -webkit-border-radius: 7px 7px 0px 0px;
-    border-radius: 7px 7px 0px 0px;
+    border-radius: 7px 7px 0 0;
 }
 
 .templateElementHeaderText {
@@ -1742,9 +1691,7 @@ span.success {
     height: 100%;
     position: absolute;
     padding: 0;
-    -webkit-border-radius: 7px 7px 0px 0px;
-    -moz-border-radius: 7px 7px 0px 0px;
-    border-radius: 7px 7px 0px 0px;
+    border-radius: 7px 7px 0 0;
     background: rgba(0,0,0,0.1.25);
     box-shadow: 0 2px 6px rgba(0,0,0,0.5),
         inset 0 1px rgba(255,255,255,0.3),
@@ -1761,10 +1708,8 @@ span.success {
     height:40px;
     line-height:40px;
     background-color: #FFFFFF;
-    padding:0px !important;
+    padding:0 !important;
     border: 1px dashed black !important;
-    -webkit-radius: 8px;
-    -moz-border-radius: 8px;
     border-radius: 8px;
     text-align:center;
     vertical-align:middle;
@@ -2102,21 +2047,12 @@ a.discrete {
 
 .progress-queued .bar, .progress .bar-queued {
     background-color: #A0A0A0;
-    background-image: -moz-linear-gradient(top, #dbdbdb, #bfbfbf);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dbdbdb), to(#bfbfbf));
-    background-image: -webkit-linear-gradient(top, #dbdbdb, #bfbfbf);
-    background-image: -o-linear-gradient(top, #dbdbdb, #bfbfbf);
     background-image: linear-gradient(to bottom, #dbdbdb, #bfbfbf);
     background-repeat: repeat-x;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffbfbfbf', GradientType=0);
 }
 
 .progress-queued.progress-striped .bar, .progress-striped .bar-warning {
     background-color: #A0A0A0;
-    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
     background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 
@@ -2421,18 +2357,6 @@ table tr:hover .down-expand-button {
     padding-left:0px !important;
 }
 
-@-webkit-keyframes rotation {
-   from {-webkit-transform: rotate(0deg);}
-   to {-webkit-transform: rotate(359deg);}
-}
-@-moz-keyframes rotation {
-   from {-moz-transform: rotate(0deg);}
-   to {-moz-transform: rotate(359deg);}
-}
-@-o-keyframes rotation {
-   from {-o-transform: rotate(0deg);}
-   to {-o-transform: rotate(359deg);}
-}
 @keyframes rotation {
     from {
         transform: rotate(0deg);
@@ -2761,3 +2685,4 @@ Query builder
 .query-builder .rule-value-container label input {
     margin-top: 0;
 }
+

From 42f74e7175b712a716ff46987ae11ca2a159572d Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 5 Mar 2021 20:04:23 +0100
Subject: [PATCH 308/437] new: [shortcuts] Show help when pressing ? key

---
 app/View/Elements/footer.ctp                  |  4 ++--
 .../js/keyboard-shortcuts-definition.js       | 16 ++++++++++------
 app/webroot/js/keyboard-shortcuts.js          | 19 ++++++++++---------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/View/Elements/footer.ctp b/app/View/Elements/footer.ctp
index dacd6c010..a23c721c0 100644
--- a/app/View/Elements/footer.ctp
+++ b/app/View/Elements/footer.ctp
@@ -1,8 +1,8 @@
 <div class="footer <?php echo $debugMode;?>">
     <div id="shortcutsListContainer" class="<?php echo $debugMode == 'debugOn' ? 'hidden': ''; ?>">
-        <div id="triangle"></div>
+        <div id="triangle" title="<?= __('Show keyboard shortcuts help') ?>"></div>
         <div id="shortcutsList">
-            <span> <?php echo __('Keyboard shortcuts for this page'); ?>:</span><br>
+            <?= __('Keyboard shortcuts for this page') ?>:<br>
             <div id="shortcuts"><?php echo __('none'); ?></div>
         </div>
     </div>
diff --git a/app/webroot/js/keyboard-shortcuts-definition.js b/app/webroot/js/keyboard-shortcuts-definition.js
index bd6acbe3f..ad60c185c 100644
--- a/app/webroot/js/keyboard-shortcuts-definition.js
+++ b/app/webroot/js/keyboard-shortcuts-definition.js
@@ -1,4 +1,4 @@
-function getShortcutsDefinition() {
+function getShortcutsDefinition(controller, action) {
     var shortcuts = [
         {
             "key": "l",
@@ -13,11 +13,17 @@ function getShortcutsDefinition() {
             "action": function () {
                 document.location.href = baseurl + '/events/add';
             }
+        },
+        {
+            "key": "?",
+            "description": "Show this help",
+            "action": function () {
+                $('#triangle').click();
+            }
         }
     ];
 
-    var $body = $(document.body);
-    if ($body.data('controller') === 'events' && $body.data('action') === 'view') {
+    if (controller === 'events' && action === 'view') {
         shortcuts.push({
             "key": "t",
             "description": "Open the tag selection modal",
@@ -46,9 +52,7 @@ function getShortcutsDefinition() {
                 $('#quickFilterField').focus();
             }
         });
-    }
-
-    if ($body.data('controller') === 'events' && $body.data('action') === 'index') {
+    } else if (controller === 'events' && action === 'index') {
         shortcuts.push({
             "key": "s",
             "description": "Focus the filter events bar",
diff --git a/app/webroot/js/keyboard-shortcuts.js b/app/webroot/js/keyboard-shortcuts.js
index f2432e2a9..dc92cc733 100644
--- a/app/webroot/js/keyboard-shortcuts.js
+++ b/app/webroot/js/keyboard-shortcuts.js
@@ -21,7 +21,8 @@ let keyboardShortcutsManager = {
 	init() {
 		/* Codacy comment to notify that baseurl is a read-only global variable. */
 		/* global baseurl */
-		this.mapKeyboardShortcuts(getShortcutsDefinition());
+		var $body = $(document.body);
+		this.mapKeyboardShortcuts(getShortcutsDefinition($body.data('controller'), $body.data('action')));
 		this.setKeyboardListener();
 	},
 
@@ -43,7 +44,7 @@ let keyboardShortcutsManager = {
 	 */
 	addShortcutListToHTML() {
 		let html = "<ul>";
-		for(let shortcut of this.shortcutKeys.values()) {
+		for (let shortcut of this.shortcutKeys.values()) {
 			html += `<li><strong>${shortcut.key.toUpperCase()}</strong>: ${shortcut.description}</li>`
 		}
 		html += "</ul>"
@@ -55,7 +56,7 @@ let keyboardShortcutsManager = {
 	 * @param {} config The shortcut JSON list: [{key: string, description: string, action: string(eval-able JS code)}]
 	 */
 	mapKeyboardShortcuts(config) {
-		for(let shortcut of config) {
+		for (let shortcut of config) {
 			this.shortcutKeys.set(shortcut.key, shortcut);
 		}
 		this.addShortcutListToHTML();
@@ -68,12 +69,12 @@ let keyboardShortcutsManager = {
 	 */
 	setKeyboardListener() {
 		window.onkeyup = (keyboardEvent) => {
-			if(this.shortcutKeys.has(keyboardEvent.key)) {
+			if (this.shortcutKeys.has(keyboardEvent.key)) {
 				let activeElement = document.activeElement.tagName;
-				if(!this.ESCAPED_TAG_NAMES.includes(activeElement)) {
+				if (!this.ESCAPED_TAG_NAMES.includes(activeElement)) {
 					this.shortcutKeys.get(keyboardEvent.key).action();
 				}
-			} else if(this.NAVIGATION_KEYS.includes(keyboardEvent.key)) {
+			} else if (this.NAVIGATION_KEYS.includes(keyboardEvent.key)) {
 				window.dispatchEvent(new CustomEvent(this.EVENTS[keyboardEvent.key], {detail: keyboardEvent}));
 			}
 		}
@@ -81,8 +82,8 @@ let keyboardShortcutsManager = {
 }
 
 // Inits the keyboard shortcut manager's main routine and the click event on the keyboard shortcut triangle at the bottom of the screen.
-$(document).ready(function(){
-        keyboardShortcutsManager.init();
-        $('#triangle').click(keyboardShortcutsManager.onTriangleClick);
+$(function(){
+	keyboardShortcutsManager.init();
+	$('#triangle').click(keyboardShortcutsManager.onTriangleClick);
 });
 

From 79e78b817f28137a31ad9ee6ed5c1aba22815f7b Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 5 Feb 2021 10:44:10 +0100
Subject: [PATCH 309/437] new: [mail] Backend support for sending HTML emails

---
 app/Lib/Tools/SendEmail.php | 91 +++++++++++++++++++++++++++++--------
 app/Model/User.php          | 11 ++++-
 2 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/app/Lib/Tools/SendEmail.php b/app/Lib/Tools/SendEmail.php
index a8b6e95f9..8a4033920 100644
--- a/app/Lib/Tools/SendEmail.php
+++ b/app/Lib/Tools/SendEmail.php
@@ -3,6 +3,36 @@ App::uses('CakeEmail', 'Network/Email');
 
 class SendEmailException extends Exception {}
 
+class CakeEmailBody
+{
+    /** @var string|null */
+    public $html;
+
+    /** @var string|null */
+    public $text;
+
+    public function __construct($text = null, $html = null)
+    {
+        $this->html = $html;
+        $this->text = $text;
+    }
+
+    /**
+     * @return string
+     */
+    public function format()
+    {
+        if (!empty($this->html) && !empty($this->text)) {
+            return 'both';
+        }
+
+        if (!empty($this->html)) {
+            return 'html';
+        }
+        return 'text';
+    }
+}
+
 /**
  * Class CakeEmailExtended
  *
@@ -14,7 +44,7 @@ class SendEmailException extends Exception {}
 class CakeEmailExtended extends CakeEmail
 {
     /**
-     * @var MimeMultipart|MessagePart
+     * @var MimeMultipart|MessagePart|CakeEmailBody
      */
     private $body;
 
@@ -30,7 +60,7 @@ class CakeEmailExtended extends CakeEmail
             $headers['Content-Type'] = $this->body->getContentType();
         } else if ($this->body instanceof MessagePart) {
             $headers = array_merge($headers, $this->body->getHeaders());
-        } else {
+        } else if ($this->_emailFormat !== 'both') { // generate correct content-type header for 'text' or 'html' format
             $headers['Content-Type'] = 'multipart/mixed; boundary="' . $this->boundary() . '"';
         }
 
@@ -71,18 +101,40 @@ class CakeEmailExtended extends CakeEmail
             return $this->body->render();
         } else if ($this->body instanceof MessagePart) {
             return $this->body->render(false);
+        } else if ($this->body instanceof CakeEmailBody) {
+            return $this->_render([]); // @see _renderTemplates
         }
 
-        return  $this->_render($this->_wrap($this->body));
+        throw new InvalidArgumentException("Expected that body is instance of MimeMultipart, MessagePart or CakeEmailBody, " . gettype($this->body) . " given.");
     }
 
-    // This is hack how to force CakeEmail to always generate multipart message.
     protected function _renderTemplates($content)
     {
+        if (!$this->body instanceof CakeEmailBody) {
+            throw new InvalidArgumentException("Expected instance of CakeEmailBody, " . gettype($this->body) . " given.");
+        }
+
         $this->_boundary = md5(uniqid());
-        $output = parent::_renderTemplates($content);
-        $output[''] = '';
-        return $output;
+
+        $rendered = [];
+        if (!empty($this->body->text)) {
+            $rendered['text'] = $this->body->text;
+        }
+        if (!empty($this->body->html)) {
+            $rendered['html'] = $this->body->html;
+        }
+
+        foreach ($rendered as $type => $content) {
+            $content = str_replace(array("\r\n", "\r"), "\n", $content);
+            $content = $this->_encodeString($content, $this->charset);
+            $content = $this->_wrap($content);
+            $content = implode("\n", $content);
+            $rendered[$type] = rtrim($content, "\n");
+        }
+
+        // This is hack how to force CakeEmail to always generate multipart message.
+        $rendered[''] = '';
+        return $rendered;
     }
 
     protected function _render($content)
@@ -101,7 +153,7 @@ class CakeEmailExtended extends CakeEmail
         if ($content !== null) {
             throw new InvalidArgumentException("Content must be null for CakeEmailExtended.");
         }
-        return parent::send($this->body);
+        return parent::send();
     }
 
     public function __toString()
@@ -285,7 +337,8 @@ class SendEmail
             }
         }
 
-        $params['body'] = str_replace('\n', PHP_EOL, $params['body']); // TODO: Why this?
+        $body = str_replace('\n', PHP_EOL, $params['body']); // TODO: Why this?
+        $body = new CakeEmailBody($body);
 
         $attachments = array();
         if (!empty($params['requestor_gpgkey'])) {
@@ -306,8 +359,8 @@ class SendEmail
         $email->returnPath(Configure::read('MISP.email'));
         $email->to($params['to']);
         $email->subject($params['subject']);
-        $email->emailFormat('text');
-        $email->body($params['body']);
+        $email->emailFormat($body->format());
+        $email->body($body);
         $email->attachments($attachments);
 
         $mock = false;
@@ -352,15 +405,15 @@ class SendEmail
     /**
      * @param array $user
      * @param string $subject
-     * @param string $body
-     * @param string|null $bodyWithoutEncryption
+     * @param CakeEmailBody $body
+     * @param CakeEmailBody|null $bodyWithoutEncryption
      * @param array $replyToUser
      * @return bool True if e-mail is encrypted, false if not.
      * @throws Crypt_GPG_BadPassphraseException
      * @throws Crypt_GPG_Exception
      * @throws SendEmailException
      */
-    public function sendToUser(array $user, $subject, $body, $bodyWithoutEncryption = null, array $replyToUser = array())
+    public function sendToUser(array $user, $subject, CakeEmailBody $body, CakeEmailBody $bodyWithoutEncryption = null, array $replyToUser = array())
     {
         if (Configure::read('MISP.disable_emailing')) {
             throw new SendEmailException('Emailing is currently disabled on this instance.');
@@ -383,9 +436,7 @@ class SendEmail
             $body = $bodyWithoutEncryption;
         }
 
-        $body = str_replace('\n', PHP_EOL, $body); // TODO: Why this?
-
-        $email = $this->create($user, $subject, $body, array(), $replyToUser);
+        $email = $this->create($user, $subject, $body, [], $replyToUser);
 
         $signed = false;
         if (Configure::read('GnuPG.sign')) {
@@ -499,12 +550,12 @@ class SendEmail
     /**
      * @param array $user User model
      * @param string $subject
-     * @param string $body
+     * @param CakeEmailBody $body
      * @param array $attachments
      * @param array $replyToUser User model
      * @return CakeEmailExtended
      */
-    private function create(array $user, $subject, $body, array $attachments = array(), array $replyToUser = array())
+    private function create(array $user, $subject, CakeEmailBody $body, array $attachments = array(), array $replyToUser = array())
     {
         $email = new CakeEmailExtended();
 
@@ -534,7 +585,7 @@ class SendEmail
         $email->returnPath(Configure::read('MISP.email')); // TODO?
         $email->to($user['User']['email']);
         $email->subject($subject);
-        $email->emailFormat('text');
+        $email->emailFormat($body->format());
         $email->body($body);
 
         foreach ($attachments as $key => $value) {
diff --git a/app/Model/User.php b/app/Model/User.php
index ca505519c..3bf2c23fa 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -800,13 +800,20 @@ class User extends AppModel
             return true;
         }
 
-        $this->Log = ClassRegistry::init('Log');
+        $this->loadLog();
         $replyToLog = $replyToUser ? ' from ' . $replyToUser['User']['email'] : '';
 
         $gpg = $this->initializeGpg();
         $sendEmail = new SendEmail($gpg);
+
         try {
-            $encrypted = $sendEmail->sendToUser($user, $subject, $body, $bodyNoEnc ?: null, $replyToUser ?: array());
+            $encrypted = $sendEmail->sendToUser(
+                $user,
+                $subject,
+                new CakeEmailBody($body),
+                $bodyNoEnc ? new CakeEmailBody($bodyNoEnc): null,
+                $replyToUser ?: []
+            );
 
         } catch (SendEmailException $e) {
             $this->logException("Exception during sending e-mail", $e);

From e2b1ba18a332af4bf1c5844bc9d43ce8205ee45d Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 5 Feb 2021 15:40:22 +0100
Subject: [PATCH 310/437] new: [mail] HTML alert emails

---
 app/Lib/Tools/SendEmail.php    |   2 +-
 app/Model/Event.php            | 196 +++++++--------------------------
 app/Model/Server.php           |   8 ++
 app/Model/User.php             |  10 +-
 app/View/Emails/text/alert.ctp | 101 +++++++++++++++++
 5 files changed, 152 insertions(+), 165 deletions(-)
 create mode 100644 app/View/Emails/text/alert.ctp

diff --git a/app/Lib/Tools/SendEmail.php b/app/Lib/Tools/SendEmail.php
index 8a4033920..35b7701cc 100644
--- a/app/Lib/Tools/SendEmail.php
+++ b/app/Lib/Tools/SendEmail.php
@@ -581,7 +581,7 @@ class SendEmail
             $email->replyTo(Configure::read('MISP.email_reply_to'));
         }
 
-        $email->from(Configure::read('MISP.email'));
+        $email->from(Configure::read('MISP.email'), Configure::read('MISP.email_from_name'));
         $email->returnPath(Configure::read('MISP.email')); // TODO?
         $email->to($user['User']['email']);
         $email->subject($subject);
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 08395868a..271a96c31 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -3219,7 +3219,7 @@ class Event extends AppModel
             ])[0];
 
             if ($this->UserSetting->checkPublishFilter($user, $eventForUser)) {
-                $body = $this->__buildAlertEmailBody($eventForUser, $user, $oldpublish);
+                $body = $this->renderAlertEmail($eventForUser, $user, $oldpublish);
                 $this->User->sendEmail(['User' => $user], $body, $bodyNoEnc, $subject);
             }
             if ($jobId) {
@@ -3233,136 +3233,41 @@ class Event extends AppModel
         return true;
     }
 
-    /**
-     * @param string $body
-     * @param string $bodyTempOther
-     * @param array $objects
-     * @param int|null $oldpublish Timestamp of latest publish
-     */
-    private function __buildAlertEmailObject(&$body, &$bodyTempOther, array $objects, $oldpublish)
-    {
-        foreach ($objects as $object) {
-            if (isset($oldpublish) && isset($object['timestamp']) && $object['timestamp'] > $oldpublish) {
-                $body .= '* ';
-            } else {
-                $body .= '  ';
-            }
-            $body .= $object['name'] . '/' . $object['meta-category'] . "\n";
-            if (!empty($object['Attribute'])) {
-                $body .= $this->__buildAlertEmailAttribute($body, $bodyTempOther, $object['Attribute'], $oldpublish, '    ');
-            }
-        }
-    }
-
-    /**
-     * @param string $body
-     * @param string $bodyTempOther
-     * @param array $attributes
-     * @param int|null $oldpublish Timestamp of latest publish
-     * @param string $indent
-     */
-    private function __buildAlertEmailAttribute(&$body, &$bodyTempOther, array $attributes, $oldpublish, $indent = '  ')
-    {
-        $appendlen = 20;
-        foreach ($attributes as $attribute) {
-            $ids = $attribute['to_ids'] ?  ' (IDS)' : '';
-
-            // Defanging URLs (Not "links") emails domains/ips in notification emails
-            $value = $attribute['value'];
-            if ('url' == $attribute['type'] || 'uri' == $attribute['type']) {
-                $value = str_ireplace("http", "hxxp", $value);
-                $value = str_ireplace(".", "[.]", $value);
-            } elseif (in_array($attribute['type'], array('email-src', 'email-dst', 'whois-registrant-email', 'dns-soa-email', 'email-reply-to'))) {
-                $value = str_replace("@", "[at]", $value);
-            } elseif (in_array($attribute['type'], array('hostname', 'domain', 'ip-src', 'ip-dst', 'domain|ip'))) {
-                $value = str_replace(".", "[.]", $value);
-            }
-
-            $strRepeatCount = $appendlen - 2 - strlen($attribute['type']);
-            $strRepeat = ($strRepeatCount > 0) ? str_repeat(' ', $strRepeatCount) : '';
-            if (isset($oldpublish) && isset($attribute['timestamp']) && $attribute['timestamp'] > $oldpublish) {
-                $line = '* ' . $indent . $attribute['category'] . '/' . $attribute['type'] . $strRepeat . ': ' . $value . $ids . " *\n";
-            } else {
-                $line = $indent . $attribute['category'] . '/' . $attribute['type'] . $strRepeat . ': ' . $value . $ids .  "\n";
-            }
-
-            if (!empty($attribute['AttributeTag'])) {
-                $tags = [];
-                foreach ($attribute['AttributeTag'] as $aT) {
-                    $tags[] = $aT['Tag']['name'];
-                }
-                $line .= '  - Tags: ' . implode(', ', $tags) . "\n";
-            }
-            if ('other' == $attribute['type']) { // append the 'other' attribute types to the bottom.
-                $bodyTempOther .= $line;
-            } else {
-                $body .= $line;
-            }
-        }
-    }
-
     /**
      * @param array $event
      * @param array $user
-     * @param int|null $oldpublish Timestamp of latest publish
-     * @return string
+     * @param int|null $oldpublish Timestamp of previous publishing.
+     * @param bool $contactAlert
+     * @return CakeEmailBody
+     * @throws CakeException
      */
-    private function __buildAlertEmailBody(array $event, array $user, $oldpublish)
+    private function renderAlertEmail(array $event, array $user, $oldpublish = null, $contactAlert = false)
     {
-        // The mail body, h() is NOT needed as we are sending plain-text mails.
-        $body = "";
-        $body .= '==============================================' . "\n";
-        $body .= 'URL         : ' . $this->__getAnnounceBaseurl() . '/events/view/' . $event['Event']['id'] . "\n";
-        $body .= 'Event ID    : ' . $event['Event']['id'] . "\n";
-        $body .= 'Date        : ' . $event['Event']['date'] . "\n";
-        if (Configure::read('MISP.showorg')) {
-            $body .= 'Reported by : ' . $event['Orgc']['name'] . "\n";
-            $body .= 'Local owner of the event : ' . $event['Org']['name'] . "\n";
+        $View = new View();
+        $View->helpers = ['TextColour'];
+        $View->loadHelpers();
+
+        $View->set('event', $event);
+        $View->set('user', $user);
+        $View->set('oldPublishTimestamp', $oldpublish);
+        $View->set('baseurl', $this->__getAnnounceBaseurl());
+        $View->set('distributionLevels', $this->distributionLevels);
+        $View->set('analysisLevels', $this->analysisLevels);
+        $View->set('contactAlert', $contactAlert);
+
+        try {
+            $View->viewPath = $View->layoutPath = 'Emails' . DS . 'html';
+            $html = $View->render('alert');
+        } catch (MissingViewException $e) {
+            $html = null; // HTMl template is optional
         }
-        $body .= 'Distribution: ' . $this->distributionLevels[$event['Event']['distribution']] . "\n";
-        if ($event['Event']['distribution'] == 4) {
-            $body .= 'Sharing Group: ' . $event['SharingGroup']['name'] . "\n";
-        }
-        $tags = [];
-        foreach ($event['EventTag'] as $tag) {
-            $tags[] = $tag['Tag']['name'];
-        }
-        $body .= 'Tags: ' . implode(', ', $tags) . "\n";
-        $body .= 'Threat Level: ' . $event['ThreatLevel']['name'] . "\n";
-        $body .= 'Analysis    : ' . $this->analysisLevels[$event['Event']['analysis']] . "\n";
-        $body .= 'Description : ' . $event['Event']['info'] . "\n";
-        if (!empty($event['RelatedEvent'])) {
-            $body .= '==============================================' . "\n";
-            $body .= 'Related to: '. "\n";
-            foreach ($event['RelatedEvent'] as $relatedEvent) {
-                $body .= $this->__getAnnounceBaseurl() . '/events/view/' . $relatedEvent['Event']['id'] . ' (' . $relatedEvent['Event']['date'] . ') ' ."\n";
-            }
-            $body .= '==============================================' . "\n";
-        }
-        $bodyTempOther = "";
-        if (!empty($event['Attribute'])) {
-            $body .= 'Attributes (* indicates a new or modified attribute):' . "\n";
-            $this->__buildAlertEmailAttribute($body, $bodyTempOther, $event['Attribute'], $oldpublish);
-        }
-        if (!empty($event['Object'])) {
-            $body .= 'Objects (* indicates a new or modified object):' . "\n";
-            $this->__buildAlertEmailObject($body, $bodyTempOther, $event['Object'], $oldpublish);
-        }
-        if (!empty($bodyTempOther)) {
-            $body .= "\n";
-        }
-        $body .= $bodyTempOther;    // append the 'other' attribute types to the bottom.
-        $body .= '==============================================' . "\n";
-        $body .= sprintf(
-            "You receive this e-mail because the e-mail address %s is set to receive publish alerts on the MISP instance at %s.%s%s",
-            $user['email'],
-            $this->__getAnnounceBaseurl(),
-            PHP_EOL,
-            PHP_EOL
-        );
-        $body .= "If you would like to unsubscribe from receiving such alert e-mails, simply\ndisable publish alerts via " . $this->__getAnnounceBaseurl() . '/users/edit' . PHP_EOL;
-        $body .= '==============================================' . "\n";
-        return $body;
+
+        $View->hasRendered = false;
+        $View->viewPath = $View->layoutPath = 'Emails' . DS . 'text';
+        $text = $View->render('alert');
+
+        require_once APP . '/Lib/Tools/SendEmail.php'; // TODO
+        return new CakeEmailBody($text, $html);
     }
 
     /**
@@ -3423,13 +3328,13 @@ class Event extends AppModel
         $subject = "[" . Configure::read('MISP.org') . " MISP] Need info about event $id - " . strtoupper($tplColorString);
         $result = true;
         foreach ($orgMembers as $reporter) {
-            list($bodyevent, $body) = $this->__buildContactEventEmailBody($user, $message, $event);
+            list($bodyevent, $body) = $this->__buildContactEventEmailBody($user, $reporter, $message, $event);
             $result = $this->User->sendEmail($reporter, $bodyevent, $body, $subject, $user) && $result;
         }
         return $result;
     }
 
-    private function __buildContactEventEmailBody(array $user, $message, array $event)
+    private function __buildContactEventEmailBody(array $user, array $reporter, $message, array $event)
     {
         // The mail body, h() is NOT needed as we are sending plain-text mails.
         $body = "";
@@ -3451,40 +3356,13 @@ class Event extends AppModel
         $body .= "\n";
         $body .= "The event is the following: \n";
 
-        // print the event in mail-format
-        // LATER place event-to-email-layout in a function
-        $body .= 'URL         : ' . $this->__getAnnounceBaseurl() . '/events/view/' . $event['Event']['id'] . "\n";
-        $bodyevent = $body;
-        $bodyevent .= 'Event ID    : ' . $event['Event']['id'] . "\n";
-        $bodyevent .= 'Date        : ' . $event['Event']['date'] . "\n";
-        if (Configure::read('MISP.showorg')) {
-            $bodyevent .= 'Reported by : ' . $event['Orgc']['name'] . "\n";
-        }
-        $bodyevent .= 'Risk        : ' . $event['ThreatLevel']['name'] . "\n";
-        $bodyevent .= 'Analysis    : ' . $this->analysisLevels[$event['Event']['analysis']] . "\n";
+        $full = $body;
+        $body .= $this->__getAnnounceBaseurl() . '/events/view/' . $event['Event']['id'] . "\n";
 
-        foreach ($event['RelatedEvent'] as $relatedEvent) {
-            $bodyevent .= 'Related to  : ' . $this->__getAnnounceBaseurl() . '/events/view/' . $relatedEvent['Event']['id'] . ' (' . $relatedEvent['Event']['date'] . ')' . "\n";
-        }
+        $rendered = $this->renderAlertEmail($event, $reporter);
+        $full .= $rendered->text;
 
-        $bodyevent .= 'Info  : ' . "\n";
-        $bodyevent .= $event['Event']['info'] . "\n";
-
-        $bodyTempOther = "";
-        if (!empty($event['Attribute'])) {
-            $bodyevent .= 'Attributes:' . "\n";
-            $this->__buildAlertEmailAttribute($bodyevent, $bodyTempOther, $event['Attribute'], null);
-        }
-        if (!empty($event['Object'])) {
-            $bodyevent .= 'Objects:' . "\n";
-            $this->__buildAlertEmailObject($bodyevent, $bodyTempOther, $event['Object'], null);
-        }
-        if (!empty($bodyTempOther)) {
-            $bodyevent .= "\n";
-        }
-        $bodyevent .= $bodyTempOther;    // append the 'other' attribute types to the bottom.
-
-        return array($bodyevent, $body);
+        return array($body, $full);
     }
 
     public function captureSGForElement($element, $user, $server=false)
diff --git a/app/Model/Server.php b/app/Model/Server.php
index 1b05ef2b1..8109c86bf 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -4739,6 +4739,14 @@ class Server extends AppModel
                     'test' => 'testBool',
                     'type' => 'boolean',
                 ),
+                'email_from_name' => [
+                    'level' => 2,
+                    'description' => __('Notification e-mail sender name.'),
+                    'value' => '',
+                    'errorMessage' => '',
+                    'test' => 'testForEmpty',
+                    'type' => 'string',
+                ],
                 'taxii_sync' => array(
                     'level' => 3,
                     'description' => __('This setting is deprecated and can be safely removed.'),
diff --git a/app/Model/User.php b/app/Model/User.php
index 3bf2c23fa..e56fd49b6 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -757,7 +757,7 @@ class User extends AppModel
             'conditions' => $conditions,
             'recursive' => -1,
             'fields' => array('id', 'email', 'gpgkey', 'certif_public', 'org_id', 'disabled'),
-            'contain' => ['Role' => ['fields' => ['perm_site_admin', 'perm_audit']], 'Organisation' => ['fields' => ['id']]],
+            'contain' => ['Role' => ['fields' => ['perm_site_admin', 'perm_audit']], 'Organisation' => ['fields' => ['id', 'name']]],
         ));
         foreach ($users as $k => $user) {
             $user = $user['User'];
@@ -786,8 +786,8 @@ class User extends AppModel
      * the remaining two parameters are the e-mail subject and a secondary user object which will be used as the replyto address if set. If it is set and an encryption key for the replyTo user exists, then his/her public key will also be attached
      *
      * @param array $user
-     * @param string $body
-     * @param string|false $bodyNoEnc
+     * @param CakeEmailBody|string $body
+     * @param CakeEmailBody|string|false $bodyNoEnc
      * @param string $subject
      * @param array|false $replyToUser
      * @return bool
@@ -810,8 +810,8 @@ class User extends AppModel
             $encrypted = $sendEmail->sendToUser(
                 $user,
                 $subject,
-                new CakeEmailBody($body),
-                $bodyNoEnc ? new CakeEmailBody($bodyNoEnc): null,
+                is_string($body) ? new CakeEmailBody($body) : $body,
+                $bodyNoEnc ? (is_string($bodyNoEnc) ? new CakeEmailBody($bodyNoEnc) : $bodyNoEnc): null,
                 $replyToUser ?: []
             );
 
diff --git a/app/View/Emails/text/alert.ctp b/app/View/Emails/text/alert.ctp
new file mode 100644
index 000000000..6c9bae885
--- /dev/null
+++ b/app/View/Emails/text/alert.ctp
@@ -0,0 +1,101 @@
+<?php
+$renderAttributes = function(array $attributes, $indent = '  ') use ($oldPublishTimestamp) {
+    $appendlen = 20;
+    foreach ($attributes as $attribute) {
+        $ids = $attribute['to_ids'] ?  ' (IDS)' : '';
+
+        // Defanging URLs (Not "links") emails domains/ips in notification emails
+        $value = $attribute['value'];
+        if ('url' === $attribute['type'] || 'uri' === $attribute['type']) {
+            $value = str_ireplace("http", "hxxp", $value);
+            $value = str_ireplace(".", "[.]", $value);
+        } elseif (in_array($attribute['type'], ['email-src', 'email-dst', 'whois-registrant-email', 'dns-soa-email', 'email-reply-to'], true)) {
+            $value = str_replace("@", "[at]", $value);
+        } elseif (in_array($attribute['type'], ['hostname', 'domain', 'ip-src', 'ip-dst', 'domain|ip'], true)) {
+            $value = str_replace(".", "[.]", $value);
+        }
+
+        $strRepeatCount = $appendlen - 2 - strlen($attribute['type']);
+        $strRepeat = ($strRepeatCount > 0) ? str_repeat(' ', $strRepeatCount) : '';
+        if (isset($oldPublishTimestamp) && isset($attribute['timestamp']) && $attribute['timestamp'] > $oldPublishTimestamp) {
+            $line = '* ' . $indent . $attribute['category'] . '/' . $attribute['type'] . $strRepeat . ': ' . $value . $ids . " *\n";
+        } else {
+            $line = $indent . $attribute['category'] . '/' . $attribute['type'] . $strRepeat . ': ' . $value . $ids .  "\n";
+        }
+
+        if (!empty($attribute['AttributeTag'])) {
+            $tags = [];
+            foreach ($attribute['AttributeTag'] as $aT) {
+                $tags[] = $aT['Tag']['name'];
+            }
+            $line .= '  - Tags: ' . implode(', ', $tags) . "\n";
+        }
+        echo $line;
+    }
+};
+
+$renderObjects = function(array $objects) use ($renderAttributes, $oldPublishTimestamp) {
+    foreach ($objects as $object) {
+        $body = '';
+        if (isset($oldPublishTimestamp) && isset($object['timestamp']) && $object['timestamp'] > $oldPublishTimestamp) {
+            $body .= '* ';
+        } else {
+            $body .= '  ';
+        }
+        $body .= $object['name'] . '/' . $object['meta-category'] . "\n";
+        if (!empty($object['Attribute'])) {
+            $body .= $renderAttributes($object['Attribute'], '    ');
+        }
+        echo $body;
+    }
+};
+
+$tags = [];
+foreach ($event['EventTag'] as $tag) {
+    $tags[] = $tag['Tag']['name'];
+}
+?>
+==============================================
+URL         : <?= $baseurl ?>/events/view/<?= $event['Event']['id'] . PHP_EOL ?>
+Event ID    : <?= $event['Event']['id'] . PHP_EOL ?>
+Date        : <?= $event['Event']['date'] . PHP_EOL ?>
+<?php if (Configure::read('MISP.showorg')): ?>
+Reported by : <?= $event['Orgc']['name'] . PHP_EOL ?>
+Local owner of the event : <?= $event['Org']['name'] . PHP_EOL ?>
+<?php endif; ?>
+Distribution: <?= $distributionLevels[$event['Event']['distribution']] . PHP_EOL ?>
+<?php if ($event['Event']['distribution'] == 4): ?>
+Sharing Group: <?= $event['SharingGroup']['name'] . PHP_EOL ?>
+<?php endif; ?>
+Tags: <?= implode(", ", $tags) . PHP_EOL ?>
+Threat Level: <?= $event['ThreatLevel']['name'] . PHP_EOL ?>
+Analysis    : <?= $analysisLevels[$event['Event']['analysis']] . PHP_EOL ?>
+Description : <?= $event['Event']['info'] . PHP_EOL ?>
+<?php if (!empty($event['RelatedEvent'])): ?>
+==============================================
+Related to:
+<?php 
+foreach ($event['RelatedEvent'] as $relatedEvent) {
+    echo $baseurl . '/events/view/' . $relatedEvent['Event']['id'] . ' (' . $relatedEvent['Event']['date'] . ') ' . "\n";
+}
+?>
+==============================================
+<?php endif; ?>
+
+<?php if (!empty($event['Attribute'])): ?>
+Attributes<?= isset($oldPublishTimestamp) ? ' (* indicates a new or modified attribute since last update):' : ':' ?>
+<?= $renderAttributes($event['Attribute']) ?>
+<?php endif; ?>
+
+<?php if (!empty($event['Object'])): ?>
+Objects<?= isset($oldPublishTimestamp) ? ' (* indicates a new or modified object since last update):' : ':' ?>
+<?= $renderObjects($event['Object']) ?>
+<?php endif; ?>
+
+==============================================
+You receive this e-mail because the e-mail address <?= $user['email'] ?> is set 
+to receive <?= $contactAlert ? 'contact' : 'publish' ?> alerts on the MISP instance at <?= $baseurl ?>.
+
+If you would like to unsubscribe from receiving such alert e-mails, simply
+disable <?= $contactAlert ? 'contact' : 'publish' ?> alerts via <?= $baseurl ?>/users/edit
+==============================================

From 17fb5db3cfeeb4cac73df93bda933d78e12ee406 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sat, 6 Feb 2021 10:58:46 +0100
Subject: [PATCH 311/437] new: [mail] Move contact alert email to templates

---
 app/Lib/Tools/SendEmail.php            |  25 ++++--
 app/Lib/Tools/SendEmailTemplate.php    |  51 ++++++++++++
 app/Model/Event.php                    | 103 +++++++++----------------
 app/Model/User.php                     |   8 +-
 app/View/Emails/text/alert.ctp         |  19 ++++-
 app/View/Emails/text/alert_contact.ctp |  23 ++++++
 6 files changed, 148 insertions(+), 81 deletions(-)
 create mode 100644 app/Lib/Tools/SendEmailTemplate.php
 create mode 100644 app/View/Emails/text/alert_contact.ctp

diff --git a/app/Lib/Tools/SendEmail.php b/app/Lib/Tools/SendEmail.php
index 35b7701cc..f8dd8f7ba 100644
--- a/app/Lib/Tools/SendEmail.php
+++ b/app/Lib/Tools/SendEmail.php
@@ -405,16 +405,20 @@ class SendEmail
     /**
      * @param array $user
      * @param string $subject
-     * @param CakeEmailBody $body
-     * @param CakeEmailBody|null $bodyWithoutEncryption
+     * @param SendEmailTemplate|string $body
+     * @param string|false $bodyWithoutEncryption
      * @param array $replyToUser
      * @return bool True if e-mail is encrypted, false if not.
      * @throws Crypt_GPG_BadPassphraseException
      * @throws Crypt_GPG_Exception
      * @throws SendEmailException
      */
-    public function sendToUser(array $user, $subject, CakeEmailBody $body, CakeEmailBody $bodyWithoutEncryption = null, array $replyToUser = array())
+    public function sendToUser(array $user, $subject, $body, $bodyWithoutEncryption = false, array $replyToUser = array())
     {
+        if ($body instanceof SendEmailTemplate && $bodyWithoutEncryption !== false) {
+            throw new InvalidArgumentException("When body is instance of SendEmailTemplate, \$bodyWithoutEncryption must be false.");
+        }
+
         if (Configure::read('MISP.disable_emailing')) {
             throw new SendEmailException('Emailing is currently disabled on this instance.');
         }
@@ -431,9 +435,18 @@ class SendEmail
             throw new SendEmailException('Encrypted messages are enforced and the message could not be encrypted for this user as no valid encryption key was found.');
         }
 
-        // If 'bodyonlyencrypted' is enabled and the user has no encryption key, use the alternate body (if it exists)
-        if (Configure::read('GnuPG.bodyonlyencrypted') && !$canEncryptSmime && !$canEncryptGpg && $bodyWithoutEncryption) {
-            $body = $bodyWithoutEncryption;
+        // If 'GnuPG.bodyonlyencrypted' is enabled and the user has no encryption key, use the alternate body
+        $hideDetails = Configure::read('GnuPG.bodyonlyencrypted') && !$canEncryptSmime && !$canEncryptGpg;
+
+        if ($body instanceof SendEmailTemplate) {
+            $body->set('canEncryptSmime', $canEncryptSmime);
+            $body->set('canEncryptGpg', $canEncryptGpg);
+            $body = $body->render($hideDetails);
+        } else {
+            if ($hideDetails && $bodyWithoutEncryption) {
+                $body = $bodyWithoutEncryption;
+            }
+            $body = new CakeEmailBody($body);
         }
 
         $email = $this->create($user, $subject, $body, [], $replyToUser);
diff --git a/app/Lib/Tools/SendEmailTemplate.php b/app/Lib/Tools/SendEmailTemplate.php
new file mode 100644
index 000000000..7ab7009a6
--- /dev/null
+++ b/app/Lib/Tools/SendEmailTemplate.php
@@ -0,0 +1,51 @@
+<?php
+class SendEmailTemplate
+{
+    /** @var array  */
+    private $viewVars = [];
+
+    /** @var string */
+    private $viewName;
+
+    public function __construct($viewName)
+    {
+        $this->viewName = $viewName;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     */
+    public function set($key, $value)
+    {
+        $this->viewVars[$key] = $value;
+    }
+
+    /**
+     * @param bool $hideDetails True when GnuPG.bodyonlyencrypted is enabled and e-mail cannot be send in encrypted form
+     * @return CakeEmailBody
+     * @throws CakeException
+     */
+    public function render($hideDetails = false)
+    {
+        $View = new View();
+        $View->helpers = ['TextColour'];
+        $View->loadHelpers();
+
+        $View->set($this->viewVars);
+        $View->set('hideDetails', $hideDetails);
+
+        $View->viewPath = $View->layoutPath = 'Emails' . DS . 'html';
+        try {
+            $html = $View->render($this->viewName);
+        } catch (MissingViewException $e) {
+            $html = null; // HTMl template is optional
+        }
+
+        $View->viewPath = $View->layoutPath = 'Emails' . DS . 'text';
+        $View->hasRendered = false;
+        $text = $View->render($this->viewName);
+
+        return new CakeEmailBody($text, $html);
+    }
+}
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 271a96c31..67eb2b452 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -4,6 +4,7 @@ App::uses('CakeEmail', 'Network/Email');
 App::uses('RandomTool', 'Tools');
 App::uses('AttachmentTool', 'Tools');
 App::uses('TmpFileTool', 'Tools');
+App::uses('SendEmailTemplate', 'Tools');
 
 /**
  * @property User $User
@@ -3202,10 +3203,6 @@ class Event extends AppModel
         }
         $subject = "[" . Configure::read('MISP.org') . " MISP] Event $id - $subject$threatLevel" . strtoupper($subjMarkingString);
 
-        $eventUrl = $this->__getAnnounceBaseurl() . "/events/view/" . $id;
-        $bodyNoEnc = __("A new or modified event was just published on %s", $eventUrl) . "\n\n";
-        $bodyNoEnc .= __("If you would like to unsubscribe from receiving such alert e-mails, simply\ndisable publish alerts via %s",  $this->__getAnnounceBaseurl() . '/users/edit');
-
         $userCount = count($usersWithAccess);
         $this->UserSetting = ClassRegistry::init('UserSetting');
         foreach ($usersWithAccess as $k => $user) {
@@ -3219,8 +3216,8 @@ class Event extends AppModel
             ])[0];
 
             if ($this->UserSetting->checkPublishFilter($user, $eventForUser)) {
-                $body = $this->renderAlertEmail($eventForUser, $user, $oldpublish);
-                $this->User->sendEmail(['User' => $user], $body, $bodyNoEnc, $subject);
+                $body = $this->prepareAlertEmail($eventForUser, $user, $oldpublish);
+                $this->User->sendEmail(['User' => $user], $body, false, $subject);
             }
             if ($jobId) {
                 $this->Job->saveProgress($jobId, null, $k / $userCount * 100);
@@ -3235,39 +3232,22 @@ class Event extends AppModel
 
     /**
      * @param array $event
-     * @param array $user
+     * @param array $user E-mail receiver
      * @param int|null $oldpublish Timestamp of previous publishing.
-     * @param bool $contactAlert
-     * @return CakeEmailBody
+     * @return SendEmailTemplate
      * @throws CakeException
      */
-    private function renderAlertEmail(array $event, array $user, $oldpublish = null, $contactAlert = false)
+    private function prepareAlertEmail(array $event, array $user, $oldpublish = null)
     {
-        $View = new View();
-        $View->helpers = ['TextColour'];
-        $View->loadHelpers();
-
-        $View->set('event', $event);
-        $View->set('user', $user);
-        $View->set('oldPublishTimestamp', $oldpublish);
-        $View->set('baseurl', $this->__getAnnounceBaseurl());
-        $View->set('distributionLevels', $this->distributionLevels);
-        $View->set('analysisLevels', $this->analysisLevels);
-        $View->set('contactAlert', $contactAlert);
-
-        try {
-            $View->viewPath = $View->layoutPath = 'Emails' . DS . 'html';
-            $html = $View->render('alert');
-        } catch (MissingViewException $e) {
-            $html = null; // HTMl template is optional
-        }
-
-        $View->hasRendered = false;
-        $View->viewPath = $View->layoutPath = 'Emails' . DS . 'text';
-        $text = $View->render('alert');
-
-        require_once APP . '/Lib/Tools/SendEmail.php'; // TODO
-        return new CakeEmailBody($text, $html);
+        $template = new SendEmailTemplate('alert');
+        $template->set('event', $event);
+        $template->set('user', $user);
+        $template->set('oldPublishTimestamp', $oldpublish);
+        $template->set('baseurl', $this->__getAnnounceBaseurl());
+        $template->set('distributionLevels', $this->distributionLevels);
+        $template->set('analysisLevels', $this->analysisLevels);
+        $template->set('tlp', $this->getEmailSubjectMarkForEvent($event));
+        return $template;
     }
 
     /**
@@ -3327,42 +3307,33 @@ class Event extends AppModel
         $tplColorString = $this->getEmailSubjectMarkForEvent($event);
         $subject = "[" . Configure::read('MISP.org') . " MISP] Need info about event $id - " . strtoupper($tplColorString);
         $result = true;
-        foreach ($orgMembers as $reporter) {
-            list($bodyevent, $body) = $this->__buildContactEventEmailBody($user, $reporter, $message, $event);
-            $result = $this->User->sendEmail($reporter, $bodyevent, $body, $subject, $user) && $result;
+        foreach ($orgMembers as $eventReporter) {
+            $body = $this->prepareContactAlertEmail($user, $eventReporter, $message, $event);
+            $result = $this->User->sendEmail($eventReporter, $body, false, $subject, $user) && $result;
         }
         return $result;
     }
 
-    private function __buildContactEventEmailBody(array $user, array $reporter, $message, array $event)
+    /**
+     * @param array $user
+     * @param array $eventReporter
+     * @param string $message
+     * @param array $event
+     * @return SendEmailTemplate
+     */
+    private function prepareContactAlertEmail(array $user, array $eventReporter, $message, array $event)
     {
-        // The mail body, h() is NOT needed as we are sending plain-text mails.
-        $body = "";
-        $body .= "Hello, \n";
-        $body .= "\n";
-        $body .= "Someone wants to get in touch with you concerning a MISP event. \n";
-        $body .= "\n";
-        $body .= "You can reach them at " . $user['User']['email'] . "\n";
-        if (!empty($user['User']['gpgkey'])) {
-            $body .= "Their GnuPG key is added as attachment to this email. \n";
-        }
-        if (!empty($user['User']['certif_public'])) {
-            $body .= "Their Public certificate is added as attachment to this email. \n";
-        }
-        $body .= "\n";
-        $body .= "They wrote the following message: \n";
-        $body .= $message . "\n";
-        $body .= "\n";
-        $body .= "\n";
-        $body .= "The event is the following: \n";
-
-        $full = $body;
-        $body .= $this->__getAnnounceBaseurl() . '/events/view/' . $event['Event']['id'] . "\n";
-
-        $rendered = $this->renderAlertEmail($event, $reporter);
-        $full .= $rendered->text;
-
-        return array($body, $full);
+        $template = new SendEmailTemplate('alert_contact');
+        $template->set('event', $event);
+        $template->set('requestor', $user);
+        $template->set('message', $message);
+        $template->set('user', $this->User->rearrangeToAuthForm($eventReporter));
+        $template->set('baseurl', $this->__getAnnounceBaseurl());
+        $template->set('distributionLevels', $this->distributionLevels);
+        $template->set('analysisLevels', $this->analysisLevels);
+        $template->set('contactAlert', true);
+        $template->set('tlp', $this->getEmailSubjectMarkForEvent($event));
+        return $template;
     }
 
     public function captureSGForElement($element, $user, $server=false)
diff --git a/app/Model/User.php b/app/Model/User.php
index e56fd49b6..5482da065 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -807,13 +807,7 @@ class User extends AppModel
         $sendEmail = new SendEmail($gpg);
 
         try {
-            $encrypted = $sendEmail->sendToUser(
-                $user,
-                $subject,
-                is_string($body) ? new CakeEmailBody($body) : $body,
-                $bodyNoEnc ? (is_string($bodyNoEnc) ? new CakeEmailBody($bodyNoEnc) : $bodyNoEnc): null,
-                $replyToUser ?: []
-            );
+            $encrypted = $sendEmail->sendToUser($user, $subject, $body, $bodyNoEnc,$replyToUser ?: []);
 
         } catch (SendEmailException $e) {
             $this->logException("Exception during sending e-mail", $e);
diff --git a/app/View/Emails/text/alert.ctp b/app/View/Emails/text/alert.ctp
index 6c9bae885..ba1f0a872 100644
--- a/app/View/Emails/text/alert.ctp
+++ b/app/View/Emails/text/alert.ctp
@@ -1,4 +1,19 @@
 <?php
+if (!isset($oldPublishTimestamp)) {
+    $oldPublishTimestamp = null;
+}
+
+if (!isset($contactAlert)) {
+    $contactAlert = false;
+}
+
+if ($hideDetails) { // Used when GnuPG.bodyonlyencrypted is enabled and e-mail cannot be send in encrypted form
+    $eventUrl = $baseurl . "/events/view/" . $event['Event']['id'];
+    echo __("A new or modified event was just published on %s", $eventUrl) . PHP_EOL . PHP_EOL;
+    echo __("If you would like to unsubscribe from receiving such alert e-mails, simply\ndisable publish alerts via %s", $baseurl . '/users/edit');
+    return;
+}
+
 $renderAttributes = function(array $attributes, $indent = '  ') use ($oldPublishTimestamp) {
     $appendlen = 20;
     foreach ($attributes as $attribute) {
@@ -83,12 +98,12 @@ foreach ($event['RelatedEvent'] as $relatedEvent) {
 <?php endif; ?>
 
 <?php if (!empty($event['Attribute'])): ?>
-Attributes<?= isset($oldPublishTimestamp) ? ' (* indicates a new or modified attribute since last update):' : ':' ?>
+Attributes<?= isset($oldPublishTimestamp) ? " (* indicates a new or modified attribute since last update):\n" : ":\n" ?>
 <?= $renderAttributes($event['Attribute']) ?>
 <?php endif; ?>
 
 <?php if (!empty($event['Object'])): ?>
-Objects<?= isset($oldPublishTimestamp) ? ' (* indicates a new or modified object since last update):' : ':' ?>
+Objects<?= isset($oldPublishTimestamp) ? " (* indicates a new or modified object since last update):\n" : ":\n" ?>
 <?= $renderObjects($event['Object']) ?>
 <?php endif; ?>
 
diff --git a/app/View/Emails/text/alert_contact.ctp b/app/View/Emails/text/alert_contact.ctp
new file mode 100644
index 000000000..64a38ff65
--- /dev/null
+++ b/app/View/Emails/text/alert_contact.ctp
@@ -0,0 +1,23 @@
+Hello,
+
+Someone wants to get in touch with you concerning a MISP event.
+
+You can reach them at <?= $requestor['User']['email'] ?>
+<?php if (!empty($requestor['User']['gpgkey'])): ?>
+Their PGP key is added as attachment to this email.
+<?php endif; ?>
+<?php if (!empty($requestor['User']['certif_public'])): ?>
+Their Public certificate is added as attachment to this email.
+<?php endif; ?>
+
+They wrote the following message:
+<?= $message ?>
+
+
+The event is the following:
+<?php
+if ($hideDetails) {
+    echo $baseurl . ' /events/view/' . $event['Event']['id'];
+} else {
+    require __DIR__ . '/alert.ctp'; // include event details
+}

From 56508cce17761c701d09b2330fd43267f8d48d4e Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sat, 6 Feb 2021 13:54:07 +0100
Subject: [PATCH 312/437] new: [mail] Add reference for event alert emails

---
 app/Lib/Tools/SendEmail.php         | 16 +++++++++++++---
 app/Lib/Tools/SendEmailTemplate.php | 18 ++++++++++++++++++
 app/Model/Event.php                 |  1 +
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/Lib/Tools/SendEmail.php b/app/Lib/Tools/SendEmail.php
index f8dd8f7ba..3379dffa7 100644
--- a/app/Lib/Tools/SendEmail.php
+++ b/app/Lib/Tools/SendEmail.php
@@ -441,15 +441,25 @@ class SendEmail
         if ($body instanceof SendEmailTemplate) {
             $body->set('canEncryptSmime', $canEncryptSmime);
             $body->set('canEncryptGpg', $canEncryptGpg);
-            $body = $body->render($hideDetails);
+            $bodyContent = $body->render($hideDetails);
         } else {
             if ($hideDetails && $bodyWithoutEncryption) {
                 $body = $bodyWithoutEncryption;
             }
-            $body = new CakeEmailBody($body);
+            $bodyContent = new CakeEmailBody($body);
         }
 
-        $email = $this->create($user, $subject, $body, [], $replyToUser);
+        $email = $this->create($user, $subject, $bodyContent, [], $replyToUser);
+
+        // Generate `In-Reply-To` and `References` to group emails
+        if ($body instanceof SendEmailTemplate && $body->referenceId()) {
+            $reference = sha1($body->referenceId() . '|' .  Configure::read('MISP.uuid'));
+            $reference = "<$reference@{$email->domain()}>";
+            $email->addHeaders([
+                'In-Reply-To' => $reference,
+                'References' => $reference,
+            ]);
+        }
 
         $signed = false;
         if (Configure::read('GnuPG.sign')) {
diff --git a/app/Lib/Tools/SendEmailTemplate.php b/app/Lib/Tools/SendEmailTemplate.php
index 7ab7009a6..a378fbd22 100644
--- a/app/Lib/Tools/SendEmailTemplate.php
+++ b/app/Lib/Tools/SendEmailTemplate.php
@@ -7,12 +7,29 @@ class SendEmailTemplate
     /** @var string */
     private $viewName;
 
+    /** @var string|null */
+    private $referenceId;
+
     public function __construct($viewName)
     {
         $this->viewName = $viewName;
     }
 
     /**
+     * This value will be used for grouping emails in mail client.
+     * @param string|null $referenceId
+     * @return string
+     */
+    public function referenceId($referenceId = null)
+    {
+        if ($referenceId === null) {
+            return $this->referenceId ;
+        }
+        $this->referenceId = $referenceId;
+    }
+
+    /**
+     * Set template variable.
      * @param string $key
      * @param mixed $value
      */
@@ -29,6 +46,7 @@ class SendEmailTemplate
     public function render($hideDetails = false)
     {
         $View = new View();
+        $View->autoLayout = false;
         $View->helpers = ['TextColour'];
         $View->loadHelpers();
 
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 67eb2b452..576159a4d 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -3247,6 +3247,7 @@ class Event extends AppModel
         $template->set('distributionLevels', $this->distributionLevels);
         $template->set('analysisLevels', $this->analysisLevels);
         $template->set('tlp', $this->getEmailSubjectMarkForEvent($event));
+        $template->referenceId("event-alert|{$event['Event']['id']}");
         return $template;
     }
 

From 9b9c69bfad66ee453a0483983ba2a77ab51a9470 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sat, 6 Feb 2021 14:24:09 +0100
Subject: [PATCH 313/437] new: [email] Allow to set email subject from template

---
 app/Lib/Tools/SendEmail.php         |  1 +
 app/Lib/Tools/SendEmailTemplate.php | 15 +++++++++++++++
 app/Model/User.php                  |  4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/Lib/Tools/SendEmail.php b/app/Lib/Tools/SendEmail.php
index 3379dffa7..7d8903302 100644
--- a/app/Lib/Tools/SendEmail.php
+++ b/app/Lib/Tools/SendEmail.php
@@ -442,6 +442,7 @@ class SendEmail
             $body->set('canEncryptSmime', $canEncryptSmime);
             $body->set('canEncryptGpg', $canEncryptGpg);
             $bodyContent = $body->render($hideDetails);
+            $subject = $body->subject() ?: $subject; // Get generated subject from template
         } else {
             if ($hideDetails && $bodyWithoutEncryption) {
                 $body = $bodyWithoutEncryption;
diff --git a/app/Lib/Tools/SendEmailTemplate.php b/app/Lib/Tools/SendEmailTemplate.php
index a378fbd22..f96f0a0ee 100644
--- a/app/Lib/Tools/SendEmailTemplate.php
+++ b/app/Lib/Tools/SendEmailTemplate.php
@@ -10,6 +10,9 @@ class SendEmailTemplate
     /** @var string|null */
     private $referenceId;
 
+    /** @var string|null */
+    private $subject;
+
     public function __construct($viewName)
     {
         $this->viewName = $viewName;
@@ -28,6 +31,15 @@ class SendEmailTemplate
         $this->referenceId = $referenceId;
     }
 
+    /**
+     * Get subject from template. Must be called after render method.
+     * @return string
+     */
+    public function subject()
+    {
+        return $this->subject;
+    }
+
     /**
      * Set template variable.
      * @param string $key
@@ -64,6 +76,9 @@ class SendEmailTemplate
         $View->hasRendered = false;
         $text = $View->render($this->viewName);
 
+        // Template can change default subject.
+        $this->subject = $View->get('subject');
+
         return new CakeEmailBody($text, $html);
     }
 }
diff --git a/app/Model/User.php b/app/Model/User.php
index 5482da065..4b58bf561 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -786,8 +786,8 @@ class User extends AppModel
      * the remaining two parameters are the e-mail subject and a secondary user object which will be used as the replyto address if set. If it is set and an encryption key for the replyTo user exists, then his/her public key will also be attached
      *
      * @param array $user
-     * @param CakeEmailBody|string $body
-     * @param CakeEmailBody|string|false $bodyNoEnc
+     * @param SendEmailTemplate|string $body
+     * @param string|false $bodyNoEnc
      * @param string $subject
      * @param array|false $replyToUser
      * @return bool

From 0d493efb1bde2eb6de75a8fe9fcded00fc518d6a Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 7 Feb 2021 19:14:47 +0100
Subject: [PATCH 314/437] chg: [email] Move event alert email subject generting

---
 app/Lib/Tools/SendEmailTemplate.php | 10 +++++--
 app/Model/Event.php                 | 46 ++++++++++++++++-------------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/app/Lib/Tools/SendEmailTemplate.php b/app/Lib/Tools/SendEmailTemplate.php
index f96f0a0ee..6f2a33356 100644
--- a/app/Lib/Tools/SendEmailTemplate.php
+++ b/app/Lib/Tools/SendEmailTemplate.php
@@ -26,18 +26,22 @@ class SendEmailTemplate
     public function referenceId($referenceId = null)
     {
         if ($referenceId === null) {
-            return $this->referenceId ;
+            return $this->referenceId;
         }
         $this->referenceId = $referenceId;
     }
 
     /**
      * Get subject from template. Must be called after render method.
+     * @param string|null $subject
      * @return string
      */
-    public function subject()
+    public function subject($subject = null)
     {
-        return $this->subject;
+        if ($subject === null) {
+            return $this->subject;
+        }
+        $this->subject = $subject;
     }
 
     /**
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 576159a4d..a96149f92 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -3156,7 +3156,7 @@ class Event extends AppModel
     {
         $event = $this->find('first', [
            'conditions' => ['Event.id' => $id],
-           'contain' => ['EventTag' => ['Tag'], 'ThreatLevel'],
+           'recursive' => -1,
         ]);
         if (empty($event)) {
             throw new NotFoundException('Invalid Event.');
@@ -3185,23 +3185,6 @@ class Event extends AppModel
             $event['Event']['sharing_group_id'],
             $userConditions
         );
-        if (Configure::read('MISP.extended_alert_subject')) {
-            $subject = preg_replace("/\r|\n/", "", $event['Event']['info']);
-            if (strlen($subject) > 58) {
-                $subject = substr($subject, 0, 55) . '... - ';
-            } else {
-                $subject .= " - ";
-            }
-        } else {
-            $subject = '';
-        }
-        $subjMarkingString = $this->getEmailSubjectMarkForEvent($event);
-        if (Configure::read('MISP.threatlevel_in_email_subject') === false) {
-            $threatLevel = '';
-        } else {
-            $threatLevel = $event['ThreatLevel']['name'] . " - ";
-        }
-        $subject = "[" . Configure::read('MISP.org') . " MISP] Event $id - $subject$threatLevel" . strtoupper($subjMarkingString);
 
         $userCount = count($usersWithAccess);
         $this->UserSetting = ClassRegistry::init('UserSetting');
@@ -3217,7 +3200,7 @@ class Event extends AppModel
 
             if ($this->UserSetting->checkPublishFilter($user, $eventForUser)) {
                 $body = $this->prepareAlertEmail($eventForUser, $user, $oldpublish);
-                $this->User->sendEmail(['User' => $user], $body, false, $subject);
+                $this->User->sendEmail(['User' => $user], $body, false, null);
             }
             if ($jobId) {
                 $this->Job->saveProgress($jobId, null, $k / $userCount * 100);
@@ -3237,8 +3220,28 @@ class Event extends AppModel
      * @return SendEmailTemplate
      * @throws CakeException
      */
-    private function prepareAlertEmail(array $event, array $user, $oldpublish = null)
+    public function prepareAlertEmail(array $event, array $user, $oldpublish = null)
     {
+        if (Configure::read('MISP.extended_alert_subject')) {
+            $subject = preg_replace("/\r|\n/", "", $event['Event']['info']);
+            if (strlen($subject) > 58) {
+                $subject = substr($subject, 0, 55) . '... - ';
+            } else {
+                $subject .= " - ";
+            }
+        } else {
+            $subject = '';
+        }
+
+        if (Configure::read('MISP.threatlevel_in_email_subject') === false) {
+            $threatLevel = '';
+        } else {
+            $threatLevel = $event['ThreatLevel']['name'] . " - ";
+        }
+
+        $subjMarkingString = $this->getEmailSubjectMarkForEvent($event);
+        $subject = "[" . Configure::read('MISP.org') . " MISP] Event {$event['Event']['id']} - $subject$threatLevel" . strtoupper($subjMarkingString);
+
         $template = new SendEmailTemplate('alert');
         $template->set('event', $event);
         $template->set('user', $user);
@@ -3246,7 +3249,8 @@ class Event extends AppModel
         $template->set('baseurl', $this->__getAnnounceBaseurl());
         $template->set('distributionLevels', $this->distributionLevels);
         $template->set('analysisLevels', $this->analysisLevels);
-        $template->set('tlp', $this->getEmailSubjectMarkForEvent($event));
+        $template->set('tlp', $subjMarkingString);
+        $template->subject($subject);
         $template->referenceId("event-alert|{$event['Event']['id']}");
         return $template;
     }

From d523025b6d632b7e6f37da2af035ee02148b74b0 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 7 Feb 2021 19:40:33 +0100
Subject: [PATCH 315/437] new: [email] Command for testing generated alert
 email

---
 app/Console/Command/EventShell.php | 37 ++++++++++++++++++++++++++++++
 app/Lib/Tools/SendEmail.php        | 32 +++++++++++++++++++++-----
 app/Model/User.php                 |  6 ++---
 3 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/app/Console/Command/EventShell.php b/app/Console/Command/EventShell.php
index bf8824db6..7607b6196 100644
--- a/app/Console/Command/EventShell.php
+++ b/app/Console/Command/EventShell.php
@@ -29,6 +29,13 @@ class EventShell extends AppShell
                 ],
             )
         ));
+        $parser->addSubcommand('testEventNotificationEmail', [
+            'help' => __('Generate event notification email in EML format.'),
+            'arguments' => [
+                'event_id' => ['help' => __('Event ID'), 'required' => true],
+                'user_id' => ['help' => __('User ID'), 'required' => true],
+            ],
+        ]);
         return $parser;
     }
 
@@ -469,6 +476,36 @@ class EventShell extends AppShell
         $this->Job->save($job);
     }
 
+    public function testEventNotificationEmail()
+    {
+        list($eventId, $userId) = $this->args;
+
+        $user = $this->User->getUserById($userId);
+        if (empty($user)) {
+            $this->error("User with ID $userId not found.");
+        }
+        $eventForUser = $this->Event->fetchEvent($this->User->rearrangeToAuthForm($user), [
+            'eventid' => $eventId,
+            'includeAllTags' => true,
+            'includeEventCorrelations' => true,
+            'noEventReports' => true,
+            'noSightings' => true,
+        ]);
+        if (empty($eventForUser)) {
+            $this->error("Event with ID $eventId not exists or given user don't have permission to access it.");
+        }
+
+        $emailTemplate = $this->Event->prepareAlertEmail($eventForUser[0], $this->User->rearrangeToAuthForm($user));
+
+        App::uses('SendEmail', 'Tools');
+        App::uses('GpgTool', 'Tools');
+        $sendEmail = new SendEmail(GpgTool::initializeGpg());
+        $sendEmail->setTransport('Debug');
+        $result = $sendEmail->sendToUser($user, null, $emailTemplate);
+
+        echo $result['contents']['headers'] . "\n\n" . $result['contents']['message'] . "\n";
+    }
+
     /**
      * @param int $userId
      * @return array
diff --git a/app/Lib/Tools/SendEmail.php b/app/Lib/Tools/SendEmail.php
index 7d8903302..451cc0f18 100644
--- a/app/Lib/Tools/SendEmail.php
+++ b/app/Lib/Tools/SendEmail.php
@@ -304,11 +304,12 @@ class MessagePart
 
 class SendEmail
 {
-    /**
-     * @var CryptGpgExtended
-     */
+    /** @var CryptGpgExtended */
     private $gpg;
 
+    /** @var string|null */
+    private $transport;
+
     /**
      * @param CryptGpgExtended|null $gpg
      */
@@ -323,6 +324,14 @@ class SendEmail
         }
     }
 
+    /**
+     * @param string $transport
+     */
+    public function setTransport($transport)
+    {
+        $this->transport = $transport;
+    }
+
     /**
      * @param array $params
      * @return array|bool
@@ -363,6 +372,10 @@ class SendEmail
         $email->body($body);
         $email->attachments($attachments);
 
+        if ($this->transport) {
+            $email->transport($this->transport);
+        }
+
         $mock = false;
         if (!empty(Configure::read('MISP.disable_emailing')) || !empty($params['mock'])) {
             $email->transport('Debug');
@@ -408,7 +421,7 @@ class SendEmail
      * @param SendEmailTemplate|string $body
      * @param string|false $bodyWithoutEncryption
      * @param array $replyToUser
-     * @return bool True if e-mail is encrypted, false if not.
+     * @return array
      * @throws Crypt_GPG_BadPassphraseException
      * @throws Crypt_GPG_Exception
      * @throws SendEmailException
@@ -452,6 +465,10 @@ class SendEmail
 
         $email = $this->create($user, $subject, $bodyContent, [], $replyToUser);
 
+        if ($this->transport) {
+            $email->transport($this->transport);
+        }
+
         // Generate `In-Reply-To` and `References` to group emails
         if ($body instanceof SendEmailTemplate && $body->referenceId()) {
             $reference = sha1($body->referenceId() . '|' .  Configure::read('MISP.uuid'));
@@ -529,8 +546,11 @@ class SendEmail
         }
 
         try {
-            $email->send();
-            return $encrypted;
+            return [
+                'contents' => $email->send(),
+                'encrypted' => $encrypted,
+                'subject' => $subject,
+            ];
         } catch (Exception $e) {
             throw new SendEmailException('The message could not be sent.', 0, $e);
         }
diff --git a/app/Model/User.php b/app/Model/User.php
index 4b58bf561..60b44d7ed 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -807,7 +807,7 @@ class User extends AppModel
         $sendEmail = new SendEmail($gpg);
 
         try {
-            $encrypted = $sendEmail->sendToUser($user, $subject, $body, $bodyNoEnc,$replyToUser ?: []);
+            $result = $sendEmail->sendToUser($user, $subject, $body, $bodyNoEnc,$replyToUser ?: []);
 
         } catch (SendEmailException $e) {
             $this->logException("Exception during sending e-mail", $e);
@@ -824,9 +824,9 @@ class User extends AppModel
             return false;
         }
 
-        $logTitle = $encrypted ? 'Encrypted email' : 'Email';
+        $logTitle = $result['encrypted'] ? 'Encrypted email' : 'Email';
         // Intentional two spaces to pass test :)
-        $logTitle .= $replyToLog  . '  to ' . $user['User']['email'] . ' sent, titled "' . $subject . '".';
+        $logTitle .= $replyToLog  . '  to ' . $user['User']['email'] . ' sent, titled "' . $result['subject'] . '".';
 
         $this->Log->create();
         $this->Log->save(array(

From 9f81f0fb65278e971bfb000da0f1d638357177f4 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 8 Feb 2021 01:01:12 +0100
Subject: [PATCH 316/437] fix: [email] Correctly set domain for email message
 ID

---
 app/Lib/Tools/SendEmail.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/Lib/Tools/SendEmail.php b/app/Lib/Tools/SendEmail.php
index 451cc0f18..de88f45f2 100644
--- a/app/Lib/Tools/SendEmail.php
+++ b/app/Lib/Tools/SendEmail.php
@@ -469,7 +469,7 @@ class SendEmail
             $email->transport($this->transport);
         }
 
-        // Generate `In-Reply-To` and `References` to group emails
+        // Generate `In-Reply-To` and `References` headers to group emails
         if ($body instanceof SendEmailTemplate && $body->referenceId()) {
             $reference = sha1($body->referenceId() . '|' .  Configure::read('MISP.uuid'));
             $reference = "<$reference@{$email->domain()}>";
@@ -603,6 +603,14 @@ class SendEmail
     {
         $email = new CakeEmailExtended();
 
+        $fromEmail = Configure::read('MISP.email');
+
+        // Set correct domain when sending email from CLI
+        $fromEmailParts = explode('@', $fromEmail, 2);
+        if (isset($fromEmailParts[1])) {
+            $email->domain($fromEmailParts[1]);
+        }
+
         // We must generate message ID by own, because CakeEmail returns different message ID for every call of
         // getHeaders() method.
         $email->messageId($this->generateMessageId($email));
@@ -625,8 +633,8 @@ class SendEmail
             $email->replyTo(Configure::read('MISP.email_reply_to'));
         }
 
-        $email->from(Configure::read('MISP.email'), Configure::read('MISP.email_from_name'));
-        $email->returnPath(Configure::read('MISP.email')); // TODO?
+        $email->from($fromEmail, Configure::read('MISP.email_from_name'));
+        $email->returnPath($fromEmail); // TODO?
         $email->to($user['User']['email']);
         $email->subject($subject);
         $email->emailFormat($body->format());

From 29040c4f1c7a0b8d1941fa3ef6281b27b09da5fc Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 8 Feb 2021 11:09:35 +0100
Subject: [PATCH 317/437] new: [email] New setting
 `MISP.event_alert_metadata_only`

---
 app/Console/Command/EventShell.php |  1 +
 app/Model/Event.php                |  1 +
 app/Model/Server.php               | 10 +++++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Console/Command/EventShell.php b/app/Console/Command/EventShell.php
index 7607b6196..4cab2bae5 100644
--- a/app/Console/Command/EventShell.php
+++ b/app/Console/Command/EventShell.php
@@ -490,6 +490,7 @@ class EventShell extends AppShell
             'includeEventCorrelations' => true,
             'noEventReports' => true,
             'noSightings' => true,
+            'metadata' => Configure::read('MISP.event_alert_metadata_only') ?: false,
         ]);
         if (empty($eventForUser)) {
             $this->error("Event with ID $eventId not exists or given user don't have permission to access it.");
diff --git a/app/Model/Event.php b/app/Model/Event.php
index a96149f92..adb14f3ec 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -3196,6 +3196,7 @@ class Event extends AppModel
                 'includeEventCorrelations' => true,
                 'noEventReports' => true,
                 'noSightings' => true,
+                'metadata' => Configure::read('MISP.event_alert_metadata_only') ?: false,
             ])[0];
 
             if ($this->UserSetting->checkPublishFilter($user, $eventForUser)) {
diff --git a/app/Model/Server.php b/app/Model/Server.php
index 8109c86bf..021e0d439 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -4864,12 +4864,20 @@ class Server extends AppModel
                 ),
                 'extended_alert_subject' => array(
                     'level' => 1,
-                    'description' => __('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.'),
+                    'description' => __('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.'),
                     'value' => false,
                     'errorMessage' => '',
                     'test' => 'testBool',
                     'type' => 'boolean'
                 ),
+                'event_alert_metadata_only' => [
+                    'level' => self::SETTING_OPTIONAL,
+                    'description' => __('Send just event metadata (attributes and objects will be omitted) for event alert.'),
+                    'value' => false,
+                    'errorMessage' => '',
+                    'test' => 'testBool',
+                    'type' => 'boolean'
+                ],
                 'default_event_distribution' => array(
                     'level' => 0,
                     'description' => __('The default distribution setting for events (0-3).'),

From f140de17f24f84a850fbebe53c08bd40dd3eba42 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 8 Feb 2021 15:59:47 +0100
Subject: [PATCH 318/437] fix: [email] Correct Content-Type header for
 alternative content

---
 app/Lib/Tools/SendEmail.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Lib/Tools/SendEmail.php b/app/Lib/Tools/SendEmail.php
index de88f45f2..2173b529e 100644
--- a/app/Lib/Tools/SendEmail.php
+++ b/app/Lib/Tools/SendEmail.php
@@ -661,14 +661,15 @@ class SendEmail
 
         $messagePart = new MessagePart();
         $messagePart->addHeader('Content-Type', array(
-            'multipart/mixed',
+            $email->emailFormat() === 'both' ? 'multipart/alternative' : 'multipart/mixed',
             'boundary="' . $email->boundary() . '"',
             'protected-headers="v1"',
         ));
 
-        // Protect User-Facing Headers according to https://tools.ietf.org/id/draft-autocrypt-lamps-protected-headers-01.html
+        // Protect User-Facing Headers and Structural Headers according to
+        // https://tools.ietf.org/id/draft-autocrypt-lamps-protected-headers-02.html
         $originalHeaders = $email->getHeaders(array('subject', 'from', 'to'));
-        $protectedHeaders = array('From', 'To', 'Date', 'Message-ID', 'Subject', 'Reply-To');
+        $protectedHeaders = ['From', 'To', 'Date', 'Message-ID', 'Subject', 'Reply-To', 'In-Reply-To', 'References'];
         foreach ($protectedHeaders as $header) {
             if (isset($originalHeaders[$header])) {
                 $messagePart->addHeader($header, $originalHeaders[$header]);
@@ -757,7 +758,7 @@ class SendEmail
 
         $messagePart = new MessagePart();
         $messagePart->addHeader('Content-Type', array(
-            'multipart/mixed',
+            $email->emailFormat() === 'both' ? 'multipart/alternative' : 'multipart/mixed',
             'boundary="' . $email->boundary() . '"',
         ));
         $messagePart->setPayload($renderedEmail);

From 634810d856d4ddf132c3c319b9a1505591630c3f Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 8 Feb 2021 17:13:25 +0100
Subject: [PATCH 319/437] fix: [email] Correctly check if user has PGP or
 S/MIME key

---
 app/Controller/EventsController.php | 50 +++++++++++++++++------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 829853d94..36d68a146 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -838,27 +838,7 @@ class EventsController extends AppController
             return $this->RestResponse->viewData($export->eventIndex($events), 'csv');
         }
 
-        $user = $this->Auth->user();
-        $user = $this->Event->User->fillKeysToUser($user);
-
-        if (empty($user['gpgkey']) && Configure::read('GnuPG.onlyencrypted')) {
-            // No GnuPG
-            if (Configure::read('SMIME.enabled') && empty($user['certif_public'])) {
-                // No GnuPG and No SMIME
-                $this->Flash->info(__('No X.509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile.'));
-            } elseif (!Configure::read('SMIME.enabled')) {
-                $this->Flash->info(__('No GnuPG key set in your profile. To receive emails, submit your public key in your profile.'));
-            }
-        } elseif ($this->Auth->user('autoalert') && empty($user['gpgkey']) && Configure::read('GnuPG.bodyonlyencrypted')) {
-            // No GnuPG & autoalert
-            if ($this->Auth->user('autoalert') && Configure::read('SMIME.enabled') && empty($user['certif_public'])) {
-                // No GnuPG and No SMIME & autoalert
-                $this->Flash->info(__('No X.509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile.'));
-            } elseif (!Configure::read('SMIME.enabled')) {
-                $this->Flash->info(__('No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile.'));
-            }
-        }
-
+        $this->__noKeyNotification();
         $this->set('events', $events);
         $this->set('eventDescriptions', $this->Event->fieldDescriptions);
         $this->set('analysisLevels', $this->Event->analysisLevels);
@@ -876,6 +856,34 @@ class EventsController extends AppController
         }
     }
 
+    private function __noKeyNotification()
+    {
+        $onlyEncrypted = Configure::read('GnuPG.onlyencrypted');
+        $bodyOnlyEncrypted = Configure::read('GnuPG.bodyonlyencrypted');
+        if (!$onlyEncrypted && !$bodyOnlyEncrypted) {
+            return;
+        }
+
+        $user = $this->Event->User->fillKeysToUser($this->Auth->user());
+        if (!empty($user['gpgkey'])) {
+            return; // use has PGP key
+        }
+
+        if ($onlyEncrypted) {
+            if (Configure::read('SMIME.enabled') && empty($user['certif_public'])) {
+                $this->Flash->info(__('No X.509 certificate or PGP key set in your profile. To receive emails, submit your public certificate or PGP key in your profile.'));
+            } elseif (!Configure::read('SMIME.enabled')) {
+                $this->Flash->info(__('No PGP key set in your profile. To receive emails, submit your public key in your profile.'));
+            }
+        } elseif ($bodyOnlyEncrypted && $user['autoalert']) {
+            if (Configure::read('SMIME.enabled') && empty($user['certif_public'])) {
+                $this->Flash->info(__('No X.509 certificate or PGP key set in your profile. To receive attributes in emails, submit your public certificate or PGP key in your profile.'));
+            } elseif (!Configure::read('SMIME.enabled')) {
+                $this->Flash->info(__('No PGP key set in your profile. To receive attributes in emails, submit your public key in your profile.'));
+            }
+        }
+    }
+
     public function filterEventIndex()
     {
         $passedArgsArray = array();

From 8b2d1bdffda8381e5551e29433fdaafa43fda160 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Fri, 5 Mar 2021 09:14:00 +0100
Subject: [PATCH 320/437] chg: [internal] Fetch attribute UUIDs for sightings
 in different query

---
 app/Model/Sighting.php | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/Model/Sighting.php b/app/Model/Sighting.php
index 534cbda92..e8a0319c6 100644
--- a/app/Model/Sighting.php
+++ b/app/Model/Sighting.php
@@ -536,7 +536,6 @@ class Sighting extends AppModel
      */
     public function attachToEvent(array $event, array $user, $attribute = null, $extraConditions = false, $forSync = false)
     {
-        $contain = [];
         $conditions = array('Sighting.event_id' => $event['Event']['id']);
         if (isset($attribute['Attribute']['id'])) {
             $conditions['Sighting.attribute_id'] = $attribute['Attribute']['id'];
@@ -547,8 +546,6 @@ class Sighting extends AppModel
                 'conditions' => ['Attribute.id' => $attribute],
                 'fields' => ['Attribute.uuid']
             ]);
-        } else {
-            $contain['Attribute'] = ['fields' => 'Attribute.uuid'];
         }
 
         $ownEvent = $user['Role']['perm_site_admin'] || $event['Event']['org_id'] == $user['org_id'];
@@ -570,18 +567,29 @@ class Sighting extends AppModel
         $sightings = $this->find('all', array(
             'conditions' => $conditions,
             'recursive' => -1,
-            'contain' => $contain,
         ));
         if (empty($sightings)) {
-            return array();
+            return [];
         }
-        foreach ($sightings as $k => $sighting) {
-            if (isset($sighting['Attribute']['uuid'])) {
-                $sighting['Sighting']['attribute_uuid'] = $sighting['Attribute']['uuid'];
-            } else {
-                $sighting['Sighting']['attribute_uuid'] = $attribute['Attribute']['uuid'];
+        if ($attribute === null) {
+            // Do not add attribute uuid in contain query, joining is slow and takes more memory
+            $attributeUuids = $this->Attribute->find('all', [
+                'conditions' => ['Attribute.event_id' => $event['Event']['id']],
+                'fields' => ['Attribute.id', 'Attribute.uuid'],
+                'recursive' => -1,
+            ]);
+            // `array_column` is much faster than find('list')
+            $attributeUuids = array_column(array_column($attributeUuids, 'Attribute'), 'uuid', 'id');
+            foreach ($sightings as $k => $sighting) {
+                $sighting['Sighting']['attribute_uuid'] = $attributeUuids[$sighting['Sighting']['attribute_id']];
+                $sightings[$k] = $sighting;
+            }
+            unset($attributeUuids);
+        } else {
+            foreach ($sightings as $k => $sighting) {
+                $sighting['Sighting']['attribute_uuid'] = $attribute['Attribute']['uuid'];
+                $sightings[$k] = $sighting;
             }
-            $sightings[$k] = $sighting;
         }
         return $this->attachOrgToSightings($sightings, $user, $forSync);
     }

From 3f12e95571e4b35f12e20dd60d88585885a2fd1c Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sat, 6 Mar 2021 10:39:06 +0100
Subject: [PATCH 321/437] new: [test] Alert email generating

---
 app/Console/Command/EventShell.php | 11 ++++-------
 tests/curl_tests_GH.sh             |  5 ++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Console/Command/EventShell.php b/app/Console/Command/EventShell.php
index 4cab2bae5..b69c36122 100644
--- a/app/Console/Command/EventShell.php
+++ b/app/Console/Command/EventShell.php
@@ -480,11 +480,8 @@ class EventShell extends AppShell
     {
         list($eventId, $userId) = $this->args;
 
-        $user = $this->User->getUserById($userId);
-        if (empty($user)) {
-            $this->error("User with ID $userId not found.");
-        }
-        $eventForUser = $this->Event->fetchEvent($this->User->rearrangeToAuthForm($user), [
+        $user = $this->getUser($userId);
+        $eventForUser = $this->Event->fetchEvent($user, [
             'eventid' => $eventId,
             'includeAllTags' => true,
             'includeEventCorrelations' => true,
@@ -496,13 +493,13 @@ class EventShell extends AppShell
             $this->error("Event with ID $eventId not exists or given user don't have permission to access it.");
         }
 
-        $emailTemplate = $this->Event->prepareAlertEmail($eventForUser[0], $this->User->rearrangeToAuthForm($user));
+        $emailTemplate = $this->Event->prepareAlertEmail($eventForUser[0], $user);
 
         App::uses('SendEmail', 'Tools');
         App::uses('GpgTool', 'Tools');
         $sendEmail = new SendEmail(GpgTool::initializeGpg());
         $sendEmail->setTransport('Debug');
-        $result = $sendEmail->sendToUser($user, null, $emailTemplate);
+        $result = $sendEmail->sendToUser(['User' => $user], null, $emailTemplate);
 
         echo $result['contents']['headers'] . "\n\n" . $result['contents']['message'] . "\n";
     }
diff --git a/tests/curl_tests_GH.sh b/tests/curl_tests_GH.sh
index fdf87ba22..2bdcf5d5d 100755
--- a/tests/curl_tests_GH.sh
+++ b/tests/curl_tests_GH.sh
@@ -6,9 +6,12 @@ set -x
 AUTH="$1"
 HOST="$2"
 
-curl -i -H "Accept: application/json" -H "content-type: application/json" -H "Authorization: $AUTH" --data "@event.json" -X POST http://${HOST}/events
+curl -i -H "Accept: application/json" -H "content-type: application/json" -H "Authorization: $AUTH" --data "@event.json" -X POST http://${HOST}/events > /dev/null
 curl -H "Authorization: $AUTH"  -X GET http://${HOST}/events/csv/download/1/ignore:1 | sed -e 's/^M//g' | cut -d, -f2 --complement | sort > 1.csv
 cat 1.csv
 cut -d, -f2 --complement event.csv | sort > compare.csv
 diff compare.csv 1.csv
+# Test alert email generating
+sudo -E su $USER -c '../app/Console/cake Event testEventNotificationEmail 1 1' > /dev/null
+# Delete created event
 curl -i -H "Accept: application/json" -H "content-type: application/json" -H "Authorization: $AUTH" -X POST http://${HOST}/events/delete/1

From 5dcaa53e88eac389e5a4df4d916a7cb417d5f967 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Sun, 7 Mar 2021 00:14:42 +0000
Subject: [PATCH 322/437] chg: [attributes] fix copypasta error leading to
 internal server error on addtag with tag name

---
 app/Controller/AttributesController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index eb46297ca..622041d1e 100644
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -2678,7 +2678,7 @@ class AttributesController extends AppController
                             }
                         }
                     } else {
-                        $tag = $this->Event->EventTag->Tag->find('first', array('recursive' => -1, 'conditions' => $conditions));
+                        $tag = $this->Attribute->AttributeTag->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'));
                         }

From e19850218a31ad86a51544f757af173fa222baf4 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 7 Mar 2021 11:12:03 +0100
Subject: [PATCH 323/437] chg: [optimisation] Faster Model::_findList method

---
 app/Model/AppModel.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index 4e4c0acae..09b4d622d 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -3036,6 +3036,34 @@ class AppModel extends Model
         }
     }
 
+    /**
+     * Optimised version of CakePHP _findList method when just one or two fields are set from same model
+     * @param string $state
+     * @param array $query
+     * @param array $results
+     * @return array
+     */
+    protected function _findList($state, $query, $results = [])
+    {
+        if ($state === 'before') {
+            return parent::_findList($state, $query, $results);
+        }
+
+        if (empty($results)) {
+            return [];
+        }
+
+        if ($query['list']['groupPath'] === null) {
+            $keyPath = explode('.', $query['list']['keyPath']);
+            $valuePath = explode('.', $query['list']['valuePath']);
+            if ($keyPath[1] === $valuePath[1]) { // same model
+                return array_column(array_column($results, $keyPath[1]), $valuePath[2], $keyPath[2]);
+            }
+        }
+
+        return parent::_findList($state, $query, $results);
+    }
+
     /**
      * Find method that allows to fetch just one column from database.
      * @param $state

From 8913fe15cc5ec0cee171377e8d9a62d59015fd22 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Sun, 7 Mar 2021 00:14:42 +0000
Subject: [PATCH 324/437] chg: [attributes] fix copypasta error leading to
 internal server error on addtag with tag name

---
 app/Controller/AttributesController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index eb46297ca..622041d1e 100644
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -2678,7 +2678,7 @@ class AttributesController extends AppController
                             }
                         }
                     } else {
-                        $tag = $this->Event->EventTag->Tag->find('first', array('recursive' => -1, 'conditions' => $conditions));
+                        $tag = $this->Attribute->AttributeTag->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'));
                         }

From c43cf356a3a6cafcada11908008056b3dafdebbf Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Sun, 7 Mar 2021 00:14:42 +0000
Subject: [PATCH 325/437] chg: [attributes] fix copypasta error leading to
 internal server error on addtag with tag name

---
 app/Controller/AttributesController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index eb46297ca..622041d1e 100644
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -2678,7 +2678,7 @@ class AttributesController extends AppController
                             }
                         }
                     } else {
-                        $tag = $this->Event->EventTag->Tag->find('first', array('recursive' => -1, 'conditions' => $conditions));
+                        $tag = $this->Attribute->AttributeTag->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'));
                         }

From 9c19392f02838afd66bf41cc6402ee3b04bd5f84 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Sun, 7 Mar 2021 13:04:39 +0000
Subject: [PATCH 326/437] chg: [attributes] fix attribute addtag by name
 conditions for find not set

---
 app/Controller/AttributesController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index 622041d1e..fe555f05d 100644
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -2678,6 +2678,11 @@ class AttributesController extends AppController
                             }
                         }
                     } else {
+                        $conditions = array('LOWER(Tag.name)' => 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'));
+                        }
                         $tag = $this->Attribute->AttributeTag->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'));

From 0c102a112cea7795a901dd0d4eed1c26a3474b85 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Sun, 7 Mar 2021 13:04:39 +0000
Subject: [PATCH 327/437] chg: [attributes] fix attribute addtag by name
 conditions for find not set

---
 app/Controller/AttributesController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index 622041d1e..fe555f05d 100644
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -2678,6 +2678,11 @@ class AttributesController extends AppController
                             }
                         }
                     } else {
+                        $conditions = array('LOWER(Tag.name)' => 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'));
+                        }
                         $tag = $this->Attribute->AttributeTag->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'));

From d7e535a302fee6348b71683b15659b548220a4ea Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Sun, 7 Mar 2021 16:09:49 +0000
Subject: [PATCH 328/437] chg: [restClient:querybuilder] add events and
 attributes addTag and removeTag actions.

---
 .../Component/RestResponseComponent.php       | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/app/Controller/Component/RestResponseComponent.php b/app/Controller/Component/RestResponseComponent.php
index b971b28d7..6508b1c84 100644
--- a/app/Controller/Component/RestResponseComponent.php
+++ b/app/Controller/Component/RestResponseComponent.php
@@ -48,7 +48,15 @@ class RestResponseComponent extends Component
                 'mandatory' => array('returnFormat'),
                 'optional' => array('page', 'limit', 'value' , 'type', 'category', 'org', 'tags', 'date', 'last', 'eventid', 'withAttachments', 'uuid', 'publish_timestamp', 'timestamp', 'attribute_timestamp', 'enforceWarninglist', 'to_ids', 'deleted', 'includeEventUuid', 'includeEventTags', 'event_timestamp', 'threat_level_id', 'eventinfo', 'includeProposals', 'includeDecayScore', 'includeFullModel', 'decayingModel', 'excludeDecayed', 'score', 'first_seen', 'last_seen'),
                 'params' => array()
-            )
+            ),
+            'addTag' => array(
+                'description' => "Add a tag or a tag collection to an attribute.",
+                'mandatory' => array('attribute', 'tag')
+            ),
+            'removeTag' => array(
+                'description' => "Remove a tag from an attribute.",
+                'mandatory' => array('attribute', 'tag')
+            ),
         ),
         'Community' => array(
             'requestAccess' => array(
@@ -80,7 +88,15 @@ class RestResponseComponent extends Component
                 'mandatory' => array('returnFormat'),
                 'optional' => array('page', 'limit', 'value', 'type', 'category', 'org', 'tag', 'tags', 'searchall', 'date', 'last', 'eventid', 'withAttachments', 'metadata', 'uuid', 'published', 'publish_timestamp', 'timestamp', 'enforceWarninglist', 'sgReferenceOnly', 'eventinfo', 'excludeLocalTags', 'threat_level_id'),
                 'params' => array()
-            )
+            ),
+            'addTag' => array(
+                'description' => "Add a tag or a tag collection to an event.",
+                'mandatory' => array('event', 'tag')
+            ),
+            'removeTag' => array(
+                'description' => "Remove a tag from an event.",
+                'mandatory' => array('event', 'tag')
+            ),
         ),
         'EventGraph' => array(
             'add' => array(
@@ -944,6 +960,13 @@ class RestResponseComponent extends Component
                 'values' => array(1 => 'True', 0 => 'False' ),
                 'help' => __('Should the warning list be enforced. Adds `blocked` field for matching attributes')
             ),
+            'event' => array(
+                'input' => 'number',
+                'type' => 'integer',
+                'operators' => array('equal', 'not_equal'),
+		'validation' => array('min' => 0, 'step' => 1),
+		'help' => __('Event id')
+            ),
             'event_id' => array(
                 'input' => 'number',
                 'type' => 'integer',
@@ -1671,12 +1694,6 @@ class RestResponseComponent extends Component
                 'operators' => array('equal'),
                 'help' => __('Not supported (warninglist->checkvalues) expect an array')
             ),
-            'event' => array(
-                'input' => 'text',
-                'type' => 'string',
-                'operators' => array('equal'),
-                'help' => __('Not supported (removeTag)')
-            ),
             'push_rules' => array(
                 'input' => 'text',
                 'type' => 'string',
@@ -1801,6 +1818,9 @@ class RestResponseComponent extends Component
                                     case "last_seen":
                                         $this->__overwriteSeen($scope, $action, $fieldsConstraint[$field]);
                                         break;
+                                    case "attribute":
+                                        $this->__overwriteAttribute($scope, $action, $fieldsConstraint[$field]);
+                                        break;
                                     default:
                                         break;
                                 }
@@ -1882,6 +1902,11 @@ class RestResponseComponent extends Component
             $field['help'] = __('Also supports array of tags');
         }
     }
+    private function __overwriteAttribute($scope, $action, &$field){
+        if ($action == 'addTag' || $action == 'removeTag') {
+            $field['help'] = __('Attribute id');
+        }
+    }
     private function __overwriteNationality($scope, $action, &$field) {
         $field['values'] = ClassRegistry::init("Organisation")->getCountries();
     }

From f4cb072d586b9a6d3ee2dea011dfe95ebf8703ba Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 8 Mar 2021 08:43:40 +0100
Subject: [PATCH 329/437] chg: [correlation] Do not update info and date
 column, since they are not used anymore

---
 app/Model/Event.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index 9901a429d..f4d34bf77 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -510,24 +510,16 @@ class Event extends AppModel
     public function afterSave($created, $options = array())
     {
         if (!Configure::read('MISP.completely_disable_correlation') && !$created) {
-            $db = $this->getDataSource();
-
-            $updateCorrelation = array();
-            if (isset($this->data['Event']['date'])) {
-                $updateCorrelation['Correlation.date'] = $db->value($this->data['Event']['date']);
-            }
-            if (isset($this->data['Event']['info'])) {
-                $updateCorrelation['Correlation.info'] = $db->value($this->data['Event']['info']);
-            }
+            $updateCorrelation = [];
             if (isset($this->data['Event']['distribution'])) {
-                $updateCorrelation['Correlation.distribution'] = $db->value($this->data['Event']['distribution']);
+                $updateCorrelation['Correlation.distribution'] = (int)$this->data['Event']['distribution'];
             }
             if (isset($this->data['Event']['sharing_group_id'])) {
-                $updateCorrelation['Correlation.sharing_group_id'] = $db->value($this->data['Event']['sharing_group_id']);
+                $updateCorrelation['Correlation.sharing_group_id'] = (int)$this->data['Event']['sharing_group_id'];
             }
             if (!empty($updateCorrelation)) {
                 $this->Correlation = ClassRegistry::init('Correlation');
-                $this->Correlation->updateAll($updateCorrelation, array('Correlation.event_id' => intval($this->data['Event']['id'])));
+                $this->Correlation->updateAll($updateCorrelation, ['Correlation.event_id' => (int)$this->data['Event']['id']]);
             }
         }
         if (empty($this->data['Event']['unpublishAction']) && empty($this->data['Event']['skip_zmq']) && Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_event_notifications_enable')) {

From b81f348581929f18c1fadf4e5ade24331038ea2d Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Sun, 7 Mar 2021 16:09:49 +0000
Subject: [PATCH 330/437] chg: [restClient:querybuilder] add events and
 attributes addTag and removeTag actions.

---
 .../Component/RestResponseComponent.php       | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/app/Controller/Component/RestResponseComponent.php b/app/Controller/Component/RestResponseComponent.php
index b971b28d7..6508b1c84 100644
--- a/app/Controller/Component/RestResponseComponent.php
+++ b/app/Controller/Component/RestResponseComponent.php
@@ -48,7 +48,15 @@ class RestResponseComponent extends Component
                 'mandatory' => array('returnFormat'),
                 'optional' => array('page', 'limit', 'value' , 'type', 'category', 'org', 'tags', 'date', 'last', 'eventid', 'withAttachments', 'uuid', 'publish_timestamp', 'timestamp', 'attribute_timestamp', 'enforceWarninglist', 'to_ids', 'deleted', 'includeEventUuid', 'includeEventTags', 'event_timestamp', 'threat_level_id', 'eventinfo', 'includeProposals', 'includeDecayScore', 'includeFullModel', 'decayingModel', 'excludeDecayed', 'score', 'first_seen', 'last_seen'),
                 'params' => array()
-            )
+            ),
+            'addTag' => array(
+                'description' => "Add a tag or a tag collection to an attribute.",
+                'mandatory' => array('attribute', 'tag')
+            ),
+            'removeTag' => array(
+                'description' => "Remove a tag from an attribute.",
+                'mandatory' => array('attribute', 'tag')
+            ),
         ),
         'Community' => array(
             'requestAccess' => array(
@@ -80,7 +88,15 @@ class RestResponseComponent extends Component
                 'mandatory' => array('returnFormat'),
                 'optional' => array('page', 'limit', 'value', 'type', 'category', 'org', 'tag', 'tags', 'searchall', 'date', 'last', 'eventid', 'withAttachments', 'metadata', 'uuid', 'published', 'publish_timestamp', 'timestamp', 'enforceWarninglist', 'sgReferenceOnly', 'eventinfo', 'excludeLocalTags', 'threat_level_id'),
                 'params' => array()
-            )
+            ),
+            'addTag' => array(
+                'description' => "Add a tag or a tag collection to an event.",
+                'mandatory' => array('event', 'tag')
+            ),
+            'removeTag' => array(
+                'description' => "Remove a tag from an event.",
+                'mandatory' => array('event', 'tag')
+            ),
         ),
         'EventGraph' => array(
             'add' => array(
@@ -944,6 +960,13 @@ class RestResponseComponent extends Component
                 'values' => array(1 => 'True', 0 => 'False' ),
                 'help' => __('Should the warning list be enforced. Adds `blocked` field for matching attributes')
             ),
+            'event' => array(
+                'input' => 'number',
+                'type' => 'integer',
+                'operators' => array('equal', 'not_equal'),
+		'validation' => array('min' => 0, 'step' => 1),
+		'help' => __('Event id')
+            ),
             'event_id' => array(
                 'input' => 'number',
                 'type' => 'integer',
@@ -1671,12 +1694,6 @@ class RestResponseComponent extends Component
                 'operators' => array('equal'),
                 'help' => __('Not supported (warninglist->checkvalues) expect an array')
             ),
-            'event' => array(
-                'input' => 'text',
-                'type' => 'string',
-                'operators' => array('equal'),
-                'help' => __('Not supported (removeTag)')
-            ),
             'push_rules' => array(
                 'input' => 'text',
                 'type' => 'string',
@@ -1801,6 +1818,9 @@ class RestResponseComponent extends Component
                                     case "last_seen":
                                         $this->__overwriteSeen($scope, $action, $fieldsConstraint[$field]);
                                         break;
+                                    case "attribute":
+                                        $this->__overwriteAttribute($scope, $action, $fieldsConstraint[$field]);
+                                        break;
                                     default:
                                         break;
                                 }
@@ -1882,6 +1902,11 @@ class RestResponseComponent extends Component
             $field['help'] = __('Also supports array of tags');
         }
     }
+    private function __overwriteAttribute($scope, $action, &$field){
+        if ($action == 'addTag' || $action == 'removeTag') {
+            $field['help'] = __('Attribute id');
+        }
+    }
     private function __overwriteNationality($scope, $action, &$field) {
         $field['values'] = ClassRegistry::init("Organisation")->getCountries();
     }

From 306782afac174d322fd26ba325f8b534f2b7325d Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 8 Mar 2021 10:22:55 +0100
Subject: [PATCH 331/437] chg: [internal] Faster event locks with Redis

---
 app/Controller/EventsController.php |   2 +-
 app/Model/EventLock.php             | 101 +++++++++++++++-------------
 2 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 3a64d2f49..a5ca151d0 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -5318,7 +5318,7 @@ class EventsController extends AppController
             throw new MethodNotAllowedException('This endpoint requires a POST request.');
         }
 
-        $event = $this->Event->fetchSimpleEvent($this->Auth->User(), $id);
+        $event = $this->Event->fetchSimpleEvent($this->Auth->user(), $id);
         if (empty($event)) {
             throw new MethodNotAllowedException(__('Invalid Event'));
         }
diff --git a/app/Model/EventLock.php b/app/Model/EventLock.php
index 790c2b801..769923763 100644
--- a/app/Model/EventLock.php
+++ b/app/Model/EventLock.php
@@ -5,7 +5,8 @@ App::uses('AppModel', 'Model');
 class EventLock extends AppModel
 {
     // In seconds
-    const DEFAULT_TTL = 900;
+    const DEFAULT_TTL = 900,
+        PREFIX = 'misp:event_lock';
 
     /**
      * @param array $user
@@ -14,7 +15,7 @@ class EventLock extends AppModel
      */
     public function insertLock(array $user, $eventId)
     {
-        return $this->insertLockToRedis("misp:event_lock:$eventId:user:{$user['id']}", [
+        return $this->insertLockToRedis($eventId, "user:{$user['id']}", [
             'type' => 'user',
             'timestamp' => time(),
             'User' => [
@@ -32,7 +33,7 @@ class EventLock extends AppModel
      */
     public function insertLockBackgroundJob($eventId, $jobId)
     {
-        return $this->insertLockToRedis("misp:event_lock:$eventId:job:$jobId", [
+        return $this->insertLockToRedis($eventId, "job:$jobId", [
             'type' => 'job',
             'timestamp' => time(),
             'job_id' => $jobId,
@@ -45,21 +46,38 @@ class EventLock extends AppModel
      */
     public function insertLockApi($eventId, array $user)
     {
-        $rand = mt_rand();
-        if ($this->insertLockToRedis("misp:event_lock:$eventId:api:{$user['id']}:$rand", [
+        $apiLockId = mt_rand();
+        if ($this->insertLockToRedis($eventId, "api:{$user['id']}:$apiLockId", [
             'type' => 'api',
             'user_id' => $user['id'],
             'timestamp' => time(),
         ])) {
-            return $rand;
+            return $apiLockId;
         }
         return null;
     }
 
+    /**
+     * @param int $eventId
+     * @param int $apiLockId
+     * @return bool
+     */
+    public function deleteApiLock($eventId, $apiLockId, array $user)
+    {
+        try {
+            $redis = $this->setupRedisWithException();
+        } catch (Exception $e) {
+            return false;
+        }
+
+        $deleted = $redis->hdel(self::PREFIX . $eventId, "api:{$user['id']}:$apiLockId");
+        return $deleted > 0;
+    }
+
     /**
      * @param int $eventId
      * @param int $jobId
-     * @return null
+     * @return bool
      */
     public function deleteBackgroundJobLock($eventId, $jobId)
     {
@@ -69,40 +87,7 @@ class EventLock extends AppModel
             return false;
         }
 
-        $deleted = $redis->del("misp:event_lock:$eventId:job:$jobId");
-        return $deleted > 0;
-    }
-
-    /**
-     * @param string $key
-     * @param array $data
-     * @return bool
-     */
-    private function insertLockToRedis($key, array $data)
-    {
-        try {
-            $redis = $this->setupRedisWithException();
-        } catch (Exception $e) {
-            return false;
-        }
-
-        return $redis->setex($key, self::DEFAULT_TTL, json_encode($data));
-    }
-
-    /**
-     * @param int $eventId
-     * @param int $lockId
-     * @return bool
-     */
-    public function deleteApiLock($eventId, $lockId, array $user)
-    {
-        try {
-            $redis = $this->setupRedisWithException();
-        } catch (Exception $e) {
-            return false;
-        }
-
-        $deleted = $redis->del("misp:event_lock:$eventId:api:{$user['id']}:$lockId");
+        $deleted = $redis->hDel(self::PREFIX . $eventId, "job:$jobId");
         return $deleted > 0;
     }
 
@@ -120,13 +105,39 @@ class EventLock extends AppModel
             return [];
         }
 
-        $keys = $redis->keys("misp:event_lock:$eventId:*");
+        $keys = $redis->hGetAll(self::PREFIX . $eventId);
         if (empty($keys)) {
             return [];
         }
 
-        return array_map(function ($value) {
-            return $this->jsonDecode($value);
-        }, $redis->mget($keys));
+        $output = [];
+        $now = time();
+        foreach ($keys as $value) {
+            $value = $this->jsonDecode($value);
+            if ($value['timestamp'] + self::DEFAULT_TTL > $now) {
+                $output[] = $value;
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * @param int $eventId
+     * @param string $lockId
+     * @param array $data
+     * @return bool
+     */
+    private function insertLockToRedis($eventId, $lockId, array $data)
+    {
+        try {
+            $redis = $this->setupRedisWithException();
+        } catch (Exception $e) {
+            return false;
+        }
+
+        $pipeline = $redis->pipeline();
+        $pipeline->hSet(self::PREFIX . $eventId, $lockId, json_encode($data));
+        $pipeline->expire(self::PREFIX . $eventId, self::DEFAULT_TTL); // prolong TTL
+        return $pipeline->exec()[0] !== false;
     }
 }

From 3b4f61c8849dce6c57eeba3aeda4c5bf3b36f96c Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Tue, 9 Mar 2021 10:48:06 +0100
Subject: [PATCH 332/437] chg: [eventGraph] Improved object coloring strategy

---
 app/Lib/Tools/ColourPaletteTool.php | 14 +++++++++++++-
 app/Lib/Tools/EventGraphTool.php    | 23 +++++++++++++++++++++++
 app/webroot/js/event-graph.js       | 16 ++++++++--------
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/app/Lib/Tools/ColourPaletteTool.php b/app/Lib/Tools/ColourPaletteTool.php
index a5bcceffa..75a3d14da 100644
--- a/app/Lib/Tools/ColourPaletteTool.php
+++ b/app/Lib/Tools/ColourPaletteTool.php
@@ -66,7 +66,11 @@ class ColourPaletteTool
     // pass the element's id from the list along to get a colour for a single item
     public function generatePaletteFromString($string, $items, $onlySpecific = false)
     {
-        $hue = $this->__stringToNumber($string);
+        if (Validation::uuid($string)) {
+            $hue = $this->__uuidToNumber($string);
+        } else {
+            $hue = $this->__stringToNumber($string);
+        }
         $saturation = 1;
         $steps = 80 / $items;
         $results = array();
@@ -91,4 +95,12 @@ class ColourPaletteTool
         }
         return $number % 100 / 100;
     }
+
+    private function __uuidToNumber($string)
+    {
+        $part = explode('-', $string)[4];
+        $number = hexdec($part);
+        $max = hexdec('ffffffffffff');
+        return round($number / $max, 2);
+    }
 }
diff --git a/app/Lib/Tools/EventGraphTool.php b/app/Lib/Tools/EventGraphTool.php
index 5006fff16..327ee63cc 100644
--- a/app/Lib/Tools/EventGraphTool.php
+++ b/app/Lib/Tools/EventGraphTool.php
@@ -28,6 +28,9 @@
                 'distributionLevels' => $this->__eventModel->Attribute->distributionLevels
             );
             $this->__authorized_JSON_key = array('event_id', 'distribution', 'category', 'type', 'value', 'comment', 'uuid', 'to_ids', 'timestamp', 'id');
+
+            App::uses('ColourPaletteTool', 'Tools');
+            $this->__paletteTool = new ColourPaletteTool();
             return true;
         }
 
@@ -270,6 +273,7 @@
                 $this->__extendedEventUUIDMapping[$toPush['event_id']] = '';
             }
 
+            $templatesCount = [];
             foreach ($object as $obj) {
                 $toPush = array(
                     'id' => sprintf('o-%s', $obj['id']),
@@ -290,6 +294,10 @@
                         $this->__json['existing_object_relation'][$attr['object_relation']] = 0; // set-alike
                     }
                 }
+                if (empty($templatesCount[$obj['template_uuid']])) {
+                    $templatesCount[$obj['template_uuid']] = 0;
+                }
+                $templatesCount[$obj['template_uuid']]++;
 
                 array_push($this->__json['items'], $toPush);
                 $this->__extendedEventUUIDMapping[$toPush['event_id']] = '';
@@ -307,6 +315,7 @@
                     array_push($this->__json['relations'], $toPush);
                 }
             }
+            $this->__json['items'] = $this->addObjectColors($this->__json['items'], $templatesCount);
 
             if ($this->__extended_view) {
                 $this->fetchEventUUIDFromId();
@@ -564,4 +573,18 @@
             ]);
             $this->__extendedEventUUIDMapping = $eventUUIDs;
         }
+
+        private function addObjectColors($items, $templatesCount)
+        {
+            $colours = [];
+            foreach ($templatesCount as $templateUUID => $count) {
+                $colours[$templateUUID] = $this->__paletteTool->generatePaletteFromString($templateUUID, $count);
+            }
+            foreach ($items as $i => $item) {
+                if ($item['node_type'] == 'object') {
+                    $items[$i]['color'] = array_shift($colours[$item['template_uuid']]);
+                }
+            }
+            return $items;
+        }
     }
diff --git a/app/webroot/js/event-graph.js b/app/webroot/js/event-graph.js
index 86a92beb2..529b6c3c3 100644
--- a/app/webroot/js/event-graph.js
+++ b/app/webroot/js/event-graph.js
@@ -86,13 +86,13 @@ class EventGraph {
     bind_listener() {
         var that = this;
         this.network.on("selectNode", function (params) {
-            that.network.moveTo({
-                position: {
-                    x: params.pointer.canvas.x,
-                    y: params.pointer.canvas.y
-                },
-                animation: true,
-            });
+            // that.network.moveTo({
+            //     position: {
+            //         x: params.pointer.canvas.x,
+            //         y: params.pointer.canvas.y
+            //     },
+            //     animation: true,
+            // });
         });
 
         this.network.on("dragStart", function (params) {
@@ -717,7 +717,7 @@ class EventGraph {
                     group: group,
                     mass: 5,
                     icon: {
-                        color: stringToRGB(label),
+                        color: node.color,
                         face: '"Font Awesome 5 Free"',
                         code: that.get_FA_icon(node['meta-category']),
                     }

From 2d058b6dc19833f6fdbe1b6a52ee0ee5415a9c69 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Tue, 9 Mar 2021 10:53:24 +0100
Subject: [PATCH 333/437] chg: bumped queryversion

---
 app/Controller/AppController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 5f6403dc2..530ff0d63 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -25,7 +25,7 @@ class AppController extends Controller
 
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
 
-    private $__queryVersion = '126';
+    private $__queryVersion = '127';
     public $pyMispVersion = '2.4.140';
     public $phpmin = '7.2';
     public $phprec = '7.4';

From fc3924c8e801cc9379d7c44ca0aad1718df1de60 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 9 Mar 2021 16:05:02 +0100
Subject: [PATCH 334/437] new: [freetext] Faster freetext parsing with more
 tests

---
 app/Lib/Tools/ComplexTypeTool.php | 42 ++++++++++---------------------
 app/Test/ComplexTypeToolTest.php  | 27 ++++++++++++++++++++
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/app/Lib/Tools/ComplexTypeTool.php b/app/Lib/Tools/ComplexTypeTool.php
index 8d6cb01be..4b8242864 100644
--- a/app/Lib/Tools/ComplexTypeTool.php
+++ b/app/Lib/Tools/ComplexTypeTool.php
@@ -41,7 +41,7 @@ class ComplexTypeTool
     public static function refangValue($value, $type)
     {
         foreach (self::$__refangRegexTable as $regex) {
-            if (in_array($type, $regex['types'])) {
+            if (in_array($type, $regex['types'], true)) {
                 $value = preg_replace($regex['from'], $regex['to'], $value);
             }
         }
@@ -131,16 +131,6 @@ class ComplexTypeTool
         return array('type' => 'other', 'value' => $input);
     }
 
-    private function __returnOddElements($array)
-    {
-        foreach ($array as $k => $v) {
-            if ($k % 2 != 1) {
-                unset($array[$k]);
-            }
-        }
-        return array_values($array);
-    }
-
     /**
      * Parse a CSV file with the given settings
      * All lines starting with # are stripped
@@ -203,27 +193,21 @@ class ComplexTypeTool
 
     public function checkFreeText($input, $settings = array())
     {
-        $charactersToTrim = '\'",() ' . "\t\n\r\0\x0B"; // custom + default PHP trim
+        $charactersToTrim = '\'".,() ' . "\t\n\r\0\x0B"; // custom + default PHP trim
+        $input = str_replace("\xc2\xa0", ' ', $input); // non breaking space to normal space
+        $input = preg_replace('/\p{C}+/u', ' ', $input);
         $iocArray = preg_split("/\r\n|\n|\r|\s|\s+|,|\<|\>|;/", $input);
-        $quotedText = explode('"', $input);
-        foreach ($quotedText as $k => $temp) {
-            $temp = trim($temp);
-            if (empty($temp)) {
-                unset($quotedText[$k]);
-            } else {
-                $quotedText[$k] = $temp;
-            }
-        }
-        $iocArray = array_merge($iocArray, $this->__returnOddElements($quotedText));
-        $resultArray = array();
+
+         preg_match_all('/\"([^\"]*)\"/', $input, $matches);
+         foreach ($matches[1] as $match) {
+             if ($match !== '') {
+                 $iocArray[] = $match;
+             }
+         }
+
+        $resultArray = [];
         foreach ($iocArray as $ioc) {
-            // remove trailing .
-            $ioc = rtrim($ioc, '.');
-            // remove brackets if enclosed
-            $ioc = trim($ioc, '()');
-            $ioc = str_replace("\xc2\xa0", '', $ioc); // remove non breaking space
             $ioc = trim($ioc, $charactersToTrim);
-            $ioc = preg_replace('/\p{C}+/u', '', $ioc);
             if (empty($ioc)) {
                 continue;
             }
diff --git a/app/Test/ComplexTypeToolTest.php b/app/Test/ComplexTypeToolTest.php
index a605af0e6..739208f9e 100644
--- a/app/Test/ComplexTypeToolTest.php
+++ b/app/Test/ComplexTypeToolTest.php
@@ -94,6 +94,15 @@ EOT;
         $this->assertEquals('ip-dst', $results[0]['default_type']);
     }
 
+    public function testCheckFreeTextIpv4Bracket(): void
+    {
+        $complexTypeTool = new ComplexTypeTool();
+        $results = $complexTypeTool->checkFreeText('we also saw an IP address (8.8.8.8).');
+        $this->assertCount(1, $results);
+        $this->assertEquals('8.8.8.8', $results[0]['value']);
+        $this->assertEquals('ip-dst', $results[0]['default_type']);
+    }
+
     public function testCheckFreeTextIpv4WithPort(): void
     {
         $complexTypeTool = new ComplexTypeTool();
@@ -497,6 +506,24 @@ EOT;
         }
     }
 
+    public function testCheckFreeTextNonBreakableSpace(): void
+    {
+        $complexTypeTool = new ComplexTypeTool();
+        $results = $complexTypeTool->checkFreeText("127.0.0.1\xc2\xa0127.0.0.2");
+        $this->assertCount(2, $results);
+        $this->assertEquals('127.0.0.1', $results[0]['value']);
+        $this->assertEquals('ip-dst', $results[0]['default_type']);
+    }
+
+    public function testCheckFreeTextQuoted(): void
+    {
+        $complexTypeTool = new ComplexTypeTool();
+        $results = $complexTypeTool->checkFreeText('="127.0.0.1",="127.0.0.2","","1"');
+        $this->assertCount(2, $results);
+        $this->assertEquals('127.0.0.1', $results[0]['value']);
+        $this->assertEquals('ip-dst', $results[0]['default_type']);
+    }
+
     public function testCheckFreeTextRemoveDuplicates(): void
     {
         $complexTypeTool = new ComplexTypeTool();

From ad20eb3562011ed89fabeecc8446f2546692a4e7 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 9 Mar 2021 17:57:22 +0100
Subject: [PATCH 335/437] new: [event loader] has a new extensionList parameter

- boolean, if set includes a list of extension events, metadata only
---
 app/Model/Event.php | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index ed9fbcead..bfc12d071 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -1842,6 +1842,7 @@ class Event extends AppModel
             'blockedAttributeTags',
             'eventsExtendingUuid',
             'extended',
+            'extensionList',
             'excludeGalaxy',
             'includeCustomGalaxyCluster', // not used
             'includeRelatedTags',
@@ -2385,6 +2386,11 @@ class Event extends AppModel
                 $results[$k] = $this->__mergeExtensions($user, $result, $options);
             }
         }
+        if ($options['extensionList']) {
+            foreach ($results as $k => $result) {
+                $results[$k] = $this->__fetchEventsExtendingEvent($user, $result, $options);
+            }
+        }
         return $results;
     }
 
@@ -2562,6 +2568,37 @@ class Event extends AppModel
         return $event;
     }
 
+    /**
+     * @param array $user
+     * @param array $event
+     * @param array $options
+     * @return array
+     * @throws Exception
+     */
+    private function __fetchEventsExtendingEvent(array $user, array $event, array $options)
+    {
+        $extensions = $this->fetchEvent($user, [
+            'eventsExtendingUuid' => $event['Event']['uuid'],
+            'sgReferenceOnly' => $options['sgReferenceOnly'],
+            'metadata' => 1
+        ]);
+        $extensionList = [];
+        foreach ($extensions as $extension) {
+            $extensionList[] = [
+                'id' => $extension['Event']['id'],
+                'uuid' => $extension['Event']['uuid'],
+                'info' => $extension['Event']['info'],
+                'Orgc' => [
+                    'id' => $extension['Orgc']['id'],
+                    'uuid' => $extension['Orgc']['uuid'],
+                    'name' => $extension['Orgc']['name']
+                ]
+            ];
+        }
+        $event['Event']['ExtendedBy'] = $extensionList;
+        return $event;
+    }
+
     /**
      * @param array $user
      * @param array $event
@@ -2602,7 +2639,7 @@ class Event extends AppModel
                 $event[$thingToMerge] = array_merge($event[$thingToMerge], $extensionEvent[$thingToMerge]);
             }
             // Merge event reports if requested
-            if (!$options['noEventReports']) {
+            if (!$options['noEventReports'] && isset($event['EventReport'])) {
                 $event['EventReport'] = array_merge($event['EventReport'], $extensionEvent['EventReport']);
             }
             // Merge just tags that are not already in main event

From 644d84f4df2ab0113ab8c8818ba9c971a4e6c1a0 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 9 Mar 2021 17:58:24 +0100
Subject: [PATCH 336/437] fix: [UI] indextable link generation on empty result
 set

- empty string instead of notice barfed back
---
 .../Elements/genericElements/IndexTable/Fields/links.ctp   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/View/Elements/genericElements/IndexTable/Fields/links.ctp b/app/View/Elements/genericElements/IndexTable/Fields/links.ctp
index 33839bd13..45b13643c 100644
--- a/app/View/Elements/genericElements/IndexTable/Fields/links.ctp
+++ b/app/View/Elements/genericElements/IndexTable/Fields/links.ctp
@@ -17,7 +17,12 @@
             }
             $url_param_data_paths = implode('/', $temp);
         } else {
-            $url_param_data_paths = h(Hash::extract($row, $field['url_params_data_paths'])[0]);
+            $url_param_data_paths = Hash::extract($row, $field['url_params_data_paths']);
+            if (!empty($url_param_data_paths)) {
+                $url_param_data_paths = $url_param_data_paths[0];
+            } else {
+                $url_param_data_paths = '';
+            }
         }
         $urlWithData .= '/' . $url_param_data_paths;
     }

From 1d08e3eef2d3f593e0502ee34bcfa92c3f07f250 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 9 Mar 2021 20:05:22 +0100
Subject: [PATCH 337/437] fix: [merge] Local tags should stay local

---
 app/Model/Event.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index a53d798f8..2dee4aedb 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -6207,7 +6207,6 @@ class Event extends AppModel
         if ($jobId) {
             $this->Job = ClassRegistry::init('Job');
             $this->Job->id = $jobId;
-
         }
         $failed_attributes = $failed_objects = $failed_object_attributes = $failed_reports = 0;
         $saved_attributes = $saved_objects = $saved_object_attributes = $saved_reports = 0;
@@ -6244,7 +6243,7 @@ class Event extends AppModel
                         foreach ($attribute['Tag'] as $tag) {
                             $tag_id = $this->Attribute->AttributeTag->Tag->captureTag($tag, $user);
                             if ($tag_id) {
-                                $this->Attribute->AttributeTag->attachTagToAttribute($this->Attribute->id, $id, $tag_id);
+                                $this->Attribute->AttributeTag->attachTagToAttribute($this->Attribute->id, $id, $tag_id, !empty($tag['local']));
                             }
                         }
                     }
@@ -6581,7 +6580,7 @@ class Event extends AppModel
                 foreach ($attribute['Tag'] as $tag) {
                     $tag_id = $this->Attribute->AttributeTag->Tag->captureTag($tag, $user);
                     if ($tag_id) {
-                        $this->Attribute->AttributeTag->attachTagToAttribute($this->Attribute->id, $event_id, $tag_id);
+                        $this->Attribute->AttributeTag->attachTagToAttribute($this->Attribute->id, $event_id, $tag_id, !empty($tag['local']));
                     }
                 }
             }

From ddd5673f86cce28afc0eaaf9da09c1803b126d70 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 9 Mar 2021 20:39:24 +0100
Subject: [PATCH 338/437] fix: [merge] Local tags should stay local vol. 2

---
 app/View/Events/resolved_misp_format.ctp | 4 ++--
 app/webroot/js/misp.js                   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/View/Events/resolved_misp_format.ctp b/app/View/Events/resolved_misp_format.ctp
index b20321d6b..1e9592c4b 100644
--- a/app/View/Events/resolved_misp_format.ctp
+++ b/app/View/Events/resolved_misp_format.ctp
@@ -280,7 +280,7 @@
                 ?>
                 <span style="display:inline-block;">
                   <span style="padding:1px;display:flex;white-space:nowrap;margin-right:2px;word-wrap:break-word;">
-                    <span class="objectAttributeTag" style="display:inline-block;background-color:<?php echo h($color); ?>;color:white;" title="<?php echo h($tag['name']); ?>">
+                    <span class="objectAttributeTag" data-local="<?= !empty($tag['local']) ? 1 : 0 ?>" style="display:inline-block;background-color:<?php echo h($color); ?>;color:white;" title="<?php echo h($tag['name']); ?>">
                     <?php echo h($tagText); ?>
                     </span>
                   </span>
@@ -390,7 +390,7 @@
               ?>
               <span style="display:inline-block;">
                 <span style="padding:1px;display:flex;white-space:nowrap;margin-right:2px;word-wrap:break-word;">
-                  <span class="attributeTag" style="display:inline-block;background-color:<?php echo h($color); ?>;color:white;" title="<?php echo h($tag['name']); ?>">
+                  <span class="attributeTag" data-local="<?= !empty($tag['local']) ? 1 : 0 ?>" style="display:inline-block;background-color:<?php echo h($color); ?>;color:white;" title="<?php echo h($tag['name']); ?>">
                   <?php echo h($tagText); ?>
                   </span>
                 </span>
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index b0f688361..cb4482602 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -2841,7 +2841,8 @@ function moduleResultsSubmit(id) {
                         $(this).find('.objectAttributeTag').each(function() {
                             tags.push({
                                 name: $(this).attr('title'),
-                                colour: rgb2hex($(this).css('background-color'))
+                                colour: rgb2hex($(this).css('background-color')),
+                                local: $(this).data('local'),
                             });
                         });
                         attribute['Tag'] = tags;
@@ -2900,7 +2901,8 @@ function moduleResultsSubmit(id) {
                 $(this).find('.attributeTag').each(function() {
                     tags.push({
                         name: $(this).attr('title'),
-                        colour: rgb2hex($(this).css('background-color'))
+                        colour: rgb2hex($(this).css('background-color')),
+                        local: $(this).data('local'),
                     });
                 });
                 temp['Tag'] = tags;

From eebe0310916a6c54f7387cb9499b72e21c4d8688 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 9 Mar 2021 23:10:19 +0100
Subject: [PATCH 339/437] fix: [unsafe API keys] fixed

- if you really have to use them, they should work again

- please don't use them, you are disclosing your APIkey via the URL
- apache logs, proxy logs they will all have your APIkey
- adding headers with your APIkey isn't so difficult
- if a tool you use has no way of configuring headers, reach out to your vendor, they ought to do something about that
---
 app/Controller/ServersController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 7e07d5b3d..3220350c0 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -2038,7 +2038,8 @@ class ServersController extends AppController
         App::uses('HttpSocket', 'Network/Http');
         $HttpSocket = new HttpSocket($params);
         $view_data = array();
-        $temp_headers = explode("\n", $request['header']);
+
+        $temp_headers = empty($request['header']) ? [] : explode("\n", $request['header']);
         $request['header'] = array(
             'Authorization' => $this->Auth->user('authkey'),
             'Accept' => 'application/json',

From 3935dee16b3bbe2802c828489771fa25ce940c20 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 10 Mar 2021 08:17:11 +0100
Subject: [PATCH 340/437] chg: [internal] Threat levels list

---
 app/Controller/EventsController.php  | 11 ++---------
 app/Controller/FeedsController.php   |  6 ++----
 app/Controller/ServersController.php |  6 ++----
 app/Model/ThreatLevel.php            |  7 +++++++
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 5b2363a76..b0126935c 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -590,13 +590,7 @@ class EventsController extends AppController
                         $searchTermInternal = $searchTerm;
                         if ($searchTerm == 'threatlevel') {
                             $searchTermInternal = 'threat_level_id';
-                            $threatLevels = $this->Event->ThreatLevel->find('all', array(
-                                'recursive' => -1,
-                                'fields' => array('id', 'name'),
-                            ));
-                            foreach ($threatLevels as $tl) {
-                                $terms[$tl['ThreatLevel']['id']] = $tl['ThreatLevel']['name'];
-                            }
+                            $terms = $this->Event->ThreatLevel->list();
                         } elseif ($searchTerm == 'analysis') {
                             $terms = $this->Event->analysisLevels;
                         } else {
@@ -4765,8 +4759,7 @@ class EventsController extends AppController
         );
 
         $this->set('events', $this->paginate());
-        $threat_levels = $this->Event->ThreatLevel->find('all');
-        $this->set('threatLevels', Set::combine($threat_levels, '{n}.ThreatLevel.id', '{n}.ThreatLevel.name'));
+        $this->set('threatLevels', $this->Event->ThreatLevel->list());
         $this->set('eventDescriptions', $this->Event->fieldDescriptions);
         $this->set('analysisLevels', $this->Event->analysisLevels);
         $this->set('distributionLevels', $this->Event->distributionLevels);
diff --git a/app/Controller/FeedsController.php b/app/Controller/FeedsController.php
index f25cf37ca..e5dfed8bc 100644
--- a/app/Controller/FeedsController.php
+++ b/app/Controller/FeedsController.php
@@ -690,8 +690,7 @@ class FeedsController extends AppController
         }
         $this->set('events', $events);
         $this->loadModel('Event');
-        $threat_levels = $this->Event->ThreatLevel->find('all');
-        $this->set('threatLevels', Set::combine($threat_levels, '{n}.ThreatLevel.id', '{n}.ThreatLevel.name'));
+        $this->set('threatLevels', $this->Event->ThreatLevel->list());
         $this->set('eventDescriptions', $this->Event->fieldDescriptions);
         $this->set('analysisLevels', $this->Event->analysisLevels);
         $this->set('distributionLevels', $this->Event->distributionLevels);
@@ -798,8 +797,7 @@ class FeedsController extends AppController
                     $this->set($alias, $currentModel->{$variable});
                 }
             }
-            $threat_levels = $this->Event->ThreatLevel->find('all');
-            $this->set('threatLevels', Set::combine($threat_levels, '{n}.ThreatLevel.id', '{n}.ThreatLevel.name'));
+            $this->set('threatLevels', $this->Event->ThreatLevel->list());
         } else {
             if ($event === 'blocked') {
                 throw new MethodNotAllowedException(__('This event is blocked by the Feed filters.'));
diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 52a95d388..9e16ee11e 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -124,8 +124,7 @@ class ServersController extends AppController
         }
 
         $this->loadModel('Event');
-        $threat_levels = $this->Event->ThreatLevel->find('list', ['fields' => ['id', 'name']]);
-        $this->set('threatLevels', $threat_levels);
+        $this->set('threatLevels', $this->Event->ThreatLevel->list());
         App::uses('CustomPaginationTool', 'Tools');
         $customPagination = new CustomPaginationTool();
         $params = $customPagination->createPaginationRules($events, $this->passedArgs, $this->alias);
@@ -202,8 +201,7 @@ class ServersController extends AppController
                 $this->set($alias, $currentModel->{$variable});
             }
         }
-        $threat_levels = $this->Event->ThreatLevel->find('list', ['fields' => ['id', 'name']]);
-        $this->set('threatLevels', $threat_levels);
+        $this->set('threatLevels', $this->Event->ThreatLevel->list());
         $this->set('title_for_layout', __('Remote event preview'));
     }
 
diff --git a/app/Model/ThreatLevel.php b/app/Model/ThreatLevel.php
index 232f0dfa3..1b0114450 100644
--- a/app/Model/ThreatLevel.php
+++ b/app/Model/ThreatLevel.php
@@ -22,4 +22,11 @@ class ThreatLevel extends AppModel
             ),
         ),
     );
+
+    public function list()
+    {
+        return $this->find('list', [
+            'fields' => ['id', 'name'],
+        ]);
+    }
 }

From 42f78580df062cb2696e059929fc8fb648f568bb Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 9 Mar 2021 23:01:52 +0100
Subject: [PATCH 341/437] chg: [UI] Make feed event preview nicer

---
 app/Controller/FeedsController.php |  42 ++++++-----
 app/View/Feeds/preview_event.ctp   | 111 ++++++++++++-----------------
 app/View/Servers/preview_event.ctp |   2 +-
 3 files changed, 72 insertions(+), 83 deletions(-)

diff --git a/app/Controller/FeedsController.php b/app/Controller/FeedsController.php
index e5dfed8bc..b07c07c29 100644
--- a/app/Controller/FeedsController.php
+++ b/app/Controller/FeedsController.php
@@ -606,26 +606,30 @@ class FeedsController extends AppController
 
     public function previewIndex($feedId)
     {
-        $this->Feed->id = $feedId;
-        if (!$this->Feed->exists()) {
+        $feed = $this->Feed->find('first', [
+            'conditions' => ['id' => $feedId],
+            'recursive' => -1,
+        ]);
+        if (empty($feed)) {
             throw new NotFoundException(__('Invalid feed.'));
         }
-        $this->Feed->read();
-        if (!empty($this->Feed->data['Feed']['settings'])) {
-            $this->Feed->data['Feed']['settings'] = json_decode($this->Feed->data['Feed']['settings'], true);
+        if (!empty($feed['Feed']['settings'])) {
+            $feed['Feed']['settings'] = json_decode($feed['Feed']['settings'], true);
         }
         $params = array();
         if ($this->request->is('post')) {
             $params = $this->request->data['Feed'];
         }
-        if ($this->Feed->data['Feed']['source_format'] == 'misp') {
-            return $this->__previewIndex($this->Feed->data, $params);
-        } elseif (in_array($this->Feed->data['Feed']['source_format'], array('freetext', 'csv'))) {
-            return $this->__previewFreetext($this->Feed->data);
+        if ($feed['Feed']['source_format'] === 'misp') {
+            return $this->__previewIndex($feed, $params);
+        } elseif (in_array($feed['Feed']['source_format'], ['freetext', 'csv'], true)) {
+            return $this->__previewFreetext($feed);
+        } else {
+            throw new Exception("Invalid feed format `{$feed['Feed']['source_format']}`.");
         }
     }
 
-    private function __previewIndex($feed, $filterParams = array())
+    private function __previewIndex(array $feed, $filterParams = array())
     {
         $urlparams = '';
         App::uses('CustomPaginationTool', 'Tools');
@@ -703,7 +707,7 @@ class FeedsController extends AppController
         $this->set('passedArgsArray', $passedArgs);
     }
 
-    private function __previewFreetext($feed)
+    private function __previewFreetext(array $feed)
     {
         if (isset($this->passedArgs['page'])) {
             $currentPage = $this->passedArgs['page'];
@@ -758,13 +762,15 @@ class FeedsController extends AppController
 
     public function previewEvent($feedId, $eventUuid, $all = false)
     {
-        $this->Feed->id = $feedId;
-        if (!$this->Feed->exists()) {
+        $feed = $this->Feed->find('first', [
+            'conditions' => ['id' => $feedId],
+            'recursive' => -1,
+        ]);
+        if (empty($feed)) {
             throw new NotFoundException(__('Invalid feed.'));
         }
-        $this->Feed->read();
         try {
-            $event = $this->Feed->downloadEventFromFeed($this->Feed->data, $eventUuid);
+            $event = $this->Feed->downloadEventFromFeed($feed, $eventUuid);
         } catch (Exception $e) {
             throw new Exception(__('Could not download the selected Event'), 0, $e);
         }
@@ -781,11 +787,11 @@ class FeedsController extends AppController
             $params = $this->Event->rearrangeEventForView($event, $this->passedArgs, $all);
             $this->params->params['paging'] = array('Feed' => $params);
             $this->set('event', $event);
-            $this->set('feed', $this->Feed->data);
+            $this->set('feed', $feed);
             $this->loadModel('Event');
             $dataForView = array(
-                    'Attribute' => array('attrDescriptions' => 'fieldDescriptions', 'distributionDescriptions' => 'distributionDescriptions', 'distributionLevels' => 'distributionLevels'),
-                    'Event' => array('eventDescriptions' => 'fieldDescriptions', 'analysisLevels' => 'analysisLevels')
+                'Attribute' => array('attrDescriptions' => 'fieldDescriptions', 'distributionDescriptions' => 'distributionDescriptions', 'distributionLevels' => 'distributionLevels'),
+                'Event' => array('eventDescriptions' => 'fieldDescriptions', 'analysisLevels' => 'analysisLevels')
             );
             foreach ($dataForView as $m => $variables) {
                 if ($m === 'Event') {
diff --git a/app/View/Feeds/preview_event.ctp b/app/View/Feeds/preview_event.ctp
index 184e13ff7..8ecc1899a 100755
--- a/app/View/Feeds/preview_event.ctp
+++ b/app/View/Feeds/preview_event.ctp
@@ -1,71 +1,56 @@
+<?php
+$tableData = [
+    ['key' => __('UUID'), 'value' => $event['Event']['uuid'], 'class' => 'quickSelect'],
+    ['key' => Configure::read('MISP.showorgalternate') ? __('Source Organisation') : __('Org'), 'value' => $event['Orgc']['name']],
+];
+if (Configure::read('MISP.tagging')) {
+    ob_start();
+    if (!empty($event['Tag'])): foreach ($event['Tag'] as $tag): ?>
+    <span style="padding-right:0;">
+        <span class="tagFirstHalf" style="background-color:<?= h($tag['colour']);?>;color:<?= $this->TextColour->getTextColour($tag['colour']);?>"><?= h($tag['name']); ?></span>
+    </span>
+    <?php endforeach; endif;
+    $tags = ob_get_clean();
+
+    $tableData[] = ['key' => __('Tags'), 'html' => $tags];
+}
+$tableData[] = ['key' => __('Date'), 'html' => $this->Time->time($event['Event']['date'])];
+$tableData[] = [
+    'key' => __('Threat Level'),
+    'key_title' => $eventDescriptions['threat_level_id']['desc'],
+    'value' => $threatLevels[$event['Event']['threat_level_id']],
+    'value_class' => 'threat-level-' . strtolower($threatLevels[$event['Event']['threat_level_id']]),
+];
+$tableData[] = [
+    'key' => __('Analysis'),
+    'key_title' => $eventDescriptions['analysis']['desc'],
+    'value' => $analysisLevels[$event['Event']['analysis']],
+];
+$tableData[] = [
+    'key' => __('Info'),
+    'value' => $event['Event']['info']
+];
+$tableData[] = [
+    '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') : sprintf('<span class="green bold">%s</span>', __('Yes')),
+];
+$tableData[] = [
+    'key' => __('Last change'),
+    'html' => $this->Time->time($event['Event']['timestamp']),
+];
+?>
 <div class="events view">
     <?php
         $title = $event['Event']['info'];
         if (strlen($title) > 58) $title = substr($title, 0, 55) . '...';
     ?>
-    <h4 class="visibleDL notPublished" ><?php echo __('You are currently viewing an event from a feed (%s by %s)', h($feed['Feed']['name']), h($feed['Feed']['provider']));?></h4>
+    <h4 class="visibleDL notPublished" ><?= __('You are currently viewing an event from a feed (%s by %s)', h($feed['Feed']['name']), h($feed['Feed']['provider']));?></h4>
     <div class="row-fluid">
         <div class="span8">
             <h2><?php echo nl2br(h($title)); ?></h2>
-            <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>
-                <dd><?php echo h($event['Orgc']['name']); ?></dd>
-                <?php if (Configure::read('MISP.tagging')): ?>
-                    <dt><?php echo __('Tags');?></dt>
-                    <dd class="eventTagContainer">
-                    <?php if (!empty($event['Tag'])) foreach ($event['Tag'] as $tag): ?>
-                        <span style="padding-right:0px;">
-                            <span class="tagFirstHalf" style="background-color:<?php echo isset($tag['colour']) ? h($tag['colour']) : 'red';?>;color:<?php echo $this->TextColour->getTextColour(isset($tag['colour']) ? h($tag['colour']) : 'red'); ?>"><?php echo h($tag['name']); ?></span>
-                        </span>
-                    <?php endforeach; ?>&nbsp;
-                    </dd>
-                <?php endif; ?>
-                <dt><?php echo __('Date');?></dt>
-                <dd>
-                    <?php echo h($event['Event']['date']); ?>
-                    &nbsp;
-                </dd>
-                <dt title="<?php echo $eventDescriptions['threat_level_id']['desc'];?>"><?php echo __('Threat Level');?></dt>
-                <dd>
-                    <?php
-                        echo h($threatLevels[$event['Event']['threat_level_id']]);
-                    ?>
-                    &nbsp;
-                </dd>
-                <dt title="<?php echo $eventDescriptions['analysis']['desc'];?>"><?php echo __('Analysis');?></dt>
-                <dd>
-                    <?php echo h($analysisLevels[$event['Event']['analysis']]); ?>
-                    &nbsp;
-                </dd>
-                <dt><?php echo __('Info');?></dt>
-                <dd style="word-wrap: break-word;">
-                    <?php echo nl2br(h($event['Event']['info'])); ?>
-                    &nbsp;
-                </dd>
-                <?php
-                    $published = '';
-                    $notPublished = 'style="display:none;"';
-                    if ($event['Event']['published'] == 0) {
-                        $published = 'style="display:none;"';
-                        $notPublished = '';
-                    }
-                ?>
-                        <dt class="published" <?php echo $published;?>><?php echo __('Published');?></dt>
-                        <dd class="published green" <?php echo $published;?>><?php echo __('Yes');?></dd>
-                <?php
-                    if ($isAclPublish) :
-                ?>
-                        <dt class="visibleDL notPublished" <?php echo $notPublished;?>><?php echo __('Published');?></dt>
-                        <dd class="visibleDL notPublished" <?php echo $notPublished;?>><?php echo __('No');?></dd>
-                <?php
-                    else:
-                ?>
-                        <dt class="notPublished" <?php echo $notPublished;?>><?php echo __('Published');?></dt>
-                        <dd class="notPublished red" <?php echo $notPublished;?>><?php echo __('No');?></dd>
-                <?php endif; ?>
-            </dl>
+            <?= $this->element('genericElements/viewMetaTable', array('table_data' => $tableData)); ?>
         </div>
 
     <?php if (!empty($event['RelatedEvent'])):?>
@@ -96,12 +81,10 @@
         <?php echo $this->element('Feeds/eventattribute'); ?>
     </div>
 </div>
-<?php
-    echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'previewEvent', 'id' => $event['Event']['uuid']));
-?>
+<?= $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'previewEvent', 'id' => $event['Event']['uuid'])); ?>
 <script type="text/javascript">
 // tooltips
-$(document).ready(function () {
+$(function () {
     $("th, td, dt, div, span, li").tooltip({
         'placement': 'top',
         'container' : 'body',
diff --git a/app/View/Servers/preview_event.ctp b/app/View/Servers/preview_event.ctp
index b22e00159..31bb9b96d7 100644
--- a/app/View/Servers/preview_event.ctp
+++ b/app/View/Servers/preview_event.ctp
@@ -57,7 +57,7 @@ $tableData[] = [
         if (strlen($title) > 58) $title = substr($title, 0, 55) . '...';
         $serverName = $server['Server']['name'] ? '"' . $server['Server']['name'] . '" (' . $server['Server']['url'] . ')' : '"' . $server['Server']['url'] . '"';
     ?>
-    <h4 class="visibleDL notPublished" ><?php echo __('You are currently viewing an event on the remote instance %s ', h($serverName));?></h4>
+    <h4 class="visibleDL notPublished"><?php echo __('You are currently viewing an event on the remote instance %s ', h($serverName));?></h4>
     <div class="row-fluid">
         <div class="span8">
             <h2><?php echo nl2br(h($title)); ?></h2>

From 9ab54477251cd1e52a7d2a59e78543fd22a3e10a Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 10 Mar 2021 09:53:23 +0100
Subject: [PATCH 342/437] fix: [feed] Convert invalid key case

---
 app/Model/Feed.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/Model/Feed.php b/app/Model/Feed.php
index 037bc3dd8..5bfc219fc 100644
--- a/app/Model/Feed.php
+++ b/app/Model/Feed.php
@@ -210,7 +210,7 @@ class Feed extends AppModel
      * @return array
      * @throws Exception
      */
-    public function getManifest($feed, HttpSocket $HttpSocket = null)
+    public function getManifest(array $feed, HttpSocket $HttpSocket = null)
     {
         $events = $this->downloadManifest($feed, $HttpSocket);
         $events = $this->__filterEventsIndex($events, $feed);
@@ -661,13 +661,19 @@ class Feed extends AppModel
         return true;
     }
 
-    private function __filterEventsIndex($events, $feed)
+    private function __filterEventsIndex(array $events, array $feed)
     {
         $filterRules = $this->__prepareFilterRules($feed);
         if (!$filterRules) {
             $filterRules = array();
         }
         foreach ($events as $k => $event) {
+            if (isset($event['orgc']) && !isset($event['Orgc'])) { // fix key case
+                $event['Orgc'] = $event['orgc'];
+                unset($event['orgc']);
+                $events[$k] = $event;
+            }
+
             if (isset($filterRules['orgs']['OR']) && !empty($filterRules['orgs']['OR']) && !in_array($event['Orgc']['name'], $filterRules['orgs']['OR'])) {
                 unset($events[$k]);
                 continue;
@@ -770,7 +776,13 @@ class Feed extends AppModel
         return $result;
     }
 
-    private function __prepareEvent($event, $feed, $filterRules)
+    /**
+     * @param array $event
+     * @param array $feed
+     * @param array $filterRules
+     * @return array|string
+     */
+    private function __prepareEvent($event, array $feed, $filterRules)
     {
         if (isset($event['response'])) {
             $event = $event['response'];
@@ -779,7 +791,11 @@ class Feed extends AppModel
             $event = $event[0];
         }
         if (!isset($event['Event']['uuid'])) {
-            throw new Exception("Event uuid field missing.");
+            throw new InvalidArgumentException("Event UUID field missing.");
+        }
+        if (isset($event['Event']['orgc']) && !isset($event['Event']['Orgc'])) { // fix key case
+            $event['Event']['Orgc'] = $event['Event']['orgc'];
+            unset($event['Event']['orgc']);
         }
         $event['Event']['distribution'] = $feed['Feed']['distribution'];
         $event['Event']['sharing_group_id'] = $feed['Feed']['sharing_group_id'];

From 5e7bbe4132964a686f367302e6cd0d23cb3258bb Mon Sep 17 00:00:00 2001
From: John Kristoff <jtkristoff@users.noreply.github.com>
Date: Wed, 10 Mar 2021 11:10:04 -0600
Subject: [PATCH 343/437] added newest DataPlane.org feeds

---
 app/files/feed-metadata/defaults.json | 182 ++++++++++++++++++++++++++
 1 file changed, 182 insertions(+)

diff --git a/app/files/feed-metadata/defaults.json b/app/files/feed-metadata/defaults.json
index 8e10ea6a6..901e99acd 100644
--- a/app/files/feed-metadata/defaults.json
+++ b/app/files/feed-metadata/defaults.json
@@ -579,6 +579,188 @@
             "hide_tag": false
         }
     },
+    {
+        "Feed": {
+            "name": "DNS recursion desired",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/dnsrd.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "DNS recursion desired IN ANY",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/dnsrdany.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "DNS CH TXT version.bind",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/dnsversion.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "IP protocol 41",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/proto41.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "SMTP data",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/smtpdata.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "SMTP greet",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/smtpgreet.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
+    {
+        "Feed": {
+            "name": "TELNET login",
+            "provider": "dataplane.org",
+            "url": "https:\/\/dataplane.org\/telnetlogin.txt",
+            "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+            "enabled": true,
+            "distribution": "3",
+            "default": false,
+            "source_format": "csv",
+            "fixed_event": true,
+            "delta_merge": false,
+            "publish": false,
+            "override_ids": false,
+            "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\"|\"},\"common\":{\"excluderegex\":\"\"}}",
+            "input_source": "network",
+            "delete_local_file": false,
+            "lookup_visible": false
+        },
+        "Tag": {
+            "name": "osint:source-type=\"block-or-filter-list\"",
+            "colour": "#004f89",
+            "exportable": true,
+            "hide_tag": false
+        }
+    },
     {
         "Feed": {
             "name": "All current domains belonging to known malicious DGAs",

From 032302dbf99c34d90753321e277dc886f6996435 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Wed, 10 Mar 2021 21:33:10 +0100
Subject: [PATCH 344/437] fix: [workers] Worker name when processing freetext

---
 app/Controller/EventsController.php | 16 ++++----
 app/Model/Event.php                 | 63 ++++++++++++-----------------
 app/Model/GalaxyCluster.php         | 16 ++++----
 app/Model/Server.php                | 17 ++++----
 app/Model/User.php                  | 17 ++++----
 5 files changed, 57 insertions(+), 72 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index b0126935c..90bf21afe 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -5712,14 +5712,14 @@ class EventsController extends AppController
                 $job = ClassRegistry::init('Job');
                 $job->create();
                 $data = array(
-                        'worker' => $this->Event->__getPrioWorkerIfPossible(),
-                        'job_type' => $job_type,
-                        'job_input' => sprintf('Event ID: %s', $id),
-                        'status' => 0,
-                        'retries' => 0,
-                        'org_id' => 0,
-                        'org' => 'ADMIN',
-                        'message' => $message
+                    'worker' => 'prio',
+                    'job_type' => $job_type,
+                    'job_input' => sprintf('Event ID: %s', $id),
+                    'status' => 0,
+                    'retries' => 0,
+                    'org_id' => 0,
+                    'org' => 'ADMIN',
+                    'message' => $message
                 );
                 $job->save($data);
                 $jobId = $job->id;
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 9d6e808ca..5dd32612b 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -4467,19 +4467,6 @@ class Event extends AppModel
         }
     }
 
-    public function __getPrioWorkerIfPossible()
-    {
-        $this->ResqueStatus = new ResqueStatus\ResqueStatus(Resque::redis());
-        $workers = $this->ResqueStatus->getWorkers();
-        $workerType = 'default';
-        foreach ($workers as $worker) {
-            if ($worker['queue'] === 'prio') {
-                $workerType = 'prio';
-            }
-        }
-        return $workerType;
-    }
-
     public function publishRouter($id, $passAlong = null, $user, $scope = 'events')
     {
         if (Configure::read('MISP.background_jobs')) {
@@ -4493,14 +4480,14 @@ class Event extends AppModel
             $job = ClassRegistry::init('Job');
             $job->create();
             $data = array(
-                    'worker' => $this->__getPrioWorkerIfPossible(),
-                    'job_type' => 'publish_event',
-                    'job_input' => 'Event ID: ' . $id,
-                    'status' => 0,
-                    'retries' => 0,
-                    'org_id' => $user['org_id'],
-                    'org' => $user['Organisation']['name'],
-                    'message' => $message
+                'worker' => 'prio',
+                'job_type' => 'publish_event',
+                'job_input' => 'Event ID: ' . $id,
+                'status' => 0,
+                'retries' => 0,
+                'org_id' => $user['org_id'],
+                'org' => $user['Organisation']['name'],
+                'message' => $message
             );
             $job->save($data);
             $jobId = $job->id;
@@ -5914,14 +5901,14 @@ class Event extends AppModel
             $job = ClassRegistry::init('Job');
             $job->create();
             $data = array(
-                    'worker' => $this->__getPrioWorkerIfPossible(),
-                    'job_type' => 'enrichment',
-                    'job_input' => 'Event ID: ' . $options['event_id'] . ' modules: ' . json_encode($options['modules']),
-                    'status' => 0,
-                    'retries' => 0,
-                    'org_id' => $options['user']['org_id'],
-                    'org' => $options['user']['Organisation']['name'],
-                    'message' => 'Enriching event.',
+                'worker' => 'prio',
+                'job_type' => 'enrichment',
+                'job_input' => 'Event ID: ' . $options['event_id'] . ' modules: ' . json_encode($options['modules']),
+                'status' => 0,
+                'retries' => 0,
+                'org_id' => $options['user']['org_id'],
+                'org' => $options['user']['Organisation']['name'],
+                'message' => 'Enriching event.',
             );
             $job->save($data);
             $jobId = $job->id;
@@ -6685,19 +6672,19 @@ class Event extends AppModel
         return $this->processModuleResultsData($user, $resolved_data, $id, $default_comment = '');
     }
 
-    private function __initiateProcessJob($user, $id, $format = 'freetext')
+    private function __initiateProcessJob(array $user, $id, $format = 'freetext')
     {
         $job = ClassRegistry::init('Job');
         $job->create();
         $data = array(
-                'worker' => 'default',
-                'job_type' => __('process_' . $format . '_data'),
-                'job_input' => 'Event: ' . $id,
-                'status' => 0,
-                'retries' => 0,
-                'org_id' => $user['org_id'],
-                'org' => $user['Organisation']['name'],
-                'message' => 'Processing...'
+            'worker' => 'prio',
+            'job_type' => 'process_' . $format . '_data',
+            'job_input' => 'Event: ' . $id,
+            'status' => 0,
+            'retries' => 0,
+            'org_id' => $user['org_id'],
+            'org' => $user['Organisation']['name'],
+            'message' => 'Processing...'
         );
         $job->save($data);
         $randomFileName = $this->generateRandomFileName() . '.json';
diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 0fb8d4d30..bb77080fc 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -459,14 +459,14 @@ class GalaxyCluster extends AppModel
             $job = ClassRegistry::init('Job');
             $job->create();
             $data = array(
-                    'worker' => $this->Event->__getPrioWorkerIfPossible(),
-                    'job_type' => 'publish_galaxy_clusters',
-                    'job_input' => 'Cluster ID: ' . $clusterId,
-                    'status' => 0,
-                    'retries' => 0,
-                    'org_id' => $user['org_id'],
-                    'org' => $user['Organisation']['name'],
-                    'message' => $message
+                'worker' => 'prio',
+                'job_type' => 'publish_galaxy_clusters',
+                'job_input' => 'Cluster ID: ' . $clusterId,
+                'status' => 0,
+                'retries' => 0,
+                'org_id' => $user['org_id'],
+                'org' => $user['Organisation']['name'],
+                'message' => $message
             );
             $job->save($data);
             $jobId = $job->id;
diff --git a/app/Model/Server.php b/app/Model/Server.php
index b0fa7ac6b..3d746a6bf 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -3924,16 +3924,15 @@ class Server extends AppModel
         if (Configure::read('MISP.background_jobs')) {
             $job = ClassRegistry::init('Job');
             $job->create();
-            $eventModel = ClassRegistry::init('Event');
             $data = array(
-                    'worker' => $eventModel->__getPrioWorkerIfPossible(),
-                    'job_type' => __('update_after_pull'),
-                    'job_input' => __('Updating: ' . $submodule_name),
-                    'status' => 0,
-                    'retries' => 0,
-                    'org_id' => $user['org_id'],
-                    'org' => $user['Organisation']['name'],
-                    'message' => 'Update the database after PULLing the submodule(s).',
+                'worker' => 'prio',
+                'job_type' => __('update_after_pull'),
+                'job_input' => __('Updating: ' . $submodule_name),
+                'status' => 0,
+                'retries' => 0,
+                'org_id' => $user['org_id'],
+                'org' => $user['Organisation']['name'],
+                'message' => 'Update the database after PULLing the submodule(s).',
             );
             $job->save($data);
             $jobId = $job->id;
diff --git a/app/Model/User.php b/app/Model/User.php
index 60b44d7ed..30890aed1 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -1028,16 +1028,15 @@ class User extends AppModel
         if (Configure::read('MISP.background_jobs')) {
             $job = ClassRegistry::init('Job');
             $job->create();
-            $eventModel = ClassRegistry::init('Event');
             $data = array(
-                    'worker' => $eventModel->__getPrioWorkerIfPossible(),
-                    'job_type' => __('reset_all_sync_api_keys'),
-                    'job_input' => __('Reseting all API keys'),
-                    'status' => 0,
-                    'retries' => 0,
-                    'org_id' => $user['org_id'],
-                    'org' => $user['Organisation']['name'],
-                    'message' => 'Issuing new API keys to all sync users.',
+                'worker' => 'prio',
+                'job_type' => __('reset_all_sync_api_keys'),
+                'job_input' => __('Reseting all API keys'),
+                'status' => 0,
+                'retries' => 0,
+                'org_id' => $user['org_id'],
+                'org' => $user['Organisation']['name'],
+                'message' => 'Issuing new API keys to all sync users.',
             );
             $job->save($data);
             $jobId = $job->id;

From a748134551a25e3100077a901d7284e8360c7ed5 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 11 Mar 2021 12:03:00 +0100
Subject: [PATCH 345/437] fix: [internal] Remove unnecessary create call

---
 app/Console/Command/EventShell.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Console/Command/EventShell.php b/app/Console/Command/EventShell.php
index bf8824db6..ed399b358 100644
--- a/app/Console/Command/EventShell.php
+++ b/app/Console/Command/EventShell.php
@@ -162,7 +162,7 @@ class EventShell extends AppShell
         $this->ConfigLoad->execute();
         $timeStart = time();
         $userId = $this->args[0];
-        $user = $this->User->getAuthUser($userId);
+        $user = $this->getUser($userId);
         $id = $this->args[1];
         $this->Job->id = $id;
         $this->Job->saveField('progress', 1);
@@ -309,7 +309,6 @@ class EventShell extends AppShell
         }
         $this->Job->save($job);
         $log = ClassRegistry::init('Log');
-        $log->create();
         $log->createLogEntry($user, 'publish', 'Event', $id, 'Event (' . $id . '): published.', 'published () => (1)');
     }
 
@@ -333,7 +332,6 @@ class EventShell extends AppShell
         }
         $this->Job->save($job);
         $log = ClassRegistry::init('Log');
-        $log->create();
         $log->createLogEntry($user, 'publish_sightings', 'Event', $id, 'Sightings for event (' . $id . '): published.', 'publish_sightings updated');
     }
 
@@ -357,7 +355,6 @@ class EventShell extends AppShell
         }
         $this->Job->save($job);
         $log = ClassRegistry::init('Log');
-        $log->create();
         $log->createLogEntry($user, 'publish', 'GalaxyCluster', $clusterId, 'GalaxyCluster (' . $clusterId . '): published.', 'published () => (1)');
     }
 
@@ -409,7 +406,6 @@ class EventShell extends AppShell
 	echo $job['Job']['message'] . PHP_EOL;
         $this->Job->save($job);
         $log = ClassRegistry::init('Log');
-        $log->create();
         $log->createLogEntry($user, 'enrichment', 'Event', $eventId, 'Event (' . $eventId . '): enriched.', 'enriched () => (1)');
     }
 

From 14e669c49f6d5c467b64f61fdc6a9e2ee1bfe6a2 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Sat, 13 Mar 2021 11:06:50 +0100
Subject: [PATCH 346/437] chg: [misp-galaxy] updated to the latest version

---
 app/files/misp-galaxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/misp-galaxy b/app/files/misp-galaxy
index fa05eb04e..05cacfc5a 160000
--- a/app/files/misp-galaxy
+++ b/app/files/misp-galaxy
@@ -1 +1 @@
-Subproject commit fa05eb04e38cfb76ae353cc158fb5d98160969a3
+Subproject commit 05cacfc5accbd1e217d82c5a2a2fd5329b5bc8f3

From cc02fd9378473b1775651086160057d6718bc8e9 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Sat, 13 Mar 2021 11:07:50 +0100
Subject: [PATCH 347/437] chg: [misp-galaxy] updated to the latest version

---
 app/files/misp-galaxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/misp-galaxy b/app/files/misp-galaxy
index fa05eb04e..05cacfc5a 160000
--- a/app/files/misp-galaxy
+++ b/app/files/misp-galaxy
@@ -1 +1 @@
-Subproject commit fa05eb04e38cfb76ae353cc158fb5d98160969a3
+Subproject commit 05cacfc5accbd1e217d82c5a2a2fd5329b5bc8f3

From d5a4f1b4a40fba221b0b3ce64a1dc43d3b596a83 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 14 Mar 2021 11:21:34 +0100
Subject: [PATCH 348/437] fix: [test] Repo is missing

---
 .github/workflows/main.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 27f480b65..10c9d1a8d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -66,10 +66,8 @@ jobs:
         run: |
               git submodule update --init --recursive
               sudo apt-get -y update
-              if [[ $php_version == "7.4" ]]; then
-                # Repo is missing for unknown reason
-                LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
-              fi
+              # Repo is missing for unknown reason
+              LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
               sudo apt-get -y install curl python3 python3-zmq python3-requests python3-pip python3-nose python3-redis python3-lxml apache2 libapache2-mod-php$php_version libfuzzy-dev
               sudo pip3 install virtualenv # virtualenv must be instaled from pip and not from ubuntu pacckages
               sudo pip3 install --upgrade -r requirements.txt

From d7228de2328486d368e4e74c0e8e67c1b46fdf00 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 14 Mar 2021 11:21:34 +0100
Subject: [PATCH 349/437] fix: [test] Repo is missing

---
 .github/workflows/main.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 27f480b65..10c9d1a8d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -66,10 +66,8 @@ jobs:
         run: |
               git submodule update --init --recursive
               sudo apt-get -y update
-              if [[ $php_version == "7.4" ]]; then
-                # Repo is missing for unknown reason
-                LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
-              fi
+              # Repo is missing for unknown reason
+              LC_ALL=C.UTF-8 sudo apt-add-repository ppa:ondrej/php -y
               sudo apt-get -y install curl python3 python3-zmq python3-requests python3-pip python3-nose python3-redis python3-lxml apache2 libapache2-mod-php$php_version libfuzzy-dev
               sudo pip3 install virtualenv # virtualenv must be instaled from pip and not from ubuntu pacckages
               sudo pip3 install --upgrade -r requirements.txt

From b17ddeaf70916883e89916df8052ac1c8d3ee0be Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 15 Mar 2021 10:51:48 +0100
Subject: [PATCH 350/437] chg: [feed] Check if value is clean IP without doing
 expensive operations

---
 app/Lib/Tools/ComplexTypeTool.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/Lib/Tools/ComplexTypeTool.php b/app/Lib/Tools/ComplexTypeTool.php
index 4b8242864..b3cd09110 100644
--- a/app/Lib/Tools/ComplexTypeTool.php
+++ b/app/Lib/Tools/ComplexTypeTool.php
@@ -246,6 +246,16 @@ class ComplexTypeTool
      */
     private function __resolveType($raw_input)
     {
+        // Check if value is clean IP without doing expensive operations.
+        if (filter_var($raw_input, FILTER_VALIDATE_IP)) {
+            return [
+                'types' => ['ip-dst', 'ip-src', 'ip-src/ip-dst'],
+                'to_ids' => true,
+                'default_type' => 'ip-dst',
+                'value' => $raw_input,
+            ];
+        }
+
         $input = array('raw' => $raw_input);
 
         // Check hashes before refang and port extracting, it is not necessary for hashes. This speedups parsing

From f320e030dc978fd500e8dc0578edafc30e2cf046 Mon Sep 17 00:00:00 2001
From: Tom King <tom.king2@baesystems.com>
Date: Mon, 15 Mar 2021 12:48:46 +0000
Subject: [PATCH 351/437] fix: Fixes bug that stops country flag being
 displayed alongside the coutry in galaxy clusters

---
 .../genericElements/IndexTable/Fields/galaxy_element_value.ctp  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/View/Elements/genericElements/IndexTable/Fields/galaxy_element_value.ctp b/app/View/Elements/genericElements/IndexTable/Fields/galaxy_element_value.ctp
index 8eac8983c..1365acdf3 100644
--- a/app/View/Elements/genericElements/IndexTable/Fields/galaxy_element_value.ctp
+++ b/app/View/Elements/genericElements/IndexTable/Fields/galaxy_element_value.ctp
@@ -7,7 +7,7 @@ if ($key === 'refs' &&
 ) {
     echo '<a href="' . h($value) . '" rel="noreferrer noopener">' . h($value) . '</a>';
 } else if ($key === 'country') {
-    echo $this->Icon->countryFlag($item['GalaxyElement']['value']) . ' ' . h($value);
+    echo $this->Icon->countryFlag($value) . ' ' . h($value);
 } else {
     echo h($value);
 }
\ No newline at end of file

From 2312fd72ff3e2acc070dda943e88cfa8f09fe3f9 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 15 Mar 2021 14:51:48 +0100
Subject: [PATCH 352/437] chg: [shibbauth] added two extra settings

- ApacheShibbauth.DefaultRole: defaults to false, if set, pick the supplied roleID for any user authenticating. Can be used together with BlockRoleModifications
- ApacheShibbauth.BlockRoleModifications: defaults to false, boolean. If set to true, will block any updates to the existing users on authentication. This preserves any modifications made by a site admin in MISP.
---
 .../Component/Auth/ApacheShibbAuthenticate.php    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php b/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
index fa830d337..1203a3f65 100644
--- a/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
+++ b/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
@@ -39,6 +39,8 @@ class ApacheShibbAuthenticate extends BaseAuthenticate
      *          'group_one' => 1,
      *       ),
      *      'DefaultOrg' => 'MY_ORG',
+     *      'DefaultRole' => false                   // set to a specific value if you wish to hard-set users created via ApacheShibbAuth
+     *      'BlockRoleModifications' => false        // set to true if you wish for the roles never to be updated during login. Especially *                                               // useful if you manually change roles in MISP
      * ),
      * @param CakeRequest $request The request that contains login information.
      * @param CakeResponse $response Unused response object.
@@ -72,6 +74,7 @@ class ApacheShibbAuthenticate extends BaseAuthenticate
         $orgTag = Configure::read('ApacheShibbAuth.OrgTag');
         $groupTag = Configure::read('ApacheShibbAuth.GroupTag');
         $groupRoleMatching = Configure::read('ApacheShibbAuth.GroupRoleMatching');
+        $blockRoleModifications = Configure::check('ApacheShibbAuth.GroupRoleMatching') ? Configure::read('ApacheShibbAuth.GroupRoleMatching') : false;
 
         // Get user values
         if (!isset($_SERVER[$mailTag])) {
@@ -110,20 +113,25 @@ class ApacheShibbAuthenticate extends BaseAuthenticate
             CakeLog::error('No role was assigned, no egroup matched the configuration.');
             return false; // Deny if the user is not in any egroup
         }
-
+        // if a default role is set, override the currently parsed out selection and use that instead.
+        $roleId = Configure::check('ApacheShibbAuth.DefaultRole') ? Configure::read('ApacheShibbAuth.DefaultRole') : $roleId;
+        if ($roleChanged) {
+            CakeLog::write('info', "User role $roleId assigned.");
+        }
         /** @var User $userModel */
         $userModel = ClassRegistry::init($this->settings['userModel']);
 
         if ($user) { // User already exists
             CakeLog::info( "User `$mispUsername` found in database.");
-            $user = $this->updateUserRole($roleChanged, $user, $roleId, $userModel);
+            if (!$blockRoleModifications) {
+                $user = $this->updateUserRole($roleChanged, $user, $roleId, $userModel);
+            }
             $user = $this->updateUserOrg($org, $user, $userModel);
             CakeLog::info("User `$mispUsername` logged in.");
             return $user;
         }
 
         CakeLog::info("User `$mispUsername` not found in database.");
-
         // Insert user in database if not existent
         $userData = array('User' => array(
             'email' => $mispUsername,
@@ -199,7 +207,6 @@ class ApacheShibbAuthenticate extends BaseAuthenticate
                         $roleId = $roleVal;
                         $roleChanged = true;
                     }
-                    CakeLog::write('info', "User role $roleId assigned.");
                 }
             }
             return array($roleChanged, $roleId);

From 045595968c92166f1a9d873d390b1408cf4102fe Mon Sep 17 00:00:00 2001
From: Tom King <tom.king2@baesystems.com>
Date: Mon, 15 Mar 2021 16:53:01 +0000
Subject: [PATCH 353/437] fix: [API] Fixes crash when a new indicator in
 existing event has a sighting

---
 app/Model/Attribute.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index b30c8897e..13616f45b 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -4076,10 +4076,6 @@ class Attribute extends AppModel
                 $attribute['distribution'] = 5;
             }
         }
-        if (isset($attribute['Sighting']) && !empty($attribute['Sighting'])) {
-            $this->Sighting = ClassRegistry::init('Sighting');
-            $this->Sighting->captureSightings($attribute['Sighting'], $attribute['id'], $eventId, $user);
-        }
         $fieldList = $this->editableFields;
         if (empty($existingAttribute)) {
             $addableFieldList = array('event_id', 'type', 'uuid');
@@ -4105,6 +4101,10 @@ class Attribute extends AppModel
             ));
             return $this->validationErrors;
         } else {
+            if (isset($attribute['Sighting']) && !empty($attribute['Sighting'])) {
+                $this->Sighting = ClassRegistry::init('Sighting');
+                $this->Sighting->captureSightings($attribute['Sighting'], $this->id, $eventId, $user);
+            }
             if ($user['Role']['perm_tagger']) {
                 /*
                     We should uncomment the line below in the future once we have tag soft-delete

From 284dc80f720e259d77c88232c22690a2a8287213 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Mon, 15 Mar 2021 18:12:58 +0100
Subject: [PATCH 354/437] chg: [UI] Show number of items in freetext feed

---
 app/View/Feeds/freetext_index.ctp | 69 +++++++++++++++----------------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/app/View/Feeds/freetext_index.ctp b/app/View/Feeds/freetext_index.ctp
index 01dc910a5..34658965f 100644
--- a/app/View/Feeds/freetext_index.ctp
+++ b/app/View/Feeds/freetext_index.ctp
@@ -1,5 +1,5 @@
 <div class="attributes index">
-    <h2><?php echo __('Parsed attributes from feed ');?><?php echo h($feed['Feed']['name']);?></h2>
+    <h2><?= __('Parsed attributes from feed %s', h($feed['Feed']['name']));?></h2>
     <?php
         echo $this->Form->create('Feed', array('url' => array('controller' => 'feeds', 'action' => 'fetchSelectedFromFreetextIndex', $feed['Feed']['id'])));
         echo $this->Form->input('data', array('style' => 'display:none;', 'label' => false, 'div' => false));
@@ -9,18 +9,18 @@
         echo $this->Form->end();
     ?>
     <div class="pagination">
-                <ul>
-                <?php
-                    $url = array_merge(array('controller' => 'feeds', 'action' => 'previewIndex', $feed['Feed']['id']), $this->request->named);
-                    $this->Paginator->options(array(
-                            'url' => $url,
-                    ));
-                        echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
-                        echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
-                        echo $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
-                ?>
-                </ul>
-        </div>
+        <ul>
+        <?php
+            $url = array_merge(array('controller' => 'feeds', 'action' => 'previewIndex', $feed['Feed']['id']), $this->request->named);
+            $this->Paginator->options(array(
+                'url' => $url,
+            ));
+            echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
+            echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
+            echo $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
+        ?>
+        </ul>
+    </div>
     <table class="table table-striped table-hover table-condensed">
     <tr>
         <th><input class="select_all" type="checkbox" onClick="toggleAllAttributeCheckboxes();" /></th>
@@ -41,7 +41,7 @@
         <td class="short" id="<?php echo h($key);?>_category"><?php echo h($attribute['category']);?></td>
         <td class="short" id="<?php echo h($key);?>_type"><?php echo h($attribute['default_type']);?></td>
         <td id="<?php echo h($key);?>_value"><?php echo h($attribute['value']);?></td>
-        <td class="short" id="<?php echo h($key);?>_to_ids" data-value="<?php echo h($attribute['to_ids']); ?>"><span class="icon-<?php echo $attribute['to_ids'] ? 'ok' : 'remove';?>"></span></td>
+        <td class="short" id="<?php echo h($key);?>_to_ids" data-value="<?php echo h($attribute['to_ids']); ?>"><span class="fa fa-<?= $attribute['to_ids'] ? 'check' : 'times';?>"></span></td>
         <td class="shortish">
             <?php
                 if (isset($attribute['correlations'])):
@@ -69,27 +69,25 @@
         endforeach;
     ?>
     </table>
+    <p>
+        <?= $this->Paginator->counter(array(
+            'format' => __('Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}'),
+        ));
+        ?>
+    </p>
     <div class="pagination">
-            <ul>
-            <?php
-                $this->Paginator->options(array(
-                    'url' => $url,
-                ));
-                echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
-                echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
-                echo $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
-            ?>
-            </ul>
+        <ul>
+        <?php
+            echo $this->Paginator->prev('&laquo; ' . __('previous'), array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'prev disabled', 'escape' => false, 'disabledTag' => 'span'));
+            echo $this->Paginator->numbers(array('modulus' => 20, 'separator' => '', 'tag' => 'li', 'currentClass' => 'active', 'currentTag' => 'span'));
+            echo $this->Paginator->next(__('next') . ' &raquo;', array('tag' => 'li', 'escape' => false), null, array('tag' => 'li', 'class' => 'next disabled', 'escape' => false, 'disabledTag' => 'span'));
+        ?>
+        </ul>
     </div>
 </div>
-<?php
-    echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'add'));
-?>
-
+<?= $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'add')); ?>
 <script type="text/javascript">
-
-var data = [];
-$(document).ready(function() {
+$(function() {
     popoverStartup();
 });
 
@@ -97,15 +95,14 @@ $('#FetchSelected').click(freetextFeedFetchSelected);
 
 function freetextFeedFetchSelected() {
     var payload = [];
-    var checkedIds = [];
     $('.select_attribute').each(function () {
         if (this.checked) {
             var row_id = $(this).data('rowid');
             payload.push({
-                'category': $('#' + row_id + '_category').html(),
-                'type': $('#' + row_id + '_type').html(),
-                'value': $('#' + row_id + '_value').html(),
-                'to_ids': $('#' + row_id + '_to_ids').data('value'),
+                category: $('#' + row_id + '_category').html(),
+                type: $('#' + row_id + '_type').html(),
+                value: $('#' + row_id + '_value').html(),
+                to_ids: $('#' + row_id + '_to_ids').data('value'),
             });
         }
     });

From a65cb60d7afb42c5d868a3dec9e6beb85723dad3 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 15 Mar 2021 20:37:25 +0100
Subject: [PATCH 355/437] fix: [shibbauth] fixed invalid varname

---
 .../Controller/Component/Auth/ApacheShibbAuthenticate.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php b/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
index 1203a3f65..5926c09b2 100644
--- a/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
+++ b/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
@@ -74,7 +74,7 @@ class ApacheShibbAuthenticate extends BaseAuthenticate
         $orgTag = Configure::read('ApacheShibbAuth.OrgTag');
         $groupTag = Configure::read('ApacheShibbAuth.GroupTag');
         $groupRoleMatching = Configure::read('ApacheShibbAuth.GroupRoleMatching');
-        $blockRoleModifications = Configure::check('ApacheShibbAuth.GroupRoleMatching') ? Configure::read('ApacheShibbAuth.GroupRoleMatching') : false;
+        $blockRoleModifications = Configure::check('ApacheShibbAuth.BlockRoleModifications') ? Configure::read('ApacheShibbAuth.BlockRoleModifications') : false;
 
         // Get user values
         if (!isset($_SERVER[$mailTag])) {

From 8d03ba7dc1803f33a3fea80f0a13091f8dc6e143 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 16 Mar 2021 20:37:23 +0100
Subject: [PATCH 356/437] fix: [internal] Keep OidcAuth setting when modify
 setting value from UI

---
 app/Model/Server.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index 3d746a6bf..4a845e397 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -2189,13 +2189,13 @@ class Server extends AppModel
             $this->Log = ClassRegistry::init('Log');
             $this->Log->create();
             $this->Log->save(array(
-                    'org' => 'SYSTEM',
-                    'model' => 'Server',
-                    'model_id' => $id,
-                    'email' => 'SYSTEM',
-                    'action' => 'error',
-                    'user_id' => 0,
-                    'title' => 'Error: Tried to modify server settings but current config is broken.',
+                'org' => 'SYSTEM',
+                'model' => 'Server',
+                'model_id' => 0,
+                'email' => 'SYSTEM',
+                'action' => 'error',
+                'user_id' => 0,
+                'title' => 'Error: Tried to modify server settings but current config is broken.',
             ));
             return false;
         }
@@ -2234,7 +2234,7 @@ class Server extends AppModel
             'debug', 'MISP', 'GnuPG', 'SMIME', 'Proxy', 'SecureAuth',
             'Security', 'Session.defaults', 'Session.timeout', 'Session.cookieTimeout',
             'Session.autoRegenerate', 'Session.checkAgent', 'site_admin_debug',
-            'Plugin', 'CertAuth', 'ApacheShibbAuth', 'ApacheSecureAuth'
+            'Plugin', 'CertAuth', 'ApacheShibbAuth', 'ApacheSecureAuth', 'OidcAuth',
         );
         $settingsArray = array();
         foreach ($settingsToSave as $setting) {
@@ -2247,7 +2247,7 @@ class Server extends AppModel
         }
         if (empty(Configure::read('MISP.server_settings_skip_backup_rotate'))) {
             $randomFilename = $this->generateRandomFileName();
-            // To protect us from 2 admin users having a concurent file write to the config file, solar flares and the bogeyman
+            // To protect us from 2 admin users having a concurrent file write to the config file, solar flares and the bogeyman
             file_put_contents(APP . 'Config' . DS . $randomFilename, $settingsString);
             rename(APP . 'Config' . DS . $randomFilename, APP . 'Config' . DS . 'config.php');
             $config_saved = file_get_contents(APP . 'Config' . DS . 'config.php');
@@ -2257,14 +2257,14 @@ class Server extends AppModel
                 $this->Log = ClassRegistry::init('Log');
                 $this->Log->create();
                 $this->Log->save(array(
-                        'org' => 'SYSTEM',
-                        'model' => 'Server',
-                        'model_id' => $id,
-                        'email' => 'SYSTEM',
-                        'action' => 'error',
-                        'user_id' => 0,
-                        'title' => 'Error: Something went wrong saving the config file, reverted to backup file.',
-                ));
+                    'org' => 'SYSTEM',
+                    'model' => 'Server',
+                    'model_id' => 0,
+                    'email' => 'SYSTEM',
+                    'action' => 'error',
+                    'user_id' => 0,
+                    'title' => 'Error: Something went wrong saving the config file, reverted to backup file.',
+               ));
                 return false;
             }
         } else {

From b773361561e77b1544eda068cf2690ce807fa191 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 16 Mar 2021 23:13:52 +0100
Subject: [PATCH 357/437] fix: [refanging] Removed obnoxious regexes, fixes
 #7214

- refanging \\. and .. to . is a stupid idea
---
 app/Lib/Tools/ComplexTypeTool.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/Lib/Tools/ComplexTypeTool.php b/app/Lib/Tools/ComplexTypeTool.php
index 71569b10c..6adef3ecf 100644
--- a/app/Lib/Tools/ComplexTypeTool.php
+++ b/app/Lib/Tools/ComplexTypeTool.php
@@ -10,15 +10,10 @@ class ComplexTypeTool
             'types' => array('link', 'url')
         ),
         array(
-            'from' => '/(\[\.\]|\[dot\]|\(dot\)|\\\\\.)/',
+            'from' => '/(\[\.\]|\[dot\]|\(dot\))/',
             'to' => '.',
             'types' => array('link', 'url', 'ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
         ),
-        array(
-            'from' => '/\.+/',
-            'to' => '.',
-            'types' => array('ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
-        ),
         array(
             'from' => '/\[hxxp:\/\/\]/',
             'to' => 'http://',

From 84f91aff2b5544cdbbdd7353af0068b02ce88132 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Wed, 17 Mar 2021 11:58:25 +0900
Subject: [PATCH 358/437] fix: [swp] /var/swap.img is not a safe place.

---
 INSTALL/INSTALL.sh        | 14 ++++++++------
 INSTALL/INSTALL.sh.sfv    |  6 +++---
 INSTALL/INSTALL.sh.sha1   |  2 +-
 INSTALL/INSTALL.sh.sha256 |  2 +-
 INSTALL/INSTALL.sh.sha384 |  2 +-
 INSTALL/INSTALL.sh.sha512 |  2 +-
 docs/INSTALL.rhel7.md     | 14 ++++++++------
 docs/INSTALL.rhel8.md     | 14 ++++++++------
 8 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh
index e2f965901..01d9417fd 100755
--- a/INSTALL/INSTALL.sh
+++ b/INSTALL/INSTALL.sh
@@ -2163,13 +2163,15 @@ installCoreRHEL () {
     # In case you get "internal compiler error: Killed (program cc1plus)"
     # You ran out of memory.
     # Create some swap
-    sudo dd if=/dev/zero of=/var/swap.img bs=1024k count=4000
-    sudo mkswap /var/swap.img
-    sudo swapon /var/swap.img
+    TEMP_DIR=$(mktemp -d)
+    TEMP_SWAP=${TEMP_DIR}/swap.img
+    sudo dd if=/dev/zero of=${TEMP_SWAP} bs=1024k count=4000
+    sudo mkswap ${TEMP_SWAP}
+    sudo swapon ${TEMP_SWAP}
     # And compile again
-    $SUDO_WWW make -j3 pyLIEF
-    sudo swapoff /var/swap.img
-    sudo rm /var/swap.img
+    ${SUDO_WWW} make -j3 pyLIEF
+    sudo swapoff ${TEMP_SWAP}
+    sudo rm -r ${TEMP_DIR}
   fi
 
   # The following adds a PYTHONPATH to where the pyLIEF module has been compiled
diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv
index 9a94998a7..b3bc21bc0 100644
--- a/INSTALL/INSTALL.sh.sfv
+++ b/INSTALL/INSTALL.sh.sfv
@@ -1,5 +1,5 @@
-; Generated by RHash v1.3.9 on 2021-02-15 at 12:01.57
+; Generated by RHash v1.4.0 on 2021-03-17 at 11:58.01
 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
 ;
-;       137749  12:01.57 2021-02-15 INSTALL.sh
-INSTALL.sh 5C4651E28DAD85AFCB59E6914D8ACAB6E447BEB7 506B3B399D5B8EC140538054D9E78ABFA11A8AD45CE5E42AC77A72FB71762FDE 400AFBF6ACA765F314F4D044ABC28D3D94E38D6223F642E1BED3F8C7884CAA64BAA10647352E5BF94411DA8A6753D549 3AC6B5A002645E7F29547F1134BE3C744BFD3D1B253473702B9132E7CEC271474333407F7AA375996EAF9A9877E8E73A7D3C655DDC6E9C7A83F5DF37FA418FB6
+;       137809  11:57.59 2021-03-17 INSTALL.sh
+INSTALL.sh 5264D3699A8122AD797C52D64DB3BDB59FF98B4E 072391BE950D876396C4C858515D429DCD5ECB1DDA6C52ABD8AC81FB1DA336C0 3BAA227161359FB6449FE7CCDAACF9985362DE128BC09296D6B543646DEA958611786F1B8F816AC11E0C9AAB15149D7E 5A1DF67A94B0F45967EA478EEB610AA33AAD1ABF2D4D27267AB8813C163683C98549071FE05275D5A99BCB08A5A6F703073563E46601E2727DE34ECFE57757D9
diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1
index 186be4f2b..47839d86f 100644
--- a/INSTALL/INSTALL.sh.sha1
+++ b/INSTALL/INSTALL.sh.sha1
@@ -1 +1 @@
-5c4651e28dad85afcb59e6914d8acab6e447beb7  INSTALL.sh
+5264d3699a8122ad797c52d64db3bdb59ff98b4e  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256
index 09585260d..3d6ee6635 100644
--- a/INSTALL/INSTALL.sh.sha256
+++ b/INSTALL/INSTALL.sh.sha256
@@ -1 +1 @@
-506b3b399d5b8ec140538054d9e78abfa11a8ad45ce5e42ac77a72fb71762fde  INSTALL.sh
+072391be950d876396c4c858515d429dcd5ecb1dda6c52abd8ac81fb1da336c0  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384
index 65d56ae61..850e8da6b 100644
--- a/INSTALL/INSTALL.sh.sha384
+++ b/INSTALL/INSTALL.sh.sha384
@@ -1 +1 @@
-400afbf6aca765f314f4d044abc28d3d94e38d6223f642e1bed3f8c7884caa64baa10647352e5bf94411da8a6753d549  INSTALL.sh
+3baa227161359fb6449fe7ccdaacf9985362de128bc09296d6b543646dea958611786f1b8f816ac11e0c9aab15149d7e  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512
index 0ea3da889..5ee66a274 100644
--- a/INSTALL/INSTALL.sh.sha512
+++ b/INSTALL/INSTALL.sh.sha512
@@ -1 +1 @@
-3ac6b5a002645e7f29547f1134be3c744bfd3d1b253473702b9132e7cec271474333407f7aa375996eaf9a9877e8e73a7d3c655ddc6e9c7a83f5df37fa418fb6  INSTALL.sh
+5a1df67a94b0f45967ea478eeb610aa33aad1abf2d4d27267ab8813c163683c98549071fe05275d5a99bcb08a5a6f703073563e46601e2727de34ecfe57757d9  INSTALL.sh
diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index f99124ed2..319c26d5d 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -280,13 +280,15 @@ installCoreRHEL () {
     # In case you get "internal compiler error: Killed (program cc1plus)"
     # You ran out of memory.
     # Create some swap
-    sudo dd if=/dev/zero of=/var/swap.img bs=1024k count=4000
-    sudo mkswap /var/swap.img
-    sudo swapon /var/swap.img
+    TEMP_DIR=$(mktemp -d)
+    TEMP_SWAP=${TEMP_DIR}/swap.img
+    sudo dd if=/dev/zero of=${TEMP_SWAP} bs=1024k count=4000
+    sudo mkswap ${TEMP_SWAP}
+    sudo swapon ${TEMP_SWAP}
     # And compile again
-    $SUDO_WWW make -j3 pyLIEF
-    sudo swapoff /var/swap.img
-    sudo rm /var/swap.img
+    ${SUDO_WWW} make -j3 pyLIEF
+    sudo swapoff ${TEMP_SWAP}
+    sudo rm -r ${TEMP_DIR}
   fi
 
   # The following adds a PYTHONPATH to where the pyLIEF module has been compiled
diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 3f3d35901..5dc9ca7fb 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -255,13 +255,15 @@ installCoreRHEL () {
     # In case you get "internal compiler error: Killed (program cc1plus)"
     # You ran out of memory.
     # Create some swap
-    sudo dd if=/dev/zero of=/var/swap.img bs=1024k count=4000
-    sudo mkswap /var/swap.img
-    sudo swapon /var/swap.img
+    TEMP_DIR=$(mktemp -d)
+    TEMP_SWAP=${TEMP_DIR}/swap.img
+    sudo dd if=/dev/zero of=${TEMP_SWAP} bs=1024k count=4000
+    sudo mkswap ${TEMP_SWAP}
+    sudo swapon ${TEMP_SWAP}
     # And compile again
-    $SUDO_WWW make -j3 pyLIEF
-    sudo swapoff /var/swap.img
-    sudo rm /var/swap.img
+    ${SUDO_WWW} make -j3 pyLIEF
+    sudo swapoff ${TEMP_SWAP}
+    sudo rm -r ${TEMP_DIR}
   fi
 
   # The following adds a PYTHONPATH to where the pyLIEF module has been compiled

From 4474dcc2cf839bf93557fc28793c16f5a2ed19f0 Mon Sep 17 00:00:00 2001
From: Tom King <tom.king2@baesystems.com>
Date: Wed, 17 Mar 2021 15:31:36 +0000
Subject: [PATCH 359/437] fix: [Sync] Crash when attempting to sync with 'Pull
 Galaxy Clusters' enabled

---
 app/Model/GalaxyCluster.php         | 2 +-
 app/Model/GalaxyClusterRelation.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index 76cf6eeb4..1f0954b51 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -818,7 +818,7 @@ class GalaxyCluster extends AppModel
     {
         $this->Event = ClassRegistry::init('Event');
         if (isset($element[$model]['distribution']) && $element[$model]['distribution'] == 4) {
-            $element[$model] = $this->Event->__captureSGForElement($element[$model], $user);
+            $element[$model] = $this->Event->captureSGForElement($element[$model], $user);
         }
         // first we want to see how the creator organisation is encoded
         // The options here are either by passing an organisation object along or simply passing a string along
diff --git a/app/Model/GalaxyClusterRelation.php b/app/Model/GalaxyClusterRelation.php
index 3055ed2aa..246fad5cd 100644
--- a/app/Model/GalaxyClusterRelation.php
+++ b/app/Model/GalaxyClusterRelation.php
@@ -475,7 +475,7 @@ class GalaxyClusterRelation extends AppModel
 
             $this->Event = ClassRegistry::init('Event');
             if (isset($relation['GalaxyClusterRelation']['distribution']) && $relation['GalaxyClusterRelation']['distribution'] == 4) {
-                $relation['GalaxyClusterRelation'] = $this->Event->__captureSGForElement($relation['GalaxyClusterRelation'], $user);
+                $relation['GalaxyClusterRelation'] = $this->Event->captureSGForElement($relation['GalaxyClusterRelation'], $user);
             }
 
             $saveSuccess = $this->save($relation);

From f74257670b5b233a754e613882ba499cc4756a4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Thu, 18 Mar 2021 01:06:05 +0100
Subject: [PATCH 360/437] fix: remove broken refang

---
 app/Test/ComplexTypeToolTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Test/ComplexTypeToolTest.php b/app/Test/ComplexTypeToolTest.php
index a605af0e6..35936b0d2 100644
--- a/app/Test/ComplexTypeToolTest.php
+++ b/app/Test/ComplexTypeToolTest.php
@@ -516,7 +516,7 @@ EOT;
     public function testRefangValueDot(): void
     {
         $complexTypeTool = new ComplexTypeTool();
-        foreach (['127.0.0.1', '127[.]0.0.1', '127[.]0[.]0[.]1', '127[dot]0[dot]0[dot]1', '127(dot)0(dot)0(dot)1', '127\.0.0.1'] as $test) {
+        foreach (['127.0.0.1', '127[.]0.0.1', '127[.]0[.]0[.]1', '127[dot]0[dot]0[dot]1', '127(dot)0(dot)0(dot)1'] as $test) {
             $this->assertEquals('127.0.0.1', $complexTypeTool->refangValue($test, 'ip-src'));
         }
     }

From bd762ed09224174fc87799cc7bb66d2844a2aeb0 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Thu, 18 Mar 2021 20:10:04 +0100
Subject: [PATCH 361/437] chg: [test] Add test for #7214

---
 app/Test/ComplexTypeToolTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Test/ComplexTypeToolTest.php b/app/Test/ComplexTypeToolTest.php
index 35936b0d2..061ee8376 100644
--- a/app/Test/ComplexTypeToolTest.php
+++ b/app/Test/ComplexTypeToolTest.php
@@ -520,4 +520,12 @@ EOT;
             $this->assertEquals('127.0.0.1', $complexTypeTool->refangValue($test, 'ip-src'));
         }
     }
+
+    // see #7214
+    public function testRefangKeepBackslashes(): void
+    {
+        $text = 'http://googlechromeupdater.twilightparadox.com/html?DVXNSTHORF=fd6f240590734406be3bd35ca3622ea0;GRIBOOZ0LN=a3bf23855b0b40dda08f709fabb60d32;\..\..\..\./mshtml,RunHTMLApplication';
+        $complexTypeTool = new ComplexTypeTool();
+        $this->assertEquals($text, $complexTypeTool->refangValue($text, 'url'));
+    }
 }

From 374b10d623bf1a1d9bc1c5b1f979738dcb1120d4 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Tue, 23 Feb 2021 19:28:08 +0100
Subject: [PATCH 362/437] new: [UI] Reworked galaxy quick view

---
 app/Controller/ServersController.php          |  21 +++
 .../View/row_attribute_simulation.ctp         |   4 +-
 .../Elements/Events/View/row_attribute.ctp    |   3 +-
 app/View/Elements/Events/eventIndexTable.ctp  |   2 +-
 app/View/Elements/Servers/eventattribute.ctp  |   1 -
 .../Elements/TagCollections/index_row.ctp     |   2 +-
 app/View/Elements/galaxyQuickView.ctp         | 160 ------------------
 app/View/Elements/galaxyQuickViewMini.ctp     | 120 -------------
 app/View/Elements/galaxyQuickViewNew.ctp      | 140 +++++++++++++++
 app/View/Events/ajax/ajaxGalaxies.ctp         |  29 ++--
 app/View/Events/view.ctp                      |  12 +-
 app/View/Servers/preview_event.ctp            |   9 +
 app/webroot/css/main.css                      |  80 ++++++---
 app/webroot/js/misp.js                        |  23 ++-
 14 files changed, 267 insertions(+), 339 deletions(-)
 delete mode 100755 app/View/Elements/galaxyQuickView.ctp
 delete mode 100644 app/View/Elements/galaxyQuickViewMini.ctp
 create mode 100755 app/View/Elements/galaxyQuickViewNew.ctp

diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 447a05e90..d8eb3a38c 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -181,6 +181,7 @@ class ServersController extends AppController
 
         $this->loadModel('Event');
         $params = $this->Event->rearrangeEventForView($event, $this->passedArgs, $all);
+        $this->__removeGalaxyClusterTags($event);
         $this->params->params['paging'] = array('Server' => $params);
         $this->set('event', $event);
         $this->set('server', $server);
@@ -205,6 +206,26 @@ class ServersController extends AppController
         $this->set('title_for_layout', __('Remote event preview'));
     }
 
+    private function __removeGalaxyClusterTags(array &$event)
+    {
+        $galaxyTagIds = [];
+        foreach ($event['Galaxy'] as $galaxy) {
+            foreach ($galaxy['GalaxyCluster'] as $galaxyCluster) {
+                $galaxyTagIds[$galaxyCluster['tag_id']] = true;
+            }
+        }
+
+        if (empty($galaxyTagIds)) {
+            return;
+        }
+
+        foreach ($event['Tag'] as $k => $eventTag) {
+            if (isset($galaxyTagIds[$eventTag['id']])) {
+                unset($event['Tag'][$k]);
+            }
+        }
+    }
+
     public function compareServers()
     {
         list($servers, $overlap) = $this->Server->serverEventsOverlap();
diff --git a/app/View/Elements/DecayingModels/View/row_attribute_simulation.ctp b/app/View/Elements/DecayingModels/View/row_attribute_simulation.ctp
index 8ca90cc84..0197c6ed5 100644
--- a/app/View/Elements/DecayingModels/View/row_attribute_simulation.ctp
+++ b/app/View/Elements/DecayingModels/View/row_attribute_simulation.ctp
@@ -55,11 +55,11 @@
     ?>
     <td class="short" id="attribute_<?php echo h($object['id']); ?>_galaxy">
       <?php
-        echo $this->element('galaxyQuickViewMini', array(
+        echo $this->element('galaxyQuickViewNew', array(
             'mayModify' => false,
             'isSiteAdmin' => false, // prevent add button
             'isAclTagger' => false,
-            'data' => (!empty($object['Galaxy']) ? $object['Galaxy'] : array()),
+            'data' => !empty($object['Galaxy']) ? $object['Galaxy'] : array(),
             'target_id' => $object['id'],
             'target_type' => 'attribute'
         ));
diff --git a/app/View/Elements/Events/View/row_attribute.ctp b/app/View/Elements/Events/View/row_attribute.ctp
index e05934420..e409f7cd9 100644
--- a/app/View/Elements/Events/View/row_attribute.ctp
+++ b/app/View/Elements/Events/View/row_attribute.ctp
@@ -162,13 +162,12 @@ $quickEdit = function($fieldName) use ($editScope, $object, $event) {
     <?php $rowId = sprintf('attribute_%s_galaxy', h($objectId)); ?>
     <td class="short" id="<?= $rowId ?>">
       <?php
-        echo $this->element('galaxyQuickViewMini', array(
+        echo $this->element('galaxyQuickViewNew', array(
           'mayModify' => $mayModify,
           'isAclTagger' => $isAclTagger,
           'data' => (!empty($object['Galaxy']) ? $object['Galaxy'] : array()),
           'target_id' => $object['id'],
           'target_type' => 'attribute',
-          'rowId' => $rowId,
         ));
       ?>
     </td>
diff --git a/app/View/Elements/Events/eventIndexTable.ctp b/app/View/Elements/Events/eventIndexTable.ctp
index 911afa155..6e23498b4 100644
--- a/app/View/Elements/Events/eventIndexTable.ctp
+++ b/app/View/Elements/Events/eventIndexTable.ctp
@@ -106,7 +106,7 @@
                         unset($galaxy_cluster['Galaxy']);
                         $galaxies[$galaxy_id]['GalaxyCluster'][] = $galaxy_cluster;
                     }
-                    echo $this->element('galaxyQuickViewMini', array(
+                    echo $this->element('galaxyQuickViewNew', array(
                       'mayModify' => false,
                       'isAclTagger' => false,
                       'data' => $galaxies,
diff --git a/app/View/Elements/Servers/eventattribute.ctp b/app/View/Elements/Servers/eventattribute.ctp
index 024e461d2..ee5342b91 100644
--- a/app/View/Elements/Servers/eventattribute.ctp
+++ b/app/View/Elements/Servers/eventattribute.ctp
@@ -31,7 +31,6 @@
             </li>
         </ul>
     </div>
-<br />
 <div id="attributeList" class="attributeListContainer">
     <table class="table table-striped table-condensed">
         <tr>
diff --git a/app/View/Elements/TagCollections/index_row.ctp b/app/View/Elements/TagCollections/index_row.ctp
index bf3f4cc9b..9e1401da1 100644
--- a/app/View/Elements/TagCollections/index_row.ctp
+++ b/app/View/Elements/TagCollections/index_row.ctp
@@ -20,7 +20,7 @@
         </td>
         <td class="shortish">
           <?php
-            echo $this->element('galaxyQuickViewMini', array(
+            echo $this->element('galaxyQuickViewNew', array(
               'mayModify' => ($isSiteAdmin || $me['org_id'] == $item['TagCollection']['org_id']),
               'isAclTagger' => $me['Role']['perm_tagger'],
               'data' => $item['Galaxy'],
diff --git a/app/View/Elements/galaxyQuickView.ctp b/app/View/Elements/galaxyQuickView.ctp
deleted file mode 100755
index aa8006408..000000000
--- a/app/View/Elements/galaxyQuickView.ctp
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-    $fixed_fields = array('synonyms', 'description', 'meta', 'authors', 'source');
-    foreach ($data as $galaxy) {
-        $cluster_data = '';
-        foreach ($galaxy['GalaxyCluster'] as $cluster) {
-            $cluster_fields = array();
-            if (isset($cluster['description'])) {
-                $cluster_fields[] = array('key' => 'description', 'value' => $cluster['description']);
-            }
-            if (isset($cluster['meta']['synonyms'])) {
-                $cluster_fields[] = array('key' => 'synonyms', 'value' => $cluster['meta']['synonyms']);
-            }
-            if (isset($cluster['source'])) {
-                $cluster_fields[] = array('key' => 'source', 'value' => $cluster['source']);
-            }
-            if (isset($cluster['authors'])) {
-                $cluster_fields[] = array('key' => 'authors', 'value' => $cluster['authors']);
-            }
-            if (!empty($cluster['meta'])) {
-                foreach ($cluster['meta'] as $metaKey => $metaField) {
-                    if ($metaKey != 'synonyms') {
-                        $cluster_fields[] = array('key' => $metaKey, 'value' => $metaField);
-                    }
-                }
-            }
-            $data = '';
-            foreach ($cluster_fields as $cluster_field) {
-                $dataKey = h(ucfirst($cluster_field['key']));
-                $dataValue = '';
-                if (is_array($cluster_field['value'])) {
-                    if ($cluster_field['key'] == 'refs') {
-                        $value = array();
-                        foreach ($cluster_field['value'] as $k => $v) {
-                            $v_name = strlen($v) > 30 ? substr($v, 0, 30) . '...' : $v;
-                            $value[$k] = sprintf('<a href="%s" title="%s">%s</a>', h($v), h($v), h($v_name));
-                        }
-                        $dataValue .= nl2br(implode("\n", $value));
-                    } else if($cluster_field['key'] == 'country') {
-                        $value = array();
-                        foreach ($cluster_field['value'] as $k => $v) {
-                            $value[] = $this->Icon->countryFlag($v) . '&nbsp;' . h($v);
-                        }
-                        $dataValue .= nl2br(implode("\n", $value));
-                    } else {
-                        $dataValue .= nl2br(h(implode("\n", $cluster_field['value'])));
-                    }
-                } else {
-                     if ($cluster_field['key'] == 'source' && filter_var($cluster_field['value'], FILTER_VALIDATE_URL)) {
-                         $dataValue .= '<a href="' . h($cluster_field['value']) . '">' . h($cluster_field['value']) . '</a>';;
-                     } else {
-                        $dataValue .= h($cluster_field['value']);
-                     }
-                }
-                $data .= sprintf(
-                    '<div class="blue galaxy_data">%s</div>',
-                    sprintf(
-                        '<div class="row-fluid cluster_%s">%s%s</div>',
-                        h($cluster_field['key']),
-                        sprintf('<div class="span3 info_container_key">%s</div>', $dataKey),
-                        sprintf('<div class="span9 info_container_value">%s</div>', $dataValue)
-                    )
-                );
-            }
-            $cluster_data .= sprintf(
-                '<div class="large-left-margin"><span class="bold blue expandContainer">%s %s %s %s %s %s</span></div>',
-                '<span class="collapse-status-container useCursorPointer"><span class="collapse-status">+</span></span>',
-                sprintf(
-                    '<span class="clusterName useCursorPointer" data-clusterid="%s"><i class="fas fa-%s"></i> %s</span>',
-                    h($cluster['id']),
-                    $cluster['local'] ? 'user' : 'globe-americas',
-                    h($cluster['value'])
-                ),
-                sprintf(
-                    '<a href="%s/galaxy_clusters/view/%s" class="fa fa-search" title="%s" aria-label="%s"></a>&nbsp;',
-                    $baseurl,
-                    h($cluster['id']),
-                    __('View details about this cluster'),
-                    __('View cluster')
-                ),
-                sprintf(
-                    '<a href="%s/events/index/searchtag:%s" class="fa fa-list" title="%s" aria-label="%s"></a>',
-                    $baseurl,
-                    h($cluster['tag_id']),
-                    __('View all events containing this cluster.'),
-                    __('View all events containing this cluster.')
-                ),
-                !$isSiteAdmin && (!$mayModify || !$isAclTagger) ? '' : sprintf(
-                    '%s%s%s',
-                    $this->Form->create(
-                        false,
-                        array(
-                            'url' => $baseurl . '/galaxy_clusters/detach/' . ucfirst(h($target_id)) . '/' . h($target_type) . '/' . $cluster['tag_id'],
-                            'style' => 'display: inline-block; margin: 0px;'
-                        )
-                    ),
-                    sprintf(
-                        '<it href="#" class="fa fa-trash useCursorPointer" role="button" tabindex="0" aria-label="%s" title="%s" onclick="popoverConfirm(this)"></it>',
-                        __('detach'),
-                        __('Are you sure you want to detach %s from this event?', h($cluster['value']))
-                    ),
-                    $this->Form->end()
-                ),
-                $data
-            );
-        }
-        echo sprintf(
-            '<div class="large-left-margin"><span title="%s" class="bold blue" style="%s">%s&nbsp;%s%s</span></div>',
-            isset($galaxy['description']) ? h($galaxy['description']) : h($galaxy['name']),
-            'font-size:14px;',
-            h($galaxy['name']),
-            sprintf(
-                '<a href="%s/galaxies/view/%s" class="fa fa-search" title="%s" aria-label="%s"></a>',
-                $baseurl,
-                h($galaxy['id']),
-                __('View details about this galaxy'),
-                __('View galaxy')
-            ),
-            $cluster_data
-        );
-    }
-    if ($isSiteAdmin || ($mayModify && $isAclTagger)) {
-        echo sprintf(
-            '<button class="%s" data-target-type="%s" data-target-id="%s" data-local="false" role="button" tabindex="0" aria-label="' . __('Add new cluster') . '" title="' . __('Add a tag') . '" style="%s">%s</button>',
-            'useCursorPointer btn btn-inverse addGalaxy',
-            h($target_type),
-            h($target_id),
-            'line-height:10px; padding: 2px; margin-right:5px;',
-            '<i class="fas fa-globe-americas"></i> +'
-        );
-    }
-    if (
-        (!isset($local_tag_off) || !$local_tag_off) &&
-        ($isSiteAdmin || ($isAclTagger && Configure::read('MISP.host_org_id') == $me['org_id']))
-    ) {
-        echo sprintf(
-            '<button class="%s" data-target-type="%s" data-target-id="%s" data-local="true" role="button" tabindex="0" aria-label="' . __('Add new local cluster') . '" title="' . __('Add a local tag') . '" style="%s">%s</button>',
-            'useCursorPointer btn btn-inverse addGalaxy',
-            h($target_type),
-            h($target_id),
-            'line-height:10px; padding: 2px;',
-            '<i class="fas fa-user"></i> +'
-        );
-    }
-?>
-<script type="text/javascript">
-    $(document).ready(function () {
-        $('.collapse-status-container').click(function() {
-            $(this).parent().children('.galaxy_data').toggle();
-            if ($(this).parent().children('.collapse-status-container').children('.collapse-status').html() == '+') {
-                $(this).parent().children('.collapse-status-container').children('.collapse-status').html('-');
-            } else {
-                $(this).parent().children('.collapse-status-container').children('.collapse-status').html('+');
-            }
-        });
-
-        $('.clusterName').on('click', function() {
-            loadClusterRelations($(this).data('clusterid'));
-        })
-    });
-</script>
diff --git a/app/View/Elements/galaxyQuickViewMini.ctp b/app/View/Elements/galaxyQuickViewMini.ctp
deleted file mode 100644
index 064a565a3..000000000
--- a/app/View/Elements/galaxyQuickViewMini.ctp
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-    $fixed_fields = array('synonyms', 'description', 'meta', 'authors', 'source');
-    foreach ($data as $galaxy):
-?>
-        <div>
-            <span title="<?php echo isset($galaxy['description']) ? h($galaxy['description']) : h($galaxy['name']);?>" class="bold blue" style="font-size:14px;">
-                <?php echo h($galaxy['name']); ?>&nbsp;
-            </span>
-    <?php
-        foreach ($galaxy['GalaxyCluster'] as $cluster):
-            $cluster_fields = array();
-            if (!empty($cluster['description'])) {
-                $cluster_fields[] = array('key' => 'description', 'value' => $cluster['description']);
-            }
-            if (isset($cluster['meta']['synonyms'])) {
-                $cluster_fields[] = array('key' => 'synonyms', 'value' => $cluster['meta']['synonyms']);
-            }
-            if (isset($cluster['source'])) {
-                $cluster_fields[] = array('key' => 'source', 'value' => $cluster['source']);
-            }
-            if (!empty($cluster['meta'])) {
-                foreach ($cluster['meta'] as $metaKey => $metaField) {
-                    if (!in_array($metaKey, ['synonyms', 'refs'], true)) {
-                        $cluster_fields[] = array('key' => $metaKey, 'value' => $metaField);
-                    }
-                }
-            }
-            $popover_data = '<h4 class="blue bold">' . h($cluster['value']) . '</h4>';
-            foreach ($cluster_fields as $cluster_field) {
-                $key = sprintf('<span class="blue bold">%s</span>', Inflector::humanize(h($cluster_field['key'])));
-                if (is_array($cluster_field['value'])) {
-                    if ($cluster_field['key'] === 'country') {
-                        $value = array();
-                        foreach ($cluster_field['value'] as $k => $v) {
-                            $value[] = $this->Icon->countryFlag($v) . '&nbsp;' . h($v);
-                        }
-                        $value_contents = implode("<br>", $value);
-                    } else {
-                        $value_contents = nl2br(h(implode("\n", $cluster_field['value'])), false);
-                    }
-                } else {
-                    $value_contents = h($cluster_field['value']);
-                }
-                $value = sprintf('<span class="black">%s</span>', $value_contents);
-                $popover_data .= "<span>$key: $value</span><br>";
-            }
-            echo sprintf(
-                '<div class="large-left-margin">%s %s %s %s</div>',
-                sprintf(
-                    '<span class="bold blue expandable useCursorPointer" data-content="%s" data-clusterid="%s">%s</span>',
-                    h($popover_data),
-                    h($cluster['id']),
-                    sprintf(
-                        '<span><i class="fas fa-%s"></i> %s</span>',
-                        $cluster['local'] ? 'user' : 'globe-americas',
-                        h($cluster['value'])
-                    )
-                ),
-                sprintf(
-                    '<a href="%s/galaxy_clusters/view/%s" class="black fas fa-search" title="%s" aria-label="%s"></a>',
-                    $baseurl,
-                    h($cluster['id']),
-                    __('View details about this cluster'),
-                    __('View cluster')
-                ),
-                sprintf(
-                    '<a href="%s/events/index/searchtag:%s" class="black fas fa-list" title="%s" aria-label="%s"></a>',
-                    $baseurl,
-                    h($cluster['tag_id']),
-                    __('View all events containing this cluster.'),
-                    __('View all events containing this cluster.')
-                ),
-                (!empty($static_tags_only) || (!$isSiteAdmin && (!$mayModify || !$isAclTagger))) ? '' : sprintf(
-                    '%s%s%s',
-                    $this->Form->create(
-                        false,
-                        array(
-                            'url' => $baseurl . '/galaxy_clusters/detach/' . ucfirst(h($target_id)) . '/' . h($target_type) . '/' . h($cluster['tag_id']),
-                            'style' => 'display: inline-block; margin: 0px;'
-                        )
-                    ),
-                    sprintf(
-                        '<span href="#" class="fa fa-trash useCursorPointer" title="%s" onclick="popoverConfirm(this)"></span>',
-                        __('Are you sure you want to detach %s from this %s?', h($cluster['value']), h($target_type))
-                    ),
-                    $this->Form->end()
-                )
-            );
-        endforeach;
-?>
-    </div>
-<?php
-    endforeach;
-?>
-<?php
-    if (empty($static_tags_only)) {
-        if ($isSiteAdmin || ($mayModify && $isAclTagger)) {
-            echo sprintf(
-                '<button class="%s" data-target-type="%s" data-target-id="%s" data-local="false" role="button" tabindex="0" aria-label="' . __('Add new cluster') . '" title="' . __('Add a tag') . '" style="%s">%s</button>',
-                'useCursorPointer btn btn-inverse addGalaxy',
-                h($target_type),
-                h($target_id),
-                'line-height:10px; padding: 2px; margin-right:5px;',
-                '<i class="fas fa-globe-americas"></i> +'
-            );
-        }
-        if (
-            (!isset($local_tag_off) || !$local_tag_off) &&
-            ($isSiteAdmin || ($mayModify && $isAclTagger) || ($isAclTagger && Configure::read('MISP.host_org_id') == $me['org_id']))
-        ) {
-            echo sprintf(
-                '<button class="%s" data-target-type="%s" data-target-id="%s" data-local="true" role="button" tabindex="0" aria-label="' . __('Add new local cluster') . '" title="' . __('Add a local tag') . '" style="%s">%s</button>',
-                'useCursorPointer btn btn-inverse addGalaxy',
-                h($target_type),
-                h($target_id),
-                'line-height:10px; padding: 2px;',
-                '<i class="fas fa-user"></i> +'
-            );
-        }
-    }
diff --git a/app/View/Elements/galaxyQuickViewNew.ctp b/app/View/Elements/galaxyQuickViewNew.ctp
new file mode 100755
index 000000000..502e0b40d
--- /dev/null
+++ b/app/View/Elements/galaxyQuickViewNew.ctp
@@ -0,0 +1,140 @@
+<?php
+// When viewing remote server or feed event
+if (isset($preview) && $preview) {
+    $mayModify = false;
+    $isAclTagger = false;
+    $static_tags_only = true;
+} else {
+    $preview = false;
+}
+
+$editButtonsEnabled = !(isset($static_tags_only) && $static_tags_only);
+
+$sortClusters = function (array $clusters) {
+    usort($clusters, function (array $a, array $b) {
+        $aExternalId = isset($a['meta']['external_id'][0]) ? $a['meta']['external_id'][0] : null;
+        $bExternalId = isset($b['meta']['external_id'][0]) ? $b['meta']['external_id'][0] : null;
+        if ($aExternalId && $bExternalId) {
+            return strcmp($aExternalId, $bExternalId);
+        }
+        return strcmp($a['value'], $b['value']);
+    });
+    return $clusters;
+};
+
+$normalizeKey = function ($key) {
+    $key = str_replace('-', '_', $key);
+    $key = Inflector::humanize($key);
+    $key = str_replace('Id', 'ID', $key);
+    $key = str_replace('Mitre', 'MITRE', $key);
+    $key = str_replace('Cfr', 'CFR', $key);
+    return $key;
+};
+
+$generatePopover = function (array $cluster) use ($normalizeKey) {
+    $clusterFields = [];
+    if (!empty($cluster['description'])) {
+        $clusterFields[] = ['key' => 'description', 'value' => $this->Markdown->toText($cluster['description'])];
+    }
+    if (isset($cluster['meta']['synonyms'])) {
+        $clusterFields[] = ['key' => 'synonyms', 'value' => $cluster['meta']['synonyms']];
+    }
+    if (isset($cluster['source'])) {
+        $clusterFields[] = ['key' => 'source', 'value' => $cluster['source']];
+    }
+    if (!empty($cluster['meta'])) {
+        foreach ($cluster['meta'] as $metaKey => $metaField) {
+            if (!in_array($metaKey, ['synonyms', 'refs'], true)) {
+                $clusterFields[] = ['key' => $metaKey, 'value' => $metaField];
+            }
+        }
+    }
+    $popover = '<h4 class="blue" style="white-space: nowrap">' . h($cluster['value']) . '</h4>';
+    foreach ($clusterFields as $clusterField) {
+        $key = '<span class="blue bold">' . h($normalizeKey($clusterField['key'])) . '</span>';
+        if (is_array($clusterField['value'])) {
+            if ($clusterField['key'] === 'country') {
+                $value = [];
+                foreach ($clusterField['value'] as $v) {
+                    $value[] = $this->Icon->countryFlag($v) . '&nbsp;' . h($v);
+                }
+                $valueContents = implode("<br>", $value);
+            } else {
+                if (count($clusterField['value']) < 4) {
+                    $valueContents = h(implode(", ", $clusterField['value']));
+                } else {
+                    $valueContents = nl2br("\n" . h(implode("\n", $clusterField['value'])), false);
+                }
+            }
+        } else {
+            $valueContents = h($clusterField['value']);
+        }
+        $popover .= "$key: $valueContents<br>";
+    }
+    return $popover;
+}
+?>
+<?php if (!empty($data)): ?>
+<div class="galaxyQuickView">
+<?php foreach ($data as $galaxy): ?>
+    <h3 title="<?= isset($galaxy['description']) ? h($galaxy['description']) : h($galaxy['name']) ?>">
+        <?= h($galaxy['name']) ?>
+        <?php if (!$preview): ?>
+        <a href="<?= $baseurl ?>/galaxies/view/<?= h($galaxy['id']) ?>" class="black fa fa-search" title="<?= __('View details about this galaxy') ?>" aria-label="<?= __('View galaxy') ?>"></a>
+        <?php endif ;?>
+    </h3>
+    <ul>
+    <?php foreach ($sortClusters($galaxy['GalaxyCluster']) as $cluster): ?>
+        <li>
+            <b <?php if (!$preview): ?>class="useCursorPointer" data-clusterid="<?= h($cluster['id']) ?>"<?php endif; ?> data-content="<?= h($generatePopover($cluster)) ?>">
+                <i class="fas fa-<?= $cluster['local'] ? 'user' : 'globe-americas' ?>" title="<?= $cluster['local'] ? __('Local galaxy') : __('Global galaxy') ?>"></i>
+                <?= h($cluster['value']) ?>
+            </b>
+            <?php if (!$preview): ?>
+            <a href="<?= $baseurl ?>/galaxy_clusters/view/<?= h($cluster['id']) ?>" class="black fa fa-search" title="<?= __('View details about this cluster') ?>" aria-label="<?= __('View cluster') ?>"></a>
+            <a href="<?= $baseurl ?>/events/index/searchtag:<?= h($cluster['tag_id']) ?>" class="black fa fa-list" title="<?= __('View all events containing this cluster') ?>" aria-label="<?= __('View all events containing this cluster') ?>"></a>
+            <?php endif ;?>
+            <?php if ($editButtonsEnabled && ($isSiteAdmin || ($mayModify && $isAclTagger))) {
+echo $this->Form->create(false, [
+    'id' => false, // prevent duplicate ids
+    'url' => $baseurl . '/galaxy_clusters/detach/' . ucfirst(h($target_id)) . '/' . h($target_type) . '/' . $cluster['tag_id'],
+    'style' => 'display: inline-block; margin: 0px;'
+]);
+echo sprintf(
+    '<a href="#" class="black fa fa-trash useCursorPointer" role="button" tabindex="0" aria-label="%s" title="%s" onclick="popoverConfirm(this);"></a>',
+    __('Detach'),
+    __('Are you sure you want to detach %s from this event?', h($cluster['value']))
+);
+echo $this->Form->end();
+}
+?>
+        </li>
+    <?php endforeach; ?>
+    </ul>
+<?php endforeach; ?>
+</div>
+<?php endif; ?>
+<?php
+if ($editButtonsEnabled && ($isSiteAdmin || ($mayModify && $isAclTagger))) {
+    echo sprintf(
+        '<button class="%s" data-target-type="%s" data-target-id="%s" data-local="false" role="button" tabindex="0" aria-label="' . __('Add new cluster') . '" title="' . __('Add new cluster') . '">%s</button>',
+        'useCursorPointer btn btn-inverse addGalaxy',
+        h($target_type),
+        h($target_id),
+        '<i class="fas fa-globe-americas"></i> <i class="fas fa-plus"></i>'
+    );
+}
+
+if (
+    $editButtonsEnabled &&
+    (!isset($local_tag_off) || !$local_tag_off) &&
+    ($isSiteAdmin || ($isAclTagger && $hostOrgUser))
+) {
+    echo sprintf(
+        '<button class="%s" data-target-type="%s" data-target-id="%s" data-local="true" role="button" tabindex="0" aria-label="' . __('Add new local cluster') . '" title="' . __('Add new local cluster') . '">%s</button>',
+        'useCursorPointer btn btn-inverse addGalaxy',
+        h($target_type),
+        h($target_id),
+        '<i class="fas fa-user"></i> <i class="fas fa-plus"></i>'
+    );
+}
diff --git a/app/View/Events/ajax/ajaxGalaxies.ctp b/app/View/Events/ajax/ajaxGalaxies.ctp
index d8a3c7616..c3a5548d0 100644
--- a/app/View/Events/ajax/ajaxGalaxies.ctp
+++ b/app/View/Events/ajax/ajaxGalaxies.ctp
@@ -1,24 +1,19 @@
 <?php
-    $mayModify = (
-        ($isAclModify && $object['Event']['orgc_id'] == $me['org_id'])
-    );
-    if ($scope == 'event') {
-        echo sprintf('<h4 class="blue">%s</h4>', __('Galaxies'));
-        $element = 'galaxyQuickView';
-    } else if ($scope == 'attribute') {
-        $element = 'galaxyQuickViewMini';
-    }
-    echo $this->element($element, array(
-        'mayModify' => $mayModify,
-        'isAclTagger' => $isAclTagger,
-        'data' => $object['Galaxy'],
-        'target_id' => $scope == 'event' ? $object['Event']['id'] : $object['Attribute']['id'],
-        'target_type' => $scope
-    ));
+$mayModify = ($isAclModify && $object['Event']['orgc_id'] == $me['org_id']);
+if ($scope === 'event') {
+    echo '<span class="title-section">' . __('Galaxies') . '</span>';
+}
+echo $this->element('galaxyQuickViewNew', [
+    'mayModify' => $mayModify,
+    'isAclTagger' => $isAclTagger,
+    'data' => $object['Galaxy'],
+    'target_id' => $scope == 'event' ? $object['Event']['id'] : $object['Attribute']['id'],
+    'target_type' => $scope
+]);
 ?>
 <script type="text/javascript">
     var showContext = false;
-    $(document).ready(function () {
+    $(function () {
         $('.addGalaxy').click(function() {
             addGalaxyListener(this);
         });
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index 361adec22..25412f564 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -530,9 +530,15 @@
     <div id="pivots_div">
         <?php if (sizeOf($allPivots) > 1) echo $this->element('pivot'); ?>
     </div>
-    <div id="galaxies_div" class="info_container">
-        <h4 class="blue"><?php echo __('Galaxies');?></h4>
-        <?php echo $this->element('galaxyQuickView', array('mayModify' => $mayModify, 'isAclTagger' => $isAclTagger, 'data' => $event['Galaxy'], 'target_id' => $event['Event']['id'], 'target_type' => 'event')); ?>
+    <div id="galaxies_div">
+        <span class="title-section"><?= __('Galaxies') ?></span>
+        <?= $this->element('galaxyQuickViewNew', [
+            'mayModify' => $mayModify,
+            'isAclTagger' => $isAclTagger,
+            'data' => $event['Galaxy'],
+            'target_id' => $event['Event']['id'],
+            'target_type' => 'event'
+        ]); ?>
     </div>
     <div id="eventgraph_div" class="info_container_eventgraph_network" style="display: none;" data-fullscreen="false">
         <?php echo $this->element('view_event_graph'); ?>
diff --git a/app/View/Servers/preview_event.ctp b/app/View/Servers/preview_event.ctp
index 31bb9b96d7..eb7a3aba3 100644
--- a/app/View/Servers/preview_event.ctp
+++ b/app/View/Servers/preview_event.ctp
@@ -93,6 +93,15 @@ $tableData[] = [
     <?php endif; ?>
     </div>
     <br />
+    <?php if (!empty($event['Galaxy'])): ?>
+    <div id="galaxies_div">
+        <span class="title-section"><?= __('Galaxies') ?></span>
+        <?= $this->element('galaxyQuickViewNew', [
+            'data' => $event['Galaxy'],
+            'preview' => true,
+        ]); ?>
+    </div>
+    <?php endif; ?>
     <div id="attributes_div">
         <?php echo $this->element('Servers/eventattribute'); ?>
     </div>
diff --git a/app/webroot/css/main.css b/app/webroot/css/main.css
index f5a9680f0..2fb02f247 100644
--- a/app/webroot/css/main.css
+++ b/app/webroot/css/main.css
@@ -1980,15 +1980,63 @@ a.discrete {
     margin-top: 15px;
 }
 
-.info_container {
-    border: 1px solid #0088cc;
-    border-radius: 7px;
-    box-shadow: 0px 0px 6px #B2B2B2;
-    padding-left:10px;
-    padding-right:10px;
-    padding-bottom:10px;
-    width: 400px;
-    height: 100%;
+#galaxies_div {
+    position: relative;
+    padding: 35px 15px 15px 15px;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    border-radius: 3px;
+    width: 40em;
+}
+
+#galaxies_div > .title-section {
+    position: absolute;
+    top: -1px;
+    left: -1px;
+    padding: 3px 7px;
+    font-weight: bold;
+    background-color: #f5f5f5;
+    border: 1px solid #ddd;
+    color: #6b6b6b;
+    border-radius: 3px 0 3px 0;
+}
+
+#galaxies_div .galaxyQuickView ul {
+    font-size: 13px;
+}
+
+.galaxyQuickView {
+    padding-bottom: 4px;
+}
+
+.galaxyQuickView h3 {
+    font-size: 14px;
+    color: #0088cc;
+    margin-bottom: 0;
+    margin-top: 2px;
+}
+
+.galaxyQuickView ul {
+    list-style: none;
+    color: #0088cc;
+    margin: 0 0 0 8px;
+    font-size: 12px;
+}
+
+.galaxyQuickView ul a, .galaxyQuickView h3 a {
+    font-size: 12px;
+}
+
+button.addGalaxy {
+    line-height: 10px;
+    padding: 2px;
+    margin-right: 5px;
+    margin-top: 1px;
+}
+
+button.addGalaxy .fa-plus {
+    font-size: 11px;
+    line-height: 13px;
 }
 
 .info_container_form {
@@ -2001,20 +2049,6 @@ a.discrete {
     margin-bottom:10px;
 }
 
-.info_container_key {
-    vertical-align:text-top;
-    width:100px;
-    padding-bottom:10px;
-}
-
-.info_container_value {
-    vertical-align:text-top;
-    display:inline-block;
-    width:300px;
-    padding-bottom:10px;
-    word-wrap:break-word;
-}
-
 .bottomGap {
     margin-bottom:5px;
 }
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index cb4482602..a9c318c6d 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -1827,6 +1827,8 @@ function popoverPopup(clicked, id, context, target, admin) {
 
 // create a confirm popover on the clicked html node.
 function popoverConfirm(clicked, message, placement) {
+    event.preventDefault();
+
     var $clicked = $(clicked);
     var popoverContent = '<div>';
         popoverContent += message === undefined ? '' : '<p>' + message + '</p>';
@@ -4710,15 +4712,18 @@ $(document).ready(function() {
         }
     });
 
-    // For galaxyQuickViewMini.ctp
-    $('.expandable[data-clusterid]')
-        .on('click', function() {
-            loadClusterRelations($(this).data('clusterid'));
-        })
-        .popover({
-            html: true,
-            trigger: 'hover'
-        });
+    // For galaxyQuickViewNew.ctp
+    $(document.body).on('click', '*[data-clusterid]', function() {
+        loadClusterRelations($(this).data('clusterid'));
+    });
+    $(document.body).popover({
+        selector: '.galaxyQuickView ul li b',
+        html: true,
+        trigger: 'hover',
+        container: 'body',
+    }).on('shown', function() {
+        $('.tooltip').not(":last").remove();
+    });
 
     if ($('.alert').text().indexOf("$flashErrorMessage") >= 0) {
         var flashMessageLink = '<span class="useCursorPointer underline bold" onClick="flashErrorPopover();">here</span>';

From f64f4b9efdf99f3403138f4b9b9c3db2fa326e19 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 22 Mar 2021 10:16:54 +0100
Subject: [PATCH 363/437] fix: [UI] signature allowedlist clarification

---
 app/View/Allowedlists/admin_index.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/View/Allowedlists/admin_index.ctp b/app/View/Allowedlists/admin_index.ctp
index 1943b30bd..172ef8b00 100644
--- a/app/View/Allowedlists/admin_index.ctp
+++ b/app/View/Allowedlists/admin_index.ctp
@@ -1,6 +1,6 @@
 <div class="allowedlist index">
     <h2><?php echo __('Signature Allowedlist');?></h2>
-    <p><?php echo __('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).');?></p>
+    <p><?php echo __('Regex entries (in the standard php regex /{regex}/{modifier} format) entered below will restrict matching attributes from being included and data sets retrieved through restSearch.');?></p>
     <div class="pagination">
         <ul>
         <?php

From 02dc2a124d43c1588dee75d4cbab5229cb45312b Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 22 Mar 2021 10:17:29 +0100
Subject: [PATCH 364/437] fix: [sharing groups] uuid not logged when saving
 failed due to invalid variable lookup

---
 app/Model/SharingGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/SharingGroup.php b/app/Model/SharingGroup.php
index 057a49f71..b4c1f0b77 100644
--- a/app/Model/SharingGroup.php
+++ b/app/Model/SharingGroup.php
@@ -705,7 +705,7 @@ class SharingGroup extends AppModel
                 'email' => $user['email'],
                 'action' => 'error',
                 'user_id' => $user['id'],
-                'title' => "Tried to save a sharing group with UUID '{$sg['SharingGroup']['uuid']}' but the user does not belong to it."
+                'title' => "Tried to save a sharing group with UUID '{$sg['uuid']}' but the user does not belong to it."
             );
             $this->Log->save($entry);
             return false;

From 3140b77be011e4a05bf938b08c994def7576083c Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 22 Mar 2021 10:18:13 +0100
Subject: [PATCH 365/437] fix: [config.php] file permission after changes fixes
 #7229

- will revert to the permissions before the save
- caused by the create -> rename cycle that backs up server settings on each change actually creating a new file instead of modifying it
---
 app/Model/Server.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index 3d746a6bf..2d505537f 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -2245,11 +2245,13 @@ class Server extends AppModel
         if (function_exists('opcache_reset')) {
             opcache_reset();
         }
+        $previous_file_perm = substr(sprintf('%o', fileperms(APP . 'Config' . DS . 'config.php')), -4);
         if (empty(Configure::read('MISP.server_settings_skip_backup_rotate'))) {
             $randomFilename = $this->generateRandomFileName();
             // To protect us from 2 admin users having a concurent file write to the config file, solar flares and the bogeyman
             file_put_contents(APP . 'Config' . DS . $randomFilename, $settingsString);
             rename(APP . 'Config' . DS . $randomFilename, APP . 'Config' . DS . 'config.php');
+            chmod(APP . 'Config' . DS . 'config.php', octdec($previous_file_perm));
             $config_saved = file_get_contents(APP . 'Config' . DS . 'config.php');
             // if the saved config file is empty, restore the backup.
             if (strlen($config_saved) < 20) {

From ebc9dcecc4936ac88968a07437570e21389674f0 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Mon, 22 Mar 2021 17:46:42 +0000
Subject: [PATCH 366/437] chg: [ShibbAuth] Add login entry on logging in for
 audit

---
 .../Controller/Component/Auth/ApacheShibbAuthenticate.php  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php b/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
index 5926c09b2..47fc223c4 100644
--- a/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
+++ b/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
@@ -127,7 +127,7 @@ class ApacheShibbAuthenticate extends BaseAuthenticate
                 $user = $this->updateUserRole($roleChanged, $user, $roleId, $userModel);
             }
             $user = $this->updateUserOrg($org, $user, $userModel);
-            CakeLog::info("User `$mispUsername` logged in.");
+            $userModel->extralog($user, 'login');
             return $user;
         }
 
@@ -145,8 +145,9 @@ class ApacheShibbAuthenticate extends BaseAuthenticate
         // save user
         $userModel->save($userData);
         CakeLog::info("User `$mispUsername` saved in database.");
-        CakeLog::info("User `$mispUsername` logged in.");
-        return $this->_findUser($mispUsername);
+        $user = $this->_findUser($mispUsername);
+        $userModel->extralog($user, 'login');
+        return $user;
     }
 
     /**

From 002ba9d416dddd971d604ae20d40698e62f44075 Mon Sep 17 00:00:00 2001
From: Eva Yang <35614133+EvaYiYang@users.noreply.github.com>
Date: Mon, 22 Mar 2021 15:25:47 -0400
Subject: [PATCH 367/437] Add AadAuth module as saved settings

---
 app/Model/Server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Server.php b/app/Model/Server.php
index 54999faca..1aab6e2d3 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -2230,7 +2230,7 @@ class Server extends AppModel
             'debug', 'MISP', 'GnuPG', 'SMIME', 'Proxy', 'SecureAuth',
             'Security', 'Session.defaults', 'Session.timeout', 'Session.cookieTimeout',
             'Session.autoRegenerate', 'Session.checkAgent', 'site_admin_debug',
-            'Plugin', 'CertAuth', 'ApacheShibbAuth', 'ApacheSecureAuth'
+            'Plugin', 'CertAuth', 'ApacheShibbAuth', 'ApacheSecureAuth', 'AadAuth'
         );
         $settingsArray = array();
         foreach ($settingsToSave as $setting) {

From a8e08a6892977a3b6cc82887267c478869a09011 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Mon, 22 Mar 2021 17:46:42 +0000
Subject: [PATCH 368/437] chg: [ShibbAuth] Add login entry on logging in for
 audit

---
 .../Controller/Component/Auth/ApacheShibbAuthenticate.php  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php b/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
index 5926c09b2..47fc223c4 100644
--- a/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
+++ b/app/Plugin/ShibbAuth/Controller/Component/Auth/ApacheShibbAuthenticate.php
@@ -127,7 +127,7 @@ class ApacheShibbAuthenticate extends BaseAuthenticate
                 $user = $this->updateUserRole($roleChanged, $user, $roleId, $userModel);
             }
             $user = $this->updateUserOrg($org, $user, $userModel);
-            CakeLog::info("User `$mispUsername` logged in.");
+            $userModel->extralog($user, 'login');
             return $user;
         }
 
@@ -145,8 +145,9 @@ class ApacheShibbAuthenticate extends BaseAuthenticate
         // save user
         $userModel->save($userData);
         CakeLog::info("User `$mispUsername` saved in database.");
-        CakeLog::info("User `$mispUsername` logged in.");
-        return $this->_findUser($mispUsername);
+        $user = $this->_findUser($mispUsername);
+        $userModel->extralog($user, 'login');
+        return $user;
     }
 
     /**

From c1f92662fefc610bc155755c7a9aab5eb8e0d6f2 Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Tue, 23 Mar 2021 23:15:08 +0000
Subject: [PATCH 369/437] chg: [statistics] fix typo in statistics_data view -
 monthly attributes styling check

---
 app/View/Users/statistics_data.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/View/Users/statistics_data.ctp b/app/View/Users/statistics_data.ctp
index 6dd6e40b6..7414270ba 100644
--- a/app/View/Users/statistics_data.ctp
+++ b/app/View/Users/statistics_data.ctp
@@ -18,7 +18,7 @@
         </dd>
         <dt><?php echo __('Attributes'); ?></dt>
         <dd><?php echo h($stats['attribute_count']);
-            if ($stats['event_count_month']) echo ' <span style="color:green">(+' . h($stats['attribute_count_month']) . ')</span>&nbsp;';
+            if ($stats['attribute_count_month']) echo ' <span style="color:green">(+' . h($stats['attribute_count_month']) . ')</span>&nbsp;';
             else echo ' <span style="color:red">(0)</span>&nbsp;';?>
         </dd>
         <dt><?php echo __('Attributes / event'); ?></dt>

From a0ead60b4d24fd6b5c419224786963a8e0a8b6bf Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Tue, 23 Mar 2021 23:15:08 +0000
Subject: [PATCH 370/437] chg: [statistics] fix typo in statistics_data view -
 monthly attributes styling check

---
 app/View/Users/statistics_data.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/View/Users/statistics_data.ctp b/app/View/Users/statistics_data.ctp
index 6dd6e40b6..7414270ba 100644
--- a/app/View/Users/statistics_data.ctp
+++ b/app/View/Users/statistics_data.ctp
@@ -18,7 +18,7 @@
         </dd>
         <dt><?php echo __('Attributes'); ?></dt>
         <dd><?php echo h($stats['attribute_count']);
-            if ($stats['event_count_month']) echo ' <span style="color:green">(+' . h($stats['attribute_count_month']) . ')</span>&nbsp;';
+            if ($stats['attribute_count_month']) echo ' <span style="color:green">(+' . h($stats['attribute_count_month']) . ')</span>&nbsp;';
             else echo ' <span style="color:red">(0)</span>&nbsp;';?>
         </dd>
         <dt><?php echo __('Attributes / event'); ?></dt>

From bbaffea65ca70d3ee90423367cfa315e94745da6 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 24 Mar 2021 10:21:05 +0100
Subject: [PATCH 371/437] fix: [attributes:addTag] Pass the event to check ACL

---
 app/Controller/AttributesController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index fe555f05d..6e36fee7a 100644
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -2714,15 +2714,15 @@ class AttributesController extends AppController
                 } else {
                     $attribute = $attributes[0];
                 }
-                if (!$this->__canModifyTag($attribute, $local)) {
-                    $fails++;
-                    continue;
-                }
                 $eventId = $attribute['Attribute']['event_id'];
                 $event = $this->Attribute->Event->find('first', array(
                     'conditions' => array('Event.id' => $eventId),
                     'recursive' => -1
                 ));
+                if (!$this->__canModifyTag($event, $local)) {
+                    $fails++;
+                    continue;
+                }
                 if (!$this->_isRest()) {
                     $this->Attribute->Event->insertLock($this->Auth->user(), $eventId);
                 }

From 41099defb240f30c2a6c23ec65ee50837fd91b50 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 24 Mar 2021 10:22:44 +0100
Subject: [PATCH 372/437] fix: [tags] More granularity for local and global add
 tag buttons

---
 app/View/Attributes/ajax/ajaxAttributeTags.ctp       |  3 ++-
 app/View/Elements/Events/View/row_attribute.ctp      | 12 +++++++++++-
 app/View/Elements/Events/eventIndexTable.ctp         |  1 +
 app/View/Elements/ajaxTags.ctp                       |  5 +++--
 .../genericElements/IndexTable/Fields/tags.ctp       |  1 +
 app/View/Events/ajax/ajaxTags.ctp                    |  1 +
 app/View/Events/get_event_info_by_id.ctp             |  2 +-
 app/View/Events/resolved_misp_format.ctp             |  3 ++-
 app/View/Events/view.ctp                             |  3 ++-
 app/View/Feeds/view.ctp                              |  1 +
 10 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/View/Attributes/ajax/ajaxAttributeTags.ctp b/app/View/Attributes/ajax/ajaxAttributeTags.ctp
index d934aa2c2..ba4ab948f 100644
--- a/app/View/Attributes/ajax/ajaxAttributeTags.ctp
+++ b/app/View/Attributes/ajax/ajaxAttributeTags.ctp
@@ -5,7 +5,8 @@
         array(
             'attributeId' => $attributeId,
             'tags' => $attributeTags,
-            'tagAccess' => ($isSiteAdmin || $mayModify || $me['org_id'] == $event['Event']['org_id']),
+            'tagAccess' => ($isSiteAdmin || $mayModify),
+            'localTagAccess' => ($isSiteAdmin || $mayModify || $me['org_id'] == $event['Event']['org_id'] || (int)$me['org_id'] === Configure::read('MISP.host_org_id')),
             'scope' => 'attribute'
         )
     );
diff --git a/app/View/Elements/Events/View/row_attribute.ctp b/app/View/Elements/Events/View/row_attribute.ctp
index e409f7cd9..778d145cb 100644
--- a/app/View/Elements/Events/View/row_attribute.ctp
+++ b/app/View/Elements/Events/View/row_attribute.ctp
@@ -143,7 +143,17 @@ $quickEdit = function($fieldName) use ($editScope, $object, $event) {
     </td>
     <td class="short">
       <div class="attributeTagContainer">
-        <?php echo $this->element('ajaxTags', array('attributeId' => $object['id'], 'tags' => $object['AttributeTag'], 'tagAccess' => ($isSiteAdmin || $mayModify || $me['org_id'] == $event['Event']['org_id']), 'context' => $context, 'scope' => 'attribute', 'tagConflicts' => isset($object['tagConflicts']) ? $object['tagConflicts'] : array())); ?>
+        <?php echo $this->element(
+          'ajaxTags',
+          array('attributeId' => $object['id'],
+            'tags' => $object['AttributeTag'],
+            'tagAccess' => ($isSiteAdmin || $mayModify),
+            'localTagAccess' => ($isSiteAdmin || $mayModify || $me['org_id'] == $event['Event']['org_id'] || (int)$me['org_id'] === Configure::read('MISP.host_org_id')),
+            'context' => $context,
+            'scope' => 'attribute',
+            'tagConflicts' => isset($object['tagConflicts']) ? $object['tagConflicts'] : array()
+          )
+        ); ?>
       </div>
     </td>
     <?php
diff --git a/app/View/Elements/Events/eventIndexTable.ctp b/app/View/Elements/Events/eventIndexTable.ctp
index a3a7bda6f..ac302c677 100644
--- a/app/View/Elements/Events/eventIndexTable.ctp
+++ b/app/View/Elements/Events/eventIndexTable.ctp
@@ -127,6 +127,7 @@
                             'event' => $event,
                             'tags' => $event['EventTag'],
                             'tagAccess' => false,
+                            'localTagAccess' => false,
                             'missingTaxonomies' => false,
                             'columnised' => true,
                             'static_tags_only' => 1,
diff --git a/app/View/Elements/ajaxTags.ctp b/app/View/Elements/ajaxTags.ctp
index 692b6f790..2dddd8d3d 100644
--- a/app/View/Elements/ajaxTags.ctp
+++ b/app/View/Elements/ajaxTags.ctp
@@ -22,6 +22,7 @@
             break;
     }
     $full = $isAclTagger && $tagAccess && empty($static_tags_only);
+    $fullLocal = $isAclTagger && $localTagAccess && empty($static_tags_only);
     $host_org_editor = (int)$me['org_id'] === Configure::read('MISP.host_org_id') && $isAclTagger && empty($static_tags_only);
     $tagData = "";
     foreach ($tags as $tag) {
@@ -85,7 +86,7 @@
             );
         }
         $span_delete = '';
-        if ($full) {
+        if ($full || ($fullLocal && $tag['Tag']['local'])) {
             $span_delete = sprintf(
                 '<span class="%s" title="%s" role="%s" tabindex="%s" aria-label="%s" onClick="%s">x</span>',
                 'black-white tag useCursorPointer noPrint',
@@ -121,7 +122,7 @@
             '<i class="fas fa-globe-americas"></i> +'
         );
     }
-    if ($host_org_editor || $full) {
+    if ($full || $fullLocal) {
         $buttonData[] = sprintf(
             '<button title="%s" role="button" tabindex="0" aria-label="%s" class="%s" style="%s" onClick="%s">%s</button>',
             __('Add a local tag'),
diff --git a/app/View/Elements/genericElements/IndexTable/Fields/tags.ctp b/app/View/Elements/genericElements/IndexTable/Fields/tags.ctp
index 33fa10e32..859f6fc06 100644
--- a/app/View/Elements/genericElements/IndexTable/Fields/tags.ctp
+++ b/app/View/Elements/genericElements/IndexTable/Fields/tags.ctp
@@ -19,6 +19,7 @@
                 'attributeId' => 0,
                 'tags' => $tags,
                 'tagAccess' => false,
+                'localTagAccess' => false,
                 'static_tags_only' => 1,
                 'scope' => isset($field['scope']) ? $field['scope'] : 'event',
                 'hide_global_scope' => isset($field['hide_global_scope']) ? $field['hide_global_scope'] : false
diff --git a/app/View/Events/ajax/ajaxTags.ctp b/app/View/Events/ajax/ajaxTags.ctp
index e56be1370..3124de3e6 100644
--- a/app/View/Events/ajax/ajaxTags.ctp
+++ b/app/View/Events/ajax/ajaxTags.ctp
@@ -7,6 +7,7 @@
         'event' => $event,
         'tags' => $tags,
         'tagAccess' => ($isSiteAdmin || $mayModify),
+        'localTagAccess' => ($isSiteAdmin || $mayModify || $me['org_id'] == $event['Event']['org_id'] || (int)$me['org_id'] === Configure::read('MISP.host_org_id')),
         'tagConflicts' => $tagConflicts
     ));
 ?>
diff --git a/app/View/Events/get_event_info_by_id.ctp b/app/View/Events/get_event_info_by_id.ctp
index 7563fc606..d544d22c3 100644
--- a/app/View/Events/get_event_info_by_id.ctp
+++ b/app/View/Events/get_event_info_by_id.ctp
@@ -19,7 +19,7 @@
         if ($fieldData === 'Tag') {
           echo '<div><span class="blue bold">Tags</span>: ';
           if (!empty($event['EventTag'])) {
-            echo '<span>' . $this->element('ajaxTags', array('event' => $event, 'tags' => $event['EventTag'], 'static_tags_only' => true)) . '</span>';
+            echo '<span>' . $this->element('ajaxTags', array('event' => $event, 'tags' => $event['EventTag'], 'static_tags_only' => true, 'tagAccess' => false, 'localTagAccess' => false)) . '</span>';
           }
           echo '</div>';
         } else {
diff --git a/app/View/Events/resolved_misp_format.ctp b/app/View/Events/resolved_misp_format.ctp
index 1e9592c4b..e21c27900 100644
--- a/app/View/Events/resolved_misp_format.ctp
+++ b/app/View/Events/resolved_misp_format.ctp
@@ -71,7 +71,8 @@
                         $this->element('ajaxTags', array(
                             'event' => $event,
                             'tags' => $event['Tag'],
-                            'tagAccess' => ($isSiteAdmin || $me['org_id'] == $event['Event']['orgc_id']),
+                            'tagAccess' => false,
+                            'localTagAccess' => false,
                             'static_tags_only' => 1
                         ))
                     )
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index 25412f564..07d1b38ed 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -105,7 +105,8 @@
                     array(
                         'event' => $event,
                         'tags' => $event['EventTag'],
-                        'tagAccess' => ($isSiteAdmin || $mayModify || $me['org_id'] == $event['Event']['orgc_id']),
+                        'tagAccess' => ($isSiteAdmin || $mayModify),
+                        'localTagAccess' => ($isSiteAdmin || $mayModify || $me['org_id'] == $event['Event']['org_id'] || (int)$me['org_id'] === Configure::read('MISP.host_org_id')),
                         'missingTaxonomies' => $missingTaxonomies,
                         'tagConflicts' => $tagConflicts
                     )
diff --git a/app/View/Feeds/view.ctp b/app/View/Feeds/view.ctp
index 661b81cb6..2c78784ff 100644
--- a/app/View/Feeds/view.ctp
+++ b/app/View/Feeds/view.ctp
@@ -22,6 +22,7 @@
                         'scope' => 'feed',
                         'tags' => array(array('Tag' => $feed['Tag'])),
                         'tagAccess' => false,
+                        'localTagAccess' => false,
                         'static_tags_only' => true
                     )
                 )

From f767ffeec586c335cf5c2eaf159c551db6df9056 Mon Sep 17 00:00:00 2001
From: Richard van den Berg <richard.vandenberg@ncsc.nl>
Date: Wed, 24 Mar 2021 10:29:02 +0100
Subject: [PATCH 373/437] fix: [selinux] allow log files rename

---
 INSTALL/misplogrotate.te | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/INSTALL/misplogrotate.te b/INSTALL/misplogrotate.te
index 921989772..80b2eb945 100644
--- a/INSTALL/misplogrotate.te
+++ b/INSTALL/misplogrotate.te
@@ -7,10 +7,10 @@ require {
 	type httpd_sys_content_t;
 	type httpd_sys_rw_content_t;
 	class dir { ioctl read getattr lock search open remove_name };
-	class file { unlink write };
+	class file { unlink write rename };
 }
 #============= logrotate_t ==============
 allow logrotate_t httpd_sys_content_t:dir { ioctl read getattr lock search open };
 allow logrotate_t httpd_sys_rw_content_t:dir { ioctl read getattr lock search open };
 allow httpd_t httpd_log_t:dir remove_name;
-allow { httpd_t httpd_sys_script_t } httpd_log_t:file { unlink write };
+allow { httpd_t httpd_sys_script_t } httpd_log_t:file { unlink write rename };

From 84c27def917725e0954fbe76e7195fc995085a9d Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 24 Mar 2021 11:00:04 +0100
Subject: [PATCH 374/437] fix: [tags] More granularity for local and global add
 cluster buttons

---
 .../View/row_attribute_simulation.ctp         |  1 +
 .../Elements/Events/View/row_attribute.ctp    |  1 +
 app/View/Elements/Events/eventIndexTable.ctp  |  1 +
 app/View/Elements/galaxyQuickViewNew.ctp      | 19 +++++++++++--------
 app/View/Events/ajax/ajaxGalaxies.ctp         |  1 +
 app/View/Events/view.ctp                      |  1 +
 app/View/Servers/preview_event.ctp            |  1 +
 7 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/View/Elements/DecayingModels/View/row_attribute_simulation.ctp b/app/View/Elements/DecayingModels/View/row_attribute_simulation.ctp
index 0197c6ed5..b27dc38bc 100644
--- a/app/View/Elements/DecayingModels/View/row_attribute_simulation.ctp
+++ b/app/View/Elements/DecayingModels/View/row_attribute_simulation.ctp
@@ -60,6 +60,7 @@
             'isSiteAdmin' => false, // prevent add button
             'isAclTagger' => false,
             'data' => !empty($object['Galaxy']) ? $object['Galaxy'] : array(),
+            'event' => $object,
             'target_id' => $object['id'],
             'target_type' => 'attribute'
         ));
diff --git a/app/View/Elements/Events/View/row_attribute.ctp b/app/View/Elements/Events/View/row_attribute.ctp
index 778d145cb..3891c0bae 100644
--- a/app/View/Elements/Events/View/row_attribute.ctp
+++ b/app/View/Elements/Events/View/row_attribute.ctp
@@ -176,6 +176,7 @@ $quickEdit = function($fieldName) use ($editScope, $object, $event) {
           'mayModify' => $mayModify,
           'isAclTagger' => $isAclTagger,
           'data' => (!empty($object['Galaxy']) ? $object['Galaxy'] : array()),
+          'event' => $event,
           'target_id' => $object['id'],
           'target_type' => 'attribute',
         ));
diff --git a/app/View/Elements/Events/eventIndexTable.ctp b/app/View/Elements/Events/eventIndexTable.ctp
index ac302c677..60deba617 100644
--- a/app/View/Elements/Events/eventIndexTable.ctp
+++ b/app/View/Elements/Events/eventIndexTable.ctp
@@ -110,6 +110,7 @@
                       'mayModify' => false,
                       'isAclTagger' => false,
                       'data' => $galaxies,
+                      'event' => $event,
                       'target_id' => $event['Event']['id'],
                       'target_type' => 'event',
                       'static_tags_only' => 1
diff --git a/app/View/Elements/galaxyQuickViewNew.ctp b/app/View/Elements/galaxyQuickViewNew.ctp
index 502e0b40d..3ac0650c7 100755
--- a/app/View/Elements/galaxyQuickViewNew.ctp
+++ b/app/View/Elements/galaxyQuickViewNew.ctp
@@ -7,8 +7,15 @@ if (isset($preview) && $preview) {
 } else {
     $preview = false;
 }
+$tagAccess = ($isSiteAdmin || ($mayModify && $isAclTagger));
+if (empty($local_tag_off) || !empty($event)) {
+    $localTagAccess = ($isSiteAdmin || ($mayModify || $me['org_id'] == $event['Event']['org_id'] || (int)$me['org_id'] === Configure::read('MISP.host_org_id'))) && $isAclTagger;
+} else {
+    $localTagAccess = false;
+}
 
-$editButtonsEnabled = !(isset($static_tags_only) && $static_tags_only);
+$editButtonsEnabled = empty($static_tags_only) && $tagAccess;
+$editButtonsLocalEnabled = empty($static_tags_only) && $localTagAccess && empty($local_tag_off);
 
 $sortClusters = function (array $clusters) {
     usort($clusters, function (array $a, array $b) {
@@ -94,7 +101,7 @@ $generatePopover = function (array $cluster) use ($normalizeKey) {
             <a href="<?= $baseurl ?>/galaxy_clusters/view/<?= h($cluster['id']) ?>" class="black fa fa-search" title="<?= __('View details about this cluster') ?>" aria-label="<?= __('View cluster') ?>"></a>
             <a href="<?= $baseurl ?>/events/index/searchtag:<?= h($cluster['tag_id']) ?>" class="black fa fa-list" title="<?= __('View all events containing this cluster') ?>" aria-label="<?= __('View all events containing this cluster') ?>"></a>
             <?php endif ;?>
-            <?php if ($editButtonsEnabled && ($isSiteAdmin || ($mayModify && $isAclTagger))) {
+            <?php if ($editButtonsEnabled || ($editButtonsLocalEnabled && $cluster['local'])) {
 echo $this->Form->create(false, [
     'id' => false, // prevent duplicate ids
     'url' => $baseurl . '/galaxy_clusters/detach/' . ucfirst(h($target_id)) . '/' . h($target_type) . '/' . $cluster['tag_id'],
@@ -115,7 +122,7 @@ echo $this->Form->end();
 </div>
 <?php endif; ?>
 <?php
-if ($editButtonsEnabled && ($isSiteAdmin || ($mayModify && $isAclTagger))) {
+if ($editButtonsEnabled) {
     echo sprintf(
         '<button class="%s" data-target-type="%s" data-target-id="%s" data-local="false" role="button" tabindex="0" aria-label="' . __('Add new cluster') . '" title="' . __('Add new cluster') . '">%s</button>',
         'useCursorPointer btn btn-inverse addGalaxy',
@@ -125,11 +132,7 @@ if ($editButtonsEnabled && ($isSiteAdmin || ($mayModify && $isAclTagger))) {
     );
 }
 
-if (
-    $editButtonsEnabled &&
-    (!isset($local_tag_off) || !$local_tag_off) &&
-    ($isSiteAdmin || ($isAclTagger && $hostOrgUser))
-) {
+if ($editButtonsLocalEnabled) {
     echo sprintf(
         '<button class="%s" data-target-type="%s" data-target-id="%s" data-local="true" role="button" tabindex="0" aria-label="' . __('Add new local cluster') . '" title="' . __('Add new local cluster') . '">%s</button>',
         'useCursorPointer btn btn-inverse addGalaxy',
diff --git a/app/View/Events/ajax/ajaxGalaxies.ctp b/app/View/Events/ajax/ajaxGalaxies.ctp
index c3a5548d0..989837067 100644
--- a/app/View/Events/ajax/ajaxGalaxies.ctp
+++ b/app/View/Events/ajax/ajaxGalaxies.ctp
@@ -7,6 +7,7 @@ echo $this->element('galaxyQuickViewNew', [
     'mayModify' => $mayModify,
     'isAclTagger' => $isAclTagger,
     'data' => $object['Galaxy'],
+    'event' => $object,
     'target_id' => $scope == 'event' ? $object['Event']['id'] : $object['Attribute']['id'],
     'target_type' => $scope
 ]);
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index 07d1b38ed..37bc5ff0d 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -537,6 +537,7 @@
             'mayModify' => $mayModify,
             'isAclTagger' => $isAclTagger,
             'data' => $event['Galaxy'],
+            'event' => $event,
             'target_id' => $event['Event']['id'],
             'target_type' => 'event'
         ]); ?>
diff --git a/app/View/Servers/preview_event.ctp b/app/View/Servers/preview_event.ctp
index eb7a3aba3..dd05a481d 100644
--- a/app/View/Servers/preview_event.ctp
+++ b/app/View/Servers/preview_event.ctp
@@ -98,6 +98,7 @@ $tableData[] = [
         <span class="title-section"><?= __('Galaxies') ?></span>
         <?= $this->element('galaxyQuickViewNew', [
             'data' => $event['Galaxy'],
+            'event' => $event,
             'preview' => true,
         ]); ?>
     </div>

From 92dc81562c9cd8c6c0098030b335ef8081e893d3 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 24 Mar 2021 11:12:10 +0100
Subject: [PATCH 375/437] fix: [db_schema] Cerebrates's comment default value.

Fix #7200, fix #7137
---
 db_schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db_schema.json b/db_schema.json
index f2427a0c0..d153573e4 100644
--- a/db_schema.json
+++ b/db_schema.json
@@ -707,7 +707,7 @@
                 "numeric_precision": null,
                 "collation_name": "utf8mb4_unicode_ci",
                 "column_type": "text",
-                "column_default": "NULL",
+                "column_default": null,
                 "extra": ""
             }
         ],

From d7de2096230d7d9fc09866553cf42576e74faef5 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 24 Mar 2021 11:33:14 +0100
Subject: [PATCH 376/437] fix: [command:admin] UpdateTaxonomies provides
 correct feedback Fix #7132

---
 app/Console/Command/AdminShell.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/Console/Command/AdminShell.php b/app/Console/Command/AdminShell.php
index c494dc8a5..06ac9e578 100644
--- a/app/Console/Command/AdminShell.php
+++ b/app/Console/Command/AdminShell.php
@@ -169,16 +169,24 @@ class AdminShell extends AppShell
         }
     }
 
-    # FIXME: Make Taxonomy->update() return a status string on API if successful
     public function updateTaxonomies()
     {
         $this->ConfigLoad->execute();
         $result = $this->Taxonomy->update();
-        if ($result) {
-            echo 'Taxonomies updated' . PHP_EOL;
-        } else {
-            echo 'Could not update Taxonomies' . PHP_EOL;
+        $successes = count(!empty($result['success']) ? $result['success'] : []);
+        $fails = count(!empty($result['fails']) ? $result['fails'] : []);
+        $message = '';
+        if ($successes == 0 && $fails == 0) {
+            $message = __('All taxonomies are up to date already.');
+        } elseif ($successes == 0 && $fails > 0) {
+            $message = __('Could not update any of the taxonomies.');
+        } elseif ($successes > 0 ) {
+            $message = __('Successfully updated %s taxonomies.', $successes);
+            if ($fails != 0) {
+                $message .= __(' However, could not update %s taxonomies.', $fails);
+            }
         }
+        echo $message . PHP_EOL;
     }
 
     public function updateWarningLists()

From 64ab76d78d47d1ae2b8e720b8870f02d0d4dfb7c Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Wed, 24 Mar 2021 21:40:22 +0900
Subject: [PATCH 377/437] fix: [doc] rhel 7 install doc initial fixes

---
 docs/INSTALL.rhel7.md      | 60 ++++++++++++++++++++++++--------------
 docs/INSTALL.ubuntu1804.md |  2 +-
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index 319c26d5d..dc547cd79 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -27,6 +27,11 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
     The core MISP team cannot verify if this guide is working or not. Please help us in keeping it up to date and accurate.
     Thus we also have difficulties in supporting RHEL issues but will do a best effort on a similar yet slightly different setup.
 
+!!! notice
+    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
+    Which explains why you will see the use of shell *functions* in various steps.
+    Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc...
+
 !!! notice
     Maintenance for CentOS 7 will end on: June 30th, 2024 [Source[0]](https://wiki.centos.org/About/Product) [Source[1]](https://linuxlifecycle.com/)
     CentOS 7-1908 [NetInstallURL](http://mirror.centos.org/centos/7/os/x86_64/)
@@ -108,6 +113,7 @@ sudo yum install deltarpm -y
 ```bash
 # Because (neo)vim is just so practical
 sudo yum install neovim -y
+# For RHEL, it's vim
 ```
 
 ## 1.5.c/ Install ntpdate (optional)
@@ -126,11 +132,15 @@ yumUpdate () {
 # <snippet-end 0_yum-update.sh>
 ```
 
-## 1.6/ **[RHEL]** Install the EPEL repo
+## 1.6/ **[RHEL]** Install the EPEL and remi repo
 ```bash
 # <snippet-begin 0_RHEL_EPEL.sh>
 enableEPEL () {
   sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -y
+  sudo yum install http://rpms.remirepo.net/enterprise/remi-release-7.rpm
+  sudo yum install yum-utils
+  sudo subscription-manager repos --enable=rhel-7-server-optional-rpms
+  sudo yum-config-manager --enable remi-php72
 }
 # <snippet-end 0_RHEL_EPEL.sh>
 ```
@@ -148,40 +158,45 @@ enableEPEL () {
 # <snippet-begin 0_yumInstallCoreDeps.sh>
 yumInstallCoreDeps () {
   # Install the dependencies:
-  sudo yum install gcc git zip rh-git218 \
-                   httpd24 \
+  sudo yum install gcc git zip \
                    mod_ssl \
-                   rh-redis32 \
-                   rh-mariadb102 \
+                   redis \
                    libxslt-devel zlib-devel ssdeep-devel -y
 
   # Enable and start redis
-  sudo systemctl enable --now rh-redis32-redis.service
+  sudo systemctl enable --now redis.service
+
+  # Install MariaDB
+  sudo yum install wget
+  wget https://downloads.mariadb.com/MariaDB/mariadb_repo_setup
+  chmod +x mariadb_repo_setup
+  sudo ./mariadb_repo_setup
+  sudo yum install MariaDB-server
 
   WWW_USER="apache"
   SUDO_WWW="sudo -H -u $WWW_USER"
-  RUN_PHP="/usr/bin/scl enable rh-php72"
-  PHP_INI="/etc/opt/rh/rh-php72/php.ini"
-  # Install PHP 7.2 from SCL, see https://www.softwarecollections.org/en/scls/rhscl/rh-php72/
-  sudo yum install rh-php72 rh-php72-php-fpm rh-php72-php-devel \
-                   rh-php72-php-mysqlnd \
-                   rh-php72-php-mbstring \
-                   rh-php72-php-xml \
-                   rh-php72-php-bcmath \
-                   rh-php72-php-opcache \
-                   rh-php72-php-zip \
-                   rh-php72-php-gd -y
+  RUN_PHP="/usr/bin/scl enable php72"
+  PHP_INI="/etc/opt/remi/php72/php.ini"
+  # Install PHP 7.2 from SCL, see https://www.softwarecollections.org/en/scls/rhscl/rh-php72/ Obsolete?
+  sudo yum install php72 php72-php-fpm php72-php-devel \
+                   php72-php-mysqlnd \
+                   php72-php-mbstring \
+                   php72-php-xml \
+                   php72-php-bcmath \
+                   php72-php-opcache \
+                   php72-php-zip \
+                   php72-php-gd -y
 
   # Python 3.6 is now available in RHEL 7.7 base
   sudo yum install python3 python3-devel -y
 
-  sudo systemctl enable --now rh-php72-php-fpm.service
+  sudo systemctl enable --now php72-php-fpm.service
 }
 # <snippet-end 0_yumInstallCoreDeps.sh>
 ```
 
 !!! notice
-    $RUN_PHP makes php available for you if using rh-php72. e.g: sudo $RUN_PHP "pear list | grep Crypt_GPG"
+    $RUN_PHP makes php available for you if using php72. e.g: sudo $RUN_PHP "pear list | grep Crypt_GPG"
 
 ```bash
 # <snippet-begin 0_yumInstallHaveged.sh>
@@ -322,10 +337,11 @@ installCoreRHEL () {
 
   # Enable dependencies detection in the diagnostics page
   # This allows MISP to detect GnuPG, the Python modules' versions and to read the PHP settings.
+  # OBSOLETE?
   # The LD_LIBRARY_PATH setting is needed for rh-git218 to work
-  echo "env[PATH] = /opt/rh/rh-git218/root/usr/bin:/opt/rh/rh-redis32/root/usr/bin:/opt/rh/rh-php72/root/usr/bin:/usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/rh/rh-php72/php-fpm.d/www.conf
-  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/rh/rh-php72/php-fpm.d/www.conf
-  sudo systemctl restart rh-php72-php-fpm.service
+  echo "env[PATH] = /opt/rh/rh-git218/root/usr/bin:/opt/rh/rh-php72/root/usr/bin:/usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/rh/rh-php72/php-fpm.d/www.conf
+  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/remi/php72/php-fpm.d/www.conf
+  sudo systemctl restart php72-php-fpm.service
   umask $UMASK
 }
 # <snippet-end 1_mispCoreInstall_RHEL.sh>
diff --git a/docs/INSTALL.ubuntu1804.md b/docs/INSTALL.ubuntu1804.md
index 5089f7fa3..f92780c73 100644
--- a/docs/INSTALL.ubuntu1804.md
+++ b/docs/INSTALL.ubuntu1804.md
@@ -20,7 +20,7 @@ bash /tmp/INSTALL.sh -c
 ### 0/ MISP Ubuntu 18.04-server install - status
 -------------------------
 !!! notice
-    Installer tested working by [@SteveClement](https://twitter.com/SteveClement) on 20200501 (works with **Ubuntu 18.10/19.04** too)
+    Installer tested working by [@SteveClement](https://twitter.com/SteveClement) on 20210324 (works with **Ubuntu 18.10/19.04** too)
 
 !!! notice
     This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.

From a1b5141a5a9933433a79fc413b01f3a482040ae1 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 24 Mar 2021 13:42:30 +0100
Subject: [PATCH 378/437] new: [eventgraph:viewPicture] Allow access to saved
 picture from the eventgraph history

---
 app/Controller/Component/ACLComponent.php |  1 +
 app/Controller/EventGraphController.php   | 31 +++++++++++++++++++++++
 app/Model/EventGraph.php                  | 14 ++++++++++
 3 files changed, 46 insertions(+)

diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php
index 783329be2..2635c9aed 100644
--- a/app/Controller/Component/ACLComponent.php
+++ b/app/Controller/Component/ACLComponent.php
@@ -727,6 +727,7 @@ class ACLComponent extends Component
             ),
             'eventGraph' => array(
                     'view' => array('*'),
+                    'viewPicture' => array('*'),
                     'add' => array('perm_add'),
                     'delete' => array('perm_modify'),
             )
diff --git a/app/Controller/EventGraphController.php b/app/Controller/EventGraphController.php
index 4fc9a2268..87b79c40f 100644
--- a/app/Controller/EventGraphController.php
+++ b/app/Controller/EventGraphController.php
@@ -50,6 +50,37 @@ class EventGraphController extends AppController
         return $this->RestResponse->viewData($eventGraphs, $this->response->type());
     }
 
+    public function viewPicture($event_id, $graph_id)
+    {
+        $this->loadModel('Event');
+        $event = $this->Event->fetchSimpleEvent($this->Auth->user(), $event_id);
+        if (empty($event)) {
+            throw new NotFoundException('Invalid event');
+        }
+
+        $conditions = [
+            'EventGraph.event_id' => $event['Event']['id'],
+            'EventGraph.org_id' => $this->Auth->user('org_id'),
+            'EventGraph.id' => $graph_id,
+        ];
+        $eventGraph = $this->EventGraph->find('first', array(
+            'conditions' => $conditions,
+            'contain' => array(
+                'User' => array(
+                    'fields' => array(
+                        'User.email'
+                    )
+                )
+            )
+        ));
+        if (empty($eventGraph)) {
+            throw new MethodNotAllowedException('Invalid event graph');
+        }
+        $eventGraph = $eventGraph;
+        $imageData = $this->EventGraph->getPictureData($eventGraph);
+        return new CakeResponse(array('body' => $imageData, 'type' => 'png'));
+    }
+
     public function add($event_id = false)
     {
         if ($this->request->is('get')) {
diff --git a/app/Model/EventGraph.php b/app/Model/EventGraph.php
index e78452e42..1e6a203ac 100644
--- a/app/Model/EventGraph.php
+++ b/app/Model/EventGraph.php
@@ -53,4 +53,18 @@ class EventGraph extends AppModel
         }
         return true;
     }
+
+    public function getPictureData($eventGraph)
+    {
+        $b64 = str_replace('data:image/png;base64,', '', $eventGraph['EventGraph']['preview_img']);
+        $imageDecoded = base64_decode($b64);
+        $source = imagecreatefromstring($imageDecoded);
+        imagesavealpha($source, true);
+        ob_start();
+        imagepng($source, null, 9);
+        $imageData = ob_get_contents();
+        ob_end_clean();
+        imagedestroy($source);
+        return $imageData;
+    }
 }

From 71e8dc96418fe06a928a635d8a02ccb137fdd530 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Wed, 24 Mar 2021 14:42:09 +0100
Subject: [PATCH 379/437] fix: [attributes:restSearch] pop attribute timestamp
 filtering condition

This avoid the condition to propagates to the event level.
Fix #7096
---
 app/Model/Attribute.php | 2 +-
 app/Model/Event.php     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 13616f45b..bec4ab55a 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -4252,7 +4252,7 @@ class Attribute extends AppModel
                     'tags' => array('function' => 'set_filter_tags', 'pop' => true),
                     'uuid' => array('function' => 'set_filter_uuid'),
                     'deleted' => array('function' => 'set_filter_deleted'),
-                    'timestamp' => array('function' => 'set_filter_timestamp'),
+                    'timestamp' => array('function' => 'set_filter_timestamp', 'pop' => true),
                     'attribute_timestamp' => array('function' => 'set_filter_timestamp'),
                     'first_seen' => array('function' => 'set_filter_seen'),
                     'last_seen' => array('function' => 'set_filter_seen'),
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 5dd32612b..37be6a2af 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -3077,6 +3077,9 @@ class Event extends AppModel
             );
             foreach ($filters[$options['filter']] as $f) {
                 $conditions = $this->Attribute->setTimestampConditions($params[$options['filter']], $conditions, $f);
+                if (!empty($options['pop'])) {
+                    unset($params[$options['filter']]);
+                }
             }
         }
         return $conditions;

From 70a28372f321fafcae8fefa5ad04e6935850777e Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Wed, 24 Mar 2021 20:36:51 +0000
Subject: [PATCH 380/437] new: [cli] enable all tags for a taxonomy

---
 app/Console/Command/AdminShell.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/Console/Command/AdminShell.php b/app/Console/Command/AdminShell.php
index 06ac9e578..006739bff 100644
--- a/app/Console/Command/AdminShell.php
+++ b/app/Console/Command/AdminShell.php
@@ -189,6 +189,20 @@ class AdminShell extends AppShell
         echo $message . PHP_EOL;
     }
 
+    public function enableTaxonomyTags()
+    {
+        if (empty($this->args[0]) || !is_numeric($this->args[0])) {
+            echo 'Usage: ' . APP . '/cake ' . 'Admin enableTaxonomyTags [taxonomy_id]' . PHP_EOL;
+	} else {
+            $result = $this->Taxonomy->addTags(intval($this->args[0]));
+	    if ($result) {
+                echo 'Taxonomy tags enabled' . PHP_EOL;
+	    } else {
+                echo 'Could not enable taxonomy tags' . PHP_EOL;
+            }
+        }
+    }
+
     public function updateWarningLists()
     {
         $this->ConfigLoad->execute();

From 3c96f66a6821c05a66a41d7d1254bc3e7eca65a7 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 24 Mar 2021 21:48:32 +0100
Subject: [PATCH 381/437] fix: [taxonomy] avoid MISP becoming unhappy when
 trying to enable tags for a non-existing taxonomy

---
 app/Model/Taxonomy.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Model/Taxonomy.php b/app/Model/Taxonomy.php
index be8b86e2e..6717f4030 100644
--- a/app/Model/Taxonomy.php
+++ b/app/Model/Taxonomy.php
@@ -387,6 +387,9 @@ class Taxonomy extends AppModel
         App::uses('ColourPaletteTool', 'Tools');
         $paletteTool = new ColourPaletteTool();
         $taxonomy = $this->__getTaxonomy($id, array('full' => true));
+        if (empty($taxonomy)) {
+            return false;
+        }
         $tags = $this->Tag->getTagsForNamespace($taxonomy['Taxonomy']['namespace']);
         $colours = $paletteTool->generatePaletteFromString($taxonomy['Taxonomy']['namespace'], count($taxonomy['entries']));
         foreach ($taxonomy['entries'] as $k => $entry) {

From 5661adcf8fd4ca32ca559368c897bcc68ef2af70 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 24 Mar 2021 23:03:22 +0100
Subject: [PATCH 382/437] chg: [auth key] logging no longer collapsed if the
 new setting is enabled

Security.log_each_individual_auth_fail will log all API failures instead of collapsing repeated queries
---
 app/Controller/AppController.php | 3 +++
 app/Model/Server.php             | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 530ff0d63..b99938822 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -1555,6 +1555,9 @@ class AppController extends Controller
      */
     protected function _shouldLog($key)
     {
+        if (Configure::read('Security.log_each_individual_auth_fail')) {
+            return true;
+        }
         $redis = $this->User->setupRedis();
         if ($redis && !$redis->exists('misp:auth_fail_throttling:' . $key)) {
             $redis->setex('misp:auth_fail_throttling:' . $key, 3600, 1);
diff --git a/app/Model/Server.php b/app/Model/Server.php
index 1ec3ead13..58c302353 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -5613,6 +5613,14 @@ class Server extends AppModel
                     'editable' => false,
                     'redacted' => true
                 ),
+                'log_each_individual_auth_fail' =>[
+                    'level' => 1,
+                    'description' => __('By default API authentication failures that happen within the same hour for the same key are omitted and a single log entry is generated. This allows administrators to more easily keep track of attackers that try to brute force API authentication, by reducing the noise generated by expired API keys. On the other hand, this makes little sense for internal MISP instances where detecting the misconfiguration of tools becomes more interesting, so if you fall into the latter category, enable this feature.'),
+                    'value' => false,
+                    'errorMessage' => '',
+                    'test' => 'testBool',
+                    'type' => 'boolean',
+                ],
                 'advanced_authkeys' => array(
                     'level' => 0,
                     'description' => __('Advanced authkeys will allow each user to create and manage a set of authkeys for themselves, each with individual expirations and comments. API keys are stored in a hashed state and can no longer be recovered from MISP. Users will be prompted to note down their key when creating a new authkey. You can generate a new set of API keys for all users on demand in the diagnostics page, or by triggering %s.', sprintf('<a href="%s/servers/serverSettings/diagnostics#advanced_authkey_update">%s</a>', $this->baseurl, __('the advanced upgrade'))),

From c7643515d6c8502371cf58caf419c2cd803ab1bc Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 24 Mar 2021 23:20:28 +0100
Subject: [PATCH 383/437] chg: [auth] if no API key is provided for an API
 action - log it

---
 app/Controller/AppController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index b99938822..51803bbef 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -226,6 +226,10 @@ class AppController extends Controller
                     $this->Security->csrfCheck = false;
                 }
                 if ($this->__loginByAuthKey() === false || $this->Auth->user() === null) {
+                    if ($this->__loginByAuthKey() === null) {
+                        $this->loadModel('Log');
+                        $this->Log->createLogEntry('SYSTEM', 'auth_fail', 'User', 0, "Failed API authentication. No authkey was provided.");
+                    }
                     throw new ForbiddenException('Authentication failed. Please make sure you pass the API key of an API enabled user along in the Authorization header.');
                 }
             } elseif (!$this->Session->read(AuthComponent::$sessionKey)) {

From b28a4e6488dd4d79b8f11de1c29267f99c7f7195 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 08:09:18 +0900
Subject: [PATCH 384/437] fix: [doc] next stages of the RHEL7 install

---
 docs/INSTALL.rhel7.md | 181 ++++++++++++++++--------------------------
 1 file changed, 69 insertions(+), 112 deletions(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index dc547cd79..f7c2bf743 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -85,7 +85,7 @@ enableReposRHEL () {
   sudo subscription-manager refresh
   sudo subscription-manager repos --enable rhel-7-server-optional-rpms
   sudo subscription-manager repos --enable rhel-7-server-extras-rpms
-  sudo subscription-manager repos --enable rhel-server-rhscl-7-rpms
+  #sudo subscription-manager repos --enable rhel-server-rhscl-7-rpms
 }
 # <snippet-end 0_RHEL_SCL.sh>
 ```
@@ -139,7 +139,6 @@ enableEPEL () {
   sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -y
   sudo yum install http://rpms.remirepo.net/enterprise/remi-release-7.rpm
   sudo yum install yum-utils
-  sudo subscription-manager repos --enable=rhel-7-server-optional-rpms
   sudo yum-config-manager --enable remi-php72
 }
 # <snippet-end 0_RHEL_EPEL.sh>
@@ -175,9 +174,9 @@ yumInstallCoreDeps () {
 
   WWW_USER="apache"
   SUDO_WWW="sudo -H -u $WWW_USER"
-  RUN_PHP="/usr/bin/scl enable php72"
+  RUN_PHP="php72"
   PHP_INI="/etc/opt/remi/php72/php.ini"
-  # Install PHP 7.2 from SCL, see https://www.softwarecollections.org/en/scls/rhscl/rh-php72/ Obsolete?
+  # Install PHP 7.2 from Remi's repo, see https://rpms.remirepo.net/enterprise/7/php72/x86_64/repoview/
   sudo yum install php72 php72-php-fpm php72-php-devel \
                    php72-php-mysqlnd \
                    php72-php-mbstring \
@@ -185,6 +184,7 @@ yumInstallCoreDeps () {
                    php72-php-bcmath \
                    php72-php-opcache \
                    php72-php-zip \
+                   php72-php-pear \
                    php72-php-gd -y
 
   # Python 3.6 is now available in RHEL 7.7 base
@@ -196,7 +196,7 @@ yumInstallCoreDeps () {
 ```
 
 !!! notice
-    $RUN_PHP makes php available for you if using php72. e.g: sudo $RUN_PHP "pear list | grep Crypt_GPG"
+    $RUN_PHP makes php available for you if using php72. e.g: sudo $RUN_PHP -v ; for PEAR: "php72-pear list | grep Crypt_GPG"
 
 ```bash
 # <snippet-begin 0_yumInstallHaveged.sh>
@@ -242,17 +242,17 @@ installCoreRHEL () {
   cd $PATH_TO_MISP/app/files/scripts
   $SUDO_WWW git clone https://github.com/CybOXProject/python-cybox.git
   $SUDO_WWW git clone https://github.com/STIXProject/python-stix.git
-  $SUDO_WWW git clone --branch master --single-branch https://github.com/lief-project/LIEF.git lief
+  ##$SUDO_WWW git clone --branch master --single-branch https://github.com/lief-project/LIEF.git lief
   $SUDO_WWW git clone https://github.com/CybOXProject/mixbox.git
 
   # If you umask is has been changed from the default, it is a good idea to reset it to 0022 before installing python modules
   UMASK=$(umask)
   umask 0022
-  
+
   cd $PATH_TO_MISP/app/files/scripts/python-cybox
   $SUDO_WWW git config core.filemode false
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install .
-  
+
   cd $PATH_TO_MISP/app/files/scripts/python-stix
   $SUDO_WWW git config core.filemode false
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install .
@@ -276,41 +276,41 @@ installCoreRHEL () {
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U redis
 
   # lief needs manual compilation
-  sudo yum install devtoolset-7 cmake3 cppcheck libcxx-devel -y
+  ##sudo yum install devtoolset-7 cmake3 cppcheck libcxx-devel -y
 
-  cd $PATH_TO_MISP/app/files/scripts/lief
-  $SUDO_WWW git config core.filemode false
-  $SUDO_WWW mkdir build
-  cd build
-  $SUDO_WWW scl enable devtoolset-7 "bash -c 'cmake3 \
-  -DLIEF_PYTHON_API=on \
-  -DPYTHON_VERSION=3.6 \
-  -DPYTHON_EXECUTABLE=$PATH_TO_MISP/venv/bin/python \
-  -DLIEF_DOC=off \
-  -DCMAKE_BUILD_TYPE=Release \
-  ..'"
-  $SUDO_WWW make -j3 pyLIEF
+  ##cd $PATH_TO_MISP/app/files/scripts/lief
+  ##$SUDO_WWW git config core.filemode false
+  ##$SUDO_WWW mkdir build
+  ##cd build
+  ##$SUDO_WWW cmake3 \
+  ##-DLIEF_PYTHON_API=on \
+  ##-DPYTHON_VERSION=3.6 \
+  ##-DPYTHON_EXECUTABLE=$PATH_TO_MISP/venv/bin/python \
+  ##-DLIEF_DOC=off \
+  ##-DCMAKE_BUILD_TYPE=Release \
+  ##..
+  ##$SUDO_WWW make -j3 pyLIEF
 
-  if [ $? == 2 ]; then
-    # In case you get "internal compiler error: Killed (program cc1plus)"
-    # You ran out of memory.
-    # Create some swap
-    TEMP_DIR=$(mktemp -d)
-    TEMP_SWAP=${TEMP_DIR}/swap.img
-    sudo dd if=/dev/zero of=${TEMP_SWAP} bs=1024k count=4000
-    sudo mkswap ${TEMP_SWAP}
-    sudo swapon ${TEMP_SWAP}
-    # And compile again
-    ${SUDO_WWW} make -j3 pyLIEF
-    sudo swapoff ${TEMP_SWAP}
-    sudo rm -r ${TEMP_DIR}
-  fi
+  ##if [ $? == 2 ]; then
+  ##  # In case you get "internal compiler error: Killed (program cc1plus)"
+  ##  # You ran out of memory.
+  ##  # Create some swap
+  ##  TEMP_DIR=$(mktemp -d)
+  ##  TEMP_SWAP=${TEMP_DIR}/swap.img
+  ##  sudo dd if=/dev/zero of=${TEMP_SWAP} bs=1024k count=4000
+  ##  sudo mkswap ${TEMP_SWAP}
+  ##  sudo swapon ${TEMP_SWAP}
+  ##  # And compile again
+  ##  ${SUDO_WWW} make -j3 pyLIEF
+  ##  sudo swapoff ${TEMP_SWAP}
+  ##  sudo rm -r ${TEMP_DIR}
+  ##fi
 
   # The following adds a PYTHONPATH to where the pyLIEF module has been compiled
-  echo $PATH_TO_MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee $PATH_TO_MISP/venv/lib/python3.6/site-packages/lief.pth
+  ##echo $PATH_TO_MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee $PATH_TO_MISP/venv/lib/python3.6/site-packages/lief.pth
 
-  # install magic, pydeep
-  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U python-magic git+https://github.com/kbandla/pydeep.git plyara
+  # install magic, pydeep, lief
+  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U python-magic git+https://github.com/kbandla/pydeep.git plyara lief
 
   # install PyMISP
   cd $PATH_TO_MISP/PyMISP
@@ -319,6 +319,7 @@ installCoreRHEL () {
   # FIXME: Remove libfaup etc once the egg has the library baked-in
   # BROKEN: This needs to be tested on RHEL/CentOS
   ##sudo apt-get install cmake libcaca-dev liblua5.3-dev -y
+  sudo yum install libcaca-devel
   cd /tmp
   [[ ! -d "faup" ]] && $SUDO_CMD git clone https://github.com/stricaud/faup.git faup
   [[ ! -d "gtcaca" ]] && $SUDO_CMD git clone https://github.com/stricaud/gtcaca.git gtcaca
@@ -326,12 +327,12 @@ installCoreRHEL () {
   cd gtcaca
   $SUDO_CMD mkdir -p build
   cd build
-  $SUDO_CMD cmake .. && $SUDO_CMD make
+  $SUDO_CMD cmake3 .. && $SUDO_CMD make
   sudo make install
   cd ../../faup
   $SUDO_CMD mkdir -p build
   cd build
-  $SUDO_CMD cmake .. && $SUDO_CMD make
+  $SUDO_CMD cmake3 .. && $SUDO_CMD make
   sudo make install
   sudo ldconfig
 
@@ -367,27 +368,16 @@ installCake_RHEL ()
   #$SUDO_WWW $RUN_PHP -- php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
   #$SUDO_WWW $RUN_PHP "php composer-setup.php"
   #$SUDO_WWW $RUN_PHP -- php -r "unlink('composer-setup.php');"
-  $SUDO_WWW $RUN_PHP "php composer.phar install"
+  $SUDO_WWW $RUN_PHP composer.phar install
 
-  ## sudo yum install php-redis -y
-  sudo scl enable rh-php72 'pecl channel-update pecl.php.net'
-  sudo scl enable rh-php72 'yes no|pecl install redis'
-  echo "extension=redis.so" |sudo tee /etc/opt/rh/rh-php72/php.d/99-redis.ini
+  sudo yum install php72-php-pecl-redis php72-php-pecl-ssdeep php72-php-pecl-gnupg -y
 
-  sudo ln -s /usr/lib64/libfuzzy.so /usr/lib/libfuzzy.so
-  sudo scl enable rh-php72 'pecl install ssdeep'
-  echo "extension=ssdeep.so" |sudo tee /etc/opt/rh/rh-php72/php.d/99-ssdeep.ini
-
-  # Install gnupg extension
-  sudo yum install gpgme-devel -y
-  sudo scl enable rh-php72 'pecl install gnupg'
-  echo "extension=gnupg.so" |sudo tee /etc/opt/rh/rh-php72/php.d/99-gnupg.ini
-  sudo systemctl restart rh-php72-php-fpm.service
+  sudo systemctl restart php72-php-fpm.service
 
   # If you have not yet set a timezone in php.ini
-  echo 'date.timezone = "Asia/Tokyo"' |sudo tee /etc/opt/rh/rh-php72/php.d/timezone.ini
+  echo 'date.timezone = "Asia/Tokyo"' |sudo tee /etc/opt/remi/php72/php.d/timezone.ini
 
-  # Recommended: Change some PHP settings in /etc/opt/rh/rh-php72/php.ini
+  # Recommended: Change some PHP settings in /etc/opt/remi/php72/php.ini
   # max_execution_time = 300
   # memory_limit = 2048M
   # upload_max_filesize = 50M
@@ -438,64 +428,31 @@ permissions_RHEL () {
 ```bash
 # <snippet-begin 1_prepareDB_RHEL.sh>
 prepareDB_RHEL () {
-  RUN_MYSQL="/usr/bin/scl enable rh-mariadb102"
-  # Enable, start and secure your mysql database server
-  sudo systemctl enable --now rh-mariadb102-mariadb.service
-  echo [mysqld] |sudo tee /etc/opt/rh/rh-mariadb102/my.cnf.d/bind-address.cnf
-  echo bind-address=127.0.0.1 |sudo tee -a /etc/opt/rh/rh-mariadb102/my.cnf.d/bind-address.cnf
-  sudo systemctl restart rh-mariadb102-mariadb
+  sudo systemctl enable --now mariadb.service
+  echo [mysqld] |sudo tee /etc/my.cnf.d/bind-address.cnf
+  echo bind-address=127.0.0.1 |sudo tee -a /etc/my.cnf.d/bind-address.cnf
+  sudo systemctl restart mariadb
 
-  sudo yum install expect -y
+  # Kill the anonymous users
+  sudo mysql -h $DBHOST -e "DROP USER IF EXISTS ''@'localhost'"
+  # Because our hostname varies we'll use some Bash magic here.
+  sudo mysql -h $DBHOST -e "DROP USER IF EXISTS ''@'$(hostname)'"
+  # Kill off the demo database
+  sudo mysql -h $DBHOST -e "DROP DATABASE IF EXISTS test"
+  # No root remote logins
+  sudo mysql -h $DBHOST -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1')"
+  # Make sure that NOBODY can access the server without a password
+  sudo mysqladmin -h $DBHOST -u "${DBUSER_ADMIN}" password "${DBPASSWORD_ADMIN}"
+  # Make our changes take effect
+  sudo mysql -h $DBHOST -e "FLUSH PRIVILEGES"
 
-  ## The following needs some thoughts about scl enable foo
-  #if [[ ! -e /var/opt/rh/rh-mariadb102/lib/mysql/misp/users.ibd ]]; then
-
-  # We ask interactively your password if not run as root
-  pw=""
-  if [[ "$EUID" -ne 0 ]]; then
-    read -s -p "Enter sudo password: " pw
-  fi
-
-  expect -f - <<-EOF
-    set timeout 10
-
-    spawn sudo scl enable rh-mariadb102 mysql_secure_installation
-    expect {
-      "*sudo*" {
-        send "$pw\r"
-        exp_continue
-      }
-      "Enter current password for root (enter for none):" {
-        send -- "\r"
-      }
-    }
-    expect "Set root password?"
-    send -- "y\r"
-    expect "New password:"
-    send -- "${DBPASSWORD_ADMIN}\r"
-    expect "Re-enter new password:"
-    send -- "${DBPASSWORD_ADMIN}\r"
-    expect "Remove anonymous users?"
-    send -- "y\r"
-    expect "Disallow root login remotely?"
-    send -- "y\r"
-    expect "Remove test database and access to it?"
-    send -- "y\r"
-    expect "Reload privilege tables now?"
-    send -- "y\r"
-    expect eof
-EOF
-
-  sudo yum remove tcl expect -y
-
-  sudo systemctl restart rh-mariadb102-mariadb
-
-  scl enable rh-mariadb102 "mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e 'CREATE DATABASE $DBNAME;'"
-  scl enable rh-mariadb102 "mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e \"GRANT USAGE on *.* to $DBUSER_MISP@localhost IDENTIFIED by '$DBPASSWORD_MISP';\""
-  scl enable rh-mariadb102 "mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e \"GRANT ALL PRIVILEGES on $DBNAME.* to '$DBUSER_MISP'@'localhost';\""
-  scl enable rh-mariadb102 "mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e 'FLUSH PRIVILEGES;'"
-
-  $SUDO_WWW cat $PATH_TO_MISP/INSTALL/MYSQL.sql | sudo scl enable rh-mariadb102 "mysql -h $DBHOST -u $DBUSER_MISP -p$DBPASSWORD_MISP $DBNAME"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "CREATE DATABASE ${DBNAME};"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "CREATE USER '${DBUSER_MISP}'@'localhost' IDENTIFIED BY '${DBPASSWORD_MISP}';"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "GRANT USAGE ON *.* to '${DBUSER_MISP}'@'localhost';"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "GRANT ALL PRIVILEGES on ${DBNAME}.* to '${DBUSER_MISP}'@'localhost';"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "FLUSH PRIVILEGES;"
+  # Import the empty MISP database from MYSQL.sql
+  ${SUDO_WWW} cat ${PATH_TO_MISP}/INSTALL/MYSQL.sql | mysql -h $DBHOST -u "${DBUSER_MISP}" -p"${DBPASSWORD_MISP}" ${DBNAME}
 }
 # <snippet-end 1_prepareDB_RHEL.sh>
 ```

From ab071dedfb13bea85c8e975772729a7d82d87e21 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 08:49:36 +0900
Subject: [PATCH 385/437] fix: [doc] MISP-core now working on RHEL 7.9

---
 docs/INSTALL.rhel7.md | 98 +++++++++++++------------------------------
 1 file changed, 29 insertions(+), 69 deletions(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index f7c2bf743..61bc848d8 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -85,7 +85,6 @@ enableReposRHEL () {
   sudo subscription-manager refresh
   sudo subscription-manager repos --enable rhel-7-server-optional-rpms
   sudo subscription-manager repos --enable rhel-7-server-extras-rpms
-  #sudo subscription-manager repos --enable rhel-server-rhscl-7-rpms
 }
 # <snippet-end 0_RHEL_SCL.sh>
 ```
@@ -147,7 +146,7 @@ enableEPEL () {
 ### 2/ Dependencies
 
 !!! note
-    This guide installs PHP 7.2 from SCL
+    This guide installs PHP 7.4 from Remi's Repo
 
 !!! warning
     [PHP 5.6 and 7.0 aren't supported since December 2018](https://secure.php.net/supported-versions.php). Please update accordingly. In the future only PHP7 will be supported.
@@ -170,34 +169,31 @@ yumInstallCoreDeps () {
   wget https://downloads.mariadb.com/MariaDB/mariadb_repo_setup
   chmod +x mariadb_repo_setup
   sudo ./mariadb_repo_setup
+  rm mariadb_repo_setup
   sudo yum install MariaDB-server
 
   WWW_USER="apache"
   SUDO_WWW="sudo -H -u $WWW_USER"
-  RUN_PHP="php72"
-  PHP_INI="/etc/opt/remi/php72/php.ini"
-  # Install PHP 7.2 from Remi's repo, see https://rpms.remirepo.net/enterprise/7/php72/x86_64/repoview/
-  sudo yum install php72 php72-php-fpm php72-php-devel \
-                   php72-php-mysqlnd \
-                   php72-php-mbstring \
-                   php72-php-xml \
-                   php72-php-bcmath \
-                   php72-php-opcache \
-                   php72-php-zip \
-                   php72-php-pear \
-                   php72-php-gd -y
+  PHP_INI="/etc/opt/remi/php74/php.ini"
+  # Install PHP 7.4 from Remi's repo, see https://rpms.remirepo.net/enterprise/7/php74/x86_64/repoview/
+  sudo yum install php74 php74-php-fpm php74-php-devel \
+                   php74-php-mysqlnd \
+                   php74-php-mbstring \
+                   php74-php-xml \
+                   php74-php-bcmath \
+                   php74-php-opcache \
+                   php74-php-zip \
+                   php74-php-pear \
+                   php74-php-gd -y
 
   # Python 3.6 is now available in RHEL 7.7 base
   sudo yum install python3 python3-devel -y
 
-  sudo systemctl enable --now php72-php-fpm.service
+  sudo systemctl enable --now php74-php-fpm.service
 }
 # <snippet-end 0_yumInstallCoreDeps.sh>
 ```
 
-!!! notice
-    $RUN_PHP makes php available for you if using php72. e.g: sudo $RUN_PHP -v ; for PEAR: "php72-pear list | grep Crypt_GPG"
-
 ```bash
 # <snippet-begin 0_yumInstallHaveged.sh>
 # GPG needs lots of entropy, haveged provides entropy
@@ -275,40 +271,6 @@ installCoreRHEL () {
   # install redis
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U redis
 
-  # lief needs manual compilation
-  ##sudo yum install devtoolset-7 cmake3 cppcheck libcxx-devel -y
-
-  ##cd $PATH_TO_MISP/app/files/scripts/lief
-  ##$SUDO_WWW git config core.filemode false
-  ##$SUDO_WWW mkdir build
-  ##cd build
-  ##$SUDO_WWW cmake3 \
-  ##-DLIEF_PYTHON_API=on \
-  ##-DPYTHON_VERSION=3.6 \
-  ##-DPYTHON_EXECUTABLE=$PATH_TO_MISP/venv/bin/python \
-  ##-DLIEF_DOC=off \
-  ##-DCMAKE_BUILD_TYPE=Release \
-  ##..
-  ##$SUDO_WWW make -j3 pyLIEF
-
-  ##if [ $? == 2 ]; then
-  ##  # In case you get "internal compiler error: Killed (program cc1plus)"
-  ##  # You ran out of memory.
-  ##  # Create some swap
-  ##  TEMP_DIR=$(mktemp -d)
-  ##  TEMP_SWAP=${TEMP_DIR}/swap.img
-  ##  sudo dd if=/dev/zero of=${TEMP_SWAP} bs=1024k count=4000
-  ##  sudo mkswap ${TEMP_SWAP}
-  ##  sudo swapon ${TEMP_SWAP}
-  ##  # And compile again
-  ##  ${SUDO_WWW} make -j3 pyLIEF
-  ##  sudo swapoff ${TEMP_SWAP}
-  ##  sudo rm -r ${TEMP_DIR}
-  ##fi
-
-  # The following adds a PYTHONPATH to where the pyLIEF module has been compiled
-  ##echo $PATH_TO_MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee $PATH_TO_MISP/venv/lib/python3.6/site-packages/lief.pth
-
   # install magic, pydeep, lief
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U python-magic git+https://github.com/kbandla/pydeep.git plyara lief
 
@@ -338,11 +300,9 @@ installCoreRHEL () {
 
   # Enable dependencies detection in the diagnostics page
   # This allows MISP to detect GnuPG, the Python modules' versions and to read the PHP settings.
-  # OBSOLETE?
-  # The LD_LIBRARY_PATH setting is needed for rh-git218 to work
-  echo "env[PATH] = /opt/rh/rh-git218/root/usr/bin:/opt/rh/rh-php72/root/usr/bin:/usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/rh/rh-php72/php-fpm.d/www.conf
-  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/remi/php72/php-fpm.d/www.conf
-  sudo systemctl restart php72-php-fpm.service
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/remi/php74/php-fpm.d/www.conf
+  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/remi/php74/php-fpm.d/www.conf
+  sudo systemctl restart php74-php-fpm.service
   umask $UMASK
 }
 # <snippet-end 1_mispCoreInstall_RHEL.sh>
@@ -364,20 +324,20 @@ installCake_RHEL ()
   cd $PATH_TO_MISP/app
   # Update composer.phar (optional)
   #EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)"
-  #$SUDO_WWW $RUN_PHP -- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-  #$SUDO_WWW $RUN_PHP -- php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-  #$SUDO_WWW $RUN_PHP "php composer-setup.php"
-  #$SUDO_WWW $RUN_PHP -- php -r "unlink('composer-setup.php');"
-  $SUDO_WWW $RUN_PHP composer.phar install
+  #$SUDO_WWW php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+  #$SUDO_WWW php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+  #$SUDO_WWW php composer-setup.php
+  #$SUDO_WWW php -r "unlink('composer-setup.php');"
+  $SUDO_WWW php composer.phar install
 
-  sudo yum install php72-php-pecl-redis php72-php-pecl-ssdeep php72-php-pecl-gnupg -y
+  sudo yum install php74-php-pecl-redis php74-php-pecl-ssdeep php74-php-pecl-gnupg -y
 
-  sudo systemctl restart php72-php-fpm.service
+  sudo systemctl restart php74-php-fpm.service
 
   # If you have not yet set a timezone in php.ini
-  echo 'date.timezone = "Asia/Tokyo"' |sudo tee /etc/opt/remi/php72/php.d/timezone.ini
+  echo 'date.timezone = "Asia/Tokyo"' |sudo tee /etc/opt/remi/php74/php.d/timezone.ini
 
-  # Recommended: Change some PHP settings in /etc/opt/remi/php72/php.ini
+  # Recommended: Change some PHP settings in /etc/opt/remi/php74/php.ini
   # max_execution_time = 300
   # memory_limit = 2048M
   # upload_max_filesize = 50M
@@ -386,7 +346,7 @@ installCake_RHEL ()
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
-  sudo systemctl restart rh-php72-php-fpm.service
+  sudo systemctl restart rh-php74-php-fpm.service
 
   # To use the scheduler worker for scheduled tasks, do the following:
   sudo cp -fa $PATH_TO_MISP/INSTALL/setup/config.php $PATH_TO_MISP/app/Plugin/CakeResque/Config/config.php
@@ -678,13 +638,13 @@ EOF
 configWorkersRHEL () {
   echo "[Unit]
   Description=MISP background workers
-  After=rh-mariadb102-mariadb.service rh-redis32-redis.service rh-php72-php-fpm.service
+  After=mariadb.service redis.service php74-php-fpm.service
 
   [Service]
   Type=forking
   User=$WWW_USER
   Group=$WWW_USER
-  ExecStart=/usr/bin/scl enable rh-php72 rh-redis32 rh-mariadb102 $PATH_TO_MISP/app/Console/worker/start.sh
+  ExecStart=$PATH_TO_MISP/app/Console/worker/start.sh
   Restart=always
   RestartSec=10
 

From c29f1f96adb3423438b62d0c83d9b42eb81591ee Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 09:11:36 +0900
Subject: [PATCH 386/437] chg: [doc] Be friendly to automation

---
 docs/INSTALL.rhel7.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index 61bc848d8..3d2b3be63 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -136,8 +136,8 @@ yumUpdate () {
 # <snippet-begin 0_RHEL_EPEL.sh>
 enableEPEL () {
   sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -y
-  sudo yum install http://rpms.remirepo.net/enterprise/remi-release-7.rpm
-  sudo yum install yum-utils
+  sudo yum install http://rpms.remirepo.net/enterprise/remi-release-7.rpm -y
+  sudo yum install yum-utils -y
   sudo yum-config-manager --enable remi-php72
 }
 # <snippet-end 0_RHEL_EPEL.sh>
@@ -165,12 +165,12 @@ yumInstallCoreDeps () {
   sudo systemctl enable --now redis.service
 
   # Install MariaDB
-  sudo yum install wget
+  sudo yum install wget -y
   wget https://downloads.mariadb.com/MariaDB/mariadb_repo_setup
   chmod +x mariadb_repo_setup
   sudo ./mariadb_repo_setup
   rm mariadb_repo_setup
-  sudo yum install MariaDB-server
+  sudo yum install MariaDB-server -y
 
   WWW_USER="apache"
   SUDO_WWW="sudo -H -u $WWW_USER"
@@ -281,7 +281,7 @@ installCoreRHEL () {
   # FIXME: Remove libfaup etc once the egg has the library baked-in
   # BROKEN: This needs to be tested on RHEL/CentOS
   ##sudo apt-get install cmake libcaca-dev liblua5.3-dev -y
-  sudo yum install libcaca-devel
+  sudo yum install libcaca-devel -y
   cd /tmp
   [[ ! -d "faup" ]] && $SUDO_CMD git clone https://github.com/stricaud/faup.git faup
   [[ ! -d "gtcaca" ]] && $SUDO_CMD git clone https://github.com/stricaud/gtcaca.git gtcaca

From faa3e513cfdbcaede90d800922fd32f617affded Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 09:24:27 +0900
Subject: [PATCH 387/437] chg: [doc] Added symlink to php

---
 docs/INSTALL.rhel7.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index 3d2b3be63..a9d19f96c 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -138,7 +138,7 @@ enableEPEL () {
   sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -y
   sudo yum install http://rpms.remirepo.net/enterprise/remi-release-7.rpm -y
   sudo yum install yum-utils -y
-  sudo yum-config-manager --enable remi-php72
+  sudo yum-config-manager --enable remi-php74
 }
 # <snippet-end 0_RHEL_EPEL.sh>
 ```
@@ -186,6 +186,9 @@ yumInstallCoreDeps () {
                    php74-php-pear \
                    php74-php-gd -y
 
+  # cake has php baked in, thus we link to it
+  sudo ln -s /usr/bin/php74 /usr/bin/php
+
   # Python 3.6 is now available in RHEL 7.7 base
   sudo yum install python3 python3-devel -y
 
@@ -280,8 +283,7 @@ installCoreRHEL () {
 
   # FIXME: Remove libfaup etc once the egg has the library baked-in
   # BROKEN: This needs to be tested on RHEL/CentOS
-  ##sudo apt-get install cmake libcaca-dev liblua5.3-dev -y
-  sudo yum install libcaca-devel -y
+  sudo yum install libcaca-devel cmake3 -y
   cd /tmp
   [[ ! -d "faup" ]] && $SUDO_CMD git clone https://github.com/stricaud/faup.git faup
   [[ ! -d "gtcaca" ]] && $SUDO_CMD git clone https://github.com/stricaud/gtcaca.git gtcaca

From cfbc93de52485c18cd91db1d01defc0b514e4a6e Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 09:25:47 +0900
Subject: [PATCH 388/437] chg: [doc] typo

---
 docs/INSTALL.rhel7.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index a9d19f96c..c3fe86f05 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -348,7 +348,7 @@ installCake_RHEL ()
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
-  sudo systemctl restart rh-php74-php-fpm.service
+  sudo systemctl restart php74-php-fpm.service
 
   # To use the scheduler worker for scheduled tasks, do the following:
   sudo cp -fa $PATH_TO_MISP/INSTALL/setup/config.php $PATH_TO_MISP/app/Plugin/CakeResque/Config/config.php

From 712414ce52764771119293cda582d768c2c41fef Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 09:54:26 +0900
Subject: [PATCH 389/437] chg: [doc] Minor adjustments to permissions setter

---
 docs/INSTALL.rhel7.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index c3fe86f05..74f9c6b92 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -463,13 +463,12 @@ apacheConfig_RHEL () {
   sudo chcon -t httpd_sys_rw_content_t $PATH_TO_MISP/app/files/scripts/tmp
   sudo chcon -t httpd_sys_rw_content_t $PATH_TO_MISP/app/Plugin/CakeResque/tmp
   sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Console/cake
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Console/worker/*.sh
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*.py
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*/*.py
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/lief/build/api/python/lief.so
+  sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Console/worker/*.sh"
+  sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*.py"
+  sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*/*.py"
   sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Vendor/pear/crypt_gpg/scripts/crypt-gpg-pinentry
-  sudo chcon -R -t bin_t $PATH_TO_MISP/venv/bin/*
-  find $PATH_TO_MISP/venv -type f -name "*.so*" -or -name "*.so.*" | xargs sudo chcon -t lib_t
+  sudo sh -c "chcon -R -t bin_t $PATH_TO_MISP/venv/bin/*"
+  sudo find $PATH_TO_MISP/venv -type f -name "*.so*" -or -name "*.so.*" | xargs sudo chcon -t lib_t
   # Only run these if you want to be able to update MISP from the web interface
   sudo chcon -R -t httpd_sys_rw_content_t $PATH_TO_MISP/.git
   sudo chcon -R -t httpd_sys_rw_content_t $PATH_TO_MISP/app/tmp

From d4839bfdfa58694a0a293a697bfe7c8c6a6460ba Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 10:54:35 +0900
Subject: [PATCH 390/437] chg: [doc] Some minor changes and hardening

---
 docs/INSTALL.rhel7.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index 74f9c6b92..d1a0ca7d5 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -184,6 +184,8 @@ yumInstallCoreDeps () {
                    php74-php-opcache \
                    php74-php-zip \
                    php74-php-pear \
+                   php74-php-brotli \
+                   php74-php-intl \
                    php74-php-gd -y
 
   # cake has php baked in, thus we link to it
@@ -344,7 +346,7 @@ installCake_RHEL ()
   # memory_limit = 2048M
   # upload_max_filesize = 50M
   # post_max_size = 50M
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
@@ -591,6 +593,7 @@ configMISP_RHEL () {
 
   # If you want to be able to change configuration parameters from the webinterface:
   sudo chown $WWW_USER:$WWW_USER $PATH_TO_MISP/app/Config/config.php
+  sudo chmod 660 $PATH_TO_MISP/app/Config/config.php
   sudo chcon -t httpd_sys_rw_content_t $PATH_TO_MISP/app/Config/config.php
 
   # Generate a GPG encryption key.

From dd85a3e218ec90109bc35f6d50b17aa7e90d539b Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 10:56:06 +0900
Subject: [PATCH 391/437] chg: [doc] Added additional hardening and logging
 defaults

---
 docs/INSTALL.rhel8.md            |  2 +-
 docs/INSTALL.ubuntu1804.md       |  2 +-
 docs/INSTALL.ubuntu2004.md       |  2 +-
 docs/generic/MISP_CAKE_init.md   | 18 +++++++++++++++++-
 docs/generic/globalVariables.md  |  2 ++
 docs/generic/supportFunctions.md |  2 +-
 docs/xINSTALL.centos6.md         |  2 +-
 docs/xINSTALL.centos7.md         |  2 +-
 docs/xINSTALL.debian10.md        |  2 +-
 docs/xINSTALL.debian9.md         |  2 +-
 docs/xINSTALL.tsurugi.md         |  5 ++++-
 11 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 5dc9ca7fb..318cc57b8 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -355,7 +355,7 @@ installCake_RHEL ()
   # memory_limit = 2048M
   # upload_max_filesize = 50M
   # post_max_size = 50M
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
diff --git a/docs/INSTALL.ubuntu1804.md b/docs/INSTALL.ubuntu1804.md
index f92780c73..a5eac7bae 100644
--- a/docs/INSTALL.ubuntu1804.md
+++ b/docs/INSTALL.ubuntu1804.md
@@ -117,7 +117,7 @@ installDepsPhp72 () {
   php-intl php-bcmath \
   php-gd
 
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
diff --git a/docs/INSTALL.ubuntu2004.md b/docs/INSTALL.ubuntu2004.md
index dd35db49e..a7149b574 100644
--- a/docs/INSTALL.ubuntu2004.md
+++ b/docs/INSTALL.ubuntu2004.md
@@ -117,7 +117,7 @@ installDepsPhp74 () {
   php-intl php-bcmath \
   php-gd
 
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
diff --git a/docs/generic/MISP_CAKE_init.md b/docs/generic/MISP_CAKE_init.md
index ecbfb5df4..807a6b9c1 100644
--- a/docs/generic/MISP_CAKE_init.md
+++ b/docs/generic/MISP_CAKE_init.md
@@ -39,6 +39,7 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "GnuPG.email" "$GPG_EMAIL_ADDRESS"
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "GnuPG.homedir" "$PATH_TO_MISP/.gnupg"
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "GnuPG.password" "$GPG_PASSPHRASE"
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "GnuPG.obscure_subject" true
   # FIXME: what if we have not gpg binary but a gpg2 one?
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "GnuPG.binary" "$(which gpg)"
 
@@ -68,6 +69,9 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Sightings_range" 365
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Sightings_sighting_db_enable" false
 
+  # Plugin Enrichment hover defaults
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_hover_popover_only" false
+
   # Plugin CustomAuth tuneable
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.CustomAuth_disable_logout" false
 
@@ -102,8 +106,10 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.passwordResetText" "Dear MISP user,\\n\\nA password reset has been triggered for your account. Use the below provided temporary password to log into MISP at \$misp, where you will be prompted to manually change your password to something of your own choice.\\n\\nUsername: \$username\\nYour temporary password: \$password\\n\\nIf you have any questions, don't hesitate to contact us at: \$contact.\\n\\nBest regards,\\nYour \$org MISP support team"
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.enableEventBlocklisting" true
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.enableOrgBlocklisting" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.log_client_ip" false
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.log_client_ip" true
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.log_auth" false
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.log_user_ips" true
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.log_user_ips_authkeys" true
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.disableUserSelfManagement" false
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.disable_user_login_change" false
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.disable_user_password_change" false
@@ -136,6 +142,16 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.password_policy_complexity" '/^((?=.*\d)|(?=.*\W+))(?![\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/'
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.self_registration_message" "If you would like to send us a registration request, please fill out the form below. Make sure you fill out as much information as possible in order to ease the task of the administrators."
 
+  # Appease the security audit, #hardening
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.disable_browser_cache" true
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.check_sec_fetch_site_header" true
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.csp_enforce" true
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.advanced_authkeys" true
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.do_not_log_authkeys" true
+
+  # Appease the security audit, #loggin
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.username_in_response_header" true
+
   # It is possible to updateMISP too, only here for reference how to to that on the CLI.
   ## $SUDO_WWW $RUN_PHP -- $CAKE Admin updateMISP
 
diff --git a/docs/generic/globalVariables.md b/docs/generic/globalVariables.md
index 115bb1de9..4cdabcf4d 100644
--- a/docs/generic/globalVariables.md
+++ b/docs/generic/globalVariables.md
@@ -84,6 +84,8 @@ MISPvars () {
   post_max_size="50M"
   max_execution_time="300"
   memory_limit="2048M"
+  session.sid_length="32"
+  session.use_strict_mode="1"
 
   CAKE="${PATH_TO_MISP}/app/Console/cake"
 
diff --git a/docs/generic/supportFunctions.md b/docs/generic/supportFunctions.md
index eb715493f..48901ca3c 100644
--- a/docs/generic/supportFunctions.md
+++ b/docs/generic/supportFunctions.md
@@ -668,7 +668,7 @@ installDepsPhp70 () {
   php-redis php-gnupg \
   php-gd
 
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
diff --git a/docs/xINSTALL.centos6.md b/docs/xINSTALL.centos6.md
index 6765b71a0..823de4611 100644
--- a/docs/xINSTALL.centos6.md
+++ b/docs/xINSTALL.centos6.md
@@ -281,7 +281,7 @@ sudo ln -s ../php-fpm.d/timezone.ini /etc/opt/rh/rh-php70/php.d/99-timezone.ini
 # memory_limit=2048M
 # upload_max_filesize=50M
 # post_max_size=50M
-for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
+for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
 do
     sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
 done
diff --git a/docs/xINSTALL.centos7.md b/docs/xINSTALL.centos7.md
index 10c12ce3d..4ede51996 100644
--- a/docs/xINSTALL.centos7.md
+++ b/docs/xINSTALL.centos7.md
@@ -264,7 +264,7 @@ echo 'date.timezone = "Europe/Luxembourg"' |sudo tee /etc/opt/rh/rh-php72/php.d/
 # memory_limit = 2048M
 # upload_max_filesize = 50M
 # post_max_size = 50M
-for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
+for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
 do
     sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
 done
diff --git a/docs/xINSTALL.debian10.md b/docs/xINSTALL.debian10.md
index 0a82aa113..191c658e4 100644
--- a/docs/xINSTALL.debian10.md
+++ b/docs/xINSTALL.debian10.md
@@ -341,7 +341,7 @@ sudo a2ensite misp-ssl
 # memory_limit = 2048M
 # upload_max_filesize = 50M
 # post_max_size = 50M
-for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
+for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
 do
     sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
 done
diff --git a/docs/xINSTALL.debian9.md b/docs/xINSTALL.debian9.md
index 0f0f8eef7..f1e379683 100644
--- a/docs/xINSTALL.debian9.md
+++ b/docs/xINSTALL.debian9.md
@@ -363,7 +363,7 @@ sudo a2ensite misp-ssl
 # memory_limit = 2048M
 # upload_max_filesize = 50M
 # post_max_size = 50M
-for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
+for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
 do
     sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
 done
diff --git a/docs/xINSTALL.tsurugi.md b/docs/xINSTALL.tsurugi.md
index dce606d74..0526209ce 100644
--- a/docs/xINSTALL.tsurugi.md
+++ b/docs/xINSTALL.tsurugi.md
@@ -118,6 +118,9 @@ function installMISPonTsurugi() {
   post_max_size=50M
   max_execution_time=300
   memory_limit=2048M
+  session.sid_length=32
+  session.use_strict_mode=1
+
   PHP_INI=/etc/php/7.0/apache2/php.ini
 
   # apt config
@@ -406,7 +409,7 @@ function installMISPonTsurugi() {
   a2ensite misp-ssl
   a2ensite misp-dashboard
 
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
   do
       sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done

From 0233d6425fb66ce8f71b1acfbe506d98c51ec109 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 12:52:08 +0900
Subject: [PATCH 392/437] fix: [doc] Fixed a bash variable bug

---
 docs/INSTALL.rhel7.md            |  6 +++++-
 docs/INSTALL.rhel8.md            | 11 ++++++++++-
 docs/INSTALL.ubuntu1804.md       |  4 +++-
 docs/INSTALL.ubuntu2004.md       |  4 +++-
 docs/generic/globalVariables.md  |  4 ++--
 docs/generic/supportFunctions.md |  4 +++-
 docs/xINSTALL.centos6.md         |  4 +++-
 docs/xINSTALL.centos7.md         |  4 +++-
 docs/xINSTALL.debian10.md        |  4 +++-
 docs/xINSTALL.debian9.md         |  4 +++-
 docs/xINSTALL.tsurugi.md         |  4 +++-
 11 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index d1a0ca7d5..aeeddeec6 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -21,6 +21,8 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
 
 ### 0/ Overview and Assumptions
 
+{!generic/community.md!}
+
 {!generic/rhelVScentos.md!}
 
 !!! warning
@@ -346,10 +348,12 @@ installCake_RHEL ()
   # memory_limit = 2048M
   # upload_max_filesize = 50M
   # post_max_size = 50M
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
+  sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+  sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
   sudo systemctl restart php74-php-fpm.service
 
   # To use the scheduler worker for scheduled tasks, do the following:
diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 318cc57b8..390523420 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -29,6 +29,11 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
     The core MISP team cannot verify if this guide is working or not. Please help us in keeping it up to date and accurate.
     Thus we also have difficulties in supporting RHEL issues but will do a best effort on a similar yet slightly different setup.
 
+!!! notice
+    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
+    Which explains why you will see the use of shell *functions* in various steps.
+    Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc...
+
 !!! notice
     Maintenance for CentOS 8 will end on: December 31st, 2021 [Source[0]](https://wiki.centos.org/About/Product) [Source[1]](https://linuxlifecycle.com/)
     CentOS 8 [NetInstallURL](http://mirrorlist.centos.org/?release=8&arch=x86_64&repo=BaseOS)
@@ -69,6 +74,7 @@ sudo hostnamectl set-hostname misp.local # Your choice, in a production environm
 ```
 
 ## 1.3/ **[RHEL]** Register the system for updates with Red Hat Subscription Manager
+Can be skipped if the Machine hsa been registered during install phase.
 ```bash
 # <snippet-begin 0_RHEL_register.sh>
 sudo subscription-manager register --auto-attach # register your system to an account and attach to a current subscription
@@ -151,6 +157,7 @@ yumInstallCoreDeps () {
        php-opcache \
        php-json \
        php-zip \
+       php-intl \
        php-gd -y
 }
 # <snippet-end 0_yumInstallCoreDeps.sh>
@@ -355,10 +362,12 @@ installCake_RHEL ()
   # memory_limit = 2048M
   # upload_max_filesize = 50M
   # post_max_size = 50M
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
+  sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+  sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
   sudo systemctl restart php-fpm.service
 
   # To use the scheduler worker for scheduled tasks, do the following:
diff --git a/docs/INSTALL.ubuntu1804.md b/docs/INSTALL.ubuntu1804.md
index a5eac7bae..d74cde3ea 100644
--- a/docs/INSTALL.ubuntu1804.md
+++ b/docs/INSTALL.ubuntu1804.md
@@ -117,10 +117,12 @@ installDepsPhp72 () {
   php-intl php-bcmath \
   php-gd
 
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
+  sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+  sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 }
 # <snippet-end 0_installDepsPhp72.sh>
 ```
diff --git a/docs/INSTALL.ubuntu2004.md b/docs/INSTALL.ubuntu2004.md
index a7149b574..2e39ae3d1 100644
--- a/docs/INSTALL.ubuntu2004.md
+++ b/docs/INSTALL.ubuntu2004.md
@@ -117,10 +117,12 @@ installDepsPhp74 () {
   php-intl php-bcmath \
   php-gd
 
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
+  sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+  sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 }
 # <snippet-end 0_installDepsPhp74.sh>
 ```
diff --git a/docs/generic/globalVariables.md b/docs/generic/globalVariables.md
index 4cdabcf4d..2db64c218 100644
--- a/docs/generic/globalVariables.md
+++ b/docs/generic/globalVariables.md
@@ -84,8 +84,8 @@ MISPvars () {
   post_max_size="50M"
   max_execution_time="300"
   memory_limit="2048M"
-  session.sid_length="32"
-  session.use_strict_mode="1"
+  session0sid_length="32"
+  session0use_strict_mode="1"
 
   CAKE="${PATH_TO_MISP}/app/Console/cake"
 
diff --git a/docs/generic/supportFunctions.md b/docs/generic/supportFunctions.md
index 48901ca3c..12b186c34 100644
--- a/docs/generic/supportFunctions.md
+++ b/docs/generic/supportFunctions.md
@@ -668,10 +668,12 @@ installDepsPhp70 () {
   php-redis php-gnupg \
   php-gd
 
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
+  sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+  sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 }
 # <snippet-end 0_installDepsPhp70.sh>
 
diff --git a/docs/xINSTALL.centos6.md b/docs/xINSTALL.centos6.md
index 823de4611..3715eca61 100644
--- a/docs/xINSTALL.centos6.md
+++ b/docs/xINSTALL.centos6.md
@@ -281,10 +281,12 @@ sudo ln -s ../php-fpm.d/timezone.ini /etc/opt/rh/rh-php70/php.d/99-timezone.ini
 # memory_limit=2048M
 # upload_max_filesize=50M
 # post_max_size=50M
-for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
+for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
 do
     sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
 done
+sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 sudo service rh-php70-php-fpm restart
 # To use the scheduler worker for scheduled tasks, do the following:
 sudo cp -fa ${PATH_TO_MISP}/INSTALL/setup/config.php ${PATH_TO_MISP}/app/Plugin/CakeResque/Config/config.php
diff --git a/docs/xINSTALL.centos7.md b/docs/xINSTALL.centos7.md
index 4ede51996..5b484c267 100644
--- a/docs/xINSTALL.centos7.md
+++ b/docs/xINSTALL.centos7.md
@@ -264,10 +264,12 @@ echo 'date.timezone = "Europe/Luxembourg"' |sudo tee /etc/opt/rh/rh-php72/php.d/
 # memory_limit = 2048M
 # upload_max_filesize = 50M
 # post_max_size = 50M
-for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
+for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
 do
     sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
 done
+sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 sudo systemctl restart rh-php72-php-fpm.service
 
 # To use the scheduler worker for scheduled tasks, do the following:
diff --git a/docs/xINSTALL.debian10.md b/docs/xINSTALL.debian10.md
index 191c658e4..a13ce42a1 100644
--- a/docs/xINSTALL.debian10.md
+++ b/docs/xINSTALL.debian10.md
@@ -341,10 +341,12 @@ sudo a2ensite misp-ssl
 # memory_limit = 2048M
 # upload_max_filesize = 50M
 # post_max_size = 50M
-for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
+for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
 do
     sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
 done
+sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 
 # Restart apache
 sudo systemctl restart apache2
diff --git a/docs/xINSTALL.debian9.md b/docs/xINSTALL.debian9.md
index f1e379683..4b83ecaa1 100644
--- a/docs/xINSTALL.debian9.md
+++ b/docs/xINSTALL.debian9.md
@@ -363,10 +363,12 @@ sudo a2ensite misp-ssl
 # memory_limit = 2048M
 # upload_max_filesize = 50M
 # post_max_size = 50M
-for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
+for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
 do
     sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
 done
+sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 
 # Restart apache
 sudo systemctl restart apache2
diff --git a/docs/xINSTALL.tsurugi.md b/docs/xINSTALL.tsurugi.md
index 0526209ce..73239f522 100644
--- a/docs/xINSTALL.tsurugi.md
+++ b/docs/xINSTALL.tsurugi.md
@@ -409,10 +409,12 @@ function installMISPonTsurugi() {
   a2ensite misp-ssl
   a2ensite misp-dashboard
 
-  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit session.sid_length session.use_strict_mode
+  for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
   do
       sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
+  sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+  sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 
   systemctl restart apache2
 

From b137d0b1f34f95b90a24d36c67fcd21b940589d2 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 12:56:42 +0900
Subject: [PATCH 393/437] chg: [installer] Update to latest

---
 INSTALL/INSTALL.sh        | 262 ++++++++++++++++----------------------
 INSTALL/INSTALL.sh.sfv    |   6 +-
 INSTALL/INSTALL.sh.sha1   |   2 +-
 INSTALL/INSTALL.sh.sha256 |   2 +-
 INSTALL/INSTALL.sh.sha384 |   2 +-
 INSTALL/INSTALL.sh.sha512 |   2 +-
 6 files changed, 119 insertions(+), 157 deletions(-)

diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh
index 01d9417fd..59742bd6b 100755
--- a/INSTALL/INSTALL.sh
+++ b/INSTALL/INSTALL.sh
@@ -150,6 +150,8 @@ MISPvars () {
   post_max_size="50M"
   max_execution_time="300"
   memory_limit="2048M"
+  session0sid_length="32"
+  session0use_strict_mode="1"
 
   CAKE="${PATH_TO_MISP}/app/Console/cake"
 
@@ -836,6 +838,8 @@ installDepsPhp70 () {
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
+  sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+  sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 }
 
 # Install Php 7.3 deps
@@ -1208,6 +1212,8 @@ installDepsPhp74 () {
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
+  sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+  sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 }
 
 # Install Php 7.3 deps
@@ -1260,6 +1266,8 @@ installDepsPhp72 () {
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
+  sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+  sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 }
 
 # Install Php 7.0 dependencies
@@ -1280,6 +1288,8 @@ installDepsPhp70 () {
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
+  sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+  sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
 }
 
 prepareDB () {
@@ -1536,6 +1546,7 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "GnuPG.email" "$GPG_EMAIL_ADDRESS"
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "GnuPG.homedir" "$PATH_TO_MISP/.gnupg"
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "GnuPG.password" "$GPG_PASSPHRASE"
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "GnuPG.obscure_subject" true
   # FIXME: what if we have not gpg binary but a gpg2 one?
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "GnuPG.binary" "$(which gpg)"
 
@@ -1565,6 +1576,9 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Sightings_range" 365
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Sightings_sighting_db_enable" false
 
+  # Plugin Enrichment hover defaults
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_hover_popover_only" false
+
   # Plugin CustomAuth tuneable
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.CustomAuth_disable_logout" false
 
@@ -1599,8 +1613,10 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.passwordResetText" "Dear MISP user,\\n\\nA password reset has been triggered for your account. Use the below provided temporary password to log into MISP at \$misp, where you will be prompted to manually change your password to something of your own choice.\\n\\nUsername: \$username\\nYour temporary password: \$password\\n\\nIf you have any questions, don't hesitate to contact us at: \$contact.\\n\\nBest regards,\\nYour \$org MISP support team"
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.enableEventBlocklisting" true
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.enableOrgBlocklisting" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.log_client_ip" false
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.log_client_ip" true
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.log_auth" false
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.log_user_ips" true
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.log_user_ips_authkeys" true
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.disableUserSelfManagement" false
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.disable_user_login_change" false
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.disable_user_password_change" false
@@ -1633,6 +1649,16 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.password_policy_complexity" '/^((?=.*\d)|(?=.*\W+))(?![\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/'
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.self_registration_message" "If you would like to send us a registration request, please fill out the form below. Make sure you fill out as much information as possible in order to ease the task of the administrators."
 
+  # Appease the security audit, #hardening
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.disable_browser_cache" true
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.check_sec_fetch_site_header" true
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.csp_enforce" true
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.advanced_authkeys" true
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.do_not_log_authkeys" true
+
+  # Appease the security audit, #loggin
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.username_in_response_header" true
+
   # It is possible to updateMISP too, only here for reference how to to that on the CLI.
   ## $SUDO_WWW $RUN_PHP -- $CAKE Admin updateMISP
 
@@ -2032,7 +2058,6 @@ enableReposRHEL () {
   sudo subscription-manager refresh
   sudo subscription-manager repos --enable rhel-7-server-optional-rpms
   sudo subscription-manager repos --enable rhel-7-server-extras-rpms
-  sudo subscription-manager repos --enable rhel-server-rhscl-7-rpms
 }
 
 centosEPEL () {
@@ -2046,38 +2071,52 @@ centosEPEL () {
 
 enableEPEL () {
   sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -y
+  sudo yum install http://rpms.remirepo.net/enterprise/remi-release-7.rpm -y
+  sudo yum install yum-utils -y
+  sudo yum-config-manager --enable remi-php74
 }
 
 yumInstallCoreDeps () {
   # Install the dependencies:
-  sudo yum install gcc git zip rh-git218 \
-                   httpd24 \
+  sudo yum install gcc git zip \
                    mod_ssl \
-                   rh-redis32 \
-                   rh-mariadb102 \
+                   redis \
                    libxslt-devel zlib-devel ssdeep-devel -y
 
   # Enable and start redis
-  sudo systemctl enable --now rh-redis32-redis.service
+  sudo systemctl enable --now redis.service
+
+  # Install MariaDB
+  sudo yum install wget -y
+  wget https://downloads.mariadb.com/MariaDB/mariadb_repo_setup
+  chmod +x mariadb_repo_setup
+  sudo ./mariadb_repo_setup
+  rm mariadb_repo_setup
+  sudo yum install MariaDB-server -y
 
   WWW_USER="apache"
   SUDO_WWW="sudo -H -u $WWW_USER"
-  RUN_PHP="/usr/bin/scl enable rh-php72"
-  PHP_INI="/etc/opt/rh/rh-php72/php.ini"
-  # Install PHP 7.2 from SCL, see https://www.softwarecollections.org/en/scls/rhscl/rh-php72/
-  sudo yum install rh-php72 rh-php72-php-fpm rh-php72-php-devel \
-                   rh-php72-php-mysqlnd \
-                   rh-php72-php-mbstring \
-                   rh-php72-php-xml \
-                   rh-php72-php-bcmath \
-                   rh-php72-php-opcache \
-                   rh-php72-php-zip \
-                   rh-php72-php-gd -y
+  PHP_INI="/etc/opt/remi/php74/php.ini"
+  # Install PHP 7.4 from Remi's repo, see https://rpms.remirepo.net/enterprise/7/php74/x86_64/repoview/
+  sudo yum install php74 php74-php-fpm php74-php-devel \
+                   php74-php-mysqlnd \
+                   php74-php-mbstring \
+                   php74-php-xml \
+                   php74-php-bcmath \
+                   php74-php-opcache \
+                   php74-php-zip \
+                   php74-php-pear \
+                   php74-php-brotli \
+                   php74-php-intl \
+                   php74-php-gd -y
+
+  # cake has php baked in, thus we link to it
+  sudo ln -s /usr/bin/php74 /usr/bin/php
 
   # Python 3.6 is now available in RHEL 7.7 base
   sudo yum install python3 python3-devel -y
 
-  sudo systemctl enable --now rh-php72-php-fpm.service
+  sudo systemctl enable --now php74-php-fpm.service
 }
 
 installCoreRHEL () {
@@ -2110,17 +2149,17 @@ installCoreRHEL () {
   cd $PATH_TO_MISP/app/files/scripts
   $SUDO_WWW git clone https://github.com/CybOXProject/python-cybox.git
   $SUDO_WWW git clone https://github.com/STIXProject/python-stix.git
-  $SUDO_WWW git clone --branch master --single-branch https://github.com/lief-project/LIEF.git lief
+  ##$SUDO_WWW git clone --branch master --single-branch https://github.com/lief-project/LIEF.git lief
   $SUDO_WWW git clone https://github.com/CybOXProject/mixbox.git
 
   # If you umask is has been changed from the default, it is a good idea to reset it to 0022 before installing python modules
   UMASK=$(umask)
   umask 0022
-  
+
   cd $PATH_TO_MISP/app/files/scripts/python-cybox
   $SUDO_WWW git config core.filemode false
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install .
-  
+
   cd $PATH_TO_MISP/app/files/scripts/python-stix
   $SUDO_WWW git config core.filemode false
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install .
@@ -2143,42 +2182,8 @@ installCoreRHEL () {
   # install redis
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U redis
 
-  # lief needs manual compilation
-  sudo yum install devtoolset-7 cmake3 cppcheck libcxx-devel -y
-
-  cd $PATH_TO_MISP/app/files/scripts/lief
-  $SUDO_WWW git config core.filemode false
-  $SUDO_WWW mkdir build
-  cd build
-  $SUDO_WWW scl enable devtoolset-7 "bash -c 'cmake3 \
-  -DLIEF_PYTHON_API=on \
-  -DPYTHON_VERSION=3.6 \
-  -DPYTHON_EXECUTABLE=$PATH_TO_MISP/venv/bin/python \
-  -DLIEF_DOC=off \
-  -DCMAKE_BUILD_TYPE=Release \
-  ..'"
-  $SUDO_WWW make -j3 pyLIEF
-
-  if [ $? == 2 ]; then
-    # In case you get "internal compiler error: Killed (program cc1plus)"
-    # You ran out of memory.
-    # Create some swap
-    TEMP_DIR=$(mktemp -d)
-    TEMP_SWAP=${TEMP_DIR}/swap.img
-    sudo dd if=/dev/zero of=${TEMP_SWAP} bs=1024k count=4000
-    sudo mkswap ${TEMP_SWAP}
-    sudo swapon ${TEMP_SWAP}
-    # And compile again
-    ${SUDO_WWW} make -j3 pyLIEF
-    sudo swapoff ${TEMP_SWAP}
-    sudo rm -r ${TEMP_DIR}
-  fi
-
-  # The following adds a PYTHONPATH to where the pyLIEF module has been compiled
-  echo $PATH_TO_MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee $PATH_TO_MISP/venv/lib/python3.6/site-packages/lief.pth
-
-  # install magic, pydeep
-  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U python-magic git+https://github.com/kbandla/pydeep.git plyara
+  # install magic, pydeep, lief
+  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U python-magic git+https://github.com/kbandla/pydeep.git plyara lief
 
   # install PyMISP
   cd $PATH_TO_MISP/PyMISP
@@ -2186,7 +2191,7 @@ installCoreRHEL () {
 
   # FIXME: Remove libfaup etc once the egg has the library baked-in
   # BROKEN: This needs to be tested on RHEL/CentOS
-  ##sudo apt-get install cmake libcaca-dev liblua5.3-dev -y
+  sudo yum install libcaca-devel cmake3 -y
   cd /tmp
   [[ ! -d "faup" ]] && $SUDO_CMD git clone https://github.com/stricaud/faup.git faup
   [[ ! -d "gtcaca" ]] && $SUDO_CMD git clone https://github.com/stricaud/gtcaca.git gtcaca
@@ -2194,21 +2199,20 @@ installCoreRHEL () {
   cd gtcaca
   $SUDO_CMD mkdir -p build
   cd build
-  $SUDO_CMD cmake .. && $SUDO_CMD make
+  $SUDO_CMD cmake3 .. && $SUDO_CMD make
   sudo make install
   cd ../../faup
   $SUDO_CMD mkdir -p build
   cd build
-  $SUDO_CMD cmake .. && $SUDO_CMD make
+  $SUDO_CMD cmake3 .. && $SUDO_CMD make
   sudo make install
   sudo ldconfig
 
   # Enable dependencies detection in the diagnostics page
   # This allows MISP to detect GnuPG, the Python modules' versions and to read the PHP settings.
-  # The LD_LIBRARY_PATH setting is needed for rh-git218 to work
-  echo "env[PATH] = /opt/rh/rh-git218/root/usr/bin:/opt/rh/rh-redis32/root/usr/bin:/opt/rh/rh-php72/root/usr/bin:/usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/rh/rh-php72/php-fpm.d/www.conf
-  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/rh/rh-php72/php-fpm.d/www.conf
-  sudo systemctl restart rh-php72-php-fpm.service
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/remi/php74/php-fpm.d/www.conf
+  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/remi/php74/php-fpm.d/www.conf
+  sudo systemctl restart php74-php-fpm.service
   umask $UMASK
 }
 
@@ -2220,31 +2224,20 @@ installCake_RHEL ()
   cd $PATH_TO_MISP/app
   # Update composer.phar (optional)
   #EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)"
-  #$SUDO_WWW $RUN_PHP -- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-  #$SUDO_WWW $RUN_PHP -- php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-  #$SUDO_WWW $RUN_PHP "php composer-setup.php"
-  #$SUDO_WWW $RUN_PHP -- php -r "unlink('composer-setup.php');"
-  $SUDO_WWW $RUN_PHP "php composer.phar install"
+  #$SUDO_WWW php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+  #$SUDO_WWW php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+  #$SUDO_WWW php composer-setup.php
+  #$SUDO_WWW php -r "unlink('composer-setup.php');"
+  $SUDO_WWW php composer.phar install
 
-  ## sudo yum install php-redis -y
-  sudo scl enable rh-php72 'pecl channel-update pecl.php.net'
-  sudo scl enable rh-php72 'yes no|pecl install redis'
-  echo "extension=redis.so" |sudo tee /etc/opt/rh/rh-php72/php.d/99-redis.ini
+  sudo yum install php74-php-pecl-redis php74-php-pecl-ssdeep php74-php-pecl-gnupg -y
 
-  sudo ln -s /usr/lib64/libfuzzy.so /usr/lib/libfuzzy.so
-  sudo scl enable rh-php72 'pecl install ssdeep'
-  echo "extension=ssdeep.so" |sudo tee /etc/opt/rh/rh-php72/php.d/99-ssdeep.ini
-
-  # Install gnupg extension
-  sudo yum install gpgme-devel -y
-  sudo scl enable rh-php72 'pecl install gnupg'
-  echo "extension=gnupg.so" |sudo tee /etc/opt/rh/rh-php72/php.d/99-gnupg.ini
-  sudo systemctl restart rh-php72-php-fpm.service
+  sudo systemctl restart php74-php-fpm.service
 
   # If you have not yet set a timezone in php.ini
-  echo 'date.timezone = "Asia/Tokyo"' |sudo tee /etc/opt/rh/rh-php72/php.d/timezone.ini
+  echo 'date.timezone = "Asia/Tokyo"' |sudo tee /etc/opt/remi/php74/php.d/timezone.ini
 
-  # Recommended: Change some PHP settings in /etc/opt/rh/rh-php72/php.ini
+  # Recommended: Change some PHP settings in /etc/opt/remi/php74/php.ini
   # max_execution_time = 300
   # memory_limit = 2048M
   # upload_max_filesize = 50M
@@ -2253,71 +2246,40 @@ installCake_RHEL ()
   do
       sudo sed -i "s/^\($key\).*/\1 = $(eval echo \${$key})/" $PHP_INI
   done
-  sudo systemctl restart rh-php72-php-fpm.service
+  sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
+  sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
+  sudo systemctl restart php74-php-fpm.service
 
   # To use the scheduler worker for scheduled tasks, do the following:
   sudo cp -fa $PATH_TO_MISP/INSTALL/setup/config.php $PATH_TO_MISP/app/Plugin/CakeResque/Config/config.php
 }
 
 prepareDB_RHEL () {
-  RUN_MYSQL="/usr/bin/scl enable rh-mariadb102"
-  # Enable, start and secure your mysql database server
-  sudo systemctl enable --now rh-mariadb102-mariadb.service
-  echo [mysqld] |sudo tee /etc/opt/rh/rh-mariadb102/my.cnf.d/bind-address.cnf
-  echo bind-address=127.0.0.1 |sudo tee -a /etc/opt/rh/rh-mariadb102/my.cnf.d/bind-address.cnf
-  sudo systemctl restart rh-mariadb102-mariadb
+  sudo systemctl enable --now mariadb.service
+  echo [mysqld] |sudo tee /etc/my.cnf.d/bind-address.cnf
+  echo bind-address=127.0.0.1 |sudo tee -a /etc/my.cnf.d/bind-address.cnf
+  sudo systemctl restart mariadb
 
-  sudo yum install expect -y
+  # Kill the anonymous users
+  sudo mysql -h $DBHOST -e "DROP USER IF EXISTS ''@'localhost'"
+  # Because our hostname varies we'll use some Bash magic here.
+  sudo mysql -h $DBHOST -e "DROP USER IF EXISTS ''@'$(hostname)'"
+  # Kill off the demo database
+  sudo mysql -h $DBHOST -e "DROP DATABASE IF EXISTS test"
+  # No root remote logins
+  sudo mysql -h $DBHOST -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1')"
+  # Make sure that NOBODY can access the server without a password
+  sudo mysqladmin -h $DBHOST -u "${DBUSER_ADMIN}" password "${DBPASSWORD_ADMIN}"
+  # Make our changes take effect
+  sudo mysql -h $DBHOST -e "FLUSH PRIVILEGES"
 
-  ## The following needs some thoughts about scl enable foo
-  #if [[ ! -e /var/opt/rh/rh-mariadb102/lib/mysql/misp/users.ibd ]]; then
-
-  # We ask interactively your password if not run as root
-  pw=""
-  if [[ "$EUID" -ne 0 ]]; then
-    read -s -p "Enter sudo password: " pw
-  fi
-
-  expect -f - <<-EOF
-    set timeout 10
-
-    spawn sudo scl enable rh-mariadb102 mysql_secure_installation
-    expect {
-      "*sudo*" {
-        send "$pw\r"
-        exp_continue
-      }
-      "Enter current password for root (enter for none):" {
-        send -- "\r"
-      }
-    }
-    expect "Set root password?"
-    send -- "y\r"
-    expect "New password:"
-    send -- "${DBPASSWORD_ADMIN}\r"
-    expect "Re-enter new password:"
-    send -- "${DBPASSWORD_ADMIN}\r"
-    expect "Remove anonymous users?"
-    send -- "y\r"
-    expect "Disallow root login remotely?"
-    send -- "y\r"
-    expect "Remove test database and access to it?"
-    send -- "y\r"
-    expect "Reload privilege tables now?"
-    send -- "y\r"
-    expect eof
-EOF
-
-  sudo yum remove tcl expect -y
-
-  sudo systemctl restart rh-mariadb102-mariadb
-
-  scl enable rh-mariadb102 "mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e 'CREATE DATABASE $DBNAME;'"
-  scl enable rh-mariadb102 "mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e \"GRANT USAGE on *.* to $DBUSER_MISP@localhost IDENTIFIED by '$DBPASSWORD_MISP';\""
-  scl enable rh-mariadb102 "mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e \"GRANT ALL PRIVILEGES on $DBNAME.* to '$DBUSER_MISP'@'localhost';\""
-  scl enable rh-mariadb102 "mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e 'FLUSH PRIVILEGES;'"
-
-  $SUDO_WWW cat $PATH_TO_MISP/INSTALL/MYSQL.sql | sudo scl enable rh-mariadb102 "mysql -h $DBHOST -u $DBUSER_MISP -p$DBPASSWORD_MISP $DBNAME"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "CREATE DATABASE ${DBNAME};"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "CREATE USER '${DBUSER_MISP}'@'localhost' IDENTIFIED BY '${DBPASSWORD_MISP}';"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "GRANT USAGE ON *.* to '${DBUSER_MISP}'@'localhost';"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "GRANT ALL PRIVILEGES on ${DBNAME}.* to '${DBUSER_MISP}'@'localhost';"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "FLUSH PRIVILEGES;"
+  # Import the empty MISP database from MYSQL.sql
+  ${SUDO_WWW} cat ${PATH_TO_MISP}/INSTALL/MYSQL.sql | mysql -h $DBHOST -u "${DBUSER_MISP}" -p"${DBPASSWORD_MISP}" ${DBNAME}
 }
 
 apacheConfig_RHEL () {
@@ -2352,13 +2314,12 @@ apacheConfig_RHEL () {
   sudo chcon -t httpd_sys_rw_content_t $PATH_TO_MISP/app/files/scripts/tmp
   sudo chcon -t httpd_sys_rw_content_t $PATH_TO_MISP/app/Plugin/CakeResque/tmp
   sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Console/cake
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Console/worker/*.sh
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*.py
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*/*.py
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/lief/build/api/python/lief.so
+  sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Console/worker/*.sh"
+  sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*.py"
+  sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*/*.py"
   sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Vendor/pear/crypt_gpg/scripts/crypt-gpg-pinentry
-  sudo chcon -R -t bin_t $PATH_TO_MISP/venv/bin/*
-  find $PATH_TO_MISP/venv -type f -name "*.so*" -or -name "*.so.*" | xargs sudo chcon -t lib_t
+  sudo sh -c "chcon -R -t bin_t $PATH_TO_MISP/venv/bin/*"
+  sudo find $PATH_TO_MISP/venv -type f -name "*.so*" -or -name "*.so.*" | xargs sudo chcon -t lib_t
   # Only run these if you want to be able to update MISP from the web interface
   sudo chcon -R -t httpd_sys_rw_content_t $PATH_TO_MISP/.git
   sudo chcon -R -t httpd_sys_rw_content_t $PATH_TO_MISP/app/tmp
@@ -2480,6 +2441,7 @@ configMISP_RHEL () {
 
   # If you want to be able to change configuration parameters from the webinterface:
   sudo chown $WWW_USER:$WWW_USER $PATH_TO_MISP/app/Config/config.php
+  sudo chmod 660 $PATH_TO_MISP/app/Config/config.php
   sudo chcon -t httpd_sys_rw_content_t $PATH_TO_MISP/app/Config/config.php
 
   # Generate a GPG encryption key.
@@ -2514,13 +2476,13 @@ EOF
 configWorkersRHEL () {
   echo "[Unit]
   Description=MISP background workers
-  After=rh-mariadb102-mariadb.service rh-redis32-redis.service rh-php72-php-fpm.service
+  After=mariadb.service redis.service php74-php-fpm.service
 
   [Service]
   Type=forking
   User=$WWW_USER
   Group=$WWW_USER
-  ExecStart=/usr/bin/scl enable rh-php72 rh-redis32 rh-mariadb102 $PATH_TO_MISP/app/Console/worker/start.sh
+  ExecStart=$PATH_TO_MISP/app/Console/worker/start.sh
   Restart=always
   RestartSec=10
 
diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv
index b3bc21bc0..d374a3ad0 100644
--- a/INSTALL/INSTALL.sh.sfv
+++ b/INSTALL/INSTALL.sh.sfv
@@ -1,5 +1,5 @@
-; Generated by RHash v1.4.0 on 2021-03-17 at 11:58.01
+; Generated by RHash v1.3.9 on 2021-03-25 at 12:56.17
 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
 ;
-;       137809  11:57.59 2021-03-17 INSTALL.sh
-INSTALL.sh 5264D3699A8122AD797C52D64DB3BDB59FF98B4E 072391BE950D876396C4C858515D429DCD5ECB1DDA6C52ABD8AC81FB1DA336C0 3BAA227161359FB6449FE7CCDAACF9985362DE128BC09296D6B543646DEA958611786F1B8F816AC11E0C9AAB15149D7E 5A1DF67A94B0F45967EA478EEB610AA33AAD1ABF2D4D27267AB8813C163683C98549071FE05275D5A99BCB08A5A6F703073563E46601E2727DE34ECFE57757D9
+;       137691  12:56.17 2021-03-25 INSTALL.sh
+INSTALL.sh 5694A8F77384677CA3DC84FB5A5F3C06D6FFF03F 5F3A9B04BEEE449E96F4A698F3FA497390E46E2AD1DBDDED37F54E29FED76221 ABCB35B681F9A5E3568A055465976EC0996C0CC2FD8A39384E05D90413D8300B7356AAE23A540912D7D9907BECCDCD9F 54712D3100DAF92EA6201D86941222F6877B772533D048C8F758332D9B45418B64AA767A0D78C8A39E491BE114F139FFEF5A2E0436EA8503AA593556E56C0992
diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1
index 47839d86f..c493202ff 100644
--- a/INSTALL/INSTALL.sh.sha1
+++ b/INSTALL/INSTALL.sh.sha1
@@ -1 +1 @@
-5264d3699a8122ad797c52d64db3bdb59ff98b4e  INSTALL.sh
+5694a8f77384677ca3dc84fb5a5f3c06d6fff03f  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256
index 3d6ee6635..cfcdac12d 100644
--- a/INSTALL/INSTALL.sh.sha256
+++ b/INSTALL/INSTALL.sh.sha256
@@ -1 +1 @@
-072391be950d876396c4c858515d429dcd5ecb1dda6c52abd8ac81fb1da336c0  INSTALL.sh
+5f3a9b04beee449e96f4a698f3fa497390e46e2ad1dbdded37f54e29fed76221  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384
index 850e8da6b..bb27a3245 100644
--- a/INSTALL/INSTALL.sh.sha384
+++ b/INSTALL/INSTALL.sh.sha384
@@ -1 +1 @@
-3baa227161359fb6449fe7ccdaacf9985362de128bc09296d6b543646dea958611786f1b8f816ac11e0c9aab15149d7e  INSTALL.sh
+abcb35b681f9a5e3568a055465976ec0996c0cc2fd8a39384e05d90413d8300b7356aae23a540912d7d9907beccdcd9f  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512
index 5ee66a274..2dfb74674 100644
--- a/INSTALL/INSTALL.sh.sha512
+++ b/INSTALL/INSTALL.sh.sha512
@@ -1 +1 @@
-5a1df67a94b0f45967ea478eeb610aa33aad1abf2d4d27267ab8813c163683c98549071fe05275d5a99bcb08a5a6f703073563e46601e2727de34ecfe57757d9  INSTALL.sh
+54712d3100daf92ea6201d86941222f6877b772533d048c8f758332d9b45418b64aa767a0d78c8a39e491be114f139ffef5a2e0436ea8503aa593556e56c0992  INSTALL.sh

From 87c96327a49910bd2063c072b17d52716711bed3 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 13:28:48 +0900
Subject: [PATCH 394/437] chg: [doc] Move away from expect

---
 docs/INSTALL.rhel8.md | 61 ++++++++++++++-----------------------------
 1 file changed, 19 insertions(+), 42 deletions(-)

diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 390523420..169de0daf 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -416,49 +416,26 @@ prepareDB_RHEL () {
   echo bind-address=127.0.0.1 |sudo tee -a /etc/my.cnf.d/bind-address.cnf
   sudo systemctl restart mariadb
 
-  sudo yum install expect -y
+  # Kill the anonymous users
+  sudo mysql -h $DBHOST -e "DROP USER IF EXISTS ''@'localhost'"
+  # Because our hostname varies we'll use some Bash magic here.
+  sudo mysql -h $DBHOST -e "DROP USER IF EXISTS ''@'$(hostname)'"
+  # Kill off the demo database
+  sudo mysql -h $DBHOST -e "DROP DATABASE IF EXISTS test"
+  # No root remote logins
+  sudo mysql -h $DBHOST -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1')"
+  # Make sure that NOBODY can access the server without a password
+  sudo mysqladmin -h $DBHOST -u "${DBUSER_ADMIN}" password "${DBPASSWORD_ADMIN}"
+  # Make our changes take effect
+  sudo mysql -h $DBHOST -e "FLUSH PRIVILEGES"
 
-  ## The following needs some thoughts about scl enable foo
-  #if [[ ! -e /var/opt/rh/rh-mariadb102/lib/mysql/misp/users.ibd ]]; then
-
-  # Add your credentials if needed, if sudo has NOPASS, comment out the relevant lines
-  pw="Password1234"
-
-  expect -f - <<-EOF
-    set timeout 10
-
-    spawn sudo mysql_secure_installation
-    expect "*?assword*"
-    send -- "$pw\r"
-    expect "Enter current password for root (enter for none):"
-    send -- "\r"
-    expect "Set root password?"
-    send -- "y\r"
-    expect "New password:"
-    send -- "${DBPASSWORD_ADMIN}\r"
-    expect "Re-enter new password:"
-    send -- "${DBPASSWORD_ADMIN}\r"
-    expect "Remove anonymous users?"
-    send -- "y\r"
-    expect "Disallow root login remotely?"
-    send -- "y\r"
-    expect "Remove test database and access to it?"
-    send -- "y\r"
-    expect "Reload privilege tables now?"
-    send -- "y\r"
-    expect eof
-EOF
-
-  sudo yum remove tcl expect -y
-
-  sudo systemctl restart mariadb
-
-  mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e "CREATE DATABASE $DBNAME;"
-  mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e "GRANT USAGE on *.* to $DBUSER_MISP@localhost IDENTIFIED by '$DBPASSWORD_MISP';"
-  mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e "GRANT ALL PRIVILEGES on $DBNAME.* to '$DBUSER_MISP'@'localhost';"
-  mysql -h $DBHOST -u $DBUSER_ADMIN -p$DBPASSWORD_ADMIN -e 'FLUSH PRIVILEGES;'
-
-  $SUDO_WWW cat $PATH_TO_MISP/INSTALL/MYSQL.sql | mysql -h $DBHOST -u $DBUSER_MISP -p$DBPASSWORD_MISP $DBNAME
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "CREATE DATABASE ${DBNAME};"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "CREATE USER '${DBUSER_MISP}'@'localhost' IDENTIFIED BY '${DBPASSWORD_MISP}';"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "GRANT USAGE ON *.* to '${DBUSER_MISP}'@'localhost';"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "GRANT ALL PRIVILEGES on ${DBNAME}.* to '${DBUSER_MISP}'@'localhost';"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "FLUSH PRIVILEGES;"
+  # Import the empty MISP database from MYSQL.sql
+  ${SUDO_WWW} cat ${PATH_TO_MISP}/INSTALL/MYSQL.sql | mysql -h $DBHOST -u "${DBUSER_MISP}" -p"${DBPASSWORD_MISP}" ${DBNAME}
 }
 # <snippet-end 1_prepareDB_RHEL.sh>
 ```

From 2a757dd11c4a40b486327228ad17a846a2465acf Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 14:22:19 +0900
Subject: [PATCH 395/437] chg: [doc] Balanced RHEL 8 and 7 Docs

---
 docs/INSTALL.rhel7.md |   4 +-
 docs/INSTALL.rhel8.md | 130 ++++++++++++++++++------------------------
 2 files changed, 58 insertions(+), 76 deletions(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index aeeddeec6..d918b4a1a 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -174,8 +174,6 @@ yumInstallCoreDeps () {
   rm mariadb_repo_setup
   sudo yum install MariaDB-server -y
 
-  WWW_USER="apache"
-  SUDO_WWW="sudo -H -u $WWW_USER"
   PHP_INI="/etc/opt/remi/php74/php.ini"
   # Install PHP 7.4 from Remi's repo, see https://rpms.remirepo.net/enterprise/7/php74/x86_64/repoview/
   sudo yum install php74 php74-php-fpm php74-php-devel \
@@ -412,7 +410,7 @@ prepareDB_RHEL () {
   # Make sure that NOBODY can access the server without a password
   sudo mysqladmin -h $DBHOST -u "${DBUSER_ADMIN}" password "${DBPASSWORD_ADMIN}"
   # Make our changes take effect
-  sudo mysql -h $DBHOST -e "FLUSH PRIVILEGES"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "FLUSH PRIVILEGES"
 
   sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "CREATE DATABASE ${DBNAME};"
   sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "CREATE USER '${DBUSER_MISP}'@'localhost' IDENTIFIED BY '${DBPASSWORD_MISP}';"
diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 169de0daf..733052bf3 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -74,21 +74,18 @@ sudo hostnamectl set-hostname misp.local # Your choice, in a production environm
 ```
 
 ## 1.3/ **[RHEL]** Register the system for updates with Red Hat Subscription Manager
-Can be skipped if the Machine hsa been registered during install phase.
+Can be skipped if the Machine has been registered during install phase.
 ```bash
 # <snippet-begin 0_RHEL_register.sh>
 sudo subscription-manager register --auto-attach # register your system to an account and attach to a current subscription
 # <snippet-end 0_RHEL_register.sh>
 ```
 
-## 1.4/ **[RHEL]** Enable the optional, extras and Software Collections (SCL) repos
+## 1.4/ **[RHEL]** Enable the optional repos (obsolete in v8)
 ```bash
 # <snippet-begin 0_RHEL_SCL.sh>
-# To be confirmed, no access to RHSCL
 sudo subscription-manager refresh 
-sudo subscription-manager repos --enable rhel-8-server-optional-rpms
-sudo subscription-manager repos --enable rhel-8-server-extras-rpms
-sudo subscription-manager repos --enable rhel-server-rhscl-8-rpms
+# Software Collections is available for Red Hat Enterprise Linux 7 and previous supported releases. Starting with Red Hat Enterprise Linux 8, the content traditionally consumed via Software Collections is now part of Application Streams. Please see the Application Streams Life Cycle documentation for that release. Source: https://access.redhat.com/support/policy/updates/rhscl
 # <snippet-end 0_RHEL_SCL.sh>
 ```
 
@@ -97,31 +94,31 @@ sudo subscription-manager repos --enable rhel-server-rhscl-8-rpms
 sudo yum install drpm -y
 ```
 
-## 1.5.b/ Install vim (optional)
-```bash
-# Because vim is just so practical
-sudo yum install vim -y
-```
-
 ## 1.5/ Update the system and reboot
 ```bash
 # <snippet-begin 0_yum-update.sh>
-sudo yum update -y
+yumUpdate () {
+  sudo yum update -y
+}
 # <snippet-end 0_yum-update.sh>
 ```
 
-## 1.6/ **[RHEL]** Install the EPEL repo
-
+## 1.6/ **[RHEL]** Install the EPEL and remi repo
 ```bash
 # <snippet-begin 0_RHEL_EPEL.sh>
-sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
+enableEPEL () {
+  sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
+  sudo yum install http://rpms.remirepo.net/enterprise/remi-release-8.rpm -y
+  sudo yum install yum-utils -y
+  sudo yum-config-manager --enable remi-php74
+}
 # <snippet-end 0_RHEL_EPEL.sh>
 ```
 
 ### 2/ Dependencies
 
 !!! note
-    This guide installs PHP 7.2 from SCL
+    This guide installs PHP 7.4 from Remi's repo
 
 !!! warning
     [PHP 5.6 and 7.0 aren't supported since December 2018](https://secure.php.net/supported-versions.php). Please update accordingly. In the future only PHP7 will be supported.
@@ -148,31 +145,30 @@ yumInstallCoreDeps () {
   # Enable and start redis
   sudo systemctl enable --now redis.service
 
-  PHP_INI=/etc/php.ini
-  sudo yum install php php-fpm php-devel php-pear \
-       php-mysqlnd \
-       php-mbstring \
-       php-xml \
-       php-bcmath \
-       php-opcache \
-       php-json \
-       php-zip \
-       php-intl \
-       php-gd -y
+  PHP_INI="/etc/opt/remi/php74/php.ini"
+  # Install PHP 7.4 from Remi's repo, see https://rpms.remirepo.net/enterprise/8/php74/x86_64/repoview/
+  sudo yum install php74 php74-php-fpm php74-php-devel \
+                   php74-php-mysqlnd \
+                   php74-php-mbstring \
+                   php74-php-xml \
+                   php74-php-bcmath \
+                   php74-php-opcache \
+                   php74-php-zip \
+                   php74-php-pear \
+                   php74-php-brotli \
+                   php74-php-intl \
+                   php74-php-gd -y
 }
 # <snippet-end 0_yumInstallCoreDeps.sh>
 ```
 
 !!! notice
     MISP 2.4 requires PHP 5.6 as a minimum, we need a higher version than base RHEL provides.<br />
-    This guide installs PHP 7.2
-
-!!! notice
-    If we want to use httpd from RHEL base we can use the rh-php72-php-fpm service instead
+    This guide installs PHP 7.4
 
 ## 2.05/ Start the PHP FPM service and enable to start on boot
 ```bash
-sudo systemctl enable --now php-fpm.service
+sudo systemctl enable --now php74-php-fpm.service
 ```
 
 TODO: Add a CentOS/RHEL rng thing, à la haveged (not in base anymore) or similar.
@@ -189,11 +185,6 @@ installCoreRHEL () {
   cd /var/www
   $SUDO_WWW git clone https://github.com/MISP/MISP.git
   cd $PATH_TO_MISP
-  ##$SUDO_WWW git checkout tags/$(git describe --tags `git rev-list --tags --max-count=1`)
-  # if the last shortcut doesn't work, specify the latest version manually
-  # example: git checkout tags/v2.4.XY
-  # the message regarding a "detached HEAD state" is expected behaviour
-  # (you only have to create a new branch, if you want to change stuff and do a pull request for example)
 
   # Fetch submodules
   $SUDO_WWW git submodule update --init --recursive
@@ -219,6 +210,11 @@ installCoreRHEL () {
   # If you umask is has been changed from the default, it is a good idea to reset it to 0022 before installing python modules
   UMASK=$(umask)
   umask 0022
+
+  cd $PATH_TO_MISP/app/files/scripts/python-cybox
+  $SUDO_WWW git config core.filemode false
+  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install .
+
   cd $PATH_TO_MISP/app/files/scripts/python-stix
   $SUDO_WWW git config core.filemode false
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install .
@@ -303,16 +299,13 @@ installCoreRHEL () {
   sudo make install
   sudo ldconfig
 
-  # Enable python3 for php-fpm
-  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/php-fpm.d/www.conf
-  sudo systemctl restart php-fpm.service
-
-  umask $UMASK
-
   # Enable dependencies detection in the diagnostics page
   # This allows MISP to detect GnuPG, the Python modules' versions and to read the PHP settings.
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/php-fpm.d/www.conf
-  sudo systemctl restart php-fpm.service
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/remi/php74/php-fpm.d/www.conf
+  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/remi/php74/php-fpm.d/www.conf
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/remi/php74/php-fpm.d/www.conf
+  sudo systemctl restart php74-php-fpm.service
+  umask $UMASK
 }
 # <snippet-end 1_mispCoreInstall_RHEL.sh>
 ```
@@ -338,20 +331,9 @@ installCake_RHEL ()
   #$SUDO_WWW php -r "unlink('composer-setup.php');"
   $SUDO_WWW php composer.phar install
 
-  ## sudo yum install php-redis -y
-  sudo pecl channel-update pecl.php.net
-  sudo pecl install redis
-  echo "extension=redis.so" |sudo tee /etc/php-fpm.d/redis.ini
-  sudo ln -s /etc/php-fpm.d/redis.ini /etc/php.d/99-redis.ini
-  sudo systemctl restart php-fpm.service
+  sudo yum install php74-php-pecl-redis php74-php-pecl-ssdeep php74-php-pecl-gnupg -y
 
-  # Install gnupg extension
-  # NOT working on RHEL 8 gpgme-devel not provided
-  ##sudo yum install gpgme-devel -y
-  ##sudo pecl install gnupg
-  ##echo "extension=gnupg.so" |sudo tee /etc/opt/rh/rh-php72/php-fpm.d/gnupg.ini
-  ##sudo ln -s /etc/opt/rh/rh-php72/php-fpm.d/gnupg.ini /etc/opt/rh/rh-php72/php.d/99-gnupg.ini
-  ##sudo systemctl restart rh-php72-php-fpm.service
+  sudo systemctl restart php74-php-fpm.service
 
   # If you have not yet set a timezone in php.ini
   echo 'date.timezone = "Asia/Tokyo"' |sudo tee /etc/php-fpm.d/timezone.ini
@@ -373,7 +355,7 @@ installCake_RHEL ()
   # To use the scheduler worker for scheduled tasks, do the following:
   sudo cp -fa $PATH_TO_MISP/INSTALL/setup/config.php $PATH_TO_MISP/app/Plugin/CakeResque/Config/config.php
 }
-# <snippet-begin 1_installCake_RHEL.sh>
+# <snippet-end 1_installCake_RHEL.sh>
 ```
 
 ### 5/ Set file permissions
@@ -382,10 +364,10 @@ installCake_RHEL ()
 # Main function to fix permissions to something sane
 permissions_RHEL () {
   sudo chown -R $WWW_USER:$WWW_USER $PATH_TO_MISP
-  ## ? chown -R root:apache /var/www/MISP
+  ## ? chown -R root:$WWW_USER $PATH_TO_MISP
   sudo find $PATH_TO_MISP -type d -exec chmod g=rx {} \;
   sudo chmod -R g+r,o= $PATH_TO_MISP
-  ## **Note :** For updates through the web interface to work, apache must own the /var/www/MISP folder and its subfolders as shown above, which can lead to security issues. If you do not require updates through the web interface to work, you can use the following more restrictive permissions :
+  ## **Note :** For updates through the web interface to work, apache must own the $PATH_TO_MISP folder and its subfolders as shown above, which can lead to security issues. If you do not require updates through the web interface to work, you can use the following more restrictive permissions :
   sudo chmod -R 750 $PATH_TO_MISP
   sudo chmod -R g+xws $PATH_TO_MISP/app/tmp
   sudo chmod -R g+ws $PATH_TO_MISP/app/files
@@ -427,7 +409,7 @@ prepareDB_RHEL () {
   # Make sure that NOBODY can access the server without a password
   sudo mysqladmin -h $DBHOST -u "${DBUSER_ADMIN}" password "${DBPASSWORD_ADMIN}"
   # Make our changes take effect
-  sudo mysql -h $DBHOST -e "FLUSH PRIVILEGES"
+  sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "FLUSH PRIVILEGES"
 
   sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "CREATE DATABASE ${DBNAME};"
   sudo mysql -h $DBHOST -u "${DBUSER_ADMIN}" -p"${DBPASSWORD_ADMIN}" -e "CREATE USER '${DBUSER_MISP}'@'localhost' IDENTIFIED BY '${DBPASSWORD_MISP}';"
@@ -457,7 +439,7 @@ apacheConfig_RHEL () {
   # A sample vhost can be found in $PATH_TO_MISP/INSTALL/apache.misp.centos7
 
   sudo cp $PATH_TO_MISP/INSTALL/apache.misp.centos7.ssl /etc/httpd/conf.d/misp.ssl.conf
-  sudo sed -i "s/SetHandler/\#SetHandler/g" /etc/httpd/conf.d/misp.ssl.conf
+  #sudo sed -i "s/SetHandler/\#SetHandler/g" /etc/httpd/conf.d/misp.ssl.conf
   sudo rm /etc/httpd/conf.d/ssl.conf
   sudo chmod 644 /etc/httpd/conf.d/misp.ssl.conf
   sudo sed -i '/Listen 80/a Listen 443' /etc/httpd/conf/httpd.conf
@@ -474,7 +456,7 @@ apacheConfig_RHEL () {
   sudo openssl req -new -subj "/C=${OPENSSL_C}/ST=${OPENSSL_ST}/L=${OPENSSL_L}/O=${OPENSSL_O}/OU=${OPENSSL_OU}/CN=${OPENSSL_CN}/emailAddress=${OPENSSL_EMAILADDRESS}" -key /etc/pki/tls/private/misp.local.key -out /etc/pki/tls/certs/misp.local.csr
   sudo openssl x509 -req -days 365 -in /etc/pki/tls/certs/misp.local.csr -signkey /etc/pki/tls/private/misp.local.key -out /etc/pki/tls/certs/misp.local.crt
   sudo ln -s /etc/pki/tls/certs/misp.local.csr /etc/pki/tls/certs/misp-chain.crt
-  cat /etc/pki/tls/certs/dhparam.pem |sudo tee -a /etc/pki/tls/certs/misp.local.crt 
+  cat /etc/pki/tls/certs/dhparam.pem |sudo tee -a /etc/pki/tls/certs/misp.local.crt
 
   sudo systemctl restart httpd.service
 
@@ -484,13 +466,14 @@ apacheConfig_RHEL () {
   sudo chcon -t httpd_sys_rw_content_t $PATH_TO_MISP/app/files/scripts/tmp
   sudo chcon -t httpd_sys_rw_content_t $PATH_TO_MISP/app/Plugin/CakeResque/tmp
   sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Console/cake
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Console/worker/start.sh
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/mispzmq/mispzmq.py
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/mispzmq/mispzmqtest.py
+  sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Console/worker/*.sh"
+  sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*.py"
+  sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*/*.py"
   sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/lief/build/api/python/lief.so
   sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Vendor/pear/crypt_gpg/scripts/crypt-gpg-pinentry
-  sudo chcon -t httpd_sys_rw_content_t /tmp
-  sudo chcon -R -t usr_t $PATH_TO_MISP/venv
+  sudo sh -c "chcon -R -t bin_t $PATH_TO_MISP/venv/bin/*"
+  sudo find $PATH_TO_MISP/venv -type f -name "*.so*" -or -name "*.so.*" | xargs sudo chcon -t lib_t
+  # Only run these if you want to be able to update MISP from the web interface
   sudo chcon -R -t httpd_sys_rw_content_t $PATH_TO_MISP/.git
   sudo chcon -R -t httpd_sys_rw_content_t $PATH_TO_MISP/app/tmp
   sudo chcon -R -t httpd_sys_rw_content_t $PATH_TO_MISP/app/Lib
@@ -527,7 +510,7 @@ firewall_RHEL () {
 
 ### 8/ Log Rotation
 ## 8.01/ Enable log rotation
-MISP saves the stdout and stderr of its workers in /var/www/MISP/app/tmp/logs
+MISP saves the stdout and stderr of its workers in $PATH_TO_MISP/app/tmp/logs
 To rotate these logs install the supplied logrotate script:
 
 FIXME: The below does not work
@@ -543,12 +526,12 @@ logRotation_RHEL () {
 
   # Now make logrotate work under SELinux as well
   # Allow logrotate to modify the log files
-  sudo semanage fcontext -a -t httpd_sys_rw_content_t "/var/www/MISP(/.*)?"
+  sudo semanage fcontext -a -t httpd_sys_rw_content_t "$PATH_TO_MISP(/.*)?"
   sudo semanage fcontext -a -t httpd_log_t "$PATH_TO_MISP/app/tmp/logs(/.*)?"
   sudo chcon -R -t httpd_log_t $PATH_TO_MISP/app/tmp/logs
   sudo chcon -R -t httpd_sys_rw_content_t $PATH_TO_MISP/app/tmp/logs
   # Impact of the following: ?!?!?!!?111
-  ##sudo restorecon -R /var/www/MISP/
+  ##sudo restorecon -R $PATH_TO_MISP
 
   # Allow logrotate to read /var/www
   sudo checkmodule -M -m -o /tmp/misplogrotate.mod $PATH_TO_MISP/INSTALL/misplogrotate.te
@@ -613,6 +596,7 @@ configMISP_RHEL () {
 
   # If you want to be able to change configuration parameters from the webinterface:
   sudo chown $WWW_USER:$WWW_USER $PATH_TO_MISP/app/Config/config.php
+  sudo chmod 660 $PATH_TO_MISP/app/Config/config.php
   sudo chcon -t httpd_sys_rw_content_t $PATH_TO_MISP/app/Config/config.php
 
   # Generate a GPG encryption key.

From 91b7dfbb649efcdc8706fd3ca633a8f6e12a3fe7 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 15:04:34 +0900
Subject: [PATCH 396/437] chg: [doc] more fine tuning to RHEL8

---
 docs/INSTALL.rhel8.md | 161 ++++++++++++------------------------------
 1 file changed, 44 insertions(+), 117 deletions(-)

diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 733052bf3..4639c61d8 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -110,7 +110,6 @@ enableEPEL () {
   sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
   sudo yum install http://rpms.remirepo.net/enterprise/remi-release-8.rpm -y
   sudo yum install yum-utils -y
-  sudo yum-config-manager --enable remi-php74
 }
 # <snippet-end 0_RHEL_EPEL.sh>
 ```
@@ -158,10 +157,22 @@ yumInstallCoreDeps () {
                    php74-php-brotli \
                    php74-php-intl \
                    php74-php-gd -y
+
+  # cake has php baked in, thus we link to it
+  sudo ln -s /usr/bin/php74 /usr/bin/php
 }
 # <snippet-end 0_yumInstallCoreDeps.sh>
 ```
 
+```bash
+# <snippet-begin 0_yumInstallHaveged.sh>
+# GPG needs lots of entropy, haveged provides entropy
+# /!\ Only do this if you're not running rngd to provide randomness and your kernel randomness is not sufficient.
+sudo yum install haveged -y
+sudo systemctl enable --now haveged.service
+# <snippet-end 0_yumInstallHaveged.sh>
+```
+
 !!! notice
     MISP 2.4 requires PHP 5.6 as a minimum, we need a higher version than base RHEL provides.<br />
     This guide installs PHP 7.4
@@ -179,10 +190,10 @@ TODO: Add a CentOS/RHEL rng thing, à la haveged (not in base anymore) or simila
 ```bash
 # <snippet-begin 1_mispCoreInstall_RHEL.sh>
 installCoreRHEL () {
-  # Download MISP using git in the /var/www/ directory.
-  sudo mkdir $PATH_TO_MISP
-  sudo chown $WWW_USER:$WWW_USER $PATH_TO_MISP
-  cd /var/www
+  # Download MISP using git in the $PATH_TO_MISP directory.
+  sudo mkdir -p $(dirname $PATH_TO_MISP)
+  sudo chown $WWW_USER:$WWW_USER $(dirname $PATH_TO_MISP)
+  cd $(dirname $PATH_TO_MISP)
   $SUDO_WWW git clone https://github.com/MISP/MISP.git
   cd $PATH_TO_MISP
 
@@ -282,7 +293,7 @@ installCoreRHEL () {
 
   # FIXME: Remove libfaup etc once the egg has the library baked-in
   # BROKEN: This needs to be tested on RHEL/CentOS
-  ##sudo apt-get install cmake libcaca-dev liblua5.3-dev -y
+  sudo yum install libcaca-devel cmake3 -y
   cd /tmp
   [[ ! -d "faup" ]] && $SUDO_CMD git clone https://github.com/stricaud/faup.git faup
   [[ ! -d "gtcaca" ]] && $SUDO_CMD git clone https://github.com/stricaud/gtcaca.git gtcaca
@@ -303,7 +314,6 @@ installCoreRHEL () {
   # This allows MISP to detect GnuPG, the Python modules' versions and to read the PHP settings.
   echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/remi/php74/php-fpm.d/www.conf
   sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/remi/php74/php-fpm.d/www.conf
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/remi/php74/php-fpm.d/www.conf
   sudo systemctl restart php74-php-fpm.service
   umask $UMASK
 }
@@ -339,7 +349,7 @@ installCake_RHEL ()
   echo 'date.timezone = "Asia/Tokyo"' |sudo tee /etc/php-fpm.d/timezone.ini
   sudo ln -s ../php-fpm.d/timezone.ini /etc/php.d/99-timezone.ini
 
-  # Recommended: Change some PHP settings in /etc/opt/rh/rh-php72/php.ini
+  # Recommended: Change some PHP settings in /etc/opt/remi/php74/php.ini
   # max_execution_time = 300
   # memory_limit = 2048M
   # upload_max_filesize = 50M
@@ -350,7 +360,7 @@ installCake_RHEL ()
   done
   sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
   sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
-  sudo systemctl restart php-fpm.service
+  sudo systemctl restart php74-php-fpm.service
 
   # To use the scheduler worker for scheduled tasks, do the following:
   sudo cp -fa $PATH_TO_MISP/INSTALL/setup/config.php $PATH_TO_MISP/app/Plugin/CakeResque/Config/config.php
@@ -638,123 +648,40 @@ EOF
     The email address should match the one set in the config.php configuration file
     Make sure that you use the same settings in the MISP Server Settings tool
 
-## 9.06/ Use MISP's background workers
-## 9.06a/ Create a systemd unit for the workers
-```bash
-echo "[Unit]
-Description=MISP background workers
-After=mariadb.service redis.service fpm.service
-
-[Service]
-Type=forking
-User=apache
-Group=apache
-ExecStart=/var/www/MISP/app/Console/worker/start.sh
-Restart=always
-RestartSec=10
-
-[Install]
-WantedBy=multi-user.target" |sudo tee /etc/systemd/system/misp-workers.service
-```
-
-Make the workers' script executable and reload the systemd units :
-```bash
-sudo chmod +x /var/www/MISP/app/Console/worker/start.sh
-sudo systemctl daemon-reload
-sudo checkmodule -M -m -o /tmp/workerstartsh.mod $PATH_TO_MISP/INSTALL/workerstartsh.te
-sudo semodule_package -o /tmp/workerstartsh.pp -m /tmp/workerstartsh.mod
-sudo semodule -i /tmp/workerstartsh.pp
-```
-
-## 9.06b/ Start the workers and enable them on boot
-```bash
-sudo systemctl enable --now misp-workers.service
-```
-
-## 9.07/ misp-modules (Broken on RHEL8)
-
-Here are CentOS 8 packages of openjpeg2-devel: https://centos.pkgs.org/8/centos-powertools-x86_64/openjpeg2-devel-2.3.0-8.el8.x86_64.rpm.html
+## 9.06/ Use MISP background workers
 
 ```bash
-# some misp-modules dependencies
-sudo yum install openjpeg2-devel -y
+# <snippet-begin 3_configWorkers_RHEL.sh>
+configWorkersRHEL () {
+  echo "[Unit]
+  Description=MISP background workers
+  After=mariadb.service redis.service php74-php-fpm.service
 
-sudo chmod 2777 /usr/local/src
-sudo chown root:users /usr/local/src
-cd /usr/local/src/
-$SUDO_WWW git clone https://github.com/MISP/misp-modules.git
-cd misp-modules
-sudo yum install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-core poppler-cpp-devel -y
-# pip install
-$SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U -I -r REQUIREMENTS
-$SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U .
-## poppler/cpp/poppler-document.h missing, under my current setup I cannot find it in the repos.
+  [Service]
+  Type=forking
+  User=$WWW_USER
+  Group=$WWW_USER
+  ExecStart=$PATH_TO_MISP/app/Console/worker/start.sh
+  Restart=always
+  RestartSec=10
 
-echo "[Unit]
-Description=MISP modules
-After=misp-workers.service
+  [Install]
+  WantedBy=multi-user.target" |sudo tee /etc/systemd/system/misp-workers.service
 
-[Service]
-Type=simple
-User=apache
-Group=apache
-ExecStart=\"${PATH_TO_MISP}/venv/bin/misp-modules –l 127.0.0.1 –s\"
-Restart=always
-RestartSec=10
+  sudo chmod +x $PATH_TO_MISP/app/Console/worker/start.sh
+  sudo systemctl daemon-reload
 
-[Install]
-WantedBy=multi-user.target" |sudo tee /etc/systemd/system/misp-modules.service
-
-sudo systemctl daemon-reload
-# Test misp-modules
-$SUDO_WWW $PATH_TO_MISP/venv/bin/misp-modules -l 127.0.0.1 -s
-sudo systemctl enable --now misp-modules
-
-  # Enable Enrichment, set better timeouts
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_services_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_hover_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_timeout" 300
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_hover_timeout" 150
-  # TODO:"Investigate why the next one fails"
-  #$SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_asn_history_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_cve_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_dns_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_btc_steroids_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_ipasn_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_yara_syntax_validator_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_yara_query_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_pdf_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_docx_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_xlsx_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_pptx_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_ods_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_odt_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_services_url" "http://127.0.0.1"
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_services_port" 6666
-
-  # Enable Import modules, set better timeout
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_services_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_services_url" "http://127.0.0.1"
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_services_port" 6666
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_timeout" 300
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_ocr_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_mispjson_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_openiocimport_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_threatanalyzer_import_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_csvimport_enabled" true
-
-  # Enable Export modules, set better timeout
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Export_services_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Export_services_url" "http://127.0.0.1"
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Export_services_port" 6666
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Export_timeout" 300
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Export_pdfexport_enabled" true
+  sudo systemctl enable --now misp-workers.service
+}
+# <snippet-end 3_configWorkers_RHEL.sh>
 ```
 
-{!generic/misp-dashboard-centos.md!}
+{!generic/misp-modules-centos.md!}
 
 {!generic/MISP_CAKE_init.md!}
 
+{!generic/misp-dashboard-centos.md!}
+
 {!generic/INSTALL.done.md!}
 
 {!generic/recommended.actions.md!}
@@ -762,7 +689,7 @@ sudo systemctl enable --now misp-modules
 ### 11/ LIEF Installation
 *lief* is required for the Advanced Attachment Handler and requires manual compilation
 
-The installation is explained in section **[3.01](https://misp.github.io/MISP/xINSTALL.rhel8/#301-download-misp-code-using-git-in-varwww-directory)**
+The installation is explained in section **[3.01](https://misp.github.io/MISP/INSTALL.rhel8/#301-download-misp-code-using-git-in-varwww-directory)**
 
 ### 12/ Known Issues
 ## 12.01/ Workers cannot be started or restarted from the web page
@@ -771,7 +698,7 @@ Possible also due to package being installed via SCL, attempting to start worker
 systemctl restart misp-workers.service
 ```
 
-!!! note 
+!!! note
     No other functions were tested after the conclusion of this install. There may be issue that aren't addressed<br />
     via this guide and will need additional investigation.
 

From d43ce7d1a2231689ae52a73557481a4806b0ba2b Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 25 Mar 2021 16:07:11 +0900
Subject: [PATCH 397/437] fix: [doc] Partial fix for misp-modules

---
 docs/INSTALL.rhel8.md               | 42 ++++++++++++++++-------------
 docs/generic/misp-modules-centos.md | 10 ++++++-
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 4639c61d8..3cbf8a5c1 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -85,6 +85,8 @@ sudo subscription-manager register --auto-attach # register your system to an ac
 ```bash
 # <snippet-begin 0_RHEL_SCL.sh>
 sudo subscription-manager refresh 
+# The following is needed for -devel repos and ONLY for misp-modules, ignore if not needed
+sudo subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms
 # Software Collections is available for Red Hat Enterprise Linux 7 and previous supported releases. Starting with Red Hat Enterprise Linux 8, the content traditionally consumed via Software Collections is now part of Application Streams. Please see the Application Streams Life Cycle documentation for that release. Source: https://access.redhat.com/support/policy/updates/rhscl
 # <snippet-end 0_RHEL_SCL.sh>
 ```
@@ -110,6 +112,7 @@ enableEPEL () {
   sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
   sudo yum install http://rpms.remirepo.net/enterprise/remi-release-8.rpm -y
   sudo yum install yum-utils -y
+  sudo dnf module enable php:remi-7.4 -y
 }
 # <snippet-end 0_RHEL_EPEL.sh>
 ```
@@ -137,8 +140,7 @@ yumInstallCoreDeps () {
                    python3-devel python3-pip python3-virtualenv \
                    python3-policycoreutils \
                    policycoreutils-python-utils \
-                   libxslt-devel zlib-devel -y
-  # ssdeep-devel available: dnf install https://extras.getpagespeed.com/release-el8-latest.rpm
+                   libxslt-devel zlib-devel ssdeep-devel -y
   sudo alternatives --set python /usr/bin/python3
 
   # Enable and start redis
@@ -146,19 +148,19 @@ yumInstallCoreDeps () {
 
   PHP_INI="/etc/opt/remi/php74/php.ini"
   # Install PHP 7.4 from Remi's repo, see https://rpms.remirepo.net/enterprise/8/php74/x86_64/repoview/
-  sudo yum install php74 php74-php-fpm php74-php-devel \
-                   php74-php-mysqlnd \
-                   php74-php-mbstring \
-                   php74-php-xml \
-                   php74-php-bcmath \
-                   php74-php-opcache \
-                   php74-php-zip \
-                   php74-php-pear \
-                   php74-php-brotli \
-                   php74-php-intl \
-                   php74-php-gd -y
+  sudo yum install php php-fpm php-devel \
+                   php-mysqlnd \
+                   php-mbstring \
+                   php-xml \
+                   php-bcmath \
+                   php-opcache \
+                   php-zip \
+                   php-pear \
+                   php-brotli \
+                   php-intl \
+                   php-gd -y
 
-  # cake has php baked in, thus we link to it
+  # cake has php baked in, thus we link to it, ignore if this fails or exists.
   sudo ln -s /usr/bin/php74 /usr/bin/php
 }
 # <snippet-end 0_yumInstallCoreDeps.sh>
@@ -179,7 +181,7 @@ sudo systemctl enable --now haveged.service
 
 ## 2.05/ Start the PHP FPM service and enable to start on boot
 ```bash
-sudo systemctl enable --now php74-php-fpm.service
+sudo systemctl enable --now php-fpm.service
 ```
 
 TODO: Add a CentOS/RHEL rng thing, à la haveged (not in base anymore) or similar.
@@ -315,6 +317,8 @@ installCoreRHEL () {
   echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/remi/php74/php-fpm.d/www.conf
   sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/remi/php74/php-fpm.d/www.conf
   sudo systemctl restart php74-php-fpm.service
+  # TODO investigate: listen = 127.0.0.1:9000
+
   umask $UMASK
 }
 # <snippet-end 1_mispCoreInstall_RHEL.sh>
@@ -341,9 +345,9 @@ installCake_RHEL ()
   #$SUDO_WWW php -r "unlink('composer-setup.php');"
   $SUDO_WWW php composer.phar install
 
-  sudo yum install php74-php-pecl-redis php74-php-pecl-ssdeep php74-php-pecl-gnupg -y
+  sudo yum install php-pecl-redis php-pecl-ssdeep php-pecl-gnupg -y
 
-  sudo systemctl restart php74-php-fpm.service
+  sudo systemctl restart php-fpm.service
 
   # If you have not yet set a timezone in php.ini
   echo 'date.timezone = "Asia/Tokyo"' |sudo tee /etc/php-fpm.d/timezone.ini
@@ -360,7 +364,7 @@ installCake_RHEL ()
   done
   sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
   sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
-  sudo systemctl restart php74-php-fpm.service
+  sudo systemctl restart php-fpm.service
 
   # To use the scheduler worker for scheduled tasks, do the following:
   sudo cp -fa $PATH_TO_MISP/INSTALL/setup/config.php $PATH_TO_MISP/app/Plugin/CakeResque/Config/config.php
@@ -655,7 +659,7 @@ EOF
 configWorkersRHEL () {
   echo "[Unit]
   Description=MISP background workers
-  After=mariadb.service redis.service php74-php-fpm.service
+  After=mariadb.service redis.service php-fpm.service
 
   [Service]
   Type=forking
diff --git a/docs/generic/misp-modules-centos.md b/docs/generic/misp-modules-centos.md
index 73d1f25ea..4abc61535 100644
--- a/docs/generic/misp-modules-centos.md
+++ b/docs/generic/misp-modules-centos.md
@@ -1,10 +1,14 @@
 ## 9.07/ misp-modules
+
 ```bash
 # <snippet-begin 3_misp-modules_RHEL.sh>
 mispmodulesRHEL () {
-  # some misp-modules dependencies
+  # some misp-modules dependencies for RHEL<8
   sudo yum install openjpeg-devel gcc-c++ poppler-cpp-devel pkgconfig python-devel redhat-rpm-config -y
 
+  # some misp-modules dependencies for RHEL8
+  sudo yum install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python2-devel redhat-rpm-config -y
+
   sudo chmod 2777 /usr/local/src
   sudo chown root:users /usr/local/src
   cd /usr/local/src/
@@ -14,7 +18,11 @@ mispmodulesRHEL () {
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U -I -r REQUIREMENTS
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U .
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install pyfaup censys
+  # some misp-modules dependencies for RHEL<8
   sudo yum install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
+  # some misp-modules dependencies for RHEL8
+  sudo dnf install https://packages.endpoint.com/rhel/8/main/x86_64/endpoint-repo-8-1.ep8.noarch.rpm
+  sudo yum install zbar-devel opencv-devel -y
 
   echo "[Unit]
   Description=MISP modules

From 74a99c1e22edfd18a58a1fe3de130036f4f95a28 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Thu, 25 Mar 2021 13:40:51 +0100
Subject: [PATCH 398/437] chg: [taxonomies] updated to the latest version

---
 app/files/taxonomies | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/taxonomies b/app/files/taxonomies
index 75a9cdca8..671b68b49 160000
--- a/app/files/taxonomies
+++ b/app/files/taxonomies
@@ -1 +1 @@
-Subproject commit 75a9cdca81fff723c519948dcdd4fdfc912fc135
+Subproject commit 671b68b4914afb4128f29a1bd641fd47d3b966b8

From 78a316a4bfcb59ebd517c6f99f5f4a85818b25d2 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Thu, 25 Mar 2021 13:43:12 +0100
Subject: [PATCH 399/437] chg: [taxonomies] updated to the latest version

---
 app/files/taxonomies | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/taxonomies b/app/files/taxonomies
index 75a9cdca8..671b68b49 160000
--- a/app/files/taxonomies
+++ b/app/files/taxonomies
@@ -1 +1 @@
-Subproject commit 75a9cdca81fff723c519948dcdd4fdfc912fc135
+Subproject commit 671b68b4914afb4128f29a1bd641fd47d3b966b8

From da07c71d908f445392c18599c96381506b2dcbe4 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Thu, 25 Mar 2021 13:44:54 +0100
Subject: [PATCH 400/437] fix: [attribute] typo in
 place-port-of-original-embarkation fixed

---
 app/Model/Attribute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 13616f45b..2a75198ef 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -4865,7 +4865,7 @@ class Attribute extends AppModel
             //'remarks' => array('desc' => '', 'default_category' => 'Person', 'to_ids' => 0),
             'travel-details' => array('desc' => __('Travel details'), 'default_category' => 'Person', 'to_ids' => 0),
             'payment-details' => array('desc' => __('Payment details'), 'default_category' => 'Person', 'to_ids' => 0),
-            'place-port-of-original-embarkation' => array('desc' => __('The orignal port of embarkation'), 'default_category' => 'Person', 'to_ids' => 0),
+            'place-port-of-original-embarkation' => array('desc' => __('The original port of embarkation'), 'default_category' => 'Person', 'to_ids' => 0),
             'place-port-of-clearance' => array('desc' => __('The port of clearance'), 'default_category' => 'Person', 'to_ids' => 0),
             'place-port-of-onward-foreign-destination' => array('desc' => __('A Port where the passenger is transiting to'), 'default_category' => 'Person', 'to_ids' => 0),
             'passenger-name-record-locator-number' => array('desc' => __('The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers.'), 'default_category' => 'Person', 'to_ids' => 0),

From a227db40eb8fb999bf2c01d910d55b23d63cddbc Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Thu, 25 Mar 2021 13:44:54 +0100
Subject: [PATCH 401/437] fix: [attribute] typo in
 place-port-of-original-embarkation fixed

---
 app/Model/Attribute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index bec4ab55a..2ac07d674 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -4865,7 +4865,7 @@ class Attribute extends AppModel
             //'remarks' => array('desc' => '', 'default_category' => 'Person', 'to_ids' => 0),
             'travel-details' => array('desc' => __('Travel details'), 'default_category' => 'Person', 'to_ids' => 0),
             'payment-details' => array('desc' => __('Payment details'), 'default_category' => 'Person', 'to_ids' => 0),
-            'place-port-of-original-embarkation' => array('desc' => __('The orignal port of embarkation'), 'default_category' => 'Person', 'to_ids' => 0),
+            'place-port-of-original-embarkation' => array('desc' => __('The original port of embarkation'), 'default_category' => 'Person', 'to_ids' => 0),
             'place-port-of-clearance' => array('desc' => __('The port of clearance'), 'default_category' => 'Person', 'to_ids' => 0),
             'place-port-of-onward-foreign-destination' => array('desc' => __('A Port where the passenger is transiting to'), 'default_category' => 'Person', 'to_ids' => 0),
             'passenger-name-record-locator-number' => array('desc' => __('The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers.'), 'default_category' => 'Person', 'to_ids' => 0),

From 05299b9f473243b042e9534e5ea8775e42e0c9c4 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Thu, 25 Mar 2021 13:48:32 +0100
Subject: [PATCH 402/437] chg: [PyMISP] updated to the latest version

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index 39a7b8242..51edb8ab3 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 39a7b8242f0d3022276d417ec334bb46b890ff23
+Subproject commit 51edb8ab33c5ee6bd3b9b05ea5809299f37c4fbe

From bf91225265d8ed932a1992f8c8c0e03edf021a6a Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Thu, 25 Mar 2021 14:06:21 +0100
Subject: [PATCH 403/437] chg: [taxonomies] updated

---
 app/files/taxonomies | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/taxonomies b/app/files/taxonomies
index 671b68b49..ad9177637 160000
--- a/app/files/taxonomies
+++ b/app/files/taxonomies
@@ -1 +1 @@
-Subproject commit 671b68b4914afb4128f29a1bd641fd47d3b966b8
+Subproject commit ad917763716b7d2b612620939966628d40c91936

From 4cefa076e74dde0995c45e9c7c71f4a48029c663 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Thu, 25 Mar 2021 14:17:28 +0100
Subject: [PATCH 404/437] chg: [taxonomies] updated to the latest version

---
 app/files/taxonomies | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/taxonomies b/app/files/taxonomies
index 671b68b49..ad9177637 160000
--- a/app/files/taxonomies
+++ b/app/files/taxonomies
@@ -1 +1 @@
-Subproject commit 671b68b4914afb4128f29a1bd641fd47d3b966b8
+Subproject commit ad917763716b7d2b612620939966628d40c91936

From 8451409f28d0ed4f8dce69ee1742b5ed0f3a5c09 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Thu, 25 Mar 2021 14:27:38 +0100
Subject: [PATCH 405/437] chg: [PyMISP] updated to the latest version

---
 PyMISP | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyMISP b/PyMISP
index 39a7b8242..51edb8ab3 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 39a7b8242f0d3022276d417ec334bb46b890ff23
+Subproject commit 51edb8ab33c5ee6bd3b9b05ea5809299f37c4fbe

From e72579f5a92074bad0fc5c13fd3efe60f120c1a6 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 25 Mar 2021 16:04:23 +0100
Subject: [PATCH 406/437] fix: [sync:local-tag] Local tags converted into
 global after sync for internal sync

Fix #7253
---
 app/Model/Event.php       | 3 ++-
 app/Model/EventReport.php | 2 +-
 app/Model/EventTag.php    | 8 ++++----
 app/Model/Feed.php        | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/Model/Event.php b/app/Model/Event.php
index bfc12d071..18a3edd62 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -6413,7 +6413,8 @@ class Event extends AppModel
             foreach ($resolved_data['Tag'] as $tag) {
                 $tag_id = $this->EventTag->Tag->captureTag($tag, $user);
                 if ($tag_id) {
-                    $this->EventTag->attachTagToEvent($id, $tag_id);
+                    $tag['id'] = $tag_id;
+                    $this->EventTag->attachTagToEvent($id, $tag);
                 }
             }
         }
diff --git a/app/Model/EventReport.php b/app/Model/EventReport.php
index 68a24473d..516b22d43 100644
--- a/app/Model/EventReport.php
+++ b/app/Model/EventReport.php
@@ -912,7 +912,7 @@ class EventReport extends AppModel
             if ($tagId === -1) {
                 $tagId = $this->EventTag->Tag->captureTag(['name' => $tagName], $user);
             }
-            $this->EventTag->attachTagToEvent($eventId, $tagId);
+            $this->EventTag->attachTagToEvent($eventId, ['id' => $tagId]);
         }
     }
 
diff --git a/app/Model/EventTag.php b/app/Model/EventTag.php
index 37499c8f5..a04f06ff3 100644
--- a/app/Model/EventTag.php
+++ b/app/Model/EventTag.php
@@ -85,25 +85,25 @@ class EventTag extends AppModel
     public function handleEventTag($event_id, $tag, &$nothingToChange = false)
     {
         if (empty($tag['deleted'])) {
-            $result = $this->attachTagToEvent($event_id, $tag['id'], $nothingToChange);
+            $result = $this->attachTagToEvent($event_id, $tag, $nothingToChange);
         } else {
             $result = $this->detachTagFromEvent($event_id, $tag['id'], $nothingToChange);
         }
         return $result;
     }
 
-    public function attachTagToEvent($event_id, $tag_id, &$nothingToChange = false)
+    public function attachTagToEvent($event_id, $tag, &$nothingToChange = false)
     {
         $existingAssociation = $this->find('first', array(
             'recursive' => -1,
             'conditions' => array(
-                'tag_id' => $tag_id,
+                'tag_id' => $tag['id'],
                 'event_id' => $event_id
             )
         ));
         if (empty($existingAssociation)) {
             $this->create();
-            if (!$this->save(array('event_id' => $event_id, 'tag_id' => $tag_id))) {
+            if (!$this->save(array('event_id' => $event_id, 'tag_id' => $tag['id'], 'local' => !empty($tag['local'])))) {
                 return false;
             }
         } else {
diff --git a/app/Model/Feed.php b/app/Model/Feed.php
index 4d9cdb8af..cf0082943 100644
--- a/app/Model/Feed.php
+++ b/app/Model/Feed.php
@@ -1116,7 +1116,7 @@ class Feed extends AppModel
             $this->Event->publishRouter($event['Event']['id'], null, $user);
         }
         if ($feed['Feed']['tag_id']) {
-            $this->Event->EventTag->attachTagToEvent($event['Event']['id'], $feed['Feed']['tag_id']);
+            $this->Event->EventTag->attachTagToEvent($event['Event']['id'], ['id' => $feed['Feed']['tag_id']]);
         }
         return true;
     }

From 0653761e2dd443acfec1cee311b7e1fd5fde4126 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 25 Mar 2021 16:33:53 +0100
Subject: [PATCH 407/437] fix: [sharinggroup:captureSG] Correctly capture the
 roaming state

Fix #7254
---
 app/Model/SharingGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Model/SharingGroup.php b/app/Model/SharingGroup.php
index 057a49f71..ffd264157 100644
--- a/app/Model/SharingGroup.php
+++ b/app/Model/SharingGroup.php
@@ -725,7 +725,7 @@ class SharingGroup extends AppModel
             'created' => !isset($sg['created']) ? $date : $sg['created'],
             'modified' => !isset($sg['modified']) ? $date : $sg['modified'],
             'active' => !isset($sg['active']) ? 1 : $sg['active'],
-            'roaming' => !isset($sg['description']) ? false : $sg['description'],
+            'roaming' => !isset($sg['roaming']) ? false : $sg['roaming'],
             'local' => 0,
             'sync_user_id' => $user['id'],
             'org_id' => $user['Role']['perm_sync'] ? $this->__retrieveOrgIdFromCapturedSG($user, $sg) : $user['org_id']

From b0714a4045c5195ca6041daffe1ebb2c2e4a4e8c Mon Sep 17 00:00:00 2001
From: Jeroen Pinoy <jeroen.pinoy@fortitude.ninja>
Date: Thu, 25 Mar 2021 16:36:26 +0000
Subject: [PATCH 408/437] chg: [UI] fix debugon for debug = 1. fix #7131

---
 app/Controller/AppController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 51803bbef..07c8d0427 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -808,7 +808,7 @@ class AppController extends Controller
      * Configure the debugMode view parameter
      */
     protected function _setupDebugMode() {
-        $this->set('debugMode', (Configure::read('debug') > 1) ? 'debugOn' : 'debugOff');
+        $this->set('debugMode', (Configure::read('debug') >= 1) ? 'debugOn' : 'debugOff');
     }
 
     /*

From 8f4ca30045421bf730af11656d6d4fe6210f0e63 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Fri, 26 Mar 2021 10:43:32 +0900
Subject: [PATCH 409/437] chg: [i8n] Added localization progress

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 2f33d2771..160f69c71 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,10 @@ MISP - Threat Intelligence Sharing Platform
   <td>Twitter</td>
   <td><a href="https://twitter.com/MISPProject"><img src="https://img.shields.io/twitter/follow/MISPProject.svg?style=social&label=Follow" /></a></td>
 </tr>
+<tr>
+  <td>Localization</td>
+  <td><a href="https://crowdin.com/project/misp"><img src="https://badges.crowdin.net/misp/localized.svg" /></a></td>
+</tr>
 <tr>
   <td>Contributors</td>
   <td><img src="https://img.shields.io/github/contributors/MISP/MISP.svg" /></td>

From 3359607920b90a89d6bfebe58fc5f9cdfe313780 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Fri, 26 Mar 2021 13:29:14 +0900
Subject: [PATCH 410/437] chg: [i18n] Updated translations

---
 app/Locale/cze/LC_MESSAGES/default.po   | 9111 +++++++++++++--------
 app/Locale/dan/LC_MESSAGES/default.po   | 3415 ++++----
 app/Locale/deu/LC_MESSAGES/default.po   | 3375 ++++----
 app/Locale/fra/LC_MESSAGES/default.po   |    4 +-
 app/Locale/ita/LC_MESSAGES/default.po   | 3397 ++++----
 app/Locale/jpn/LC_MESSAGES/default.po   | 3417 ++++----
 app/Locale/kor/LC_MESSAGES/default.po   | 8870 ++++++++++++++-------
 app/Locale/no/LC_MESSAGES/default.po    | 3403 ++++----
 app/Locale/pol/LC_MESSAGES/default.po   | 9237 ++++++++++++++--------
 app/Locale/pt_BR/LC_MESSAGES/default.po | 9642 +++++++++++++++--------
 app/Locale/rus/LC_MESSAGES/default.po   | 3397 ++++----
 app/Locale/spa/LC_MESSAGES/default.po   | 3375 ++++----
 app/Locale/swe/LC_MESSAGES/default.po   | 8876 ++++++++++++++-------
 app/Locale/zh-s/LC_MESSAGES/default.po  | 3466 ++++----
 14 files changed, 46198 insertions(+), 26787 deletions(-)

diff --git a/app/Locale/cze/LC_MESSAGES/default.po b/app/Locale/cze/LC_MESSAGES/default.po
index c4ee28365..6e2f3f35e 100644
--- a/app/Locale/cze/LC_MESSAGES/default.po
+++ b/app/Locale/cze/LC_MESSAGES/default.po
@@ -1,800 +1,1102 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-09-30 01:22\n"
-"Last-Translator: Steve Clement (SteveClement)\n"
+"PO-Revision-Date: 2021-03-26 04:21\n"
+"Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech\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>=2 && n<=4) ? 1 : 3;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: cs\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: cs_CZ\n"
 
-#: Console/Command/AdminShell.php:59
+#: Console/Command/AdminShell.php:72
 msgid "Database updated: "
-msgstr ""
+msgstr "Databáze aktualizována: "
 
-#: Console/Command/AdminShell.php:61
+#: Console/Command/AdminShell.php:74
 msgid "Could not update the database: "
-msgstr ""
+msgstr "Databázi nelze aktualizovat: "
 
-#: Console/Command/AdminShell.php:73
+#: Console/Command/AdminShell.php:87
 msgid "Worker restarted."
-msgstr ""
+msgstr "Worker restartován."
 
-#: Console/Command/AdminShell.php:75
+#: Console/Command/AdminShell.php:89
 msgid "Could not restart the worker. Reason: %s"
-msgstr ""
+msgstr "Nelze restartovat worker. Důvod: %s"
 
-#: Console/Command/AdminShell.php:96
+#: Console/Command/AdminShell.php:111
 msgid "Worker killed."
 msgstr ""
 
-#: Console/Command/AdminShell.php:112
-msgid "Worker started."
-msgstr ""
-
-#: Console/Command/AdminShell.php:123
-msgid "%s updated."
-msgstr ""
-
 #: Console/Command/AdminShell.php:128
+msgid "Worker started."
+msgstr "Worker spuštěn."
+
+#: Console/Command/AdminShell.php:141
+msgid "%s updated."
+msgstr "%s aktualizováno."
+
+#: Console/Command/AdminShell.php:146
 msgid "Could not update %s."
-msgstr ""
+msgstr "Nelze aktualizovat %s."
 
-#: Console/Command/AdminShell.php:455
+#: Console/Command/AdminShell.php:466
 msgid "Update the JSON definitions of MISP."
-msgstr ""
+msgstr "Aktualizovat definice JSON MISP."
 
-#: Console/Command/AdminShell.php:458
+#: Console/Command/AdminShell.php:469
 msgid "Update the submodules before ingestion."
-msgstr ""
+msgstr "Aktualizujte podmoduly před přidáním."
 
-#: Console/Command/AdminShell.php:487
+#: Console/Command/AdminShell.php:499
 msgid "Last DB num which was successfully executed: "
 msgstr ""
 
-#: Console/Command/AdminShell.php:496
+#: Console/Command/AdminShell.php:508
 msgid "Something went wrong. Could not find the existing db version"
-msgstr ""
+msgstr "Něco se pokazilo. Nelze najít existující verzi db"
 
-#: Console/Command/AdminShell.php:499
+#: Console/Command/AdminShell.php:511
 msgid "DB was never successfully updated or we are on a fresh install"
+msgstr "DB nebyla nikdy úspěšně aktualizována, nebo jsme na nové instalaci"
+
+#: Console/Command/AdminShell.php:528
+msgid "MISP mass sync authkey reset command line tool.\n\n"
+"Usage: %sConsole/cake resetSyncAuthkeys [user_id]"
 msgstr ""
 
-#: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:125;129;133
+#: Console/Command/AdminShell.php:536
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
+msgid "Invalid user."
+msgstr "Neplatný uživatel."
+
+#: Console/Command/AdminShell.php:539
+msgid "User has to be a site admin."
+msgstr "Uživatel musí být správcem webu."
+
+#: Console/Command/AdminShell.php:563
+msgid "\n"
+"Error: %s\n"
+msgstr "\n"
+"Chyba: %s\n"
+
+#: Console/Command/AdminShell.php:565
+msgid "%s events purged.\n"
+msgstr "%s událostí vymazáno.\n"
+
+#: Console/Command/AdminShell.php:587
+msgid "> Database schema dumped on disk"
+msgstr "> Schéma databáze přeuloženo na disk"
+
+#: Console/Command/AdminShell.php:589
+msgid "Something went wrong. Could not find the existing db version or fetch the current database schema."
+msgstr "Něco se pokazilo. Nelze najít existující verzi db nebo načíst aktuální schéma databáze."
+
+#: Console/Command/EventShell.php:15
+#: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1085;1510;1514;1518;1593;2102;2178;2182;2186;2404;2453;2524;2613;3137;5506;5727;5731;5740
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
-#: Model/Galaxy.php:292
+#: Model/Galaxy.php:293
 msgid "Invalid event"
 msgstr "Neplatná událost"
 
-#: Console/Command/PasswordShell.php:43
+#: Console/Command/PasswordShell.php:46
 msgid "override password change"
+msgstr "přepsat změnu hesla"
+
+#: Console/Command/ServerShell.php:83
+#: Controller/ServersController.php:674
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled, %s sightings pulled."
 msgstr ""
 
-#: Console/Command/ServerShell.php:49
-#: Controller/ServersController.php:636
-msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
-msgstr ""
-
-#: Console/Command/ServerShell.php:51
+#: Console/Command/ServerShell.php:85
 msgid "ERROR: %s"
-msgstr ""
+msgstr "CHYBA: %s"
 
 #: Console/Command/TrainingShell.php:682
 msgid "verbose mode"
-msgstr ""
+msgstr "detailní režim"
 
 #: Console/Command/TrainingShell.php:686
 msgid "interactive mode"
-msgstr ""
+msgstr "interaktivní režim"
 
-#: Controller/AppController.php:385
+#: Controller/AppController.php:382
+msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
+msgstr "Varování: MISP je momentálně zakázán pro všechny uživatele. Povolte jej v nastavení serveru (Administrace -> Nastavení serveru -> MISP karta -> živé). Aktualizace může stále probíhat, můžete vidět její průběh "
+
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
+msgid "Update Progress"
+msgstr "Průběh aktualizace"
+
+#: Controller/AppController.php:389
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
-msgstr ""
+msgstr "Něco se pokazilo. Váš uživatelský účet, kterým jste ověřeni, již neexistuje."
 
-#: Controller/AppController.php:629
-#: Controller/AttributesController.php:1999;2108;2158;2241;2327
-#: Controller/EventsController.php:2846;2962;3024;3390;4006;4069
+#: Controller/AppController.php:519
+msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
+msgstr "VAROVÁNÍ: Tato funkce je zastaralá a bude odstraněna v blízké budoucnosti. "
+
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 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:638
-#: Controller/AttributesController.php:2162;2245;2331
-#: Controller/EventsController.php:2850;2967;3029;3394;4010;4073
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr "Pro tuto akci je nutné se přihlásit."
 
-#: Controller/AppController.php:655
+#: Controller/AppController.php:764
+#: Controller/Component/IndexFilterComponent.php:23
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr ""
 
-#: Controller/AppController.php:780
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Vše je hotovo. attribute_count generované od začátku pro "
 
-#: Controller/AppController.php:903
-#: Controller/AttributesController.php:2385
-#: Controller/ShadowAttributesController.php:1278
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
+#: Controller/ShadowAttributesController.php:1267
 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:116;1389
+#: Controller/AppController.php:1211
+msgid "RestSearch is not implemented (yet) for this scope."
+msgstr "RestSearch není implementován (zatím) pro tento rozsah."
+
+#: Controller/AttributesController.php:109;1339
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "Není nastaveno ID události."
 
-#: Controller/AttributesController.php:119
-msgid "You don't have permissions to create attributes"
+#: Controller/AttributesController.php:112
+msgid "You do not have permissions to create attributes"
 msgstr "Nemáte oprávnění k vytvoření atributů"
 
-#: Controller/AttributesController.php:139;492;672
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1985;2006;2040
-#: Controller/ObjectsController.php:622
+#: Controller/EventsController.php:2107;2128;2162
+#: Controller/ObjectsController.php:837
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "K tomu nemáte oprávnění."
 
-#: Controller/AttributesController.php:415;870;875;879;1087;1167;1209;2401;2415;2448;2470;2479;3106;3210;3214
-#: Controller/ShadowAttributesController.php:824;1069;1093;1126;1136
-#: Controller/TagsController.php:492
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
+#: Controller/ObjectsController.php:641
+#: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
+#: Controller/TagsController.php:506
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "Neplatný atribut"
 
-#: Controller/AttributesController.php:425
-#: Controller/ShadowAttributesController.php:501
+#: Controller/AttributesController.php:355
+#: Controller/ShadowAttributesController.php:483
 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:402
 msgid "Attribute not an attachment or malware-sample"
 msgstr "Atribut není přílohou nebo vzorkem malware"
 
-#: Controller/AttributesController.php:489;656;947;1398
-#: Controller/EventsController.php:4706;4720;5455;5469
+#: Controller/AttributesController.php:419;586;892;1348
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "Neplatná událost."
 
-#: Controller/AttributesController.php:507;683
-#: Controller/ShadowAttributesController.php:548
+#: Controller/AttributesController.php:437;613
+#: Controller/DecayingModelController.php:56
+#: Controller/ShadowAttributesController.php:530
 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:686
-#: Controller/ShadowAttributesController.php:551;561
+#: Controller/AttributesController.php:616
+#: Controller/ShadowAttributesController.php:533;543
 msgid "There was a problem to upload the file."
 msgstr "Došlo k potížím při nahrávání souboru."
 
-#: Controller/AttributesController.php:830
+#: Controller/AttributesController.php:760
 msgid "The ThreatConnect data has been imported."
 msgstr "ThreatConnect data byla importována."
 
-#: Controller/AttributesController.php:833
+#: Controller/AttributesController.php:763
 msgid "%s entries imported."
 msgstr "%s položek importováno."
 
-#: Controller/AttributesController.php:837
+#: Controller/AttributesController.php:767
 msgid "%s entries could not be imported."
 msgstr "%s položek nelze importovat."
 
-#: Controller/AttributesController.php:887;935;937
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "Neplatný atribut."
-
-#: Controller/AttributesController.php:931
+#: Controller/AttributesController.php:876
 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:964
+#: Controller/AttributesController.php:880;882
+#: Controller/ShadowAttributesController.php:817
+msgid "Invalid attribute."
+msgstr "Neplatný atribut."
+
+#: Controller/AttributesController.php:909
 msgid "The attribute has been saved"
 msgstr "Atribut byl uložen"
 
-#: Controller/AttributesController.php:999
+#: Controller/AttributesController.php:944
 msgid "The attribute could not be saved. Please, try again."
 msgstr "Atribut nelze uložit. Prosím opakujte akci."
 
-#: Controller/AttributesController.php:1091
+#: Controller/AttributesController.php:1036
+#: Controller/ObjectsController.php:515
 msgid "Invalid event id."
 msgstr "Neplatné Id události."
 
-#: Controller/AttributesController.php:1121
-#: Controller/EventsController.php:2326
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1072
+#: Controller/EventsController.php:2466
+#: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "Neplatný vstup."
 
-#: Controller/AttributesController.php:1126
+#: Controller/AttributesController.php:1077
 msgid "Invalid field."
 msgstr "Neplatné pole."
 
-#: Controller/AttributesController.php:1171;1213
+#: Controller/AttributesController.php:1125;1161
 msgid "Invalid attribute id."
 msgstr "Neplatné ID atributu."
 
-#: Controller/AttributesController.php:1299;1309
-msgid "Attribute deleted"
-msgstr "Atribut odstraněn"
-
-#: Controller/AttributesController.php:1304;1306
-msgid "Attribute was not deleted"
-msgstr "Atribut nebyl odstraněn"
-
-#: Controller/AttributesController.php:1331;2872
-#: Controller/ShadowAttributesController.php:865
-msgid "Invalid Attribute"
-msgstr "Neplatný atribut"
-
-#: Controller/AttributesController.php:1358
-msgid "Could not restore the attribute"
-msgstr "Nelze obnovit atribut"
-
-#: Controller/AttributesController.php:1369
+#: Controller/AttributesController.php:1242;1319
 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:1424
+#: Controller/AttributesController.php:1249;1259
+msgid "Attribute deleted"
+msgstr "Atribut odstraněn"
+
+#: Controller/AttributesController.php:1254;1256
+msgid "Attribute was not deleted"
+msgstr "Atribut nebyl odstraněn"
+
+#: Controller/AttributesController.php:1281;2675
+#: Controller/ShadowAttributesController.php:853
+msgid "Invalid Attribute"
+msgstr "Neplatný atribut"
+
+#: Controller/AttributesController.php:1308
+msgid "Could not restore the attribute"
+msgstr "Nelze obnovit atribut"
+
+#: Controller/AttributesController.php:1374
 msgid "No matching attributes found."
 msgstr "Nebyly nalezeny žádné stejné atributy."
 
-#: Controller/AttributesController.php:1458
+#: Controller/AttributesController.php:1408
 msgid "This method can only be accessed via AJAX."
 msgstr "Tato metoda je přístupná pouze přes AJAX."
 
-#: Controller/AttributesController.php:1468
+#: Controller/AttributesController.php:1418
 msgid "You are not authorized to edit this event."
 msgstr "Nemáte oprávnění k úpravě této události."
 
-#: Controller/AttributesController.php:1566
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "Žádné ID události není k dispozici."
 
-#: Controller/AttributesController.php:1611
-#: Controller/GalaxiesController.php:235
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "Synonyma: "
 
-#: Controller/AttributesController.php:1994;2101
+#: Controller/AttributesController.php:1912;2019
 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:2007
+#: Controller/AttributesController.php:1925
 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:2027
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "Nemáte přístup k této události."
 
-#: Controller/AttributesController.php:2090
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "Žádná shoda."
 
-#: Controller/AttributesController.php:2112;2121
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Neplatný atribut nebo nemáte oprávnění k jeho zobrazení."
 
-#: Controller/AttributesController.php:2189
-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:2253
-msgid "Invalid event ID format."
-msgstr "Neplatný formát ID události."
-
-#: Controller/AttributesController.php:2362
-#: Controller/ShadowAttributesController.php:1256
+#: Controller/AttributesController.php:2165
+#: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "Vše je hotovo. "
 
-#: Controller/AttributesController.php:2394;2441
-#: Controller/ShadowAttributesController.php:1064
+#: Controller/AttributesController.php:2197;2244
+#: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "Požadováno neplatné pole."
 
-#: Controller/AttributesController.php:2397;2444
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "Tato funkce je přístupná pouze přes AJAX."
 
-#: Controller/AttributesController.php:2509;2517
-#: Controller/EventsController.php:3833;3982;5261
+#: Controller/AttributesController.php:2282
+msgid "You do not have permission to do that"
+msgstr "K tomu nemáte oprávnění"
+
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 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:2538
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "Tato akce je přístupná pouze přes AJAX."
 
-#: Controller/AttributesController.php:2547;2798;2812;2823
-#: Controller/OrganisationsController.php:418
-#: Controller/ServersController.php:623;691
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
+#: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "K tomu nemáte oprávnění."
 
-#: Controller/AttributesController.php:2652
-#: Controller/EventsController.php:4499
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "Tato funkce vyžaduje API klíč."
 
-#: Controller/AttributesController.php:2660
+#: Controller/AttributesController.php:2463
 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:2672
+#: Controller/AttributesController.php:2475
 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:2833
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "Neplatný skript."
 
-#: Controller/AttributesController.php:2900
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr "Žádná platná obohacování možnosti pro tento atribut."
 
-#: Controller/AttributesController.php:2998
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "Vyžádán neplatný typ."
 
-#: Controller/AttributesController.php:3277
-#: Controller/EventsController.php:5451
+#: Controller/AttributesController.php:2864;3071
+#: Controller/TagCollectionsController.php:254
+msgid "Invalid tag"
+msgstr "Neplatný štítek"
+
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Zákaz korelace není na tuto instanci možný."
 
-#: Controller/AttributesController.php:3281;3296
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3165;3180
+#: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "Neplatný atribut."
 
-#: Controller/AttributesController.php:3284;3299
-#: Controller/EventsController.php:5458;5472
-#: Controller/PostsController.php:60;84
-#: Controller/TaxonomiesController.php:100;131;163;245;275;305;335;365;374;383
-msgid "You don't have permission to do that."
-msgstr "K tomu nemáte oprávnění."
+#: Controller/CommunitiesController.php:150
+msgid "Request sent."
+msgstr "Žádost odeslána."
+
+#: Controller/CommunitiesController.php:150
+msgid "Something went wrong and the request could not be sent."
+msgstr "Něco se pokazilo a žádost nemohla být odeslána."
+
+#: Controller/CommunitiesController.php:166
+msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
+msgstr ""
+
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
+#: Controller/DecayingModelController.php:20
+msgid "Default decaying models updated"
+msgstr "Výchozí modely rozkladu byly aktualizovány"
+
+#: Controller/DecayingModelController.php:28
+msgid "This method is not allowed"
+msgstr "Tato metoda není povolena"
+
+#: Controller/DecayingModelController.php:36;105;207;243;264;276;354;387;399;409;430;442;452;544
+#: Controller/DecayingModelMappingController.php:25
+#: Model/DecayingModel.php:483;619
+#: Model/DecayingModelMapping.php:30;59
+msgid "No Decaying Model with the provided ID exists"
+msgstr "Žádný model rozkladu s zadaným ID neexistuje"
+
+#: Controller/DecayingModelController.php:47
+msgid "Only one import field can be used"
+msgstr "Lze použít pouze jedno importní pole"
+
+#: Controller/DecayingModelController.php:65
+msgid "Error while decoding JSON"
+msgstr "Chyba při dekódování JSON"
+
+#: Controller/DecayingModelController.php:90
+msgid "The model has been imported."
+msgstr "Model byl importován."
+
+#: Controller/DecayingModelController.php:92
+msgid "The model has been imported. However importing mapping failed."
+msgstr "Model byl importován. Import mapování se však nezdařil."
+
+#: Controller/DecayingModelController.php:95
+msgid "Error while importing model."
+msgstr "Chyba při importu modelu."
+
+#: Controller/DecayingModelController.php:186
+msgid "The model must have a name"
+msgstr "Model musí mít název"
+
+#: Controller/DecayingModelController.php:198;269
+msgid "The model has been saved."
+msgstr "Model byl uložen."
+
+#: Controller/DecayingModelController.php:201
+msgid "The model has been saved. However importing mapping failed."
+msgstr "Model byl uložen. Import mapování se však nezdařil."
+
+#: Controller/DecayingModelController.php:220;224;281
+msgid "The model could not be saved. Please try again."
+msgstr "Model nelze uložit. Zkuste to prosím znovu."
+
+#: Controller/DecayingModelController.php:308
+msgid "Invalid JSON `Settings`."
+msgstr "Neplatné JSON `Nastavení`."
+
+#: Controller/DecayingModelController.php:314
+msgid "Invalid parameter `lifetime`."
+msgstr "Neplatný parametr `lifetime`."
+
+#: Controller/DecayingModelController.php:318
+msgid "Invalid parameter `decay_speed`."
+msgstr "Neplatný parametr `decay_speed`."
+
+#: Controller/DecayingModelController.php:322
+msgid "Invalid parameter `threshold`."
+msgstr "Neplatný parametr `threshold`."
+
+#: Controller/DecayingModelController.php:326
+msgid "Invalid parameter `default_base_score`."
+msgstr "Neplatný parametr `default_base_score`."
+
+#: Controller/DecayingModelController.php:333
+msgid "Invalid parameter `base_score_config`."
+msgstr "Neplatný parametr `base_score_config`."
+
+#: Controller/DecayingModelController.php:342
+msgid "Missing JSON key `parameters`."
+msgstr "Chybí JSON klíč `parameters`."
+
+#: Controller/DecayingModelController.php:360
+msgid "You are not authorised to delete this model."
+msgstr "Nemáte oprávnění k odstranění tohoto modelu."
+
+#: Controller/DecayingModelController.php:368
+msgid "Decaying Model deleted."
+msgstr "Model vyřazení byl smazán."
+
+#: Controller/DecayingModelController.php:371
+msgid "The Decaying Model could not be deleted."
+msgstr "Model rozkladu nemohl být odstraněn."
+
+#: Controller/DecayingModelController.php:391
+msgid "You are not authorised to enable this model."
+msgstr "Nemáte oprávnění k povolení tohoto modelu."
+
+#: Controller/DecayingModelController.php:404
+msgid "Decaying Model enabled."
+msgstr "Model rozkladu byl povolen."
+
+#: Controller/DecayingModelController.php:414;417;457
+msgid "Error while enabling decaying model"
+msgstr "Chyba při zapnutí modelu rozkladu"
+
+#: Controller/DecayingModelController.php:434
+msgid "You are not authorised to disable this model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:447
+msgid "Decaying Model disabled."
+msgstr "Model rozkladu zakázán."
+
+#: Controller/DecayingModelController.php:460
+msgid "Error while disabling decaying model"
+msgstr "Chyba při zakázání rozkladového modelu"
+
+#: Controller/DecayingModelController.php:478
+#: View/DecayingModel/add.ctp:37
+msgid "Lifetime"
+msgstr "Celoživotní"
+
+#: Controller/DecayingModelController.php:479
+#: View/DecayingModel/add.ctp:37
+msgid "Lifetime of the attribute, or time after which the score will be 0"
+msgstr ""
+
+#: Controller/DecayingModelController.php:486
+#: View/DecayingModel/add.ctp:46
+msgid "Decay speed"
+msgstr "Rychlost rozkladu"
+
+#: Controller/DecayingModelController.php:487
+#: View/DecayingModel/add.ctp:46
+msgid "Decay speed at which an indicator will loose score"
+msgstr "Rychlost rozkladu, při kterém indikátor ztratí skóre"
+
+#: Controller/DecayingModelController.php:494
+#: View/DecayingModel/add.ctp:56
+msgid "Cutoff threshold"
+msgstr "Prahová hodnota přerušení"
+
+#: Controller/DecayingModelController.php:495
+#: View/DecayingModel/add.ctp:56
+msgid "Cutoff value at which an indicator will be marked as decayed instead of 0"
+msgstr "Hodnota přerušení, při které bude indikátor označen jako rozložen místo 0"
+
+#: Controller/DecayingModelController.php:563
+msgid "Error Processing Request, can't parse the body"
+msgstr "Chyba při zpracování požadavku, nelze analyzovat tělo"
+
+#: Controller/DecayingModelController.php:712
+msgid "This method is only accessible via AJAX."
+msgstr "Tato metoda je přístupná pouze přes AJAX."
 
 #: Controller/EventBlacklistsController.php:15
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "V této instanci není zapsání události na blacklist povoleno."
 
-#: Controller/EventBlacklistsController.php:73;95
+#: Controller/EventBlacklistsController.php:76;98
 msgid "Invalid event IDs."
-msgstr ""
+msgstr "Neplatné ID události."
 
-#: Controller/EventBlacklistsController.php:84
+#: Controller/EventBlacklistsController.php:87
 msgid "Failed to delete Event from EventBlacklist. Error: "
-msgstr ""
+msgstr "Nepodařilo se odstranit událost z EventBlacklistu. Chyba: "
 
-#: Controller/EventsController.php:855
+#: Controller/EventsController.php:894
 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:857
+#: Controller/EventsController.php:896
 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:863
+#: Controller/EventsController.php:902
 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:865
+#: Controller/EventsController.php:904
 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:1617
-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:1731
+msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
+msgstr "V současné době jste přihlášeni jako správce webu a chystáte se upravit událost, která nepatří do vaší organizace. To je v rozporu s modelem sdílení MISP. Pro každodenní práci použijte běžný uživatelský účet."
 
-#: Controller/EventsController.php:1827
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr "Nemáte oprávnění k vytváření událostí"
 
-#: Controller/EventsController.php:1833
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr "Nebyla přijata žádná platná data událostí."
 
-#: Controller/EventsController.php:1869
+#: Controller/EventsController.php:1984
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
-msgstr ""
+msgstr "Neplatná Skupina sdílení nebo neautorizovaná (Sync uživatel není obsažen ve skupině Sdílení)."
 
-#: Controller/EventsController.php:1873;1877
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
-msgstr ""
+msgstr "Neplatná Skupina sdílení nebo není autorizovaná."
 
-#: Controller/EventsController.php:1901
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr "Událost zablokována místním blacklistem."
 
-#: Controller/EventsController.php:1914;1994;2258
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "Událost byla uložena"
 
-#: Controller/EventsController.php:1922
+#: Controller/EventsController.php:2037
 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:1928
+#: Controller/EventsController.php:2043
 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:1930;2261
+#: Controller/EventsController.php:2045;2395
 msgid "The event could not be saved. Please, try again."
 msgstr "Událost nelze uložit. Prosím opakujte akci."
 
-#: Controller/EventsController.php:1970
+#: Controller/EventsController.php:2094
 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 ""
+msgstr "Vytvořená událost bude viditelná pro organizace, které mají účet na této platformě, ale není synchronizován s ostatními instancemi MISP, dokud nebude publikován."
 
-#: Controller/EventsController.php:2020
+#: Controller/EventsController.php:2142
 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:2021
+#: Controller/EventsController.php:2143
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
-msgstr ""
+msgstr "Nahrávání souboru se nezdařilo nebo soubor nemá očekávanou příponu (.xml / .json)."
 
-#: Controller/EventsController.php:2070
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr "STIX dokument importován, událost vytvořena: "
 
-#: Controller/EventsController.php:2073
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr "STIX dokument importován."
 
-#: Controller/EventsController.php:2076
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr "Není možné importovat STIX dokument: "
 
-#: Controller/EventsController.php:2083
+#: Controller/EventsController.php:2217
 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:2107;2192
+#: Controller/EventsController.php:2241;2326
 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:2115
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr "Vloženo neplatné ID události."
 
-#: Controller/EventsController.php:2120
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr "Nemáte oprávnění ke čtení vybrané události."
 
-#: Controller/EventsController.php:2410;2460;2530
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr "K tomu nemáte oprávnění."
 
-#: Controller/EventsController.php:2419
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr "Událost nebyla ublikována."
 
-#: Controller/EventsController.php:2472;2541
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
-msgstr ""
+msgstr "Nelze publikovat událost - chybí štítek pro požadované kategorizace: %s"
 
-#: Controller/EventsController.php:2624
+#: Controller/EventsController.php:2819
+msgid "You must specify a message."
+msgstr "Musíte zadat zprávu."
+
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr "E-mail byl odeslán reportérovi."
 
-#: Controller/EventsController.php:2626
-msgid "Sending of email failed"
-msgstr "Odesílání e-mailu se nezdařilo"
+#: Controller/EventsController.php:2847
+msgid "Sending of email failed."
+msgstr "Odeslání e-mailu se nezdařilo."
 
-#: Controller/EventsController.php:2671
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
-msgstr ""
+msgstr "Varování, jste přihlášeni jako administrátor stránek, jakýkoliv export, který vygenerujete, bude obsahovat ZCELA NEOMEZENOU datovou sadu. Pokud chcete generovat export pro svou vlastní organizaci, přihlaste se prosím s jiným uživatelem."
 
-#: Controller/EventsController.php:2759
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr "Tato funkce je vypnuta"
 
-#: Controller/EventsController.php:2801;4015;4083
-msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
-msgstr ""
-
-#: Controller/EventsController.php:2837
-msgid "Invalid Event ID."
-msgstr "Neplatné ID události."
-
-#: Controller/EventsController.php:2884
-msgid "No events found that match the passed parameters."
-msgstr ""
-
-#: Controller/EventsController.php:2909
-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:2984
-msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
-msgstr ""
-
-#: Controller/EventsController.php:3003
-#: Model/Attribute.php:2069
-msgid "Invalid hash type."
-msgstr "Neplatný typ hashe."
-
-#: Controller/EventsController.php:3106
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr "Tento typ souboru není povolen."
 
-#: Controller/EventsController.php:3126
-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:3134
+msgid "Problem with writing the IoC file. Please report to site admin."
+msgstr "Problém se zapsáním IoC souboru. Nahlaste prosím administrátorovi webu."
 
-#: Controller/EventsController.php:3220
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr "Toto není platný MISP XML soubor."
 
-#: Controller/EventsController.php:3383
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr "Není implementováno"
 
-#: Controller/EventsController.php:3401;3405
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr "Neplatná událost nebo není povoleno."
 
-#: Controller/EventsController.php:3425;3495
-msgid "You don't have the privileges to access this."
-msgstr ""
-
-#: Controller/EventsController.php:3706
-#: Controller/TagCollectionsController.php:311
+#: Controller/EventsController.php:3484
+#: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr "Neplatná značka."
 
-#: Controller/EventsController.php:3722
-#: Controller/TagCollectionsController.php:327
+#: Controller/EventsController.php:3500
+#: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
-msgstr ""
+msgstr "Štítek je již připojen k této události."
 
-#: Controller/EventsController.php:3733;3739
-#: Controller/TagCollectionsController.php:334
+#: Controller/EventsController.php:3514
+msgid "Tag is not allowed due to taxonomy exclusivity settings"
+msgstr "Tag není povolen z důvodu nastavení výlučné kategorizace"
+
+#: Controller/EventsController.php:3545;3551
+#: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr "Značky přidány."
 
-#: Controller/EventsController.php:3735
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr "Nelze přidat značku."
 
-#: Controller/EventsController.php:3741
-#: Controller/TagCollectionsController.php:342
+#: Controller/EventsController.php:3553
+#: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr "Všechny značky jsou již přítomny, nic k přidání."
 
-#: Controller/EventsController.php:3986;5265;5287;5785;5789
-#: Controller/ObjectsController.php:46;190;194;618;1028
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
+#: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "Neplatná událost."
 
-#: Controller/EventsController.php:4146;4176;4192
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr "K tomu nemáte oprávnění."
 
-#: Controller/EventsController.php:4257;4397
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr "Neplatné ID"
 
-#: Controller/EventsController.php:4261;4401;4948
+#: Controller/EventsController.php:3987;4128;4703
 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:4502;4509
+#: Controller/EventsController.php:4134
+msgid "Freetext Import"
+msgstr "Import Freetext"
+
+#: Controller/EventsController.php:4140
+msgid "Populate using a Template"
+msgstr "Vyplnit pomocí šablony"
+
+#: Controller/EventsController.php:4146
+msgid "OpenIOC Import"
+msgstr "Import OpenIOC"
+
+#: Controller/EventsController.php:4151
+msgid "ThreatConnect Import"
+msgstr "Import ThreatConnect"
+
+#: Controller/EventsController.php:4156
+msgid "(Experimental) Forensic analysis - Mactime"
+msgstr "(Experimentální) Forenzní analýza - Mactime"
+
+#: Controller/EventsController.php:4175
+msgid "MISP standard (recommended exchange format - lossless)"
+msgstr "MISP standard (doporučený výměnný formát – bezztrátový)"
+
+#: Controller/EventsController.php:4181
+msgid "STIX 1.1.1 format (lossy)"
+msgstr "Formát STIX 1.1.1 (ztrátový)"
+
+#: Controller/EventsController.php:4186
+msgid "STIX 2.0 format (lossy)"
+msgstr "Formát STIX. 2.0 (ztrátový)"
+
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr "Prosím POST vzorky, jak je popsáno na stránce automatizace."
 
-#: Controller/EventsController.php:4538
+#: Controller/EventsController.php:4264
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
-msgstr ""
+msgstr "Nebyly obdrženy žádné vzorky nebo vzorky nejsou ve správném formátu. Podívejte se na API dokumentaci na stránce automatizace."
 
-#: Controller/EventsController.php:4546
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "Událost nebyla nalezena"
 
-#: Controller/EventsController.php:4569
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "Událost nebyla nalezena."
 
-#: Controller/EventsController.php:4579
+#: Controller/EventsController.php:4305
 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 ""
+msgstr "Úroveň distribuce 5 není podporována při nahrávání vzorku bez zadání ID události. Úroveň distribuce 5 má převzít úroveň distribuce existující události."
 
-#: Controller/EventsController.php:4604
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
-msgstr ""
+msgstr "Vytvoření nové události s poskytnutými informacemi selhalo."
 
-#: Controller/EventsController.php:4743;4764;4797;4822;4847;4877;4898
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr "Neplatný typ."
 
-#: Controller/EventsController.php:5012
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr "Neplatná metoda."
 
-#: Controller/EventsController.php:5094
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr "%s služeb není povoleno."
 
-#: Controller/EventsController.php:5098
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
-msgstr ""
+msgstr "Atribut nebyl nalezen nebo nemáte oprávnění k jeho zobrazení."
 
-#: Controller/EventsController.php:5103
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
-msgstr ""
+msgstr "Pro tento atribut nebyly nalezeny žádné platné možnosti %s."
 
-#: Controller/EventsController.php:5158;5204
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
-msgstr ""
+msgstr "Služba %s není dostupná."
 
-#: Controller/EventsController.php:5170
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
-msgstr ""
+msgstr ": Obohaceno pomocí "
 
-#: Controller/EventsController.php:5221
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
-msgstr ""
+msgstr ": Obohaceno pomocí %s"
 
-#: Controller/EventsController.php:5373
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr "Importovat služby se nedaří."
 
-#: Controller/EventsController.php:5598
+#: Controller/EventsController.php:5222;5236
+#: Controller/PostsController.php:60;84
+#: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
+msgid "You don't have permission to do that."
+msgstr "K tomu nemáte oprávnění."
+
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr "Neplatné ID."
 
-#: Controller/EventsController.php:5646
-#: Controller/ShadowAttributesController.php:313;318;534
+#: Controller/EventsController.php:5411
+#: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr "Neplatná událost"
 
-#: Controller/EventsController.php:5667
+#: Controller/EventsController.php:5432
 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."
 
-#: Controller/EventsController.php:5918
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
-msgstr ""
+msgstr "%s událost(í) bylo smazáno."
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
+msgstr "K tomu nemáte potřebná oprávnění."
+
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
 msgstr ""
 
-#: Controller/FeedsController.php:238;337
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr "Přidán informační kanál."
 
-#: Controller/FeedsController.php:246
-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:291
+msgid "Feed could not be added. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:271;372;394;516;551;755
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr "Neplatný kanál."
 
-#: Controller/FeedsController.php:345
-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:368
-msgid "This action requires a post request."
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:401;520
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
+#: Controller/SharingGroupsController.php:237
+#: Controller/UsersController.php:1044
+msgid "Action not allowed, post or delete request expected."
+msgstr "Akce neni povolena, byl očekáván požadavek na post nebo smazání."
+
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
-msgstr ""
+msgstr "Feed není momentálně povolen. Ujistěte se, že jste jej povolily."
 
-#: Controller/FeedsController.php:414;480
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
-msgstr ""
+msgstr "Začíná se načítání z feedu."
 
-#: Controller/FeedsController.php:425
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
-msgstr ""
+msgstr "Pull byl přidán do fronty pro spuštění v pozadí."
 
-#: Controller/FeedsController.php:430;432
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
-msgstr ""
+msgstr "Načtení feedu se nezdařilo."
 
-#: Controller/FeedsController.php:436;497
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
-msgstr ""
+msgstr "Načítání feedu bylo úspěšně dokončeno."
 
-#: Controller/FeedsController.php:527
-msgid "Event added."
-msgstr "Událost přidána."
+#: Controller/FeedsController.php:563
+msgid "No feed enabled."
+msgstr "Žádný feed není povolen."
 
-#: Controller/FeedsController.php:530
-msgid "Event already up to date."
-msgstr "Událost je již aktuální."
-
-#: Controller/FeedsController.php:532
-msgid "Event updated."
-msgstr "Událost byla aktualizována."
-
-#: Controller/FeedsController.php:536
-msgid "Could not %s event."
-msgstr ""
-
-#: Controller/FeedsController.php:539
+#: Controller/FeedsController.php:587;606
+#: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr "Stahování se nezdařilo."
 
-#: Controller/FeedsController.php:631
-msgid "Feed could not be fetched. The HTTP error code returned was: "
-msgstr ""
+#: Controller/FeedsController.php:594
+msgid "Event added."
+msgstr "Událost přidána."
 
-#: Controller/FeedsController.php:670;721
+#: Controller/FeedsController.php:597
+msgid "Event already up to date."
+msgstr "Událost je již aktuální."
+
+#: Controller/FeedsController.php:599
+msgid "Event updated."
+msgstr "Událost byla aktualizována."
+
+#: Controller/FeedsController.php:603
+msgid "Could not %s event."
+msgstr "Nemohu %s událost."
+
+#: Controller/FeedsController.php:700
+msgid "Feed could not be fetched. The HTTP error code returned was: "
+msgstr "Feed nelze načíst. Byl vrácen HTTP chybový kód: "
+
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr "Neplatný kanál."
 
-#: Controller/FeedsController.php:787
-msgid "This event is blocked by the Feed filters."
-msgstr ""
-
-#: Controller/FeedsController.php:789
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
-msgstr ""
+msgstr "Nelze stáhnout vybranou událost"
 
-#: Controller/FeedsController.php:825;829
+#: Controller/FeedsController.php:865
+msgid "This event is blocked by the Feed filters."
+msgstr "Tato událost je blokována filtry feedu."
+
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr "Neplatný kanál."
 
-#: Controller/FeedsController.php:850
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
-msgstr ""
+msgstr "Jsou povoleny pouze požadavky POST."
 
-#: Controller/FeedsController.php:854
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr "Kanál nebyl nalezen."
 
-#: Controller/FeedsController.php:863
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr "Data byla stažena."
 
-#: Controller/FeedsController.php:865
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
-msgstr ""
+msgstr "Nelze stáhnout vybraná data. Důvod: %s"
 
-#: Controller/FeedsController.php:882
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
-msgstr ""
+msgstr "Zahájení ukládání feedu do mezipaměti."
 
-#: Controller/FeedsController.php:897
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
-msgstr ""
+msgstr "Ukládání feedů selhalo."
 
-#: Controller/FeedsController.php:900
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
-msgstr ""
+msgstr "Uložení feedu do mezipaměti proběhlo úspěšně."
 
-#: Controller/FeedsController.php:934
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
-msgstr ""
+msgstr "Přijat neplatný feed."
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
-msgstr ""
+msgstr "Všechny clustery"
 
-#: Controller/GalaxiesController.php:167
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
-msgstr ""
+msgstr "Všechny jmenné prostory"
 
-#: Controller/GalaxiesController.php:293
+#: Controller/GalaxiesController.php:337
+msgid "Failed to parse request or no clusters picked."
+msgstr "Nepodařilo se analyzovat požadavek nebo nebyly vybrány žádné clustery."
+
+#: Controller/GalaxiesController.php:340
 msgid "Failed to parse request."
-msgstr ""
-
-#: Controller/GalaxiesController.php:296
-msgid "No clusters picked."
-msgstr ""
+msgstr "Nepodařilo se zpracovat požadavek."
 
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
@@ -806,47 +1108,48 @@ msgstr "Všechny úlohy byly odstraněny"
 
 #: Controller/NewsController.php:51
 msgid "News item added."
-msgstr ""
+msgstr "Novinky byly přidány."
 
 #: Controller/NewsController.php:54
 msgid "The news item could not be added."
-msgstr ""
+msgstr "Položka novinek nemohla být přidána."
 
 #: Controller/NewsController.php:68
 msgid "News item updated."
-msgstr ""
+msgstr "Novinky aktualizovány."
 
 #: Controller/NewsController.php:71
 msgid "Could not update news item."
-msgstr ""
+msgstr "Položku novinek nelze aktualizovat."
 
 #: Controller/NewsController.php:89
 msgid "News item deleted."
-msgstr ""
+msgstr "Novinky byly smazány."
 
 #: Controller/NewsController.php:92
 msgid "News item could not be deleted."
-msgstr ""
+msgstr "Novinky nelze odstranit."
 
 #: Controller/ObjectReferencesController.php:37
+#: Controller/ObjectsController.php:511;607;650;671;686;757;768;786
 msgid "Invalid object"
 msgstr "Neplatný objekt"
 
-#: Controller/ObjectReferencesController.php:161
+#: Controller/ObjectReferencesController.php:163
 msgid "Invalid object reference"
 msgstr "Neplatný odkaz na objekt"
 
 #: Controller/ObjectTemplatesController.php:31
 msgid "All Objects"
-msgstr ""
+msgstr "Všechny objekty"
 
 #: Controller/ObjectTemplatesController.php:99
 msgid "Invalid object template"
-msgstr ""
+msgstr "Neplatná šablona objektu"
 
 #: Controller/ObjectTemplatesController.php:103
 msgid "Invalid object template id."
-msgstr ""
+msgstr "Neplatné ID šablony objektu."
 
 #: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
@@ -854,9 +1157,9 @@ msgstr "Šablona objektu byla smazána"
 
 #: Controller/ObjectsController.php:29
 msgid "This action can only be reached via POST requests"
-msgstr ""
+msgstr "Tuto akci lze dosáhnout pouze prostřednictvím POST požadavků"
 
-#: Controller/ObjectsController.php:69;82;1055
+#: Controller/ObjectsController.php:69;82;1272
 msgid "Invalid sharing group."
 msgstr "Neplatná skupina sdílení."
 
@@ -864,43 +1167,67 @@ msgstr "Neplatná skupina sdílení."
 msgid "You don't have permissions to create objects."
 msgstr "Nemáte oprávnění k vytvoření objektů."
 
-#: Controller/ObjectsController.php:181;1040;1092
+#: Controller/ObjectsController.php:181;1257;1309
 #: Model/Template.php:25
 msgid "Invalid template."
 msgstr "Neplatná šablona."
 
-#: Controller/ObjectsController.php:364
-msgid "You don't have permissions to edit objects."
-msgstr "Nemáte oprávnění k editaci objektů."
+#: Controller/ObjectsController.php:295;424;430
+msgid "Object could not be saved."
+msgstr "Objekt nelze uložit."
 
-#: Controller/ObjectsController.php:378;389;607
-#: Model/Event.php:6207
+#: Controller/ObjectsController.php:373;1006
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr "Neplatný objekt."
 
-#: Controller/ObjectsController.php:601
-msgid "You don't have permissions to delete objects."
-msgstr ""
+#: Controller/ObjectsController.php:377
+msgid "Insufficient permissions to edit this object."
+msgstr "Nedostatečné právnění k editaci tohoto objektu."
 
-#: Controller/ObjectsController.php:711;718;722
+#: Controller/ObjectsController.php:449
+msgid "Object attributes saved."
+msgstr "Atributy objektu byly uloženy."
+
+#: Controller/ObjectsController.php:518
+msgid "This function can only be accessed via POST or PUT"
+msgstr "K této funkci lze přistupovat pouze pomocí POST nebo PUT"
+
+#: Controller/ObjectsController.php:711
+msgid "Invalid template"
+msgstr "Neplatná šablona"
+
+#: Controller/ObjectsController.php:789
+msgid "Invalid fields"
+msgstr "Neplatná pole"
+
+#: Controller/ObjectsController.php:796
+msgid "Invalid field"
+msgstr "Neplatné pole"
+
+#: Controller/ObjectsController.php:822
+msgid "You don't have permissions to delete objects."
+msgstr "Nemáte oprávnění k odstranění objektů."
+
+#: Controller/ObjectsController.php:926;933;937
 msgid "Object not found or not authorised."
 msgstr "Objekt nebyl nalezen nebo není povolen."
 
-#: Controller/ObjectsController.php:986
+#: Controller/ObjectsController.php:1203
 msgid "%s objects successfully reconstructed."
 msgstr "%s objektů bylo úspěšně obnoveno."
 
-#: Controller/ObjectsController.php:996;1032
+#: Controller/ObjectsController.php:1213;1249
 msgid "This action can only be reached via AJAX."
-msgstr ""
+msgstr "Tuto akci lze dosáhnout pouze prostřednictvím AJAX."
 
-#: Controller/ObjectsController.php:1073
+#: Controller/ObjectsController.php:1290
 msgid "Failed to create an Object from Attributes. Error: "
-msgstr ""
+msgstr "Nepodařilo se vytvořit objekt z atributů. Chyba: "
 
-#: Controller/ObjectsController.php:1084
+#: Controller/ObjectsController.php:1301
 msgid "No Attribute selected."
-msgstr ""
+msgstr "Nebyl vybrán žádný atribut."
 
 #: Controller/OrgBlacklistsController.php:15
 msgid "Organisation Blacklisting is not currently enabled on this instance."
@@ -908,63 +1235,59 @@ msgstr "V této instanci není zapsání organizace na blacklist povoleno."
 
 #: Controller/OrganisationsController.php:28
 msgid "This feature is disabled on this instance for normal users."
-msgstr ""
+msgstr "Tato funkce je v této instanci zakázána pro běžné uživatele."
 
 #: Controller/OrganisationsController.php:133
 msgid "The organisation has been successfully added."
-msgstr ""
+msgstr "Organizace byla úspěšně přidána."
 
 #: Controller/OrganisationsController.php:140
 msgid "The organisation could not be added."
-msgstr ""
+msgstr "Organizace nemohla být přidána."
 
-#: Controller/OrganisationsController.php:155;234;287;314;347
+#: Controller/OrganisationsController.php:163;296;302
+msgid "Invalid organisation."
+msgstr "Neplatná organizace."
+
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
 msgid "Invalid organisation"
-msgstr ""
+msgstr "Neplatná organizace"
 
-#: Controller/OrganisationsController.php:194
+#: Controller/OrganisationsController.php:208
 msgid "Organisation updated."
-msgstr ""
+msgstr "Organizace byla aktualizována."
 
-#: Controller/OrganisationsController.php:209
+#: Controller/OrganisationsController.php:223
 msgid "The organisation could not be updated."
-msgstr ""
+msgstr "Organizace nemohla být aktualizována."
 
-#: Controller/OrganisationsController.php:230
-msgid "Action not allowed, post request expected."
-msgstr ""
-
-#: Controller/OrganisationsController.php:251
+#: Controller/OrganisationsController.php:272
 msgid "Organisation deleted"
 msgstr "Organizace smazána"
 
-#: Controller/OrganisationsController.php:258
+#: Controller/OrganisationsController.php:279
 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 ""
+msgstr "Organizace nemohla být odstraněna. Organizace by nikdy neměla být smazána, místo toho by měly zvážit jejich přesun do seznamu známých vzdálených organizací. Pokud jste si jisti, že chcete odstranit organizaci a že jste si vědomi jejího dopadu, před smazáním se ujistěte, že neexistují žádní uživatelé nebo události, které jsou s touto organizací stále spojeny."
 
-#: Controller/OrganisationsController.php:275;281
-msgid "Invalid organisation."
-msgstr ""
-
-#: Controller/OrganisationsController.php:352
+#: Controller/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
-msgstr ""
+msgstr "Pro tuto organizaci nebyla vytvořena žádná vstupní stránka."
 
-#: Controller/OrganisationsController.php:401
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
-msgstr ""
+msgstr "Tato akce je omezena na synchronizaci uživatelů"
 
-#: Controller/OrganisationsController.php:423
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
-msgstr ""
+msgstr "Organizace byla úspěšně sloučena."
 
-#: Controller/OrganisationsController.php:426
+#: Controller/OrganisationsController.php:447
 msgid "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"
-msgstr ""
+msgstr "Při slučování organizací došlo k chybě. Pro více informací o tom, co se pokazilo, se podívejte na protokoly auditu. Pokud chcete změny vrátit zpět, můžete najít soubor .sql"
 
 #: Controller/PostsController.php:54
 msgid "Discussion about Event #"
-msgstr ""
+msgstr "Diskuse o události #"
 
 #: Controller/PostsController.php:80
 msgid "Invalid thread"
@@ -972,7 +1295,7 @@ msgstr "Neplatný proces"
 
 #: Controller/PostsController.php:115
 msgid "Cannot post an empty message."
-msgstr ""
+msgstr "Nelze odeslat prázdnou zprávu."
 
 #: Controller/PostsController.php:176
 msgid "Post added"
@@ -980,7 +1303,7 @@ msgstr "Příspěvek přidán"
 
 #: Controller/PostsController.php:189
 msgid "The post could not be added."
-msgstr ""
+msgstr "Příspěvek nelze přidat."
 
 #: Controller/PostsController.php:208;256
 msgid "Invalid post"
@@ -988,27 +1311,27 @@ msgstr "Neplatný příspěvek"
 
 #: Controller/PostsController.php:211
 msgid "This is not your event."
-msgstr ""
+msgstr "Toto není vaše událost."
 
 #: Controller/PostsController.php:219
 msgid "Post edited"
-msgstr ""
+msgstr "Příspěvek upraven"
 
 #: Controller/PostsController.php:240
 msgid "The post could not be edited. Please, try again."
-msgstr ""
+msgstr "Příspěvek nelze upravit. Zkuste to prosím znovu."
 
 #: Controller/PostsController.php:261
 msgid "This post doesn't belong to you, so you cannot delete it."
-msgstr ""
+msgstr "Tento příspěvek vám nepatří, takže jej nemůžete odstranit."
 
 #: Controller/PostsController.php:274
 msgid "Post and thread deleted"
-msgstr ""
+msgstr "Příspěvek a vlákno odstraněno"
 
 #: Controller/PostsController.php:283
 msgid "Post deleted"
-msgstr ""
+msgstr "Příspěvek smazán"
 
 #: Controller/RegexpController.php:27
 msgid "The Regexp has been saved."
@@ -1024,7 +1347,7 @@ msgstr "Regulární výrazy byly uloženy."
 
 #: 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 ""
+msgstr "Nelze vytvořit Regex záznam, protože nebyly vybrány žádné typy. Buď zkontrolujte \"Vše\" nebo zkontrolujte typy, které si přejete Regex ovlivnit."
 
 #: Controller/RegexpController.php:211
 msgid "All done! Number of changed attributes: "
@@ -1036,11 +1359,11 @@ msgstr "Dokončeno! Nalezeno a vyčištěno "
 
 #: Controller/RestClientHistoryController.php:63
 msgid "Invalid entry."
-msgstr ""
+msgstr "Neplatný záznam."
 
 #: Controller/RestClientHistoryController.php:66
 msgid "Entry removed."
-msgstr ""
+msgstr "Záznam odstraněn."
 
 #: Controller/RolesController.php:33
 msgid "Invalid role"
@@ -1048,7 +1371,7 @@ msgstr "Neplatná funkce"
 
 #: Controller/RolesController.php:59;100
 msgid "The Role has been saved"
-msgstr ""
+msgstr "Role byla uložena"
 
 #: Controller/RolesController.php:67;108
 msgid "The Role could not be saved. Please, try again."
@@ -1056,7 +1379,7 @@ msgstr "Funkci nelze uložit. Prosím opakujte akci."
 
 #: Controller/RolesController.php:85;151
 msgid "Invalid Role"
-msgstr ""
+msgstr "Neplatná role"
 
 #: Controller/RolesController.php:157
 msgid "Role deleted"
@@ -1064,352 +1387,438 @@ msgstr "Funkce odstraněna"
 
 #: Controller/RolesController.php:164
 msgid "Role could not be deleted"
-msgstr ""
+msgstr "Roli není možné odstranit"
 
 #: Controller/RolesController.php:200
 msgid "Default role set."
-msgstr ""
+msgstr "Výchozí role nastavena."
 
 #: Controller/RolesController.php:200
 msgid "Default role unset."
-msgstr ""
+msgstr "Výchozí role byla zrušena."
 
-#: Controller/ServersController.php:225;421
+#: Controller/ServersController.php:237;436
 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:235;431
+#: Controller/ServersController.php:247;446
 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:289;461
+#: Controller/ServersController.php:302;476
 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:301
+#: Controller/ServersController.php:314
 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:336;517;1997
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr "Server byl uložen"
 
-#: Controller/ServersController.php:343;524
+#: Controller/ServersController.php:357;539
 msgid "The server could not be saved. Please, try again."
 msgstr "Server nelze uložit. Prosím opakujte akci."
 
-#: Controller/ServersController.php:396;593;618;627;687;1403
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: Controller/ServersController.php:478
+#: Controller/ServersController.php:493
 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:600
+#: Controller/ServersController.php:604;2183;2225
+msgid "This endpoint expects POST requests."
+msgstr "Tento koncový bod očekává POST požadavky."
+
+#: Controller/ServersController.php:612
+msgid "You don't have the privileges to do that."
+msgstr "K tomu nemáte potřebná oprávnění."
+
+#: Controller/ServersController.php:621
 msgid "Server deleted"
 msgstr "Server smazán"
 
-#: Controller/ServersController.php:603
+#: Controller/ServersController.php:630
 msgid "Server was not deleted"
 msgstr "Server nebyl odstraněn"
 
-#: Controller/ServersController.php:630
+#: Controller/ServersController.php:668
 msgid "Pull setting not enabled for this server."
 msgstr "Nastavení pro stahování není na tomto serveru povoleno."
 
-#: Controller/ServersController.php:653
+#: Controller/ServersController.php:692
 msgid "Pulling."
-msgstr ""
+msgstr "Pulling."
 
-#: Controller/ServersController.php:663
+#: Controller/ServersController.php:702
 msgid "Pull queued for background execution. Job ID: %s"
-msgstr ""
+msgstr "Stáhnout do fronty pro provedení na pozadí. ID úlohy: %s"
 
-#: Controller/ServersController.php:700
+#: Controller/ServersController.php:748
 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:713
+#: Controller/ServersController.php:761
 msgid "Push complete. %s events pushed, %s events could not be pushed."
 msgstr ""
 
-#: Controller/ServersController.php:728
+#: Controller/ServersController.php:776
 msgid "Pushing."
 msgstr ""
 
-#: Controller/ServersController.php:738
+#: Controller/ServersController.php:786
 msgid "Push queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:766
+#: Controller/ServersController.php:814
 msgid "Filename not allowed"
-msgstr ""
+msgstr "Název souboru není povolen"
 
-#: Controller/ServersController.php:771
+#: Controller/ServersController.php:819
 msgid "Incorrect extension or empty file."
-msgstr ""
+msgstr "Nesprávná přípona nebo prázdný soubor."
 
-#: Controller/ServersController.php:853
+#: Controller/ServersController.php:901
 msgid "No organisation selected."
-msgstr ""
+msgstr "Nebyla vybrána žádná organizace."
 
-#: Controller/ServersController.php:869;870;871;872;873;874;875;876;877;878;879;880;881;882;883
-#: View/Elements/healthElements/diagnostics.ctp:26;170;184;209;269
+#: Controller/ServersController.php:917;918;919;920;921;922;923;924;925;926;927;928;929;930;931
+#: View/Elements/healthElements/diagnostics.ctp:26;170;184;271;331
 #: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/submoduleStatus.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
-#: Controller/ServersController.php:869
+#: Controller/ServersController.php:917
 msgid "not found"
-msgstr ""
+msgstr "nenalezeno"
 
-#: Controller/ServersController.php:869
+#: Controller/ServersController.php:917
 msgid "is not writeable"
-msgstr ""
+msgstr "není zapisovatelný"
 
-#: Controller/ServersController.php:870
+#: Controller/ServersController.php:918
 msgid "not readable"
-msgstr ""
+msgstr "nečitelný"
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: settings not set"
-msgstr ""
+msgstr "CHYBA: nastavení není nastaveno"
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: Failed to load GnuPG"
-msgstr ""
+msgstr "CHYBA: Nepodařilo se načíst GnuPG"
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: Issues with the key/passphrase"
-msgstr ""
+msgstr "CHYBA: Problémy s klíčem/heslem"
 
-#: Controller/ServersController.php:871
-msgid "FAIL: encrypt failed"
-msgstr ""
+#: Controller/ServersController.php:919
+msgid "FAIL: sign failed"
+msgstr "CHYBA: podpis se nezdařil"
 
-#: Controller/ServersController.php:872
+#: Controller/ServersController.php:920
 msgid "not configured (so not tested)"
-msgstr ""
+msgstr "není nakonfigurováno (takže není testováno)"
 
-#: Controller/ServersController.php:872
+#: Controller/ServersController.php:920
 msgid "Getting URL via proxy failed"
-msgstr ""
+msgstr "Získání URL přes proxy selhalo"
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "not enabled (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "Python ZeroMQ library not installed correctly."
-msgstr ""
+msgstr "Python ZeroMQ knihovna není správně nainstalována."
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "ZeroMQ script not running."
-msgstr ""
+msgstr "Skript ZeroMQ není spuštěn."
 
-#: Controller/ServersController.php:874
+#: Controller/ServersController.php:922
 msgid "Some of the libraries related to STIX are not installed. Make sure that all libraries listed below are correctly installed."
-msgstr ""
+msgstr "Některé knihovny související se STIX nejsou nainstalovány. Ujistěte se, že všechny níže uvedené knihovny jsou správně nainstalovány."
 
-#: Controller/ServersController.php:875
+#: Controller/ServersController.php:923
 msgid "Incorrect STIX version installed, found $current, expecting $expected"
-msgstr ""
+msgstr "Nesprávná STIX verze nainstalována, nalezeno $current, očekáváno $expected"
 
-#: Controller/ServersController.php:876
+#: Controller/ServersController.php:924
 msgid "Incorrect STIX2 version installed, found $current, expecting $expected"
-msgstr ""
+msgstr "Nesprávná nainstalovaná verze STIX2, nalezena $current, očekává se $expected"
 
-#: Controller/ServersController.php:877
+#: Controller/ServersController.php:925
 msgid "Incorrect CyBox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:878
+#: Controller/ServersController.php:926
 msgid "Incorrect mixbox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:879
+#: Controller/ServersController.php:927
 msgid "Incorrect maec version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:880
+#: Controller/ServersController.php:928
 msgid "Incorrect PyMISP version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:881
+#: Controller/ServersController.php:929
 msgid "Incorrect plyara version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 #: View/Events/filter_event_index.ctp:32;188
 #: View/Pages/doc/using_the_system.ctp:68;173
 msgid "High"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 msgid "Alternative setting used"
-msgstr ""
+msgstr "Použito alternativní nastavení"
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 msgid "Test failed"
-msgstr ""
+msgstr "Test se nezdařil"
 
-#: Controller/ServersController.php:883
+#: Controller/ServersController.php:931
 msgid "System not enabled"
-msgstr ""
+msgstr "Systém není povolen"
 
-#: Controller/ServersController.php:883
+#: Controller/ServersController.php:931
 msgid "No modules found"
-msgstr ""
+msgstr "Nebyly nalezeny žádné moduly"
 
-#: Controller/ServersController.php:890
+#: Controller/ServersController.php:938
 msgid "MISP will not operate correctly or will be unsecure until these issues are resolved."
-msgstr ""
+msgstr "MISP nebude fungovat správně nebo nebude bezpečný, dokud nebudou tyto problémy vyřešeny."
 
-#: Controller/ServersController.php:894
+#: Controller/ServersController.php:942
 msgid "Some of the features of MISP cannot be utilised until these issues are resolved."
-msgstr ""
+msgstr "Některé funkce MISP nelze použít, dokud nebudou tyto otázky vyřešeny."
 
-#: Controller/ServersController.php:898
+#: Controller/ServersController.php:946
 msgid "There are some optional tweaks that could be done to improve the looks of your MISP instance."
 msgstr ""
 
-#: Controller/ServersController.php:1106
+#: Controller/ServersController.php:1165
+msgid "Only one `update` worker can run at a time"
+msgstr ""
+
+#: Controller/ServersController.php:1177
 msgid "Worker start signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1121
+#: Controller/ServersController.php:1192
 msgid "Worker stop signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1191
+#: Controller/ServersController.php:1249
+msgid "This setting is redacted."
+msgstr "Toto nastavení je opraveno."
+
+#: Controller/ServersController.php:1274
 msgid "This setting can only be edited via the CLI."
+msgstr "Toto nastavení lze upravit pouze prostřednictvím CLI."
+
+#: Controller/ServersController.php:1365;1377
+msgid "Restarting workers."
 msgstr ""
 
-#: Controller/ServersController.php:1300
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "Soubor nebyl nalezen."
 
-#: Controller/ServersController.php:1306
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "Soubor nebylo možné odstranit."
 
-#: Controller/ServersController.php:1329;1345
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr "Odeslání se nezdařilo."
 
-#: Controller/ServersController.php:1337
+#: Controller/ServersController.php:1438
 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/ServersController.php:1896
+#: Controller/ServersController.php:1505
+msgid "Invalid user or user not found."
+msgstr "Neplatný uživatel nebo uživatel nebyl nalezen."
+
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
-msgstr ""
+msgstr "Spouštění mezipaměti serveru."
 
-#: Controller/ServersController.php:1911
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
-msgstr ""
+msgstr "Načítání serverů do mezipaměti se nezdařilo."
 
-#: Controller/ServersController.php:1914
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
+msgstr "Načítání serverů do mezipaměti bylo úspěšně dokončeno."
+
+#: Controller/ServersController.php:2100
+msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2004
+#: Controller/ServersController.php:2109
+msgid "Configured host org not found. Please make sure that the setting is current on the instance."
+msgstr ""
+
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:212
-msgid "Moving of the file that this attachment references failed."
-msgstr "Přesun souboru, na který tato příloha odkazuje se nezdařil."
+#: Controller/ServersController.php:2194
+msgid "API key updated."
+msgstr ""
 
-#: Controller/ShadowAttributesController.php:281
+#: Controller/ServersController.php:2207
+msgid "ID has to be a valid server connection"
+msgstr ""
+
+#: Controller/ServersController.php:2210
+msgid "Invalid direction. Valid options: "
+msgstr ""
+
+#: Controller/ServersController.php:2214
+msgid "Priority changed."
+msgstr "Priorita se změnila."
+
+#: Controller/ServersController.php:2217
+msgid "Priority could not be changed."
+msgstr ""
+
+#: Controller/ServersController.php:2228
+msgid "Only site admin accounts can release the update lock."
+msgstr "Pouze správce webu může uvolnit zámek aktualizací."
+
+#: Controller/ServersController.php:2238
+msgid "Only site admin accounts get the DB schema diagnostic."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:263
 msgid "Could not discard proposal."
 msgstr "Návrh se nepodařilo smazat."
 
-#: Controller/ShadowAttributesController.php:342
+#: Controller/ShadowAttributesController.php:324
 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:390;393;402
+#: Controller/ShadowAttributesController.php:372;375;384
 msgid "The lines"
 msgstr "Řádky"
 
-#: Controller/ShadowAttributesController.php:442
+#: Controller/ShadowAttributesController.php:424
 msgid "The proposal has been saved"
 msgstr "N8vrh byl uložena"
 
-#: Controller/ShadowAttributesController.php:454;763
+#: Controller/ShadowAttributesController.php:436;749
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:456
+#: Controller/ShadowAttributesController.php:438
 msgid "The proposal could not be saved. Please, try again."
 msgstr "Návrh nelze uložit. Prosím opakujte akci."
 
-#: Controller/ShadowAttributesController.php:493
+#: Controller/ShadowAttributesController.php:475
 msgid "Invalid Proposal"
 msgstr "Neplatný návrh"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:505
 msgid "Proposal not an attachment or malware-sample"
 msgstr "Návrh není přílohou nebo vzorkem malware"
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:601
 msgid "The attachment has been uploaded"
 msgstr "Příloha byla úspěšně nahrána"
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:603
 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:606
 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:740
 msgid "The proposed Attribute has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:751
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:896;906
+#: Controller/ShadowAttributesController.php:884;894
 msgid "Invalid proposal."
 msgstr "Neplatný návrh."
 
-#: Controller/ShadowAttributesController.php:950
-msgid "No proposals found or invalid event."
-msgstr ""
-
-#: Controller/ShadowAttributesController.php:982;1018
+#: Controller/ShadowAttributesController.php:1010
 msgid "This feature is only available using the API to Sync users"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:985
+#: Controller/ShadowAttributesController.php:1013
 msgid "Invalid UUID"
 msgstr "Neplatný identifikátor UUID"
 
-#: Controller/ShadowAttributesController.php:1021
-msgid "This feature is only available using POST requests"
-msgstr ""
-
-#: Controller/SharingGroupsController.php:237
+#: Controller/SharingGroupsController.php:251
 msgid "Sharing Group deleted"
 msgstr ""
 
-#: Controller/SharingGroupsController.php:242
+#: Controller/SharingGroupsController.php:256
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr ""
 
+#: Controller/SightingdbController.php:32
+msgid "SightingDB connection added."
+msgstr ""
+
+#: Controller/SightingdbController.php:32
+msgid "SightingDB connection could not be added."
+msgstr ""
+
+#: Controller/SightingdbController.php:49;99;143
+msgid " Reason: %s"
+msgstr ""
+
+#: Controller/SightingdbController.php:71;123
+#: Model/Sightingdb.php:325
+msgid "Invalid SightingDB entry."
+msgstr ""
+
+#: Controller/SightingdbController.php:87
+msgid "SightingDB connection updated."
+msgstr ""
+
+#: Controller/SightingdbController.php:87
+msgid "SightingDB connection could not be updated."
+msgstr ""
+
+#: Controller/SightingdbController.php:128
+msgid "SightingDB connection removed."
+msgstr ""
+
+#: Controller/SightingdbController.php:130
+msgid "SightingDB connection could not be removed."
+msgstr ""
+
+#: Controller/SightingdbController.php:196
+msgid "Pass a valid SightingDB ID"
+msgstr ""
+
 #: Controller/SightingsController.php:83
 msgid "Could not add the Sighting. Reason: "
 msgstr ""
 
-#: Controller/SightingsController.php:93;96
+#: Controller/SightingsController.php:96
 msgid "Sighting added"
 msgstr ""
 
@@ -1418,6 +1827,7 @@ msgid "You are not authorised to remove sightings data as you don't have permiss
 msgstr ""
 
 #: Controller/SightingsController.php:155
+#: Model/DecayingModel.php:464
 msgid "Attribute not found"
 msgstr ""
 
@@ -1453,7 +1863,7 @@ msgstr ""
 msgid "You don't have editing rights on this Tag Collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:201;385
+#: Controller/TagCollectionsController.php:201;391
 msgid "Invalid tag collection."
 msgstr ""
 
@@ -1469,115 +1879,147 @@ msgstr ""
 msgid "You are not allowed to delete that."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:336
+#: Controller/TagCollectionsController.php:241
+msgid "Invalid tag collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:342
 msgid "Tag(s) could not be added."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:389
+#: Controller/TagCollectionsController.php:395
 msgid "Insufficient privileges to remove the tag from the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:400
+#: Controller/TagCollectionsController.php:406
 msgid "Invalid tag or tag not associated with the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:404
+#: Controller/TagCollectionsController.php:410
 msgid "Failed to remove tag from the collection."
 msgstr ""
 
-#: Controller/TagsController.php:367
+#: Controller/TagsController.php:370
 msgid "Tag deleted"
 msgstr "Značka odstraněna"
 
-#: Controller/TagsController.php:372
+#: Controller/TagsController.php:375
 msgid "Tag was not deleted"
 msgstr "Značka nebyla odstraněna"
 
-#: Controller/TagsController.php:580
+#: Controller/TagsController.php:599
 msgid "Favourite Tags"
 msgstr ""
 
-#: Controller/TagsController.php:586
+#: Controller/TagsController.php:605
 #: View/TagCollections/index.ctp:4
 msgid "Tag Collections"
 msgstr ""
 
-#: Controller/TagsController.php:591
+#: Controller/TagsController.php:610
 msgid "Custom Tags"
 msgstr ""
 
-#: Controller/TagsController.php:595
+#: Controller/TagsController.php:614
 msgid "All Tags"
 msgstr ""
 
-#: Controller/TagsController.php:603
+#: Controller/TagsController.php:622
 #: View/Taxonomies/view.ctp:2
 msgid "Taxonomy Library"
 msgstr ""
 
-#: Controller/TagsController.php:772
+#: Controller/TagsController.php:790
 msgid "Includes: "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:57
+#: Controller/TagsController.php:867
+msgid "This functionality requires tagging permission."
+msgstr ""
+
+#: Controller/TagsController.php:881;905
+msgid "Cannot alter the tags of this data, only the organisation that has created the data (orgc) can modify global tags."
+msgstr ""
+
+#: Controller/TagsController.php:883;907
+msgid "Please consider using local tags if you are in the host organisation of the instance."
+msgstr ""
+
+#: Controller/TagsController.php:912;1058
+msgid "Invalid Target."
+msgstr ""
+
+#: Controller/TagsController.php:951
+msgid "Local tags can only be added by users of the host organisation."
+msgstr ""
+
+#: Controller/TagsController.php:964
+msgid "Unable to create tag. Reason: "
+msgstr ""
+
+#: Controller/TagsController.php:1075
+msgid "Insufficient privileges to remove local tags from events you do not own."
+msgstr ""
+
+#: Controller/TaxonomiesController.php:68
 msgid "Taxonomy not found."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:123
+#: Controller/TaxonomiesController.php:134
 msgid "Taxonomy enabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:155
+#: Controller/TaxonomiesController.php:166
 msgid "Taxonomy disabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:223
+#: Controller/TaxonomiesController.php:234
 msgid "All taxonomy libraries are up to date already."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:226
+#: Controller/TaxonomiesController.php:237
 msgid "Could not update any of the taxonomy libraries"
 msgstr ""
 
-#: Controller/TaxonomiesController.php:229
+#: Controller/TaxonomiesController.php:240
 #: Controller/WarninglistsController.php:107
 msgid "Successfully updated "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:229;231
+#: Controller/TaxonomiesController.php:240;242
 msgid " taxonomy libraries."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:231
+#: Controller/TaxonomiesController.php:242
 #: Controller/WarninglistsController.php:109
 msgid " However, could not update "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:265;295;325
+#: Controller/TaxonomiesController.php:276;314;344
 msgid "The tag(s) has been saved."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:267;297;327
+#: Controller/TaxonomiesController.php:282;316;346
 msgid "The tag(s) could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:355
+#: Controller/TaxonomiesController.php:374
 msgid "The tag(s) has been hidden."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:357
+#: Controller/TaxonomiesController.php:376
 msgid "The tag(s) could not be hidden. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:394
+#: Controller/TaxonomiesController.php:413
 msgid "Taxonomy successfuly deleted."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:397
+#: Controller/TaxonomiesController.php:416
 msgid "Taxonomy could not be deleted."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:405
+#: Controller/TaxonomiesController.php:424
 #: Controller/WarninglistsController.php:262
 msgid "This function can only be reached via AJAX."
 msgstr ""
@@ -1590,109 +2032,175 @@ msgstr "Událost vytvořena, "
 msgid "Event populated, but "
 msgstr "Událost vytvořena, ale "
 
-#: Controller/UsersController.php:42;247
+#: Controller/UserSettingsController.php:129;276
+msgid "Invalid ID passed."
+msgstr ""
+
+#: Controller/UserSettingsController.php:139;143;286;290
+msgid "Invalid user setting."
+msgstr ""
+
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
+msgid "Invalid setting."
+msgstr ""
+
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
+msgid "This setting is restricted and requires the following permission(s): %s"
+msgstr ""
+
+#: Controller/UserSettingsController.php:193
+msgid "Setting saved."
+msgstr ""
+
+#: Controller/UserSettingsController.php:206
+msgid "Setting could not be saved."
+msgstr ""
+
+#: Controller/UserSettingsController.php:301
+msgid "Setting deleted."
+msgstr ""
+
+#: Controller/UserSettingsController.php:309
+msgid "Setting could not be deleted."
+msgstr ""
+
+#: Controller/UserSettingsController.php:322
+msgid "Expecting POST or DELETE request."
+msgstr ""
+
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr "Neplatný uživatel nebo není autorizován."
 
-#: Controller/UsersController.php:54;467;706;725;953
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "Neplatný uživatel"
 
-#: Controller/UsersController.php:119;613;778
+#: Controller/UsersController.php:154;722;887
 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: "
 
-#: Controller/UsersController.php:146
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr "Profil byl aktualizován"
 
-#: Controller/UsersController.php:150
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr "Profil nelze aktualizovat. Prosím opakujte akci."
 
-#: Controller/UsersController.php:184
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:193
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:213
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "Heslo bylo změněno."
 
-#: Controller/UsersController.php:222
+#: Controller/UsersController.php:299
 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:359;377;477
-#: Model/Log.php:320
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:624
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr "Uživatele nelze uložit. Neplatná organizace."
 
-#: Controller/UsersController.php:646
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "Uživatel byl uložen."
 
-#: Controller/UsersController.php:655;889
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr "Uživatele nelze uložit. Prosím opakujte akci."
 
-#: Controller/UsersController.php:881
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "Uživatel byl uložen"
 
-#: Controller/UsersController.php:961
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "Uživatel odstraněn"
 
-#: Controller/UsersController.php:965
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "Uživatel nebyl odstraněn"
 
-#: Controller/UsersController.php:1043
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "Neplatné uživatelské jméno nebo heslo, zkuste to znovu"
 
-#: Controller/UsersController.php:1130
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr "Nashledanou"
 
-#: Controller/UsersController.php:1171
+#: Controller/UsersController.php:1273;1297
+msgid "This functionality is only accessible via POST requests."
+msgstr ""
+
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
 msgid "New authkey generated."
 msgstr "Vytvořen nový autentizační klíč."
 
-#: Controller/UsersController.php:1280
+#: Controller/UsersController.php:1301
+msgid "Job initiated."
+msgstr ""
+
+#: Controller/UsersController.php:1303
+msgid "%s authkeys reset, %s could not be reset."
+msgstr ""
+
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr "Přijali jste podmínky používání."
 
-#: Controller/UsersController.php:1462
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1467
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1504
+#: Controller/UsersController.php:1587
 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:1506
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr "E-maily odeslány."
 
-#: Controller/UsersController.php:1580
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr ""
 
-#: Controller/UsersController.php:1581
-#: View/Elements/global_menu.ctp:151
+#: Controller/UsersController.php:1664
+#: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
@@ -1701,18 +2209,19 @@ msgstr ""
 msgid "Organisations"
 msgstr ""
 
-#: Controller/UsersController.php:1582
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr ""
 
-#: Controller/UsersController.php:1583
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
-#: View/Elements/eventattribute.ctp:150
+#: View/DecayingModel/decaying_tool_rest_search.ctp:28
+#: View/Elements/eventattribute.ctp:151
 #: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Elements/Feeds/eventattribute.ctp:46
+#: View/Elements/Servers/eventattribute.ctp:46
 #: View/Events/resolved_attributes.ctp:53
-#: View/Events/resolved_misp_format.ctp:66;93;263
+#: View/Events/resolved_misp_format.ctp:66;94;289
 #: View/Events/view.ctp:127
 #: View/Feeds/preview_event.ctp:16
 #: View/Feeds/preview_index.ctp:39
@@ -1730,18 +2239,160 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: Controller/UsersController.php:1584
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr ""
 
-#: Controller/UsersController.php:1585
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1586
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr ""
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "Ano"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "Ne"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr ""
@@ -1822,6 +2473,14 @@ msgstr ""
 msgid "No valid data received."
 msgstr ""
 
+#: Controller/Component/ACLComponent.php:634
+msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
+msgstr ""
+
+#: Controller/Component/ACLComponent.php:688
+msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
+msgstr ""
+
 #: Controller/Component/AdminCrudComponent.php:20
 msgid "The %s has been saved."
 msgstr "%s byl uložen."
@@ -1870,2154 +2529,2967 @@ msgstr "Položka blacklistu odebrána"
 msgid "Could not remove the blacklist entry"
 msgstr "Nelze odstranit položku blacklistu"
 
-#: Model/AppModel.php:1232
+#: Controller/Component/DeprecationComponent.php:18
+msgid "Use /attributes/restSearch to export RPZ rules."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:19
+msgid "Use /attributes/restSearch to export flat indicator lists."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:22
+msgid "Use MISP modules to import in OpenIOC format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:23
+msgid "Use /events/restSearch to export in CSV format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:24
+msgid "Use the REST client to refine your search conditions and export in any of the given formats with much more control."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:25
+msgid "Use /events/restSearch to export hashes."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:26
+msgid "Use /events/restSearch to export in the various NIDS formats."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:27
+msgid "Use /events/restSearch to export in STIX format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:28
+msgid "Use /events/restSearch to export in STIX2 format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:29
+msgid "Use /events/restSearch to export in XML format. It is highly recommended to use JSON whenever possible."
+msgstr ""
+
+#: Controller/Component/RateLimitComponent.php:29
+msgid "API searches are not allowed for this user role."
+msgstr ""
+
+#: Controller/Component/RateLimitComponent.php:41
+msgid "Rate limit exceeded."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:603
+msgid "The action that the user performed"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:609
+msgid "Is the sharing group selectable (active) when chosing distribution"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:614;1356
+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 ""
+
+#: Controller/Component/RestResponseComponent.php:620
+msgid "All organisations contained on the instance will be part of the sharing group"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:626
+msgid "hard-delete already soft-deleted attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:633
+msgid "Maturity of the event"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:640
+msgid "Anonymise the information regarding the server on which the request was issued"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:646
+msgid "Filter on attribute value"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:652
+msgid "The authorisation key found on the external server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:658
+msgid "The user receive alerts when events are published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:664
+msgid "The email's body"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:670
+msgid "The feed is cached"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:682
+msgid "A valid x509 certificate "
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:688
+msgid "The text contained in the change field"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:694
+msgid "The user will be prompted the change the password"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:700
+msgid "A valid hexadecimal colour `#ffffff`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:711
+msgid "Contact details for the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:717
+msgid "The user receive alerts from `contact reporter` requests"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:734
+msgid "Base64 encoded file contents"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:746
+msgid "The user set date field on the event level. If you are using restSearch, you can use any of the valid time related filters (examples: 7d, timestamps, [14d, 7d] for ranges, etc.)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:781
+msgid "The role is a default role (selected by default)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:787
+msgid "Remove file after ingestion"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:793
+msgid "Include deleted elements"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:799
+msgid "Merge attributes (only add new attribute, remove revoked attributes)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:810
+msgid "Disable the user account"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:822
+msgid "Filter on user email"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:828
+msgid "Set the password manually"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:839
+msgid "When uploading malicious samples, set this flag to tell MISP to encrpyt the sample and extract the file hashes. This will create a MISP object with the appropriate attributes."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:850
+msgid "Should the warning list be enforced. Adds `blocked` field for matching attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:863
+msgid "The timestamp at which the event was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:870
+msgid "The timestamp at which the attribute was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:882;1021
+msgid "Quick event description"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:888
+msgid "The tag is exported when synchronising with other instances"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:900
+msgid "Exclude local tags from the export"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:906
+msgid "The organisation have write access to this sharing group (they can add/remove other organisation)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:912
+msgid "An external authorisation is required for this user"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:918
+msgid "A valid external auth key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:931
+msgid "target_event option might be considered"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:943
+msgid "The date from which the event was published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:949
+msgid "A valid GPG key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:955
+msgid "The event contains proposals"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:961
+msgid "Headers to be passed with the requests. All separated by `\\n`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:967
+msgid "The tag is hidden (not selectable)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:979
+msgid "Include matching attributes in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:991
+msgid "Include matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:997
+msgid "Include matching eventUuids in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1003
+msgid "Include tags of matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1015
+msgid "Include proposals of matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1028
+msgid "Specify whether the source (url field) is a directory (local) or an geniun url (network)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1034
+msgid "The IP of a login attempt"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1040
+msgid "JSON containing ID, UUID and name"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1046
+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)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1059
+msgid "Limit on the pagination"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1065
+msgid "If the organisation should have access to this instance, make sure that the Local organisation setting is checked. If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1071
+msgid "The lookup will not be visible in the feed correlation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1077
+msgid "Message to be included"
+msgstr "Zpráva, která má být zahrnuta"
+
+#: Controller/Component/RestResponseComponent.php:1083
+msgid "Will not return Attributes, shadow attribute and objects"
+msgstr "Nelze vrátit atributy, stínový atribut a objekty"
+
+#: Controller/Component/RestResponseComponent.php:1089
+msgid "Will only return  id, timestamp, published and uuid"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1096
+msgid "Mock the query"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1120
+msgid "The last time the sharing group was modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1138
+msgid "The news are read"
+msgstr "Zprávy jsou přečteny"
+
+#: Controller/Component/RestResponseComponent.php:1145
+msgid "The unique Signature Identification"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1151
+msgid "Can be either the ORG_ID or the ORG_NAME"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1157
+msgid "Describe the organisation"
+msgstr "Popište organizaci"
+
+#: Controller/Component/RestResponseComponent.php:1163
+msgid "Organisation identifier (name)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1175;1181
+msgid "Globally used uuid of an organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1187
+msgid "The IDS flags will be set to off for this feed"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1194
+msgid "Page number for the pagination"
+msgstr "Číslo stránky pro stránkování"
+
+#: Controller/Component/RestResponseComponent.php:1200
+msgid "The hardcoded password"
+msgstr "Tvrdé heslo"
+
+#: Controller/Component/RestResponseComponent.php:1272
+msgid "The name of the feed provider"
+msgstr "Název poskytovatele feedu"
+
+#: Controller/Component/RestResponseComponent.php:1278
+msgid "The event will be published"
+msgstr "Událost bude zveřejněna"
+
+#: Controller/Component/RestResponseComponent.php:1301
+msgid "Allow the download of events and their attribute from the server"
+msgstr "Povolit stahování událostí a jejich atributů ze serveru"
+
+#: Controller/Component/RestResponseComponent.php:1307
+msgid "Allow the upload of events and their attribute to the server"
+msgstr "Povolit nahrávání událostí a jejich atributů na server"
+
+#: Controller/Component/RestResponseComponent.php:1313
+msgid "Allow the upload of sightings to the server"
+msgstr "Povolit nahrávání pozorování na server"
+
+#: Controller/Component/RestResponseComponent.php:1319
+msgid "Concise summary for who this sharing group is releasable to"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1337
+msgid "Pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1362
+msgid "The sector of the organisation"
+msgstr "Odvětví organizace"
+
+#: Controller/Component/RestResponseComponent.php:1374
+msgid "Will only return the sharing group ID"
+msgstr "Vrátí pouze ID sdílení skupiny"
+
+#: Controller/Component/RestResponseComponent.php:1387
+msgid "Sharing group ID"
+msgstr "ID skupiny sdílení"
+
+#: Controller/Component/RestResponseComponent.php:1393
+msgid "The source of the Sighting (e.g. honeypot_1)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1405
+msgid "The email's subject"
+msgstr "Předmět e-mailu"
+
+#: Controller/Component/RestResponseComponent.php:1411;1417
+msgid "Base64 encoded certificate"
+msgstr "Base64 kódovaný certifikát"
+
+#: Controller/Component/RestResponseComponent.php:1435
+msgid "A tad ID to attach to created events"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1448
+msgid "The provided ID will be reused as an existing event"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1471
+msgid "Time of the sighting with the form `h:i:s`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1483
+msgid "The title of the log"
+msgstr "Název logu"
+
+#: Controller/Component/RestResponseComponent.php:1495
+msgid "The date to which the event was published"
+msgstr "Datum, ke kterému byla událost zveřejněna"
+
+#: Controller/Component/RestResponseComponent.php:1501
+msgid "The state of the `to_ids` flag"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1507
+msgid "The type of the attribute"
+msgstr "Typ atributu"
+
+#: Controller/Component/RestResponseComponent.php:1535
+msgid "Placeholder containing values to sight"
+msgstr "Zástupný symbol obsahující hodnoty na pohled"
+
+#: Controller/Component/RestResponseComponent.php:1548
+msgid "Not supported (warninglist->checkvalues) expect an array"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1554
+msgid "Not supported (removeTag)"
+msgstr "Není podporováno (odstranitTag)"
+
+#: Controller/Component/RestResponseComponent.php:1560;1566;1572;1579;1585;1591;1597;1603;1614
+msgid "Not supported"
+msgstr "Není podporováno"
+
+#: Controller/Component/RestResponseComponent.php:1771
+msgid "Seen within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m)"
+msgstr "Viděno v posledním x čase, kde x lze definovat ve dnech, hodinách, minutách (například 5d nebo 12h nebo 30m)"
+
+#: Controller/Component/ToolboxComponent.php:18;26
+#: Model/Galaxy.php:220;277;287;301
+msgid "Invalid %s."
+msgstr "Neplatné %s."
+
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr ""
 
-#: Model/AppModel.php:1246
-msgid "Issues executing the pre-update test `"
+#: Model/AppModel.php:1480
+msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1246
-msgid "`. The returned error is: "
-msgstr ""
-
-#: Model/AppModel.php:1268;1271
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1269;1282
+#: Model/AppModel.php:1503
+msgid "The executed SQL query was: %s"
+msgstr ""
+
+#: Model/AppModel.php:1505
+msgid "Successfuly executed the SQL query for %s"
+msgstr ""
+
+#: Model/AppModel.php:1516;1580
+msgid "Issues executing the SQL query for %s"
+msgstr ""
+
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1281;1284
-msgid "Issues executing the SQL query for "
-msgstr ""
-
-#: Model/AppModel.php:1282
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1284
-msgid ". The returned error is: "
+#: Model/AppModel.php:1519
+msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1306
+#: Model/AppModel.php:1528
+msgid "However, as this error is whitelisted, the update went through."
+msgstr ""
+
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/Attribute.php:59
+#: Model/AppModel.php:1550
+msgid "Failed to add index"
+msgstr ""
+
+#: Model/AppModel.php:1552
+msgid "The returned error is:"
+msgstr ""
+
+#: Model/AppModel.php:1581
+msgid "Database updates stopped as some errors occured and the stop flag is enabled."
+msgstr ""
+
+#: Model/AppModel.php:1740
+msgid "Invalid JSON."
+msgstr ""
+
+#: Model/AppModel.php:1833;1891
+msgid "Issues executing run_updates"
+msgstr ""
+
+#: Model/AppModel.php:1834
+msgid "Database updates are locked. Worker not spawned"
+msgstr ""
+
+#: Model/AppModel.php:1838;1896;1931
+msgid "Update done"
+msgstr ""
+
+#: Model/AppModel.php:1892
+msgid "Updates are locked. Stopping worker gracefully"
+msgstr ""
+
+#: Model/AppModel.php:1911
+msgid "Running update %s"
+msgstr ""
+
+#: Model/AppModel.php:1937
+msgid "Update done in another worker. Gracefuly stopping."
+msgstr ""
+
+#: Model/Attribute.php:63
 #: View/Events/filter_event_index.ctp:46;182
 msgid "Your organisation only"
 msgstr ""
 
-#: Model/Attribute.php:60
+#: Model/Attribute.php:64
 #: View/Events/filter_event_index.ctp:46;183
 msgid "This community only"
 msgstr ""
 
-#: Model/Attribute.php:61
+#: Model/Attribute.php:65
 #: View/Events/filter_event_index.ctp:46;184
 #: View/Pages/doc/using_the_system.ctp:51
 msgid "Connected communities"
 msgstr ""
 
-#: Model/Attribute.php:62
+#: Model/Attribute.php:66
 #: View/Events/filter_event_index.ctp:46;185
 #: View/Pages/doc/using_the_system.ctp:58
 msgid "All communities"
-msgstr ""
+msgstr "Všechny komunity"
 
-#: Model/Attribute.php:63
+#: Model/Attribute.php:67
 #: View/Elements/view_event_distribution_graph.ctp:24
 msgid "Sharing group"
-msgstr ""
+msgstr "Skupina sdílení"
 
-#: Model/Attribute.php:64
+#: Model/Attribute.php:68
 msgid "Inherit event"
-msgstr ""
+msgstr "Zdědit událost"
 
-#: Model/Attribute.php:69
+#: Model/Attribute.php:76
 msgid "Reference used by the publishing party (e.g. ticket number)"
-msgstr ""
+msgstr "Referenční číslo používané vydavatelskou stranou (např. číslo tiketu)"
 
-#: Model/Attribute.php:73
+#: Model/Attribute.php:80
 msgid "Internal Attack Targeting and Compromise Information"
 msgstr ""
 
-#: Model/Attribute.php:74
+#: Model/Attribute.php:81
 msgid "Targeting information to include recipient email, infected machines, department, and or locations."
-msgstr ""
+msgstr "Zaměření na informace včetně e-mailu příjemce, nakažených strojů, oddělení nebo míst."
 
-#: Model/Attribute.php:78
+#: Model/Attribute.php:85
 msgid "All the info about how the malware is detected by the antivirus products"
-msgstr ""
+msgstr "Všechny informace o tom, jak antivirus detekuje škodlivý software"
 
-#: Model/Attribute.php:79
+#: Model/Attribute.php:86
 msgid "List of anti-virus vendors detecting the malware or information on detection performance (e.g. 13/43 or 67%). Attachment with list of detection or link to VirusTotal could be placed here as well."
-msgstr ""
+msgstr "Seznam poskytovatelů antiviru detekujících malware nebo informace o detekční výkonnosti (např. 13/43 nebo 67%). Připojení se seznamem detekce nebo odkazu na VirusTotal může být také umístěno zde."
 
-#: Model/Attribute.php:83
+#: Model/Attribute.php:90
 msgid "Information about how the malware is delivered"
 msgstr ""
 
-#: Model/Attribute.php:84
+#: Model/Attribute.php:91
 msgid "Information about the way the malware payload is initially delivered, for example information about the email or web-site, vulnerability used, originating IP etc. Malware sample itself should be attached here."
 msgstr ""
 
-#: Model/Attribute.php:88
+#: Model/Attribute.php:95
 msgid "Any artifact (files, registry keys etc.) dropped by the malware or other modifications to the system"
 msgstr ""
 
-#: Model/Attribute.php:92
+#: Model/Attribute.php:99
 msgid "Info on where the malware gets installed in the system"
 msgstr ""
 
-#: Model/Attribute.php:93
+#: Model/Attribute.php:100
 msgid "Location where the payload was placed in the system and the way it was installed. For example, a filename|md5 type attribute can be added here like this: c:\\windows\\system32\\malicious.exe|41d8cd98f00b204e9800998ecf8427e."
 msgstr ""
 
-#: Model/Attribute.php:97
+#: Model/Attribute.php:104
 msgid "Mechanisms used by the malware to start at boot"
 msgstr ""
 
-#: Model/Attribute.php:98
+#: Model/Attribute.php:105
 msgid "Mechanisms used by the malware to start at boot. This could be a registry key, legitimate driver modification, LNK file in startup"
 msgstr ""
 
-#: Model/Attribute.php:102
+#: Model/Attribute.php:109
 msgid "Information about network traffic generated by the malware"
 msgstr ""
 
-#: Model/Attribute.php:106
+#: Model/Attribute.php:113
 msgid "Information about the final payload(s)"
 msgstr ""
 
-#: Model/Attribute.php:107
+#: Model/Attribute.php:114
 msgid "Information about the final payload(s). Can contain a function of the payload, e.g. keylogger, RAT, or a name if identified, such as Poison Ivy."
 msgstr ""
 
-#: Model/Attribute.php:111
+#: Model/Attribute.php:118
 msgid "Identification of the group, organisation, or country behind the attack"
 msgstr ""
 
-#: Model/Attribute.php:115
+#: Model/Attribute.php:122
 msgid "Any other result from additional analysis of the malware like tools output"
 msgstr ""
 
-#: Model/Attribute.php:116
+#: Model/Attribute.php:123
 msgid "Any other result from additional analysis of the malware like tools output Examples: pdf-parser output, automated sandbox analysis, reverse engineering report."
 msgstr ""
 
-#: Model/Attribute.php:120
+#: Model/Attribute.php:127
 msgid "Financial Fraud indicators"
-msgstr ""
+msgstr "Ukazatele finančních podvodů"
 
-#: Model/Attribute.php:121
+#: Model/Attribute.php:128
 msgid "Financial Fraud indicators, for example: IBAN Numbers, BIC codes, Credit card numbers, etc."
-msgstr ""
+msgstr "Ukazatele finančních podvodů, například: čísla IBAN, kódy BIC, čísla kreditních karet atd."
 
-#: Model/Attribute.php:125
+#: Model/Attribute.php:132
 msgid "Tools supporting analysis or detection of the event"
-msgstr ""
+msgstr "Nástroje na podporu analýzy nebo detekce události"
 
-#: Model/Attribute.php:129
+#: Model/Attribute.php:136
 msgid "Social networks and platforms"
-msgstr ""
+msgstr "Sociální sítě a platformy"
 
-#: Model/Attribute.php:134
+#: Model/Attribute.php:141
 msgid "A human being - natural person"
 msgstr ""
 
-#: Model/Attribute.php:138
+#: Model/Attribute.php:145
 msgid "Attributes that are not part of any other category or are meant to be used as a component in MISP objects in the future"
 msgstr ""
 
-#: Model/Attribute.php:144;228
+#: Model/Attribute.php:154;243
 msgid "A checksum in md5 format"
 msgstr ""
 
-#: Model/Attribute.php:144
+#: Model/Attribute.php:154
 msgid "You are encouraged to use filename|md5 instead. A checksum in md5 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:155
 msgid "A checksum in sha1 format"
 msgstr ""
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:155
 msgid "You are encouraged to use filename|sha1 instead. A checksum in sha1 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:146
+#: Model/Attribute.php:156
 msgid "A checksum in sha256 format"
 msgstr ""
 
-#: Model/Attribute.php:146
+#: Model/Attribute.php:156
 msgid "You are encouraged to use filename|sha256 instead. A checksum in sha256 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:147
+#: Model/Attribute.php:157
 #: View/Elements/healthElements/files.ctp:29
 msgid "Filename"
 msgstr ""
 
-#: Model/Attribute.php:148
+#: Model/Attribute.php:158
 msgid "Microsoft Program database (PDB) path information"
 msgstr ""
 
-#: Model/Attribute.php:149
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:149
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:150
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:150
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:151
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:151
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:152
+#: Model/Attribute.php:162
 msgid "A source IP address of the attacker"
 msgstr ""
 
-#: Model/Attribute.php:153
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server"
 msgstr ""
 
-#: Model/Attribute.php:153
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server. Also set the IDS flag on when this IP is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker. Also set the IDS flag on when this hostname is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware. Use this instead of hostname when the upper domain is important or can be used to create links between events."
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:157
+#: Model/Attribute.php:167
 msgid "The email address used to send the malware."
 msgstr ""
 
-#: Model/Attribute.php:158
-msgid "A recipient email address"
-msgstr ""
-
-#: Model/Attribute.php:158
-msgid "A recipient email address that is not related to your constituency."
-msgstr ""
-
-#: Model/Attribute.php:159
-msgid "The subject of the email"
-msgstr ""
-
-#: Model/Attribute.php:160
-msgid "File name of the email attachment."
-msgstr ""
-
-#: Model/Attribute.php:161
-msgid "Email body"
-msgstr ""
-
-#: Model/Attribute.php:162
-msgid "A floating point value."
-msgstr ""
-
-#: Model/Attribute.php:163
-msgid "url"
-msgstr ""
-
-#: Model/Attribute.php:164
-msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
-msgstr ""
-
-#: Model/Attribute.php:165
-msgid "The user-agent used by the malware in the HTTP request."
-msgstr ""
-
-#: Model/Attribute.php:166
-msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
-msgstr ""
-
-#: Model/Attribute.php:167
-msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
-msgstr ""
-
 #: Model/Attribute.php:168
-msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
+msgid "eduPersonPrincipalName - eppn - the NetId of the person for the purposes of inter-institutional authentication. Should be stored in the form of user@univ.edu, where univ.edu is the name of the local security domain."
 msgstr ""
 
 #: Model/Attribute.php:169
-msgid "Registry key or value"
+msgid "A recipient email address"
+msgstr ""
+
+#: Model/Attribute.php:169
+msgid "A recipient email address that is not related to your constituency."
 msgstr ""
 
 #: Model/Attribute.php:170
-msgid "Registry value + data separated by |"
+msgid "The subject of the email"
 msgstr ""
 
 #: Model/Attribute.php:171
-msgid "Autonomous system"
+msgid "File name of the email attachment."
 msgstr ""
 
 #: Model/Attribute.php:172
-msgid "An IDS rule in Snort rule-format"
-msgstr ""
-
-#: Model/Attribute.php:172
-msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
+msgid "Email body"
 msgstr ""
 
 #: Model/Attribute.php:173
-msgid "An NIDS rule in the Bro rule-format"
-msgstr ""
-
-#: Model/Attribute.php:173
-msgid "An NIDS rule in the Bro rule-format."
+msgid "A floating point value."
 msgstr ""
 
 #: Model/Attribute.php:174
-msgid "An NIDS rule in the Zeek rule-format"
-msgstr ""
-
-#: Model/Attribute.php:174
-msgid "An NIDS rule in the Zeek rule-format."
+msgid "url"
 msgstr ""
 
 #: Model/Attribute.php:175
-msgid "Pattern in file that identifies the malware"
+msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
 msgstr ""
 
 #: Model/Attribute.php:176
-msgid "Pattern in network traffic that identifies the malware"
+msgid "The user-agent used by the malware in the HTTP request."
 msgstr ""
 
 #: Model/Attribute.php:177
-msgid "Pattern in memory dump that identifies the malware"
+msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
 msgstr ""
 
 #: Model/Attribute.php:178
-msgid "Yara signature"
+msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
 #: Model/Attribute.php:179
-msgid "STIX 2 pattern"
+msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
 #: Model/Attribute.php:180
-msgid "Sigma - Generic Signature Format for SIEM Systems"
+msgid "Registry key or value"
 msgstr ""
 
 #: Model/Attribute.php:181
-msgid "GENE - Go Evtx sigNature Engine"
+msgid "Registry value + data separated by |"
 msgstr ""
 
 #: Model/Attribute.php:182
-msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
+msgid "Autonomous system"
 msgstr ""
 
 #: Model/Attribute.php:183
-msgid "Identity card number"
+msgid "An IDS rule in Snort rule-format"
+msgstr ""
+
+#: Model/Attribute.php:183
+msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
 msgstr ""
 
 #: Model/Attribute.php:184
-msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
+msgid "An NIDS rule in the Bro rule-format"
+msgstr ""
+
+#: Model/Attribute.php:184
+msgid "An NIDS rule in the Bro rule-format."
 msgstr ""
 
 #: Model/Attribute.php:185
-msgid "A reference to the vulnerability used in the exploit"
+msgid "An NIDS rule in the Zeek rule-format"
+msgstr ""
+
+#: Model/Attribute.php:185
+msgid "An NIDS rule in the Zeek rule-format."
 msgstr ""
 
 #: Model/Attribute.php:186
-msgid "Attachment with external information"
-msgstr ""
-
-#: Model/Attribute.php:186;187
-msgid "Please upload files using the <em>Upload Attachment</em> button."
+msgid "a community ID flow hashing algorithm to map multiple traffic monitors into common flow id"
 msgstr ""
 
 #: Model/Attribute.php:187
-msgid "Attachment containing encrypted malware sample"
+msgid "Pattern in file that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:188
-msgid "Link to an external information"
+msgid "Pattern in network traffic that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:189
-msgid "Comment or description in a human language"
-msgstr ""
-
-#: Model/Attribute.php:189
-msgid "Comment or description in a human language.  This will not be correlated with other attributes"
+msgid "Pattern in memory dump that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:190
-msgid "Name, ID or a reference"
+msgid "Yara signature"
 msgstr ""
 
 #: Model/Attribute.php:191
-msgid "A value in hexadecimal format"
+msgid "STIX 2 pattern"
 msgstr ""
 
 #: Model/Attribute.php:192
-msgid "Other attribute"
+msgid "Sigma - Generic Signature Format for SIEM Systems"
 msgstr ""
 
 #: Model/Attribute.php:193
-msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
+msgid "GENE - Go Evtx sigNature Engine"
 msgstr ""
 
 #: Model/Attribute.php:194
-msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
+msgid "Kusto query - Kusto from Microsoft Azure is a service for storing and running interactive analytics over Big Data."
 msgstr ""
 
 #: Model/Attribute.php:195
-msgid "Attack Targets Username(s)"
+msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
 msgstr ""
 
 #: Model/Attribute.php:196
-msgid "Attack Targets Email(s)"
+msgid "Identity card number"
 msgstr ""
 
 #: Model/Attribute.php:197
-msgid "Attack Targets Machine Name(s)"
+msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
 msgstr ""
 
 #: Model/Attribute.php:198
-msgid "Attack Targets Department or Organization(s)"
+msgid "A reference to the vulnerability used in the exploit"
 msgstr ""
 
 #: Model/Attribute.php:199
-msgid "Attack Targets Physical Location(s)"
+msgid "A reference to the weakness used in the exploit"
 msgstr ""
 
 #: Model/Attribute.php:200
-msgid "External Target Organizations Affected by this Attack"
+msgid "Attachment with external information"
+msgstr ""
+
+#: Model/Attribute.php:200;201
+msgid "Please upload files using the <em>Upload Attachment</em> button."
 msgstr ""
 
 #: Model/Attribute.php:201
-msgid "Bitcoin Address"
+msgid "Attachment containing encrypted malware sample"
 msgstr ""
 
 #: Model/Attribute.php:202
-msgid "Monero Address"
+msgid "Link to an external information"
 msgstr ""
 
 #: Model/Attribute.php:203
-msgid "International Bank Account Number"
+msgid "Comment or description in a human language"
+msgstr ""
+
+#: Model/Attribute.php:203
+msgid "Comment or description in a human language.  This will not be correlated with other attributes"
 msgstr ""
 
 #: Model/Attribute.php:204
-msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
+msgid "Name, ID or a reference"
 msgstr ""
 
 #: Model/Attribute.php:205
-msgid "Bank account number without any routing number"
+msgid "A value in hexadecimal format"
 msgstr ""
 
 #: Model/Attribute.php:206
-msgid "ABA routing transit number"
+msgid "Other attribute"
 msgstr ""
 
 #: Model/Attribute.php:207
-msgid "Bank Identification Number"
+msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
 msgstr ""
 
 #: Model/Attribute.php:208
-msgid "Credit-Card Number"
+msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
 msgstr ""
 
 #: Model/Attribute.php:209
-msgid "Premium-Rate Telephone Number"
+msgid "Attack Targets Username(s)"
 msgstr ""
 
 #: Model/Attribute.php:210
-msgid "Telephone Number"
+msgid "Attack Targets Email(s)"
 msgstr ""
 
 #: Model/Attribute.php:211
-msgid "A string identifying the threat actor"
+msgid "Attack Targets Machine Name(s)"
 msgstr ""
 
 #: Model/Attribute.php:212
-msgid "Associated campaign name"
+msgid "Attack Targets Department or Organization(s)"
 msgstr ""
 
 #: Model/Attribute.php:213
-msgid "Associated campaign ID"
+msgid "Attack Targets Physical Location(s)"
+msgstr ""
+
+#: Model/Attribute.php:214
+msgid "External Target Organizations Affected by this Attack"
 msgstr ""
 
 #: Model/Attribute.php:215
-msgid "Uniform Resource Identifier"
+msgid "Bitcoin Address"
 msgstr ""
 
 #: Model/Attribute.php:216
-msgid "Authenticode executable signature hash"
-msgstr ""
-
-#: Model/Attribute.php:216
-msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:217;229
-msgid "A checksum in ssdeep format"
+msgid "Dash Address"
 msgstr ""
 
 #: Model/Attribute.php:217
-msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:218;230
-msgid "Import hash - a hash created based on the imports in the sample."
+msgid "Monero Address"
 msgstr ""
 
 #: Model/Attribute.php:218
-msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
+msgid "International Bank Account Number"
 msgstr ""
 
 #: Model/Attribute.php:219
-msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
+msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
 msgstr ""
 
 #: Model/Attribute.php:220
-msgid "A fuzzy hash of import table of Portable Executable format"
-msgstr ""
-
-#: Model/Attribute.php:220
-msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
+msgid "Bank account number without any routing number"
 msgstr ""
 
 #: Model/Attribute.php:221
-msgid "A checksum in sha-224 format"
-msgstr ""
-
-#: Model/Attribute.php:221
-msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
+msgid "ABA routing transit number"
 msgstr ""
 
 #: Model/Attribute.php:222
-msgid "A checksum in sha-384 format"
-msgstr ""
-
-#: Model/Attribute.php:222
-msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
+msgid "Bank Identification Number"
 msgstr ""
 
 #: Model/Attribute.php:223
-msgid "A checksum in sha-512 format"
-msgstr ""
-
-#: Model/Attribute.php:223
-msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
+msgid "Credit-Card Number"
 msgstr ""
 
 #: Model/Attribute.php:224
-msgid "A checksum in the sha-512/224 format"
-msgstr ""
-
-#: Model/Attribute.php:224
-msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
+msgid "Premium-Rate Telephone Number"
 msgstr ""
 
 #: Model/Attribute.php:225
-msgid "A checksum in the sha-512/256 format"
-msgstr ""
-
-#: Model/Attribute.php:225
-msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
+msgid "Telephone Number"
 msgstr ""
 
 #: Model/Attribute.php:226
-msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
-msgstr ""
-
-#: Model/Attribute.php:226
-msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
+msgid "A string identifying the threat actor"
 msgstr ""
 
 #: Model/Attribute.php:227
-msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
+msgid "Associated campaign name"
+msgstr ""
+
+#: Model/Attribute.php:228
+msgid "Associated campaign ID"
+msgstr ""
+
+#: Model/Attribute.php:230
+msgid "Uniform Resource Identifier"
 msgstr ""
 
 #: Model/Attribute.php:231
-msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
+msgid "Authenticode executable signature hash"
+msgstr ""
+
+#: Model/Attribute.php:231
+msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:232;244
+msgid "A checksum in ssdeep format"
 msgstr ""
 
 #: Model/Attribute.php:232
-msgid "A filename and a PEhash separated by a |"
+msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:233;245
+msgid "Import hash - a hash created based on the imports in the sample."
 msgstr ""
 
 #: Model/Attribute.php:233
-msgid "A filename and a sha-224 hash separated by a |"
+msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:234
-msgid "A filename and a sha-384 hash separated by a |"
+msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
 msgstr ""
 
 #: Model/Attribute.php:235
-msgid "A filename and a sha-512 hash separated by a |"
+msgid "A fuzzy hash of import table of Portable Executable format"
+msgstr ""
+
+#: Model/Attribute.php:235
+msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:236
-msgid "A filename and a sha-512/224 hash separated by a |"
+msgid "A checksum in sha-224 format"
+msgstr ""
+
+#: Model/Attribute.php:236
+msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:237
-msgid "A filename and a sha-512/256 hash separated by a |"
+msgid "A checksum in sha-384 format"
+msgstr ""
+
+#: Model/Attribute.php:237
+msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:238
-msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
+msgid "A checksum in sha-512 format"
+msgstr ""
+
+#: Model/Attribute.php:238
+msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:239
-msgid "A scheduled task in windows"
+msgid "A checksum in the sha-512/224 format"
+msgstr ""
+
+#: Model/Attribute.php:239
+msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:240
-msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
+msgid "A checksum in the sha-512/256 format"
+msgstr ""
+
+#: Model/Attribute.php:240
+msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:241
-msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
+msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
+msgstr ""
+
+#: Model/Attribute.php:241
+msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:242
-msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:243
-msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:244
-msgid "The name of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:245
-msgid "The org of a domain's registrant, obtained from the WHOIS information."
+msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
 msgstr ""
 
 #: Model/Attribute.php:246
-msgid "The registrar of the domain, obtained from the WHOIS information."
+msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
 msgstr ""
 
 #: Model/Attribute.php:247
-msgid "The date of domain's creation, obtained from the WHOIS information."
+msgid "A filename and a PEhash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:248
+msgid "A filename and a sha-224 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:249
+msgid "A filename and a sha-384 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:250
+msgid "A filename and a sha-512 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:251
+msgid "A filename and a sha-512/224 hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:252
-msgid "X509 fingerprint in SHA-1 format"
+msgid "A filename and a sha-512/256 hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:253
-msgid "X509 fingerprint in MD5 format"
+msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:254
-msgid "X509 fingerprint in SHA-256 format"
+msgid "A scheduled task in windows"
 msgstr ""
 
 #: Model/Attribute.php:255
-msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
+msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
 msgstr ""
 
 #: Model/Attribute.php:256
-msgid "Size expressed in bytes"
+msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
 msgstr ""
 
 #: Model/Attribute.php:257
-msgid "An integer counter, generally to be used in objects"
+msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:258
-msgid "Datetime in the ISO 8601 format"
+msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:259
-msgid "Common platform enumeration"
+msgid "The name of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:260
-msgid "Port number"
+msgid "The org of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:261
-msgid "IP destination and port number seperated by a |"
+msgid "The registrar of the domain, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:262
-msgid "IP source and port number seperated by a |"
-msgstr ""
-
-#: Model/Attribute.php:263
-msgid "Hostname and port number seperated by a |"
-msgstr ""
-
-#: Model/Attribute.php:264
-msgid "Mac address"
-msgstr ""
-
-#: Model/Attribute.php:265
-msgid "Mac EUI-64 address"
+msgid "The date of domain's creation, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:267
-msgid "Email destination display name"
+msgid "X509 fingerprint in SHA-1 format"
 msgstr ""
 
 #: Model/Attribute.php:268
-msgid "Email source display name"
+msgid "X509 fingerprint in MD5 format"
 msgstr ""
 
 #: Model/Attribute.php:269
-msgid "Email header"
+msgid "X509 fingerprint in SHA-256 format"
 msgstr ""
 
 #: Model/Attribute.php:270
-msgid "Email reply to header"
+msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
 msgstr ""
 
 #: Model/Attribute.php:271
-msgid "Email x-mailer header"
+msgid "Size expressed in bytes"
 msgstr ""
 
 #: Model/Attribute.php:272
-msgid "The email mime boundary separating parts in a multipart email"
+msgid "An integer counter, generally to be used in objects"
 msgstr ""
 
 #: Model/Attribute.php:273
-msgid "The email thread index header"
+msgid "Datetime in the ISO 8601 format"
 msgstr ""
 
 #: Model/Attribute.php:274
-msgid "The email message ID"
+msgid "Common platform enumeration"
 msgstr ""
 
 #: Model/Attribute.php:275
-msgid "A github user name"
+msgid "Port number"
 msgstr ""
 
 #: Model/Attribute.php:276
-msgid "A github repository"
+msgid "IP destination and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:277
-msgid "A github organisation"
+msgid "IP source and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:278
-msgid "Jabber ID"
+msgid "Hostname and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:279
-msgid "Twitter ID"
+msgid "Mac address"
 msgstr ""
 
 #: Model/Attribute.php:280
-msgid "First name of a natural person"
-msgstr ""
-
-#: Model/Attribute.php:281
-msgid "Middle name of a natural person"
+msgid "Mac EUI-64 address"
 msgstr ""
 
 #: Model/Attribute.php:282
-msgid "Last name of a natural person"
+msgid "Email destination display name"
 msgstr ""
 
 #: Model/Attribute.php:283
-msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
+msgid "Email source display name"
 msgstr ""
 
 #: Model/Attribute.php:284
-msgid "Place of birth of a natural person"
+msgid "Email header"
 msgstr ""
 
 #: Model/Attribute.php:285
-msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
+msgid "Email reply to header"
 msgstr ""
 
 #: Model/Attribute.php:286
-msgid "The passport number of a natural person"
+msgid "Email x-mailer header"
 msgstr ""
 
 #: Model/Attribute.php:287
-msgid "The country in which the passport was issued"
+msgid "The email mime boundary separating parts in a multipart email"
 msgstr ""
 
 #: Model/Attribute.php:288
-msgid "The expiration date of a passport"
+msgid "The email thread index header"
 msgstr ""
 
 #: Model/Attribute.php:289
-msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
+msgid "The email message ID"
 msgstr ""
 
 #: Model/Attribute.php:290
-msgid "The nationality of a natural person"
+msgid "A github user name"
 msgstr ""
 
 #: Model/Attribute.php:291
-msgid "Visa number"
+msgid "A github repository"
 msgstr ""
 
 #: Model/Attribute.php:292
-msgid "The date on which the visa was issued"
+msgid "A github organisation"
 msgstr ""
 
 #: Model/Attribute.php:293
-msgid "The primary residence of a natural person"
+msgid "Jabber ID"
 msgstr ""
 
 #: Model/Attribute.php:294
-msgid "The country of residence of a natural person"
+msgid "Twitter ID"
 msgstr ""
 
 #: Model/Attribute.php:295
-msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
+msgid "First name of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:296
-msgid "The frequent flyer number of a passenger"
+msgid "Middle name of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:297
+msgid "Last name of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:298
+msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
 msgstr ""
 
 #: Model/Attribute.php:299
-msgid "Travel details"
+msgid "Place of birth of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:300
-msgid "Payment details"
+msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
 msgstr ""
 
 #: Model/Attribute.php:301
-msgid "The orignal port of embarkation"
+msgid "The passport number of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:302
-msgid "The port of clearance"
+msgid "The country in which the passport was issued"
 msgstr ""
 
 #: Model/Attribute.php:303
-msgid "A Port where the passenger is transiting to"
+msgid "The expiration date of a passport"
 msgstr ""
 
 #: Model/Attribute.php:304
-msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
+msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
 msgstr ""
 
 #: Model/Attribute.php:305
-msgid "The application id of a mobile application"
+msgid "The nationality of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:306
-msgid "Cortex analysis result"
+msgid "Visa number"
 msgstr ""
 
 #: Model/Attribute.php:307
+msgid "The date on which the visa was issued"
+msgstr ""
+
+#: Model/Attribute.php:308
+msgid "The primary residence of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:309
+msgid "The country of residence of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:310
+msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
+msgstr ""
+
+#: Model/Attribute.php:311
+msgid "The frequent flyer number of a passenger"
+msgstr ""
+
+#: Model/Attribute.php:314
+msgid "Travel details"
+msgstr ""
+
+#: Model/Attribute.php:315
+msgid "Payment details"
+msgstr ""
+
+#: Model/Attribute.php:316
+msgid "The orignal port of embarkation"
+msgstr ""
+
+#: Model/Attribute.php:317
+msgid "The port of clearance"
+msgstr ""
+
+#: Model/Attribute.php:318
+msgid "A Port where the passenger is transiting to"
+msgstr ""
+
+#: Model/Attribute.php:319
+msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
+msgstr ""
+
+#: Model/Attribute.php:320
+msgid "The application id of a mobile application"
+msgstr ""
+
+#: Model/Attribute.php:321
+msgid "Chrome extension id"
+msgstr ""
+
+#: Model/Attribute.php:322
+msgid "Cortex analysis result"
+msgstr ""
+
+#: Model/Attribute.php:323
 msgid "Boolean value - to be used in objects"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship."
 msgstr ""
 
-#: Model/Attribute.php:603
+#: Model/Attribute.php:644
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:728
+#: Model/Attribute.php:791
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:862
+#: Model/Attribute.php:935
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:987
+#: Model/Attribute.php:1074
 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:994
+#: Model/Attribute.php:1081
 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:1001
+#: Model/Attribute.php:1088
 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:1012
+#: Model/Attribute.php:1099
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:1023
+#: Model/Attribute.php:1110
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:1030
+#: Model/Attribute.php:1117
 msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
 msgstr ""
 
-#: Model/Attribute.php:1045
+#: Model/Attribute.php:1132
 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:1063
+#: Model/Attribute.php:1150
 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:1068
+#: Model/Attribute.php:1155
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1079
+#: Model/Attribute.php:1166
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr ""
 
-#: Model/Attribute.php:1087
+#: Model/Attribute.php:1174
 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:1098
+#: Model/Attribute.php:1185
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1105;1156
+#: Model/Attribute.php:1192;1243
 msgid "IP address has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1110
+#: Model/Attribute.php:1197
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr ""
 
-#: Model/Attribute.php:1139
+#: Model/Attribute.php:1226
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1159
+#: Model/Attribute.php:1246
 msgid "Domain name has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1172
+#: Model/Attribute.php:1260
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1180
+#: Model/Attribute.php:1268
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr ""
 
-#: Model/Attribute.php:1191
+#: Model/Attribute.php:1276
+msgid "Invalid format. Expected: CWE-x..."
+msgstr ""
+
+#: Model/Attribute.php:1287
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1306
+#: Model/Attribute.php:1405
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr ""
 
-#: Model/Attribute.php:1312
+#: Model/Attribute.php:1411
 msgid "The value has to be a number greater or equal 0."
 msgstr ""
 
-#: Model/Attribute.php:1319
+#: Model/Attribute.php:1418
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:2065;2133
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2757
+#: Model/Attribute.php:2301
+msgid "Invalid hash type."
+msgstr "Neplatný typ hashe."
+
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr ""
 
-#: Model/Attribute.php:3233
+#: Model/Attribute.php:3559
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/Attribute.php:3921;3928;3932
-msgid "Attribute not found or not authorised."
-msgstr "Atribut nebyl nalezen nebo není povolen."
+#: Model/Community.php:26;67
+msgid "Default community list not found."
+msgstr ""
 
-#: Model/Event.php:378
+#: Model/Community.php:30;71
+msgid "Default community list empty."
+msgstr ""
+
+#: Model/Community.php:35;76
+msgid "Default community list not in the expected format."
+msgstr ""
+
+#: Model/Community.php:93
+msgid "Community not found."
+msgstr ""
+
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
+#: Model/DecayingModel.php:162
+msgid "Models could not be loaded or default decaying models folder is empty"
+msgstr ""
+
+#: Model/DecayingModel.php:351
+msgid "No tags nor predicates with `numerical_value`"
+msgstr ""
+
+#: Model/DecayingModel.php:358
+msgid "No predicate"
+msgstr ""
+
+#: Model/DecayingModel.php:437
+msgid "The class for `%s` was not found or not loaded correctly"
+msgstr ""
+
+#: Model/Event.php:390
 msgid "Click this to download all events and attributes that you have access to in MISP JSON format."
 msgstr ""
 
-#: Model/Event.php:386
+#: Model/Event.php:398
 msgid "Click this to download all events and attributes that you have access to in MISP XML format."
 msgstr ""
 
-#: Model/Event.php:394
+#: Model/Event.php:406
 #: View/Events/export_alternate.ctp:19
 msgid "Click this to download all attributes that are indicators and that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:402
+#: Model/Event.php:414
 #: View/Events/export_alternate.ctp:26
 msgid "Click this to download all attributes that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:410
+#: Model/Event.php:422
 msgid "Click this to download all network related attributes that you have access to under the Suricata rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:418
+#: Model/Event.php:430
 msgid "Click this to download all network related attributes that you have access to under the Snort rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:426
+#: Model/Event.php:438
 msgid "Click this to download all network related attributes that you have access to under the Bro rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:434
+#: Model/Event.php:446
 msgid "Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:442
+#: Model/Event.php:454
 msgid "Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:450
+#: Model/Event.php:462
 #: 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 ""
 
-#: Model/Event.php:458
+#: Model/Event.php:470
 msgid "Click on one of the buttons below to download all the attributes with the matching type. This list can be used to feed forensic software when searching for susipicious files. Only published events and attributes marked as IDS Signature are exported."
 msgstr ""
 
-#: Model/Event.php:466
+#: Model/Event.php:478
 msgid "Click this to download Yara rules generated from all relevant attributes."
 msgstr ""
 
-#: Model/Event.php:474
+#: Model/Event.php:486
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5774
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr "Problémy při načítání souboru stix. "
 
-#: Model/Event.php:5776
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr "Problémy s knihovnou maec. "
 
-#: Model/Event.php:5778
+#: Model/Event.php:5803
 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:5781
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr "Kontaktujte administrátora pro "
 
-#: Model/Event.php:5783
+#: Model/Event.php:5808
 msgid "Please "
 msgstr "Prosím "
 
-#: Model/Event.php:5785
+#: Model/Event.php:5810
 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:5817
+#: Model/Event.php:5842
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:5826
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr "%s není nastaveno"
 
-#: Model/Event.php:6068
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr "Nelze přidat tagy."
 
-#: Model/Event.php:6538
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:1545;1589
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1559
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Galaxy.php:219;276;286;300
-msgid "Invalid %s."
+#: Model/Feed.php:1687
+msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Galaxy.php:416
+#: Model/Feed.php:1690
+msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
+msgstr ""
+
+#: Model/Feed.php:1695
+msgid "Invalid user id."
+msgstr ""
+
+#: Model/Feed.php:1715
+msgid "Events related to feed %s purged."
+msgstr ""
+
+#: Model/Galaxy.php:421
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:808
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
 #: Model/Server.php:123
-msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
+msgid "Server unreachable"
 msgstr ""
 
 #: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
+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:151
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:134
+#: Model/Server.php:163
 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:135
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:144
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:145
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:154
+#: Model/Server.php:183
 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:156
+#: Model/Server.php:185
 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:162
+#: Model/Server.php:191
 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:170
+#: Model/Server.php:199
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:178
+#: Model/Server.php:207
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:188
-msgid "Enable some performance heavy correlations (currently CIDR correlation)"
-msgstr ""
-
-#: Model/Server.php:197
-msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
-msgstr ""
-
-#: Model/Server.php:206
-msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
-msgstr ""
-
 #: Model/Server.php:217
-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."
+msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
 #: Model/Server.php:226
+msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
+msgstr ""
+
+#: Model/Server.php:235
+msgid "Enable some performance heavy correlations (currently CIDR correlation)"
+msgstr ""
+
+#: Model/Server.php:244
+msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
+msgstr ""
+
+#: Model/Server.php:253
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:264
+msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:274
+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:283
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:234
+#: Model/Server.php:291
 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:243
+#: Model/Server.php:300
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:245
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:251;259;286;310;318;326;334;391;439;447;514
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:267
+#: Model/Server.php:324
 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:277
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr ""
 
-#: Model/Server.php:294
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:302
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:342
+#: Model/Server.php:399
 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:350
+#: Model/Server.php:407
 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:358
+#: Model/Server.php:415
 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:366
+#: Model/Server.php:423
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:374
+#: Model/Server.php:431
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:383
+#: Model/Server.php:440
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:385
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:399
+#: Model/Server.php:456
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:407
+#: Model/Server.php:464
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:415
+#: Model/Server.php:472
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:423
+#: Model/Server.php:480
 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:431
+#: Model/Server.php:488
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:455
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:463
+#: Model/Server.php:520
 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:473
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:481
+#: Model/Server.php:538
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:489
+#: Model/Server.php:546
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:497
+#: Model/Server.php:554
 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:506
+#: Model/Server.php:563
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:522
+#: Model/Server.php:579
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:530
+#: Model/Server.php:587
+msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
+msgstr ""
+
+#: Model/Server.php:595
 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:538
+#: Model/Server.php:603
 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:546
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:555
+#: Model/Server.php:620
 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:564
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:582
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:590
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:599
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:607
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:615
+#: Model/Server.php:689
 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:623
+#: Model/Server.php:697
 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:631
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:639
+#: Model/Server.php:713
 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:647
+#: Model/Server.php:721
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:655
+#: Model/Server.php:729
 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:663
+#: Model/Server.php:737
 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:671
+#: Model/Server.php:745
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:680
+#: Model/Server.php:754
 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:689
+#: Model/Server.php:763
 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:697
+#: Model/Server.php:771
 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:704
+#: Model/Server.php:778
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:711
+#: Model/Server.php:785
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:720
+#: Model/Server.php:794
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:728
+#: Model/Server.php:802
+msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
+msgstr ""
+
+#: Model/Server.php:804
+msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
+msgstr ""
+
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:737
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:746
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:755
+#: Model/Server.php:838
+msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
+msgstr ""
+
+#: Model/Server.php:847
 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:764
+#: Model/Server.php:856
 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:773
+#: Model/Server.php:865
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:782
+#: Model/Server.php:874
 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:791
+#: Model/Server.php:883
 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:800
+#: Model/Server.php:892
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:810
+#: Model/Server.php:902
 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:819
+#: Model/Server.php:911
 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:828
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:837
+#: Model/Server.php:929
 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:846
-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"
+#: Model/Server.php:938
+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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:855
+#: Model/Server.php:947
+msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:956
 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:865
+#: Model/Server.php:966
 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:874
+#: Model/Server.php:975
 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:883
+#: Model/Server.php:984
 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:892
+#: Model/Server.php:993
 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:902
+#: Model/Server.php:1003
 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:911
+#: Model/Server.php:1012
 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:919
+#: Model/Server.php:1020
 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:927
+#: Model/Server.php:1028
 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:935
+#: Model/Server.php:1036
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:944
+#: Model/Server.php:1045
 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:952
+#: Model/Server.php:1053
 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:960
+#: Model/Server.php:1061
 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:969
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:980
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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:989
+#: Model/Server.php:1099
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1107
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:1005
+#: Model/Server.php:1115
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:1013
+#: Model/Server.php:1123
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:1021
+#: Model/Server.php:1131
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:1030
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:1041
+#: Model/Server.php:1151
 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:1049
+#: Model/Server.php:1159
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:1057
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1065
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1073
+#: Model/Server.php:1183
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:1085
+#: Model/Server.php:1195
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:1093
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1101
+#: Model/Server.php:1211
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:1109
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1117
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1128
+#: Model/Server.php:1238
+msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
+msgstr ""
+
+#: Model/Server.php:1247
 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:1137
+#: Model/Server.php:1257
 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:1146
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1154
+#: Model/Server.php:1292
 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:1162
+#: Model/Server.php:1300
 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:1171
+#: Model/Server.php:1309
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1180
+#: Model/Server.php:1318
 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:1189
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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:1191
+#: Model/Server.php:1339
 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:1198
+#: Model/Server.php:1346
 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:1207
+#: Model/Server.php:1355
 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:1219
+#: Model/Server.php:1364
+msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
+msgstr ""
+
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1227
+#: Model/Server.php:1393
 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:1238
+#: Model/Server.php:1404
 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:1246
+#: Model/Server.php:1412
 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:1254
+#: Model/Server.php:1420
 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:1263
+#: Model/Server.php:1429
 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:1271
+#: Model/Server.php:1437
 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:1282
+#: Model/Server.php:1448
 msgid "The default policy action for the values added to the RPZ."
 msgstr ""
 
-#: Model/Server.php:1291
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1299
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:1307
+#: Model/Server.php:1473
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1315
+#: Model/Server.php:1481
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1323
+#: Model/Server.php:1489
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1331
+#: Model/Server.php:1497
 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:1339
+#: Model/Server.php:1505
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1347
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr ""
 
-#: Model/Server.php:1355
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1363
+#: Model/Server.php:1529
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1371
+#: Model/Server.php:1537
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1379
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr ""
 
-#: Model/Server.php:1387
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr ""
 
-#: Model/Server.php:1395;1642
+#: Model/Server.php:1561;1808
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1403;1650
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1411
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1419
+#: Model/Server.php:1585
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1427
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr ""
 
-#: Model/Server.php:1435;1658
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1443
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1451;1666
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1459
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1467;1674
+#: Model/Server.php:1633;1840
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1475
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1483
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1491
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1499;1682
+#: Model/Server.php:1665;1848
 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:1507
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1515
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr ""
 
-#: Model/Server.php:1523
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr ""
 
-#: Model/Server.php:1531
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr ""
 
-#: Model/Server.php:1539
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr ""
 
-#: Model/Server.php:1547
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1555
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1563
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1571
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr ""
 
-#: Model/Server.php:1579
+#: Model/Server.php:1745
 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:1588
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1597
+#: Model/Server.php:1763
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1606
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1615
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1624
+#: Model/Server.php:1790
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1799
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1690
+#: Model/Server.php:1856
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1698
+#: Model/Server.php:1864
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1706
+#: Model/Server.php:1872
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1714
+#: Model/Server.php:1880
 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:1722
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1730
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1738
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1746
+#: Model/Server.php:1912
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1754
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1762
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1770
+#: Model/Server.php:1936
 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:1778
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1786
+#: Model/Server.php:1952
 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:1795
+#: Model/Server.php:1961
 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:1803
+#: Model/Server.php:1969
 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:1811
+#: Model/Server.php:1977
+msgid "Enable SightingDB integration."
+msgstr ""
+
+#: Model/Server.php:1985
 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:1821
+#: Model/Server.php:1995
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1830
+#: Model/Server.php:2004
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1839
+#: Model/Server.php:2013
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1848
+#: Model/Server.php:2022
 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:1857
+#: Model/Server.php:2031
 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:1866
+#: Model/Server.php:2040
 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:1875
+#: Model/Server.php:2049
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1883
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1891
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1899
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1907
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1915
+#: Model/Server.php:2089
 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:1923
+#: Model/Server.php:2097
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1931
+#: Model/Server.php:2105
 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:1939
+#: Model/Server.php:2113
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1947
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1955
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1963
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1971
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1979
+#: Model/Server.php:2153
 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:1987
+#: Model/Server.php:2161
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1995
+#: Model/Server.php:2169
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:2003
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:2011
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2019
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:2028
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2036
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:2045
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:2054
+#: Model/Server.php:2228
 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:2063
+#: Model/Server.php:2237
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:2072
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:2081
+#: Model/Server.php:2255
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:2091
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:2100
+#: Model/Server.php:2274
 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:2254
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2258
+#: Model/Server.php:2445
 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:2285
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr ""
 
-#: Model/Server.php:2291
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr ""
 
-#: Model/Server.php:2369
+#: Model/Server.php:2557
 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:2371
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr ""
 
-#: Model/Server.php:2372
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2384;2386
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr ""
 
-#: Model/Server.php:2850
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2853
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2861
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2976
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3676
+#: Model/Server.php:3281
+msgid "Invalid language."
+msgstr ""
+
+#: Model/Server.php:3302
+msgid "Invalid tag_collection."
+msgstr ""
+
+#: Model/Server.php:3310
+msgid "This setting has to be a number."
+msgstr ""
+
+#: Model/Server.php:3322
+msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
+msgstr ""
+
+#: Model/Server.php:3619
+msgid "Invalid file path or file not accessible."
+msgstr ""
+
+#: Model/Server.php:3622
+msgid "File has to be in .pem format."
+msgstr ""
+
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr ""
 
-#: Model/Server.php:3808
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr "Loga organizace"
 
-#: Model/Server.php:3809
+#: Model/Server.php:4121
 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:3811
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr "soubory PNG 48 x 48 pixelů"
 
-#: Model/Server.php:3814;3829
+#: Model/Server.php:4126;4141
 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:3818
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr "Další obrázky"
 
-#: Model/Server.php:3819
+#: Model/Server.php:4131
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:3826
+#: Model/Server.php:4138
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:4014
+#: Model/Server.php:4228
+msgid "Invalid server."
+msgstr ""
+
+#: Model/Server.php:4259
+msgid "Response was empty."
+msgstr ""
+
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:4471
+#: Model/Server.php:4604
+msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
+msgstr ""
+
+#: Model/Server.php:4675
+msgid "Can't check database schema for Postgres database type"
+msgstr ""
+
+#: Model/Server.php:4692
+msgid "Table `%s` does not exist"
+msgstr ""
+
+#: Model/Server.php:4719
+msgid "Column `%s` exists but should not"
+msgstr ""
+
+#: Model/Server.php:4752
+msgid "Column `%s` is different"
+msgstr ""
+
+#: Model/Server.php:4762
+msgid "Column `%s` does not exist but should"
+msgstr ""
+
+#: Model/Server.php:4775
+msgid "Table `%s` is an additional table"
+msgstr ""
+
+#: Model/Server.php:4799
+msgid "Column `%s` should be indexed"
+msgstr ""
+
+#: Model/Server.php:4822
+msgid "Column `%s` is indexed but should not"
+msgstr ""
+
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:4472
+#: Model/Server.php:5253
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:4476
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:4477
+#: Model/Server.php:5258
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:4805
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:4805;4834
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:4817
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:4818
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:4931
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:4938
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:4945
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr ""
 
+#: Model/Server.php:5911
+msgid "Could not reset the remote authentication key."
+msgstr ""
+
+#: Model/Server.php:5988
+msgid "Could not parse JSON: "
+msgstr ""
+
+#: Model/Server.php:6008
+msgid "Could not reset fetch remote user account."
+msgstr ""
+
+#: Model/Server.php:6030
+msgid "No user object received in response."
+msgstr ""
+
+#: Model/Sightingdb.php:346
+msgid "Could not resolve Sightingdb address."
+msgstr ""
+
+#: Model/Sightingdb.php:348
+msgid "Something went wrong. Could not contact the SightingDB server."
+msgstr ""
+
+#: Model/Sightingdb.php:363
+msgid "The SightingDB returned an invalid response."
+msgstr ""
+
+#: Model/Sightingdb.php:366
+msgid "No response from the SightingDB server."
+msgstr ""
+
+#: Model/Taxonomy.php:619
+msgid "Taxonomy `%s` is an exclusive Taxonomy"
+msgstr ""
+
+#: Model/Taxonomy.php:626
+msgid "Predicate `%s` is exclusive"
+msgstr ""
+
+#: Model/User.php:1254
+msgid "reset_all_sync_api_keys"
+msgstr ""
+
+#: Model/User.php:1255
+msgid "Reseting all API keys"
+msgstr ""
+
+#: Model/User.php:1317
+msgid "Reset in progress - %s/%s."
+msgstr ""
+
+#: Model/User.php:1322
+msgid "%s authkeys reset, %s could not be reset"
+msgstr ""
+
+#: Model/User.php:1347
+msgid "Authentication key for user %s (%s) updated."
+msgstr ""
+
+#: Model/User.php:1359
+msgid "Dear user,\n\n"
+"an API key reset has been triggered by an administrator for your user account on %s.\n\n"
+"Your new API key is: %s\n\n"
+"Please update your server's sync setup to reflect this change.\n\n"
+"We apologise for the inconvenience."
+msgstr ""
+
+#: Model/User.php:1364
+msgid "Dear user,\n\n"
+"an API key reset has been triggered by an administrator for your user account on %s.\n\n"
+"Your new API key can be retrieved by logging in using this sync user's account.\n\n"
+"Please update your server's sync setup to reflect this change.\n\n"
+"We apologise for the inconvenience."
+msgstr ""
+
+#: Model/User.php:1373
+msgid "API key reset by administrator"
+msgstr ""
+
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/Polynomial.php:7
+msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/PolynomialExtended.php:7
+msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms` with support of the `Retention` taxonomy which overrides the final score."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/PolynomialExtended.php:17
+msgid "`Retention` taxonomy not available"
+msgstr ""
+
 #: Plugin/Assets/models/behaviors/LogableBehavior.php:361
 msgid "deleted"
 msgstr "odstraněno"
@@ -4036,19 +5508,19 @@ msgstr "aktualizováno"
 msgid "it has the following dependent items"
 msgstr ""
 
-#: View/Attributes/add.ctp:7
+#: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Přidat atribut"
 
-#: View/Attributes/add.ctp:7
+#: View/Attributes/add.ctp:6
 #: View/Attributes/edit.ctp:4
 msgid "Edit Attribute"
 msgstr "Upravit atribut"
 
-#: View/Attributes/add.ctp:14
+#: View/Attributes/add.ctp:18
 #: View/Attributes/attribute_replace.ctp:12
 #: View/Attributes/edit.ctp:8
 #: View/ShadowAttributes/add.ctp:10
@@ -4056,53 +5528,26 @@ msgstr "Upravit atribut"
 msgid "(choose one)"
 msgstr "(vyberte jeden)"
 
-#: 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 "Kategorie "
+#: View/Attributes/add.ctp:25
+msgid "(choose category first)"
+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 "(nejprve vyberte kategorii)"
-
-#: View/Attributes/add.ctp:19
-#: View/Attributes/edit.ctp:13
-#: View/ShadowAttributes/add.ctp:16
-#: View/ShadowAttributes/edit.ctp:14
-msgid "Type "
-msgstr "Typ "
-
-#: View/Attributes/add.ctp:36
-#: View/Attributes/add_attachment.ctp:24
-#: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:20
-msgid "Distribution "
-msgstr "Distribuce "
-
-#: View/Attributes/add.ctp:50
+#: View/Attributes/add.ctp:39
 #: 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:178
-#: View/Feeds/edit.ctp:173
+#: View/Events/add.ctp:33
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
+#: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
 msgstr "Sdílená skupina"
 
-#: View/Attributes/add.ctp:67
+#: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -4111,133 +5556,52 @@ msgstr "Sdílená skupina"
 msgid "Contextual Comment"
 msgstr "Kontextový komentář"
 
-#: View/Attributes/add.ctp:76
+#: View/Attributes/add.ctp:57
 #: View/Attributes/edit.ctp:55
 #: View/Elements/eventattributecreation.ctp:53
 #: View/ShadowAttributes/add.ctp:38
 msgid "for Intrusion Detection System"
 msgstr "pro systém detekce vniknutí - IDS"
 
-#: 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;202
-#: View/Events/contact.ctp:29
-#: View/Events/edit.ctp:61
-#: View/Events/free_text_import.ctp:27
-#: View/Events/resolved_misp_format.ctp:350
-#: View/News/add.ctp:33
-#: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:131
-#: View/Objects/add.ctp:153
-#: View/Organisations/admin_add.ctp:49
-#: View/Organisations/admin_edit.ctp:60
-#: View/Posts/add.ctp:66
-#: View/Posts/edit.ctp:20
-#: View/Servers/add.ctp:119
-#: View/Servers/edit.ctp:164
-#: View/Servers/ondemand_action.ctp:53
-#: 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/Users/statistics_galaxymatrix.ctp:31
-#: View/Whitelists/admin_edit.ctp:13
-msgid "Submit"
-msgstr "Odeslat"
+#: View/Attributes/add.ctp:155
+msgid "Timezone missing, auto-detected as: "
+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:203
-#: 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/resolved_misp_format.ctp:351
-#: View/Events/ajax/enrich_event.ctp:22
-#: View/Events/ajax/enrichmentChoice.ctp:35
-#: 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:135
-#: View/ObjectReferences/ajax/delete.ctp:37
-#: View/Objects/add.ctp:159
-#: View/Objects/revise_object.ctp:105
-#: 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 "Zrušit"
+#: View/Attributes/add.ctp:156
+msgid "The following value will be submited instead: "
+msgstr ""
+
+#: View/Attributes/add.ctp:164
+msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
+msgstr ""
 
 #: View/Attributes/add_attachment.ctp:4
 msgid "Add Attachment(s)"
 msgstr "Přidat přílohu(y)"
 
-#: View/Attributes/add_attachment.ctp:64
+#: 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 "Kategorie "
+
+#: View/Attributes/add_attachment.ctp:24
+#: View/Attributes/edit.ctp:24
+#: View/Objects/ajax/quickAddAttributeForm.ctp:59
+msgid "Distribution "
+msgstr "Distribuce "
+
+#: View/Attributes/add_attachment.ctp:63
 msgid "Is a malware sample (encrypt and hash)"
 msgstr "Je vzorek malware (šifra a hash)"
 
-#: View/Attributes/add_attachment.ctp:73
+#: View/Attributes/add_attachment.ctp:72
 msgid "Advanced extraction (if installed)"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:78
+#: View/Attributes/add_attachment.ctp:77
 #: View/Elements/healthElements/files.ctp:92
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
@@ -4259,24 +5623,30 @@ msgid "This is a list of events that match the given search criteria sorted acco
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:6
+#: View/EventDelegations/index.ctp:70
 msgid "Event id"
 msgstr "ID události"
 
 #: View/Attributes/alternate_search_result.ctp:7
 #: View/Attributes/index.ctp:49
-#: View/Elements/eventattribute.ctp:146
+#: View/DecayingModel/decaying_tool_rest_search.ctp:24
+#: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr "Org"
 
 #: View/Attributes/alternate_search_result.ctp:8
-#: View/Elements/Events/View/row_attribute.ctp:68
+#: View/Elements/Events/View/row_attribute.ctp:71
 #: View/EventBlacklists/add.ctp:24
 #: View/EventBlacklists/edit.ctp:25
+#: View/EventDelegations/index.ctp:78
 #: View/Events/add_misp_export_result.ctp:5
 #: View/Events/resolved_misp_format.ctp:51
 msgid "Event info"
@@ -4287,7 +5657,7 @@ msgid "Event date"
 msgstr "Datum události"
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:472
+#: View/Events/view.ctp:509
 msgid "Event graph"
 msgstr "Graf události"
 
@@ -4309,6 +5679,13 @@ msgstr "Nástroj pro nahrazení atributu"
 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:15
+#: View/Attributes/edit.ctp:12
+#: View/ShadowAttributes/add.ctp:15
+#: View/ShadowAttributes/edit.ctp:13
+msgid "(first choose category)"
+msgstr "(nejprve vyberte kategorii)"
+
 #: View/Attributes/attribute_replace.ctp:19
 msgid "Mark all new attributes as to IDS"
 msgstr "Označit všechny nové atributy jako pro IDS"
@@ -4320,10 +5697,10 @@ msgid "Values"
 msgstr "Hodnoty"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
-#: View/ShadowAttributes/add.ctp:46
+#: View/ShadowAttributes/add.ctp:57
 #: 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
@@ -4341,6 +5718,115 @@ msgstr "Nahradit atributy"
 msgid "Replaceattributes"
 msgstr "Nahradit atributy"
 
+#: View/Attributes/attribute_replace.ctp:38
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Elements/view_galaxy_matrix.ctp:76;211
+#: View/Elements/genericElements/Form/submitButton.ctp:8;25
+#: View/Events/contact.ctp:29
+#: View/Events/free_text_import.ctp:27
+#: View/Events/resolved_misp_format.ctp:386
+#: View/News/add.ctp:33
+#: View/News/edit.ctp:34
+#: View/ObjectReferences/ajax/add.ctp:131
+#: View/Objects/add.ctp:166
+#: View/Objects/ajax/quickAddAttributeForm.ctp:119
+#: View/Organisations/admin_add.ctp:48
+#: View/Organisations/admin_edit.ctp:59
+#: View/Posts/add.ctp:66
+#: View/Posts/edit.ctp:20
+#: View/Servers/add.ctp:129
+#: View/Servers/edit.ctp:171
+#: View/Servers/ondemand_action.ctp:54
+#: 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/UserSettings/set_setting.ctp:36
+#: View/Users/admin_add.ctp:98
+#: 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/Users/statistics_galaxymatrix.ctp:31
+#: View/Whitelists/admin_edit.ctp:13
+msgid "Submit"
+msgstr "Odeslat"
+
+#: View/Attributes/attribute_replace.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
+#: 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:212
+#: View/Elements/genericElements/infoModal.ctp:40
+#: View/Elements/genericElements/Form/submitButton.ctp:13
+#: View/Elements/serverRuleElements/pull.ctp:73
+#: 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/resolved_misp_format.ctp:387
+#: View/Events/ajax/enrich_event.ctp:22
+#: View/Events/ajax/enrichmentChoice.ctp:35
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:135
+#: View/ObjectReferences/ajax/delete.ctp:37
+#: View/Objects/add.ctp:172
+#: View/Objects/revise_object.ctp:112
+#: 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:69
+#: View/ShadowAttributes/edit.ctp:68
+#: 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:26
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:32
+#: View/Warninglists/ajax/delete_confirmation.ctp:25
+msgid "Cancel"
+msgstr "Zrušit"
+
 #: View/Attributes/check_composites.ctp:2
 msgid "Failed Composites"
 msgstr "Neúspěšné kompozity"
@@ -4349,24 +5835,31 @@ msgstr "Neúspěšné kompozity"
 msgid "No Failed Composites"
 msgstr "Žádné selhané kompozity"
 
+#: View/Attributes/edit.ctp:13
+#: View/ShadowAttributes/add.ctp:16
+#: View/ShadowAttributes/edit.ctp:14
+msgid "Type "
+msgstr "Typ "
+
 #: View/Attributes/edit.ctp:16
 #: View/Pages/doc/using_the_system.ctp:368
 msgid "disabled"
 msgstr "zakázáno"
 
 #: View/Attributes/edit.ctp:68
-#: View/ShadowAttributes/add.ctp:55
-#: View/ShadowAttributes/edit.ctp:45;54
+#: View/ShadowAttributes/add.ctp:66
+#: View/ShadowAttributes/edit.ctp:56;65
 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:481
+#: View/Events/view.ctp:521
 #: 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
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr "Atributy"
 
@@ -4403,22 +5896,21 @@ msgid "Results for all attributes"
 msgstr "Výsledky pro všechny atributy"
 
 #: View/Attributes/index.ctp:39;128
-#: View/Elements/eventattribute.ctp:60;227
+#: View/DecayingModel/decaying_tool_rest_search.ctp:12;64
+#: View/DecayingModel/index.ctp:13;169
+#: View/Elements/eventattribute.ctp:60;247
 #: 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/Elements/genericElements/IndexTable/pagination.ctp:10
+#: View/Elements/Feeds/eventattribute.ctp:20;87
+#: View/Elements/Servers/eventattribute.ctp:20;87
+#: View/Elements/genericElements/IndexTable/pagination.ctp:14
 #: View/EventBlacklists/index.ctp:13;85
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -4431,19 +5923,18 @@ msgstr "Výsledky pro všechny atributy"
 #: 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;95
+#: View/Roles/admin_index.ctp:13;105
 #: View/Roles/index.ctp:13;68
-#: View/Servers/index.ctp:13;156
+#: View/Servers/index.ctp:13;202
 #: View/Servers/preview_index.ctp:15;190
-#: View/ShadowAttributes/index.ctp:12;118
-#: View/SharingGroups/index.ctp:13;105
+#: View/ShadowAttributes/index.ctp:12;128
+#: View/SharingGroups/index.ctp:13;107
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;65
 #: 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
@@ -4452,22 +5943,21 @@ msgid "previous"
 msgstr "předchozí"
 
 #: View/Attributes/index.ctp:41;130
-#: View/Elements/eventattribute.ctp:62;229
+#: View/DecayingModel/decaying_tool_rest_search.ctp:14;66
+#: View/DecayingModel/index.ctp:15;171
+#: View/Elements/eventattribute.ctp:62;249
 #: 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/Elements/genericElements/IndexTable/pagination.ctp:12
+#: View/Elements/Feeds/eventattribute.ctp:22;89
+#: View/Elements/Servers/eventattribute.ctp:22;89
+#: View/Elements/genericElements/IndexTable/pagination.ctp:16
 #: View/EventBlacklists/index.ctp:15;87
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -4480,19 +5970,18 @@ msgstr "předchozí"
 #: 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;97
+#: View/Roles/admin_index.ctp:15;107
 #: View/Roles/index.ctp:15;70
-#: View/Servers/index.ctp:15;158
+#: View/Servers/index.ctp:15;204
 #: View/Servers/preview_index.ctp:17;192
-#: View/ShadowAttributes/index.ctp:14;120
-#: View/SharingGroups/index.ctp:15;107
+#: View/ShadowAttributes/index.ctp:14;130
+#: View/SharingGroups/index.ctp:15;109
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;67
 #: 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
@@ -4500,26 +5989,41 @@ msgstr "předchozí"
 msgid "next"
 msgstr "další"
 
+#: View/Attributes/index.ctp:47
+#: View/DecayingModel/decaying_tool_rest_search.ctp:23
+#: View/Elements/eventattribute.ctp:139
+#: View/Elements/Feeds/eventattribute.ctp:41
+#: View/Elements/Servers/eventattribute.ctp:41
+#: View/Events/proposal_event_index.ctp:30
+#: View/Events/view.ctp:143
+#: View/Feeds/preview_event.ctp:25
+#: View/Objects/group_attributes_into_object.ctp:56
+#: 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/Attributes/index.ctp:54
-#: View/Elements/eventattribute.ctp:157
-#: View/Elements/global_menu.ctp:90
-#: View/Events/view.ctp:493
+#: View/DecayingModel/decaying_tool_rest_search.ctp:30
+#: View/Elements/eventattribute.ctp:158
+#: View/Elements/global_menu.ctp:94
+#: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr ""
 
 #: View/Attributes/index.ctp:56
-#: View/Elements/eventattribute.ctp:159
+#: View/Elements/eventattribute.ctp:160
 msgid "Correlate"
 msgstr ""
 
 #: View/Attributes/index.ctp:57
-#: View/Elements/eventattribute.ctp:160
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:336
+#: View/Elements/eventattribute.ctp:161
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+#: View/Events/view.ctp:372
 #: View/Feeds/preview_event.ctp:73
 #: View/Pages/doc/using_the_system.ctp:235
 #: View/Servers/preview_event.ctp:95
@@ -4527,30 +6031,33 @@ msgid "Related Events"
 msgstr ""
 
 #: View/Attributes/index.ctp:58
-#: View/Elements/eventattribute.ctp:161
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:49
 msgid "Feed hits"
 msgstr ""
 
 #: View/Attributes/index.ctp:61
-#: View/Elements/eventattribute.ctp:164
-#: View/Events/view.ctp:251
+#: View/DecayingModel/decaying_tool_rest_search.ctp:33
+#: View/Elements/eventattribute.ctp:165
+#: View/Events/view.ctp:252
 msgid "Sightings"
 msgstr ""
 
 #: View/Attributes/index.ctp:62
-#: View/Elements/eventattribute.ctp:165
-#: View/Events/view.ctp:261
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:262
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr ""
 
 #: View/Attributes/index.ctp:63
-#: View/Elements/eventattribute.ctp:166
+#: View/DecayingModel/index.ctp:99
+#: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -4559,10 +6066,7 @@ msgstr ""
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -4570,12 +6074,12 @@ msgstr ""
 #: 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/Roles/admin_index.ctp:36
+#: View/Servers/index.ctp:41
 #: View/Servers/preview_index.ctp:106
 #: View/SharingGroups/add.ctp:74;94
 #: View/SharingGroups/edit.ctp:74;102
-#: View/SharingGroups/index.ctp:47
+#: View/SharingGroups/index.ctp:48
 #: View/Sightings/ajax/list_sightings.ctp:11
 #: View/TagCollections/index.ctp:16
 #: View/Tags/index.ctp:76
@@ -4588,6 +6092,8 @@ msgid "Actions"
 msgstr ""
 
 #: View/Attributes/index.ctp:121
+#: View/DecayingModel/decaying_tool_rest_search.ctp:57
+#: View/DecayingModel/index.ctp:162
 #: View/Elements/eventdiscussion.ctp:119
 #: View/Elements/generic_table.ctp:53
 #: View/Elements/generic_table_row.ctp:45
@@ -4596,10 +6102,7 @@ msgstr ""
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -4612,19 +6115,18 @@ msgstr ""
 #: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
-#: View/Roles/admin_index.ctp:88
+#: View/Roles/admin_index.ctp:98
 #: View/Roles/index.ctp:61
-#: View/Servers/index.ctp:149
+#: View/Servers/index.ctp:195
 #: View/Servers/preview_index.ctp:182
-#: View/ShadowAttributes/index.ctp:111
-#: View/SharingGroups/index.ctp:98
+#: View/ShadowAttributes/index.ctp:121
+#: View/SharingGroups/index.ctp:100
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:58
 #: 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
@@ -4690,11 +6192,12 @@ msgstr ""
 msgid "Alternate Search Result (Events)"
 msgstr ""
 
-#: View/Attributes/search.ctp:38
-#: View/Events/automation.ctp:14
-#: View/Logs/admin_index.ctp:20;21
-#: View/Logs/admin_search.ctp:25
-msgid "Search"
+#: View/Attributes/search.ctp:47
+msgid "First seen and Last seen."
+msgstr ""
+
+#: View/Attributes/search.ctp:48
+msgid "Attributes not having first seen or last seen set might not appear in the search"
 msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:6
@@ -4711,16 +6214,15 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90;98
-#: View/Elements/Events/eventIndexTable.ctp:245
-#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -4729,117 +6231,21 @@ msgstr ""
 #: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:80
-#: View/Servers/index.ctp:137
-#: View/SharingGroups/index.ctp:87
+#: View/Roles/admin_index.ctp:90
+#: View/Servers/index.ctp:183
+#: View/SharingGroups/index.ctp:89
 #: View/Tags/index.ctp:125
 #: View/Whitelists/admin_index.ctp:32
 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
-#: View/Elements/Feeds/View/row_attribute.ctp:87
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:190
-#: 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:85
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:42;50
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:74;75;76;112;113;118;119
-#: 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 "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
-#: View/Elements/Feeds/View/row_attribute.ctp:87
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:190
-#: 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:85
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:42;50
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:74;75;76;108;112;113;118;119
-#: 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 "Ne"
-
 #: 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
+#: View/Objects/ajax/objectEditCommentForm.ctp:5
+#: View/Objects/ajax/objectEditDistributionForm.ctp:5
 msgid "Accept change"
 msgstr "Přijmout změnu"
 
@@ -4848,6 +6254,8 @@ msgstr "Přijmout změnu"
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
+#: View/Objects/ajax/objectEditCommentForm.ctp:6
+#: View/Objects/ajax/objectEditDistributionForm.ctp:6
 msgid "Discard change"
 msgstr "Zahodit změny"
 
@@ -4862,14 +6270,15 @@ msgstr "Neměňte aktuální nastavení"
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:51
-#: View/Events/resolved_misp_format.ctp:97;267
-#: View/Events/view.ctp:158
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:165
+#: View/Events/resolved_misp_format.ctp:98;293
+#: View/Events/view.ctp:159
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
-#: View/Objects/add.ctp:47;105;201
+#: View/Feeds/index.ctp:184
+#: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
-#: View/Objects/revise_object.ctp:35;62
+#: View/Objects/revise_object.ctp:35;69
 #: 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
@@ -4882,23 +6291,27 @@ msgstr ""
 msgid "For Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
@@ -4979,41 +6392,952 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Communities/index.ctp:14
+msgid "Vetted by the MISP-project team"
+msgstr ""
+
+#: View/Communities/index.ctp:19
+msgid "Unvetted"
+msgstr ""
+
+#: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
+#: View/EventBlacklists/index.ctp:35
+#: View/EventDelegations/index.ctp:41
+#: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
+#: View/Feeds/preview_index.ctp:25
+#: View/Feeds/search_caches.ctp:26
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
+#: View/ObjectTemplates/index.ctp:47
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
+#: View/ShadowAttributes/index.ctp:37
+#: View/Sightingdb/index.ctp:10
+#: View/Tags/index.ctp:56
+#: View/Taxonomies/view.ctp:65
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
+msgid "Filter"
+msgstr ""
+
+#: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
+#: View/Elements/eventattributetoolbar.ctp:231
+#: View/EventBlacklists/index.ctp:36
+#: View/EventDelegations/index.ctp:42
+#: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
+#: View/Feeds/preview_index.ctp:26
+#: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
+#: View/ObjectTemplates/index.ctp:48
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+#: View/ShadowAttributes/index.ctp:38
+#: View/Sightingdb/index.ctp:11
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
+msgid "Enter value to search"
+msgstr ""
+
+#: View/Communities/index.ctp:34
+#: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
+#: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
+#: View/Feeds/search_caches.ctp:35
+#: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Sightingdb/index.ctp:26
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
+#: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/Communities/index.ctp:40
+msgid "Vetted"
+msgstr ""
+
+#: View/Communities/index.ctp:46
+msgid "Host org"
+msgstr ""
+
+#: View/Communities/index.ctp:53
+msgid "Community name"
+msgstr ""
+
+#: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
+#: View/DecayingModel/index.ctp:89
+#: View/DecayingModel/view.ctp:21
+#: View/Elements/Servers/View/row_object.ctp:24
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: 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:26
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
+#: View/ObjectTemplates/view.ctp:9
+#: View/Objects/add.ctp:22;113;210
+#: View/Objects/group_attributes_into_object.ctp:8
+#: View/Objects/propose_objects_from_attributes.ctp:17
+#: 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:46
+#: View/Sightingdb/index.ctp:88
+#: View/TagCollections/index.ctp:15
+#: View/Taxonomies/view.ctp:14
+#: View/Templates/view.ctp:14
+#: View/Warninglists/view.ctp:11
+msgid "Description"
+msgstr ""
+
+#: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
+msgid "Communities index"
+msgstr ""
+
+#: View/Communities/index.ctp:72
+msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
+msgstr ""
+
+#: View/Communities/request_access.ctp:7
+msgid "Describe both yourself and your organisation as best as you can - keep in mind this information is to be used by the hosts of the community you are requesting access to in order to determine whether you're a good fit for their community. The sending server's basic metadata is included by default, you can opt out using the \"anonymise\" checkbox (server url, uuid, version are shared otherwise - though this can be a useful step in establishing trust.)."
+msgstr ""
+
+#: View/Communities/request_access.ctp:10
+msgid "Requestor E-mail address"
+msgstr ""
+
+#: View/Communities/request_access.ctp:15
+#: View/Jobs/index.ctp:104
+#: View/OrgBlacklists/add.ctp:17
+#: View/OrgBlacklists/index.ctp:22
+#: View/Organisations/view.ctp:6
+msgid "Organisation name"
+msgstr ""
+
+#: View/Communities/request_access.ctp:20
+msgid "Organisation uuid"
+msgstr ""
+
+#: View/Communities/request_access.ctp:25
+msgid "Description of the requestor organisation"
+msgstr ""
+
+#: View/Communities/request_access.ctp:31
+msgid "Message to the community host organisation"
+msgstr ""
+
+#: View/Communities/request_access.ctp:37
+msgid "PGP public key"
+msgstr ""
+
+#: View/Communities/request_access.ctp:44
+msgid "Request sync access"
+msgstr ""
+
+#: View/Communities/request_access.ctp:49
+msgid "Anonymise information on the server used to issue the request"
+msgstr ""
+
+#: View/Communities/request_access.ctp:54
+msgid "Generate e-mail for later use, but do not send it"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:5
+msgid "Email to send in order to request access"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:6
+msgid "Emailing is currently disabled on the instance, but we have generated the e-mail that would normally be sent out below."
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:7
+msgid "Please find a generated e-mail below that you can use to contact the community in question"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:8
+msgid "Headers:"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:10
+msgid "Message:"
+msgstr ""
+
+#: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
+#: View/Elements/Events/View/row_object.ctp:72
+#: View/Events/resolved_misp_format.ctp:93;288
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
+#: View/ObjectTemplates/index.ctp:66
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:68
+#: View/OrgBlacklists/index.ctp:23
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:58;65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+#: View/SharingGroups/index.ctp:43
+#: View/TagCollections/index.ctp:8
+msgid "UUID"
+msgstr ""
+
+#: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
+#: View/DecayingModel/index.ctp:88
+#: View/DecayingModel/view.ctp:14
+#: View/Elements/Servers/View/row_object.ctp:19
+#: View/Elements/templateElements/templateRowAttribute.ctp:12
+#: View/Elements/templateElements/templateRowFile.ctp:12
+#: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
+#: View/Feeds/search_caches.ctp:47
+#: View/Feeds/view.ctp:4
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
+#: View/ObjectTemplates/view.ctp:4
+#: View/Objects/add.ctp:206
+#: View/Objects/revise_object.ctp:27
+#: 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/Sightingdb/index.ctp:51
+#: View/Templates/view.ctp:9
+#: View/Users/statistics_orgs.ctp:33
+#: View/Warninglists/view.ctp:10
+msgid "Name"
+msgstr ""
+
+#: View/Communities/view.ctp:7
+#: View/SharingGroups/view.ctp:68
+msgid "Url"
+msgstr ""
+
+#: View/Communities/view.ctp:8
+msgid "Host organisation"
+msgstr ""
+
+#: View/Communities/view.ctp:10
+msgid "Vetted by MISP-project"
+msgstr ""
+
+#: View/Communities/view.ctp:27
+#: View/Elements/footer.ctp:15
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:64
+#: View/Users/admin_view.ctp:72
+#: View/Users/edit.ctp:23
+#: View/Users/view.ctp:32
+msgid "GnuPG key"
+msgstr ""
+
+#: View/Communities/view.ctp:42
+msgid "Community "
+msgstr ""
+
+#: View/Communities/view.ctp:51
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
+msgid "Request Access"
+msgstr ""
+
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
+#: View/DecayingModel/add.ctp:4
+msgid " Decaying Model"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:7
+msgid "You are editing a Default Model, only restricted edition is allowed."
+msgstr ""
+
+#: View/DecayingModel/add.ctp:9;28
+msgid "Can other organization use this model"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:37
+msgid "days"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:46;56;65
+msgid "float"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:65
+msgid "Default base_score"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:65
+msgid "Default base_score value if no tags are attached to the indicator"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:75
+msgid "Base Score configuration"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:84
+msgid "Model Settings"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:9
+msgid "Show All Types"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:13
+msgid "Show MISP Objects"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:15
+msgid "Search Attribute Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:22
+msgid "Check all"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:23
+msgid "Attribute Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:24
+#: View/DecayingModel/decaying_tool_rest_search.ctp:25
+#: View/Elements/templateElements/templateRowAttribute.ctp:30
+#: View/Elements/templateElements/templateRowFile.ctp:30
+#: View/Events/resolved_attributes.ctp:47
+#: View/Events/resolved_misp_format.ctp:90;285
+#: View/Events/show_i_o_c_results.ctp:11
+#: View/Feeds/freetext_index.ctp:31
+#: View/Objects/add.ctp:114
+#: View/Objects/group_attributes_into_object.ctp:57
+#: View/Objects/propose_objects_from_attributes.ctp:16
+#: View/Objects/revise_object.ctp:63
+#: 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:65
+#: 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/DecayingModel/decaying_tool.ctp:25
+#: View/DecayingModel/view.ctp:3
+#: View/Logs/admin_index.ctp:75
+#: View/Logs/admin_search.ctp:14
+msgid "Model ID"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:47
+msgid "Belong to a MISP Object"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:51
+msgid "To IDS flag set"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:100
+msgid "Adjust base  score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:108
+msgid "Simulate this model"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:129
+msgid "Model's Settings"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Elements/eventdiscussion.ctp:89;97
+#: View/Elements/Events/eventIndexTable.ctp:231
+#: View/Elements/Events/View/row_attribute.ctp:413
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Users/userIndexTable.ctp:90
+#: View/EventBlacklists/edit.ctp:37
+#: View/EventBlacklists/index.ctp:69
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
+#: View/News/index.ctp:22
+#: View/OrgBlacklists/edit.ctp:30
+#: View/OrgBlacklists/index.ctp:36
+#: View/Organisations/index.ctp:138
+#: View/Pages/doc/using_the_system.ctp:191
+#: View/Regexp/admin_index.ctp:34
+#: View/Roles/admin_edit.ctp:56
+#: View/Roles/admin_index.ctp:89
+#: View/Servers/index.ctp:182
+#: View/SharingGroups/index.ctp:88
+#: View/Tags/edit.ctp:36
+#: View/Tags/index.ctp:124
+#: View/Templates/edit.ctp:49
+#: View/Whitelists/admin_index.ctp:31
+msgid "Edit"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Templates/add.ctp:49
+msgid "Create"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:146
+msgid "All available models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:149
+msgid "My models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:152
+msgid "Default models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:3
+msgid "Search Taxonomy"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:4
+msgid "Clear search field"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:5
+msgid " not having numerical value"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:7
+msgid "Default basescore"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:13
+#: View/Taxonomies/index.ctp:2
+msgid "Taxonomies"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:14
+msgid "Weight"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:91
+msgid "Excluded"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:112
+msgid "Placeholder for `Organisation source confidence`"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:115
+msgid "Example"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:141;146;151
+msgid "Pick a Taxonomy"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:157
+msgid "Computation steps"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:160
+msgid "Apply base score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:26
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
+#: View/Events/export.ctp:26
+#: View/Events/resolved_attributes.ctp:48
+#: View/Events/resolved_misp_format.ctp:91;286
+#: View/Events/show_i_o_c_results.ctp:12
+#: View/Feeds/freetext_index.ctp:32
+#: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
+#: View/Objects/revise_object.ctp:64
+#: 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:53;68
+#: 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:38
+#: View/Warninglists/view.ctp:13
+msgid "Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:27
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+#: 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/resolved_misp_format.ctp:92;287
+#: View/Events/show_i_o_c_results.ctp:13
+#: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
+#: View/Noticelists/view.ctp:42
+#: View/Objects/add.ctp:115
+#: View/Objects/group_attributes_into_object.ctp:58
+#: View/Objects/revise_object.ctp:65
+#: View/Objects/ajax/quickAddAttributeForm.ctp:78
+#: 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/UserSettings/index.ctp:68
+#: View/Users/admin_filter_user_index.ctp:71
+msgid "Value"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:29
+msgid "Event Tags"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:31
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
+#: View/ObjectReferences/ajax/add.ctp:30
+#: View/Objects/add.ctp:67;119
+#: View/Objects/group_attributes_into_object.ctp:30
+#: View/Objects/revise_object.ctp:49;67
+#: View/Pages/doc/using_the_system.ctp:234;284
+#: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
+msgid "Comment"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:35
+#: View/Elements/eventattribute.ctp:179
+msgid "Score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:84
+#: View/DecayingModel/decaying_tool_simulation.ctp:184
+msgid "Failed to perform RestSearch"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search_form.ctp:3
+msgid "Decaying Model RestSearch"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:45
+#: View/Events/automation.ctp:24
+#: View/Logs/admin_index.ctp:20;21
+#: View/Logs/admin_search.ctp:25
+msgid "Search"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:49
+msgid "Specific Attribute"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:53
+msgid "Attribute ID or UUID"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:55
+msgid "Simulate"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:66
+msgid "Base score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:68;71
+msgid "Base score configuration"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:68
+msgid "not set. But default value sets."
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:71
+msgid "not set"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:79
+msgid "Sighting"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:83
+msgid "Current score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:132
+msgid "Basescore computation steps"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:266
+msgid "Failed to perform the simulation"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:4
+msgid "Import model data"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:5
+msgid "Paste a MISP model JSON or provide a JSON file below to add models."
+msgstr ""
+
+#: View/DecayingModel/import.ctp:10
+#: View/Feeds/import_feeds.ctp:10
+#: View/Servers/import.ctp:10
+#: View/TagCollections/import.ctp:10
+msgid "JSON"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:11
+msgid "Model JSON"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:18
+msgid "JSON file"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:25
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:15
+#: View/Elements/genericElements/org_picker.ctp:17
+#: View/EventBlacklists/add.ctp:36
+#: View/Events/filter_event_index.ctp:125
+#: View/Feeds/add.ctp:220
+#: View/Feeds/import_feeds.ctp:20
+#: View/OrgBlacklists/add.ctp:29
+#: View/Regexp/admin_add.ctp:32
+#: View/Regexp/admin_edit.ctp:42
+#: View/Roles/admin_add.ctp:57
+#: View/Servers/import.ctp:20
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:20
+#: View/Tags/add.ctp:35
+#: View/Users/admin_filter_user_index.ctp:62
+#: View/Whitelists/admin_add.ctp:13
+msgid "Add"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:2
+msgid "Decaying Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:30;31
+msgid "All Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:41
+msgid "My models only"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:42
+msgid "My Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:53
+msgid "Models available to everyone"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:54
+msgid "Shared Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:65
+msgid "Default models only"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:66
+msgid "Default Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:86
+#: View/Pages/doc/using_the_system.ctp:398
+msgid "Organization"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:87
+msgid "Usable to everyone"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:91
+#: View/DecayingModel/view.ctp:40
+msgid "Parameters"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:92
+msgid "Pretty print"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:95
+#: View/DecayingModel/view.ctp:35
+msgid "Formula"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:96
+msgid "# Assigned Types"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:97
+#: View/DecayingModel/view.ctp:25
+#: View/Galaxies/view.ctp:10
+#: View/ObjectTemplates/view.ctp:7
+#: View/Taxonomies/view.ctp:19
+#: View/Warninglists/view.ctp:12
+msgid "Version"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:98
+#: View/DecayingModel/view.ctp:31
+#: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
+#: View/Feeds/view.ctp:63
+#: View/Noticelists/index.ctp:63
+#: View/ObjectTemplates/index.ctp:35
+#: View/Sightingdb/index.ctp:19
+#: View/Taxonomies/view.ctp:24
+#: View/Warninglists/view.ctp:16
+msgid "Enabled"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:114
+#: View/DecayingModel/view.ctp:18
+msgid "Default Model from MISP Project"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:137
+msgid "Download model"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:142
+msgid "Are you sure you want to delete DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:148
+msgid "Are you sure you want to disable DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:150
+msgid "Are you sure you want to enable DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:5
+#: View/Events/view.ctp:86
+msgid "Creator org"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:27
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
+#: View/SharingGroups/view.ctp:69
+#: View/TagCollections/index.ctp:12
+msgid "All orgs"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:41
+msgid "Reference(s)"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:42
+msgid "Associated types"
+msgstr ""
+
+#: View/DecayingModel/ajax/disable_form.ctp:3
+msgid "Disable model"
+msgstr ""
+
+#: View/DecayingModel/ajax/enable_form.ctp:3
+msgid "Enable model"
+msgstr ""
+
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:4
+msgid "Add DecayingModelMapping"
+msgstr ""
+
+#: View/Elements/ajaxAttributeTags.ctp:29
 #: View/Elements/ajaxTagCollectionTags.ctp:16
-#: View/Elements/ajaxTags.ctp:45
+#: View/Elements/ajaxTags.ctp:104
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Elements/ajaxAttributeTags.ctp:43
 #: 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:48
+#: View/Elements/ajaxTags.ctp:73;74
+msgid "Local tag"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:73;74
+msgid "Global tag"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:107
 msgid "Remove tag %s"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:58;61
+#: View/Elements/ajaxTags.ctp:123;124
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 #: View/Templates/add.ctp:28
 #: View/Templates/edit.ctp:28
 msgid "Add a tag"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:67;69;234;236
-#: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
-#: View/Elements/Servers/eventattribute.ctp:28;31;94;97
+#: View/Elements/ajaxTags.ctp:141;142
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
+msgid "Add a local tag"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:67;69;254;256
+#: View/Elements/Feeds/eventattribute.ctp:28;31;95;98
+#: View/Elements/Servers/eventattribute.ctp:28;31;95;98
 msgid "view all"
 msgstr ""
 
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr ""
 
@@ -5022,40 +7346,51 @@ msgid "Select all attributes/proposals on current page"
 msgstr ""
 
 #: View/Elements/eventattribute.ctp:138
-#: View/Elements/Feeds/eventattribute.ctp:41
-#: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/proposal_event_index.ctp:30
-#: View/Events/view.ctp:142
-#: View/Feeds/preview_event.ctp:25
-#: View/Objects/group_attributes_into_object.ctp:56
-#: 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"
+#: View/Elements/Feeds/eventattribute.ctp:42
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:52
+msgid "First seen"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:142
-#: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:218;229
+#: View/Elements/eventattribute.ctp:138
+#: View/Elements/Feeds/eventattribute.ctp:42
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:56
+msgid "Last seen"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:143
+#: View/Elements/eventdiscussion.ctp:143
+#: View/Events/view.ctp:219;230
 #: 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
+#: View/ShadowAttributes/index.ctp:48
 msgid "Event"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:153
+#: View/Elements/eventattribute.ctp:154
+#: View/Elements/eventattributetoolbar.ctp:201
 msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:207
+#: View/Elements/eventattribute.ctp:171
+#: View/Elements/eventattributetoolbar.ctp:185
+msgid "SightingDB"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:178
+msgid "Decaying Score"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:227
 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:211
+#: View/Elements/eventattribute.ctp:231
 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 ""
 
@@ -5068,12 +7403,15 @@ msgid "Show all attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:6
-#: View/Elements/Events/eventIndexTable.ctp:216
+#: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
 #: View/Regexp/admin_edit.ctp:18
 #: View/Sightings/ajax/advanced.ctp:5
+#: View/UserSettings/index.ctp:41
 msgid "All"
 msgstr ""
 
@@ -5095,7 +7433,7 @@ msgid "Only show correlating attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:33
-#: View/Events/view.ctp:305
+#: View/Events/view.ctp:306
 msgid "Correlation"
 msgstr ""
 
@@ -5104,6 +7442,8 @@ msgid "Only show potentially false positive attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr ""
@@ -5113,105 +7453,111 @@ msgstr ""
 msgid "Add attribute"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:59
+#: View/Elements/eventattributetoolbar.ctp:52
+msgid "Add proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:60
 msgid "Edit selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:67
+#: View/Elements/eventattributetoolbar.ctp:68
 msgid "Tag selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:75
+#: View/Elements/eventattributetoolbar.ctp:76
 msgid "Add new cluster to selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:84
+#: View/Elements/eventattributetoolbar.ctp:85
 msgid "Group selected Attributes into an Object"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:93
+#: View/Elements/eventattributetoolbar.ctp:94
 msgid "Delete selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:101
+#: View/Elements/eventattributetoolbar.ctp:102
 msgid "Accept selected Proposals"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:109
+#: View/Elements/eventattributetoolbar.ctp:110
 msgid "Discard selected Proposals"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:117
+#: View/Elements/eventattributetoolbar.ctp:118
 msgid "Sightings display for selected attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:128
+#: View/Elements/eventattributetoolbar.ctp:129
 msgid "Populate using a template"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:136
+#: View/Elements/eventattributetoolbar.ctp:137
 msgid "Populate using the freetext import tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:143
+#: View/Elements/eventattributetoolbar.ctp:144
 msgid "Replace all attributes of a category/type combination within the event"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:157
+#: View/Elements/eventattributetoolbar.ctp:158
 msgid "Use a list of simple scopes to filter the data"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:158
+#: View/Elements/eventattributetoolbar.ctp:159
 msgid "Scope toggle"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:163
+#: View/Elements/eventattributetoolbar.ctp:164
 msgid "Include deleted attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:165
+#: View/Elements/eventattributetoolbar.ctp:166
 msgid "Deleted"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:173
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Show attribute decaying score"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:176
+msgid "Decay score"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:183
+msgid "Show SightingDB lookup results"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:192
 msgid "Show attribute context fields"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:175
+#: View/Elements/eventattributetoolbar.ctp:194
 msgid "Context"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:180
+#: View/Elements/eventattributetoolbar.ctp:199
+msgid "Show related tags"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:208
 msgid "Advanced filtering tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:184
+#: View/Elements/eventattributetoolbar.ctp:212
 msgid "Filtering tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:188
+#: View/Elements/eventattributetoolbar.ctp:216
 msgid "%s active rule(s)"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:203
-#: View/EventBlacklists/index.ctp:36
-#: View/Events/index.ctp:95
-#: View/Feeds/preview_index.ctp:26
-#: View/Feeds/search_caches.ctp:27
-#: View/ObjectTemplates/index.ctp:48
-#: View/Organisations/index.ctp:76
-#: View/Servers/preview_index.ctp:65
-#: View/Users/admin_index.ctp:62
-msgid "Enter value to search"
-msgstr ""
-
-#: View/Elements/eventattributetoolbar.ctp:207
+#: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: 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 ""
 
@@ -5231,32 +7577,6 @@ msgstr ""
 msgid "User "
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:242
-#: View/Elements/Events/View/row_attribute.ctp:393
-#: View/Elements/TagCollections/index_row.ctp:43
-#: View/Elements/Users/userIndexTable.ctp:90
-#: View/EventBlacklists/edit.ctp:37
-#: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:194
-#: View/Feeds/index.ctp:282
-#: View/News/index.ctp:22
-#: View/OrgBlacklists/edit.ctp:30
-#: View/OrgBlacklists/index.ctp:36
-#: View/Organisations/index.ctp:138
-#: View/Pages/doc/using_the_system.ctp:191
-#: View/Regexp/admin_index.ctp:34
-#: View/Roles/admin_edit.ctp:42
-#: View/Roles/admin_index.ctp:79
-#: View/Servers/index.ctp:136
-#: View/SharingGroups/index.ctp:86
-#: View/Tags/edit.ctp:36
-#: View/Tags/index.ctp:124
-#: View/Templates/edit.ctp:49
-#: View/Whitelists/admin_index.ctp:31
-msgid "Edit"
-msgstr ""
-
 #: View/Elements/eventdiscussion.ctp:90;98
 msgid "Are you sure you want to delete this post?"
 msgstr ""
@@ -5265,51 +7585,51 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:141
+#: View/Elements/eventdiscussion.ctp:142
 #: 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/Elements/eventdiscussion.ctp:142
 #: View/Posts/add.ctp:32
 msgid "Quote"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:142
+#: View/Elements/eventdiscussion.ctp:143
 msgid "Insert a link to an event - just enter the event ID between the [event][/event] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:143
+#: View/Elements/eventdiscussion.ctp:144
 #: 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/Elements/eventdiscussion.ctp:144
 #: View/Posts/add.ctp:34
 msgid "Thread"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Insert a link [link][/link] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Link"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Insert a code [code][/code] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Code"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:156
+#: View/Elements/eventdiscussion.ctp:157
 #: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr ""
@@ -5331,15 +7651,6 @@ msgstr ""
 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/edit.ctp:23
-#: View/Users/view.ctp:31
-msgid "GnuPG key"
-msgstr ""
-
 #: View/Elements/footer.ctp:17
 msgid "Could not locate the GnuPG public key."
 msgstr ""
@@ -5348,72 +7659,80 @@ msgstr ""
 msgid "Could not locate SMIME certificate."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:8
-msgid "View details about this galaxy"
+#: View/Elements/form_seen_input.ctp:53
+msgid "First seen date"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:8
-msgid "View galaxy"
+#: View/Elements/form_seen_input.ctp:57
+msgid "Last seen date"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:19
-#: View/Elements/galaxyQuickViewMini.ctp:69
+#: View/Elements/form_seen_input.ctp:63
+msgid "First seen time"
+msgstr ""
+
+#: View/Elements/form_seen_input.ctp:64;69
+msgid "Expected format: HH:MM:SS.ssssss+TT:TT"
+msgstr ""
+
+#: View/Elements/form_seen_input.ctp:68
+msgid "Last seen time"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:79
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:19
-#: View/Elements/galaxyQuickViewMini.ctp:69
-#: View/Elements/Events/eventIndexTable.ctp:138
+#: View/Elements/galaxyQuickView.ctp:77
+#: View/Elements/galaxyQuickViewMini.ctp:80
 msgid "View cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:20
-#: View/Elements/galaxyQuickViewMini.ctp:70
+#: View/Elements/galaxyQuickView.ctp:83;84
+#: View/Elements/galaxyQuickViewMini.ctp:86;87
 msgid "View all events containing this cluster."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:24
+#: View/Elements/galaxyQuickView.ctp:97
 msgid "detach"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:24
+#: View/Elements/galaxyQuickView.ctp:98
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:96
-#: View/Elements/galaxyQuickViewMini.ctp:89
-#: View/EventBlacklists/add.ctp:36
-#: View/Events/add.ctp:71
-#: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
-#: View/Feeds/import_feeds.ctp:20
-#: View/OrgBlacklists/add.ctp:29
-#: View/Regexp/admin_add.ctp:32
-#: View/Regexp/admin_edit.ctp:42
-#: View/Roles/admin_add.ctp:44
-#: View/Servers/import.ctp:20
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
-#: View/Sightings/ajax/add_sighting.ctp:33
-#: View/TagCollections/import.ctp:20
-#: View/Tags/add.ctp:35
-#: View/Users/admin_filter_user_index.ctp:62
-#: View/Whitelists/admin_add.ctp:13
-msgid "Add"
+#: View/Elements/galaxyQuickView.ctp:114
+msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:74
-msgid "Are you sure you want to detach %s from this %s?"
+#: View/Elements/galaxyQuickView.ctp:115
+msgid "View galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:89
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:205
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
+msgid "Add new local cluster"
+msgstr ""
+
+#: View/Elements/galaxyQuickViewMini.ctp:100
+msgid "Are you sure you want to detach %s from this %s?"
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:187
+msgid "No item picked"
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:209
 msgid "Due to the large number of options, no contextual information is provided."
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:273
+#: View/Elements/generic_picker.ctp:277
 msgid "Nothing to pick"
 msgstr ""
 
@@ -5427,98 +7746,103 @@ msgid "Event Actions"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;252
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: 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:214;258
-#: View/Events/add.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
+#: View/Events/add.ctp:7
 #: 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:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: 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:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: 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:270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:298
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:49
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:47
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "View delegation requests"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:803
+#: View/Elements/global_menu.ctp:61
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:62
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:832
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:860
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:865
+#: View/Elements/global_menu.ctp:74
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:78
+#: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:308
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: 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:314
+#: View/Elements/global_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -5527,17 +7851,17 @@ msgstr ""
 msgid "Automation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:94
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:966
+#: View/Elements/global_menu.ctp:98
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:101
+#: View/Elements/global_menu.ctp:105
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:104;109
+#: View/Elements/global_menu.ctp:108;113
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -5546,7 +7870,7 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:114;119
+#: View/Elements/global_menu.ctp:118;123
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -5555,79 +7879,98 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:124
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:361
+#: View/Elements/global_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:128
+#: View/Elements/global_menu.ctp:132
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:135
+#: View/Elements/global_menu.ctp:139
 #: View/Pages/doc/general.ctp:22;54
 msgid "Global Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:139
+#: View/Elements/global_menu.ctp:143
 #: 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:440
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/global_menu.ctp:151
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
+msgid "My Settings"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:155
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
+msgid "Set Setting"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:159
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:156
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:463
+#: View/Elements/global_menu.ctp:168
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:163
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1010
+#: View/Elements/global_menu.ctp:175
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:480
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:174
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:486
+#: View/Elements/global_menu.ctp:186
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:493
+#: View/Elements/global_menu.ctp:194
+msgid "Decaying Models Tool"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:199
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
+msgid "List Decaying Models"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:206
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: 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
+#: View/Elements/global_menu.ctp:210
 msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:190
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:497
+#: View/Elements/global_menu.ctp:214
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:194
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:218
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -5641,48 +7984,61 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:201
+#: View/Elements/global_menu.ctp:225
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:205
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:212
+#: View/Elements/global_menu.ctp:236
 #: View/Pages/doc/general.ctp:23;66
 msgid "Sync Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:216
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:509
+#: View/Elements/global_menu.ctp:240
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:221
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:515
+#: View/Elements/global_menu.ctp:245
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
+#: View/Elements/global_menu.ctp:250
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:231
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:887
+#: View/Elements/global_menu.ctp:255
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:236
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:891
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:244
+#: View/Elements/global_menu.ctp:265
+msgid "List SightingDB Connections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:270
+msgid "Add SightingDB Connection"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:275
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+msgid "List Communities"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:283
 #: View/Pages/doc/administration.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
@@ -5692,100 +8048,113 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:249
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:638
+#: View/Elements/global_menu.ctp:288
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:253
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:633
+#: View/Elements/global_menu.ctp:292
+msgid "List User Settings"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:296
+#: View/UserSettings/set_setting.ctp:5
+msgid "Set User Setting"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:300
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:257
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
+#: View/Elements/global_menu.ctp:304
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:264
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:450;680
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:268
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:692
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:279
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:297
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:306
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:711
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:315
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:320
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:329
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:342
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:346
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:744
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:350
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:748
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:377;382
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -5807,7 +8176,9 @@ msgid "Attributes per organization"
 msgstr ""
 
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:91
+#: View/Elements/view_timeline.ctp:23
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -5834,6 +8205,7 @@ msgid "Physics"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:13
+#: View/Elements/view_timeline.ctp:12
 msgid "Display"
 msgstr ""
 
@@ -5841,7 +8213,6 @@ msgstr ""
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr ""
 
@@ -5849,11 +8220,8 @@ msgstr ""
 msgid "History"
 msgstr ""
 
-#: View/Elements/view_event_graph.ctp:18
-msgid "Search for an item"
-msgstr ""
-
 #: View/Elements/view_event_graph.ctp:22
+#: View/Elements/view_timeline.ctp:26
 #: View/Events/view_graph.ctp:17
 msgid "Toggle fullscreen"
 msgstr ""
@@ -5862,13 +8230,47 @@ msgstr ""
 msgid "Show all"
 msgstr ""
 
-#: View/Elements/view_galaxy_matrix.ctp:121
+#: View/Elements/view_galaxy_matrix.ctp:129
 msgid "(%s items)"
 msgstr ""
 
+#: View/Elements/view_timeline.ctp:9
+msgid "Time scope"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
+#: View/Taxonomies/view.ctp:83
+msgid "Tag"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:6
+msgid "Computation"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:7
+#: View/Events/add_misp_export_result.ctp:6
+msgid "Result"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:10
+msgid "Taxonomy effective ratio"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:10
+msgid "Eff. Ratio"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+msgid "Tag numerical value"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:19
+msgid "Pick an Attribute"
+msgstr ""
+
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr ""
 
@@ -5925,72 +8327,73 @@ msgstr ""
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:82;86;248
+#: View/Elements/Events/eventIndexTable.ctp:82;86;237
 #: 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/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
 #: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/index.ctp:103
 #: View/Servers/preview_index.ctp:174
-#: View/SharingGroups/index.ctp:89
+#: View/SharingGroups/index.ctp:91
 #: View/Taxonomies/index.ctp:49
 #: View/Warninglists/index.ctp:60
 msgid "View"
 msgstr "Náhled"
 
-#: View/Elements/Events/eventIndexTable.ctp:168
+#: View/Elements/Events/eventIndexTable.ctp:157
 msgid " correlation(s). Show filtered event with correlation only."
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:186;191
+#: View/Elements/Events/eventIndexTable.ctp:175;180
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:196
+#: View/Elements/Events/eventIndexTable.ctp:185
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:237
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:237
+#: View/Elements/Events/eventIndexTable.ctp:226
 #: 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:238
+#: View/Elements/Events/eventIndexTable.ctp:227
 msgid "Not published"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;347;414;571;625
-#: View/Servers/index.ctp:137
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
+#: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr ""
 
-#: View/Elements/Events/View/attribute_correlations.ctp:7
+#: View/Elements/Events/View/attribute_correlations.ctp:17
 msgid "Show "
 msgstr ""
 
-#: View/Elements/Events/View/attribute_correlations.ctp:7
+#: View/Elements/Events/View/attribute_correlations.ctp:17
 msgid " more..."
 msgstr ""
 
-#: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:362
+#: View/Elements/Events/View/attribute_correlations.ctp:53
+#: View/Events/view.ctp:399
 #: View/Feeds/preview_event.ctp:88
 #: View/Servers/preview_event.ctp:116
 msgid "Collapse…"
@@ -6004,131 +8407,122 @@ msgstr ""
 msgid "Advanced Sightings"
 msgstr ""
 
+#: View/Elements/Events/View/related_event.ctp:26
+msgid "This related event contains %s unique correlation(s)"
+msgstr ""
+
 #: View/Elements/Events/View/row_attribute.ctp:43
 msgid "Select attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:152
-#: View/Elements/Events/View/row_proposal.ctp:110
-#: View/Elements/Feeds/View/row_attribute.ctp:61
-#: View/Elements/Servers/View/row_attribute.ctp:68
+#: View/Elements/Events/View/row_attribute.ctp:155
+#: View/Elements/Events/View/row_proposal.ctp:113
+#: View/Elements/Feeds/View/row_attribute.ctp:63
+#: View/Elements/Servers/View/row_attribute.ctp:70
 msgid "warning"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:196;197
+#: View/Elements/Events/View/row_attribute.ctp:199;200
 #: View/Events/ajax/toggle_correlation.ctp:20
 msgid "Toggle correlation"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:323
+#: View/Elements/Events/View/row_attribute.ctp:326
 msgid "Toggle IDS flag"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:356
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Restore attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:357;397
+#: View/Elements/Events/View/row_attribute.ctp:377;417
 msgid "Permanently delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:364
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:364
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:369
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:369
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:373
+#: View/Elements/Events/View/row_attribute.ctp:393
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:374
+#: View/Elements/Events/View/row_attribute.ctp:394
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:384;389
+#: View/Elements/Events/View/row_attribute.ctp:404;409
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:389
+#: View/Elements/Events/View/row_attribute.ctp:409
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:401
+#: View/Elements/Events/View/row_attribute.ctp:421
 msgid "Soft-delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:65
-#: View/Elements/Feeds/View/row_object.ctp:16
-#: View/Events/resolved_misp_format.ctp:109
+#: View/Elements/Events/View/row_object.ctp:68
+#: View/Elements/Feeds/View/row_object.ctp:19
+#: View/Events/resolved_misp_format.ctp:113
 msgid "Name: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:66
+#: View/Elements/Events/View/row_object.ctp:69
 #: 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.ctp:20
 #: 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.ctp:20
 #: View/Elements/Servers/View/row_object_reference.ctp:7
 #: View/Elements/Servers/View/row_object_referenced_by.ctp:7
-#: View/Events/resolved_misp_format.ctp:110;120
+#: View/Events/resolved_misp_format.ctp:114;135
 msgid "Expand or Collapse"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:69
-#: View/Events/resolved_misp_format.ctp:92;262
-#: View/GalaxyClusters/view.ctp:19
-#: View/ObjectTemplates/index.ctp:66
-#: View/ObjectTemplates/view.ctp:6
-#: View/Objects/revise_object.ctp:61
-#: View/OrgBlacklists/index.ctp:23
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/view.ctp:24
-#: View/Organisations/ajax/merge.ctp:58;65
-#: View/SharingGroups/add.ctp:72
-#: View/SharingGroups/edit.ctp:72
-#: View/TagCollections/index.ctp:8
-msgid "UUID"
-msgstr ""
-
-#: View/Elements/Events/View/row_object.ctp:70
+#: View/Elements/Events/View/row_object.ctp:73
 msgid "Meta-category: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:71
-#: View/Elements/Feeds/View/row_object.ctp:21
+#: View/Elements/Events/View/row_object.ctp:74
+#: View/Elements/Feeds/View/row_object.ctp:24
 msgid "Description: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:72
-#: View/Elements/Feeds/View/row_object.ctp:22
+#: View/Elements/Events/View/row_object.ctp:75
+#: View/Elements/Feeds/View/row_object.ctp:25
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:125
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:125
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Soft delete object"
 msgstr ""
 
+#: View/Elements/Events/View/row_object.ctp:164
+msgid "Add an Object Attribute"
+msgstr ""
+
 #: View/Elements/Events/View/row_object_reference.ctp:1
 #: View/Elements/Feeds/View/row_object_reference.ctp:1
-#: View/Events/resolved_misp_format.ctp:115
+#: View/Events/resolved_misp_format.ctp:130
 msgid "References: "
 msgstr ""
 
@@ -6150,18 +8544,18 @@ msgstr ""
 msgid "Select proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:183
-#: View/Elements/Events/View/row_proposal_delete.ctp:77
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept Proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:183
-#: View/Elements/Events/View/row_proposal_delete.ctp:77
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:188
-#: View/Elements/Events/View/row_proposal_delete.ctp:82
+#: View/Elements/Events/View/row_proposal.ctp:199
+#: View/Elements/Events/View/row_proposal_delete.ctp:85
 msgid "Discard proposal"
 msgstr ""
 
@@ -6181,24 +8575,22 @@ msgid "Advanced sightings"
 msgstr ""
 
 #: View/Elements/Events/View/value_field.ctp:52
-#: View/Elements/Servers/View/value_field.ctp:43
+msgid "Cortex object"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:68
 msgid "Hexadecimal representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:52
-#: View/Elements/Feeds/View/value_field.ctp:43
-#: View/Elements/Servers/View/value_field.ctp:43
+#: View/Elements/Events/View/value_field.ctp:69
 msgid "Switch to binary representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:58
-#: View/Elements/Feeds/View/value_field.ctp:48
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:58
-#: View/Elements/Feeds/View/value_field.ctp:48
-#: View/Elements/Servers/View/value_field.ctp:48
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr ""
 
@@ -6222,19 +8614,14 @@ msgstr ""
 msgid "Check coverage"
 msgstr ""
 
-#: View/Elements/Feeds/View/row_object.ctp:20
-#: View/Elements/Servers/View/row_object.ctp:20
+#: View/Elements/Feeds/View/row_object.ctp:23
+#: View/Elements/Servers/View/row_object.ctp:23
 #: View/ObjectTemplates/index.ctp:69
 #: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:31
 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/Objects/object_similarities.ctp:76
 msgid "Update template and merge"
 msgstr ""
@@ -6279,98 +8666,44 @@ msgstr ""
 msgid "-- Select an option --"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:31;97
+#: View/Elements/Servers/eventattribute.ctp:31;98
 msgid "all"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:50
 #: View/Elements/templateElements/templateRowAttribute.ctp:82
 #: View/Events/resolved_attributes.ctp:49
-#: View/Events/resolved_misp_format.ctp:94;264
+#: View/Events/resolved_misp_format.ctp:95;290
 #: View/Feeds/freetext_index.ctp:34
-#: View/Objects/add.ctp:103
+#: View/Objects/add.ctp:116
 #: 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:305
+#: View/Elements/healthElements/diagnostics.ctp:367
 #: View/Pages/doc/administration.ctp:56;228
 #: View/Servers/ajax/submoduleStatus.ctp:6
 msgid "Status"
 msgstr ""
 
-#: View/Elements/Servers/View/row_attribute.ctp:93
+#: View/Elements/Servers/View/row_attribute.ctp:95
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
+#: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
-#: View/Events/view.ctp:190
-#: View/GalaxyClusters/view.ctp:32
+#: View/Events/view.ctp:191
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
-#: View/Users/admin_view.ctp:63;84
-#: View/Users/view.ctp:33
+#: View/Users/admin_view.ctp:95
 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/Feeds/search_caches.ctp:47
-#: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
-#: View/ObjectTemplates/view.ctp:4
-#: View/Objects/add.ctp:193
-#: View/Objects/revise_object.ctp:27
-#: 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:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
-#: View/ObjectTemplates/view.ctp:9
-#: View/Objects/add.ctp:22;100;197
-#: View/Objects/group_attributes_into_object.ctp:8
-#: View/Objects/propose_objects_from_attributes.ctp:17
-#: 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/TagCollections/index.ctp:15
-#: 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/Elements/Servers/View/row_object.ctp:25
 #: View/Objects/propose_objects_from_attributes.ctp:14
 #: View/Templates/view.ctp:2
 msgid "Template"
@@ -6386,20 +8719,22 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
-#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/TagCollections/index_row.ctp:45
 #: View/Tags/index.ctp:125
 #: View/Whitelists/admin_index.ctp:32
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: View/Elements/TagCollections/index_row.ctp:50
+#: View/Elements/TagCollections/index_row.ctp:51;52
 msgid "Download configuration"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
@@ -6412,20 +8747,18 @@ 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
+#: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:88
-msgid "Initiate password refresh"
-msgstr ""
-
-#: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 msgid "Create new credentials and inform user"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:611
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -6442,6 +8775,7 @@ msgid "Events published: "
 msgstr ""
 
 #: View/Elements/dashboard/dashboard_events.ctp:7
+#: View/Servers/index.ctp:107
 msgid "Reset"
 msgstr ""
 
@@ -6461,439 +8795,713 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
-msgid "Populate From Template"
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
-msgid "Enrichment Module Result"
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+msgid "Enrichment Module Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;824;996
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
-#: View/Events/edit.ctp:8
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+msgid "Publish Sightings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:180
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:181
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:197
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:204;291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:227;232
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:265
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:334
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:346
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:367
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:376
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:386
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:387
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:397
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:402
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:413
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:423
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:427
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:434;600
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:469
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524;554
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:543
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:562
-#: View/Servers/edit.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:593
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
+msgid "View community"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
+msgid "Request E-mail"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:605
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:610
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:619
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:624
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:653
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
+msgid "User settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757;771
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:762
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:776
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:782
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:794
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:810
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:818;837
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:852
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+msgid "Update Default Models"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
+msgid "Force Update Default Models"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
+msgid "Import Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
+msgid "Add Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+msgid "Decaying Tool"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
+msgid "View Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
+msgid "Edit Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:901
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:907
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:912
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:920
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:925
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:946
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:951
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:972
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:973
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:978
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:979
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:986;1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:991
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1015
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1021
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
+#: View/Sightingdb/add.ctp:6
+msgid "Add SightingDB connection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
+msgid "Edit SightingDB connection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
+msgid "List SightingDB connections"
+msgstr ""
+
 #: View/Elements/genericElements/SideMenu/side_menu_post_link.ctp:26
 #: View/Errors/error403.ctp:4
 msgid "%s"
 msgstr ""
 
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:4
+msgid "Show database indexes"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:9
+msgid "Index diagnostic:"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:12
+msgid "Notice"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:13
+msgid "The highlighted issues may be benign. if you are unsure, please open an issue and ask for clarification."
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:47
+msgid "Fix Database Index Schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
+msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:62
+msgid "The current database schema does not match the expected format."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
+msgid "Database schema diagnostic: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:68;74
+msgid "The MISP database state does not match the expected schema. Resolving these issues is recommended."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:69;75
+msgid "⚠ This diagnostic tool is in experimental state - the highlighted issues may be benign. If you are unsure, please open an issue on with the issues identified over at https://github.com/MISP/MISP for clarification."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:79
+msgid "Reveal benign deltas"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Table name"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Expected schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Actual schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
+msgid "Fix Database schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
+msgid "The current database is correct"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
+msgid "Expected DB_version: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
+msgid "The current database version matches the expected one"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
+msgid "Actual DB_version: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
+msgid "The current database version does not match the expected one"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
+msgid "Updates are locked"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
+msgid "Updates are not locked"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+#: View/Servers/update_progress.ctp:32
+msgid "Updates are locked due to to many update fails"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+msgid "Updates unlocked in %s"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
+msgid "DataSource: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
+msgid "Column diagnostic"
+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 ""
@@ -6956,7 +9564,7 @@ msgid "Click the following button to go to the update progress page. This page l
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:69
-msgid "Update Progress"
+msgid "View Update Progress"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:71
@@ -7046,7 +9654,7 @@ msgid "PHP CLI Version"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:162
-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: "
+msgid "Please note that the support for Python versions below 3.6 and below PHP 7.2 has been dropped as of 2020-01-01 and are henceforth considered unsupported. More info: "
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:163
@@ -7071,237 +9679,293 @@ msgstr ""
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:197
-msgid "Advanced attachment handler"
+#: View/Elements/healthElements/diagnostics.ctp:206
+msgid "Table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:198
-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:203
-msgid "PyMISP"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:203
-msgid "Not installed or version outdated."
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:215
-msgid "STIX and Cybox libraries"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:216
-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."
+#: View/Elements/healthElements/diagnostics.ctp:211
+msgid "Used"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:217
-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"
+msgid "Reclaimable"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:223
+msgid "SQL database status"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:224
-msgid "Other versions might work but are not tested / recommended."
+msgid "Size of each individual table on disk, along with the size that can be freed via SQL optimize. Make sure that you always have at least 3x the size of the largest table in free space in order for the update scripts to work as expected."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:233
-msgid "STIX and CyBox"
+#: View/Elements/healthElements/diagnostics.ctp:229
+msgid "Schema status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:233
-msgid "Could not read test script (stixtest.py)."
+#: View/Elements/healthElements/diagnostics.ctp:246
+msgid "Redis info"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:247
-msgid " library version"
+#: View/Elements/healthElements/diagnostics.ctp:248
+msgid "PHP extension version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:264
-msgid "Yara"
+#: View/Elements/healthElements/diagnostics.ctp:248
+msgid "Not installed."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:250
+msgid "Redis version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:251
+msgid "Memory allocator"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:252
+msgid "Memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:253
+msgid "Peak memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:254
+msgid "Total system memory"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:259
+msgid "Advanced attachment handler"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:260
+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:265
-msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
+msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:272
-msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
+#: View/Elements/healthElements/diagnostics.ctp:265
+msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:274
-msgid "plyara library installed"
+#: View/Elements/healthElements/diagnostics.ctp:277
+msgid "STIX and Cybox libraries"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:278
-msgid "GnuPG"
+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:279
+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:286
+msgid "Other versions might work but are not tested / recommended."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:295
+msgid "STIX and CyBox"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:295
+msgid "Could not read test script (stixtest.py)."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:309
+msgid " library version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:326
+msgid "Yara"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:327
+msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:334
+msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:336
+msgid "plyara library installed"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:340
+msgid "GnuPG"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:341
 msgid "This tool tests whether your GnuPG is set up correctly or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:287
+#: View/Elements/healthElements/diagnostics.ctp:349
 msgid "GnuPG installation and settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:290
+#: View/Elements/healthElements/diagnostics.ctp:352
 msgid "ZeroMQ"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:291
+#: View/Elements/healthElements/diagnostics.ctp:353
 msgid "This tool tests whether the ZeroMQ extension is installed and functional."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:299
+#: View/Elements/healthElements/diagnostics.ctp:361
 msgid "ZeroMQ settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:305
+#: View/Elements/healthElements/diagnostics.ctp:367
 msgid "Check ZeroMQ service status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:307
+#: View/Elements/healthElements/diagnostics.ctp:369
 msgid "Proxy"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:308
+#: View/Elements/healthElements/diagnostics.ctp:370
 msgid "This tool tests whether your HTTP proxy settings are correct."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:316
+#: View/Elements/healthElements/diagnostics.ctp:378
 #: View/Pages/doc/administration.ctp:35
 msgid "Proxy settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:319
+#: View/Elements/healthElements/diagnostics.ctp:381
 msgid "Module System"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:320
+#: View/Elements/healthElements/diagnostics.ctp:382
 msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:335
+#: View/Elements/healthElements/diagnostics.ctp:397
 msgid " module system"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:341
+#: View/Elements/healthElements/diagnostics.ctp:403
 msgid "Session table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:342
+#: View/Elements/healthElements/diagnostics.ctp:404
 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:349
+#: View/Elements/healthElements/diagnostics.ctp:411
 msgid "Expired sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:355
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Purge sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:359
+#: View/Elements/healthElements/diagnostics.ctp:421
 msgid "Clean model cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:360
+#: View/Elements/healthElements/diagnostics.ctp:422
 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:361
+#: View/Elements/healthElements/diagnostics.ctp:423
 msgid "Clean cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:362
-msgid "Overwritten objects"
+#: View/Elements/healthElements/diagnostics.ctp:427
+msgid "Check for deprecated function usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:363
-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."
+#: View/Elements/healthElements/diagnostics.ctp:428
+msgid "In an effort to identify the usage of deprecated functionalities, MISP has started aggregating the count of access requests to these endpoints. Check the frequency of their use below along with the users to potentially warn about better ways of achieving their goals."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:364
-msgid "Reconstruct overwritten objects"
+#: View/Elements/healthElements/diagnostics.ctp:431;432;434
+msgid "View deprecated endpoint usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:365;368
+#: View/Elements/healthElements/diagnostics.ctp:438;441
 msgid "Orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:366
+#: View/Elements/healthElements/diagnostics.ctp:439
 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:368;382
+#: View/Elements/healthElements/diagnostics.ctp:441;455
 msgid "Run the test below"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attribute"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:371
+#: View/Elements/healthElements/diagnostics.ctp:444
 msgid "Remove orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:372
+#: View/Elements/healthElements/diagnostics.ctp:445
 msgid "Remove published empty events"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:373;375
+#: View/Elements/healthElements/diagnostics.ctp:446;448
 #: View/Servers/ondemand_action.ctp:7
 msgid "Administrator On-demand Action"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:374
+#: View/Elements/healthElements/diagnostics.ctp:447
 msgid "Click the following button to go to the Administrator On-demand Action page."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:376;378
+#: View/Elements/healthElements/diagnostics.ctp:449;451
 msgid "Legacy Administrative Tools"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:377
+#: View/Elements/healthElements/diagnostics.ctp:450
 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:379
+#: View/Elements/healthElements/diagnostics.ctp:452
 msgid "Verify bad link on attachments"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:380
+#: View/Elements/healthElements/diagnostics.ctp:453
 msgid "Verify each attachment referenced in database is accessible on filesystem."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:382
+#: View/Elements/healthElements/diagnostics.ctp:455
 msgid "Non existing attachments referenced in Database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:384
+#: View/Elements/healthElements/diagnostics.ctp:457
 msgid "Check bad link on attachments"
 msgstr ""
 
@@ -7340,8 +10004,8 @@ msgstr ""
 #: View/Elements/healthElements/files.ctp:73
 #: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:80
-#: View/SharingGroups/index.ctp:87
+#: View/Roles/admin_index.ctp:90
+#: View/SharingGroups/index.ctp:89
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
@@ -7362,27 +10026,10 @@ msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
+#: View/Sightingdb/index.ctp:32
 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/resolved_misp_format.ctp:91;261
-#: View/Events/show_i_o_c_results.ctp:13
-#: View/Feeds/freetext_index.ctp:33
-#: View/Noticelists/view.ctp:42
-#: View/Objects/add.ctp:102
-#: View/Objects/group_attributes_into_object.ctp:58
-#: View/Objects/revise_object.ctp:58
-#: 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 ""
@@ -7422,6 +10069,7 @@ msgstr ""
 
 #: View/Elements/healthElements/settings_table.ctp:4
 #: View/Pages/doc/administration.ctp:46
+#: View/UserSettings/index.ctp:62
 msgid "Setting"
 msgstr ""
 
@@ -7510,8 +10158,9 @@ msgstr ""
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
 #: View/TagCollections/index.ctp:14
-#: View/Users/admin_view.ctp:98
-#: View/Users/view.ctp:58
+#: View/UserSettings/index.ctp:56
+#: View/Users/admin_view.ctp:109
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr ""
 
@@ -7556,7 +10205,7 @@ msgid "Start a worker"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
+msgid "Restart dead workers"
 msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
@@ -7648,11 +10297,15 @@ msgstr ""
 msgid "Blocked Orgs (AND NOT)"
 msgstr ""
 
-#: View/Elements/serverRuleElements/pull.ctp:65
+#: View/Elements/serverRuleElements/pull.ctp:60
+msgid "Additional sync parameters (based on the event index filters)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:68
 msgid "Accept changes"
 msgstr ""
 
-#: View/Elements/serverRuleElements/pull.ctp:65
+#: View/Elements/serverRuleElements/pull.ctp:68
 #: View/Elements/serverRuleElements/push.ctp:67
 msgid "Update"
 msgstr ""
@@ -7679,29 +10332,6 @@ msgstr ""
 msgid "Field"
 msgstr ""
 
-#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
-#: View/Events/export.ctp:26
-#: View/Events/resolved_attributes.ctp:48
-#: View/Events/resolved_misp_format.ctp:90;260
-#: View/Events/show_i_o_c_results.ctp:12
-#: View/Feeds/freetext_index.ctp:32
-#: View/Feeds/search_caches.ctp:41
-#: View/Objects/revise_object.ctp:57
-#: 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 ""
@@ -7732,10 +10362,6 @@ msgstr ""
 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
@@ -7758,33 +10384,12 @@ msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
 #: View/ObjectReferences/ajax/add.ctp:86
-#: View/Objects/revise_object.ctp:55
+#: View/Objects/revise_object.ctp:62
 #: 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/resolved_misp_format.ctp:89;259
-#: View/Events/show_i_o_c_results.ctp:11
-#: View/Feeds/freetext_index.ctp:31
-#: View/Objects/add.ctp:101
-#: View/Objects/group_attributes_into_object.ctp:57
-#: View/Objects/propose_objects_from_attributes.ctp:16
-#: View/Objects/revise_object.ctp:56
-#: 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
@@ -7907,20 +10512,6 @@ msgstr ""
 msgid "Event Blacklists"
 msgstr ""
 
-#: View/EventBlacklists/index.ctp:35
-#: View/Events/index.ctp:94
-#: View/Feeds/preview_index.ctp:25
-#: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
-#: View/ObjectTemplates/index.ctp:47
-#: View/Organisations/index.ctp:75
-#: View/Servers/preview_index.ctp:64
-#: View/Tags/index.ctp:56
-#: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:61
-msgid "Filter"
-msgstr ""
-
 #: View/EventBlacklists/index.ctp:51
 #: View/Events/resolved_misp_format.ctp:39
 msgid "Event UUID"
@@ -7938,6 +10529,42 @@ msgstr ""
 msgid "Are you sure you want to delete from the blacklist the selected events?"
 msgstr ""
 
+#: View/EventDelegations/index.ctp:30
+msgid "Pending"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:35
+msgid "Issued"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:56
+msgid "Requester"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:63
+#: View/Pages/doc/administration.ctp:134
+msgid "Recipient"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:82
+#: View/Events/automation.ctp:279;286
+#: 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/EventDelegations/index.ctp:86
+msgid "Delegation index"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:87
+#: View/Posts/add.ctp:33
+msgid ""
+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 ""
@@ -8051,35 +10678,29 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/Events/add.ctp:45
-#: View/Events/edit.ctp:36
-msgid "Threat Level "
+#: View/Events/add.ctp:39
+#: View/Events/view.ctp:148
+#: 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/add.ctp:50
-#: View/Events/edit.ctp:40
-msgid "Analysis "
-msgstr ""
-
-#: View/Events/add.ctp:54
-#: View/Events/edit.ctp:45
-#: View/ShadowAttributes/index.ctp:52
+#: View/Events/add.ctp:49
+#: View/ShadowAttributes/index.ctp:59
 msgid "Event Info"
 msgstr ""
 
-#: View/Events/add.ctp:58
-#: View/Events/edit.ctp:49
+#: View/Events/add.ctp:52
 msgid "Quick Event Description or Tracking Info"
 msgstr ""
 
-#: View/Events/add.ctp:61
-#: View/Events/edit.ctp:52
-msgid "Extends event"
+#: View/Events/add.ctp:57
+msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr ""
 
-#: View/Events/add.ctp:65
-#: View/Events/edit.ctp:55
-msgid "Event UUID or ID. Leave blank if not applicable."
+#: View/Events/add.ctp:58
+msgid "Extends Event"
 msgstr ""
 
 #: View/Events/add_i_o_c.ctp:4
@@ -8111,10 +10732,6 @@ msgstr ""
 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 ""
@@ -8143,7 +10760,7 @@ msgid "Automation functionality is designed to automatically feed other tools an
 msgstr ""
 
 #: View/Events/automation.ctp:5
-msgid "You can use the <a href=\"servers/rest\">ReST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
+msgid "You can use the <a href=\"/servers/rest\">REST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
 msgstr ""
 
 #: View/Events/automation.ctp:6
@@ -8154,477 +10771,475 @@ msgstr ""
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 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."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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/automation.ctp:27
 #: 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
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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
+#: View/Events/automation.ctp:32
 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
+#: View/Events/automation.ctp:33
 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/automation.ctp:34
 #: 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/automation.ctp:35
 #: 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/automation.ctp:36
 #: 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/automation.ctp:37
 #: 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/automation.ctp:38
 #: 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/automation.ctp:39
 #: 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;150
+#: View/Events/automation.ctp:40;160
 #: 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;151
+#: View/Events/automation.ctp:41;161
 #: 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/automation.ctp:42
 #: 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/automation.ctp:43
 #: 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/automation.ctp:44
 #: 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/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:46
 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/automation.ctp:47
 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/automation.ctp:48
 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/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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/automation.ctp:52
 #: 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/automation.ctp:53
 #: 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
+#: View/Events/automation.ctp:54
 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
+#: View/Events/automation.ctp:55
 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
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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:81
+#: View/Events/automation.ctp:91
 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:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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:97
+#: View/Events/automation.ctp:107
 #: 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:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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:118
+#: View/Events/automation.ctp:128
 #: 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:136
+#: View/Events/automation.ctp:146
 #: 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:138
+#: View/Events/automation.ctp:148
 #: 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:145
+#: View/Events/automation.ctp:155
 #: 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:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:152
+#: View/Events/automation.ctp:162
 #: 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:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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:156
+#: View/Events/automation.ctp:166
 #: 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:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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:172
+#: View/Events/automation.ctp:182
 #: 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:173
+#: View/Events/automation.ctp:183
 #: 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:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:187
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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:191
+#: View/Events/automation.ctp:201
 #: 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:192
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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:205
+#: View/Events/automation.ctp:215
 #: 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:206
+#: View/Events/automation.ctp:216
 #: 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:207
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:208
+#: View/Events/automation.ctp:218
 #: 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:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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:214
+#: View/Events/automation.ctp:224
 #: 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:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: 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:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:68
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -8632,208 +11247,200 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
-#: View/Servers/rest.ctp:160
+#: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:269;276
-#: 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:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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:291
+#: View/Events/automation.ctp:301
 #: 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:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:309
+#: View/Events/automation.ctp:319
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:310
+#: View/Events/automation.ctp:320
 #: 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:311
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:324
 #: 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:315
+#: View/Events/automation.ctp:325
 #: 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:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 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:322
+#: View/Events/automation.ctp:332
 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:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -9029,7 +11636,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -9075,24 +11682,24 @@ msgstr ""
 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
+#: View/Events/import_module.ctp:99
 msgid "Input File"
 msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 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
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr ""
 
@@ -9126,6 +11733,11 @@ msgstr ""
 msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
+#: View/Events/legacy_automation.ctp:7
+msgid "Your current key is: <code>%s</code>.\n"
+"    You can %s this key."
+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 ""
@@ -9443,7 +12055,7 @@ msgid "You can also use search for IP addresses using CIDR. Make sure that you u
 msgstr ""
 
 #: View/Events/merge.ctp:4
-msgid "Merge events"
+msgid "Merge events - WARNING: this feature is very outdated and should not be used anymore."
 msgstr ""
 
 #: View/Events/merge.ctp:9
@@ -9508,22 +12120,11 @@ msgid "Similar Attributes"
 msgstr ""
 
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/resolved_misp_format.ctp:95;265
-#: View/Objects/add.ctp:104
+#: View/Events/resolved_misp_format.ctp:96;291
+#: View/Objects/add.ctp:117
 msgid "Disable Correlation"
 msgstr ""
 
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/resolved_misp_format.ctp:96;266
-#: View/ObjectReferences/ajax/add.ctp:30
-#: View/Objects/add.ctp:67;106
-#: View/Objects/group_attributes_into_object.ctp:30
-#: View/Objects/revise_object.ctp:49;60
-#: 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:195
 msgid "Remove resolved attribute"
 msgstr ""
@@ -9559,15 +12160,19 @@ msgstr ""
 msgid "#Resolved Attributes"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:107
+#: View/Events/resolved_misp_format.ctp:89;284
+msgid "Import"
+msgstr ""
+
+#: View/Events/resolved_misp_format.ctp:111
 msgid "ID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:112
+#: View/Events/resolved_misp_format.ctp:127
 msgid "UUID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:113
+#: View/Events/resolved_misp_format.ctp:128
 msgid "Meta Category: "
 msgstr ""
 
@@ -9585,7 +12190,6 @@ msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -9640,35 +12244,24 @@ msgstr ""
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:86
-msgid "Creator org"
-msgstr ""
-
-#: View/Events/view.ctp:147
-#: 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:153
+#: View/Events/view.ctp:154
 #: 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:177
+#: View/Events/view.ctp:178
 msgid "Toggle advanced sharing network viewer"
 msgstr ""
 
-#: View/Events/view.ctp:183
+#: View/Events/view.ctp:184
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr ""
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:188
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
@@ -9676,156 +12269,161 @@ msgstr ""
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:193
+#: View/Events/view.ctp:194
 msgid " (%s Objects)"
 msgstr ""
 
-#: View/Events/view.ctp:193
+#: View/Events/view.ctp:194
 msgid " (%s Object)"
 msgstr ""
 
-#: View/Events/view.ctp:195
+#: View/Events/view.ctp:196
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:199
+#: View/Events/view.ctp:200
 msgid "First recorded change"
 msgstr ""
 
-#: View/Events/view.ctp:203
+#: View/Events/view.ctp:204
 msgid "Last change"
 msgstr ""
 
-#: View/Events/view.ctp:207
+#: View/Events/view.ctp:208
 msgid "Modification map"
 msgstr ""
 
-#: View/Events/view.ctp:213
+#: View/Events/view.ctp:214
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:232
+#: View/Events/view.ctp:233
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:239
+#: View/Events/view.ctp:240
 msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:239
+#: View/Events/view.ctp:240
 msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:270
+#: View/Events/view.ctp:271
 msgid "%s has requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:276
+#: View/Events/view.ctp:277
 msgid "%s has requested that you take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:282
+#: View/Events/view.ctp:283
 msgid "You have requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:287
+#: View/Events/view.ctp:288
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:299
+#: View/Events/view.ctp:300
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:309
-#: View/Users/admin_view.ctp:86
+#: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
+#: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:309
-#: View/Feeds/view.ctp:62
-#: View/Noticelists/index.ctp:63
-#: View/ObjectTemplates/index.ctp:35
-#: View/Taxonomies/view.ctp:24
-msgid "Enabled"
-msgstr ""
-
-#: View/Events/view.ctp:318
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "enable"
 msgstr ""
 
-#: View/Events/view.ctp:318
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:329
+#: View/Events/view.ctp:330
 msgid "Extended view"
 msgstr ""
 
-#: View/Events/view.ctp:346
+#: View/Events/view.ctp:337
+msgid "Warning: Taxonomy inconsistencies"
+msgstr ""
+
+#: View/Events/view.ctp:382
 #: View/Feeds/preview_event.ctp:84
 #: View/Servers/preview_event.ctp:112
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:406;441
+#: View/Events/view.ctp:443;478
 msgid "This event has "
 msgstr ""
 
-#: View/Events/view.ctp:407;442
+#: View/Events/view.ctp:444;479
 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:450
+#: View/Events/view.ctp:487
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:466
+#: View/Events/view.ctp:503
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:466
+#: View/Events/view.ctp:503
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:469
+#: View/Events/view.ctp:506
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:469
+#: View/Events/view.ctp:506
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:472
+#: View/Events/view.ctp:509
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:475
+#: View/Events/view.ctp:512
+msgid "Toggle Event timeline"
+msgstr ""
+
+#: View/Events/view.ctp:512
+msgid "Event timeline"
+msgstr ""
+
+#: View/Events/view.ctp:515
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:475
+#: View/Events/view.ctp:515
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:478
+#: View/Events/view.ctp:518
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:478
+#: View/Events/view.ctp:518
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:481
+#: View/Events/view.ctp:521
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:484
+#: View/Events/view.ctp:524
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:484
+#: View/Events/view.ctp:524
 msgid "Discussion"
 msgstr ""
 
@@ -9886,11 +12484,15 @@ msgid "Are you sure you wish to unpublish the event?"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:20
+msgid "Are you sure you wish publish and synchronise all sightings attached to this event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:22
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
-#: View/Feeds/index.ctp:105
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -9924,78 +12526,81 @@ msgstr ""
 msgid "Add MISP Feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:5
-msgid "Add a new MISP feed source."
-msgstr ""
-
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
-#: View/Feeds/view.ctp:63
-msgid "Caching enabled"
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
 msgstr ""
 
 #: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+msgid "Add a new MISP feed source."
+msgstr ""
+
+#: View/Feeds/add.ctp:14
+#: View/Feeds/view.ctp:64
+msgid "Caching enabled"
+msgstr ""
+
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr ""
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:15
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr ""
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
-#: View/Feeds/view.ctp:30
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
+#: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:20
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr ""
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:60
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr ""
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:69
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:73
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr ""
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:32
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr ""
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:36
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr ""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:40
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr ""
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:44
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr ""
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:48
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -10004,129 +12609,128 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:52
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr ""
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:82
-msgid "Target Event"
-msgstr ""
-
 #: View/Feeds/add.ctp:94
-#: View/Feeds/edit.ctp:92
-msgid "Target Event ID"
-msgstr ""
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:94
-msgid "Leave blank unless you want to reuse an existing event."
+#: View/Feeds/edit.ctp:98
+msgid "Creator organisation"
 msgstr ""
 
 #: View/Feeds/add.ctp:104
-#: View/Feeds/edit.ctp:102
-msgid "Value field(s) in the CSV"
+#: View/Feeds/edit.ctp:108
+msgid "Target Event"
 msgstr ""
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:103
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr ""
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:105
-msgid "2,3,4 (column position separated by commas)"
-msgstr ""
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:113
-msgid "Delimiter"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
 msgstr ""
 
 #: View/Feeds/add.ctp:116
-#: View/Feeds/edit.ctp:114
-msgid "Set the default CSV delimiter (default = \",\")"
+#: View/Feeds/edit.ctp:120
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr ""
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr ""
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
 msgstr ""
 
 #: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:124
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr ""
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr ""
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
+msgid "Set the default CSV delimiter (default = \",\")"
+msgstr ""
+
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr ""
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:125
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr ""
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:135
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr ""
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 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:148
-#: View/Feeds/edit.ctp:144
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr ""
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:145
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:154
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr ""
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:155
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr ""
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:182
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr ""
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:187
-msgid "Filter rules"
-msgstr ""
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:189
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:190
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:191
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:192
-#: View/Servers/add.ctp:106
-#: View/Servers/edit.ctp:149;155
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
+#: View/Servers/add.ctp:116
+#: View/Servers/edit.ctp:155;162
 msgid "Modify"
 msgstr ""
 
@@ -10142,66 +12746,66 @@ msgstr ""
 msgid "Edit MISP Feed"
 msgstr ""
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr ""
 
-#: View/Feeds/edit.ctp:127
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr ""
 
-#: View/Feeds/edit.ctp:207
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr ""
 
-#: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:136
-#: View/Servers/edit.ctp:183
+#: View/Feeds/edit.ctp:234
+#: View/Servers/add.ctp:146
+#: View/Servers/edit.ctp:190
 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:209
-#: View/Servers/add.ctp:137
-#: View/Servers/edit.ctp:182
+#: View/Feeds/edit.ctp:235
+#: View/Servers/add.ctp:147
+#: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
-#: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:138
-#: View/Servers/edit.ctp:184
+#: View/Feeds/edit.ctp:236
+#: View/Servers/add.ctp:148
+#: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:139
-#: View/Servers/edit.ctp:185
+#: View/Feeds/edit.ctp:237
+#: View/Servers/add.ctp:149
+#: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
-#: View/Feeds/edit.ctp:212
-#: View/Servers/add.ctp:140
-#: View/Servers/edit.ctp:186
+#: View/Feeds/edit.ctp:238
+#: View/Servers/add.ctp:150
+#: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:187
+#: View/Feeds/edit.ctp:239
+#: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:188
+#: View/Feeds/edit.ctp:240
+#: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:215
-#: View/Servers/edit.ctp:189
+#: View/Feeds/edit.ctp:241
+#: View/Servers/edit.ctp:196
 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:216
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:191
+#: View/Feeds/edit.ctp:242
+#: View/Servers/add.ctp:154
+#: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -10225,147 +12829,132 @@ msgstr ""
 msgid "Paste a MISP feed metadata JSON below to add feeds."
 msgstr ""
 
-#: View/Feeds/import_feeds.ctp:10
-#: View/Servers/import.ctp:10
-#: View/TagCollections/import.ctp:10
-msgid "JSON"
-msgstr ""
-
 #: View/Feeds/import_feeds.ctp:11
 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:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr ""
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr ""
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr ""
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr ""
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: 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/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr ""
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:54
-#: View/Servers/index.ctp:75;76
-msgid "Rules"
+msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
+#: View/Feeds/index.ctp:196
+msgid "Visible"
 msgstr ""
 
 #: View/Feeds/index.ctp:211
-msgid "New fixed event"
+msgid "Feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:95
-msgid "Age: "
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
 msgstr ""
 
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:103
-msgid "Not cached"
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr ""
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:283
-msgid "Are you sure you want to permanently remove the feed (%s)?"
+#: View/Feeds/index.ctp:294
+msgid "Are you sure you want to permanently remove the feed?"
 msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -10386,20 +12975,6 @@ msgstr ""
 msgid "Fetch the event"
 msgstr ""
 
-#: View/Feeds/search_caches.ctp:35
-#: View/Feeds/view.ctp:3
-#: 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/Feeds/search_caches.ctp:53
 msgid "Feed URL"
 msgstr ""
@@ -10420,44 +12995,51 @@ msgstr ""
 msgid "Source format"
 msgstr ""
 
-#: View/Feeds/view.ctp:57
+#: View/Feeds/view.ctp:58
 msgid "Settings"
 msgstr ""
 
-#: View/Feeds/view.ctp:70
+#: View/Feeds/view.ctp:71
 msgid "Coverage by other feeds"
 msgstr ""
 
-#: View/Feeds/view.ctp:79
+#: View/Feeds/view.ctp:80
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr ""
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
+#: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr ""
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 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
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr ""
 
@@ -10465,33 +13047,30 @@ msgstr ""
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:23
-#: 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/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -10500,22 +13079,16 @@ msgstr ""
 msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
 msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
@@ -10526,6 +13099,27 @@ msgstr ""
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Inbox/index.ctp:31
+#: 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/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr ""
@@ -10546,12 +13140,6 @@ msgstr ""
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr ""
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr ""
@@ -10589,11 +13177,9 @@ msgstr ""
 msgid "Job type"
 msgstr ""
 
-#: View/Jobs/index.ctp:104
-#: View/OrgBlacklists/add.ctp:17
-#: View/OrgBlacklists/index.ctp:22
-#: View/Organisations/view.ctp:6
-msgid "Organisation name"
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
 msgstr ""
 
 #: View/Jobs/index.ctp:106
@@ -10670,17 +13256,14 @@ msgstr ""
 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:67
 #: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
+#: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -10688,13 +13271,6 @@ msgstr ""
 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"
@@ -10745,10 +13321,6 @@ msgstr ""
 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"
@@ -10904,87 +13476,87 @@ msgstr ""
 msgid "Meta category"
 msgstr ""
 
-#: View/Objects/add.ctp:85
+#: View/Objects/add.ctp:98
 msgid "Warning, issues found with the template"
 msgstr ""
 
-#: View/Objects/add.ctp:98
+#: View/Objects/add.ctp:111
 msgid "Save"
 msgstr ""
 
-#: View/Objects/add.ctp:99
+#: View/Objects/add.ctp:112
 msgid "Name :: type"
 msgstr ""
 
-#: View/Objects/add.ctp:156;167
+#: View/Objects/add.ctp:169;180
 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:171
+#: View/Objects/add.ctp:184
 msgid "Back"
 msgstr ""
 
-#: View/Objects/add.ctp:183
+#: View/Objects/add.ctp:196
 msgid "Pre-update object's template"
 msgstr ""
 
-#: View/Objects/add.ctp:189
+#: View/Objects/add.ctp:202
 #: View/Objects/group_attributes_into_object.ctp:54
 #: View/Organisations/ajax/merge.ctp:56;63
 #: View/Pages/doc/using_the_system.ctp:163;203
 msgid "ID"
 msgstr ""
 
-#: View/Objects/add.ctp:205
+#: View/Objects/add.ctp:218
 #: View/Objects/revise_object.ctp:45
 msgid "Template version"
 msgstr ""
 
-#: View/Objects/add.ctp:212;272
+#: View/Objects/add.ctp:225;285
 msgid "Can not be merged automatically"
 msgstr ""
 
-#: View/Objects/add.ctp:217;277
+#: View/Objects/add.ctp:230;290
 msgid "This attribute type is missing from the new template. It will be lost if not taken care of right now."
 msgstr ""
 
-#: View/Objects/add.ctp:239
+#: View/Objects/add.ctp:252
 msgid "Insert"
 msgstr ""
 
-#: View/Objects/add.ctp:242
+#: View/Objects/add.ctp:255
 msgid "No valid type. This attribute will be lost."
 msgstr ""
 
-#: View/Objects/add.ctp:249
+#: View/Objects/add.ctp:262
 msgid "This attribute can be merged automatically. Injection in the template done."
 msgstr ""
 
-#: View/Objects/add.ctp:264
+#: View/Objects/add.ctp:277
 msgid "Attributes to merge"
 msgstr ""
 
-#: View/Objects/add.ctp:265
+#: View/Objects/add.ctp:278
 msgid "Contextual information and actions"
 msgstr ""
 
-#: View/Objects/add.ctp:275
+#: View/Objects/add.ctp:288
 msgid "Overwrite the current attribute value with this one"
 msgstr ""
 
-#: View/Objects/add.ctp:285
+#: View/Objects/add.ctp:298
 msgid "Original value: "
 msgstr ""
 
-#: View/Objects/add.ctp:290
+#: View/Objects/add.ctp:303
 msgid "Can be merged automatically. Injection done."
 msgstr ""
 
-#: View/Objects/add.ctp:293
-msgid "An instance of this attribute already exists. However, as multiple instanciation is allowed by this template, the two attributes will be keept."
+#: View/Objects/add.ctp:306
+msgid "An instance of this attribute already exists. However, as multiple instances are allowed by this template, the two attributes will be kept."
 msgstr ""
 
-#: View/Objects/add.ctp:321;332
+#: View/Objects/add.ctp:335;346
 msgid "Enter value manually"
 msgstr ""
 
@@ -11100,35 +13672,35 @@ msgstr ""
 msgid "Make sure that the below Object reflects your expectation before submiting it."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:59
+#: View/Objects/revise_object.ctp:66
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:103
+#: View/Objects/revise_object.ctp:110
 msgid "Create new object"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:104
+#: View/Objects/revise_object.ctp:111
 msgid "Back to review"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:107
+#: View/Objects/revise_object.ctp:114
 msgid "This event contains similar objects."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:108
+#: View/Objects/revise_object.ctp:115
 msgid "Instead of creating a new object, would you like to merge your new object into one of the following?"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:125
+#: View/Objects/revise_object.ctp:132
 msgid "All similar objects not displayed..."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:126
+#: View/Objects/revise_object.ctp:133
 msgid "%s Similar objects found. %s not displayed"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:163
+#: View/Objects/revise_object.ctp:170
 msgid "This attribute will NOT be merged into the similar object as it is conflicting with another attribute."
 msgstr ""
 
@@ -11144,6 +13716,10 @@ msgstr ""
 msgid "Are you sure you want to %sdelete Object #%s? %s"
 msgstr ""
 
+#: View/Objects/ajax/quickAddAttributeForm.ctp:15
+msgid "Add Object attribute"
+msgstr ""
+
 #: View/OrgBlacklists/add.ctp:4
 msgid "Add Organisation Blacklist Entries"
 msgstr ""
@@ -11192,73 +13768,68 @@ msgstr ""
 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
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
 msgid "Paste UUID or click generate"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:25
-#: View/Organisations/admin_edit.ctp:24
+#: View/Organisations/admin_add.ctp:24
+#: View/Organisations/admin_edit.ctp:23
 msgid "Generate UUID"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:25
-#: View/Organisations/admin_edit.ctp:24
+#: View/Organisations/admin_add.ctp:24
+#: View/Organisations/admin_edit.ctp:23
 msgid "Generate a new UUID for the organisation"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:27
-#: View/Organisations/admin_edit.ctp:38
+#: View/Organisations/admin_add.ctp:26
+#: View/Organisations/admin_edit.ctp:37
 msgid "A brief description of the organisation"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:27
-#: View/Organisations/admin_edit.ctp:38
+#: View/Organisations/admin_add.ctp:26
+#: View/Organisations/admin_edit.ctp:37
 msgid "A description of the organisation that is purely informational."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:30
-#: View/Organisations/admin_edit.ctp:41
+#: View/Organisations/admin_add.ctp:29
+#: View/Organisations/admin_edit.ctp:40
 msgid "Bind user accounts to domains (line separated)"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:30
-#: View/Organisations/admin_edit.ctp:41
+#: View/Organisations/admin_add.ctp:29
+#: View/Organisations/admin_edit.ctp:40
 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
+#: View/Organisations/admin_add.ctp:32
+#: View/Organisations/admin_edit.ctp:43
 msgid "The following fields are all optional."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:38
-#: View/Organisations/admin_edit.ctp:49
+#: View/Organisations/admin_add.ctp:37
+#: View/Organisations/admin_edit.ctp:48
 msgid "Logo (48x48 png)"
 msgstr ""
 
+#: View/Organisations/admin_add.ctp:43
+#: View/Organisations/admin_edit.ctp:54
+msgid "For example \"financial\"."
+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
+#: View/Organisations/admin_add.ctp:44
+#: View/Organisations/admin_edit.ctp:55
 msgid "Freetext description of the org."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:46
-#: View/Organisations/admin_edit.ctp:57
+#: View/Organisations/admin_add.ctp:45
+#: View/Organisations/admin_edit.ctp:56
 msgid "You can add some contact details for the organisation here, if applicable."
 msgstr ""
 
@@ -11266,15 +13837,15 @@ msgstr ""
 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
+#: View/Organisations/admin_edit.ctp:29
 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
+#: View/Organisations/admin_edit.ctp:31
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/admin_edit.ctp:57
+#: View/Organisations/admin_edit.ctp:56
 msgid "Contacts"
 msgstr ""
 
@@ -11317,7 +13888,7 @@ msgstr ""
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr ""
 
@@ -11351,12 +13922,12 @@ msgid "Last modified"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:36
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr ""
 
@@ -11702,7 +14273,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
-#: View/Servers/edit.ctp:84
+#: View/Servers/edit.ctp:90
 msgid "Misc settings"
 msgstr ""
 
@@ -11898,7 +14469,7 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:76
+#: View/Users/admin_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -11909,7 +14480,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -11922,7 +14493,7 @@ 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr ""
 
@@ -11975,6 +14546,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -12005,7 +14577,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:84
+#: View/Users/admin_view.ctp:95
 msgid "Newsread"
 msgstr ""
 
@@ -12077,10 +14649,6 @@ msgstr ""
 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 ""
@@ -13293,10 +15861,6 @@ msgstr ""
 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 ""
@@ -14346,10 +16910,6 @@ msgstr ""
 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 ""
@@ -14439,7 +16999,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:129
+#: View/Servers/index.ctp:175
 msgid "Push all"
 msgstr ""
 
@@ -14448,7 +17008,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:126
+#: View/Servers/index.ctp:172
 msgid "Pull all"
 msgstr ""
 
@@ -14566,11 +17126,6 @@ msgstr ""
 msgid "In response to"
 msgstr ""
 
-#: View/Posts/add.ctp:33
-msgid ""
-msgstr ""
-""
-
 #: View/Posts/edit.ctp:12
 msgid "Contents"
 msgstr ""
@@ -14609,6 +17164,16 @@ msgstr ""
 msgid "Maximum execution time"
 msgstr ""
 
+#: View/Roles/admin_add.ctp:26
+#: View/Roles/admin_edit.ctp:26
+msgid "Enforce search rate limit"
+msgstr ""
+
+#: View/Roles/admin_add.ctp:32
+#: View/Roles/admin_edit.ctp:32
+msgid "# of searches / 15 min"
+msgstr ""
+
 #: View/Roles/admin_index.ctp:24
 msgid "Restricted to site admins"
 msgstr ""
@@ -14617,11 +17182,15 @@ msgstr ""
 msgid "Max execution time"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:40
+#: View/Roles/admin_index.ctp:35
+msgid "Searches / 15 mins"
+msgstr ""
+
+#: View/Roles/admin_index.ctp:41
 msgid "Default role"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:52
+#: View/Roles/admin_index.ctp:53
 #: View/Roles/index.ctp:47
 msgid "%s permission %s"
 msgstr ""
@@ -14647,6 +17216,7 @@ msgid "Permission level"
 msgstr ""
 
 #: View/Servers/add.ctp:4
+#: View/Servers/edit.ctp:5
 msgid "Add Server"
 msgstr ""
 
@@ -14665,17 +17235,17 @@ msgid "You can set this instance up as an internal instance by checking the chec
 msgstr ""
 
 #: View/Servers/add.ctp:20
-#: View/Servers/edit.ctp:20
+#: View/Servers/edit.ctp:17
 msgid "Internal instance"
 msgstr ""
 
 #: View/Servers/add.ctp:30
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:25
 msgid "Instance ownership and credentials"
 msgstr ""
 
 #: View/Servers/add.ctp:31
-#: View/Servers/edit.ctp:32
+#: View/Servers/edit.ctp:26
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
@@ -14684,86 +17254,86 @@ msgid "Remote Sync Organisation Type"
 msgstr ""
 
 #: View/Servers/add.ctp:42
-#: View/Servers/edit.ctp:43
+#: View/Servers/edit.ctp:40
 msgid "External Organisation"
 msgstr ""
 
-#: View/Servers/add.ctp:48
+#: View/Servers/add.ctp:57
 msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:54
-#: View/Servers/edit.ctp:65
+#: View/Servers/add.ctp:63
+#: View/Servers/edit.ctp:70
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:58
-#: View/Servers/edit.ctp:69
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:74
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:67
-#: View/Servers/edit.ctp:76
+#: View/Servers/add.ctp:76
+#: View/Servers/edit.ctp:81
 msgid "Ask the owner of the remote instance for a sync account on their instance, log into their MISP using the sync user's credentials and retrieve your API key by navigating to Global actions -> My profile. This key is used to authenticate with the remote instance."
 msgstr ""
 
-#: View/Servers/add.ctp:71
-#: View/Servers/edit.ctp:80
+#: View/Servers/add.ctp:80
+#: View/Servers/edit.ctp:85
 msgid "Enabled synchronisation methods"
 msgstr ""
 
-#: View/Servers/add.ctp:90
+#: View/Servers/add.ctp:100
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:96
+#: View/Servers/add.ctp:106
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:101
-#: View/Servers/edit.ctp:144
+#: View/Servers/add.ctp:111
+#: View/Servers/edit.ctp:150
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:102;108
-#: View/Servers/edit.ctp:145;151
+#: View/Servers/add.ctp:112;118
+#: View/Servers/edit.ctp:151;157
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:103;109
-#: View/Servers/edit.ctp:146;152
+#: View/Servers/add.ctp:113;119
+#: View/Servers/edit.ctp:152;158
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:104;110
-#: View/Servers/edit.ctp:147;153
+#: View/Servers/add.ctp:114;120
+#: View/Servers/edit.ctp:153;159
 msgid "Events with the following organisations allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:105;111
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:115;121
+#: View/Servers/edit.ctp:154;160
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:107
-#: View/Servers/edit.ctp:150
+#: View/Servers/add.ctp:117
+#: View/Servers/edit.ctp:156
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:135
-#: View/Servers/edit.ctp:181
+#: View/Servers/add.ctp:145
+#: View/Servers/edit.ctp:188
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:141
+#: View/Servers/add.ctp:151
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:142
+#: View/Servers/add.ctp:152
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:143
+#: View/Servers/add.ctp:153
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
@@ -14771,43 +17341,47 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: View/Servers/edit.ctp:17
+#: View/Servers/edit.ctp:15
 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
+#: View/Servers/edit.ctp:31
 msgid "Organisation Type"
 msgstr ""
 
-#: View/Servers/edit.ctp:54
+#: View/Servers/edit.ctp:55
 msgid "Local Organisation"
 msgstr ""
 
-#: View/Servers/edit.ctp:77
+#: View/Servers/edit.ctp:82
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:101
+#: View/Servers/edit.ctp:107
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:109;131
+#: View/Servers/edit.ctp:115;137
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:110;132
+#: View/Servers/edit.ctp:116;138
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:123
+#: View/Servers/edit.ctp:129
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:161
+msgid "Additional parameters: "
+msgstr ""
+
+#: View/Servers/edit.ctp:197
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:247;251
+#: View/Servers/edit.ctp:263;267
 msgid "Not set."
 msgstr ""
 
@@ -14840,42 +17414,75 @@ msgid "Servers"
 msgstr ""
 
 #: View/Servers/index.ctp:23
+msgid "Prio"
+msgstr ""
+
+#: View/Servers/index.ctp:24
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:31
+#: View/Servers/index.ctp:25
+msgid "Sync user"
+msgstr ""
+
+#: View/Servers/index.ctp:26
+msgid "Reset API key"
+msgstr ""
+
+#: View/Servers/index.ctp:35
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:70
+msgid "URL params"
+msgstr ""
+
+#: View/Servers/index.ctp:85;86
+msgid "Move server priority up"
+msgstr ""
+
+#: View/Servers/index.ctp:85;86
+msgid "Move server priority down"
+msgstr ""
+
+#: View/Servers/index.ctp:102
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:102
+#: View/Sightingdb/index.ctp:35
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:74
+#: View/Servers/index.ctp:103
+msgid "View the sync user of the remote instance"
+msgstr ""
+
+#: View/Servers/index.ctp:111;112
+msgid "Remotely reset API key"
+msgstr ""
+
+#: View/Servers/index.ctp:119
 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:74
+#: View/Servers/index.ctp:119
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:123
+#: View/Servers/index.ctp:169
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:125
+#: View/Servers/index.ctp:171
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
-#: View/Servers/index.ctp:125
+#: View/Servers/index.ctp:171
 msgid "Pull updates"
 msgstr ""
 
-#: View/Servers/index.ctp:132
+#: View/Servers/index.ctp:178
 msgid "Cache instance"
 msgstr ""
 
@@ -14891,19 +17498,19 @@ msgstr ""
 msgid "Show Update Progress Page"
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:37
+#: View/Servers/ondemand_action.ctp:38
 msgid "Running this script may take a very long time depending of the size of your database. It is adviced that you <b>back your database up</b> before running it."
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:43
+#: View/Servers/ondemand_action.ctp:44
 msgid "Running this script will make this instance unusable for all users (not site-admin) during the time of upgrade."
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:53
+#: View/Servers/ondemand_action.ctp:54
 msgid "Action: "
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:60
+#: View/Servers/ondemand_action.ctp:61
 msgid "This action has been done and cannot be run again."
 msgstr ""
 
@@ -14955,6 +17562,14 @@ msgstr ""
 msgid "No proposals pulled"
 msgstr ""
 
+#: View/Servers/pull.ctp:35
+msgid "Sightings pulled"
+msgstr ""
+
+#: View/Servers/pull.ctp:38
+msgid "No sightings pulled"
+msgstr ""
+
 #: View/Servers/push.ctp:2
 msgid "Failed pushes"
 msgstr ""
@@ -14975,60 +17590,56 @@ msgstr ""
 msgid "HTTP method to use"
 msgstr ""
 
-#: View/Servers/rest.ctp:61
+#: View/Servers/rest.ctp:62
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:68
+#: View/Servers/rest.ctp:69
 msgid "Use full path - disclose my apikey"
 msgstr ""
 
-#: View/Servers/rest.ctp:72
+#: View/Servers/rest.ctp:73
 msgid "Bookmark query"
 msgstr ""
 
-#: View/Servers/rest.ctp:81
+#: View/Servers/rest.ctp:82
 msgid "Bookmark name"
 msgstr ""
 
-#: View/Servers/rest.ctp:89
+#: View/Servers/rest.ctp:90
 msgid "Show result"
 msgstr ""
 
-#: View/Servers/rest.ctp:94
+#: View/Servers/rest.ctp:95
 msgid "Skip SSL validation"
 msgstr ""
 
-#: View/Servers/rest.ctp:101
+#: View/Servers/rest.ctp:102
 msgid "HTTP headers"
 msgstr ""
 
-#: View/Servers/rest.ctp:114
+#: View/Servers/rest.ctp:115
 msgid " Inject"
 msgstr ""
 
-#: View/Servers/rest.ctp:115
+#: View/Servers/rest.ctp:116
 msgid " Show rules"
 msgstr ""
 
-#: View/Servers/rest.ctp:124
+#: View/Servers/rest.ctp:125
 msgid "HTTP body"
 msgstr ""
 
-#: View/Servers/rest.ctp:132
+#: View/Servers/rest.ctp:133
 msgid "Run query"
 msgstr ""
 
-#: View/Servers/rest.ctp:161
+#: View/Servers/rest.ctp:162
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:162
-msgid "Request duration"
-msgstr ""
-
 #: View/Servers/rest.ctp:163
-msgid "Headers"
+msgid "Request duration"
 msgstr ""
 
 #: View/Servers/server_settings.ctp:3
@@ -15039,26 +17650,66 @@ msgstr ""
 msgid "To edit a setting, simply double click it."
 msgstr ""
 
-#: View/Servers/update_progress.ctp:18
-msgid "Database Update progress"
+#: View/Servers/update_progress.ctp:34
+msgid "Updates are locked due to an ongoing update process. Release lock only if you know what you are doing."
 msgstr ""
 
-#: View/Servers/update_progress.ctp:85
+#: View/Servers/update_progress.ctp:35
+msgid "automatically unlock in %smin %ssec"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:40
+msgid "Release update lock"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:54
+msgid "Complete update progression"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:55
+msgid "%s remaining"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:62
+msgid "Database Update progress for update %s"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:133
 msgid "Update "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:88
+#: View/Servers/update_progress.ctp:136
 msgid "Started @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:92
+#: View/Servers/update_progress.ctp:140
 msgid "Elapsed Time @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:144
+#: View/Servers/update_progress.ctp:192
 msgid "No update in progress"
 msgstr ""
 
+#: View/Servers/update_progress.ctp:213
+msgid "Follow updates"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:13
+msgid "Total"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:27
+msgid "View details on the usage of %s on the %s controller"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:39
+msgid "View user ID "
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:40
+msgid "User #%s"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:2
 msgid "Select instances to add"
 msgstr ""
@@ -15136,9 +17787,9 @@ msgstr ""
 msgid "Add Proposal"
 msgstr ""
 
-#: View/ShadowAttributes/add.ctp:52;65
+#: View/ShadowAttributes/add.ctp:63;76
 #: View/ShadowAttributes/add_attachment.ctp:35
-#: View/ShadowAttributes/edit.ctp:51
+#: View/ShadowAttributes/edit.ctp:62
 msgid "Propose"
 msgstr ""
 
@@ -15154,23 +17805,23 @@ msgstr ""
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:43
+#: View/ShadowAttributes/index.ctp:50
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:49
+#: View/ShadowAttributes/index.ctp:56
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:55
+#: View/ShadowAttributes/index.ctp:62
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:81
+#: View/ShadowAttributes/index.ctp:91
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:83
+#: View/ShadowAttributes/index.ctp:93
 msgid "New Attribute"
 msgstr ""
 
@@ -15240,7 +17891,7 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:53
 #: View/SharingGroups/edit.ctp:53
-#: View/SharingGroups/index.ctp:46
+#: View/SharingGroups/index.ctp:47
 msgid "Releasable to"
 msgstr ""
 
@@ -15315,13 +17966,6 @@ msgstr ""
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:93
-#: View/SharingGroups/edit.ctp:101
-#: View/SharingGroups/view.ctp:69
-#: View/TagCollections/index.ctp:12
-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 ""
@@ -15374,20 +18018,49 @@ msgstr ""
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:80
+#: View/SharingGroups/index.ctp:82
 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"
+#: View/Sightingdb/index.ctp:41
+msgid "Quick Search"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:61
+msgid "Host"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:66
+msgid "Port"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:76
+msgid "Skip Proxy"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:82
+msgid "Skip SSL"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:92
+#: View/UserSettings/index.ctp:74
+msgid "Restricted to"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:98
+msgid "SightingDB index"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:99
+msgid "SightingDB is an alternate sighting database that MISP interconnects with. Configure connections to sighting databases below."
+msgstr ""
+
+#: View/Sightingdb/index.ctp:114
+msgid "Are you sure you want to remove the connection to this SightingDB?"
 msgstr ""
 
 #: View/Sightings/ajax/add_sighting.ctp:11
@@ -15517,6 +18190,11 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+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 ""
@@ -15541,10 +18219,6 @@ msgstr ""
 msgid "Update all"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:2
-msgid "Taxonomies"
-msgstr ""
-
 #: View/Taxonomies/index.ctp:26
 msgid "Required"
 msgstr ""
@@ -15591,10 +18265,6 @@ msgstr ""
 msgid "Unhide selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:83
-msgid "Tag"
-msgstr ""
-
 #: View/Taxonomies/view.ctp:84
 msgid "Expanded"
 msgstr ""
@@ -15793,10 +18463,6 @@ msgstr ""
 msgid "A description of the template"
 msgstr ""
 
-#: View/Templates/add.ctp:49
-msgid "Create"
-msgstr ""
-
 #: View/Templates/index.ctp:2
 msgid "Templates"
 msgstr ""
@@ -15853,6 +18519,61 @@ msgstr ""
 msgid "View Discussion"
 msgstr ""
 
+#: View/UserSettings/index.ctp:30
+msgid "Me"
+msgstr ""
+
+#: View/UserSettings/index.ctp:79
+msgid "User settings management"
+msgstr ""
+
+#: View/UserSettings/index.ctp:80
+msgid "Manage the individual user settings."
+msgstr ""
+
+#: View/UserSettings/index.ctp:97
+msgid "Are you sure you wish to delete this entry?"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr ""
@@ -15886,7 +18607,7 @@ msgstr ""
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
 #: View/Users/edit.ctp:23
-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."
+msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
 msgstr ""
 
 #: View/Users/admin_add.ctp:72
@@ -15910,12 +18631,12 @@ msgstr ""
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr ""
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr ""
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
@@ -15924,8 +18645,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
-#: View/Users/admin_view.ctp:58
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:69
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr ""
 
@@ -16028,12 +18749,66 @@ msgstr ""
 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"
+#: View/Users/admin_index.ctp:3
+msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
+msgstr ""
+
+#: View/Users/admin_index.ctp:6
+msgid "here"
+msgstr ""
+
+#: View/Users/admin_index.ctp:9;10
+msgid "Reset all sync user API keys"
+msgstr ""
+
+#: View/Users/admin_index.ctp:13
+msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
+msgstr ""
+
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
 #: View/Users/admin_quick_email.ctp:2
@@ -16048,50 +18823,49 @@ msgstr ""
 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
+#: View/Users/admin_view.ctp:47
+msgid "Customauth header"
+msgstr ""
+
+#: View/Users/admin_view.ctp:55
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:56
+#: View/Users/admin_view.ctp:67
 msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:57
-#: View/Users/view.ctp:28
+#: View/Users/admin_view.ctp:68
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr ""
 
-#: View/Users/admin_view.ctp:59
+#: View/Users/admin_view.ctp:70
 msgid "Password change"
 msgstr ""
 
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:37
+#: View/Users/admin_view.ctp:78
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:72
-#: View/Users/view.ctp:42
+#: View/Users/admin_view.ctp:83
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:79
-#: View/Users/view.ctp:49
-msgid "SMIME Public certificate"
+#: View/Users/admin_view.ctp:90
+#: View/Users/view.ctp:50
+msgid "S/MIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:108
-#: View/Users/view.ctp:64
+#: View/Users/admin_view.ctp:119
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr ""
 
@@ -16107,10 +18881,102 @@ msgstr ""
 msgid "SMIME Public certificate (PEM format)"
 msgstr ""
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr ""
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr ""
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+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"
@@ -16126,6 +18992,13 @@ msgstr ""
 msgid "Proposals active"
 msgstr ""
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr ""
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -16181,14 +19054,18 @@ msgstr ""
 msgid "A heatmap showing the usage of %s."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr ""
 
+#: View/Users/statistics_orgs.ctp:40
+msgid "Activity (1 year)"
+msgstr ""
+
 #: View/Users/statistics_sightings.ctp:6
 msgid "A toplist of the top sources for the sightings of your organisation."
 msgstr ""
@@ -16241,6 +19118,14 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -16253,19 +19138,27 @@ msgstr ""
 msgid "Choose the key that you would like to use"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:6
+#: View/Users/ajax/fetchpgpkey.ctp:4
+msgid "Do not blindly trust fetched keys and check the fingerprint from other source."
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:5
+msgid "And do not check just Key ID, but whole fingerprint."
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:10
 msgid "Key ID"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:7
+#: View/Users/ajax/fetchpgpkey.ctp:11
 msgid "Creation date"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:8
+#: View/Users/ajax/fetchpgpkey.ctp:12
 msgid "Associated E-mail addresses"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:12
+#: View/Users/ajax/fetchpgpkey.ctp:16
 msgid "Select GnuPG key"
 msgstr ""
 
@@ -16317,7 +19210,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:14;16
+#: View/Warninglists/view.ctp:14
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -16384,13 +19277,14 @@ 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/Server.php:validation for field push;validation for field pull;validation for field push_sightings
 #: 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/Dashboard.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
@@ -16410,7 +19304,14 @@ msgstr ""
 msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group, Inherit event"
 msgstr ""
 
+#: Model/Attribute.php:validation for field first_seen;validation for field last_seen
+#: Model/MispObject.php:validation for field first_seen;validation for field last_seen
+#: Model/ShadowAttribute.php:validation for field first_seen;validation for field last_seen
+msgid "Invalid ISO 8601 format"
+msgstr ""
+
 #: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
+#: Model/DecayingModelMapping.php:validation for field attribute_type;validation for field model_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
@@ -16463,7 +19364,7 @@ msgstr ""
 #: 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/Server.php:validation for field authkey;validation for field name
 #: 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
@@ -16509,6 +19410,14 @@ msgstr ""
 msgid "Please enter a valid base-url."
 msgstr ""
 
+#: Model/Server.php:validation for field name
+msgid "allowEmpty"
+msgstr ""
+
+#: Model/Server.php:validation for field name
+msgid "required"
+msgstr ""
+
 #: Model/SharingGroup.php:validation for field name
 msgid "A sharing group with this name already exists."
 msgstr ""
@@ -16517,6 +19426,22 @@ msgstr ""
 msgid "Invalid type. Valid options are: 0 (Sighting), 1 (False-positive), 2 (Expiration)."
 msgstr ""
 
+#: Model/Sightingdb.php:validation for field name
+msgid "Name not set."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field host
+msgid "Host not set."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field port
+msgid "Port needs to be numeric."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field owner
+msgid "Owner not set."
+msgstr ""
+
 #: Model/Tag.php:validation for field name
 msgid "This field is required."
 msgstr ""
@@ -16593,6 +19518,10 @@ msgstr ""
 msgid "A SID should be an integer."
 msgstr ""
 
+#: Model/UserSetting.php:validation for field json
+msgid "isValidJson"
+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/dan/LC_MESSAGES/default.po b/app/Locale/dan/LC_MESSAGES/default.po
index 99dbe7f8e..8624dd1dd 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: 2020-04-24 01:14\n"
+"PO-Revision-Date: 2021-03-26 04:21\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
@@ -9,8 +9,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: da\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: da_DK\n"
 
 #: Console/Command/AdminShell.php:72
@@ -71,7 +73,8 @@ msgid "MISP mass sync authkey reset command line tool.\n\n"
 msgstr ""
 
 #: Console/Command/AdminShell.php:536
-#: Controller/UsersController.php:1234
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
 msgid "Invalid user."
 msgstr ""
 
@@ -99,7 +102,7 @@ msgstr ""
 #: Console/Command/EventShell.php:15
 #: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1122;1606;1691;2221;2297;2301;2305;2433;2530;2585;2633;2705;2795;3128;5252;5474;5478;5487
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
 #: Model/Galaxy.php:293
 msgid "Invalid event"
@@ -126,51 +129,51 @@ msgstr "detaljerig tilstand"
 msgid "interactive mode"
 msgstr "interaktiv tilstand"
 
-#: Controller/AppController.php:377
+#: Controller/AppController.php:382
 msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
 msgstr ""
 
-#: Controller/AppController.php:377
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
 msgid "Update Progress"
 msgstr ""
 
-#: Controller/AppController.php:384
+#: Controller/AppController.php:389
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
 msgstr "Noget gik galt. Den brugerkonto, hvormed du er godkendt, findes ikke længere."
 
-#: Controller/AppController.php:502
+#: Controller/AppController.php:519
 msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
 msgstr ""
 
-#: Controller/AppController.php:710
-#: Controller/AttributesController.php:1876;1985;2089
-#: Controller/EventsController.php:3260
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr "Denne godkendelsesnøgle er ikke godkendt til eksport. Kontakt din administrator."
 
-#: Controller/AppController.php:719
-#: Controller/AttributesController.php:2093
-#: Controller/EventsController.php:3264
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 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:735
+#: Controller/AppController.php:764
 #: Controller/Component/IndexFilterComponent.php:23
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr "Angiv enten søgeordene i URL'en eller POST en JSON- eller XML-fil med filtreparametrene."
 
-#: Controller/AppController.php:873
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Udført. attribute_count genereret fra bunden til "
 
-#: Controller/AppController.php:996
-#: Controller/AttributesController.php:2147
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
 #: Controller/ShadowAttributesController.php:1267
 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/AppController.php:1178
+#: Controller/AppController.php:1211
 msgid "RestSearch is not implemented (yet) for this scope."
 msgstr ""
 
@@ -183,19 +186,19 @@ msgstr "Intet hændelses-ID angivet."
 msgid "You do not have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:132;422;602;832;3127;3142
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:2092;2113;2147
+#: Controller/EventsController.php:2107;2128;2162
 #: Controller/ObjectsController.php:837
-#: Model/Attribute.php:4304;4308
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "Du har ikke rettighed til at gøre dette."
 
-#: Controller/AttributesController.php:345;800;805;824;1032;1121;2163;2177;2210;2232;2800;2811;2817;2886;3024;3036;3040
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
 #: Controller/ObjectsController.php:641
 #: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
 #: Controller/TagsController.php:506
-#: Model/Attribute.php:4296
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "Ugyldig Attribut"
 
@@ -209,7 +212,7 @@ msgid "Attribute not an attachment or malware-sample"
 msgstr "Attribut er ikke en vedhæftning eller malware-eksempel"
 
 #: Controller/AttributesController.php:419;586;892;1348
-#: Controller/EventsController.php:4414;4428;5201;5215
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "Ugyldig Event."
 
@@ -259,7 +262,7 @@ msgid "Invalid event id."
 msgstr "Ugyldigt begivenheds-ID."
 
 #: Controller/AttributesController.php:1072
-#: Controller/EventsController.php:2451
+#: Controller/EventsController.php:2466
 #: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "Ugyldigt input."
@@ -284,7 +287,7 @@ msgstr "Attribut slettet"
 msgid "Attribute was not deleted"
 msgstr "Attributten blev ikke slettet"
 
-#: Controller/AttributesController.php:1281;2634
+#: Controller/AttributesController.php:1281;2675
 #: Controller/ShadowAttributesController.php:853
 msgid "Invalid Attribute"
 msgstr "Ugyldig Attribut"
@@ -305,104 +308,104 @@ msgstr "Denne metode kan kun tilgås via AJAX."
 msgid "You are not authorized to edit this event."
 msgstr "Du er ikke godkendt til at redigere denne begivenhed."
 
-#: Controller/AttributesController.php:1516
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "Intet begivenheds-ID givet."
 
-#: Controller/AttributesController.php:1561
-#: Controller/GalaxiesController.php:243
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "Synonymer: "
 
-#: Controller/AttributesController.php:1871;1978
+#: Controller/AttributesController.php:1912;2019
 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 godkendt. Send Authorization-headeren med din auth-nøgle sammen med en Accept-header for application/xml."
 
-#: Controller/AttributesController.php:1884
+#: Controller/AttributesController.php:1925
 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:1904
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "Du har ikke adgang til den begivenhed."
 
-#: Controller/AttributesController.php:1967
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "Ingen matches."
 
-#: Controller/AttributesController.php:1989;1998
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Ugyldig attribut eller manglende rettigheder til at se den."
 
-#: Controller/AttributesController.php:2124
+#: Controller/AttributesController.php:2165
 #: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "Udført. "
 
-#: Controller/AttributesController.php:2156;2203
+#: Controller/AttributesController.php:2197;2244
 #: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "Ugyldig feltforespørgsel."
 
-#: Controller/AttributesController.php:2159;2206
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "Denne funktion kan kun tilgås via AJAX."
 
-#: Controller/AttributesController.php:2241
+#: Controller/AttributesController.php:2282
 msgid "You do not have permission to do that"
 msgstr ""
 
-#: Controller/AttributesController.php:2271;2279
-#: Controller/EventsController.php:3643;3796;4999
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "Event ikke fundet eller du har ikke rettigheder til at oprette attributter"
 
-#: Controller/AttributesController.php:2300
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "Denne handling kan kun tilgås via AJAX."
 
-#: Controller/AttributesController.php:2309;2560;2574;2585
-#: Controller/OrganisationsController.php:432
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
 #: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "Du har ikke rettigheder til at gøre dette."
 
-#: Controller/AttributesController.php:2414
-#: Controller/EventsController.php:4207
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "Denne funktionalitet kræver API-nøgle adgang."
 
-#: Controller/AttributesController.php:2422
+#: Controller/AttributesController.php:2463
 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'en. Se automatiseringssiden for oplysninger om anvendelsen."
 
-#: Controller/AttributesController.php:2434
+#: Controller/AttributesController.php:2475
 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:2595
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "Ugyldigt script."
 
-#: Controller/AttributesController.php:2662
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr "Ingen gyldige berigelsesmuligheder fundet for denne attribut."
 
-#: Controller/AttributesController.php:2760
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "Ugyldig type forespurgt."
 
-#: Controller/AttributesController.php:2823;3030
+#: Controller/AttributesController.php:2864;3071
 #: Controller/TagCollectionsController.php:254
 msgid "Invalid tag"
 msgstr ""
 
-#: Controller/AttributesController.php:3120
-#: Controller/EventsController.php:5197
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Deaktivering af korrelation er ikke tilladt på denne instans."
 
-#: Controller/AttributesController.php:3124;3139
+#: Controller/AttributesController.php:3165;3180
 #: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "Ugyldig Attribut."
@@ -419,6 +422,63 @@ msgstr ""
 msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
 msgstr ""
 
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
 #: Controller/DecayingModelController.php:20
 msgid "Default decaying models updated"
 msgstr ""
@@ -584,452 +644,456 @@ msgstr "Ugyldigt hændelses-ID."
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr "Mislykkedes at slette event fra EventBlacklist. Fejl: "
 
-#: Controller/EventsController.php:879
+#: Controller/EventsController.php:894
 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:881
+#: Controller/EventsController.php:896
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "Ingen GnuPG-nøgle opsat i din profil. For at modtage e-mails skal du indsætte din offentlige nøgle i din profil."
 
-#: Controller/EventsController.php:887
+#: Controller/EventsController.php:902
 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 i din profil. For at modtage emails, indsæt dit offentlige certifikat eller GnuPG nøgle i din profil."
 
-#: Controller/EventsController.php:889
+#: Controller/EventsController.php:904
 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 i din profil."
 
-#: Controller/EventsController.php:1716
+#: Controller/EventsController.php:1731
 msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1927
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr "Du har ikke rettigheder til at oprette hændelser"
 
-#: Controller/EventsController.php:1933
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr "Ingen gyldige event-data modtaget."
 
-#: Controller/EventsController.php:1969
+#: Controller/EventsController.php:1984
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "Ugyldig Delingsgruppe eller ingen rettigheder (Synk-bruger findes ikke i Delingsgruppen)."
 
-#: Controller/EventsController.php:1973;1977
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
 msgstr "Ugyldig Delingsgruppe, eller ingen godkendelse."
 
-#: Controller/EventsController.php:2001
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr "Event blokkeret af lokal sortliste."
 
-#: Controller/EventsController.php:2014;2101;2377
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "Hændelseen er gemt"
 
-#: Controller/EventsController.php:2022
+#: Controller/EventsController.php:2037
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "Event findes allerede. Vil du opdatere den, så brug URL'en i placeringsoverskriften."
 
-#: Controller/EventsController.php:2028
+#: Controller/EventsController.php:2043
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "En sortlistepost blokerer din oprettelse af events. Kontakt administratorteamet for denne instans"
 
-#: Controller/EventsController.php:2030;2380
+#: Controller/EventsController.php:2045;2395
 msgid "The event could not be saved. Please, try again."
 msgstr "Eventen kunne ikke gemmes. Forsøg igen."
 
-#: Controller/EventsController.php:2079
+#: Controller/EventsController.php:2094
 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 "Den oprettede hændelse vil være synlig for de organisationer, som har en konto på denne platform, men synkroniseret ikke med andre MISP-instanser, før den er offentliggjort."
 
-#: Controller/EventsController.php:2127
+#: Controller/EventsController.php:2142
 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:2128
+#: Controller/EventsController.php:2143
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "Upload af fil mislykkedes, eller fil er ikke af forventet type (.xml/.json)."
 
-#: Controller/EventsController.php:2189
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr "STIX dokument importeret, event er oprettet: "
 
-#: Controller/EventsController.php:2192
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr "STIX-dokument importeret."
 
-#: Controller/EventsController.php:2195
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr "Kunne ikke importerer STIX-dokument: "
 
-#: Controller/EventsController.php:2202
+#: Controller/EventsController.php:2217
 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 af fil mislykkedes. Sørg for at vælge en STIX-fil til upload samt at denne ikke overstiger den maksimale filstørrelse på "
 
-#: Controller/EventsController.php:2226;2311
+#: Controller/EventsController.php:2241;2326
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "Du har ikke rettigheder til at gøre dette. Overvej at bruge funktionen 'foreslå attribut'."
 
-#: Controller/EventsController.php:2234
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr "Ugyldigt begivenheds-ID angivet."
 
-#: Controller/EventsController.php:2239
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr "Du har ingen rettigheder til at læse den valgte event."
 
-#: Controller/EventsController.php:2536;2640;2711
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr "Du har ikke tilladelse til at gøre dette."
 
-#: Controller/EventsController.php:2545
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr "Hændelse afpubliceret."
 
-#: Controller/EventsController.php:2652;2722
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr "Kunne ikke publicere hændelse - intet tag til krævede taksonomier mangler: %s"
 
-#: Controller/EventsController.php:2804
+#: Controller/EventsController.php:2819
 msgid "You must specify a message."
 msgstr ""
 
-#: Controller/EventsController.php:2823
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr "E-mail sendt rapportafgiveren."
 
-#: Controller/EventsController.php:2832
+#: Controller/EventsController.php:2847
 msgid "Sending of email failed."
 msgstr ""
 
-#: Controller/EventsController.php:2883
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr "Advarsel: Du er logget ind som en webstedsadministrator. Enhver eksport, du genererer, vil indeholde det FULDE UBEGRÆNSEDE datasæt. Ønsker du at generere en eksport udelukkende for din egen organisation, så log ind som en anden bruger."
 
-#: Controller/EventsController.php:2971
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr "Denne funktion er pt. deaktiveret"
 
-#: Controller/EventsController.php:3097
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr "Filnavn ikke tilladt."
 
-#: Controller/EventsController.php:3117
+#: Controller/EventsController.php:3134
 msgid "Problem with writing the IoC file. Please report to site admin."
 msgstr ""
 
-#: Controller/EventsController.php:3211
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr "Dette er ikke en gyldig MISP XML-fil."
 
-#: Controller/EventsController.php:3253
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr "Endnu ikke implementeret"
 
-#: Controller/EventsController.php:3271;3275
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr "Ugyldig hændelse eller manglende rettigheder."
 
-#: Controller/EventsController.php:3467
+#: Controller/EventsController.php:3484
 #: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr ""
 
-#: Controller/EventsController.php:3483
+#: Controller/EventsController.php:3500
 #: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr "Tag er allerede tilknyttet denne hændelse."
 
-#: Controller/EventsController.php:3497
+#: Controller/EventsController.php:3514
 msgid "Tag is not allowed due to taxonomy exclusivity settings"
 msgstr ""
 
-#: Controller/EventsController.php:3528;3534
+#: Controller/EventsController.php:3545;3551
 #: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr "Tag(-s) tilføjet."
 
-#: Controller/EventsController.php:3530
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr "Tag kunne ikke tilføjes."
 
-#: Controller/EventsController.php:3536
+#: Controller/EventsController.php:3553
 #: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr "Alle tags er allerede til stede, intet at tilføje."
 
-#: Controller/EventsController.php:3800;5003;5025;5532;5536
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
 #: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "Ugyldig event."
 
-#: Controller/EventsController.php:3855;3885;3901
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr "Du har ikke rettigheder til at gøre dette."
 
-#: Controller/EventsController.php:3966;4106
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr "Ugyldigt ID"
 
-#: Controller/EventsController.php:3970;4110;4685
+#: Controller/EventsController.php:3987;4128;4703
 msgid "Event not found or you are not authorised to view it."
 msgstr "Event ikke fundet, eller du har ingen rettigheder til at se den."
 
-#: Controller/EventsController.php:4116
+#: Controller/EventsController.php:4134
 msgid "Freetext Import"
 msgstr ""
 
-#: Controller/EventsController.php:4122
+#: Controller/EventsController.php:4140
 msgid "Populate using a Template"
 msgstr ""
 
-#: Controller/EventsController.php:4128
+#: Controller/EventsController.php:4146
 msgid "OpenIOC Import"
 msgstr ""
 
-#: Controller/EventsController.php:4133
+#: Controller/EventsController.php:4151
 msgid "ThreatConnect Import"
 msgstr ""
 
-#: Controller/EventsController.php:4138
+#: Controller/EventsController.php:4156
 msgid "(Experimental) Forensic analysis - Mactime"
 msgstr ""
 
-#: Controller/EventsController.php:4157
+#: Controller/EventsController.php:4175
 msgid "MISP standard (recommended exchange format - lossless)"
 msgstr ""
 
-#: Controller/EventsController.php:4163
+#: Controller/EventsController.php:4181
 msgid "STIX 1.1.1 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4168
+#: Controller/EventsController.php:4186
 msgid "STIX 2.0 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4210;4217
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr "POST prøverne som beskrevet på automatiseringsiden."
 
-#: Controller/EventsController.php:4246
+#: Controller/EventsController.php:4264
 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 er ikke i det korrekte format. Se API-dokumentationen på automatiseringsiden."
 
-#: Controller/EventsController.php:4254
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "Event ikke fundet"
 
-#: Controller/EventsController.php:4277
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "Event ikke fundet."
 
-#: Controller/EventsController.php:4287
+#: Controller/EventsController.php:4305
 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 "Distributionsniveau 5 understøttes ikke ved upload af en prøve uden videregivelse af et event-ID. Distributionsniveau 5 er beregnet til at håndtere distributionsniveauet for en eksisterende begivenhed."
 
-#: Controller/EventsController.php:4312
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "Oprettelsen af ​​en ny event med de givne oplysninger mislykkedes."
 
-#: Controller/EventsController.php:4451;4472;4531;4556;4581;4611;4632
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr "Ugyldig type."
 
-#: Controller/EventsController.php:4750
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr "Ugyldig metode."
 
-#: Controller/EventsController.php:4832
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr "%s tjenester er ikke aktiveret."
 
-#: Controller/EventsController.php:4836
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "Attribut ikke fundet, eller du har ingen rettigheder til at se den."
 
-#: Controller/EventsController.php:4841
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr "Ingen gyldige %s-muligheder fundet for denne attribut."
 
-#: Controller/EventsController.php:4896;4942
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr "%s-tjeneste kan ikke kontaktes."
 
-#: Controller/EventsController.php:4908
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr ": Beriget via "
 
-#: Controller/EventsController.php:4959
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ": Beriget via %s"
 
-#: Controller/EventsController.php:5114
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr "Importtjeneste kan ikke kontaktes."
 
-#: Controller/EventsController.php:5204;5218
+#: Controller/EventsController.php:5222;5236
 #: Controller/PostsController.php:60;84
 #: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
 msgid "You don't have permission to do that."
 msgstr "Du har ikke rettigheder til at gøre dette."
 
-#: Controller/EventsController.php:5345
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr "Ugyldigt ID."
 
-#: Controller/EventsController.php:5393
+#: Controller/EventsController.php:5411
 #: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr "Ugyldig Event"
 
-#: Controller/EventsController.php:5414
+#: Controller/EventsController.php:5432
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "Berigelsesopgave sat i kø til baggrundsbehandling. Returnér senere for at se resultaterne."
 
-#: Controller/EventsController.php:5665
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr "%s hændelse(-r) slettet."
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr "Du har ikke de nødvendige rettigheder til at gøre dette."
 
-#: Controller/FeedsController.php:241;340
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr "Feed tilføjet."
 
-#: Controller/FeedsController.php:249
-msgid "Feed could not be added. Invalid field: %s"
-msgstr "Feed kunne ikke tilføjes. Ugyldigt felt: %s"
+#: Controller/FeedsController.php:291
+msgid "Feed could not be added. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:274;375;397;526;567;778
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr "Ugyldigt feed."
 
-#: Controller/FeedsController.php:348
-msgid "Feed could not be updated. Invalid fields: %s"
-msgstr "Feed kunne ikke opdateres. Ugyldige felter: %s"
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:371
-#: Controller/OrganisationsController.php:237
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
 #: Controller/SharingGroupsController.php:237
-#: Controller/UsersController.php:1015
+#: Controller/UsersController.php:1044
 msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:404;530
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "Feed er pt. ikke aktiveret. Sørg for at aktivere det."
 
-#: Controller/FeedsController.php:417;483
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr "Starter hentning fra Feed."
 
-#: Controller/FeedsController.php:428
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr "Pull sat i kø til baggrundseksekvering."
 
-#: Controller/FeedsController.php:433;435
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr "Hentning af feed mislykkedes."
 
-#: Controller/FeedsController.php:439;500
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr "Hentning af feed blev gennemført korrerkt."
 
-#: Controller/FeedsController.php:512
+#: Controller/FeedsController.php:563
 msgid "No feed enabled."
 msgstr ""
 
-#: Controller/FeedsController.php:536;555
+#: Controller/FeedsController.php:587;606
 #: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr "Download mislykkedes."
 
-#: Controller/FeedsController.php:543
+#: Controller/FeedsController.php:594
 msgid "Event added."
 msgstr "Begivenhed tilføjet."
 
-#: Controller/FeedsController.php:546
+#: Controller/FeedsController.php:597
 msgid "Event already up to date."
 msgstr "Begivenhed allerede opdateret."
 
-#: Controller/FeedsController.php:548
+#: Controller/FeedsController.php:599
 msgid "Event updated."
 msgstr "Begivenhed opdateret."
 
-#: Controller/FeedsController.php:552
+#: Controller/FeedsController.php:603
 msgid "Could not %s event."
 msgstr "Kunne ikke %s begivenhed."
 
-#: Controller/FeedsController.php:649
+#: Controller/FeedsController.php:700
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "Feed kunne ikke hentes. Returnerede HTTP-fejlkode var: "
 
-#: Controller/FeedsController.php:688;739
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr "Ugyldigt feed type."
 
-#: Controller/FeedsController.php:784;816
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr "Kunne ikke downloade den valgte Begivenhed"
 
-#: Controller/FeedsController.php:814
+#: Controller/FeedsController.php:865
 msgid "This event is blocked by the Feed filters."
 msgstr "Denne begivenhed blokeres af Feed-filteret."
 
-#: Controller/FeedsController.php:852;856
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr "Ugyldigt Feed."
 
-#: Controller/FeedsController.php:877
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr "Kun POST-forespørgsler er tilladt."
 
-#: Controller/FeedsController.php:881
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr "Feed ikke fundet."
 
-#: Controller/FeedsController.php:890
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr "Data hentet."
 
-#: Controller/FeedsController.php:892
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "Kunne ikke hente valgte data. Årsag: %s"
 
-#: Controller/FeedsController.php:909
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr "Starter feed-caching."
 
-#: Controller/FeedsController.php:924
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr "Caching af feeds mislykkedes."
 
-#: Controller/FeedsController.php:927
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr "Caching af feeds afsluttet korrekt."
 
-#: Controller/FeedsController.php:961
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr "Ugyldig feed-liste modtaget."
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr "Alle klynger"
 
-#: Controller/GalaxiesController.php:174
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr "Alle navneområder"
 
-#: Controller/GalaxiesController.php:304
+#: Controller/GalaxiesController.php:337
 msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:307
+#: Controller/GalaxiesController.php:340
 msgid "Failed to parse request."
 msgstr "Fortolkning af forespørgsel mislykkedes."
 
@@ -1112,7 +1176,7 @@ msgid "Object could not be saved."
 msgstr ""
 
 #: Controller/ObjectsController.php:373;1006
-#: Model/Event.php:6171
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr "Ugyldigt objekt."
 
@@ -1180,43 +1244,43 @@ msgstr "Organisationen er blevet tilføjet korrekt."
 msgid "The organisation could not be added."
 msgstr "Organisationen kunne ikke tilføjes."
 
-#: Controller/OrganisationsController.php:156;289;295
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr "Ugyldig organisation."
 
-#: Controller/OrganisationsController.php:162;242;248;301;328;361
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
 msgid "Invalid organisation"
 msgstr "Ugyldig organisation"
 
-#: Controller/OrganisationsController.php:201
+#: Controller/OrganisationsController.php:208
 msgid "Organisation updated."
 msgstr "Organisation opdateret."
 
-#: Controller/OrganisationsController.php:216
+#: Controller/OrganisationsController.php:223
 msgid "The organisation could not be updated."
 msgstr "Organisationen kunne ikke opdateres."
 
-#: Controller/OrganisationsController.php:265
+#: Controller/OrganisationsController.php:272
 msgid "Organisation deleted"
 msgstr "Organisation slettet"
 
-#: Controller/OrganisationsController.php:272
+#: Controller/OrganisationsController.php:279
 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 "Organisation kunne ikke slettes. Organisationer bør generelt aldrig slettes. I stedet bør det overvejes at flytte dem til den kendte fjernorganisations liste. Alternativt, hvis du er sikker på, at du vil fjerne en organisation og er opmærksom på konsekvenserne, så sørg inden sletningen for, at der ikke findes nogle brugere eller begivenheder, som fortsat er bundet til denne organisation."
 
-#: Controller/OrganisationsController.php:366
+#: Controller/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr "Ingen destinationsside oprettet til denne organisation."
 
-#: Controller/OrganisationsController.php:415
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr "Denne handling er begrænset til synk-brugere"
 
-#: Controller/OrganisationsController.php:437
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr "Organisationen er blevet flettet korrekt."
 
-#: Controller/OrganisationsController.php:440
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr "Der opstod en fejl under fletningen af organisationerne. Se revisionslogfilerne for yderligere info om, hvad der gik galt. Vil du tilbagefører ændringerne, kan du finde en .sql-fil"
 
@@ -1348,7 +1412,7 @@ msgstr "Organisationen kunne ikke oprettes, da UUID'en allerede er i brug."
 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. Sikker på, at UIID'en har et korrekt format? Tjek også, at organisationsnavnet ikke allerede findes."
 
-#: Controller/ServersController.php:350;532;2154
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr "Serveren er gemt"
 
@@ -1356,8 +1420,8 @@ msgstr "Serveren er gemt"
 msgid "The server could not be saved. Please, try again."
 msgstr "Serveren kunne ikke gemmes. Forsøg igen."
 
-#: Controller/ServersController.php:411;608;653;656;665;729;735;1489;1506
-#: Model/Server.php:5737
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
@@ -1365,7 +1429,7 @@ msgstr "Ugyldig server"
 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:604;2171;2213
+#: Controller/ServersController.php:604;2183;2225
 msgid "This endpoint expects POST requests."
 msgstr ""
 
@@ -1564,79 +1628,79 @@ msgstr ""
 msgid "This setting can only be edited via the CLI."
 msgstr "Denne indstilling kan kun redigeres via CLI."
 
-#: Controller/ServersController.php:1365
+#: Controller/ServersController.php:1365;1377
 msgid "Restarting workers."
 msgstr ""
 
-#: Controller/ServersController.php:1389
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "Fil ikke fundet."
 
-#: Controller/ServersController.php:1395
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "Fil kunne ikke slettes."
 
-#: Controller/ServersController.php:1418;1434
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr "Upload mislykkedes."
 
-#: Controller/ServersController.php:1426
+#: Controller/ServersController.php:1438
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "Fil findes allerede. Skal den erstattes, skal den gamle fil fjernes først."
 
-#: Controller/ServersController.php:1493
+#: Controller/ServersController.php:1505
 msgid "Invalid user or user not found."
 msgstr ""
 
-#: Controller/ServersController.php:2040
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr "Starter server-caching."
 
-#: Controller/ServersController.php:2055
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr "Caching af server mislykkedes."
 
-#: Controller/ServersController.php:2058
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr "Caching af server korrekt gennemført."
 
-#: Controller/ServersController.php:2088
+#: Controller/ServersController.php:2100
 msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2097
+#: Controller/ServersController.php:2109
 msgid "Configured host org not found. Please make sure that the setting is current on the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2161
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr "Kunne ikke gemme server. Fejl: %s"
 
-#: Controller/ServersController.php:2182
+#: Controller/ServersController.php:2194
 msgid "API key updated."
 msgstr ""
 
-#: Controller/ServersController.php:2195
+#: Controller/ServersController.php:2207
 msgid "ID has to be a valid server connection"
 msgstr ""
 
-#: Controller/ServersController.php:2198
+#: Controller/ServersController.php:2210
 msgid "Invalid direction. Valid options: "
 msgstr ""
 
-#: Controller/ServersController.php:2202
+#: Controller/ServersController.php:2214
 msgid "Priority changed."
 msgstr ""
 
-#: Controller/ServersController.php:2205
+#: Controller/ServersController.php:2217
 msgid "Priority could not be changed."
 msgstr ""
 
-#: Controller/ServersController.php:2216
+#: Controller/ServersController.php:2228
 msgid "Only site admin accounts can release the update lock."
 msgstr ""
 
-#: Controller/ServersController.php:2226
+#: Controller/ServersController.php:2238
 msgid "Only site admin accounts get the DB schema diagnostic."
 msgstr ""
 
@@ -1967,164 +2031,174 @@ msgstr "Event udfyldt, "
 msgid "Event populated, but "
 msgstr "Event er udfyldt men, "
 
-#: Controller/UserSettingsController.php:123;312
+#: Controller/UserSettingsController.php:129;276
 msgid "Invalid ID passed."
 msgstr ""
 
-#: Controller/UserSettingsController.php:133;137;322;326
+#: Controller/UserSettingsController.php:139;143;286;290
 msgid "Invalid user setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:151;192;278;290
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
 msgid "Invalid setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:155;196;330
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
 msgid "This setting is restricted and requires the following permission(s): %s"
 msgstr ""
 
-#: Controller/UserSettingsController.php:189
-msgid "This endpoint expects both a setting and a value to be set."
-msgstr ""
-
-#: Controller/UserSettingsController.php:229
+#: Controller/UserSettingsController.php:193
 msgid "Setting saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:242
+#: Controller/UserSettingsController.php:206
 msgid "Setting could not be saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:337
+#: Controller/UserSettingsController.php:301
 msgid "Setting deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:345
+#: Controller/UserSettingsController.php:309
 msgid "Setting could not be deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:358
+#: Controller/UserSettingsController.php:322
 msgid "Expecting POST or DELETE request."
 msgstr ""
 
-#: Controller/UsersController.php:42;310
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr "Ukendt bruger eller manglende autorisation."
 
-#: Controller/UsersController.php:62;538;786;805;1030
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "Ukendt bruger"
 
-#: Controller/UsersController.php:150;693;858
+#: Controller/UsersController.php:154;722;887
 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): "
 
-#: Controller/UsersController.php:202
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr "Profilen blev opdateret"
 
-#: Controller/UsersController.php:207
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr "Profilen kunne ikke opdateres. Venligst prøv igen."
 
-#: Controller/UsersController.php:247
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:256
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:276
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "Kodeord ændret."
 
-#: Controller/UsersController.php:285
+#: Controller/UsersController.php:299
 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:422;440;547
-#: Model/Log.php:370
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:704
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr "Brugeren kunne ikke gemmes. Ugyldig organisation."
 
-#: Controller/UsersController.php:726
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "Brugeren er gemt."
 
-#: Controller/UsersController.php:735;966
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr "Brugeren kunne ikke gemmes. Venligst prøv igen."
 
-#: Controller/UsersController.php:958
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "Brugeren er gemt"
 
-#: Controller/UsersController.php:1038
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "Brugeren slettet"
 
-#: Controller/UsersController.php:1042
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "Brugeren blev ikke slettet"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "Ukendt brugernavn eller kodeord, prøv igen"
 
-#: Controller/UsersController.php:1208
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr "Farvel og tak for kaffe"
 
-#: Controller/UsersController.php:1230
-msgid "Invalid action."
-msgstr ""
-
-#: Controller/UsersController.php:1237
-msgid "New authkey generated."
-msgstr "Ny autentifikations nøgle genereret."
-
-#: Controller/UsersController.php:1248
+#: Controller/UsersController.php:1273;1297
 msgid "This functionality is only accessible via POST requests."
 msgstr ""
 
-#: Controller/UsersController.php:1252
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
+msgid "New authkey generated."
+msgstr "Ny autentifikations nøgle genereret."
+
+#: Controller/UsersController.php:1301
 msgid "Job initiated."
 msgstr ""
 
-#: Controller/UsersController.php:1254
+#: Controller/UsersController.php:1303
 msgid "%s authkeys reset, %s could not be reset."
 msgstr ""
 
-#: Controller/UsersController.php:1368
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr "Du har accepteret vilkår og betingelserne."
 
-#: Controller/UsersController.php:1496
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1501
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1538
+#: Controller/UsersController.php:1587
 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:1540
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr "E-Mails sendt."
 
-#: Controller/UsersController.php:1614
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr ""
 
-#: Controller/UsersController.php:1615
+#: Controller/UsersController.php:1664
 #: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
@@ -2134,11 +2208,11 @@ msgstr ""
 msgid "Organisations"
 msgstr "Organisationer"
 
-#: Controller/UsersController.php:1616
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr ""
 
-#: Controller/UsersController.php:1617
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
 #: View/DecayingModel/decaying_tool_rest_search.ctp:28
 #: View/Elements/eventattribute.ctp:151
@@ -2164,18 +2238,160 @@ msgstr ""
 msgid "Tags"
 msgstr "Tags"
 
-#: Controller/UsersController.php:1618
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr ""
 
-#: Controller/UsersController.php:1619
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1620
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr ""
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "Ja"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "Nej"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr ""
@@ -2256,11 +2472,11 @@ msgstr ""
 msgid "No valid data received."
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:614
+#: Controller/Component/ACLComponent.php:634
 msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:668
+#: Controller/Component/ACLComponent.php:688
 msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
 msgstr ""
 
@@ -2741,87 +2957,87 @@ msgstr ""
 msgid "Invalid %s."
 msgstr ""
 
-#: Model/AppModel.php:1416
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr ""
 
-#: Model/AppModel.php:1430
+#: Model/AppModel.php:1480
 msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1452
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1453
+#: Model/AppModel.php:1503
 msgid "The executed SQL query was: %s"
 msgstr ""
 
-#: Model/AppModel.php:1455
+#: Model/AppModel.php:1505
 msgid "Successfuly executed the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1466;1530
+#: Model/AppModel.php:1516;1580
 msgid "Issues executing the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1469
+#: Model/AppModel.php:1519
 msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1478
+#: Model/AppModel.php:1528
 msgid "However, as this error is whitelisted, the update went through."
 msgstr ""
 
-#: Model/AppModel.php:1497
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/AppModel.php:1500
+#: Model/AppModel.php:1550
 msgid "Failed to add index"
 msgstr ""
 
-#: Model/AppModel.php:1502
+#: Model/AppModel.php:1552
 msgid "The returned error is:"
 msgstr ""
 
-#: Model/AppModel.php:1531
+#: Model/AppModel.php:1581
 msgid "Database updates stopped as some errors occured and the stop flag is enabled."
 msgstr ""
 
-#: Model/AppModel.php:1690
+#: Model/AppModel.php:1740
 msgid "Invalid JSON."
 msgstr ""
 
-#: Model/AppModel.php:1783;1841
+#: Model/AppModel.php:1833;1891
 msgid "Issues executing run_updates"
 msgstr ""
 
-#: Model/AppModel.php:1784
+#: Model/AppModel.php:1834
 msgid "Database updates are locked. Worker not spawned"
 msgstr ""
 
-#: Model/AppModel.php:1788;1846;1881
+#: Model/AppModel.php:1838;1896;1931
 msgid "Update done"
 msgstr ""
 
-#: Model/AppModel.php:1842
+#: Model/AppModel.php:1892
 msgid "Updates are locked. Stopping worker gracefully"
 msgstr ""
 
-#: Model/AppModel.php:1861
+#: Model/AppModel.php:1911
 msgid "Running update %s"
 msgstr ""
 
-#: Model/AppModel.php:1887
+#: Model/AppModel.php:1937
 msgid "Update done in another worker. Gracefuly stopping."
 msgstr ""
 
@@ -3805,19 +4021,19 @@ msgstr "Værdien skal være et nummer der er større end eller lig med 0."
 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:2278;2346
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr "Brugeren kunne ikke læses."
 
-#: Model/Attribute.php:2282
+#: Model/Attribute.php:2301
 msgid "Invalid hash type."
 msgstr "Ugyldig hash-type."
 
-#: Model/Attribute.php:2973
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr "Feltet er obligatorisk."
 
-#: Model/Attribute.php:3540
+#: Model/Attribute.php:3559
 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."
 
@@ -3837,6 +4053,10 @@ msgstr ""
 msgid "Community not found."
 msgstr ""
 
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
 #: Model/DecayingModel.php:162
 msgid "Models could not be loaded or default decaying models folder is empty"
 msgstr ""
@@ -3908,67 +4128,75 @@ msgstr ""
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5722
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr "Problemer, under indlæsningen af STIX filen. "
 
-#: Model/Event.php:5724
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr "Problemer med MAEC biblioteket. "
 
-#: Model/Event.php:5726
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "Der var problemer med at udføre indtagelsen, eller ugyldigt input. "
 
-#: Model/Event.php:5729
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr "Kontakt din administrator for "
 
-#: Model/Event.php:5731
+#: Model/Event.php:5808
 msgid "Please "
 msgstr "Venligst "
 
-#: Model/Event.php:5733
+#: Model/Event.php:5810
 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:5765
+#: Model/Event.php:5842
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:5774
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr "%s ikke sat"
 
-#: Model/Event.php:6023
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr "Kunne ikke tilføje tags."
 
-#: Model/Event.php:6505
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:1444;1488
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1458
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Feed.php:1635
+#: Model/Feed.php:1687
 msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Feed.php:1638
+#: Model/Feed.php:1690
 msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
 msgstr ""
 
-#: Model/Feed.php:1643
+#: Model/Feed.php:1695
 msgid "Invalid user id."
 msgstr ""
 
-#: Model/Feed.php:1663
+#: Model/Feed.php:1715
 msgid "Events related to feed %s purged."
 msgstr ""
 
@@ -3976,1164 +4204,1208 @@ msgstr ""
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:1057
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
-#: Model/Server.php:140
+#: Model/Server.php:123
+msgid "Server unreachable"
+msgstr ""
+
+#: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
 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:141
+#: Model/Server.php:151
 msgid "Administering MISP via the CLI"
 msgstr "Administrer MISP via CLI"
 
-#: Model/Server.php:153
+#: Model/Server.php:163
 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:154
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "Automatisering af visse konsol opgaver"
 
-#: Model/Server.php:163
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:164
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:173
+#: Model/Server.php:183
 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:175
+#: Model/Server.php:185
 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:181
+#: Model/Server.php:191
 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:189
+#: Model/Server.php:199
 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:197
+#: Model/Server.php:207
 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:207
+#: Model/Server.php:217
 msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
-#: Model/Server.php:216
+#: Model/Server.php:226
 msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
 msgstr ""
 
-#: Model/Server.php:225
+#: Model/Server.php:235
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "Aktiver nogle performance tunge korrelationer (i øjeblikket CIDR korrelation)"
 
-#: Model/Server.php:234
+#: Model/Server.php:244
 msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
 msgstr ""
 
-#: Model/Server.php:243
+#: Model/Server.php:253
 msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
 msgstr ""
 
-#: Model/Server.php:254
+#: Model/Server.php:264
 msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
 msgstr ""
 
-#: Model/Server.php:264
+#: Model/Server.php:274
 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:273
+#: Model/Server.php:283
 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:281
+#: Model/Server.php:291
 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:290
+#: Model/Server.php:300
 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:292
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr "Hvis dette ikke er angivet benyttes standardværdien."
 
-#: Model/Server.php:298;306;333;357;365;373;381;438;486;494;561
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr "Denne indstilling er forældet og kan fjernes."
 
-#: Model/Server.php:314
+#: Model/Server.php:324
 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:324
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr ""
 
-#: Model/Server.php:341
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "Sidefodsteksten foran \"Drevet af MISP\" teksten."
 
-#: Model/Server.php:349
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "Sidefodsteksten efter \"Drevet af MISP\" teksten."
 
-#: Model/Server.php:389
+#: Model/Server.php:399
 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:397
+#: Model/Server.php:407
 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:405
+#: Model/Server.php:415
 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:413
+#: Model/Server.php:423
 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:421
+#: Model/Server.php:431
 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:430
+#: Model/Server.php:440
 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:432
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr "Der er ikke sat et gyldigt UUID"
 
-#: Model/Server.php:446
+#: Model/Server.php:456
 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:454
+#: Model/Server.php:464
 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:462
+#: Model/Server.php:472
 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:470
+#: Model/Server.php:480
 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:478
+#: Model/Server.php:488
 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:502
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr "Aktiver anvendelsen af MISP's baggrunds processering."
 
-#: Model/Server.php:510
+#: Model/Server.php:520
 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:520
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "Tillad XML caches at inkludere kodede vedhæftninger."
 
-#: Model/Server.php:528
+#: Model/Server.php:538
 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:536
+#: Model/Server.php:546
 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:544
+#: Model/Server.php:554
 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:553
+#: Model/Server.php:563
 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:569
+#: Model/Server.php:579
 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:577
+#: Model/Server.php:587
 msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
 msgstr ""
 
-#: Model/Server.php:585
+#: Model/Server.php:595
 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:593
+#: Model/Server.php:603
 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:601
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr "Standard distributions indstilling for events (0-3)."
 
-#: Model/Server.php:610
+#: Model/Server.php:620
 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:619
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr "Standardindstillingen for trussel niveau ved oprettelse af events."
 
-#: Model/Server.php:628
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:637
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 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:645
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr "Vis de fulde tag navne i event oversigten."
 
-#: Model/Server.php:654
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr "Anvendes på login-siden, før MISP logoet"
 
-#: Model/Server.php:662
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr "Anvendes på login-siden, efter MISP logoet"
 
-#: Model/Server.php:670
+#: Model/Server.php:689
 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:678
+#: Model/Server.php:697
 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:686
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr "Bruges i sidetitlen efter navnet på siden"
 
-#: Model/Server.php:694
+#: Model/Server.php:713
 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:702
+#: Model/Server.php:721
 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:710
+#: Model/Server.php:729
 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:718
+#: Model/Server.php:737
 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:726
+#: Model/Server.php:745
 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:735
+#: Model/Server.php:754
 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:744
+#: Model/Server.php:763
 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:752
+#: Model/Server.php:771
 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:759
+#: Model/Server.php:778
 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:766
+#: Model/Server.php:785
 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:775
+#: Model/Server.php:794
 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:783
+#: Model/Server.php:802
 msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
 msgstr ""
 
-#: Model/Server.php:785
+#: Model/Server.php:804
 msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
 msgstr ""
 
-#: Model/Server.php:792
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:801
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:810
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:819
+#: Model/Server.php:838
 msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
 msgstr ""
 
-#: Model/Server.php:828
+#: Model/Server.php:847
 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:837
+#: Model/Server.php:856
 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:846
+#: Model/Server.php:865
 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:855
+#: Model/Server.php:874
 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:864
+#: Model/Server.php:883
 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:873
+#: Model/Server.php:892
 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:883
+#: Model/Server.php:902
 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:892
+#: Model/Server.php:911
 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:901
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:910
+#: Model/Server.php:929
 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:919
+#: Model/Server.php:938
 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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:928
+#: Model/Server.php:947
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:937
+#: Model/Server.php:956
 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:947
+#: Model/Server.php:966
 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:956
+#: Model/Server.php:975
 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:965
+#: Model/Server.php:984
 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:974
+#: Model/Server.php:993
 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:984
+#: Model/Server.php:1003
 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:993
+#: Model/Server.php:1012
 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:1001
+#: Model/Server.php:1020
 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:1009
+#: Model/Server.php:1028
 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:1017
+#: Model/Server.php:1036
 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:1026
+#: Model/Server.php:1045
 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:1034
+#: Model/Server.php:1053
 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:1042
+#: Model/Server.php:1061
 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:1051
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:1062
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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:1071
+#: Model/Server.php:1099
 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:1079
+#: Model/Server.php:1107
 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:1087
+#: Model/Server.php:1115
 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:1095
+#: Model/Server.php:1123
 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:1103
+#: Model/Server.php:1131
 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:1112
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr "Placeringen af ​​GnuPGs hjemmemappe."
 
-#: Model/Server.php:1123
+#: Model/Server.php:1151
 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:1131
+#: Model/Server.php:1159
 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:1139
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr "Placeringen af den offentlige del af signeringscertifikatet."
 
-#: Model/Server.php:1147
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr "Placeringen af den private del af signerings certifikatet."
 
-#: Model/Server.php:1155
+#: Model/Server.php:1183
 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:1167
+#: Model/Server.php:1195
 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:1175
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr "TCP-porten til HTTP-proxy'en."
 
-#: Model/Server.php:1183
+#: Model/Server.php:1211
 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:1191
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr "Godkendelsesbrugernavnet til HTTP proxy'en."
 
-#: Model/Server.php:1199
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr "Godkendelsesadgangskoden til HTTP-proxy'en."
 
-#: Model/Server.php:1210
+#: Model/Server.php:1238
 msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
 msgstr ""
 
-#: Model/Server.php:1219
+#: Model/Server.php:1247
 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:1229
+#: Model/Server.php:1257
 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:1238
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1246
+#: Model/Server.php:1292
 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:1254
+#: Model/Server.php:1300
 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:1263
+#: Model/Server.php:1309
 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:1272
+#: Model/Server.php:1318
 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:1281
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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:1283
+#: Model/Server.php:1339
 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:1290
+#: Model/Server.php:1346
 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:1299
+#: Model/Server.php:1355
 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:1308
+#: Model/Server.php:1364
 msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 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:1328
+#: Model/Server.php:1393
 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:1339
+#: Model/Server.php:1404
 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:1347
+#: Model/Server.php:1412
 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:1355
+#: Model/Server.php:1420
 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:1364
+#: Model/Server.php:1429
 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:1372
+#: Model/Server.php:1437
 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:1383
+#: Model/Server.php:1448
 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:1392
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1473
 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:1416
+#: Model/Server.php:1481
 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:1424
+#: Model/Server.php:1489
 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:1432
+#: Model/Server.php:1497
 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:1440
+#: Model/Server.php:1505
 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:1448
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr ""
 
-#: Model/Server.php:1456
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr "Alternativ navneserver"
 
-#: Model/Server.php:1464
+#: Model/Server.php:1529
 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:1472
+#: Model/Server.php:1537
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1480
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr ""
 
-#: Model/Server.php:1488
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr ""
 
-#: Model/Server.php:1496;1743
+#: Model/Server.php:1561;1808
 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:1504;1751
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr "Aktiverer/deaktiverer publiceringen af enhver begivenhedsoprettelse/redigering/sletning."
 
-#: Model/Server.php:1512
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1520
+#: Model/Server.php:1585
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1528
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr ""
 
-#: Model/Server.php:1536;1759
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr "Aktiverer/deaktiverer publiceringen af enhver objektoprettelse/redigering/sletning."
 
-#: Model/Server.php:1544
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1552;1767
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr "Aktiverer/deaktiverer publiceringen af enhver objektreferenceoprettelse/sletning."
 
-#: Model/Server.php:1560
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1568;1775
+#: Model/Server.php:1633;1840
 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:1576
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1584
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1592
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1600;1783
+#: Model/Server.php:1665;1848
 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:1608
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1616
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr ""
 
-#: Model/Server.php:1624
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr ""
 
-#: Model/Server.php:1632
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr ""
 
-#: Model/Server.php:1640
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr ""
 
-#: Model/Server.php:1648
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1656
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1664
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1672
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr ""
 
-#: Model/Server.php:1680
+#: Model/Server.php:1745
 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:1689
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr "Porten benyttet af funktionerne pub/sub."
 
-#: Model/Server.php:1698
+#: Model/Server.php:1763
 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:1707
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr "Porten, som Redis monitere."
 
-#: Model/Server.php:1716
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr "Redis-adgangskoden (hvis opsat)."
 
-#: Model/Server.php:1725
+#: Model/Server.php:1790
 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:1734
+#: Model/Server.php:1799
 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:1791
+#: Model/Server.php:1856
 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:1799
+#: Model/Server.php:1864
 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:1807
+#: Model/Server.php:1872
 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:1815
+#: Model/Server.php:1880
 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:1823
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "Aktivér logning til en ElasticSearch-instans"
 
-#: Model/Server.php:1831
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1839
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr "Indekset, hvori logger skal placeres"
 
-#: Model/Server.php:1847
+#: Model/Server.php:1912
 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:1855
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr "Bucket-navn til at uploade til"
 
-#: Model/Server.php:1863
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr "Region, hvori din S3-bucket er beliggende"
 
-#: Model/Server.php:1871
+#: Model/Server.php:1936
 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:1879
+#: Model/Server.php:1944
 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:1887
+#: Model/Server.php:1952
 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:1896
+#: Model/Server.php:1961
 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:1904
+#: Model/Server.php:1969
 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:1912
+#: Model/Server.php:1977
 msgid "Enable SightingDB integration."
 msgstr ""
 
-#: Model/Server.php:1920
+#: Model/Server.php:1985
 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:1930
+#: Model/Server.php:1995
 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:1939
+#: Model/Server.php:2004
 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:1948
+#: Model/Server.php:2013
 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:1957
+#: Model/Server.php:2022
 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:1966
+#: Model/Server.php:2031
 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:1975
+#: Model/Server.php:2040
 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:1984
+#: Model/Server.php:2049
 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:1992
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr "Aktivér/deaktivér berigelsestjenesterne"
 
-#: Model/Server.php:2000
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr "Angiv en timeout for berigelsestjenesterne"
 
-#: Model/Server.php:2008
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr "Aktivér/deaktivér importtjenesterne"
 
-#: Model/Server.php:2016
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr "Angiv en timeout for importtjenesterne"
 
-#: Model/Server.php:2024
+#: Model/Server.php:2089
 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:2032
+#: Model/Server.php:2097
 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:2040
+#: Model/Server.php:2105
 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:2048
+#: Model/Server.php:2113
 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:2056
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr "Aktivér/deaktivér eksporttjenesterne"
 
-#: Model/Server.php:2064
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr "Angiv en timeout for eksporttjenesterne"
 
-#: Model/Server.php:2072
+#: Model/Server.php:2137
 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:2080
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr "Angiv en timeout for mus-over tjenesterne"
 
-#: Model/Server.php:2088
+#: Model/Server.php:2153
 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:2096
+#: Model/Server.php:2161
 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:2104
+#: Model/Server.php:2169
 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:2112
+#: Model/Server.php:2177
 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:2120
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2128
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "Angiv en godkendelsesnøgle til videreivelse til Cortex"
 
-#: Model/Server.php:2137
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2145
+#: Model/Server.php:2210
 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:2154
+#: Model/Server.php:2219
 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:2163
+#: Model/Server.php:2228
 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:2172
+#: Model/Server.php:2237
 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:2181
+#: Model/Server.php:2246
 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:2190
+#: Model/Server.php:2255
 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:2200
+#: Model/Server.php:2265
 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:2209
+#: Model/Server.php:2274
 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:2376
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2380
+#: Model/Server.php:2445
 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:2407
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr ""
 
-#: Model/Server.php:2413
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr ""
 
-#: Model/Server.php:2492
+#: Model/Server.php:2557
 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:2494
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr ""
 
-#: Model/Server.php:2495
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2507;2509
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr ""
 
-#: Model/Server.php:3049
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr "Aktivér/deaktivér %s-modulet."
 
-#: Model/Server.php:3052
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr "Begræns %s-modulet til den givne organisation."
 
-#: Model/Server.php:3060
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr "Angiv specifikke indstillinger for dette modul."
 
-#: Model/Server.php:3175
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr "Ingen værdi sat."
 
-#: Model/Server.php:3196
+#: Model/Server.php:3281
 msgid "Invalid language."
 msgstr ""
 
-#: Model/Server.php:3217
+#: Model/Server.php:3302
 msgid "Invalid tag_collection."
 msgstr ""
 
-#: Model/Server.php:3225
+#: Model/Server.php:3310
 msgid "This setting has to be a number."
 msgstr ""
 
-#: Model/Server.php:3237
+#: Model/Server.php:3322
 msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
 msgstr ""
 
-#: Model/Server.php:3519
+#: Model/Server.php:3619
 msgid "Invalid file path or file not accessible."
 msgstr ""
 
-#: Model/Server.php:3522
+#: Model/Server.php:3622
 msgid "File has to be in .pem format."
 msgstr ""
 
-#: Model/Server.php:3888
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr ""
 
-#: Model/Server.php:4020
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr "Organisationslogoer"
 
-#: Model/Server.php:4021
+#: Model/Server.php:4121
 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:4023
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr "48x48 pixel .png filer"
 
-#: Model/Server.php:4026;4041
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
 msgstr "Filnavnet skal være i følgende format: *.png"
 
-#: Model/Server.php:4030
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr "Yderligere billedfiler"
 
-#: Model/Server.php:4031
+#: Model/Server.php:4131
 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:4038
+#: Model/Server.php:4138
 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:4128
+#: Model/Server.php:4228
 msgid "Invalid server."
 msgstr ""
 
-#: Model/Server.php:4159
+#: Model/Server.php:4259
 msgid "Response was empty."
 msgstr ""
 
-#: Model/Server.php:4235
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:4501
+#: Model/Server.php:4604
 msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
 msgstr ""
 
-#: Model/Server.php:4571
+#: Model/Server.php:4675
 msgid "Can't check database schema for Postgres database type"
 msgstr ""
 
-#: Model/Server.php:4588
+#: Model/Server.php:4692
 msgid "Table `%s` does not exist"
 msgstr ""
 
-#: Model/Server.php:4615
+#: Model/Server.php:4719
 msgid "Column `%s` exists but should not"
 msgstr ""
 
-#: Model/Server.php:4648
+#: Model/Server.php:4752
 msgid "Column `%s` is different"
 msgstr ""
 
-#: Model/Server.php:4658
+#: Model/Server.php:4762
 msgid "Column `%s` does not exist but should"
 msgstr ""
 
-#: Model/Server.php:4671
+#: Model/Server.php:4775
 msgid "Table `%s` is an additional table"
 msgstr ""
 
-#: Model/Server.php:4695
+#: Model/Server.php:4799
 msgid "Column `%s` should be indexed"
 msgstr ""
 
-#: Model/Server.php:4718
+#: Model/Server.php:4822
 msgid "Column `%s` is indexed but should not"
 msgstr ""
 
-#: Model/Server.php:5141
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr "Fjerner en dead worker."
 
-#: Model/Server.php:5142
+#: Model/Server.php:5253
 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:5146
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr "Stopper en worker."
 
-#: Model/Server.php:5147
+#: Model/Server.php:5258
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr "Stopper en worker. Worker var af typen %s med PID %s"
 
-#: Model/Server.php:5449
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:5449;5478
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:5461
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:5462
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:5593
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:5600
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:5607
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr ""
 
-#: Model/Server.php:5787
+#: Model/Server.php:5911
 msgid "Could not reset the remote authentication key."
 msgstr ""
 
-#: Model/Server.php:5864
+#: Model/Server.php:5988
 msgid "Could not parse JSON: "
 msgstr ""
 
-#: Model/Server.php:5884
+#: Model/Server.php:6008
 msgid "Could not reset fetch remote user account."
 msgstr ""
 
-#: Model/Server.php:5906
+#: Model/Server.php:6030
 msgid "No user object received in response."
 msgstr ""
 
@@ -5201,6 +5473,10 @@ msgstr ""
 msgid "API key reset by administrator"
 msgstr ""
 
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
 #: Model/DecayingModelsFormulas/Polynomial.php:7
 msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
 msgstr ""
@@ -5233,7 +5509,7 @@ msgstr "der har de følgende afhængige items"
 
 #: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Tilføj attribut"
@@ -5260,8 +5536,8 @@ msgstr ""
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
 #: View/Events/add.ctp:33
-#: View/Feeds/add.ctp:178
-#: View/Feeds/edit.ctp:179
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
 #: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
@@ -5270,7 +5546,7 @@ msgstr "Delingsgruppe"
 #: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -5286,15 +5562,15 @@ msgstr "Kontekstuel kommentar"
 msgid "for Intrusion Detection System"
 msgstr "til Intrustion Dectection System"
 
-#: View/Attributes/add.ctp:154
+#: View/Attributes/add.ctp:155
 msgid "Timezone missing, auto-detected as: "
 msgstr ""
 
-#: View/Attributes/add.ctp:155
+#: View/Attributes/add.ctp:156
 msgid "The following value will be submited instead: "
 msgstr ""
 
-#: View/Attributes/add.ctp:163
+#: View/Attributes/add.ctp:164
 msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr ""
 
@@ -5355,10 +5631,13 @@ msgstr "Begivenheds-ID"
 #: View/DecayingModel/decaying_tool_rest_search.ctp:24
 #: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr "Org"
 
@@ -5417,7 +5696,7 @@ msgid "Values"
 msgstr "Værdier"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:57
@@ -5439,7 +5718,7 @@ msgid "Replaceattributes"
 msgstr "Replaceattributes"
 
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:80
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Elements/view_galaxy_matrix.ctp:76;211
 #: View/Elements/genericElements/Form/submitButton.ctp:8;25
@@ -5467,7 +5746,7 @@ msgstr "Replaceattributes"
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:67
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/UserSettings/set_setting.ctp:36
-#: View/Users/admin_add.ctp:97
+#: View/Users/admin_add.ctp:98
 #: View/Users/admin_edit.ctp:91
 #: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
@@ -5479,7 +5758,7 @@ msgid "Submit"
 msgstr "Godkend"
 
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
 #: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/exportSearch.ctp:32
@@ -5488,6 +5767,7 @@ msgstr "Godkend"
 #: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
 #: View/Elements/view_galaxy_matrix.ctp:212
+#: View/Elements/genericElements/infoModal.ctp:40
 #: View/Elements/genericElements/Form/submitButton.ctp:13
 #: View/Elements/serverRuleElements/pull.ctp:73
 #: View/Elements/serverRuleElements/push.ctp:72
@@ -5578,7 +5858,7 @@ msgstr "Advarsel: Du er ved at dele data af en sensitiv art (Tilskrivningsdata/m
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
 #: View/Users/statistics_data.ctp:19
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr "Attributter"
 
@@ -5629,10 +5909,7 @@ msgstr "Resultater for alle attributter"
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -5657,7 +5934,6 @@ msgstr "Resultater for alle attributter"
 #: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:32;106
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -5680,10 +5956,7 @@ msgstr "forrige"
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -5708,7 +5981,6 @@ msgstr "forrige"
 #: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:34;108
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -5737,7 +6009,6 @@ msgstr "Dato"
 #: View/Elements/global_menu.ctp:94
 #: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr "Galaxies"
@@ -5775,7 +6046,7 @@ msgstr "Observationer"
 #: View/Attributes/index.ctp:62
 #: View/Elements/eventattribute.ctp:166
 #: View/Events/view.ctp:262
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr "Aktivitet"
@@ -5785,7 +6056,7 @@ msgstr "Aktivitet"
 #: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/genericElements/IndexTable/headers.ctp:31
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -5794,10 +6065,7 @@ msgstr "Aktivitet"
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -5833,10 +6101,7 @@ msgstr "Handlinger"
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -5861,7 +6126,6 @@ msgstr "Handlinger"
 #: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:99
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -5952,13 +6216,12 @@ msgstr "Er du sikker på at du vil soft-delete attribut #%s? Dette betyder at de
 #: View/Elements/Events/eventIndexTable.ctp:234
 #: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:597
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -5975,106 +6238,6 @@ msgstr "Er du sikker på at du vil soft-delete attribut #%s? Dette betyder at de
 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
-#: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: 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:92
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
-#: 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 "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
-#: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
-#: 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:92
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
-#: 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 "Nej"
-
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
@@ -6108,9 +6271,10 @@ msgstr "Undlad ændring af nuværende indstillinger"
 #: View/Events/resolved_attributes.ctp:51
 #: View/Events/resolved_misp_format.ctp:98;293
 #: View/Events/view.ctp:159
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:171
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
+#: View/Feeds/index.ctp:184
 #: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
 #: View/Objects/revise_object.ctp:35;69
@@ -6126,23 +6290,27 @@ msgstr "Distribution"
 msgid "For Intrusion Detection System"
 msgstr "Til Intrusion Detection System"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 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
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
@@ -6232,12 +6400,16 @@ msgid "Unvetted"
 msgstr ""
 
 #: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
 #: View/EventBlacklists/index.ctp:35
 #: View/EventDelegations/index.ctp:41
 #: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
 #: View/Feeds/preview_index.ctp:25
 #: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
 #: View/ObjectTemplates/index.ctp:47
 #: View/Organisations/index.ctp:75
 #: View/Servers/preview_index.ctp:64
@@ -6245,31 +6417,41 @@ msgstr ""
 #: View/Sightingdb/index.ctp:10
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:81
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
 msgid "Filter"
 msgstr "Filter"
 
 #: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
 #: View/Elements/eventattributetoolbar.ctp:231
 #: View/EventBlacklists/index.ctp:36
 #: View/EventDelegations/index.ctp:42
 #: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
 #: View/Feeds/preview_index.ctp:26
 #: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
 #: View/ObjectTemplates/index.ctp:48
 #: View/Organisations/index.ctp:76
 #: View/Servers/preview_index.ctp:65
 #: View/ShadowAttributes/index.ctp:38
 #: View/Sightingdb/index.ctp:11
-#: View/Users/admin_index.ctp:82
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
 msgid "Enter value to search"
 msgstr ""
 
 #: View/Communities/index.ctp:34
 #: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
 #: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
 #: View/Feeds/search_caches.ctp:35
 #: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
 #: View/ObjectTemplates/view.ctp:3
 #: View/Organisations/view.ctp:5
 #: View/Pages/doc/administration.ctp:180;221;236
@@ -6278,7 +6460,9 @@ msgstr ""
 #: View/Taxonomies/view.ctp:4
 #: View/Templates/view.ctp:4
 #: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
 #: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
 #: View/Users/view.ctp:3
 #: View/Warninglists/view.ctp:9
 msgid "Id"
@@ -6297,6 +6481,8 @@ msgid "Community name"
 msgstr ""
 
 #: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
 #: View/DecayingModel/index.ctp:89
 #: View/DecayingModel/view.ctp:21
 #: View/Elements/Servers/View/row_object.ctp:24
@@ -6310,8 +6496,10 @@ msgstr ""
 #: View/Elements/templateElements/templateRowAttribute.ctp:21
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
 #: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:22;113;210
 #: View/Objects/group_attributes_into_object.ctp:8
@@ -6333,10 +6521,18 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
 msgid "Communities index"
 msgstr ""
 
-#: View/Communities/index.ctp:64
+#: View/Communities/index.ctp:72
 msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
 msgstr ""
 
@@ -6405,9 +6601,11 @@ msgid "Message:"
 msgstr ""
 
 #: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
 #: View/Elements/Events/View/row_object.ctp:72
 #: View/Events/resolved_misp_format.ctp:93;288
-#: View/GalaxyClusters/view.ctp:19
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
 #: View/ObjectTemplates/index.ctp:66
 #: View/ObjectTemplates/view.ctp:6
 #: View/Objects/revise_object.ctp:68
@@ -6424,16 +6622,19 @@ msgid "UUID"
 msgstr "UUID"
 
 #: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
 #: View/DecayingModel/index.ctp:88
 #: View/DecayingModel/view.ctp:14
 #: View/Elements/Servers/View/row_object.ctp:19
 #: View/Elements/templateElements/templateRowAttribute.ctp:12
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
 #: View/Feeds/search_caches.ctp:47
 #: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
 #: View/ObjectTemplates/view.ctp:4
 #: View/Objects/add.ctp:206
 #: View/Objects/revise_object.ctp:27
@@ -6445,7 +6646,7 @@ msgstr "UUID"
 #: View/SharingGroups/view.ctp:42;67
 #: View/Sightingdb/index.ctp:51
 #: View/Templates/view.ctp:9
-#: View/Users/statistics_orgs.ctp:31
+#: View/Users/statistics_orgs.ctp:33
 #: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "Navn"
@@ -6469,7 +6670,7 @@ msgstr ""
 #: View/Users/admin_edit.ctp:64
 #: View/Users/admin_view.ctp:72
 #: View/Users/edit.ctp:23
-#: View/Users/view.ctp:31
+#: View/Users/view.ctp:32
 msgid "GnuPG key"
 msgstr "GnuPG-nøgle"
 
@@ -6478,10 +6679,105 @@ msgid "Community "
 msgstr ""
 
 #: View/Communities/view.ctp:51
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:617
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
 msgid "Request Access"
 msgstr ""
 
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr "Valgbar"
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr "Standard"
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr "Skabelon navn"
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
 #: View/DecayingModel/add.ctp:4
 msgid " Decaying Model"
 msgstr ""
@@ -6596,8 +6892,8 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/EventBlacklists/edit.ctp:37
 #: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:200
-#: View/Feeds/index.ctp:282
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
 #: View/News/index.ctp:22
 #: View/OrgBlacklists/edit.ctp:30
 #: View/OrgBlacklists/index.ctp:36
@@ -6689,6 +6985,7 @@ msgstr ""
 #: View/Events/show_i_o_c_results.ctp:12
 #: View/Feeds/freetext_index.ctp:32
 #: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
 #: View/Objects/revise_object.ctp:64
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
@@ -6700,7 +6997,7 @@ msgstr ""
 #: 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:36
+#: View/Users/statistics_orgs.ctp:38
 #: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr "Type"
@@ -6714,6 +7011,7 @@ msgstr "Type"
 #: View/Events/resolved_misp_format.ctp:92;287
 #: View/Events/show_i_o_c_results.ctp:13
 #: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
 #: View/Noticelists/view.ctp:42
 #: View/Objects/add.ctp:115
 #: View/Objects/group_attributes_into_object.ctp:58
@@ -6734,12 +7032,14 @@ msgstr ""
 #: View/DecayingModel/decaying_tool_rest_search.ctp:31
 #: View/Events/resolved_attributes.ctp:52
 #: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
 #: View/ObjectReferences/ajax/add.ctp:30
 #: View/Objects/add.ctp:67;119
 #: View/Objects/group_attributes_into_object.ctp:30
 #: View/Objects/revise_object.ctp:49;67
 #: View/Pages/doc/using_the_system.ctp:234;284
 #: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -6758,7 +7058,7 @@ msgid "Decaying Model RestSearch"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_simulation.ctp:45
-#: View/Events/automation.ctp:14
+#: View/Events/automation.ctp:24
 #: View/Logs/admin_index.ctp:20;21
 #: View/Logs/admin_search.ctp:25
 msgid "Search"
@@ -6836,7 +7136,7 @@ msgstr ""
 #: View/Elements/genericElements/org_picker.ctp:17
 #: View/EventBlacklists/add.ctp:36
 #: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
+#: View/Feeds/add.ctp:220
 #: View/Feeds/import_feeds.ctp:20
 #: View/OrgBlacklists/add.ctp:29
 #: View/Regexp/admin_add.ctp:32
@@ -6913,7 +7213,7 @@ msgstr ""
 
 #: View/DecayingModel/index.ctp:97
 #: View/DecayingModel/view.ctp:25
-#: View/Galaxies/view.ctp:22
+#: View/Galaxies/view.ctp:10
 #: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
 #: View/Warninglists/view.ctp:12
@@ -6923,6 +7223,7 @@ msgstr "Version"
 #: View/DecayingModel/index.ctp:98
 #: View/DecayingModel/view.ctp:31
 #: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
 #: View/Feeds/view.ctp:63
 #: View/Noticelists/index.ctp:63
 #: View/ObjectTemplates/index.ctp:35
@@ -7036,7 +7337,6 @@ msgstr "se alle"
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr "Vælg alle"
 
@@ -7105,6 +7405,8 @@ msgstr "Vis alle attributter"
 
 #: View/Elements/eventattributetoolbar.ctp:6
 #: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
@@ -7142,7 +7444,7 @@ msgstr "Vis kun potentielt falske positive attributter"
 
 #: View/Elements/eventattributetoolbar.ctp:41
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr "Advarsel"
@@ -7254,11 +7556,9 @@ msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: View/Logs/admin_index.ctp:62
 #: View/Servers/preview_index.ctp:57
 #: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:74
 msgid "Remove filters"
 msgstr "Fjern filtre"
 
@@ -7447,14 +7747,14 @@ msgid "Event Actions"
 msgstr "Event handlinger"
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:221;264
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr "Oplist events"
 
 #: View/Elements/global_menu.ctp:18
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:226;270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
 #: View/Events/add.ctp:7
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
@@ -7462,80 +7762,80 @@ msgid "Add Event"
 msgstr "Tilføj Event"
 
 #: View/Elements/global_menu.ctp:23
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:289
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr "Oplist attributter"
 
 #: View/Elements/global_menu.ctp:27
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:294
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: 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:31
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr "REST-klient"
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:310
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "Vis forslag"
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr "Begivenheder med forslag"
 
 #: View/Elements/global_menu.ctp:47
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:320
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
 msgid "View delegation requests"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:861
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "Liste over Tags"
 
 #: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:61
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:866
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr "Tilføj Tag"
 
 #: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:895
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr "Opliste taksonomier"
 
 #: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:923
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "Liste over Skabeloner"
 
 #: View/Elements/global_menu.ctp:74
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:928
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "Tilføj Skabelon"
 
 #: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
@@ -7543,7 +7843,7 @@ msgid "Export"
 msgstr "Eksporter"
 
 #: View/Elements/global_menu.ctp:86
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -7553,7 +7853,7 @@ msgid "Automation"
 msgstr "Automatisering"
 
 #: View/Elements/global_menu.ctp:98
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1086
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr "Liste over Galaxies"
 
@@ -7581,7 +7881,7 @@ msgid "Signature Whitelist"
 msgstr "Signatur Whitelist"
 
 #: View/Elements/global_menu.ctp:128
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:378
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr "Vis advarselslister"
 
@@ -7602,45 +7902,45 @@ msgid "News"
 msgstr "Nyheder"
 
 #: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Min profil"
 
 #: View/Elements/global_menu.ctp:151
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
 msgid "My Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:155
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:467;699
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
 msgid "Set Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:159
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:471
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "Kontrolpanel"
 
 #: View/Elements/global_menu.ctp:168
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:490
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "Rollerettigheder"
 
 #: View/Elements/global_menu.ctp:175
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1130
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr "Oplist objektskabeloner"
 
 #: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:507
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr "Oplist delingsgrupper"
 
 #: View/Elements/global_menu.ctp:186
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr "Tilføj delingsgruppe"
 
@@ -7649,12 +7949,12 @@ msgid "Decaying Models Tool"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:199
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:977
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
 msgid "List Decaying Models"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:206
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:520
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
@@ -7666,12 +7966,12 @@ msgid "Categories & Types"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:214
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:218
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:528
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -7701,28 +8001,28 @@ msgid "Sync Actions"
 msgstr "Sync handlinger"
 
 #: View/Elements/global_menu.ctp:240
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:536
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:542
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:250
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "Oplist servere"
 
 #: View/Elements/global_menu.ctp:255
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:998
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr "Oplist feeds"
 
 #: View/Elements/global_menu.ctp:260
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr ""
 
@@ -7735,7 +8035,7 @@ msgid "Add SightingDB Connection"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:612
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
 msgid "List Communities"
 msgstr ""
 
@@ -7750,7 +8050,7 @@ msgid "Administration"
 msgstr "Administration"
 
 #: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:687
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Oplist brugere"
@@ -7765,93 +8065,97 @@ msgid "Set User Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:300
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:682
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr "Tilføj bruger"
 
 #: View/Elements/global_menu.ctp:304
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:704
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "Kontakt brugere"
 
-#: View/Elements/global_menu.ctp:311
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:477;739
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr "Oplist organisationer"
 
-#: View/Elements/global_menu.ctp:315
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:322
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "Oplist roller"
 
-#: View/Elements/global_menu.ctp:326
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr "Serverindstillinger og Vedligehold"
 
-#: View/Elements/global_menu.ctp:343
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:768
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "Opgaver"
 
-#: View/Elements/global_menu.ctp:352
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:774
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:361
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:366
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr "Håndtér begivenhedssortlister"
 
-#: View/Elements/global_menu.ctp:375
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr "Sortlist organisation"
 
-#: View/Elements/global_menu.ctp:380
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr "Håndtér org. sortlistser"
 
-#: View/Elements/global_menu.ctp:388
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "Revision"
 
-#: View/Elements/global_menu.ctp:392
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "Oplist logger"
 
-#: View/Elements/global_menu.ctp:396
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:811
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: 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:424
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "Log ud"
@@ -7874,7 +8178,8 @@ msgstr "Attributter pr. organisation"
 
 #: View/Elements/view_event_distribution_graph.ctp:9
 #: View/Elements/view_timeline.ctp:23
-#: View/Layouts/default.ctp:92
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "Indlæser"
@@ -7909,7 +8214,6 @@ msgstr "Vis"
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:67
 msgid "Filters"
 msgstr "Filtre"
 
@@ -7936,6 +8240,7 @@ msgid "Time scope"
 msgstr ""
 
 #: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
 #: View/Taxonomies/view.ctp:83
 msgid "Tag"
 msgstr ""
@@ -7967,7 +8272,6 @@ msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr "Vælg alle hændelser på denne side"
 
@@ -8024,7 +8328,9 @@ msgstr "#Opslag"
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr "Email"
@@ -8035,8 +8341,6 @@ msgstr "Email"
 #: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
 #: View/Events/proposal_event_index.ctp:45;49
 #: View/Feeds/preview_index.ctp:73
-#: View/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
@@ -8062,7 +8366,7 @@ msgid "NEW"
 msgstr "NY"
 
 #: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr "Publicér event"
 
@@ -8076,7 +8380,7 @@ msgid "Not published"
 msgstr "Ikke offentliggjort"
 
 #: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;364;431;598;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
 #: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr "Sikker på, at du vil slette # %s?"
@@ -8283,11 +8587,11 @@ msgstr "Hexadecimal visning"
 msgid "Switch to binary representation"
 msgstr "Skift til binær visning"
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr "Advarsel, dette synes ikke at være et legitimt "
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr " værdi"
 
@@ -8390,11 +8694,11 @@ msgstr "Status"
 #: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
 #: View/Events/view.ctp:191
-#: View/GalaxyClusters/view.ctp:32
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
 #: View/Users/admin_view.ctp:95
 msgid "N/A"
@@ -8428,8 +8732,10 @@ msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
@@ -8443,15 +8749,17 @@ msgstr "Seneste login"
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
 #: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr "Tilføjet"
 
 #: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 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:660
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 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."
 
@@ -8488,488 +8796,599 @@ msgstr "Events med forslag: "
 msgid "Delegation requests: "
 msgstr "Anmodninger om delegation: "
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
-msgid "Populate From Template"
-msgstr "Udfyld via skabelon"
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
+msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
-msgid "Enrichment Module Result"
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr "Filter regler"
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr "Regler"
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr "Alder: "
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr "Ikke cached"
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr "klik her"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr "Fejl: Ugyldig event!"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr "Rettet event %s"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr "Ny rettet event"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+msgid "Populate From Template"
+msgstr "Udfyld via skabelon"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+msgid "Enrichment Module Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr "Fritekst importresultat"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr "Vis begivenhed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;887;1116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr "Vis korrelationsgraf"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr "Vis begivenhedshistorik"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
 #: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr "Redigér event"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr "Slet begivenhed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr "Tilføj objekt"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr "Tilføj vedhæftning"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr "Udfyld via..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr "Berig hændelse"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr "Flet attributter fra..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr "Foreslå attribut"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr "Foreslå vedhæftning"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr "Udgiv (ingen e-mail)"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
 msgid "Publish Sightings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr "Uddelegér udgivelse"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr "Acceptér delegationsanmodning"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr "Kassér delegeringsanmodning"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr "Udgiv begivenhed til ZMQ"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:200
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:208
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr "Kontakt rapportør"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:216;303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
 msgstr "Download som..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239;244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:251
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr "Importér fra…"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr "Oplist regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr "Nyt regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:351
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr "Udfør på eksisterende"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:352
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:359
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr "Redigér regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr "Slet regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr "Vis advarselsliste"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr "Opdatér advarselsliste"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:385
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:393
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr "Vis notitsliste"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:403
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr "Opdatér notitslister"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:404
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:414
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr "Oplist hvidliste"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:419
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr "Ny hvidliste"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr "Redigér hvidliste"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:430
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr "Slet Whitelist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:440
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr "Redigér min profil"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:451;649
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr "Nulstil adgangskode"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:484;733
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr "Se Organisation"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:496
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr "Redigér delingsgruppe"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr "Vis delingsgrupper"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:551;581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr "Udforsk fjernserver"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:559
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr "Udforsk fjernbegivenhed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570;1056
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr "Hent denne begivenhed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:571;1057
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:589
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
 #: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr "Redigér server"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:622
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
 msgid "View community"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:630
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
 msgid "Request E-mail"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:642
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr "Se bruger"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:654
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr "Redigér bruger"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr "Slet bruger"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:668
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr "Redigér rolle"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr "Slet rolle"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:694
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
 msgid "User settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:712
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr "Tilføj organisation"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr "Redigér organisation"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:726
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr "Flet organisation"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:745
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr "Tilføj rolle"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:781
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr "Sortlistebegivenheder"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:793
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr "Sortlisteorganisationer"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:820;834
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr "Vis tråd"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:825
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr "Tilføj indlæg"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:839
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr "Redigér indlæg"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr "Oplist tråde"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:849
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr "Ny tråd"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:857
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr "Oplist favorit-tags"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:873
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr "Redigér tag"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:881;900
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr "Vis taksonomi"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:908
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr "Slet taksonomi"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:915
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:935
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr "Vis skabelon"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:941
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr "Redigér skabelon"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:952
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
 msgid "Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
 msgid "Force Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:962
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
 msgid "Import Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:967
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
 msgid "Add Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:971
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
 msgid "Decaying Tool"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
 msgid "View Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:989
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
 msgid "Edit Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1007
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr "Tilføj feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr "Importér feeds fra JSON"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1018
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr "Feedoverlapningsanalysematrix"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1023
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr "Eksportér feedindstillinger"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr "Redigér feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1036
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1042
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr "PreviewIndex"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1048
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr "PreviewEvent"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1066
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr "Se Nyheder"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1071
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr "Tilføj nyhedselement"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1077
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr "Redigér nyhedselement"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1092
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr "Opdater Galaxies"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1093
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 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:1098
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr "Gennemtving galakseopdateringer"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1099
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 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:1106;1122
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr "Vis galakse"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr "Vis formation"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1135
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr "Opdater Objekter"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1141
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr "Vis objektskabelon"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1149
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
 #: View/Sightingdb/add.ctp:6
 msgid "Add SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1157
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
 msgid "Edit SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1162
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
 msgid "List SightingDB connections"
 msgstr ""
 
@@ -8999,7 +9418,7 @@ msgid "Fix Database Index Schema"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
 msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
 msgstr ""
 
@@ -9007,7 +9426,7 @@ msgstr ""
 msgid "The current database schema does not match the expected format."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;131
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
 msgid "Database schema diagnostic: "
 msgstr ""
 
@@ -9035,52 +9454,52 @@ msgstr ""
 msgid "Actual schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:118
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
 msgid "Fix Database schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:130
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
 msgid "The current database is correct"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:141
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
 msgid "Expected DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:145
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
 msgid "The current database version matches the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:146;151
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
 msgid "Actual DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:150
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
 msgid "The current database version does not match the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
 msgid "Updates are locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158;162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
 msgid "Updates are not locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 #: View/Servers/update_progress.ctp:32
 msgid "Updates are locked due to to many update fails"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 msgid "Updates unlocked in %s"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:167;168
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
 msgid "DataSource: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:203
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
 msgid "Column diagnostic"
 msgstr ""
 
@@ -9742,7 +10161,7 @@ msgstr "Worker PID"
 #: View/TagCollections/index.ctp:14
 #: View/UserSettings/index.ctp:56
 #: View/Users/admin_view.ctp:109
-#: View/Users/view.ctp:58
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr "Bruger"
 
@@ -9787,8 +10206,8 @@ msgid "Start a worker"
 msgstr "Start en worker"
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
-msgstr "Genstart alle workers"
+msgid "Restart dead workers"
+msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
 msgid "Set pull rules"
@@ -9944,10 +10363,6 @@ msgstr "Beskrivelse af skabelon"
 msgid "Template ID"
 msgstr "Skabelon ID"
 
-#: View/Elements/templateElements/populateTemplateDescription.ctp:8
-msgid "Template Name"
-msgstr "Skabelon navn"
-
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
 #: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
@@ -10133,7 +10548,7 @@ msgid "Recipient"
 msgstr "Modtager"
 
 #: View/EventDelegations/index.ctp:82
-#: View/Events/automation.ctp:269;276
+#: View/Events/automation.ctp:279;286
 #: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
@@ -10357,478 +10772,475 @@ msgstr ""
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 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 "Din nuværende nøgle er: <code>%s</code>.\n"
-"Du kan %s denne nøgle."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
+msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr "nulstil"
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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
+#: View/Events/automation.ctp:27
 #: 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 "For at returnere en hændelse eller en liste over hændelser til et ønsket format, så benyt flg. syntaks"
 
-#: View/Events/automation.ctp:18
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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
+#: View/Events/automation.ctp:32
 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
+#: View/Events/automation.ctp:33
 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/automation.ctp:34
 #: 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:25
+#: View/Events/automation.ctp:35
 #: 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:26
+#: View/Events/automation.ctp:36
 #: 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:27
+#: View/Events/automation.ctp:37
 #: 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:28
+#: View/Events/automation.ctp:38
 #: 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:29
+#: View/Events/automation.ctp:39
 #: 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;150
+#: View/Events/automation.ctp:40;160
 #: 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 "Hændelser med en datoangivelse efter den dato, der er angivet i fra-feltet (format: 2015-02-15). Dette filter bruger hændelsesdatoen."
 
-#: View/Events/automation.ctp:31;151
+#: View/Events/automation.ctp:41;161
 #: 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 "Hændelser med datoangivelse før den i til-feltet angivne (format: 2015-02-15). Dette filter bruger datoen for hændelsen."
 
-#: View/Events/automation.ctp:32
+#: View/Events/automation.ctp:42
 #: View/Events/legacy_automation.ctp:282;307
 msgid "The events that should be included / excluded from the search"
 msgstr "De hændelser, som skal inkluderes/udelukkes fra søgningen"
 
-#: View/Events/automation.ctp:33
+#: View/Events/automation.ctp:43
 #: 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/automation.ctp:44
 #: View/Events/legacy_automation.ctp:284
 msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
 msgstr "Kun metadata (hændelse, tags, relationer) returneres, attributter og forslag udelades."
 
-#: View/Events/automation.ctp:35
+#: View/Events/automation.ctp:45
 #: 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
+#: View/Events/automation.ctp:46
 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/automation.ctp:47
 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/automation.ctp:48
 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/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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/automation.ctp:52
 #: 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/automation.ctp:53
 #: 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 hændelses-ID, inkludér også hændelses-UUID i hver af attributterne."
 
-#: View/Events/automation.ctp:44
+#: View/Events/automation.ctp:54
 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
+#: View/Events/automation.ctp:55
 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
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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:81
+#: View/Events/automation.ctp:91
 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:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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:97
+#: View/Events/automation.ctp:107
 #: 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:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: 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:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr "Bro IDS eksport"
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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 resultatbegrænsning efter tags, benyt de sædvanlige syntakser. Vær opmærksom på kolon (:) ikke kan benyttes i tag-søgning. Benyt i stedet semikolon (søgningen vil automatisk søge efter koloner i stedet). For at få IP-værdier fra hændelser tagget som tag1, men ikke som tag2, så benyt"
 
-#: View/Events/automation.ctp:118
+#: View/Events/automation.ctp:128
 #: 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:136
+#: View/Events/automation.ctp:146
 #: 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:138
+#: View/Events/automation.ctp:148
 #: 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:145
+#: View/Events/automation.ctp:155
 #: 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:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr "Begræns resultaterne til de givne Hændelses-ID'er."
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: 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:152
+#: View/Events/automation.ctp:162
 #: 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 "Hændelser publiceret inden for det seneste x tidsrum, hvor x kan defineres som dage, timer, minutter (f.eks. 5d eller 12t eller 30m). Dette filter benytter hændelsens publiceringstidsstempel."
 
-#: View/Events/automation.ctp:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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:156
+#: View/Events/automation.ctp:166
 #: 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 "For eksempelvis at hente alle attributter til hændelse #5, herunder ikke-IDS markerede attributter, så benyt flg. linje"
 
-#: View/Events/automation.ctp:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr "Eksportér hændelsesattributter af angivet type som XML"
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr "Download vedhæftning eller malware prøve"
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr "Download malware prøve baseret på hash"
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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:172
+#: View/Events/automation.ctp:182
 #: 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:173
+#: View/Events/automation.ctp:183
 #: 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:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr "POST besked payload (XML)"
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr "POST besked payload (JSON)"
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: 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:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:187
+#: View/Events/automation.ctp:197
 #: 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:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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:191
+#: View/Events/automation.ctp:201
 #: 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 "Hændelses-ID'et er valgfrit. MISP accepterer enten et JSON- eller et XML-objekt, der er POST'et til ovenstående URL."
 
-#: View/Events/automation.ctp:192
+#: View/Events/automation.ctp:202
 #: 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:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr "Følgende valgfrie parametre forventes"
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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:205
+#: View/Events/automation.ctp:215
 #: 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:206
+#: View/Events/automation.ctp:216
 #: 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:207
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr "Analyseniveauet for den nyoprettede hændelse, hvis relevant. [0-2]"
 
-#: View/Events/automation.ctp:208
+#: View/Events/automation.ctp:218
 #: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr "Trusselsniveau-ID for den nyoprettede hændelse, hvis relevant. [0-3]"
 
-#: View/Events/automation.ctp:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr "Tilføj eller fjern tags fra hændelser"
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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 hændelse på flg. måde"
 
-#: View/Events/automation.ctp:214
+#: View/Events/automation.ctp:224
 #: 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:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr "Forslag og API'en"
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: 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:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr "HTTP"
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:74
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -10836,200 +11248,200 @@ msgstr "HTTP"
 msgid "URL"
 msgstr "URL"
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr "Forklaring"
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr "Forventet Payload"
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
 #: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr "Svar"
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr "Se et forslag"
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr "ShadowAttribute objekt"
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr "Se alle forslag for min orgs. hændelser"
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr "ShadowAttribute objekter"
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr "Se alle foreslag for en hændelse"
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr "Foreslå en ny attribut til en hændelse"
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr "Foreslå en ændring til en attribut"
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr "Accepter et forslag"
 
-#: View/Events/automation.ctp:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr "Kasser et forslag"
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: 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:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr "Filtrering af hændelsesmetadata"
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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:291
+#: View/Events/automation.ctp:301
 #: 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:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr "Listen over gyldige parametre"
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr "Filtre til publicerede eller upublicerede hændelser [0,1] - negerbar"
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr "Filtre til strenge fundet i hændelsesinfoen - negerbar"
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: 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:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr "Filtre til specifike hændelses-ID'er - negerbar"
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr "Filtre til et givent hændelsestrusselsniveau [1,2,3,4] - negerbar"
 
-#: View/Events/automation.ctp:309
+#: View/Events/automation.ctp:319
 #: 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:310
+#: View/Events/automation.ctp:320
 #: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr "Filtre til den givne analysefase for en hændelse [0,1,2] - negerbar"
 
-#: View/Events/automation.ctp:311
+#: View/Events/automation.ctp:321
 #: 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:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr "Filtre på oprettelses organisationen - ikke sammenlignelige"
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: 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:314
+#: View/Events/automation.ctp:324
 #: 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:315
+#: View/Events/automation.ctp:325
 #: 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:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 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:322
+#: View/Events/automation.ctp:332
 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:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -11225,7 +11637,7 @@ msgid "Ongoing"
 msgstr "Igangværende"
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr "Mål"
@@ -11277,18 +11689,18 @@ msgstr "Input fil"
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 msgid "Events"
 msgstr "Hændelser"
 
 #: View/Events/index.ctp:34
 #: View/Logs/admin_index.ctp:54
 #: View/Servers/preview_index.ctp:37
-#: View/Users/admin_index.ctp:54
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr "Ændre filtre"
 
@@ -11322,6 +11734,12 @@ msgstr ""
 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/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/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."
@@ -11779,7 +12197,6 @@ msgstr "Korrekte tilføjede attributter"
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -11920,6 +12337,7 @@ msgid "View request details"
 msgstr "Se anmodnings detaljer"
 
 #: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
 #: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr "Deaktiveret"
@@ -12081,7 +12499,7 @@ 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:28
-#: View/Feeds/index.ctp:105
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -12115,78 +12533,81 @@ msgstr "Dette fjerner de allerede eksisterer korrelationer for hændelsen og for
 msgid "Add MISP Feed"
 msgstr "Tilføj MISP Feed"
 
-#: View/Feeds/add.ctp:5
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
+msgstr ""
+
+#: View/Feeds/add.ctp:12
 msgid "Add a new MISP feed source."
 msgstr "Tilføj en ny MISP feed kilde."
 
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
+#: View/Feeds/add.ctp:14
 #: View/Feeds/view.ctp:64
 msgid "Caching enabled"
 msgstr ""
 
-#: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr ""
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:21
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr "Feed navn"
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
 #: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:26
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr "Navn på indholdsleverandøren"
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr "Input kilde"
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:66
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr "Fjern input efter det er konsumeret"
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:75
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr "URL til Feed"
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:79
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr "Kilde format"
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:38
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr "Alle headers kan sendes sammen med forespørgslen (Eksempelvis: Authorization)"
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:42
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr "Linjeskift adskilt liste over overskrifter i formatet \"headernavn: værdi\""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:46
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr "Tilføj Basic Auth"
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:50
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr "Brugernavn"
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:54
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -12195,127 +12616,126 @@ msgstr "Brugernavn"
 msgid "Password"
 msgstr "Kodeord"
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:58
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr "Tilføj basic auth header"
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:88
-msgid "Target Event"
-msgstr "Target Event"
-
 #: View/Feeds/add.ctp:94
 #: View/Feeds/edit.ctp:98
-msgid "Target Event ID"
-msgstr "Target Event ID"
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:100
-msgid "Leave blank unless you want to reuse an existing event."
-msgstr "Efterlad blank, med mindre du vil anvende en eksisterende event."
+msgid "Creator organisation"
+msgstr ""
 
 #: View/Feeds/add.ctp:104
 #: View/Feeds/edit.ctp:108
-msgid "Value field(s) in the CSV"
-msgstr "Data felt(er) i CSV'en"
+msgid "Target Event"
+msgstr "Target Event"
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:109
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr "Vælg et eller flere felter, der skal analyseres af CSV parseren og konverteres til MISP attributter"
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:111
-msgid "2,3,4 (column position separated by commas)"
-msgstr "2,3,4 (kolonne position sepereret af komma)"
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:119
-msgid "Delimiter"
-msgstr "Afgrænser"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
+msgstr "Target Event ID"
 
 #: View/Feeds/add.ctp:116
 #: View/Feeds/edit.ctp:120
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr "Efterlad blank, med mindre du vil anvende en eksisterende event."
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr "Data felt(er) i CSV'en"
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
+msgstr "Vælg et eller flere felter, der skal analyseres af CSV parseren og konverteres til MISP attributter"
+
+#: View/Feeds/add.ctp:127
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr "2,3,4 (kolonne position sepereret af komma)"
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr "Afgrænser"
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
 msgid "Set the default CSV delimiter (default = \",\")"
 msgstr ""
 
-#: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:130
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr "Exclusion Regex"
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:131
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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 "Tilføj et regex mønster til detektion af IOC'er, der skal skippes (dette kan f. eks. være nyttigt for at ekskludere eventuelle referencer til den aktuelle rapport / feed)"
 
-#: View/Feeds/add.ctp:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr "Regex pattern, som eksempel: \"/^https://myfeedurl/i"
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:141
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr "Publicer automatisk"
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 msgid "Publish events directly after pulling the feed - if you would like to review the event before publishing uncheck this"
 msgstr "Publicer events direkte efter feedet er hentet - hvis du gerne vil gennemgå eventen før publiceringen fjernes markeringen i afkrydsningsfeltet"
 
-#: View/Feeds/add.ctp:148
-#: View/Feeds/edit.ctp:150
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr ""
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:151
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr "Hvis markeret, vil IDS flagene altid blive fjernet når du henter dette feed"
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:160
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr "Delta Flet"
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:161
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr "Flet attributter (tilføj kun nye attributter, fjern tilbagekaldte attributter)"
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr "Standard Tag"
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:193
-msgid "Filter rules"
-msgstr "Filter regler"
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:194
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr "Events med følgende tags er tilladt"
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:195
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr "Events med følgende tags er blokeret"
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:196
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr "Events med følgende organisation er tilladt"
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:197
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr "Events med følgende organisation er blokeret"
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:198
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
 #: View/Servers/add.ctp:116
 #: View/Servers/edit.ctp:155;162
 msgid "Modify"
@@ -12333,64 +12753,64 @@ msgstr ""
 msgid "Edit MISP Feed"
 msgstr "Rediger MISP Feed"
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr "Rediger en ny MISP feed kilde."
 
-#: View/Feeds/edit.ctp:133
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr ""
 
-#: View/Feeds/edit.ctp:213
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr "Basis URL'en til den eksterne server, du ønsker at synkronisere med. Eksempel: https://misppriv.circl.lu"
 
-#: View/Feeds/edit.ctp:214
+#: View/Feeds/edit.ctp:234
 #: View/Servers/add.ctp:146
 #: View/Servers/edit.ctp:190
 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:215
+#: View/Feeds/edit.ctp:235
 #: View/Servers/add.ctp:147
 #: View/Servers/edit.ctp:189
 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:216
+#: View/Feeds/edit.ctp:236
 #: View/Servers/add.ctp:148
 #: View/Servers/edit.ctp:191
 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:217
+#: View/Feeds/edit.ctp:237
 #: View/Servers/add.ctp:149
 #: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr "Tillad upload af events og deres attributter."
 
-#: View/Feeds/edit.ctp:218
+#: View/Feeds/edit.ctp:238
 #: View/Servers/add.ctp:150
 #: View/Servers/edit.ctp:193
 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:219
+#: View/Feeds/edit.ctp:239
 #: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr "Unpublish nye events (arbejder med push-events)."
 
-#: View/Feeds/edit.ctp:220
+#: View/Feeds/edit.ctp:240
 #: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr "Publicer nye events uden email (arbejder med Push-events)."
 
-#: View/Feeds/edit.ctp:221
+#: View/Feeds/edit.ctp:241
 #: View/Servers/edit.ctp:196
 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:222
+#: View/Feeds/edit.ctp:242
 #: View/Servers/add.ctp:154
 #: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
@@ -12420,137 +12840,128 @@ msgstr "Indsæt en MISP-feed metadata JSON nedenfor for at tilføje feeds."
 msgid "Feed metadata JSON"
 msgstr "Feed metadata JSON"
 
-#: View/Feeds/index.ctp:2
-msgid "Feeds"
-msgstr "Feeds"
-
-#: 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 "Cache alle feeds"
-
-#: View/Feeds/index.ctp:6
-msgid "Cache freetext/CSV feeds"
-msgstr "Cache fritekst/CSV feeds"
-
-#: View/Feeds/index.ctp:7
-msgid "Cache MISP feeds"
-msgstr "Cache MISP feeds"
-
-#: View/Feeds/index.ctp:8
-msgid "Fetch and store all feed data"
-msgstr "Hent og gem alle feed data"
-
-#: View/Feeds/index.ctp:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr "Aktivér valgte"
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr "Deaktiver valgte"
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr "Aktiver caching for det valgte"
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr "Deaktiver caching for det valgte"
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr "Standard feeds"
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr "Brugerdefineret feeds"
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr "Alle Feeds"
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr "Aktiverede feeds"
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr ""
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr "Feed Format"
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr "Input"
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr "Override IDS"
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr "Caching"
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: View/Pages/doc/using_the_system.ctp:145
+#: View/Sightings/ajax/list_sightings.ctp:8
+#: View/Users/statistics_sightings.ctp:9
+msgid "Source"
+msgstr "Kilde"
+
+#: View/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr ""
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:55
-#: View/Servers/index.ctp:120;121
-msgid "Rules"
-msgstr "Regler"
-
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
-msgstr "Fejl: Ugyldig event!"
-
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
-msgstr "Rettet event %s"
-
-#: View/Feeds/index.ctp:211
-msgid "New fixed event"
-msgstr "Ny rettet event"
-
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:141
-msgid "Age: "
-msgstr "Alder: "
-
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:149
-msgid "Not cached"
-msgstr "Ikke cached"
-
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
+msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
+msgstr ""
+
+#: View/Feeds/index.ctp:196
+msgid "Visible"
+msgstr ""
+
+#: View/Feeds/index.ctp:211
+msgid "Feeds"
+msgstr "Feeds"
+
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
+msgstr ""
+
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
+msgstr ""
+
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
+msgstr "Cache alle feeds"
+
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr "Cache fritekst/CSV feeds"
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr "Cache MISP feeds"
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr "Hent og gem alle feed data"
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr "Udforsk eventen eksternt"
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr "Hent alle events"
 
-#: View/Feeds/index.ctp:283
-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:294
+msgid "Are you sure you want to permanently remove the feed?"
+msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr "Download feed metadata som JSON"
 
@@ -12603,26 +13014,39 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr "version"
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
 #: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr "Namespace"
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr "Galaxy ID"
 
-#: View/Galaxies/view.ctp:29
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr ""
 
@@ -12630,33 +13054,30 @@ msgstr ""
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:23
-#: View/Pages/doc/using_the_system.ctp:145
-#: View/Sightings/ajax/list_sightings.ctp:8
-#: View/Users/statistics_sightings.ctp:9
-msgid "Source"
-msgstr "Kilde"
-
-#: View/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -12665,22 +13086,16 @@ msgstr ""
 msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr "Se graf"
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
 msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
@@ -12691,6 +13106,27 @@ msgstr ""
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Inbox/index.ctp:31
+#: 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 "Titel"
+
+#: View/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr ""
@@ -12711,12 +13147,6 @@ msgstr "Færdig."
 msgid "Show all queues"
 msgstr "Vis alle køer"
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr "Standard"
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr "Vis standard køen"
@@ -12754,6 +13184,11 @@ msgstr "Worker"
 msgid "Job type"
 msgstr ""
 
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
+msgstr "Input"
+
 #: View/Jobs/index.ctp:106
 #: View/Pages/doc/administration.ctp:229
 msgid "Retries"
@@ -12835,6 +13270,7 @@ msgstr "fra IP"
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
 #: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -12842,13 +13278,6 @@ msgstr "fra IP"
 msgid "Organisation"
 msgstr "Organisation"
 
-#: 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 "Titel"
-
 #: View/Logs/admin_search.ctp:21
 #: View/Pages/doc/administration.ctp:186;199
 msgid "Change"
@@ -12899,10 +13328,6 @@ msgstr "ref"
 msgid "geographical_area"
 msgstr "geographical_area"
 
-#: View/Noticelists/index.ctp:35
-msgid "version"
-msgstr "version"
-
 #: View/Noticelists/index.ctp:36
 #: View/Pages/doc/using_the_system.ctp:371
 msgid "enabled"
@@ -13470,7 +13895,7 @@ msgstr "Se alle"
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr "Logo"
 
@@ -13504,12 +13929,12 @@ msgid "Last modified"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:37
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr "Sektor"
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:35
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr "Nationalitet"
 
@@ -14052,7 +14477,7 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr "En rulleliste muliggør valg af en rollegruppe til brugeren. Roller definerer brugerens rettigheder. For yderligere info om roller, <a href=#roles> klik hér </a>."
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:76
+#: View/Users/admin_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -14063,7 +14488,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr "Denne mulighed lade den nye bruger modtage de e-mails, som automatisk udsendes, når en begivenhed offentliggøres."
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -14076,7 +14501,7 @@ 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:41
-#: View/Users/view.ctp:25
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr "Authkey"
 
@@ -14129,6 +14554,7 @@ 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_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -15443,10 +15869,6 @@ msgstr "Denne form tillader at to tilføjer attributter."
 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 "klik her"
-
 #: 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 ""
@@ -17228,10 +17650,6 @@ msgstr ""
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:164
-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 "Advarsel: app/Config/config.php er ikke skrivebar. Det betyder at eventuelle ændringer af indstillinger der er foretaget her IKKE vil blive gemt."
@@ -17612,10 +18030,6 @@ msgstr "Passive Delings Grupper"
 msgid "Distribution List"
 msgstr "Distributions liste"
 
-#: View/SharingGroups/view.ctp:12
-msgid "Selectable"
-msgstr "Valgbar"
-
 #: View/SharingGroups/view.ctp:28
 msgid "Synced by"
 msgstr "Synkroniseret af"
@@ -17624,10 +18038,6 @@ msgstr "Synkroniseret af"
 msgid "Quick Search"
 msgstr ""
 
-#: View/Sightingdb/index.ctp:55
-msgid "Owner"
-msgstr ""
-
 #: View/Sightingdb/index.ctp:61
 msgid "Host"
 msgstr ""
@@ -17788,6 +18198,11 @@ msgstr "Taggede attributer"
 msgid "Favourite"
 msgstr "Favorit"
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+msgstr "Se graf"
+
 #: 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."
@@ -18128,6 +18543,45 @@ msgstr ""
 msgid "Are you sure you wish to delete this entry?"
 msgstr ""
 
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr "Admin Tilføj Bruger"
@@ -18185,12 +18639,12 @@ msgstr "SMIME nøgle"
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr ""
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr "Deaktiver denne brugerkonto"
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr "Send brugernavn og password automatisk"
 
@@ -18200,7 +18654,7 @@ msgstr "Admin Rediger Bruger"
 
 #: View/Users/admin_edit.ctp:69
 #: View/Users/admin_view.ctp:69
-#: View/Users/view.ctp:29
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr "Vilkår accepteret"
 
@@ -18303,30 +18757,68 @@ msgstr "Fjern filter"
 msgid "Apply filters"
 msgstr "Anvend filtre"
 
-#: 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 "Brugere"
-
-#: View/Users/admin_index.ctp:7
+#: View/Users/admin_index.ctp:3
 msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
 msgstr ""
 
-#: View/Users/admin_index.ctp:10
+#: View/Users/admin_index.ctp:6
 msgid "here"
 msgstr ""
 
-#: View/Users/admin_index.ctp:13;14
+#: View/Users/admin_index.ctp:9;10
 msgid "Reset all sync user API keys"
 msgstr ""
 
-#: View/Users/admin_index.ctp:17
+#: View/Users/admin_index.ctp:13
 msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
 msgstr ""
 
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr "Contactalert"
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr "Kontakt %s"
@@ -18339,11 +18831,6 @@ msgstr ""
 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 "Contactalert"
-
 #: View/Users/admin_view.ctp:30
 #: View/Users/view.ctp:11
 msgid "Request API access"
@@ -18362,7 +18849,7 @@ msgid "Org_admin"
 msgstr ""
 
 #: View/Users/admin_view.ctp:68
-#: View/Users/view.ctp:28
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr "NIDS Start SID"
 
@@ -18371,22 +18858,22 @@ msgid "Password change"
 msgstr "Kodeord ændret"
 
 #: View/Users/admin_view.ctp:78
-#: View/Users/view.ctp:37
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr "GnuPG fingeraftryk"
 
 #: View/Users/admin_view.ctp:83
-#: View/Users/view.ctp:42
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr "GnuPG status"
 
 #: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:49
+#: View/Users/view.ctp:50
 msgid "S/MIME Public certificate"
 msgstr ""
 
 #: View/Users/admin_view.ctp:119
-#: View/Users/view.ctp:64
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr ""
 
@@ -18402,10 +18889,102 @@ msgstr ""
 msgid "SMIME Public certificate (PEM format)"
 msgstr "SMIME Offentlig certifikat (PEM format)"
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr "Log på"
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr ""
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+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"
@@ -18421,6 +19000,13 @@ msgstr "Korrelationer fundet"
 msgid "Proposals active"
 msgstr "Forslag aktive"
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr "Brugere"
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -18476,15 +19062,15 @@ msgstr ""
 msgid "A heatmap showing the usage of %s."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr "Organisations liste"
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:38
+#: View/Users/statistics_orgs.ctp:40
 msgid "Activity (1 year)"
 msgstr ""
 
@@ -18540,6 +19126,14 @@ msgstr "Certifikat validering"
 msgid "GnuPG key validation"
 msgstr "GnuPG nøgle validering"
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -18698,6 +19292,7 @@ msgid "boolean"
 msgstr "boolean"
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/Dashboard.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
diff --git a/app/Locale/deu/LC_MESSAGES/default.po b/app/Locale/deu/LC_MESSAGES/default.po
index 3d01dac9e..5dee05bc6 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: 2020-04-24 01:13\n"
+"PO-Revision-Date: 2021-03-26 04:21\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -9,8 +9,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: de\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: de_DE\n"
 
 #: Console/Command/AdminShell.php:72
@@ -71,7 +73,8 @@ msgid "MISP mass sync authkey reset command line tool.\n\n"
 msgstr ""
 
 #: Console/Command/AdminShell.php:536
-#: Controller/UsersController.php:1234
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
 msgid "Invalid user."
 msgstr ""
 
@@ -99,7 +102,7 @@ msgstr ""
 #: Console/Command/EventShell.php:15
 #: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1122;1606;1691;2221;2297;2301;2305;2433;2530;2585;2633;2705;2795;3128;5252;5474;5478;5487
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
 #: Model/Galaxy.php:293
 msgid "Invalid event"
@@ -126,51 +129,51 @@ msgstr "ausführlicher Modus"
 msgid "interactive mode"
 msgstr "interaktiver Modus"
 
-#: Controller/AppController.php:377
+#: Controller/AppController.php:382
 msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
 msgstr ""
 
-#: Controller/AppController.php:377
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
 msgid "Update Progress"
 msgstr ""
 
-#: Controller/AppController.php:384
+#: Controller/AppController.php:389
 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:502
+#: Controller/AppController.php:519
 msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
 msgstr ""
 
-#: Controller/AppController.php:710
-#: Controller/AttributesController.php:1876;1985;2089
-#: Controller/EventsController.php:3260
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 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:719
-#: Controller/AttributesController.php:2093
-#: Controller/EventsController.php:3264
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr "Dafür müssen Sie angemeldet sein."
 
-#: Controller/AppController.php:735
+#: Controller/AppController.php:764
 #: Controller/Component/IndexFilterComponent.php:23
 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:873
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Fertig. Attribute_count wurde von Grund auf erstellt für "
 
-#: Controller/AppController.php:996
-#: Controller/AttributesController.php:2147
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
 #: Controller/ShadowAttributesController.php:1267
 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/AppController.php:1178
+#: Controller/AppController.php:1211
 msgid "RestSearch is not implemented (yet) for this scope."
 msgstr ""
 
@@ -183,19 +186,19 @@ msgstr "Keine Event-ID festgelegt."
 msgid "You do not have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:132;422;602;832;3127;3142
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:2092;2113;2147
+#: Controller/EventsController.php:2107;2128;2162
 #: Controller/ObjectsController.php:837
-#: Model/Attribute.php:4304;4308
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "Sie haben keine Berechtigung dies zu tun."
 
-#: Controller/AttributesController.php:345;800;805;824;1032;1121;2163;2177;2210;2232;2800;2811;2817;2886;3024;3036;3040
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
 #: Controller/ObjectsController.php:641
 #: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
 #: Controller/TagsController.php:506
-#: Model/Attribute.php:4296
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "Ungültiges Attribut"
 
@@ -209,7 +212,7 @@ msgid "Attribute not an attachment or malware-sample"
 msgstr "Attribut ist kein Anhang oder Malware-Sample"
 
 #: Controller/AttributesController.php:419;586;892;1348
-#: Controller/EventsController.php:4414;4428;5201;5215
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "Ungültiges Event."
 
@@ -259,7 +262,7 @@ msgid "Invalid event id."
 msgstr "Ungültige Event-Id."
 
 #: Controller/AttributesController.php:1072
-#: Controller/EventsController.php:2451
+#: Controller/EventsController.php:2466
 #: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "Ungültige Eingabe."
@@ -284,7 +287,7 @@ msgstr "Attribut gelöscht"
 msgid "Attribute was not deleted"
 msgstr "Attribut wurde nicht gelöscht"
 
-#: Controller/AttributesController.php:1281;2634
+#: Controller/AttributesController.php:1281;2675
 #: Controller/ShadowAttributesController.php:853
 msgid "Invalid Attribute"
 msgstr "Ungültiges Attribut"
@@ -305,104 +308,104 @@ msgstr "Diese Methode kann nur über AJAX zugegriffen werden."
 msgid "You are not authorized to edit this event."
 msgstr "Sie sind nicht berechtigt, dieses Event zu bearbeiten."
 
-#: Controller/AttributesController.php:1516
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "Keine Event-ID angegeben."
 
-#: Controller/AttributesController.php:1561
-#: Controller/GalaxiesController.php:243
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "Synonyme: "
 
-#: Controller/AttributesController.php:1871;1978
+#: Controller/AttributesController.php:1912;2019
 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:1884
+#: Controller/AttributesController.php:1925
 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:1904
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "Sie haben keinen Zugriff auf dieses Event."
 
-#: Controller/AttributesController.php:1967
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "Keine Übereinstimmungen."
 
-#: Controller/AttributesController.php:1989;1998
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Ungültiges Attribut oder keine Berechtigung es anzuzeigen."
 
-#: Controller/AttributesController.php:2124
+#: Controller/AttributesController.php:2165
 #: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "Fertig. "
 
-#: Controller/AttributesController.php:2156;2203
+#: Controller/AttributesController.php:2197;2244
 #: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "Ungültiges Feld angefordert."
 
-#: Controller/AttributesController.php:2159;2206
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "Diese Methode kann nur über AJAX zugegriffen werden."
 
-#: Controller/AttributesController.php:2241
+#: Controller/AttributesController.php:2282
 msgid "You do not have permission to do that"
 msgstr ""
 
-#: Controller/AttributesController.php:2271;2279
-#: Controller/EventsController.php:3643;3796;4999
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 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:2300
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "Diese Methode kann nur über AJAX zugegriffen werden."
 
-#: Controller/AttributesController.php:2309;2560;2574;2585
-#: Controller/OrganisationsController.php:432
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
 #: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "Sie haben keine Berechtigung dies zu tun."
 
-#: Controller/AttributesController.php:2414
-#: Controller/EventsController.php:4207
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "Diese Funktionalität erfordert Zugang über einen API Schlüssel."
 
-#: Controller/AttributesController.php:2422
+#: Controller/AttributesController.php:2463
 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:2434
+#: Controller/AttributesController.php:2475
 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:2595
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "Ungültige Skript."
 
-#: Controller/AttributesController.php:2662
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr "Keine gültige Optionen zur Anreicherung dieses Attributs gefunden."
 
-#: Controller/AttributesController.php:2760
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "Ungültiger Typ angefordert."
 
-#: Controller/AttributesController.php:2823;3030
+#: Controller/AttributesController.php:2864;3071
 #: Controller/TagCollectionsController.php:254
 msgid "Invalid tag"
 msgstr ""
 
-#: Controller/AttributesController.php:3120
-#: Controller/EventsController.php:5197
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Deaktivieren die Korrelation ist in dieser Instanz nicht zulässig."
 
-#: Controller/AttributesController.php:3124;3139
+#: Controller/AttributesController.php:3165;3180
 #: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "Ungültiges Attribut."
@@ -419,6 +422,63 @@ msgstr ""
 msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
 msgstr ""
 
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
 #: Controller/DecayingModelController.php:20
 msgid "Default decaying models updated"
 msgstr ""
@@ -584,452 +644,456 @@ msgstr "Ungültige Event IDs."
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr "Löschen des Ereignisses von der EventBlacklist fehlgeschlagen. Fehler: "
 
-#: Controller/EventsController.php:879
+#: Controller/EventsController.php:894
 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:881
+#: Controller/EventsController.php:896
 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:887
+#: Controller/EventsController.php:902
 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:889
+#: Controller/EventsController.php:904
 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:1716
+#: Controller/EventsController.php:1731
 msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1927
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr "Sie haben keine Berechtigung, ein Ereignis zu erstellen"
 
-#: Controller/EventsController.php:1933
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr "Keine gültige Eventdaten empfangen."
 
-#: Controller/EventsController.php:1969
+#: Controller/EventsController.php:1984
 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:1973;1977
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
 msgstr "Ungültige Freigabegruppe oder nicht berechtigt."
 
-#: Controller/EventsController.php:2001
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr "Event von lokaler Blacklist geblockt."
 
-#: Controller/EventsController.php:2014;2101;2377
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "Das Event wurde gespeichert"
 
-#: Controller/EventsController.php:2022
+#: Controller/EventsController.php:2037
 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:2028
+#: Controller/EventsController.php:2043
 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:2030;2380
+#: Controller/EventsController.php:2045;2395
 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:2079
+#: Controller/EventsController.php:2094
 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:2127
+#: Controller/EventsController.php:2142
 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:2128
+#: Controller/EventsController.php:2143
 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:2189
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr "STIX-Dokument importiert, Events erstellt: "
 
-#: Controller/EventsController.php:2192
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr "STIX-Dokument importiert."
 
-#: Controller/EventsController.php:2195
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr "STIX Dokument konnte nicht importiert werden: "
 
-#: Controller/EventsController.php:2202
+#: Controller/EventsController.php:2217
 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:2226;2311
+#: Controller/EventsController.php:2241;2326
 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:2234
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr "Ungültige Event-ID eingegeben."
 
-#: Controller/EventsController.php:2239
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr "Sie sind nicht berechtigt dieses Event zu lesen."
 
-#: Controller/EventsController.php:2536;2640;2711
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr "Dir fehlt die Berechtigung um dies zu tun."
 
-#: Controller/EventsController.php:2545
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr "Event unveröffentlicht."
 
-#: Controller/EventsController.php:2652;2722
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr "Event konnte nicht veröffentlicht werden - kein Tag für benötigte Taxonomien fehlt: %s"
 
-#: Controller/EventsController.php:2804
+#: Controller/EventsController.php:2819
 msgid "You must specify a message."
 msgstr ""
 
-#: Controller/EventsController.php:2823
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr "E-Mail an Berichterstatter gesendet."
 
-#: Controller/EventsController.php:2832
+#: Controller/EventsController.php:2847
 msgid "Sending of email failed."
 msgstr ""
 
-#: Controller/EventsController.php:2883
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr "Warnung, Sie sind als Administrator eingeloggt, jeder Export, den Sie generieren, enthält den VOLLSTÄNDIGEN Datensatz. Wenn Sie einen Export für Ihre eigene Organisation generieren möchten, melden Sie sich bitte mit einem anderen Benutzer an."
 
-#: Controller/EventsController.php:2971
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr "Dieses Feature ist im Moment deaktiviert"
 
-#: Controller/EventsController.php:3097
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr "Dateinamen nicht zulässig."
 
-#: Controller/EventsController.php:3117
+#: Controller/EventsController.php:3134
 msgid "Problem with writing the IoC file. Please report to site admin."
 msgstr ""
 
-#: Controller/EventsController.php:3211
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr "Dies ist keine gültige MISP XML-Datei."
 
-#: Controller/EventsController.php:3253
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr "Noch nicht implementiert"
 
-#: Controller/EventsController.php:3271;3275
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr "Ungültiges Event oder nicht berechtigt."
 
-#: Controller/EventsController.php:3467
+#: Controller/EventsController.php:3484
 #: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr "Ungültiger Tag."
 
-#: Controller/EventsController.php:3483
+#: Controller/EventsController.php:3500
 #: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr "Tag ist bereits mit diesem Event verbunden."
 
-#: Controller/EventsController.php:3497
+#: Controller/EventsController.php:3514
 msgid "Tag is not allowed due to taxonomy exclusivity settings"
 msgstr ""
 
-#: Controller/EventsController.php:3528;3534
+#: Controller/EventsController.php:3545;3551
 #: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr "Tag(s) hinzugefügt."
 
-#: Controller/EventsController.php:3530
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr "Tag konnte nicht hinzugefügt werden."
 
-#: Controller/EventsController.php:3536
+#: Controller/EventsController.php:3553
 #: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr "Alle Tags wurden bereits hinzugefügt, es gibt nichts hinzuzufügen."
 
-#: Controller/EventsController.php:3800;5003;5025;5532;5536
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
 #: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "Ungültiges Event."
 
-#: Controller/EventsController.php:3855;3885;3901
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr "Sie haben keine Berechtigung dies zu tun."
 
-#: Controller/EventsController.php:3966;4106
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr "Ungültige ID"
 
-#: Controller/EventsController.php:3970;4110;4685
+#: Controller/EventsController.php:3987;4128;4703
 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:4116
+#: Controller/EventsController.php:4134
 msgid "Freetext Import"
 msgstr ""
 
-#: Controller/EventsController.php:4122
+#: Controller/EventsController.php:4140
 msgid "Populate using a Template"
 msgstr ""
 
-#: Controller/EventsController.php:4128
+#: Controller/EventsController.php:4146
 msgid "OpenIOC Import"
 msgstr ""
 
-#: Controller/EventsController.php:4133
+#: Controller/EventsController.php:4151
 msgid "ThreatConnect Import"
 msgstr ""
 
-#: Controller/EventsController.php:4138
+#: Controller/EventsController.php:4156
 msgid "(Experimental) Forensic analysis - Mactime"
 msgstr ""
 
-#: Controller/EventsController.php:4157
+#: Controller/EventsController.php:4175
 msgid "MISP standard (recommended exchange format - lossless)"
 msgstr ""
 
-#: Controller/EventsController.php:4163
+#: Controller/EventsController.php:4181
 msgid "STIX 1.1.1 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4168
+#: Controller/EventsController.php:4186
 msgid "STIX 2.0 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4210;4217
+#: Controller/EventsController.php:4228;4235
 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:4246
+#: Controller/EventsController.php:4264
 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:4254
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "Event nicht gefunden"
 
-#: Controller/EventsController.php:4277
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "Event nicht gefunden."
 
-#: Controller/EventsController.php:4287
+#: Controller/EventsController.php:4305
 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:4312
+#: Controller/EventsController.php:4330
 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:4451;4472;4531;4556;4581;4611;4632
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr "Ungültiger Typ."
 
-#: Controller/EventsController.php:4750
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr "Ungültige Methode."
 
-#: Controller/EventsController.php:4832
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr "%s Dienste sind nicht aktiviert."
 
-#: Controller/EventsController.php:4836
+#: Controller/EventsController.php:4854
 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:4841
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr "Keine gültigen Optionen %s für dieses Attribut gefunden."
 
-#: Controller/EventsController.php:4896;4942
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr "%s Dienst nicht erreichbar."
 
-#: Controller/EventsController.php:4908
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr ": angereicht durch "
 
-#: Controller/EventsController.php:4959
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ": Über %s angereichert"
 
-#: Controller/EventsController.php:5114
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr "Dienst zum importieren nicht erreichbar."
 
-#: Controller/EventsController.php:5204;5218
+#: Controller/EventsController.php:5222;5236
 #: Controller/PostsController.php:60;84
 #: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
 msgid "You don't have permission to do that."
 msgstr "Sie haben keine Berechtigung dies zu tun."
 
-#: Controller/EventsController.php:5345
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr "Ungültige ID."
 
-#: Controller/EventsController.php:5393
+#: Controller/EventsController.php:5411
 #: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr "Ungültiges Event"
 
-#: Controller/EventsController.php:5414
+#: Controller/EventsController.php:5432
 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."
 
-#: Controller/EventsController.php:5665
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr "%s Ereigniss(e) gelöscht."
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 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:241;340
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr "Feed hinzugefügt."
 
-#: Controller/FeedsController.php:249
-msgid "Feed could not be added. Invalid field: %s"
-msgstr "Feed konnte nicht hinzugefügt werden. Ungültiges Feld: %s"
+#: Controller/FeedsController.php:291
+msgid "Feed could not be added. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:274;375;397;526;567;778
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr "Ungültiger Feed."
 
-#: Controller/FeedsController.php:348
-msgid "Feed could not be updated. Invalid fields: %s"
-msgstr "Feed konnte nicht aktualisiert werden. Ungültiges Feld: %s"
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:371
-#: Controller/OrganisationsController.php:237
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
 #: Controller/SharingGroupsController.php:237
-#: Controller/UsersController.php:1015
+#: Controller/UsersController.php:1044
 msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:404;530
+#: Controller/FeedsController.php:455;581
 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:417;483
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr "Feed-Download gestartet."
 
-#: Controller/FeedsController.php:428
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr "Pull eingereiht zur Hintergrundausführung."
 
-#: Controller/FeedsController.php:433;435
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr "Feed-Download fehlgeschlagen."
 
-#: Controller/FeedsController.php:439;500
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr "Holen des Feed erfolgreich abgeschlossen."
 
-#: Controller/FeedsController.php:512
+#: Controller/FeedsController.php:563
 msgid "No feed enabled."
 msgstr ""
 
-#: Controller/FeedsController.php:536;555
+#: Controller/FeedsController.php:587;606
 #: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr "Download fehlgeschlagen."
 
-#: Controller/FeedsController.php:543
+#: Controller/FeedsController.php:594
 msgid "Event added."
 msgstr "Event hinzugefügt."
 
-#: Controller/FeedsController.php:546
+#: Controller/FeedsController.php:597
 msgid "Event already up to date."
 msgstr "Event bereits auf aktuellem Stand."
 
-#: Controller/FeedsController.php:548
+#: Controller/FeedsController.php:599
 msgid "Event updated."
 msgstr "Event aktualisiert."
 
-#: Controller/FeedsController.php:552
+#: Controller/FeedsController.php:603
 msgid "Could not %s event."
 msgstr "Konnte nicht \"%s\" Event."
 
-#: Controller/FeedsController.php:649
+#: Controller/FeedsController.php:700
 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:688;739
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr "Ungültiger Feedtyp."
 
-#: Controller/FeedsController.php:784;816
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr "Das ausgewählte Event konnte nicht heruntergeladen werden"
 
-#: Controller/FeedsController.php:814
+#: Controller/FeedsController.php:865
 msgid "This event is blocked by the Feed filters."
 msgstr "Dieses Event wird durch die Feed-Filter blockiert."
 
-#: Controller/FeedsController.php:852;856
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr "Ungültiger Feed."
 
-#: Controller/FeedsController.php:877
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr "Nur POST-Anfragen sind erlaubt."
 
-#: Controller/FeedsController.php:881
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 
-#: Controller/FeedsController.php:890
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr "Daten abgerufen."
 
-#: Controller/FeedsController.php:892
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "Die ausgewählten Daten konnte nicht geladen werden. Grund: %s"
 
-#: Controller/FeedsController.php:909
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr "Feed-Caching begonnen."
 
-#: Controller/FeedsController.php:924
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr "Feed-Caching fehlgeschlagen."
 
-#: Controller/FeedsController.php:927
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr "Zwischenspeicherung der Feeds wurde erfolgreich abgeschlossen."
 
-#: Controller/FeedsController.php:961
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr "Ungültige Feed-Liste erhalten."
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr "Alle Cluster"
 
-#: Controller/GalaxiesController.php:174
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr "Alle Namespaces"
 
-#: Controller/GalaxiesController.php:304
+#: Controller/GalaxiesController.php:337
 msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:307
+#: Controller/GalaxiesController.php:340
 msgid "Failed to parse request."
 msgstr "Fehler beim Anfrage parsen."
 
@@ -1112,7 +1176,7 @@ msgid "Object could not be saved."
 msgstr ""
 
 #: Controller/ObjectsController.php:373;1006
-#: Model/Event.php:6171
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr "Ungültiges Objekt."
 
@@ -1180,43 +1244,43 @@ msgstr "Die Organisation wurde erfolgreich hinzugefügt."
 msgid "The organisation could not be added."
 msgstr "Die Organisation konnte nicht hinzugefügt werden."
 
-#: Controller/OrganisationsController.php:156;289;295
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr "Ungültige Organisation."
 
-#: Controller/OrganisationsController.php:162;242;248;301;328;361
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
 msgid "Invalid organisation"
 msgstr "Ungültige Organisation"
 
-#: Controller/OrganisationsController.php:201
+#: Controller/OrganisationsController.php:208
 msgid "Organisation updated."
 msgstr "Organisation aktualisiert."
 
-#: Controller/OrganisationsController.php:216
+#: Controller/OrganisationsController.php:223
 msgid "The organisation could not be updated."
 msgstr "Die Organisation konnte nicht aktualisiert werden."
 
-#: Controller/OrganisationsController.php:265
+#: Controller/OrganisationsController.php:272
 msgid "Organisation deleted"
 msgstr "Organisation gelöscht"
 
-#: Controller/OrganisationsController.php:272
+#: Controller/OrganisationsController.php:279
 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 "Organisation konnte nicht gelöscht werden. Generell sollten Organisationen niemals gelöscht werden. Überlegen Sie stattdessen sie in die Liste bekannter entfernter Organisationen zu verschieben. Alternativ, wenn Sie sich sicher sind, dass Sie diese Organisation löschen möchten und sich über die Auswirkungen im klaren sind, stellen Sie sicher, dass keine Benutzer oder Events mit dieser Organisation verbunden sind bevor Sie sie löschen."
 
-#: Controller/OrganisationsController.php:366
+#: Controller/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr "Für diese Organisation wurde keine Startseite erstellt."
 
-#: Controller/OrganisationsController.php:415
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr "Diese Aktion ist auf Sync-User beschränkt"
 
-#: Controller/OrganisationsController.php:437
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr "Die Organisation wurde erfolgreich zusammengeführt."
 
-#: Controller/OrganisationsController.php:440
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr "Beim Zusammenführen der Organisationen ist ein Fehler aufgetreten. Um mehr über das zu erfahren, was schief gelaufen ist, lesen Sie die Auditprotokolle. Wenn Sie die Änderungen rückgängig machen möchten, finden Sie eine .sql Datei"
 
@@ -1348,7 +1412,7 @@ msgstr "Die Organisation konnte nicht angelet werden, die UUID wird bereits verw
 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:350;532;2154
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr "Der Server wurde gespeichert"
 
@@ -1356,8 +1420,8 @@ msgstr "Der Server wurde gespeichert"
 msgid "The server could not be saved. Please, try again."
 msgstr "Der Server konnte nicht gespeichert werden. Bitte erneut versuchen."
 
-#: Controller/ServersController.php:411;608;653;656;665;729;735;1489;1506
-#: Model/Server.php:5737
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "Ungültiger Server"
 
@@ -1365,7 +1429,7 @@ msgstr "Ungültiger Server"
 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:604;2171;2213
+#: Controller/ServersController.php:604;2183;2225
 msgid "This endpoint expects POST requests."
 msgstr ""
 
@@ -1564,79 +1628,79 @@ msgstr ""
 msgid "This setting can only be edited via the CLI."
 msgstr "Diese Einstellung kann nur über das CLI bearbeitet werden."
 
-#: Controller/ServersController.php:1365
+#: Controller/ServersController.php:1365;1377
 msgid "Restarting workers."
 msgstr ""
 
-#: Controller/ServersController.php:1389
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "Datei nicht gefunden."
 
-#: Controller/ServersController.php:1395
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "Datei konnte nicht gelöscht werden."
 
-#: Controller/ServersController.php:1418;1434
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr "Upload fehlgeschlagen."
 
-#: Controller/ServersController.php:1426
+#: Controller/ServersController.php:1438
 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/ServersController.php:1493
+#: Controller/ServersController.php:1505
 msgid "Invalid user or user not found."
 msgstr ""
 
-#: Controller/ServersController.php:2040
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr "Server Caching wird gestartet."
 
-#: Controller/ServersController.php:2055
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr "Server Caching fehlgeschlagen."
 
-#: Controller/ServersController.php:2058
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr "Server Caching erfolgreich abgeschlossen."
 
-#: Controller/ServersController.php:2088
+#: Controller/ServersController.php:2100
 msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2097
+#: Controller/ServersController.php:2109
 msgid "Configured host org not found. Please make sure that the setting is current on the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2161
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr "Server konnte nicht gespeichert werden. Fehler: %s"
 
-#: Controller/ServersController.php:2182
+#: Controller/ServersController.php:2194
 msgid "API key updated."
 msgstr ""
 
-#: Controller/ServersController.php:2195
+#: Controller/ServersController.php:2207
 msgid "ID has to be a valid server connection"
 msgstr ""
 
-#: Controller/ServersController.php:2198
+#: Controller/ServersController.php:2210
 msgid "Invalid direction. Valid options: "
 msgstr ""
 
-#: Controller/ServersController.php:2202
+#: Controller/ServersController.php:2214
 msgid "Priority changed."
 msgstr ""
 
-#: Controller/ServersController.php:2205
+#: Controller/ServersController.php:2217
 msgid "Priority could not be changed."
 msgstr ""
 
-#: Controller/ServersController.php:2216
+#: Controller/ServersController.php:2228
 msgid "Only site admin accounts can release the update lock."
 msgstr ""
 
-#: Controller/ServersController.php:2226
+#: Controller/ServersController.php:2238
 msgid "Only site admin accounts get the DB schema diagnostic."
 msgstr ""
 
@@ -1967,164 +2031,174 @@ msgstr "Event verteilt, "
 msgid "Event populated, but "
 msgstr "Event verteilt, aber "
 
-#: Controller/UserSettingsController.php:123;312
+#: Controller/UserSettingsController.php:129;276
 msgid "Invalid ID passed."
 msgstr ""
 
-#: Controller/UserSettingsController.php:133;137;322;326
+#: Controller/UserSettingsController.php:139;143;286;290
 msgid "Invalid user setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:151;192;278;290
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
 msgid "Invalid setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:155;196;330
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
 msgid "This setting is restricted and requires the following permission(s): %s"
 msgstr ""
 
-#: Controller/UserSettingsController.php:189
-msgid "This endpoint expects both a setting and a value to be set."
-msgstr ""
-
-#: Controller/UserSettingsController.php:229
+#: Controller/UserSettingsController.php:193
 msgid "Setting saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:242
+#: Controller/UserSettingsController.php:206
 msgid "Setting could not be saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:337
+#: Controller/UserSettingsController.php:301
 msgid "Setting deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:345
+#: Controller/UserSettingsController.php:309
 msgid "Setting could not be deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:358
+#: Controller/UserSettingsController.php:322
 msgid "Expecting POST or DELETE request."
 msgstr ""
 
-#: Controller/UsersController.php:42;310
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr "Ungültiger Nutzer oder nicht berechtigt."
 
-#: Controller/UsersController.php:62;538;786;805;1030
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "Ungültiger Nutzer"
 
-#: Controller/UsersController.php:150;693;858
+#: Controller/UsersController.php:154;722;887
 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: "
 
-#: Controller/UsersController.php:202
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr "Das Profile wurde aktualisiert"
 
-#: Controller/UsersController.php:207
+#: Controller/UsersController.php:211
 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:247
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr "Ungültiges Passwort. Bitte geben Sie Ihr aktuelles Passwort ein, um fortzufahren."
 
-#: Controller/UsersController.php:256
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr "Bitte geben Sie Ihr aktuelles Passwort ein, um fortzufahren."
 
-#: Controller/UsersController.php:276
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "Passwort geändert."
 
-#: Controller/UsersController.php:285
+#: Controller/UsersController.php:299
 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:422;440;547
-#: Model/Log.php:370
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr "Bearbeitet"
 
-#: Controller/UsersController.php:704
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr "Der Nutzer konnte nicht gespeichert werden. Ungültige Organisation."
 
-#: Controller/UsersController.php:726
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "Der Nutzer wurde gespeichert."
 
-#: Controller/UsersController.php:735;966
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr "Der Nutzer konnte nicht gespeichert werden. Bitte erneut versuchen."
 
-#: Controller/UsersController.php:958
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "Der Nutzer wurde gespeichert"
 
-#: Controller/UsersController.php:1038
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "Nutzer gelöscht"
 
-#: Controller/UsersController.php:1042
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "Nutzer wurde nicht gelöscht"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "Ungültiger Nutzername oder Passwort, erneut versuchen"
 
-#: Controller/UsersController.php:1208
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr "Auf Wiedersehen"
 
-#: Controller/UsersController.php:1230
-msgid "Invalid action."
-msgstr ""
-
-#: Controller/UsersController.php:1237
-msgid "New authkey generated."
-msgstr "Kein authkey erzeugt."
-
-#: Controller/UsersController.php:1248
+#: Controller/UsersController.php:1273;1297
 msgid "This functionality is only accessible via POST requests."
 msgstr ""
 
-#: Controller/UsersController.php:1252
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
+msgid "New authkey generated."
+msgstr "Kein authkey erzeugt."
+
+#: Controller/UsersController.php:1301
 msgid "Job initiated."
 msgstr ""
 
-#: Controller/UsersController.php:1254
+#: Controller/UsersController.php:1303
 msgid "%s authkeys reset, %s could not be reset."
 msgstr ""
 
-#: Controller/UsersController.php:1368
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr "Sie akzeptieren die Geschäftsbedingungen."
 
-#: Controller/UsersController.php:1496
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr "Empfänger E-Mail nicht angegeben"
 
-#: Controller/UsersController.php:1501
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr "Empfänger Organisation nicht angegeben"
 
-#: Controller/UsersController.php:1538
+#: Controller/UsersController.php:1587
 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:1540
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr "E-Mails versendet."
 
-#: Controller/UsersController.php:1614
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr "Nutzungsdaten"
 
-#: Controller/UsersController.php:1615
+#: Controller/UsersController.php:1664
 #: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
@@ -2134,11 +2208,11 @@ msgstr "Nutzungsdaten"
 msgid "Organisations"
 msgstr "Organisationen"
 
-#: Controller/UsersController.php:1616
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr "Benutzer- und Organisationsstatistiken"
 
-#: Controller/UsersController.php:1617
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
 #: View/DecayingModel/decaying_tool_rest_search.ctp:28
 #: View/Elements/eventattribute.ctp:151
@@ -2164,18 +2238,160 @@ msgstr "Benutzer- und Organisationsstatistiken"
 msgid "Tags"
 msgstr "Tags"
 
-#: Controller/UsersController.php:1618
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr "Attribut Histogramm"
 
-#: Controller/UsersController.php:1619
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr "Sichtungen Toplisten"
 
-#: Controller/UsersController.php:1620
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr "Galaxy Matrix"
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "Ja"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "Nein"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr "Diese Aktion ist nur über POST-Anfragen erreichbar."
@@ -2256,11 +2472,11 @@ msgstr "Warnungslisten konnten nicht gelöscht werden."
 msgid "No valid data received."
 msgstr "Keine gültigen Daten empfangen."
 
-#: Controller/Component/ACLComponent.php:614
+#: Controller/Component/ACLComponent.php:634
 msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:668
+#: Controller/Component/ACLComponent.php:688
 msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
 msgstr ""
 
@@ -2741,87 +2957,87 @@ msgstr ""
 msgid "Invalid %s."
 msgstr "Ungültig %s."
 
-#: Model/AppModel.php:1416
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr "Indizierung "
 
-#: Model/AppModel.php:1430
+#: Model/AppModel.php:1480
 msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1452
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr "SQL-Abfrage erfolgreich ausgeführt für "
 
-#: Model/AppModel.php:1453
+#: Model/AppModel.php:1503
 msgid "The executed SQL query was: %s"
 msgstr ""
 
-#: Model/AppModel.php:1455
+#: Model/AppModel.php:1505
 msgid "Successfuly executed the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1466;1530
+#: Model/AppModel.php:1516;1580
 msgid "Issues executing the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr "Die ausgeführte SQL-Abfrage war: "
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr " Ausgegebener Fehler: "
 
-#: Model/AppModel.php:1469
+#: Model/AppModel.php:1519
 msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1478
+#: Model/AppModel.php:1528
 msgid "However, as this error is whitelisted, the update went through."
 msgstr ""
 
-#: Model/AppModel.php:1497
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr "Erfolgreich indiziert "
 
-#: Model/AppModel.php:1500
+#: Model/AppModel.php:1550
 msgid "Failed to add index"
 msgstr ""
 
-#: Model/AppModel.php:1502
+#: Model/AppModel.php:1552
 msgid "The returned error is:"
 msgstr ""
 
-#: Model/AppModel.php:1531
+#: Model/AppModel.php:1581
 msgid "Database updates stopped as some errors occured and the stop flag is enabled."
 msgstr ""
 
-#: Model/AppModel.php:1690
+#: Model/AppModel.php:1740
 msgid "Invalid JSON."
 msgstr ""
 
-#: Model/AppModel.php:1783;1841
+#: Model/AppModel.php:1833;1891
 msgid "Issues executing run_updates"
 msgstr ""
 
-#: Model/AppModel.php:1784
+#: Model/AppModel.php:1834
 msgid "Database updates are locked. Worker not spawned"
 msgstr ""
 
-#: Model/AppModel.php:1788;1846;1881
+#: Model/AppModel.php:1838;1896;1931
 msgid "Update done"
 msgstr ""
 
-#: Model/AppModel.php:1842
+#: Model/AppModel.php:1892
 msgid "Updates are locked. Stopping worker gracefully"
 msgstr ""
 
-#: Model/AppModel.php:1861
+#: Model/AppModel.php:1911
 msgid "Running update %s"
 msgstr ""
 
-#: Model/AppModel.php:1887
+#: Model/AppModel.php:1937
 msgid "Update done in another worker. Gracefuly stopping."
 msgstr ""
 
@@ -3805,19 +4021,19 @@ msgstr "Der Wert muss eine Zahl größer oder gleich 0 sein."
 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:2278;2346
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr "Nutzer konnte nicht gelesen werden."
 
-#: Model/Attribute.php:2282
+#: Model/Attribute.php:2301
 msgid "Invalid hash type."
 msgstr "Ungültiger Hashtyp."
 
-#: Model/Attribute.php:2973
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr "Dies ist ein Pflichtfeld."
 
-#: Model/Attribute.php:3540
+#: Model/Attribute.php:3559
 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."
 
@@ -3837,6 +4053,10 @@ msgstr ""
 msgid "Community not found."
 msgstr ""
 
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
 #: Model/DecayingModel.php:162
 msgid "Models could not be loaded or default decaying models folder is empty"
 msgstr ""
@@ -3908,67 +4128,75 @@ msgstr "Klicken Sie hier, um die Yara Regeln herunterzuladen, die aus allen rele
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr "Klicken Sie hier, um die Yara Regeln herunterzuladen, die aus allen relevanten Attributen generiert wurden. Regeln werden im JSON-Format mit Informationen über den Ursprung (generiert oder geparst) und Gültigkeitsdauer zurückgegeben."
 
-#: Model/Event.php:5722
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr "Probleme beim laden der STIX-Datei. "
 
-#: Model/Event.php:5724
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr "Probeleme mit der maec Bibliothek. "
 
-#: Model/Event.php:5726
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "Probleme beim Ausführen des Aufnahemskripts oder ungültige Eingabe. "
 
-#: Model/Event.php:5729
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr "Bitte fragen Sie ihren Administrator "
 
-#: Model/Event.php:5731
+#: Model/Event.php:5808
 msgid "Please "
 msgstr "Bitte "
 
-#: Model/Event.php:5733
+#: Model/Event.php:5810
 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:5765
+#: Model/Event.php:5842
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:5774
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr "%s nicht gesetzt"
 
-#: Model/Event.php:6023
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr "Tags konnten nicht hinzugefügt werden."
 
-#: Model/Event.php:6505
+#: Model/Event.php:6582
 msgid "process_"
 msgstr "prozess_"
 
-#: Model/Feed.php:1444;1488
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr "Ereignis: %s"
 
-#: Model/Feed.php:1458
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr "Feeds %s"
 
-#: Model/Feed.php:1635
+#: Model/Feed.php:1687
 msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Feed.php:1638
+#: Model/Feed.php:1690
 msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
 msgstr ""
 
-#: Model/Feed.php:1643
+#: Model/Feed.php:1695
 msgid "Invalid user id."
 msgstr ""
 
-#: Model/Feed.php:1663
+#: Model/Feed.php:1715
 msgid "Events related to feed %s purged."
 msgstr ""
 
@@ -3976,1164 +4204,1208 @@ msgstr ""
 msgid "Galaxy cannot be represented as a matrix"
 msgstr "Galaxie kann nicht als Matrix dargestellt werden"
 
-#: Model/MispObject.php:1057
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr "Ausgewählte Attribute sind nicht vorhanden."
 
-#: Model/Server.php:140
+#: Model/Server.php:123
+msgid "Server unreachable"
+msgstr ""
+
+#: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
 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:141
+#: Model/Server.php:151
 msgid "Administering MISP via the CLI"
 msgstr "Administration von MISP über die Kommandozeile"
 
-#: Model/Server.php:153
+#: Model/Server.php:163
 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:154
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "Automatisierung gewisser Konsolenaufgaben"
 
-#: Model/Server.php:163
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr "Die Hintergrundarbeiter können zusätzlich zu den UI / API Management-Tools über das CLI verwaltet werden"
 
-#: Model/Server.php:164
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr "Verwaltung der Hintergrundarbeiter"
 
-#: Model/Server.php:173
+#: Model/Server.php:183
 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:175
+#: Model/Server.php:185
 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:181
+#: Model/Server.php:191
 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 "Die Basis-URL der Anwendung (im Format https://www.mymispinstance.com) als extern sichtbar/durch andere MISPs. MISP kodiert diese URL in Teilgruppen wenn sie sich selbst einschließt. Wenn dieser Wert nicht gesetzt ist, wird der Baseurl als Fallback verwendet."
 
-#: Model/Server.php:189
+#: Model/Server.php:199
 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:197
+#: Model/Server.php:207
 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:207
+#: Model/Server.php:217
 msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
-#: Model/Server.php:216
+#: Model/Server.php:226
 msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
 msgstr ""
 
-#: Model/Server.php:225
+#: Model/Server.php:235
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "Aktivieren von leistungsintensiven Korrelationen (aktuell CIDR Korrelation)"
 
-#: Model/Server.php:234
+#: Model/Server.php:244
 msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
 msgstr "Aktivieren Sie diese Einstellung, um die Datei config.php direkt zu speichern, ohne zuvor eine temporäre Datei zu erstellen und sie zu verschieben, um Probleme mit der Übereinstimmung zu vermeiden. Im Allgemeinen nicht empfohlen, aber nützlich, wenn zum Beispiel andere Tools die config.php-Datei modifizieren/pflegen."
 
-#: Model/Server.php:243
+#: Model/Server.php:253
 msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
 msgstr "Es wird dringend empfohlen, alle Python-Abhängigkeiten in einer virtuellen Umgebung zu installieren. Der empfohlene Ort ist: %s/venv"
 
-#: Model/Server.php:254
+#: Model/Server.php:264
 msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
 msgstr ""
 
-#: Model/Server.php:264
+#: Model/Server.php:274
 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:273
+#: Model/Server.php:283
 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:281
+#: Model/Server.php:291
 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:290
+#: Model/Server.php:300
 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:292
+#: Model/Server.php:302
 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:298;306;333;357;365;373;381;438;486;494;561
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr "Diese Einstellung ist veraltet und kann gefahrlos entfernt werden."
 
-#: Model/Server.php:314
+#: Model/Server.php:324
 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:324
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr "Deaktivieren Sie die Anzeige / Modifikationen der Bedrohungsstufe in der Instanz (veraltetes Feld)."
 
-#: Model/Server.php:341
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "Fußzeilentext, dem \"Powered by MISP\" vorangestellt."
 
-#: Model/Server.php:349
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "Fußzeilentext, dem \"Powered by MISP\" folgend."
 
-#: Model/Server.php:389
+#: Model/Server.php:399
 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:397
+#: Model/Server.php:407
 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:405
+#: Model/Server.php:415
 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:413
+#: Model/Server.php:423
 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:421
+#: Model/Server.php:431
 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:430
+#: Model/Server.php:440
 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:432
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr "Keine gültige UUID gesetzt"
 
-#: Model/Server.php:446
+#: Model/Server.php:456
 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:454
+#: Model/Server.php:464
 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:462
+#: Model/Server.php:472
 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:470
+#: Model/Server.php:480
 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:478
+#: Model/Server.php:488
 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:502
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr "Aktiviert das Benutzen der MISP Hintergrundverarbeitung."
 
-#: Model/Server.php:510
+#: Model/Server.php:520
 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:520
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "Erlauben den XML-Caches encodierte Anlagen zu beinhalten."
 
-#: Model/Server.php:528
+#: Model/Server.php:538
 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:536
+#: Model/Server.php:546
 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:544
+#: Model/Server.php:554
 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:553
+#: Model/Server.php:563
 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:569
+#: Model/Server.php:579
 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:577
+#: Model/Server.php:587
 msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
 msgstr ""
 
-#: Model/Server.php:585
+#: Model/Server.php:595
 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:593
+#: Model/Server.php:603
 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:601
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr "Die standard Verteilungseinstellung für Events (0-3)."
 
-#: Model/Server.php:610
+#: Model/Server.php:620
 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:619
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr "Die Standardeinstellung für Bedrohungslevel beim erstellen von Events."
 
-#: Model/Server.php:628
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr "Die Tag-Sammlung, die auf alle manuell erstellten Ereignisse angewendet werden soll."
 
-#: Model/Server.php:637
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr "Aktivieren der Tagging-Funktion von MISP. Strengstens empfohlen."
 
-#: Model/Server.php:645
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr "Zeige die vollen Tag-Namen im Eregnis-Index."
 
-#: Model/Server.php:654
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr "Genutzt auf der Login-Seite, vor dem MISP-Logo"
 
-#: Model/Server.php:662
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr "Genutzt auf der Login-Seite, hiner dem MISP-Logo"
 
-#: Model/Server.php:670
+#: Model/Server.php:689
 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:678
+#: Model/Server.php:697
 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:686
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr "Verwendet im Seitentitel nach dem Namen der Seite"
 
-#: Model/Server.php:694
+#: Model/Server.php:713
 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:702
+#: Model/Server.php:721
 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:710
+#: Model/Server.php:729
 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:718
+#: Model/Server.php:737
 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:726
+#: Model/Server.php:745
 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:735
+#: Model/Server.php:754
 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:744
+#: Model/Server.php:763
 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:752
+#: Model/Server.php:771
 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:759
+#: Model/Server.php:778
 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:766
+#: Model/Server.php:785
 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:775
+#: Model/Server.php:794
 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:783
+#: Model/Server.php:802
 msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
 msgstr ""
 
-#: Model/Server.php:785
+#: Model/Server.php:804
 msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
 msgstr ""
 
-#: Model/Server.php:792
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr "Wenn diese Funktion aktiviert ist, werden alle Seitenanfragen protokolliert. Denken Sie daran, dass dies äußerst ausführlich ist und zu einer Belastung für Ihre Datenbank werden wird."
 
-#: Model/Server.php:801
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr "Sie können entscheiden, die Protokollierung der Paranoidprotokolle in der Datenbank zu überspringen."
 
-#: Model/Server.php:810
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr "Wenn paranoide Protokollierung aktiviert ist, fügen Sie den POST-Körper in die Einträge ein."
 
-#: Model/Server.php:819
+#: Model/Server.php:838
 msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
 msgstr ""
 
-#: Model/Server.php:828
+#: Model/Server.php:847
 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:837
+#: Model/Server.php:856
 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:846
+#: Model/Server.php:865
 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:855
+#: Model/Server.php:874
 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:864
+#: Model/Server.php:883
 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:873
+#: Model/Server.php:892
 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:883
+#: Model/Server.php:902
 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:892
+#: Model/Server.php:911
 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:901
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr "Legen Sie einen Wert fest, um die Anzahl der E-Mail-Warnungen zu begrenzen, die Ereignisse pro Erstellungsorganisation generieren können (z. B. wenn eine Organisation 2000 Ereignisse auf einmal ausgibt, aber nur bei den ersten 20 warnt)."
 
-#: Model/Server.php:910
+#: Model/Server.php:929
 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:919
+#: Model/Server.php:938
 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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:928
+#: Model/Server.php:947
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:937
+#: Model/Server.php:956
 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:947
+#: Model/Server.php:966
 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 "Wenn Sie den css anpassen möchten, schreiben Sie einfach eine CSS-Datei, legen Sie diese in folgendes Verzeichnis /var/www/MISP/app/webroot/css und geben Sie den Namen hier ein."
 
-#: Model/Server.php:956
+#: Model/Server.php:975
 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:965
+#: Model/Server.php:984
 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:974
+#: Model/Server.php:993
 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:984
+#: Model/Server.php:1003
 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:993
+#: Model/Server.php:1012
 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:1001
+#: Model/Server.php:1020
 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:1009
+#: Model/Server.php:1028
 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:1017
+#: Model/Server.php:1036
 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:1026
+#: Model/Server.php:1045
 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:1034
+#: Model/Server.php:1053
 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 "Setzen Sie dies auf falsch, wenn Sie MISP deaktivieren möchten, um seine eigenen Worker-Prozesse zu deaktivieren (zum Beispiel, wenn Sie die Mitarbeiter mit einer System-Einheit verwalten)."
 
-#: Model/Server.php:1042
+#: Model/Server.php:1061
 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:1051
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr "Legt die minimale Zeit fest, bevor ein Update erneut ausgelöst werden kann, falls das vorherige fehlschlägt. (sicherer Wächter, um zu vermeiden, dass das selbe Update mehrmals gestartet wird)"
 
-#: Model/Server.php:1062
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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:1071
+#: Model/Server.php:1099
 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:1079
+#: Model/Server.php:1107
 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:1087
+#: Model/Server.php:1115
 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:1095
+#: Model/Server.php:1123
 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:1103
+#: Model/Server.php:1131
 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:1112
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr "Der Speicherort des GnuPG Schlüsselbundes (homedir)."
 
-#: Model/Server.php:1123
+#: Model/Server.php:1151
 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:1131
+#: Model/Server.php:1159
 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:1139
+#: Model/Server.php:1167
 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:1147
+#: Model/Server.php:1175
 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:1155
+#: Model/Server.php:1183
 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:1167
+#: Model/Server.php:1195
 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:1175
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr "Der TCP-Port für den HTTP-Proxy."
 
-#: Model/Server.php:1183
+#: Model/Server.php:1211
 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:1191
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr "Der Benutzername für die Authentifizierung am HTTP-Proxy."
 
-#: Model/Server.php:1199
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr "Das Passwort für die Authentifizierung am HTTP-Proxy."
 
-#: Model/Server.php:1210
+#: Model/Server.php:1238
 msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
 msgstr ""
 
-#: Model/Server.php:1219
+#: Model/Server.php:1247
 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:1229
+#: Model/Server.php:1257
 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:1238
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1246
+#: Model/Server.php:1292
 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:1254
+#: Model/Server.php:1300
 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:1263
+#: Model/Server.php:1309
 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:1272
+#: Model/Server.php:1318
 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:1281
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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:1283
+#: Model/Server.php:1339
 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:1290
+#: Model/Server.php:1346
 msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
 msgstr "Erlaube Cross-Ursprungs Anfragen in dieser Instanz, die mit den in Security.cors_origins übereinstimmen. Setzen Sie auf false um vollständig zu deaktivieren"
 
-#: Model/Server.php:1299
+#: Model/Server.php:1355
 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 "Legen Sie die Ursprünge fest, von denen MISP Cross-Ursprungs-Anfragen zulässt. Nützlich für externe Integration. Komma trennen, wenn Sie mehr als eine benötigen."
 
-#: Model/Server.php:1308
+#: Model/Server.php:1364
 msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 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:1328
+#: Model/Server.php:1393
 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:1339
+#: Model/Server.php:1404
 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:1347
+#: Model/Server.php:1412
 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:1355
+#: Model/Server.php:1420
 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:1364
+#: Model/Server.php:1429
 msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
 msgstr "Die Timeout-Dauer von Sitzungen (in MINUTEN). 0 bedeutet für den PHP-Session-Handler nicht unendlich, stattdessen werden Sessions sofort ungültig."
 
-#: Model/Server.php:1372
+#: Model/Server.php:1437
 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:1383
+#: Model/Server.php:1448
 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:1392
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr "Der Standardgarten, der vom RPZ-Export verwendet wird, wenn die Einstellungen für Lokal-Daten-Richtlinien für den Export ausgewählt werden."
 
-#: Model/Server.php:1400
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr "Die Seriennummer im SOA-Teil der Zonendatei (numerisch, best practice ist jjjjmmttrr, wobei rr die zweistellige Sub-Revision der Datei ist. $date wird automatisch in das aktuelle jjjjmmtt konvertiert, also ist $date00 eine gültige Einstellung). Die Einstellung auf $time gibt Ihnen eine unixtime basierte Seriennummer (gut, dann benötigen Sie mehr als 99 Revisionen pro Tag)."
 
-#: Model/Server.php:1408
+#: Model/Server.php:1473
 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:1416
+#: Model/Server.php:1481
 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:1424
+#: Model/Server.php:1489
 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:1432
+#: Model/Server.php:1497
 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:1440
+#: Model/Server.php:1505
 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:1448
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr "Servername"
 
-#: Model/Server.php:1456
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr "Alternative nameserver"
 
-#: Model/Server.php:1464
+#: Model/Server.php:1529
 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:1472
+#: Model/Server.php:1537
 msgid "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."
 msgstr "Aktiviert oder deaktiviert die Kafka-Pub Funktion von MISP. Stellen Sie sicher, dass Sie die Voraussetzungen erfüllen, damit das Plugin funktioniert. Weitere Informationen finden Sie in den Installationsanweisungen."
 
-#: Model/Server.php:1480
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr "Eine kommagetrennte Liste von Kafka Bootstrap-Brokern"
 
-#: Model/Server.php:1488
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr "Ein Pfad zu einer ini-Datei mit Konfigurationsoptionen, die an rdkafka übergeben werden sollen."
 
-#: Model/Server.php:1496;1743
+#: Model/Server.php:1561;1808
 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:1504;1751
+#: Model/Server.php:1569;1816
 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:1512
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr "Thema für die Veröffentlichung von Ereignis-Erstellungen/Änderungen/Löschungen."
 
-#: Model/Server.php:1520
+#: Model/Server.php:1585
 msgid "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."
 msgstr "Wenn aktiviert, wird das Ereignis in Kafka zu dem Zeitpunkt veröffentlicht, an dem das Ereignis im MISP veröffentlicht wird. Eventaktionen (Erstellen oder Bearbeiten) werden nicht in Kafka veröffentlicht."
 
-#: Model/Server.php:1528
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr "Thema für die Veröffentlichung von Ereignisinformationen bei der Veröffentlichung."
 
-#: Model/Server.php:1536;1759
+#: Model/Server.php:1601;1824
 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:1544
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr "Thema für die Veröffentlichung von Objekterstellungen/Bearbeitungen/Löschungen."
 
-#: Model/Server.php:1552;1767
+#: Model/Server.php:1617;1832
 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:1560
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr "Thema für die Veröffentlichung von Referenz-Erstellungen/Löschungen."
 
-#: Model/Server.php:1568;1775
+#: Model/Server.php:1633;1840
 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:1576
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr "Thema für die Veröffentlichung von Attributerstellungen/Bearbeitungen/soft Löschungen."
 
-#: Model/Server.php:1584
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung von Angebotserstellungen/Bearbeitungen/Löschungen."
 
-#: Model/Server.php:1592
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr "Thema für die Veröffentlichung von Angebotserstellungen/Bearbeitungen/Löschungen."
 
-#: Model/Server.php:1600;1783
+#: Model/Server.php:1665;1848
 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:1608
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr "Thema zum Publizieren von Tag-Erstellungen/Bearbeitungen/Löschungen sowie Schlagwörter, die an verschiedene MISP-Elemente angehängt bzw. von ihnen getrennt werden."
 
-#: Model/Server.php:1616
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung neuer Ansichten."
 
-#: Model/Server.php:1624
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr "Thema für die Veröffentlichung von Ansichten."
 
-#: Model/Server.php:1632
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung von neuen/modifizierten Benutzern."
 
-#: Model/Server.php:1640
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr "Thema für die Veröffentlichung von neuen/geänderten Benutzern."
 
-#: Model/Server.php:1648
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung von neuen/modifizierten Organisationen."
 
-#: Model/Server.php:1656
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr "Thema für die Veröffentlichung neuer/geänderter Organisationen."
 
-#: Model/Server.php:1664
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung von Log-Einträgen. Beachten Sie, dass dies je nach den Log-Einstellungen ziemlich ausführlich werden kann."
 
-#: Model/Server.php:1672
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr "Thema für die Veröffentlichung von Logeinträgen."
 
-#: Model/Server.php:1680
+#: Model/Server.php:1745
 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:1689
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr "Der Port, den das Pub/Sub-Feature verwendet."
 
-#: Model/Server.php:1698
+#: Model/Server.php:1763
 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:1707
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr "Der Port auf dem Redis hört."
 
-#: Model/Server.php:1716
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr "Das Passwort, falls für Redis gesetzt."
 
-#: Model/Server.php:1725
+#: Model/Server.php:1790
 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:1734
+#: Model/Server.php:1799
 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:1791
+#: Model/Server.php:1856
 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:1799
+#: Model/Server.php:1864
 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:1807
+#: Model/Server.php:1872
 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:1815
+#: Model/Server.php:1880
 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:1823
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "Aktiviert das Logging auf eine ElasticSearch-Instanz"
 
-#: Model/Server.php:1831
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr "Die URL(s) mit denen Sie auf ElasticSearch zugreifen können - durch Komma getrennt, wenn Sie mehr als eine haben möchten."
 
-#: Model/Server.php:1839
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr "Der Index in dem Logs gespeichert werden sollen"
 
-#: Model/Server.php:1847
+#: Model/Server.php:1912
 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:1855
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr "Name des Bucket in den hochgeladen wird"
 
-#: Model/Server.php:1863
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr "Region in welcher der S3-Bucket ist"
 
-#: Model/Server.php:1871
+#: Model/Server.php:1936
 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:1879
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr "Geheimer AWS Schlüssel für das Hochladen von Samples"
 
-#: Model/Server.php:1887
+#: Model/Server.php:1952
 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:1896
+#: Model/Server.php:1961
 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:1904
+#: Model/Server.php:1969
 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:1912
+#: Model/Server.php:1977
 msgid "Enable SightingDB integration."
 msgstr ""
 
-#: Model/Server.php:1920
+#: Model/Server.php:1985
 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:1930
+#: Model/Server.php:1995
 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:1939
+#: Model/Server.php:2004
 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:1948
+#: Model/Server.php:2013
 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:1957
+#: Model/Server.php:2022
 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 "Wenn diese Einstellung aktiviert ist, ist die Authentifizierung nur mit dem benutzerdefinierten Header. Alternativ können Sie im gemischten Modus ausführen, der Benutzer über den Header einloggt, wenn er gefunden wird, andernfalls werden Benutzer zur normalen Login-Seite weitergeleitet."
 
-#: Model/Server.php:1966
+#: Model/Server.php:2031
 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 "Wenn Sie ein externes Werkzeug verwenden, um sich mit MISP zu authentifizieren und nur die URL des Werkzeugs als gültiger Eintragspunkt zulassen möchten, dann setzen Sie dieses Feld. "
 
-#: Model/Server.php:1975
+#: Model/Server.php:2040
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr "Der Name der Authentifizierungsmethode, dies ist nur kosmetisch und wird auf der Seite zur Benutzererstellung und -protokolle angezeigt."
 
-#: Model/Server.php:1984
+#: Model/Server.php:2049
 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:1992
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr "Aktivieren/Deaktivieren der Enrichtment Services"
 
-#: Model/Server.php:2000
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr "Timeout für die Enrichment Services"
 
-#: Model/Server.php:2008
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr "Aktivieren/Deaktivieren der Import Services"
 
-#: Model/Server.php:2016
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr "Timeout für die Import-Services"
 
-#: Model/Server.php:2024
+#: Model/Server.php:2089
 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:2032
+#: Model/Server.php:2097
 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:2040
+#: Model/Server.php:2105
 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:2048
+#: Model/Server.php:2113
 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:2056
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr "Aktivieren/Deaktivieren der Export Services"
 
-#: Model/Server.php:2064
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr "Timeout für die Export-Services"
 
-#: Model/Server.php:2072
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr "Aktiviere/deaktiviere den schwebenden Überlauf von Informationen aus den Anreicherungsmodulen"
 
-#: Model/Server.php:2080
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr "Timeout für Tooltips (hover services)"
 
-#: Model/Server.php:2088
+#: Model/Server.php:2153
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "Die Url, die verwendet wird, um auf die Anreicherungsdienste zuzugreifen. Standardmäßig ist sie unter http://127.0.0.1:6666 verfügbar"
 
-#: Model/Server.php:2096
+#: Model/Server.php:2161
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Der Port, der für den Zugriff auf die Anreicherungsdienste verwendet wird. Standardmäßig ist er auf 127.0.0.1:6666 zugegriffen"
 
-#: Model/Server.php:2104
+#: Model/Server.php:2169
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr "Die Url, die verwendet wird, um auf Cortex zuzugreifen. Standardmäßig ist sie unter http://cortex-url erreichbar"
 
-#: Model/Server.php:2112
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr "Der Port, der verwendet wird, um auf Cortex zuzugreifen. Standardmäßig ist dies Port 9000"
 
-#: Model/Server.php:2120
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr "Aktiviere/Deaktiviere die Cortex-Dienste"
 
-#: Model/Server.php:2128
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "Legen Sie einen Authentifizierungsschlüssel fest, der an Cortex übergeben werden soll"
 
-#: Model/Server.php:2137
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr "Setze ein Timeout für die Cortex-Dienste"
 
-#: Model/Server.php:2145
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr "Auf 'falsch' setzen, um die SSL-Überprüfung zu deaktivieren. Nicht empfohlen."
 
-#: Model/Server.php:2154
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr "Auf 'falsch' setzen, wenn der Hostname bei der Validierung von Zertifikaten auf Fehler trifft."
 
-#: Model/Server.php:2163
+#: Model/Server.php:2228
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr "Auf \"Richtig\" setzen, damit selbstsignierte Zertifikate akzeptiert werden können. Dies setzt die Aktivierung von Cortex_ssl_verify_peer voraus."
 
-#: Model/Server.php:2172
+#: Model/Server.php:2237
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr "Legen Sie den absoluten Pfad der Zertifikatsautoritätsdatei fest, die Sie zur Überprüfung von SSL-Zertifikaten verwenden möchten."
 
-#: Model/Server.php:2181
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr "Geben Sie Ihren benutzerdefinierten Authentifizierungsbenutzern eine externe URL zum Authentifizierungssystem, um ihre Passwörter zurückzusetzen."
 
-#: Model/Server.php:2190
+#: Model/Server.php:2255
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr "Geben Sie eine benutzerdefinierte Logout-URL für Ihre Benutzer an, die sie mit dem von Ihnen verwendeten Authentifizierungssystem abmelden."
 
-#: Model/Server.php:2200
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr "Der Debug-Level der Instanz verwendet immer 0 für produktive Instanzen."
 
-#: Model/Server.php:2209
+#: Model/Server.php:2274
 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 "Der Debug-Level der Instanz für Site-Admins. Diese Funktion erlaubt es Site-Administratoren, den Debug-Modus in einer Live-Instanz auszuführen, ohne ihn anderen Benutzern zugänglich zu machen. Die ausführlichste Option für Debug und site_admin_debug wird für Site-Administratoren verwendet."
 
-#: Model/Server.php:2376
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr "Fehlgeschlagen (teilweise?) wegen Validierungsfehler: "
 
-#: Model/Server.php:2380
+#: Model/Server.php:2445
 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 "Eine Änderung an einem lokal erstellten Ereignis wurde blockiert. Dies kann passieren, wenn ein synchronisiertes Ereignis, das in dieser Instanz erstellt wurde, von einem Administrator auf der Remote-Seite geändert wurde."
 
-#: Model/Server.php:2407
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr "Leeres Ereignis erkannt."
 
-#: Model/Server.php:2413
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr "konnte das Ereignis nicht herunterladen"
 
-#: Model/Server.php:2492
+#: Model/Server.php:2557
 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:2494
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr "Entschuldigung, die Entwickler von MISP waren zu faul dies zu entwickeln;P"
 
-#: Model/Server.php:2495
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr "Beim Versenden der E-Mails ist etwas schief gegangen"
 
-#: Model/Server.php:2507;2509
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr "Unbekanntes Problem."
 
-#: Model/Server.php:3049
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr "Ein- oder Ausschalten des %s Moduls."
 
-#: Model/Server.php:3052
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr "Das %s Modul auf die angegebene Organisation beschränken."
 
-#: Model/Server.php:3060
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr "Setzen Sie die spezifische Einstellung für dieses Modul."
 
-#: Model/Server.php:3175
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr "Wert wurde nicht gesetzt."
 
-#: Model/Server.php:3196
+#: Model/Server.php:3281
 msgid "Invalid language."
 msgstr ""
 
-#: Model/Server.php:3217
+#: Model/Server.php:3302
 msgid "Invalid tag_collection."
 msgstr ""
 
-#: Model/Server.php:3225
+#: Model/Server.php:3310
 msgid "This setting has to be a number."
 msgstr ""
 
-#: Model/Server.php:3237
+#: Model/Server.php:3322
 msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
 msgstr ""
 
-#: Model/Server.php:3519
+#: Model/Server.php:3619
 msgid "Invalid file path or file not accessible."
 msgstr ""
 
-#: Model/Server.php:3522
+#: Model/Server.php:3622
 msgid "File has to be in .pem format."
 msgstr ""
 
-#: Model/Server.php:3888
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr "Etwas ist schief gelaufen. MISP versuchte eine fehlerhafte Konfigurationsdatei zu speichern. Änderung wurde rückgängig gemacht."
 
-#: Model/Server.php:4020
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr "Logos der Organisationen"
 
-#: Model/Server.php:4021
+#: Model/Server.php:4121
 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:4023
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr "48x48 Pixel png-Dateien"
 
-#: Model/Server.php:4026;4041
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
 msgstr "Dateiname muss im folgenden Format sein: *.png"
 
-#: Model/Server.php:4030
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr "Zusätzliche Bilder"
 
-#: Model/Server.php:4031
+#: Model/Server.php:4131
 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:4038
+#: Model/Server.php:4138
 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:4128
+#: Model/Server.php:4228
 msgid "Invalid server."
 msgstr ""
 
-#: Model/Server.php:4159
+#: Model/Server.php:4259
 msgid "Response was empty."
 msgstr ""
 
-#: Model/Server.php:4235
+#: Model/Server.php:4335
 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:4501
+#: Model/Server.php:4604
 msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
 msgstr ""
 
-#: Model/Server.php:4571
+#: Model/Server.php:4675
 msgid "Can't check database schema for Postgres database type"
 msgstr ""
 
-#: Model/Server.php:4588
+#: Model/Server.php:4692
 msgid "Table `%s` does not exist"
 msgstr ""
 
-#: Model/Server.php:4615
+#: Model/Server.php:4719
 msgid "Column `%s` exists but should not"
 msgstr ""
 
-#: Model/Server.php:4648
+#: Model/Server.php:4752
 msgid "Column `%s` is different"
 msgstr ""
 
-#: Model/Server.php:4658
+#: Model/Server.php:4762
 msgid "Column `%s` does not exist but should"
 msgstr ""
 
-#: Model/Server.php:4671
+#: Model/Server.php:4775
 msgid "Table `%s` is an additional table"
 msgstr ""
 
-#: Model/Server.php:4695
+#: Model/Server.php:4799
 msgid "Column `%s` should be indexed"
 msgstr ""
 
-#: Model/Server.php:4718
+#: Model/Server.php:4822
 msgid "Column `%s` is indexed but should not"
 msgstr ""
 
-#: Model/Server.php:5141
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr "Gestorbenen Arbeitsprozess entfernen."
 
-#: Model/Server.php:5142
+#: Model/Server.php:5253
 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:5146
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr "Einen Arbeitsprozess anhalten."
 
-#: Model/Server.php:5147
+#: Model/Server.php:5258
 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"
 
-#: Model/Server.php:5449
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr "Ungültiges Submodul."
 
-#: Model/Server.php:5449;5478
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr "unbekannt"
 
-#: Model/Server.php:5461
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr "aktualisiere_nach_pull"
 
-#: Model/Server.php:5462
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr "Aktualisiere: "
 
-#: Model/Server.php:5593
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr "Ungültiger Worker."
 
-#: Model/Server.php:5600
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr "Hintergrundarbeiter nicht aktiviert."
 
-#: Model/Server.php:5607
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr "Ungültiger Worker Typ."
 
-#: Model/Server.php:5787
+#: Model/Server.php:5911
 msgid "Could not reset the remote authentication key."
 msgstr ""
 
-#: Model/Server.php:5864
+#: Model/Server.php:5988
 msgid "Could not parse JSON: "
 msgstr ""
 
-#: Model/Server.php:5884
+#: Model/Server.php:6008
 msgid "Could not reset fetch remote user account."
 msgstr ""
 
-#: Model/Server.php:5906
+#: Model/Server.php:6030
 msgid "No user object received in response."
 msgstr ""
 
@@ -5201,6 +5473,10 @@ msgstr ""
 msgid "API key reset by administrator"
 msgstr ""
 
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
 #: Model/DecayingModelsFormulas/Polynomial.php:7
 msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
 msgstr ""
@@ -5233,7 +5509,7 @@ msgstr "hat die folgenden abhängigen Elemente"
 
 #: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Attribut hinzufügen"
@@ -5260,8 +5536,8 @@ msgstr ""
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
 #: View/Events/add.ctp:33
-#: View/Feeds/add.ctp:178
-#: View/Feeds/edit.ctp:179
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
 #: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
@@ -5270,7 +5546,7 @@ msgstr "Sharing-Gruppe"
 #: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -5286,15 +5562,15 @@ msgstr "Kontextuelles Kommentar"
 msgid "for Intrusion Detection System"
 msgstr "für Intrusion Detection System (IDS)"
 
-#: View/Attributes/add.ctp:154
+#: View/Attributes/add.ctp:155
 msgid "Timezone missing, auto-detected as: "
 msgstr ""
 
-#: View/Attributes/add.ctp:155
+#: View/Attributes/add.ctp:156
 msgid "The following value will be submited instead: "
 msgstr ""
 
-#: View/Attributes/add.ctp:163
+#: View/Attributes/add.ctp:164
 msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr ""
 
@@ -5355,10 +5631,13 @@ msgstr "Event-ID"
 #: View/DecayingModel/decaying_tool_rest_search.ctp:24
 #: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr "Org"
 
@@ -5417,7 +5696,7 @@ msgid "Values"
 msgstr "Werte"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:57
@@ -5439,7 +5718,7 @@ msgid "Replaceattributes"
 msgstr "Attribute ersetzen"
 
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:80
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Elements/view_galaxy_matrix.ctp:76;211
 #: View/Elements/genericElements/Form/submitButton.ctp:8;25
@@ -5467,7 +5746,7 @@ msgstr "Attribute ersetzen"
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:67
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/UserSettings/set_setting.ctp:36
-#: View/Users/admin_add.ctp:97
+#: View/Users/admin_add.ctp:98
 #: View/Users/admin_edit.ctp:91
 #: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
@@ -5479,7 +5758,7 @@ msgid "Submit"
 msgstr "Einreichen"
 
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
 #: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/exportSearch.ctp:32
@@ -5488,6 +5767,7 @@ msgstr "Einreichen"
 #: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
 #: View/Elements/view_galaxy_matrix.ctp:212
+#: View/Elements/genericElements/infoModal.ctp:40
 #: View/Elements/genericElements/Form/submitButton.ctp:13
 #: View/Elements/serverRuleElements/pull.ctp:73
 #: View/Elements/serverRuleElements/push.ctp:72
@@ -5578,7 +5858,7 @@ msgstr "Warnung: Sie sind dabei, Daten freizugeben, die als vertraulich eingestu
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
 #: View/Users/statistics_data.ctp:19
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr "Attribute"
 
@@ -5629,10 +5909,7 @@ msgstr "Resultate aller Attribute"
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -5657,7 +5934,6 @@ msgstr "Resultate aller Attribute"
 #: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:32;106
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -5680,10 +5956,7 @@ msgstr "zurück"
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -5708,7 +5981,6 @@ msgstr "zurück"
 #: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:34;108
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -5737,7 +6009,6 @@ msgstr "Datum"
 #: View/Elements/global_menu.ctp:94
 #: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr "Galaxien"
@@ -5775,7 +6046,7 @@ msgstr "Sichtungen"
 #: View/Attributes/index.ctp:62
 #: View/Elements/eventattribute.ctp:166
 #: View/Events/view.ctp:262
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr "Aktivität"
@@ -5785,7 +6056,7 @@ msgstr "Aktivität"
 #: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/genericElements/IndexTable/headers.ctp:31
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -5794,10 +6065,7 @@ msgstr "Aktivität"
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -5833,10 +6101,7 @@ msgstr "Aktionen"
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -5861,7 +6126,6 @@ msgstr "Aktionen"
 #: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:99
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -5952,13 +6216,12 @@ msgstr "Sind Sie sicher, dass Sie Attribut #%s weich-löschen möchten? Das Attr
 #: View/Elements/Events/eventIndexTable.ctp:234
 #: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:597
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -5975,106 +6238,6 @@ msgstr "Sind Sie sicher, dass Sie Attribut #%s weich-löschen möchten? Das Attr
 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
-#: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: 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:92
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
-#: 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 "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
-#: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
-#: 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:92
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
-#: 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 "Nein"
-
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
@@ -6108,9 +6271,10 @@ msgstr "Aktuelle Einstellungen nicht ändern"
 #: View/Events/resolved_attributes.ctp:51
 #: View/Events/resolved_misp_format.ctp:98;293
 #: View/Events/view.ctp:159
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:171
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
+#: View/Feeds/index.ctp:184
 #: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
 #: View/Objects/revise_object.ctp:35;69
@@ -6126,23 +6290,27 @@ msgstr "Distribution"
 msgid "For Intrusion Detection System"
 msgstr "Für Intrusion Detection System (IDS)"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 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
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr "Tags zu <b>entfernen</b>"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr "Tags <b>hinzuzufügen</b>"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr "Tags zu <b>entfernen</b>"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr "Cluster zu <b>hinzufügen</b>"
 
@@ -6232,12 +6400,16 @@ msgid "Unvetted"
 msgstr ""
 
 #: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
 #: View/EventBlacklists/index.ctp:35
 #: View/EventDelegations/index.ctp:41
 #: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
 #: View/Feeds/preview_index.ctp:25
 #: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
 #: View/ObjectTemplates/index.ctp:47
 #: View/Organisations/index.ctp:75
 #: View/Servers/preview_index.ctp:64
@@ -6245,31 +6417,41 @@ msgstr ""
 #: View/Sightingdb/index.ctp:10
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:81
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
 msgid "Filter"
 msgstr ""
 
 #: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
 #: View/Elements/eventattributetoolbar.ctp:231
 #: View/EventBlacklists/index.ctp:36
 #: View/EventDelegations/index.ctp:42
 #: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
 #: View/Feeds/preview_index.ctp:26
 #: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
 #: View/ObjectTemplates/index.ctp:48
 #: View/Organisations/index.ctp:76
 #: View/Servers/preview_index.ctp:65
 #: View/ShadowAttributes/index.ctp:38
 #: View/Sightingdb/index.ctp:11
-#: View/Users/admin_index.ctp:82
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
 msgid "Enter value to search"
 msgstr "Zu suchende Wert eingeben"
 
 #: View/Communities/index.ctp:34
 #: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
 #: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
 #: View/Feeds/search_caches.ctp:35
 #: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
 #: View/ObjectTemplates/view.ctp:3
 #: View/Organisations/view.ctp:5
 #: View/Pages/doc/administration.ctp:180;221;236
@@ -6278,7 +6460,9 @@ msgstr "Zu suchende Wert eingeben"
 #: View/Taxonomies/view.ctp:4
 #: View/Templates/view.ctp:4
 #: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
 #: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
 #: View/Users/view.ctp:3
 #: View/Warninglists/view.ctp:9
 msgid "Id"
@@ -6297,6 +6481,8 @@ msgid "Community name"
 msgstr ""
 
 #: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
 #: View/DecayingModel/index.ctp:89
 #: View/DecayingModel/view.ctp:21
 #: View/Elements/Servers/View/row_object.ctp:24
@@ -6310,8 +6496,10 @@ msgstr ""
 #: View/Elements/templateElements/templateRowAttribute.ctp:21
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
 #: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:22;113;210
 #: View/Objects/group_attributes_into_object.ctp:8
@@ -6333,10 +6521,18 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
 msgid "Communities index"
 msgstr ""
 
-#: View/Communities/index.ctp:64
+#: View/Communities/index.ctp:72
 msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
 msgstr ""
 
@@ -6405,9 +6601,11 @@ msgid "Message:"
 msgstr ""
 
 #: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
 #: View/Elements/Events/View/row_object.ctp:72
 #: View/Events/resolved_misp_format.ctp:93;288
-#: View/GalaxyClusters/view.ctp:19
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
 #: View/ObjectTemplates/index.ctp:66
 #: View/ObjectTemplates/view.ctp:6
 #: View/Objects/revise_object.ctp:68
@@ -6424,16 +6622,19 @@ msgid "UUID"
 msgstr "UUID"
 
 #: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
 #: View/DecayingModel/index.ctp:88
 #: View/DecayingModel/view.ctp:14
 #: View/Elements/Servers/View/row_object.ctp:19
 #: View/Elements/templateElements/templateRowAttribute.ctp:12
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
 #: View/Feeds/search_caches.ctp:47
 #: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
 #: View/ObjectTemplates/view.ctp:4
 #: View/Objects/add.ctp:206
 #: View/Objects/revise_object.ctp:27
@@ -6445,7 +6646,7 @@ msgstr "UUID"
 #: View/SharingGroups/view.ctp:42;67
 #: View/Sightingdb/index.ctp:51
 #: View/Templates/view.ctp:9
-#: View/Users/statistics_orgs.ctp:31
+#: View/Users/statistics_orgs.ctp:33
 #: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "Name"
@@ -6469,7 +6670,7 @@ msgstr ""
 #: View/Users/admin_edit.ctp:64
 #: View/Users/admin_view.ctp:72
 #: View/Users/edit.ctp:23
-#: View/Users/view.ctp:31
+#: View/Users/view.ctp:32
 msgid "GnuPG key"
 msgstr "GnuPG-Schlüssel"
 
@@ -6478,10 +6679,105 @@ msgid "Community "
 msgstr ""
 
 #: View/Communities/view.ctp:51
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:617
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
 msgid "Request Access"
 msgstr ""
 
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
 #: View/DecayingModel/add.ctp:4
 msgid " Decaying Model"
 msgstr ""
@@ -6596,8 +6892,8 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/EventBlacklists/edit.ctp:37
 #: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:200
-#: View/Feeds/index.ctp:282
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
 #: View/News/index.ctp:22
 #: View/OrgBlacklists/edit.ctp:30
 #: View/OrgBlacklists/index.ctp:36
@@ -6689,6 +6985,7 @@ msgstr ""
 #: View/Events/show_i_o_c_results.ctp:12
 #: View/Feeds/freetext_index.ctp:32
 #: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
 #: View/Objects/revise_object.ctp:64
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
@@ -6700,7 +6997,7 @@ msgstr ""
 #: 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:36
+#: View/Users/statistics_orgs.ctp:38
 #: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr "Typ"
@@ -6714,6 +7011,7 @@ msgstr "Typ"
 #: View/Events/resolved_misp_format.ctp:92;287
 #: View/Events/show_i_o_c_results.ctp:13
 #: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
 #: View/Noticelists/view.ctp:42
 #: View/Objects/add.ctp:115
 #: View/Objects/group_attributes_into_object.ctp:58
@@ -6734,12 +7032,14 @@ msgstr ""
 #: View/DecayingModel/decaying_tool_rest_search.ctp:31
 #: View/Events/resolved_attributes.ctp:52
 #: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
 #: View/ObjectReferences/ajax/add.ctp:30
 #: View/Objects/add.ctp:67;119
 #: View/Objects/group_attributes_into_object.ctp:30
 #: View/Objects/revise_object.ctp:49;67
 #: View/Pages/doc/using_the_system.ctp:234;284
 #: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
 msgid "Comment"
 msgstr ""
 
@@ -6758,7 +7058,7 @@ msgid "Decaying Model RestSearch"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_simulation.ctp:45
-#: View/Events/automation.ctp:14
+#: View/Events/automation.ctp:24
 #: View/Logs/admin_index.ctp:20;21
 #: View/Logs/admin_search.ctp:25
 msgid "Search"
@@ -6836,7 +7136,7 @@ msgstr ""
 #: View/Elements/genericElements/org_picker.ctp:17
 #: View/EventBlacklists/add.ctp:36
 #: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
+#: View/Feeds/add.ctp:220
 #: View/Feeds/import_feeds.ctp:20
 #: View/OrgBlacklists/add.ctp:29
 #: View/Regexp/admin_add.ctp:32
@@ -6913,7 +7213,7 @@ msgstr ""
 
 #: View/DecayingModel/index.ctp:97
 #: View/DecayingModel/view.ctp:25
-#: View/Galaxies/view.ctp:22
+#: View/Galaxies/view.ctp:10
 #: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
 #: View/Warninglists/view.ctp:12
@@ -6923,6 +7223,7 @@ msgstr "Version"
 #: View/DecayingModel/index.ctp:98
 #: View/DecayingModel/view.ctp:31
 #: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
 #: View/Feeds/view.ctp:63
 #: View/Noticelists/index.ctp:63
 #: View/ObjectTemplates/index.ctp:35
@@ -7036,7 +7337,6 @@ msgstr "Alle anzeigen"
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr "Alle auswählen"
 
@@ -7103,6 +7403,8 @@ msgstr "Alle Attribute anzeigen"
 
 #: View/Elements/eventattributetoolbar.ctp:6
 #: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
@@ -7140,7 +7442,7 @@ msgstr "Nur potentielle falsch-positiv Attribute anzeigen"
 
 #: View/Elements/eventattributetoolbar.ctp:41
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr "Warnung"
@@ -7252,11 +7554,9 @@ msgstr "%s aktive Regel(n)"
 
 #: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: View/Logs/admin_index.ctp:62
 #: View/Servers/preview_index.ctp:57
 #: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:74
 msgid "Remove filters"
 msgstr "Filter entfernen"
 
@@ -7445,14 +7745,14 @@ msgid "Event Actions"
 msgstr "Ereignisaktionen"
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:221;264
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr "Events auflisten"
 
 #: View/Elements/global_menu.ctp:18
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:226;270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
 #: View/Events/add.ctp:7
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
@@ -7460,80 +7760,80 @@ msgid "Add Event"
 msgstr "Event hinzufügen"
 
 #: View/Elements/global_menu.ctp:23
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:289
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr "Attribute auflisten"
 
 #: View/Elements/global_menu.ctp:27
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:294
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr "Attribute suchen"
 
 #: View/Elements/global_menu.ctp:31
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr "REST-Client"
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:310
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "Vorschläge anzeigen"
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr "Events mit Vorschlägen"
 
 #: View/Elements/global_menu.ctp:47
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:320
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
 msgid "View delegation requests"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:861
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "Tags auflisten"
 
 #: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr "Tag-Sammlungen auflisten"
 
 #: View/Elements/global_menu.ctp:61
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:866
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr "Tag hinzufügen"
 
 #: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:895
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr "Taxonomien auflisten"
 
 #: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:923
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "Vorlagen auflisten"
 
 #: View/Elements/global_menu.ctp:74
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:928
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "Vorlage hinzufügen"
 
 #: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
@@ -7541,7 +7841,7 @@ msgid "Export"
 msgstr "Exportieren"
 
 #: View/Elements/global_menu.ctp:86
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -7551,7 +7851,7 @@ msgid "Automation"
 msgstr "Automatisierung"
 
 #: View/Elements/global_menu.ctp:98
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1086
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr "Galaxien auflisten"
 
@@ -7579,7 +7879,7 @@ msgid "Signature Whitelist"
 msgstr "Signatur-Whitelist"
 
 #: View/Elements/global_menu.ctp:128
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:378
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr "Warninglist anzeigen"
 
@@ -7600,45 +7900,45 @@ msgid "News"
 msgstr "Neuigkeiten"
 
 #: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Mein Profil"
 
 #: View/Elements/global_menu.ctp:151
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
 msgid "My Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:155
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:467;699
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
 msgid "Set Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:159
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:471
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "Dashboard"
 
 #: View/Elements/global_menu.ctp:168
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:490
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "Rollen und Berechtigungen"
 
 #: View/Elements/global_menu.ctp:175
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1130
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr "Objektvorlagen anzeigen"
 
 #: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:507
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr "Freigabegruppen auflisten"
 
 #: View/Elements/global_menu.ctp:186
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr "Freigabegruppe hinzufügen"
 
@@ -7647,12 +7947,12 @@ msgid "Decaying Models Tool"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:199
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:977
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
 msgid "List Decaying Models"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:206
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:520
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
@@ -7664,12 +7964,12 @@ msgid "Categories & Types"
 msgstr "Kategorien & Typen"
 
 #: View/Elements/global_menu.ctp:214
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr "Nutzungsbedingungen"
 
 #: View/Elements/global_menu.ctp:218
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:528
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -7699,28 +7999,28 @@ msgid "Sync Actions"
 msgstr "Sync-Aktionen"
 
 #: View/Elements/global_menu.ctp:240
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:536
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr "Sync Konfiguration erstellen"
 
 #: View/Elements/global_menu.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:542
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr "Server Einstellungen importieren"
 
 #: View/Elements/global_menu.ctp:250
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "Server auflisten"
 
 #: View/Elements/global_menu.ctp:255
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:998
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr "Feeds auflisten"
 
 #: View/Elements/global_menu.ctp:260
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr "Suche Feed-Caches"
 
@@ -7733,7 +8033,7 @@ msgid "Add SightingDB Connection"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:612
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
 msgid "List Communities"
 msgstr ""
 
@@ -7748,7 +8048,7 @@ msgid "Administration"
 msgstr "Administration"
 
 #: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:687
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Benutzer auflisten"
@@ -7763,93 +8063,97 @@ msgid "Set User Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:300
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:682
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr "Benutzer hinzufügen"
 
 #: View/Elements/global_menu.ctp:304
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:704
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "Benutzer kontaktieren"
 
-#: View/Elements/global_menu.ctp:311
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:477;739
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr "Organisationen anzeigen"
 
-#: View/Elements/global_menu.ctp:315
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr "Organisationen hinzufügen"
 
-#: View/Elements/global_menu.ctp:322
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "Rollen auflisten"
 
-#: View/Elements/global_menu.ctp:326
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr "Rollen hinzufügen"
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr "Servereinstellungen & Wartung"
 
-#: View/Elements/global_menu.ctp:343
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:768
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "Jobs"
 
-#: View/Elements/global_menu.ctp:352
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:774
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:361
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr "Sperrlistenereignis"
 
-#: View/Elements/global_menu.ctp:366
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr "Event-Blacklisten verwalten"
 
-#: View/Elements/global_menu.ctp:375
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr "Organisationen blacklisten"
 
-#: View/Elements/global_menu.ctp:380
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr "Org Blacklists verwalten"
 
-#: View/Elements/global_menu.ctp:388
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "Audit"
 
-#: View/Elements/global_menu.ctp:392
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "Logs auflisten"
 
-#: View/Elements/global_menu.ctp:396
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:811
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "Logs durchsuchen"
 
-#: View/Elements/global_menu.ctp:424
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "Ausloggen"
@@ -7872,7 +8176,8 @@ msgstr "Attribute per Organisation"
 
 #: View/Elements/view_event_distribution_graph.ctp:9
 #: View/Elements/view_timeline.ctp:23
-#: View/Layouts/default.ctp:92
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "Lädt"
@@ -7907,7 +8212,6 @@ msgstr "Anzeigen"
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:67
 msgid "Filters"
 msgstr "Filtern"
 
@@ -7934,6 +8238,7 @@ msgid "Time scope"
 msgstr ""
 
 #: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
 #: View/Taxonomies/view.ctp:83
 msgid "Tag"
 msgstr ""
@@ -7965,7 +8270,6 @@ msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr "Alle Datensätze der aktuellen Seite selektieren"
 
@@ -8022,7 +8326,9 @@ msgstr "#Beiträge"
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr "Email"
@@ -8033,8 +8339,6 @@ msgstr "Email"
 #: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
 #: View/Events/proposal_event_index.ctp:45;49
 #: View/Feeds/preview_index.ctp:73
-#: View/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
@@ -8060,7 +8364,7 @@ msgid "NEW"
 msgstr "NEU"
 
 #: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr "Event veröffentlichen"
 
@@ -8074,7 +8378,7 @@ msgid "Not published"
 msgstr "Nicht veröffentlicht"
 
 #: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;364;431;598;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
 #: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr "Möchten Sie # %s wirklich löschen?"
@@ -8281,11 +8585,11 @@ msgstr "Hexadezimale Darstellung"
 msgid "Switch to binary representation"
 msgstr "Wechseln zur binären Darstellung"
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr "Achtung, dies scheint nicht korrekt zu sein "
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr " wert"
 
@@ -8388,11 +8692,11 @@ msgstr "Status"
 #: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
 #: View/Events/view.ctp:191
-#: View/GalaxyClusters/view.ctp:32
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
 #: View/Users/admin_view.ctp:95
 msgid "N/A"
@@ -8426,8 +8730,10 @@ msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
@@ -8441,15 +8747,17 @@ msgstr "Letztes Login"
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
 #: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr "Erstellt"
 
 #: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 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:660
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 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."
 
@@ -8486,488 +8794,599 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
-msgid "Populate From Template"
-msgstr "Aus Vorlage befüllen"
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
+msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
-msgid "Enrichment Module Result"
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+msgid "Populate From Template"
+msgstr "Aus Vorlage befüllen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+msgid "Enrichment Module Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr "Ergebnisse des Freitext-Imports"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr "Event anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;887;1116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr "Korrelations-Graph anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr "Event-Verlauf anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
 #: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr "Event bearbeiten"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr "Event löschen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr "Objekt hinzufügen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr "Anhang hinzufügen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr "Befüllen aus..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr "Event anreichern"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr "Attribute übernehmen von..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr "Attribute vorschlagen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr "Anhang vorschlagen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr "Veröffentlichen (ohne Email)"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
 msgid "Publish Sightings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr "Veröffentlichung delegieren"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr "Delegationsanfrage akzeptieren"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr "Delegationsanfrage verwerfen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr "Event via ZMQ veröffentlichen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:200
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:208
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr "Reporter kontaktieren"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:216;303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
 msgstr "Herunterladen als..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239;244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:251
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr "Importieren aus…"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr "Reguläre Ausdrücke auflisten"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr "Neuer regulärer Ausdruck"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:351
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr "Auf Bestehende ausführen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:352
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:359
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr "Regulären Ausdruck bearbeiten"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr "Regulären Ausdruck löschen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr "Warninglist anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr "Warninglist aktualisieren"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:385
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:393
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr "Noticelists anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:403
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr "Noticelists aktualisieren"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:404
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:414
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr "Whitelist anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:419
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr "Neue Whitelist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr "Whitelist bearbeiten"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:430
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr "Whitelist löschen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:440
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr "Mein Profil bearbeiten"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:451;649
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr "Passwort zurücksetzen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:484;733
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr "Organisationen anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:496
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr "Sharing-Gruppe bearbeiten"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr "Sharing-Gruppe anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:551;581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr "Server per Fernzugriff erkunden"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:559
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr "Event per Fernzugriff ansehen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570;1056
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr "Event abholen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:571;1057
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:589
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
 #: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr "Server bearbeiten"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:622
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
 msgid "View community"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:630
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
 msgid "Request E-mail"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:642
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr "Benutzer anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:654
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr "Benutzer bearbeiten"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr "Benutzer löschen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:668
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr "Rolle bearbeiten"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr "Rolle löschen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:694
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
 msgid "User settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:712
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr "Organisation hinzufügen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr "Organisation bearbeiten"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:726
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr "Organisation zusammenfügen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:745
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr "Rolle hinzufügen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:781
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr "Blacklists Event"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:793
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr "Blacklists Organisation"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:820;834
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr "Thread anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:825
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr "Beitrag hinzufügen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:839
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr "Beitrag editieren"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr "Threads anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:849
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr "Neuer Thread"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:857
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr "Bevorzugte Tags anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:873
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr "Tag bearbeiten"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:881;900
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr "Taxonomie anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:908
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr "Taxonomie löschen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:915
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:935
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr "Vorlage ansehen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:941
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:952
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
 msgid "Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
 msgid "Force Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:962
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
 msgid "Import Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:967
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
 msgid "Add Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:971
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
 msgid "Decaying Tool"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
 msgid "View Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:989
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
 msgid "Edit Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1007
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1018
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1023
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1036
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1042
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1048
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1066
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr "News anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1071
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1077
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1092
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr "Galaxien aktualisieren"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1093
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1098
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1099
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1106;1122
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr "Galaxy anzeigen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1135
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1141
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1149
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
 #: View/Sightingdb/add.ctp:6
 msgid "Add SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1157
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
 msgid "Edit SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1162
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
 msgid "List SightingDB connections"
 msgstr ""
 
@@ -8997,7 +9416,7 @@ msgid "Fix Database Index Schema"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
 msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
 msgstr ""
 
@@ -9005,7 +9424,7 @@ msgstr ""
 msgid "The current database schema does not match the expected format."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;131
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
 msgid "Database schema diagnostic: "
 msgstr ""
 
@@ -9033,52 +9452,52 @@ msgstr ""
 msgid "Actual schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:118
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
 msgid "Fix Database schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:130
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
 msgid "The current database is correct"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:141
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
 msgid "Expected DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:145
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
 msgid "The current database version matches the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:146;151
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
 msgid "Actual DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:150
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
 msgid "The current database version does not match the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
 msgid "Updates are locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158;162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
 msgid "Updates are not locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 #: View/Servers/update_progress.ctp:32
 msgid "Updates are locked due to to many update fails"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 msgid "Updates unlocked in %s"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:167;168
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
 msgid "DataSource: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:203
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
 msgid "Column diagnostic"
 msgstr ""
 
@@ -9740,7 +10159,7 @@ msgstr ""
 #: View/TagCollections/index.ctp:14
 #: View/UserSettings/index.ctp:56
 #: View/Users/admin_view.ctp:109
-#: View/Users/view.ctp:58
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr ""
 
@@ -9785,7 +10204,7 @@ msgid "Start a worker"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
+msgid "Restart dead workers"
 msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
@@ -9942,10 +10361,6 @@ msgstr ""
 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
@@ -10131,7 +10546,7 @@ msgid "Recipient"
 msgstr ""
 
 #: View/EventDelegations/index.ctp:82
-#: View/Events/automation.ctp:269;276
+#: View/Events/automation.ctp:279;286
 #: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
@@ -10355,477 +10770,475 @@ msgstr ""
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 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."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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/automation.ctp:27
 #: 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
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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
+#: View/Events/automation.ctp:32
 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
+#: View/Events/automation.ctp:33
 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/automation.ctp:34
 #: 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/automation.ctp:35
 #: 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/automation.ctp:36
 #: 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/automation.ctp:37
 #: 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/automation.ctp:38
 #: 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/automation.ctp:39
 #: 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;150
+#: View/Events/automation.ctp:40;160
 #: 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;151
+#: View/Events/automation.ctp:41;161
 #: 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/automation.ctp:42
 #: 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/automation.ctp:43
 #: 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/automation.ctp:44
 #: 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/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:46
 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/automation.ctp:47
 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/automation.ctp:48
 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/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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/automation.ctp:52
 #: 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/automation.ctp:53
 #: 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
+#: View/Events/automation.ctp:54
 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
+#: View/Events/automation.ctp:55
 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
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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:81
+#: View/Events/automation.ctp:91
 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:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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:97
+#: View/Events/automation.ctp:107
 #: 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:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr "Bro IDS Export"
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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:118
+#: View/Events/automation.ctp:128
 #: 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:136
+#: View/Events/automation.ctp:146
 #: 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:138
+#: View/Events/automation.ctp:148
 #: 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:145
+#: View/Events/automation.ctp:155
 #: 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:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:152
+#: View/Events/automation.ctp:162
 #: 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:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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:156
+#: View/Events/automation.ctp:166
 #: 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:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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:172
+#: View/Events/automation.ctp:182
 #: 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:173
+#: View/Events/automation.ctp:183
 #: 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:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:187
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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:191
+#: View/Events/automation.ctp:201
 #: 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:192
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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:205
+#: View/Events/automation.ctp:215
 #: 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:206
+#: View/Events/automation.ctp:216
 #: 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:207
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:208
+#: View/Events/automation.ctp:218
 #: 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:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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:214
+#: View/Events/automation.ctp:224
 #: 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:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: 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:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr "HTTP"
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:74
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -10833,200 +11246,200 @@ msgstr "HTTP"
 msgid "URL"
 msgstr "URL"
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
 #: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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:291
+#: View/Events/automation.ctp:301
 #: 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:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:309
+#: View/Events/automation.ctp:319
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:310
+#: View/Events/automation.ctp:320
 #: 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:311
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:324
 #: 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:315
+#: View/Events/automation.ctp:325
 #: 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:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 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:322
+#: View/Events/automation.ctp:332
 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:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -11222,7 +11635,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -11274,18 +11687,18 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 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:54
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr ""
 
@@ -11319,6 +11732,11 @@ msgstr ""
 msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
+#: View/Events/legacy_automation.ctp:7
+msgid "Your current key is: <code>%s</code>.\n"
+"    You can %s this key."
+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 ""
@@ -11771,7 +12189,6 @@ msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -11912,6 +12329,7 @@ msgid "View request details"
 msgstr ""
 
 #: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
 #: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr ""
@@ -12073,7 +12491,7 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: View/Feeds/index.ctp:105
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -12107,78 +12525,81 @@ msgstr ""
 msgid "Add MISP Feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:5
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
+msgstr ""
+
+#: View/Feeds/add.ctp:12
 msgid "Add a new MISP feed source."
 msgstr ""
 
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
+#: View/Feeds/add.ctp:14
 #: View/Feeds/view.ctp:64
 msgid "Caching enabled"
 msgstr ""
 
-#: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr ""
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:21
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr ""
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
 #: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:26
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr ""
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:66
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr ""
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:75
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:79
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr ""
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:38
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr ""
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:42
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr ""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:46
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr ""
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:50
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr "Username"
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:54
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -12187,127 +12608,126 @@ msgstr "Username"
 msgid "Password"
 msgstr "Passwort"
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:58
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr ""
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:88
-msgid "Target Event"
-msgstr ""
-
 #: View/Feeds/add.ctp:94
 #: View/Feeds/edit.ctp:98
-msgid "Target Event ID"
-msgstr ""
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:100
-msgid "Leave blank unless you want to reuse an existing event."
+msgid "Creator organisation"
 msgstr ""
 
 #: View/Feeds/add.ctp:104
 #: View/Feeds/edit.ctp:108
-msgid "Value field(s) in the CSV"
+msgid "Target Event"
 msgstr ""
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:109
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr ""
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:111
-msgid "2,3,4 (column position separated by commas)"
-msgstr ""
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:119
-msgid "Delimiter"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
 msgstr ""
 
 #: View/Feeds/add.ctp:116
 #: View/Feeds/edit.ctp:120
-msgid "Set the default CSV delimiter (default = \",\")"
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr ""
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr ""
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
 msgstr ""
 
 #: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:130
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr ""
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr ""
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
+msgid "Set the default CSV delimiter (default = \",\")"
+msgstr ""
+
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr ""
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:131
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr ""
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:141
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr ""
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 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:148
-#: View/Feeds/edit.ctp:150
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr ""
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:151
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:160
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr ""
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:161
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr ""
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr ""
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:193
-msgid "Filter rules"
-msgstr ""
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:194
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:195
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:196
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:197
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:198
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
 #: View/Servers/add.ctp:116
 #: View/Servers/edit.ctp:155;162
 msgid "Modify"
@@ -12325,64 +12745,64 @@ msgstr ""
 msgid "Edit MISP Feed"
 msgstr ""
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr ""
 
-#: View/Feeds/edit.ctp:133
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr ""
 
-#: View/Feeds/edit.ctp:213
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr ""
 
-#: View/Feeds/edit.ctp:214
+#: View/Feeds/edit.ctp:234
 #: View/Servers/add.ctp:146
 #: View/Servers/edit.ctp:190
 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:215
+#: View/Feeds/edit.ctp:235
 #: View/Servers/add.ctp:147
 #: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
-#: View/Feeds/edit.ctp:216
+#: View/Feeds/edit.ctp:236
 #: View/Servers/add.ctp:148
 #: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:217
+#: View/Feeds/edit.ctp:237
 #: View/Servers/add.ctp:149
 #: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
-#: View/Feeds/edit.ctp:218
+#: View/Feeds/edit.ctp:238
 #: View/Servers/add.ctp:150
 #: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:219
+#: View/Feeds/edit.ctp:239
 #: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:220
+#: View/Feeds/edit.ctp:240
 #: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:221
+#: View/Feeds/edit.ctp:241
 #: View/Servers/edit.ctp:196
 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:222
+#: View/Feeds/edit.ctp:242
 #: View/Servers/add.ctp:154
 #: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
@@ -12412,137 +12832,128 @@ msgstr ""
 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:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr ""
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr ""
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr ""
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr ""
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: 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/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr ""
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:55
-#: View/Servers/index.ctp:120;121
-msgid "Rules"
+msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
+#: View/Feeds/index.ctp:196
+msgid "Visible"
 msgstr ""
 
 #: View/Feeds/index.ctp:211
-msgid "New fixed event"
+msgid "Feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:141
-msgid "Age: "
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
 msgstr ""
 
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:149
-msgid "Not cached"
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr ""
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:283
-msgid "Are you sure you want to permanently remove the feed (%s)?"
+#: View/Feeds/index.ctp:294
+msgid "Are you sure you want to permanently remove the feed?"
 msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -12595,26 +13006,39 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr "Version"
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
 #: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr ""
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr ""
 
-#: View/Galaxies/view.ctp:29
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr ""
 
@@ -12622,33 +13046,30 @@ msgstr ""
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:23
-#: 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/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -12657,22 +13078,16 @@ msgstr ""
 msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
 msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
@@ -12683,6 +13098,27 @@ msgstr ""
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Inbox/index.ctp:31
+#: 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/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr ""
@@ -12703,12 +13139,6 @@ msgstr ""
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr ""
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr ""
@@ -12746,6 +13176,11 @@ msgstr ""
 msgid "Job type"
 msgstr ""
 
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
+msgstr ""
+
 #: View/Jobs/index.ctp:106
 #: View/Pages/doc/administration.ctp:229
 msgid "Retries"
@@ -12827,6 +13262,7 @@ msgstr ""
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
 #: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -12834,13 +13270,6 @@ msgstr ""
 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"
@@ -12891,10 +13320,6 @@ msgstr ""
 msgid "geographical_area"
 msgstr ""
 
-#: View/Noticelists/index.ctp:35
-msgid "version"
-msgstr "Version"
-
 #: View/Noticelists/index.ctp:36
 #: View/Pages/doc/using_the_system.ctp:371
 msgid "enabled"
@@ -13462,7 +13887,7 @@ msgstr ""
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr ""
 
@@ -13496,12 +13921,12 @@ msgid "Last modified"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:37
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:35
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr ""
 
@@ -14043,7 +14468,7 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:76
+#: View/Users/admin_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -14054,7 +14479,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -14067,7 +14492,7 @@ 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr ""
 
@@ -14120,6 +14545,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -15434,10 +15860,6 @@ msgstr ""
 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 ""
@@ -17219,10 +17641,6 @@ msgstr ""
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:164
-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 ""
@@ -17603,10 +18021,6 @@ msgstr ""
 msgid "Distribution List"
 msgstr ""
 
-#: View/SharingGroups/view.ctp:12
-msgid "Selectable"
-msgstr ""
-
 #: View/SharingGroups/view.ctp:28
 msgid "Synced by"
 msgstr ""
@@ -17615,10 +18029,6 @@ msgstr ""
 msgid "Quick Search"
 msgstr ""
 
-#: View/Sightingdb/index.ctp:55
-msgid "Owner"
-msgstr ""
-
 #: View/Sightingdb/index.ctp:61
 msgid "Host"
 msgstr ""
@@ -17779,6 +18189,11 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+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 ""
@@ -18119,6 +18534,45 @@ msgstr ""
 msgid "Are you sure you wish to delete this entry?"
 msgstr ""
 
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr ""
@@ -18176,12 +18630,12 @@ msgstr ""
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr ""
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr "Diesen Useraccount deaktivieren"
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
@@ -18191,7 +18645,7 @@ msgstr ""
 
 #: View/Users/admin_edit.ctp:69
 #: View/Users/admin_view.ctp:69
-#: View/Users/view.ctp:29
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr ""
 
@@ -18294,30 +18748,68 @@ msgstr ""
 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_index.ctp:7
+#: View/Users/admin_index.ctp:3
 msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
 msgstr ""
 
-#: View/Users/admin_index.ctp:10
+#: View/Users/admin_index.ctp:6
 msgid "here"
 msgstr ""
 
-#: View/Users/admin_index.ctp:13;14
+#: View/Users/admin_index.ctp:9;10
 msgid "Reset all sync user API keys"
 msgstr ""
 
-#: View/Users/admin_index.ctp:17
+#: View/Users/admin_index.ctp:13
 msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
 msgstr ""
 
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -18330,11 +18822,6 @@ msgstr ""
 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"
@@ -18353,7 +18840,7 @@ msgid "Org_admin"
 msgstr ""
 
 #: View/Users/admin_view.ctp:68
-#: View/Users/view.ctp:28
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr ""
 
@@ -18362,22 +18849,22 @@ msgid "Password change"
 msgstr ""
 
 #: View/Users/admin_view.ctp:78
-#: View/Users/view.ctp:37
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr ""
 
 #: View/Users/admin_view.ctp:83
-#: View/Users/view.ctp:42
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr ""
 
 #: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:49
+#: View/Users/view.ctp:50
 msgid "S/MIME Public certificate"
 msgstr ""
 
 #: View/Users/admin_view.ctp:119
-#: View/Users/view.ctp:64
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr ""
 
@@ -18393,10 +18880,102 @@ msgstr ""
 msgid "SMIME Public certificate (PEM format)"
 msgstr ""
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr ""
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr ""
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+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"
@@ -18412,6 +18991,13 @@ msgstr ""
 msgid "Proposals active"
 msgstr ""
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr ""
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -18467,15 +19053,15 @@ msgstr ""
 msgid "A heatmap showing the usage of %s."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:38
+#: View/Users/statistics_orgs.ctp:40
 msgid "Activity (1 year)"
 msgstr ""
 
@@ -18531,6 +19117,14 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -18689,6 +19283,7 @@ msgid "boolean"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/Dashboard.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
diff --git a/app/Locale/fra/LC_MESSAGES/default.po b/app/Locale/fra/LC_MESSAGES/default.po
index 984d81759..82cc6b84b 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: 2020-04-24 02:08\n"
+"PO-Revision-Date: 2021-03-26 04:21\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -9,8 +9,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: fr\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: fr_FR\n"
 
 #: Console/Command/AdminShell.php:72
diff --git a/app/Locale/ita/LC_MESSAGES/default.po b/app/Locale/ita/LC_MESSAGES/default.po
index 625f449e7..992da9986 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: 2020-04-24 01:14\n"
+"PO-Revision-Date: 2021-03-26 04:21\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -9,8 +9,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: it\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: it_IT\n"
 
 #: Console/Command/AdminShell.php:72
@@ -71,7 +73,8 @@ msgid "MISP mass sync authkey reset command line tool.\n\n"
 msgstr ""
 
 #: Console/Command/AdminShell.php:536
-#: Controller/UsersController.php:1234
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
 msgid "Invalid user."
 msgstr ""
 
@@ -100,7 +103,7 @@ msgstr ""
 #: Console/Command/EventShell.php:15
 #: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1122;1606;1691;2221;2297;2301;2305;2433;2530;2585;2633;2705;2795;3128;5252;5474;5478;5487
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
 #: Model/Galaxy.php:293
 msgid "Invalid event"
@@ -127,51 +130,51 @@ msgstr "modalità verbosa"
 msgid "interactive mode"
 msgstr "modalità interattiva"
 
-#: Controller/AppController.php:377
+#: Controller/AppController.php:382
 msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
 msgstr ""
 
-#: Controller/AppController.php:377
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
 msgid "Update Progress"
 msgstr ""
 
-#: Controller/AppController.php:384
+#: Controller/AppController.php:389
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
 msgstr "Qualcosa è andato storto. L'account utente con cui lei loggato non esiste più."
 
-#: Controller/AppController.php:502
+#: Controller/AppController.php:519
 msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
 msgstr ""
 
-#: Controller/AppController.php:710
-#: Controller/AttributesController.php:1876;1985;2089
-#: Controller/EventsController.php:3260
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 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:719
-#: Controller/AttributesController.php:2093
-#: Controller/EventsController.php:3264
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr "Devi essere autenticato per farlo."
 
-#: Controller/AppController.php:735
+#: Controller/AppController.php:764
 #: Controller/Component/IndexFilterComponent.php:23
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr "Specificare i termini di ricerca nella url, o inviare via POST un json con i parametri di filtro."
 
-#: Controller/AppController.php:873
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Fatto. attribute_count generato da zero per "
 
-#: Controller/AppController.php:996
-#: Controller/AttributesController.php:2147
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
 #: Controller/ShadowAttributesController.php:1267
 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/AppController.php:1178
+#: Controller/AppController.php:1211
 msgid "RestSearch is not implemented (yet) for this scope."
 msgstr ""
 
@@ -184,19 +187,19 @@ msgstr "ID evento non specificato."
 msgid "You do not have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:132;422;602;832;3127;3142
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:2092;2113;2147
+#: Controller/EventsController.php:2107;2128;2162
 #: Controller/ObjectsController.php:837
-#: Model/Attribute.php:4304;4308
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "Non hai il permesso di farlo."
 
-#: Controller/AttributesController.php:345;800;805;824;1032;1121;2163;2177;2210;2232;2800;2811;2817;2886;3024;3036;3040
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
 #: Controller/ObjectsController.php:641
 #: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
 #: Controller/TagsController.php:506
-#: Model/Attribute.php:4296
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "Attributo non valido"
 
@@ -210,7 +213,7 @@ msgid "Attribute not an attachment or malware-sample"
 msgstr "L'attributo non è un allegato o un campione malware"
 
 #: Controller/AttributesController.php:419;586;892;1348
-#: Controller/EventsController.php:4414;4428;5201;5215
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "Evento non valido."
 
@@ -260,7 +263,7 @@ msgid "Invalid event id."
 msgstr "ID evento non valido."
 
 #: Controller/AttributesController.php:1072
-#: Controller/EventsController.php:2451
+#: Controller/EventsController.php:2466
 #: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "Inserimento non valido."
@@ -285,7 +288,7 @@ msgstr "Attributo eliminato"
 msgid "Attribute was not deleted"
 msgstr "L'attributo non è stato eliminato"
 
-#: Controller/AttributesController.php:1281;2634
+#: Controller/AttributesController.php:1281;2675
 #: Controller/ShadowAttributesController.php:853
 msgid "Invalid Attribute"
 msgstr "Attributo non valido"
@@ -306,104 +309,104 @@ msgstr "Questo metodo è accessibile solo via richiesta AJAX."
 msgid "You are not authorized to edit this event."
 msgstr "Non sei autorizzato a modificare questo evento."
 
-#: Controller/AttributesController.php:1516
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "Nessun ID evento fornito."
 
-#: Controller/AttributesController.php:1561
-#: Controller/GalaxiesController.php:243
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "Sinonimi: "
 
-#: Controller/AttributesController.php:1871;1978
+#: Controller/AttributesController.php:1912;2019
 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:1884
+#: Controller/AttributesController.php:1925
 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:1904
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "Non hai accesso a quell'evento."
 
-#: Controller/AttributesController.php:1967
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "Nessuna corrispondenza."
 
-#: Controller/AttributesController.php:1989;1998
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Attributo invalido oppure non autorizzato a visualizzarlo."
 
-#: Controller/AttributesController.php:2124
+#: Controller/AttributesController.php:2165
 #: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "Fatto. "
 
-#: Controller/AttributesController.php:2156;2203
+#: Controller/AttributesController.php:2197;2244
 #: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "Campo richiesto non valido."
 
-#: Controller/AttributesController.php:2159;2206
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "Questa funzione è accessibile solo tramite AJAX."
 
-#: Controller/AttributesController.php:2241
+#: Controller/AttributesController.php:2282
 msgid "You do not have permission to do that"
 msgstr ""
 
-#: Controller/AttributesController.php:2271;2279
-#: Controller/EventsController.php:3643;3796;4999
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 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:2300
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "Questo metodo è accessibile solo via richiesta AJAX."
 
-#: Controller/AttributesController.php:2309;2560;2574;2585
-#: Controller/OrganisationsController.php:432
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
 #: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "Non sei autorizzato a farlo."
 
-#: Controller/AttributesController.php:2414
-#: Controller/EventsController.php:4207
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "Questa funzionalità richiede accesso con chiave API."
 
-#: Controller/AttributesController.php:2422
+#: Controller/AttributesController.php:2463
 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:2434
+#: Controller/AttributesController.php:2475
 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:2595
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "Script non valido."
 
-#: Controller/AttributesController.php:2662
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr "Nessuna opzione di enrichment trovata per questo attributo."
 
-#: Controller/AttributesController.php:2760
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "Tipo richiesto non valido."
 
-#: Controller/AttributesController.php:2823;3030
+#: Controller/AttributesController.php:2864;3071
 #: Controller/TagCollectionsController.php:254
 msgid "Invalid tag"
 msgstr ""
 
-#: Controller/AttributesController.php:3120
-#: Controller/EventsController.php:5197
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Disabilitare la correlazione non è consentito su questa istanza."
 
-#: Controller/AttributesController.php:3124;3139
+#: Controller/AttributesController.php:3165;3180
 #: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "Attributo non valido."
@@ -420,6 +423,63 @@ msgstr ""
 msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
 msgstr ""
 
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
 #: Controller/DecayingModelController.php:20
 msgid "Default decaying models updated"
 msgstr ""
@@ -585,452 +645,456 @@ msgstr "ID evento non valido."
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr "Impossibile cancellare l'evento dalla lista nera. Errore: "
 
-#: Controller/EventsController.php:879
+#: Controller/EventsController.php:894
 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:881
+#: Controller/EventsController.php:896
 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:887
+#: Controller/EventsController.php:902
 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:889
+#: Controller/EventsController.php:904
 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:1716
+#: Controller/EventsController.php:1731
 msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1927
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr "Non hai il permesso di creare eventi"
 
-#: Controller/EventsController.php:1933
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr "Nessun dato evento valido ricevuto."
 
-#: Controller/EventsController.php:1969
+#: Controller/EventsController.php:1984
 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:1973;1977
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
 msgstr "Sharing Group non valido o non autorizzato."
 
-#: Controller/EventsController.php:2001
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr "Evento bloccato dalla blacklist locale."
 
-#: Controller/EventsController.php:2014;2101;2377
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "L'evento è stato salvato"
 
-#: Controller/EventsController.php:2022
+#: Controller/EventsController.php:2037
 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:2028
+#: Controller/EventsController.php:2043
 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:2030;2380
+#: Controller/EventsController.php:2045;2395
 msgid "The event could not be saved. Please, try again."
 msgstr "L'evento non può essere salvato. Si prega di riprovare."
 
-#: Controller/EventsController.php:2079
+#: Controller/EventsController.php:2094
 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'evento creato sarà visibile alle organizzazioni che hanno un account su questa istanza, ma non verrà sincronizzato con altre istanza MISP fin quando non verrà pubblicato."
 
-#: Controller/EventsController.php:2127
+#: Controller/EventsController.php:2142
 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:2128
+#: Controller/EventsController.php:2143
 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:2189
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr "Il file STIX è stato importato, sono stati creati i seguenti eventi: "
 
-#: Controller/EventsController.php:2192
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr "Il file STIX è stato importato importato."
 
-#: Controller/EventsController.php:2195
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr "Impossibile importare il file STIX: "
 
-#: Controller/EventsController.php:2202
+#: Controller/EventsController.php:2217
 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:2226;2311
+#: Controller/EventsController.php:2241;2326
 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:2234
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr "ID evento non valido."
 
-#: Controller/EventsController.php:2239
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr "Non sei autorizzato a visualizzare l'evento."
 
-#: Controller/EventsController.php:2536;2640;2711
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr "Non hai l'autorizzazione per farlo."
 
-#: Controller/EventsController.php:2545
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr "Evento non pubblico."
 
-#: Controller/EventsController.php:2652;2722
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr "Impossibile pubblicare l'evento - nessun tag per le tassonomie richieste: %s"
 
-#: Controller/EventsController.php:2804
+#: Controller/EventsController.php:2819
 msgid "You must specify a message."
 msgstr ""
 
-#: Controller/EventsController.php:2823
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr "Email inviata al segnalante."
 
-#: Controller/EventsController.php:2832
+#: Controller/EventsController.php:2847
 msgid "Sending of email failed."
 msgstr ""
 
-#: Controller/EventsController.php:2883
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr "Attenzione, hai effettuato l'accesso come amministratore, ogni estrazione dati generata conterrà dati non filtrati. Se si desidera effettuare un'estrazione per la propria organizzazione si prega di effettuare l'accesso con un account differente."
 
-#: Controller/EventsController.php:2971
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr "Questa funzionalità è al momento disabilitata"
 
-#: Controller/EventsController.php:3097
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr "Nome file non consentito."
 
-#: Controller/EventsController.php:3117
+#: Controller/EventsController.php:3134
 msgid "Problem with writing the IoC file. Please report to site admin."
 msgstr ""
 
-#: Controller/EventsController.php:3211
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr "File MISP XML non valido."
 
-#: Controller/EventsController.php:3253
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr "Non ancora implementato"
 
-#: Controller/EventsController.php:3271;3275
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr "Evento non valido o utente non autorizzato."
 
-#: Controller/EventsController.php:3467
+#: Controller/EventsController.php:3484
 #: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr "Tag non valido."
 
-#: Controller/EventsController.php:3483
+#: Controller/EventsController.php:3500
 #: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr "Tag già inserito nell'evento."
 
-#: Controller/EventsController.php:3497
+#: Controller/EventsController.php:3514
 msgid "Tag is not allowed due to taxonomy exclusivity settings"
 msgstr ""
 
-#: Controller/EventsController.php:3528;3534
+#: Controller/EventsController.php:3545;3551
 #: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr "Tag aggiunto(i)."
 
-#: Controller/EventsController.php:3530
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr "Il tag non può essere aggiunto."
 
-#: Controller/EventsController.php:3536
+#: Controller/EventsController.php:3553
 #: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr "Tutte le tag sono già presenti, nulla da aggiungere."
 
-#: Controller/EventsController.php:3800;5003;5025;5532;5536
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
 #: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "Evento non valido."
 
-#: Controller/EventsController.php:3855;3885;3901
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr "Non hai l'autorizzazione per farlo."
 
-#: Controller/EventsController.php:3966;4106
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr "ID invalido"
 
-#: Controller/EventsController.php:3970;4110;4685
+#: Controller/EventsController.php:3987;4128;4703
 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:4116
+#: Controller/EventsController.php:4134
 msgid "Freetext Import"
 msgstr ""
 
-#: Controller/EventsController.php:4122
+#: Controller/EventsController.php:4140
 msgid "Populate using a Template"
 msgstr ""
 
-#: Controller/EventsController.php:4128
+#: Controller/EventsController.php:4146
 msgid "OpenIOC Import"
 msgstr ""
 
-#: Controller/EventsController.php:4133
+#: Controller/EventsController.php:4151
 msgid "ThreatConnect Import"
 msgstr ""
 
-#: Controller/EventsController.php:4138
+#: Controller/EventsController.php:4156
 msgid "(Experimental) Forensic analysis - Mactime"
 msgstr ""
 
-#: Controller/EventsController.php:4157
+#: Controller/EventsController.php:4175
 msgid "MISP standard (recommended exchange format - lossless)"
 msgstr ""
 
-#: Controller/EventsController.php:4163
+#: Controller/EventsController.php:4181
 msgid "STIX 1.1.1 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4168
+#: Controller/EventsController.php:4186
 msgid "STIX 2.0 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4210;4217
+#: Controller/EventsController.php:4228;4235
 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:4246
+#: Controller/EventsController.php:4264
 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:4254
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "Evento non trovato"
 
-#: Controller/EventsController.php:4277
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "Evento non trovato."
 
-#: Controller/EventsController.php:4287
+#: Controller/EventsController.php:4305
 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:4312
+#: Controller/EventsController.php:4330
 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:4451;4472;4531;4556;4581;4611;4632
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr "Tipo non valido."
 
-#: Controller/EventsController.php:4750
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr "Metodo invalido."
 
-#: Controller/EventsController.php:4832
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr "I servizi %s non sono abilitati."
 
-#: Controller/EventsController.php:4836
+#: Controller/EventsController.php:4854
 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:4841
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr "Nessuna opzione %s valida trovata per questo attributo."
 
-#: Controller/EventsController.php:4896;4942
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr "Servizio %s non raggiungibile."
 
-#: Controller/EventsController.php:4908
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr ": Arricchito tramite "
 
-#: Controller/EventsController.php:4959
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ": Arricchito tramite %s"
 
-#: Controller/EventsController.php:5114
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr "Servizio Import non raggiungibile."
 
-#: Controller/EventsController.php:5204;5218
+#: Controller/EventsController.php:5222;5236
 #: Controller/PostsController.php:60;84
 #: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
 msgid "You don't have permission to do that."
 msgstr "Non hai il permesso per farlo."
 
-#: Controller/EventsController.php:5345
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr "ID non valido."
 
-#: Controller/EventsController.php:5393
+#: Controller/EventsController.php:5411
 #: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr "Evento non valido"
 
-#: Controller/EventsController.php:5414
+#: Controller/EventsController.php:5432
 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."
 
-#: Controller/EventsController.php:5665
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr "%s evento(i) cancellato(i)."
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr "Non hai i privilegi richiesti per farlo."
 
-#: Controller/FeedsController.php:241;340
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr "Feed inserito."
 
-#: Controller/FeedsController.php:249
-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:291
+msgid "Feed could not be added. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:274;375;397;526;567;778
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr "Feed non valido."
 
-#: Controller/FeedsController.php:348
-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:399
+msgid "Feed could not be updated. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:371
-#: Controller/OrganisationsController.php:237
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
 #: Controller/SharingGroupsController.php:237
-#: Controller/UsersController.php:1015
+#: Controller/UsersController.php:1044
 msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:404;530
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "Il feed è disabilitato al momento. Assicurarsi di abilitarlo."
 
-#: Controller/FeedsController.php:417;483
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr "Avvia recupero dati dal Feed."
 
-#: Controller/FeedsController.php:428
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr "Pull messo in coda per esecuzione in background."
 
-#: Controller/FeedsController.php:433;435
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr "Recupero dati dal feed fallita."
 
-#: Controller/FeedsController.php:439;500
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr "Recupero dati dal feed terminato con successo."
 
-#: Controller/FeedsController.php:512
+#: Controller/FeedsController.php:563
 msgid "No feed enabled."
 msgstr ""
 
-#: Controller/FeedsController.php:536;555
+#: Controller/FeedsController.php:587;606
 #: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr "Download fallito."
 
-#: Controller/FeedsController.php:543
+#: Controller/FeedsController.php:594
 msgid "Event added."
 msgstr "Evento aggiunto."
 
-#: Controller/FeedsController.php:546
+#: Controller/FeedsController.php:597
 msgid "Event already up to date."
 msgstr "Evento già aggiornato."
 
-#: Controller/FeedsController.php:548
+#: Controller/FeedsController.php:599
 msgid "Event updated."
 msgstr "Evento aggiornato."
 
-#: Controller/FeedsController.php:552
+#: Controller/FeedsController.php:603
 msgid "Could not %s event."
 msgstr "Impossibile %s l'evento."
 
-#: Controller/FeedsController.php:649
+#: Controller/FeedsController.php:700
 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:688;739
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr "Tipo feed non valido."
 
-#: Controller/FeedsController.php:784;816
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr "Impossibile scaricare l'evento selezionato"
 
-#: Controller/FeedsController.php:814
+#: Controller/FeedsController.php:865
 msgid "This event is blocked by the Feed filters."
 msgstr "Questo evento è bloccato dai filtri Feed."
 
-#: Controller/FeedsController.php:852;856
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr "Feed non valido."
 
-#: Controller/FeedsController.php:877
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr "Sono ammesse solo richiesta POST."
 
-#: Controller/FeedsController.php:881
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr "File non trovato."
 
-#: Controller/FeedsController.php:890
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr "Dati estratti."
 
-#: Controller/FeedsController.php:892
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "Impossibile estrarre i dati selezionati. Motivo: %s"
 
-#: Controller/FeedsController.php:909
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr "Avviato il caching del feed."
 
-#: Controller/FeedsController.php:924
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr "Caching dei feed fallito."
 
-#: Controller/FeedsController.php:927
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr "Il caching dei feed è stato completato con successo."
 
-#: Controller/FeedsController.php:961
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr "Ricevuta lista feed invalida."
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr "Tutti i clusters"
 
-#: Controller/GalaxiesController.php:174
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr "Tutti i namespace"
 
-#: Controller/GalaxiesController.php:304
+#: Controller/GalaxiesController.php:337
 msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:307
+#: Controller/GalaxiesController.php:340
 msgid "Failed to parse request."
 msgstr "Impossibile interpretare la richiesta."
 
@@ -1113,7 +1177,7 @@ msgid "Object could not be saved."
 msgstr ""
 
 #: Controller/ObjectsController.php:373;1006
-#: Model/Event.php:6171
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr "Oggetto non valido."
 
@@ -1181,43 +1245,43 @@ msgstr "Organizzazione aggiunta con successo."
 msgid "The organisation could not be added."
 msgstr "Impossibile aggiungere l'organizzazione."
 
-#: Controller/OrganisationsController.php:156;289;295
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr "Organizzazione non valida."
 
-#: Controller/OrganisationsController.php:162;242;248;301;328;361
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
 msgid "Invalid organisation"
 msgstr "Organizzazione non valida"
 
-#: Controller/OrganisationsController.php:201
+#: Controller/OrganisationsController.php:208
 msgid "Organisation updated."
 msgstr "Organizzazione aggiornata."
 
-#: Controller/OrganisationsController.php:216
+#: Controller/OrganisationsController.php:223
 msgid "The organisation could not be updated."
 msgstr "Impossibile aggiornare l'organizzazione."
 
-#: Controller/OrganisationsController.php:265
+#: Controller/OrganisationsController.php:272
 msgid "Organisation deleted"
 msgstr "Organizzazione cancellata"
 
-#: Controller/OrganisationsController.php:272
+#: Controller/OrganisationsController.php:279
 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 "Le organizzazioni non dovrebbero essere cancellate. In generale le organizzazioni non dovrebbero mai essere cancellate, piuttosto considera la possibilità di spostarle nella lista delle organizzazioni esterne. Se sei sicuro di voler rimuovere un'organizzazione e sei al corrente dell'impatto, accertati che non ci siano utenti o eventi legati a questa, prima di cancellarla."
 
-#: Controller/OrganisationsController.php:366
+#: Controller/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr "Pagina principale non creata per questa organizzazione."
 
-#: Controller/OrganisationsController.php:415
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr "Questa azione è riservata agli utenti sync"
 
-#: Controller/OrganisationsController.php:437
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr "L'organizzazione è stata fusa con successo."
 
-#: Controller/OrganisationsController.php:440
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr "Errore durante la fusione delle organizzazioni. Per avere maggiori informazioni a riguardo, si consultino i log di audit. Se si vogliono annullare le modifiche, è possibile farlo con un file .sql recuperato"
 
@@ -1349,7 +1413,7 @@ msgstr "L'organizzazione non può essere creata in quanto l'Uuid è già in uso.
 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:350;532;2154
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr "Server salvato"
 
@@ -1357,8 +1421,8 @@ msgstr "Server salvato"
 msgid "The server could not be saved. Please, try again."
 msgstr "Il server non è stato salvato. Si prega di riprovare."
 
-#: Controller/ServersController.php:411;608;653;656;665;729;735;1489;1506
-#: Model/Server.php:5737
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "Server non valido"
 
@@ -1366,7 +1430,7 @@ msgstr "Server non valido"
 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:604;2171;2213
+#: Controller/ServersController.php:604;2183;2225
 msgid "This endpoint expects POST requests."
 msgstr ""
 
@@ -1565,79 +1629,79 @@ msgstr ""
 msgid "This setting can only be edited via the CLI."
 msgstr "Questa impostazione può essere modificata solo via CLI."
 
-#: Controller/ServersController.php:1365
+#: Controller/ServersController.php:1365;1377
 msgid "Restarting workers."
 msgstr ""
 
-#: Controller/ServersController.php:1389
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "File non trovato."
 
-#: Controller/ServersController.php:1395
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "Il file non può essere cancellato."
 
-#: Controller/ServersController.php:1418;1434
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr "Caricamento fallito."
 
-#: Controller/ServersController.php:1426
+#: Controller/ServersController.php:1438
 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/ServersController.php:1493
+#: Controller/ServersController.php:1505
 msgid "Invalid user or user not found."
 msgstr ""
 
-#: Controller/ServersController.php:2040
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr "Cache del server avviata."
 
-#: Controller/ServersController.php:2055
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr "Server caching fallito."
 
-#: Controller/ServersController.php:2058
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr "Il caching dei server è stato completato con successo."
 
-#: Controller/ServersController.php:2088
+#: Controller/ServersController.php:2100
 msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2097
+#: Controller/ServersController.php:2109
 msgid "Configured host org not found. Please make sure that the setting is current on the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2161
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr "Impossibile salvare il server. Errore: %s"
 
-#: Controller/ServersController.php:2182
+#: Controller/ServersController.php:2194
 msgid "API key updated."
 msgstr ""
 
-#: Controller/ServersController.php:2195
+#: Controller/ServersController.php:2207
 msgid "ID has to be a valid server connection"
 msgstr ""
 
-#: Controller/ServersController.php:2198
+#: Controller/ServersController.php:2210
 msgid "Invalid direction. Valid options: "
 msgstr ""
 
-#: Controller/ServersController.php:2202
+#: Controller/ServersController.php:2214
 msgid "Priority changed."
 msgstr ""
 
-#: Controller/ServersController.php:2205
+#: Controller/ServersController.php:2217
 msgid "Priority could not be changed."
 msgstr ""
 
-#: Controller/ServersController.php:2216
+#: Controller/ServersController.php:2228
 msgid "Only site admin accounts can release the update lock."
 msgstr ""
 
-#: Controller/ServersController.php:2226
+#: Controller/ServersController.php:2238
 msgid "Only site admin accounts get the DB schema diagnostic."
 msgstr ""
 
@@ -1968,164 +2032,174 @@ msgstr "Evento popolato, "
 msgid "Event populated, but "
 msgstr "Evento popolato, ma "
 
-#: Controller/UserSettingsController.php:123;312
+#: Controller/UserSettingsController.php:129;276
 msgid "Invalid ID passed."
 msgstr ""
 
-#: Controller/UserSettingsController.php:133;137;322;326
+#: Controller/UserSettingsController.php:139;143;286;290
 msgid "Invalid user setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:151;192;278;290
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
 msgid "Invalid setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:155;196;330
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
 msgid "This setting is restricted and requires the following permission(s): %s"
 msgstr ""
 
-#: Controller/UserSettingsController.php:189
-msgid "This endpoint expects both a setting and a value to be set."
-msgstr ""
-
-#: Controller/UserSettingsController.php:229
+#: Controller/UserSettingsController.php:193
 msgid "Setting saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:242
+#: Controller/UserSettingsController.php:206
 msgid "Setting could not be saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:337
+#: Controller/UserSettingsController.php:301
 msgid "Setting deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:345
+#: Controller/UserSettingsController.php:309
 msgid "Setting could not be deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:358
+#: Controller/UserSettingsController.php:322
 msgid "Expecting POST or DELETE request."
 msgstr ""
 
-#: Controller/UsersController.php:42;310
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr "Utente non valido o non autorizzato."
 
-#: Controller/UsersController.php:62;538;786;805;1030
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "Utente non valido"
 
-#: Controller/UsersController.php:150;693;858
+#: Controller/UsersController.php:154;722;887
 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: "
 
-#: Controller/UsersController.php:202
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr "Il profilo è stato aggiornato"
 
-#: Controller/UsersController.php:207
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr "Non è stato possibile aggiornare il profilo. Si prega di riprovare."
 
-#: Controller/UsersController.php:247
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr "Password non valida. Si prega di inserire la tua password corrente per continuare."
 
-#: Controller/UsersController.php:256
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr "Inserire la password attuale per continuare."
 
-#: Controller/UsersController.php:276
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "Password modificata."
 
-#: Controller/UsersController.php:285
+#: Controller/UsersController.php:299
 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:422;440;547
-#: Model/Log.php:370
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr "Redatto"
 
-#: Controller/UsersController.php:704
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr "L'utente non può essere salvato. Organizzazione non valida."
 
-#: Controller/UsersController.php:726
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "L'utente è stato salvato."
 
-#: Controller/UsersController.php:735;966
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr "L'utente non può essere salvato. Si prega di riprovare."
 
-#: Controller/UsersController.php:958
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "L'utente è stato salvato"
 
-#: Controller/UsersController.php:1038
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "Utente cancellato"
 
-#: Controller/UsersController.php:1042
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "Utente non cancellato"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "Nome utente o password non validi, riprovare"
 
-#: Controller/UsersController.php:1208
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr "Arrivederci"
 
-#: Controller/UsersController.php:1230
-msgid "Invalid action."
-msgstr ""
-
-#: Controller/UsersController.php:1237
-msgid "New authkey generated."
-msgstr "Nuova chiave API generata."
-
-#: Controller/UsersController.php:1248
+#: Controller/UsersController.php:1273;1297
 msgid "This functionality is only accessible via POST requests."
 msgstr ""
 
-#: Controller/UsersController.php:1252
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
+msgid "New authkey generated."
+msgstr "Nuova chiave API generata."
+
+#: Controller/UsersController.php:1301
 msgid "Job initiated."
 msgstr ""
 
-#: Controller/UsersController.php:1254
+#: Controller/UsersController.php:1303
 msgid "%s authkeys reset, %s could not be reset."
 msgstr ""
 
-#: Controller/UsersController.php:1368
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr "Hai accettato i Termini e le Condizioni."
 
-#: Controller/UsersController.php:1496
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr "Email destinatario non inserita"
 
-#: Controller/UsersController.php:1501
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr "Organizzazione destinataria non selezionata"
 
-#: Controller/UsersController.php:1538
+#: Controller/UsersController.php:1587
 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:1540
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr "E-mail inviate."
 
-#: Controller/UsersController.php:1614
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr "Utilizzo dati"
 
-#: Controller/UsersController.php:1615
+#: Controller/UsersController.php:1664
 #: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
@@ -2135,11 +2209,11 @@ msgstr "Utilizzo dati"
 msgid "Organisations"
 msgstr "Organizzazioni"
 
-#: Controller/UsersController.php:1616
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr "Statistiche utenti e organizzazioni"
 
-#: Controller/UsersController.php:1617
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
 #: View/DecayingModel/decaying_tool_rest_search.ctp:28
 #: View/Elements/eventattribute.ctp:151
@@ -2165,18 +2239,160 @@ msgstr "Statistiche utenti e organizzazioni"
 msgid "Tags"
 msgstr "Tag"
 
-#: Controller/UsersController.php:1618
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr "Istogramma attributo"
 
-#: Controller/UsersController.php:1619
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr "Classifica sightings"
 
-#: Controller/UsersController.php:1620
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr "Matrice Galaxy"
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "Sì"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "No"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr "Questa funzione non è accessibile via richiesta POST."
@@ -2257,11 +2473,11 @@ msgstr "Impossibile cancellare la warninglist."
 msgid "No valid data received."
 msgstr "Nessun dato valido ricevuto."
 
-#: Controller/Component/ACLComponent.php:614
+#: Controller/Component/ACLComponent.php:634
 msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:668
+#: Controller/Component/ACLComponent.php:688
 msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
 msgstr ""
 
@@ -2742,87 +2958,87 @@ msgstr ""
 msgid "Invalid %s."
 msgstr ""
 
-#: Model/AppModel.php:1416
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr "Indicizzazione "
 
-#: Model/AppModel.php:1430
+#: Model/AppModel.php:1480
 msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1452
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr "Quey SQL eseguita con successo per "
 
-#: Model/AppModel.php:1453
+#: Model/AppModel.php:1503
 msgid "The executed SQL query was: %s"
 msgstr ""
 
-#: Model/AppModel.php:1455
+#: Model/AppModel.php:1505
 msgid "Successfuly executed the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1466;1530
+#: Model/AppModel.php:1516;1580
 msgid "Issues executing the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr "La query SQL eseguita era: "
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr " Errore riscontrato: "
 
-#: Model/AppModel.php:1469
+#: Model/AppModel.php:1519
 msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1478
+#: Model/AppModel.php:1528
 msgid "However, as this error is whitelisted, the update went through."
 msgstr ""
 
-#: Model/AppModel.php:1497
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr "Indicizzato con successo "
 
-#: Model/AppModel.php:1500
+#: Model/AppModel.php:1550
 msgid "Failed to add index"
 msgstr ""
 
-#: Model/AppModel.php:1502
+#: Model/AppModel.php:1552
 msgid "The returned error is:"
 msgstr ""
 
-#: Model/AppModel.php:1531
+#: Model/AppModel.php:1581
 msgid "Database updates stopped as some errors occured and the stop flag is enabled."
 msgstr ""
 
-#: Model/AppModel.php:1690
+#: Model/AppModel.php:1740
 msgid "Invalid JSON."
 msgstr ""
 
-#: Model/AppModel.php:1783;1841
+#: Model/AppModel.php:1833;1891
 msgid "Issues executing run_updates"
 msgstr ""
 
-#: Model/AppModel.php:1784
+#: Model/AppModel.php:1834
 msgid "Database updates are locked. Worker not spawned"
 msgstr ""
 
-#: Model/AppModel.php:1788;1846;1881
+#: Model/AppModel.php:1838;1896;1931
 msgid "Update done"
 msgstr ""
 
-#: Model/AppModel.php:1842
+#: Model/AppModel.php:1892
 msgid "Updates are locked. Stopping worker gracefully"
 msgstr ""
 
-#: Model/AppModel.php:1861
+#: Model/AppModel.php:1911
 msgid "Running update %s"
 msgstr ""
 
-#: Model/AppModel.php:1887
+#: Model/AppModel.php:1937
 msgid "Update done in another worker. Gracefuly stopping."
 msgstr ""
 
@@ -3806,19 +4022,19 @@ msgstr "Il valore deve essere un numero superiore o uguale a 0."
 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:2278;2346
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr "Impossibile leggere l'utente."
 
-#: Model/Attribute.php:2282
+#: Model/Attribute.php:2301
 msgid "Invalid hash type."
 msgstr "Tipo hash non valido."
 
-#: Model/Attribute.php:2973
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr "Il campo è obbligatorio."
 
-#: Model/Attribute.php:3540
+#: Model/Attribute.php:3559
 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."
 
@@ -3838,6 +4054,10 @@ msgstr ""
 msgid "Community not found."
 msgstr ""
 
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
 #: Model/DecayingModel.php:162
 msgid "Models could not be loaded or default decaying models folder is empty"
 msgstr ""
@@ -3909,67 +4129,75 @@ msgstr ""
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5722
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr "Errore durante il caricamento del file stix. "
 
-#: Model/Event.php:5724
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr "Errore con la libreria maec. "
 
-#: Model/Event.php:5726
+#: Model/Event.php:5803
 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:5729
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr "Contattare l'amministratore per "
 
-#: Model/Event.php:5731
+#: Model/Event.php:5808
 msgid "Please "
 msgstr "Per favore "
 
-#: Model/Event.php:5733
+#: Model/Event.php:5810
 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:5765
+#: Model/Event.php:5842
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:5774
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr "%s non impostato"
 
-#: Model/Event.php:6023
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr "Impossibile aggiungere tag."
 
-#: Model/Event.php:6505
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:1444;1488
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1458
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Feed.php:1635
+#: Model/Feed.php:1687
 msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Feed.php:1638
+#: Model/Feed.php:1690
 msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
 msgstr ""
 
-#: Model/Feed.php:1643
+#: Model/Feed.php:1695
 msgid "Invalid user id."
 msgstr ""
 
-#: Model/Feed.php:1663
+#: Model/Feed.php:1715
 msgid "Events related to feed %s purged."
 msgstr ""
 
@@ -3977,1164 +4205,1208 @@ msgstr ""
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:1057
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
-#: Model/Server.php:140
+#: Model/Server.php:123
+msgid "Server unreachable"
+msgstr ""
+
+#: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
 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:141
+#: Model/Server.php:151
 msgid "Administering MISP via the CLI"
 msgstr "Amministrare MISP via CLI"
 
-#: Model/Server.php:153
+#: Model/Server.php:163
 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:154
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "Automatizzare certi processi di console"
 
-#: Model/Server.php:163
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:164
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:173
+#: Model/Server.php:183
 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:175
+#: Model/Server.php:185
 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:181
+#: Model/Server.php:191
 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 "Il base url dell'applicazione (nel formato https://www.mymispinstance.com) raggiungibile esternamente da altre istanze. MISP codificherà la URL negli sharing group che la includono. Se il valore non è configurato, verrà utilizzato il valore impostato nel parametro baseurl."
 
-#: Model/Server.php:189
+#: Model/Server.php:199
 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:197
+#: Model/Server.php:207
 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:207
+#: Model/Server.php:217
 msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
-#: Model/Server.php:216
+#: Model/Server.php:226
 msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
 msgstr ""
 
-#: Model/Server.php:225
+#: Model/Server.php:235
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "Abilitare alcune correlazioni che hanno performance pesanti (attualmente la correlazione CIDR)"
 
-#: Model/Server.php:234
+#: Model/Server.php:244
 msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
 msgstr ""
 
-#: Model/Server.php:243
+#: Model/Server.php:253
 msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
 msgstr "È vivamente consigliato installare tutte le dipendenze python in un virtualenv. La posizione raccomandata è: %s/venv"
 
-#: Model/Server.php:254
+#: Model/Server.php:264
 msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
 msgstr ""
 
-#: Model/Server.php:264
+#: Model/Server.php:274
 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:273
+#: Model/Server.php:283
 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:281
+#: Model/Server.php:291
 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:290
+#: Model/Server.php:300
 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:292
+#: Model/Server.php:302
 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:298;306;333;357;365;373;381;438;486;494;561
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr "Questa impostazione è obsoleta e può essere tranquillamente rimossa."
 
-#: Model/Server.php:314
+#: Model/Server.php:324
 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:324
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr ""
 
-#: Model/Server.php:341
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "Testo a piè di pagina antecedente al testo \"Powered by MISP\"."
 
-#: Model/Server.php:349
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "Testo a piè di pagina successivo al testo \"Powered by MISP\"."
 
-#: Model/Server.php:389
+#: Model/Server.php:399
 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:397
+#: Model/Server.php:407
 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:405
+#: Model/Server.php:415
 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:413
+#: Model/Server.php:423
 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:421
+#: Model/Server.php:431
 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:430
+#: Model/Server.php:440
 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:432
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr "Nessun UUID valodo impostato"
 
-#: Model/Server.php:446
+#: Model/Server.php:456
 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:454
+#: Model/Server.php:464
 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:462
+#: Model/Server.php:472
 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:470
+#: Model/Server.php:480
 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:478
+#: Model/Server.php:488
 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:502
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr "Abilitare l'uso dei processi di background di MISP."
 
-#: Model/Server.php:510
+#: Model/Server.php:520
 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:520
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "Consentire alla cache XML di includere gli allegati codificati."
 
-#: Model/Server.php:528
+#: Model/Server.php:538
 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:536
+#: Model/Server.php:546
 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:544
+#: Model/Server.php:554
 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:553
+#: Model/Server.php:563
 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:569
+#: Model/Server.php:579
 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:577
+#: Model/Server.php:587
 msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
 msgstr ""
 
-#: Model/Server.php:585
+#: Model/Server.php:595
 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:593
+#: Model/Server.php:603
 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:601
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr "L'impostazione predefinita per la distrubuzione degli eventi (0-3)."
 
-#: Model/Server.php:610
+#: Model/Server.php:620
 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:619
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr "Il livello di minaccia predefinito alla creazione di un evento."
 
-#: Model/Server.php:628
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:637
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr "Abilitare le funzionalità di tagging di MISP. Altamente raccomandato."
 
-#: Model/Server.php:645
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr "Mostra il nome completo del tag nell'indice eventi."
 
-#: Model/Server.php:654
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr "Usato nella pagina di login, priva del logo MISP"
 
-#: Model/Server.php:662
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr "Usato nella pagina di login, dopo il logo MISP"
 
-#: Model/Server.php:670
+#: Model/Server.php:689
 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:678
+#: Model/Server.php:697
 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:686
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr "Usato nel titolo, dopo il nome della pagina"
 
-#: Model/Server.php:694
+#: Model/Server.php:713
 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:702
+#: Model/Server.php:721
 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:710
+#: Model/Server.php:729
 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:718
+#: Model/Server.php:737
 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:726
+#: Model/Server.php:745
 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:735
+#: Model/Server.php:754
 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:744
+#: Model/Server.php:763
 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:752
+#: Model/Server.php:771
 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:759
+#: Model/Server.php:778
 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:766
+#: Model/Server.php:785
 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:775
+#: Model/Server.php:794
 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:783
+#: Model/Server.php:802
 msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
 msgstr ""
 
-#: Model/Server.php:785
+#: Model/Server.php:804
 msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
 msgstr ""
 
-#: Model/Server.php:792
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:801
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:810
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:819
+#: Model/Server.php:838
 msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
 msgstr ""
 
-#: Model/Server.php:828
+#: Model/Server.php:847
 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:837
+#: Model/Server.php:856
 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:846
+#: Model/Server.php:865
 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:855
+#: Model/Server.php:874
 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:864
+#: Model/Server.php:883
 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:873
+#: Model/Server.php:892
 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:883
+#: Model/Server.php:902
 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:892
+#: Model/Server.php:911
 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:901
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:910
+#: Model/Server.php:929
 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:919
+#: Model/Server.php:938
 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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:928
+#: Model/Server.php:947
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:937
+#: Model/Server.php:956
 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:947
+#: Model/Server.php:966
 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:956
+#: Model/Server.php:975
 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:965
+#: Model/Server.php:984
 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:974
+#: Model/Server.php:993
 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:984
+#: Model/Server.php:1003
 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:993
+#: Model/Server.php:1012
 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:1001
+#: Model/Server.php:1020
 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:1009
+#: Model/Server.php:1028
 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:1017
+#: Model/Server.php:1036
 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:1026
+#: Model/Server.php:1045
 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:1034
+#: Model/Server.php:1053
 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 "Impostarlo a \"false\" se si vuole disabilitare MISP dalla gestione dei suoi processi worker (ad esempio, nel caso in cui i worker vengano gestiti dall'unità systemd)."
 
-#: Model/Server.php:1042
+#: Model/Server.php:1061
 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:1051
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:1062
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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:1071
+#: Model/Server.php:1099
 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:1079
+#: Model/Server.php:1107
 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:1087
+#: Model/Server.php:1115
 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:1095
+#: Model/Server.php:1123
 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:1103
+#: Model/Server.php:1131
 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:1112
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr "La cartella home di GnuPG."
 
-#: Model/Server.php:1123
+#: Model/Server.php:1151
 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:1131
+#: Model/Server.php:1159
 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:1139
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr "La posizione della certificato pubblico di firma."
 
-#: Model/Server.php:1147
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr "La posizione del certificato privato di firma."
 
-#: Model/Server.php:1155
+#: Model/Server.php:1183
 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:1167
+#: Model/Server.php:1195
 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:1175
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr "La porta TCP del proxy HTTP."
 
-#: Model/Server.php:1183
+#: Model/Server.php:1211
 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:1191
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr "Il nome utente per il proxy HTTP."
 
-#: Model/Server.php:1199
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr "La password di autenticazione per il proxy HTTP."
 
-#: Model/Server.php:1210
+#: Model/Server.php:1238
 msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
 msgstr ""
 
-#: Model/Server.php:1219
+#: Model/Server.php:1247
 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:1229
+#: Model/Server.php:1257
 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:1238
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1246
+#: Model/Server.php:1292
 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:1254
+#: Model/Server.php:1300
 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:1263
+#: Model/Server.php:1309
 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:1272
+#: Model/Server.php:1318
 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:1281
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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:1283
+#: Model/Server.php:1339
 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:1290
+#: Model/Server.php:1346
 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:1299
+#: Model/Server.php:1355
 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:1308
+#: Model/Server.php:1364
 msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 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:1328
+#: Model/Server.php:1393
 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:1339
+#: Model/Server.php:1404
 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:1347
+#: Model/Server.php:1412
 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:1355
+#: Model/Server.php:1420
 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:1364
+#: Model/Server.php:1429
 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:1372
+#: Model/Server.php:1437
 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:1383
+#: Model/Server.php:1448
 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:1392
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1473
 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:1416
+#: Model/Server.php:1481
 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:1424
+#: Model/Server.php:1489
 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:1432
+#: Model/Server.php:1497
 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:1440
+#: Model/Server.php:1505
 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:1448
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr ""
 
-#: Model/Server.php:1456
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr "Nameserver alternativo"
 
-#: Model/Server.php:1464
+#: Model/Server.php:1529
 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:1472
+#: Model/Server.php:1537
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1480
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr ""
 
-#: Model/Server.php:1488
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr ""
 
-#: Model/Server.php:1496;1743
+#: Model/Server.php:1561;1808
 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:1504;1751
+#: Model/Server.php:1569;1816
 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:1512
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1520
+#: Model/Server.php:1585
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1528
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr ""
 
-#: Model/Server.php:1536;1759
+#: Model/Server.php:1601;1824
 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:1544
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1552;1767
+#: Model/Server.php:1617;1832
 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:1560
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1568;1775
+#: Model/Server.php:1633;1840
 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:1576
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1584
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1592
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1600;1783
+#: Model/Server.php:1665;1848
 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:1608
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1616
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr "Abilita o disabilita la pubblicazione di nuovi sighting."
 
-#: Model/Server.php:1624
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr "Topic per pubblicazione sightings."
 
-#: Model/Server.php:1632
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr ""
 
-#: Model/Server.php:1640
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr ""
 
-#: Model/Server.php:1648
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1656
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1664
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1672
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr ""
 
-#: Model/Server.php:1680
+#: Model/Server.php:1745
 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:1689
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr "La porta che la funzionalità pub/sub utilizzerà."
 
-#: Model/Server.php:1698
+#: Model/Server.php:1763
 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:1707
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr "La porta a cui Redis sta in ascolto."
 
-#: Model/Server.php:1716
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr "La password per Redis, se configurata."
 
-#: Model/Server.php:1725
+#: Model/Server.php:1790
 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:1734
+#: Model/Server.php:1799
 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:1791
+#: Model/Server.php:1856
 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:1799
+#: Model/Server.php:1864
 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:1807
+#: Model/Server.php:1872
 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:1815
+#: Model/Server.php:1880
 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:1823
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "Abilitare l'invio dei log ad un'istanza ElasticSearch"
 
-#: Model/Server.php:1831
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1839
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr "L'indice in cui inserire i log"
 
-#: Model/Server.php:1847
+#: Model/Server.php:1912
 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:1855
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr "Nome del pacchetto da caricare"
 
-#: Model/Server.php:1863
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr "Regione in cui il vostro S3 risidede"
 
-#: Model/Server.php:1871
+#: Model/Server.php:1936
 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:1879
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr "Chiave segreta AWS da usare al caricamento dei campioni"
 
-#: Model/Server.php:1887
+#: Model/Server.php:1952
 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:1896
+#: Model/Server.php:1961
 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:1904
+#: Model/Server.php:1969
 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:1912
+#: Model/Server.php:1977
 msgid "Enable SightingDB integration."
 msgstr ""
 
-#: Model/Server.php:1920
+#: Model/Server.php:1985
 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:1930
+#: Model/Server.php:1995
 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:1939
+#: Model/Server.php:2004
 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:1948
+#: Model/Server.php:2013
 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:1957
+#: Model/Server.php:2022
 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:1966
+#: Model/Server.php:2031
 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:1975
+#: Model/Server.php:2040
 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:1984
+#: Model/Server.php:2049
 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:1992
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr "Abilitare/disabilitare i servizi di enrichment"
 
-#: Model/Server.php:2000
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr "Impostare un timeout per i servizi di enrichment"
 
-#: Model/Server.php:2008
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr "Abilitare/disabilitare i servizi di import"
 
-#: Model/Server.php:2016
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr "Impostare un timeout per i servizi di import"
 
-#: Model/Server.php:2024
+#: Model/Server.php:2089
 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:2032
+#: Model/Server.php:2097
 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:2040
+#: Model/Server.php:2105
 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:2048
+#: Model/Server.php:2113
 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:2056
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr "Abilitare/disabilitare i servizi di export"
 
-#: Model/Server.php:2064
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr "Impostare un timeout per i servizi di export"
 
-#: Model/Server.php:2072
+#: Model/Server.php:2137
 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:2080
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr "Impostare il timout per i servizi hover"
 
-#: Model/Server.php:2088
+#: Model/Server.php:2153
 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:2096
+#: Model/Server.php:2161
 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:2104
+#: Model/Server.php:2169
 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:2112
+#: Model/Server.php:2177
 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:2120
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2128
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "Assegna una chiave di autenticazione da passare a Cortex"
 
-#: Model/Server.php:2137
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2145
+#: Model/Server.php:2210
 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:2154
+#: Model/Server.php:2219
 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:2163
+#: Model/Server.php:2228
 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:2172
+#: Model/Server.php:2237
 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:2181
+#: Model/Server.php:2246
 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:2190
+#: Model/Server.php:2255
 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:2200
+#: Model/Server.php:2265
 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:2209
+#: Model/Server.php:2274
 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:2376
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2380
+#: Model/Server.php:2445
 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:2407
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr "Rilevato evento vuoto."
 
-#: Model/Server.php:2413
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr "downlod dell'evento non riuscito"
 
-#: Model/Server.php:2492
+#: Model/Server.php:2557
 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:2494
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr "Spiacente, questo non è stato ancora implementato"
 
-#: Model/Server.php:2495
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr "Qualcosa è andato storto durante il tentativo di pull"
 
-#: Model/Server.php:2507;2509
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr "Problema sconosciuto."
 
-#: Model/Server.php:3049
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr "Abilita o disabilita il modulo %s."
 
-#: Model/Server.php:3052
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr "Limitare il %s modulo all'organizzazione."
 
-#: Model/Server.php:3060
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr "Imposta i parametri per questo modulo obbligatorio."
 
-#: Model/Server.php:3175
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr "Valore non impostato."
 
-#: Model/Server.php:3196
+#: Model/Server.php:3281
 msgid "Invalid language."
 msgstr ""
 
-#: Model/Server.php:3217
+#: Model/Server.php:3302
 msgid "Invalid tag_collection."
 msgstr ""
 
-#: Model/Server.php:3225
+#: Model/Server.php:3310
 msgid "This setting has to be a number."
 msgstr ""
 
-#: Model/Server.php:3237
+#: Model/Server.php:3322
 msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
 msgstr ""
 
-#: Model/Server.php:3519
+#: Model/Server.php:3619
 msgid "Invalid file path or file not accessible."
 msgstr ""
 
-#: Model/Server.php:3522
+#: Model/Server.php:3622
 msgid "File has to be in .pem format."
 msgstr ""
 
-#: Model/Server.php:3888
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr "Qualcosa è andato storto. MISP a provato a salvare un file di configurazione malformato. Modifiche alle impostazioni annullate."
 
-#: Model/Server.php:4020
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr "Immagine dell'organizzazione"
 
-#: Model/Server.php:4021
+#: Model/Server.php:4121
 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:4023
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr "Il file png è 48x48 pixel"
 
-#: Model/Server.php:4026;4041
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
 msgstr "Il filename deve essere del formato: *.png"
 
-#: Model/Server.php:4030
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr "Immagini aggiuntive"
 
-#: Model/Server.php:4031
+#: Model/Server.php:4131
 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:4038
+#: Model/Server.php:4138
 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:4128
+#: Model/Server.php:4228
 msgid "Invalid server."
 msgstr ""
 
-#: Model/Server.php:4159
+#: Model/Server.php:4259
 msgid "Response was empty."
 msgstr ""
 
-#: Model/Server.php:4235
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:4501
+#: Model/Server.php:4604
 msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
 msgstr ""
 
-#: Model/Server.php:4571
+#: Model/Server.php:4675
 msgid "Can't check database schema for Postgres database type"
 msgstr ""
 
-#: Model/Server.php:4588
+#: Model/Server.php:4692
 msgid "Table `%s` does not exist"
 msgstr ""
 
-#: Model/Server.php:4615
+#: Model/Server.php:4719
 msgid "Column `%s` exists but should not"
 msgstr ""
 
-#: Model/Server.php:4648
+#: Model/Server.php:4752
 msgid "Column `%s` is different"
 msgstr ""
 
-#: Model/Server.php:4658
+#: Model/Server.php:4762
 msgid "Column `%s` does not exist but should"
 msgstr ""
 
-#: Model/Server.php:4671
+#: Model/Server.php:4775
 msgid "Table `%s` is an additional table"
 msgstr ""
 
-#: Model/Server.php:4695
+#: Model/Server.php:4799
 msgid "Column `%s` should be indexed"
 msgstr ""
 
-#: Model/Server.php:4718
+#: Model/Server.php:4822
 msgid "Column `%s` is indexed but should not"
 msgstr ""
 
-#: Model/Server.php:5141
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr "Rimozione di un worker down."
 
-#: Model/Server.php:5142
+#: Model/Server.php:5253
 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:5146
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr "Arresto di un worker."
 
-#: Model/Server.php:5147
+#: Model/Server.php:5258
 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"
 
-#: Model/Server.php:5449
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:5449;5478
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:5461
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:5462
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:5593
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:5600
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:5607
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr ""
 
-#: Model/Server.php:5787
+#: Model/Server.php:5911
 msgid "Could not reset the remote authentication key."
 msgstr ""
 
-#: Model/Server.php:5864
+#: Model/Server.php:5988
 msgid "Could not parse JSON: "
 msgstr ""
 
-#: Model/Server.php:5884
+#: Model/Server.php:6008
 msgid "Could not reset fetch remote user account."
 msgstr ""
 
-#: Model/Server.php:5906
+#: Model/Server.php:6030
 msgid "No user object received in response."
 msgstr ""
 
@@ -5202,6 +5474,10 @@ msgstr ""
 msgid "API key reset by administrator"
 msgstr ""
 
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
 #: Model/DecayingModelsFormulas/Polynomial.php:7
 msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
 msgstr ""
@@ -5234,7 +5510,7 @@ msgstr "ha i seguenti elementi dipendenti"
 
 #: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Aggiungi Attributo"
@@ -5261,8 +5537,8 @@ msgstr ""
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
 #: View/Events/add.ctp:33
-#: View/Feeds/add.ctp:178
-#: View/Feeds/edit.ctp:179
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
 #: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
@@ -5271,7 +5547,7 @@ msgstr "Sharing Group"
 #: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -5287,15 +5563,15 @@ msgstr "Commento contestuale"
 msgid "for Intrusion Detection System"
 msgstr "per Intrusion Detection System"
 
-#: View/Attributes/add.ctp:154
+#: View/Attributes/add.ctp:155
 msgid "Timezone missing, auto-detected as: "
 msgstr ""
 
-#: View/Attributes/add.ctp:155
+#: View/Attributes/add.ctp:156
 msgid "The following value will be submited instead: "
 msgstr ""
 
-#: View/Attributes/add.ctp:163
+#: View/Attributes/add.ctp:164
 msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr ""
 
@@ -5356,10 +5632,13 @@ msgstr "ID evento"
 #: View/DecayingModel/decaying_tool_rest_search.ctp:24
 #: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr "Org"
 
@@ -5418,7 +5697,7 @@ msgid "Values"
 msgstr "Valori"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:57
@@ -5440,7 +5719,7 @@ msgid "Replaceattributes"
 msgstr "Sostituire gli attributi"
 
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:80
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Elements/view_galaxy_matrix.ctp:76;211
 #: View/Elements/genericElements/Form/submitButton.ctp:8;25
@@ -5468,7 +5747,7 @@ msgstr "Sostituire gli attributi"
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:67
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/UserSettings/set_setting.ctp:36
-#: View/Users/admin_add.ctp:97
+#: View/Users/admin_add.ctp:98
 #: View/Users/admin_edit.ctp:91
 #: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
@@ -5480,7 +5759,7 @@ msgid "Submit"
 msgstr "Invia"
 
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
 #: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/exportSearch.ctp:32
@@ -5489,6 +5768,7 @@ msgstr "Invia"
 #: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
 #: View/Elements/view_galaxy_matrix.ctp:212
+#: View/Elements/genericElements/infoModal.ctp:40
 #: View/Elements/genericElements/Form/submitButton.ctp:13
 #: View/Elements/serverRuleElements/pull.ctp:73
 #: View/Elements/serverRuleElements/push.ctp:72
@@ -5579,7 +5859,7 @@ msgstr "Attenzione: stai per condividere dati di natura classificata (attributi
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
 #: View/Users/statistics_data.ctp:19
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr "Attributi"
 
@@ -5630,10 +5910,7 @@ msgstr "Risultati per tutti gli attributi"
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -5658,7 +5935,6 @@ msgstr "Risultati per tutti gli attributi"
 #: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:32;106
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -5681,10 +5957,7 @@ msgstr "precedente"
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -5709,7 +5982,6 @@ msgstr "precedente"
 #: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:34;108
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -5738,7 +6010,6 @@ msgstr "Data"
 #: View/Elements/global_menu.ctp:94
 #: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr "Galaxy"
@@ -5776,7 +6047,7 @@ msgstr "Sighting"
 #: View/Attributes/index.ctp:62
 #: View/Elements/eventattribute.ctp:166
 #: View/Events/view.ctp:262
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr "Attività"
@@ -5786,7 +6057,7 @@ msgstr "Attività"
 #: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/genericElements/IndexTable/headers.ctp:31
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -5795,10 +6066,7 @@ msgstr "Attività"
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -5834,10 +6102,7 @@ msgstr "Azioni"
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -5862,7 +6127,6 @@ msgstr "Azioni"
 #: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:99
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -5953,13 +6217,12 @@ msgstr "Sei sicuro di cancellare l'attributo #%s? Questa operazione non cancella
 #: View/Elements/Events/eventIndexTable.ctp:234
 #: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:597
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -5976,106 +6239,6 @@ msgstr "Sei sicuro di cancellare l'attributo #%s? Questa operazione non cancella
 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
-#: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: 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:92
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
-#: 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 "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
-#: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
-#: 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:92
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
-#: 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 "No"
-
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
@@ -6109,9 +6272,10 @@ msgstr "Non modificare le impostazioni correnti"
 #: View/Events/resolved_attributes.ctp:51
 #: View/Events/resolved_misp_format.ctp:98;293
 #: View/Events/view.ctp:159
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:171
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
+#: View/Feeds/index.ctp:184
 #: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
 #: View/Objects/revise_object.ctp:35;69
@@ -6127,23 +6291,27 @@ msgstr "Distribuzione"
 msgid "For Intrusion Detection System"
 msgstr "Per Intrusion Detection System"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 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
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
@@ -6233,12 +6401,16 @@ msgid "Unvetted"
 msgstr ""
 
 #: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
 #: View/EventBlacklists/index.ctp:35
 #: View/EventDelegations/index.ctp:41
 #: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
 #: View/Feeds/preview_index.ctp:25
 #: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
 #: View/ObjectTemplates/index.ctp:47
 #: View/Organisations/index.ctp:75
 #: View/Servers/preview_index.ctp:64
@@ -6246,31 +6418,41 @@ msgstr ""
 #: View/Sightingdb/index.ctp:10
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:81
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
 msgid "Filter"
 msgstr "Filtro"
 
 #: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
 #: View/Elements/eventattributetoolbar.ctp:231
 #: View/EventBlacklists/index.ctp:36
 #: View/EventDelegations/index.ctp:42
 #: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
 #: View/Feeds/preview_index.ctp:26
 #: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
 #: View/ObjectTemplates/index.ctp:48
 #: View/Organisations/index.ctp:76
 #: View/Servers/preview_index.ctp:65
 #: View/ShadowAttributes/index.ctp:38
 #: View/Sightingdb/index.ctp:11
-#: View/Users/admin_index.ctp:82
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
 msgid "Enter value to search"
 msgstr ""
 
 #: View/Communities/index.ctp:34
 #: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
 #: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
 #: View/Feeds/search_caches.ctp:35
 #: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
 #: View/ObjectTemplates/view.ctp:3
 #: View/Organisations/view.ctp:5
 #: View/Pages/doc/administration.ctp:180;221;236
@@ -6279,7 +6461,9 @@ msgstr ""
 #: View/Taxonomies/view.ctp:4
 #: View/Templates/view.ctp:4
 #: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
 #: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
 #: View/Users/view.ctp:3
 #: View/Warninglists/view.ctp:9
 msgid "Id"
@@ -6298,6 +6482,8 @@ msgid "Community name"
 msgstr ""
 
 #: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
 #: View/DecayingModel/index.ctp:89
 #: View/DecayingModel/view.ctp:21
 #: View/Elements/Servers/View/row_object.ctp:24
@@ -6311,8 +6497,10 @@ msgstr ""
 #: View/Elements/templateElements/templateRowAttribute.ctp:21
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
 #: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:22;113;210
 #: View/Objects/group_attributes_into_object.ctp:8
@@ -6334,10 +6522,18 @@ msgid "Description"
 msgstr "Descrizione"
 
 #: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
 msgid "Communities index"
 msgstr ""
 
-#: View/Communities/index.ctp:64
+#: View/Communities/index.ctp:72
 msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
 msgstr ""
 
@@ -6406,9 +6602,11 @@ msgid "Message:"
 msgstr ""
 
 #: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
 #: View/Elements/Events/View/row_object.ctp:72
 #: View/Events/resolved_misp_format.ctp:93;288
-#: View/GalaxyClusters/view.ctp:19
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
 #: View/ObjectTemplates/index.ctp:66
 #: View/ObjectTemplates/view.ctp:6
 #: View/Objects/revise_object.ctp:68
@@ -6425,16 +6623,19 @@ msgid "UUID"
 msgstr "UUID"
 
 #: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
 #: View/DecayingModel/index.ctp:88
 #: View/DecayingModel/view.ctp:14
 #: View/Elements/Servers/View/row_object.ctp:19
 #: View/Elements/templateElements/templateRowAttribute.ctp:12
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
 #: View/Feeds/search_caches.ctp:47
 #: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
 #: View/ObjectTemplates/view.ctp:4
 #: View/Objects/add.ctp:206
 #: View/Objects/revise_object.ctp:27
@@ -6446,7 +6647,7 @@ msgstr "UUID"
 #: View/SharingGroups/view.ctp:42;67
 #: View/Sightingdb/index.ctp:51
 #: View/Templates/view.ctp:9
-#: View/Users/statistics_orgs.ctp:31
+#: View/Users/statistics_orgs.ctp:33
 #: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "Nome"
@@ -6470,7 +6671,7 @@ msgstr ""
 #: View/Users/admin_edit.ctp:64
 #: View/Users/admin_view.ctp:72
 #: View/Users/edit.ctp:23
-#: View/Users/view.ctp:31
+#: View/Users/view.ctp:32
 msgid "GnuPG key"
 msgstr "Chiave GnuPG"
 
@@ -6479,10 +6680,105 @@ msgid "Community "
 msgstr ""
 
 #: View/Communities/view.ctp:51
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:617
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
 msgid "Request Access"
 msgstr ""
 
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr "Default"
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr "Nome modello"
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
 #: View/DecayingModel/add.ctp:4
 msgid " Decaying Model"
 msgstr ""
@@ -6597,8 +6893,8 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/EventBlacklists/edit.ctp:37
 #: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:200
-#: View/Feeds/index.ctp:282
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
 #: View/News/index.ctp:22
 #: View/OrgBlacklists/edit.ctp:30
 #: View/OrgBlacklists/index.ctp:36
@@ -6690,6 +6986,7 @@ msgstr ""
 #: View/Events/show_i_o_c_results.ctp:12
 #: View/Feeds/freetext_index.ctp:32
 #: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
 #: View/Objects/revise_object.ctp:64
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
@@ -6701,7 +6998,7 @@ msgstr ""
 #: 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:36
+#: View/Users/statistics_orgs.ctp:38
 #: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr "Tipo"
@@ -6715,6 +7012,7 @@ msgstr "Tipo"
 #: View/Events/resolved_misp_format.ctp:92;287
 #: View/Events/show_i_o_c_results.ctp:13
 #: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
 #: View/Noticelists/view.ctp:42
 #: View/Objects/add.ctp:115
 #: View/Objects/group_attributes_into_object.ctp:58
@@ -6735,12 +7033,14 @@ msgstr ""
 #: View/DecayingModel/decaying_tool_rest_search.ctp:31
 #: View/Events/resolved_attributes.ctp:52
 #: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
 #: View/ObjectReferences/ajax/add.ctp:30
 #: View/Objects/add.ctp:67;119
 #: View/Objects/group_attributes_into_object.ctp:30
 #: View/Objects/revise_object.ctp:49;67
 #: View/Pages/doc/using_the_system.ctp:234;284
 #: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
 msgid "Comment"
 msgstr "Commento"
 
@@ -6759,7 +7059,7 @@ msgid "Decaying Model RestSearch"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_simulation.ctp:45
-#: View/Events/automation.ctp:14
+#: View/Events/automation.ctp:24
 #: View/Logs/admin_index.ctp:20;21
 #: View/Logs/admin_search.ctp:25
 msgid "Search"
@@ -6837,7 +7137,7 @@ msgstr ""
 #: View/Elements/genericElements/org_picker.ctp:17
 #: View/EventBlacklists/add.ctp:36
 #: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
+#: View/Feeds/add.ctp:220
 #: View/Feeds/import_feeds.ctp:20
 #: View/OrgBlacklists/add.ctp:29
 #: View/Regexp/admin_add.ctp:32
@@ -6914,7 +7214,7 @@ msgstr ""
 
 #: View/DecayingModel/index.ctp:97
 #: View/DecayingModel/view.ctp:25
-#: View/Galaxies/view.ctp:22
+#: View/Galaxies/view.ctp:10
 #: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
 #: View/Warninglists/view.ctp:12
@@ -6924,6 +7224,7 @@ msgstr "Versione"
 #: View/DecayingModel/index.ctp:98
 #: View/DecayingModel/view.ctp:31
 #: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
 #: View/Feeds/view.ctp:63
 #: View/Noticelists/index.ctp:63
 #: View/ObjectTemplates/index.ctp:35
@@ -7037,7 +7338,6 @@ msgstr "mostra tutto"
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr "Seleziona tutto"
 
@@ -7106,6 +7406,8 @@ msgstr "Visualizza tutti gli attributi"
 
 #: View/Elements/eventattributetoolbar.ctp:6
 #: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
@@ -7143,7 +7445,7 @@ msgstr "Visualizza solo gli attributi relativi a falsi positivi"
 
 #: View/Elements/eventattributetoolbar.ctp:41
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr "Attenzione"
@@ -7255,11 +7557,9 @@ msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: View/Logs/admin_index.ctp:62
 #: View/Servers/preview_index.ctp:57
 #: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:74
 msgid "Remove filters"
 msgstr "Rimuovi i filtri"
 
@@ -7448,14 +7748,14 @@ msgid "Event Actions"
 msgstr "Azioni evento"
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:221;264
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr "Elenco Eventi"
 
 #: View/Elements/global_menu.ctp:18
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:226;270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
 #: View/Events/add.ctp:7
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
@@ -7463,80 +7763,80 @@ msgid "Add Event"
 msgstr "Aggiungi Evento"
 
 #: View/Elements/global_menu.ctp:23
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:289
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr "Lista Attributi"
 
 #: View/Elements/global_menu.ctp:27
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:294
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr "Cerca Attributi"
 
 #: View/Elements/global_menu.ctp:31
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr "Client REST"
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:310
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "Visualizza Proposte"
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr "Eventi con proposte"
 
 #: View/Elements/global_menu.ctp:47
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:320
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
 msgid "View delegation requests"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:861
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "Elenco classificazioni"
 
 #: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:61
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:866
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr "Aggiungi Tag"
 
 #: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:895
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr "Elenco Tassonomie"
 
 #: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:923
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "Elenco Modelli"
 
 #: View/Elements/global_menu.ctp:74
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:928
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "Aggiungi Modello"
 
 #: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
@@ -7544,7 +7844,7 @@ msgid "Export"
 msgstr "Esporta"
 
 #: View/Elements/global_menu.ctp:86
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -7554,7 +7854,7 @@ msgid "Automation"
 msgstr "Automazione"
 
 #: View/Elements/global_menu.ctp:98
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1086
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr "Elenco Galaxy"
 
@@ -7582,7 +7882,7 @@ msgid "Signature Whitelist"
 msgstr "Firma Whitelist"
 
 #: View/Elements/global_menu.ctp:128
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:378
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr "Elenco Gruppi Segnalazioni"
 
@@ -7603,45 +7903,45 @@ msgid "News"
 msgstr "Notizie"
 
 #: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Profilo"
 
 #: View/Elements/global_menu.ctp:151
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
 msgid "My Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:155
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:467;699
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
 msgid "Set Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:159
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:471
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "Dashboard"
 
 #: View/Elements/global_menu.ctp:168
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:490
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "Permessi Ruolo"
 
 #: View/Elements/global_menu.ctp:175
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1130
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr "Elenco Modelli Oggetti"
 
 #: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:507
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr "Elenco Gruppi Condivisione"
 
 #: View/Elements/global_menu.ctp:186
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr "Aggiungi Sharing Group"
 
@@ -7650,12 +7950,12 @@ msgid "Decaying Models Tool"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:199
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:977
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
 msgid "List Decaying Models"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:206
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:520
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
@@ -7667,12 +7967,12 @@ msgid "Categories & Types"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:214
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:218
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:528
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -7702,28 +8002,28 @@ msgid "Sync Actions"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:240
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:536
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:542
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:250
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "Elenco Server"
 
 #: View/Elements/global_menu.ctp:255
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:998
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr "Elenco Feed"
 
 #: View/Elements/global_menu.ctp:260
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr ""
 
@@ -7736,7 +8036,7 @@ msgid "Add SightingDB Connection"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:612
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
 msgid "List Communities"
 msgstr ""
 
@@ -7751,7 +8051,7 @@ msgid "Administration"
 msgstr "Amministrazione"
 
 #: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:687
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Elenco Utenti"
@@ -7766,93 +8066,97 @@ msgid "Set User Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:300
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:682
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr "Aggiungi Utente"
 
 #: View/Elements/global_menu.ctp:304
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:704
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "Contatta Utente"
 
-#: View/Elements/global_menu.ctp:311
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:477;739
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr "Elenco Organizzazioni"
 
-#: View/Elements/global_menu.ctp:315
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:322
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "Elenco Ruoli"
 
-#: View/Elements/global_menu.ctp:326
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr "Impostazioni Server & Manutenzione"
 
-#: View/Elements/global_menu.ctp:343
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:768
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "Jobs"
 
-#: View/Elements/global_menu.ctp:352
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:774
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:361
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:366
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr "Gestisci Blacklist Eventi"
 
-#: View/Elements/global_menu.ctp:375
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr "Metti Organizzazione nella blacklist"
 
-#: View/Elements/global_menu.ctp:380
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr "Gestisci Blacklist Org"
 
-#: View/Elements/global_menu.ctp:388
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "Audit"
 
-#: View/Elements/global_menu.ctp:392
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "Elenco Log"
 
-#: View/Elements/global_menu.ctp:396
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:811
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "Cerca nei Log"
 
-#: View/Elements/global_menu.ctp:424
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "Log out"
@@ -7875,7 +8179,8 @@ msgstr "Attributi per organizzazione"
 
 #: View/Elements/view_event_distribution_graph.ctp:9
 #: View/Elements/view_timeline.ctp:23
-#: View/Layouts/default.ctp:92
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "Caricamento"
@@ -7910,7 +8215,6 @@ msgstr "Visualizza"
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:67
 msgid "Filters"
 msgstr "Filtri"
 
@@ -7937,6 +8241,7 @@ msgid "Time scope"
 msgstr ""
 
 #: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
 #: View/Taxonomies/view.ctp:83
 msgid "Tag"
 msgstr ""
@@ -7968,7 +8273,6 @@ msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr "Seleziona gli eventi di questa pagina"
 
@@ -8025,7 +8329,9 @@ msgstr "#Post"
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr "Email"
@@ -8036,8 +8342,6 @@ msgstr "Email"
 #: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
 #: View/Events/proposal_event_index.ctp:45;49
 #: View/Feeds/preview_index.ctp:73
-#: View/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
@@ -8063,7 +8367,7 @@ msgid "NEW"
 msgstr "NUOVO"
 
 #: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr "Pubblica Evento"
 
@@ -8077,7 +8381,7 @@ msgid "Not published"
 msgstr "Non pubblicato"
 
 #: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;364;431;598;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
 #: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr "Sicuro di voler cancellare # %s?"
@@ -8284,11 +8588,11 @@ msgstr "Rappresentazione esadecimale"
 msgid "Switch to binary representation"
 msgstr "Passare alla rappresentazione binaria"
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr "Attenzione, ciò non sembra un legittimo "
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr " valore"
 
@@ -8391,11 +8695,11 @@ msgstr "Stato"
 #: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
 #: View/Events/view.ctp:191
-#: View/GalaxyClusters/view.ctp:32
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
 #: View/Users/admin_view.ctp:95
 msgid "N/A"
@@ -8429,8 +8733,10 @@ msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
@@ -8444,15 +8750,17 @@ msgstr "Ultimo accesso"
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
 #: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr "Creato"
 
 #: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 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:660
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 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."
 
@@ -8489,488 +8797,599 @@ msgstr "Eventi con proposte: "
 msgid "Delegation requests: "
 msgstr "Richieste di delega: "
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
-msgid "Populate From Template"
-msgstr "Popolare dal modello"
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
+msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
-msgid "Enrichment Module Result"
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr "Regole di filtro"
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr "Regole"
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr "Età: "
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr "clicca qui"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr "Errore: Evento non valido!"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr "Eventi corretti %s"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+msgid "Populate From Template"
+msgstr "Popolare dal modello"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+msgid "Enrichment Module Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr "Risultato importazione testo"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr "Visualizza Evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;887;1116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr "Visualizza Grafico di Correlazione"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr "Visualizza storico Evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
 #: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr "Modifica Evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr "Cancella Evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr "Aggiungi Oggetto"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr "Aggiungi allegato"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr "Popolare da..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr "Arricchisci evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr "Incorporare attributi da..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr "Proponi Attributo"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr "Proponi Allegato"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr "Pubblica (no email)"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
 msgid "Publish Sightings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr "Delega la pubblicazione"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr "Accetta Richiesta di Delega"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr "Rimuovi richiesta di delega"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr "Evento pubblicato in ZMQ"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr "Sei sicuro di voler ripubblicare l'evento corrente nel canale ZMQ?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:200
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:208
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr "Contatta segnalante"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:216;303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
 msgstr "Scarica come..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239;244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:251
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr "Importa da…"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr "Elenco Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr "Nuovo Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:351
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr "Esegui all'uscita"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:352
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:359
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr "Modifica Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr "Cancella Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr "Visualizza Warninglist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr "Aggiorna le Warninglist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:385
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:393
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr "Visualizza la Noticelist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:403
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr "Aggiorna Noticeslists"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:404
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:414
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr "Elenco Whitelist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:419
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr "Nuova Whitelist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr "Modifica Whitelist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:430
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr "Cancella Whitelist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:440
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr "Modifica Profilo"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:451;649
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr "Reimposta Password"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:484;733
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr "Visualizza Organizzazione"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:496
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr "Modifica Sharing Group"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr "Visualizza Sharing Group"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:551;581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr "Naviga Server Remoti"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:559
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr "Naviga Eventi Remoti"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570;1056
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr "Scarica questo evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:571;1057
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:589
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
 #: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr "Modifica Server"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:622
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
 msgid "View community"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:630
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
 msgid "Request E-mail"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:642
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr "Visualizza Server"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:654
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr "Modifica Utente"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr "Cancella Utente"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:668
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr "Modifica Ruolo"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr "Cancella Ruolo"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:694
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
 msgid "User settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:712
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr "Aggiungi Organizzazione"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr "Modifica Organizzazione"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:726
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr "Fondi Organizzazione"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:745
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr "Aggiungi Ruolo"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:781
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr "Blacklist Eventi"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:793
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr "Blacklist Organizzazioni"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:820;834
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr "Visualizza Discussione"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:825
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr "Aggiungi Post"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:839
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr "Modifica Post"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr "Elenco Discussioni"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:849
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr "Nuova Discussione"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:857
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr "Elenco classificazioni preferite"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:873
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr "Modifica Tag"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:881;900
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr "Visualizza Tassonomia"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:908
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr "Cancella Tassonomia"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:915
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:935
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr "Visualizza Modello"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:941
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr "Modifica Modello"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:952
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
 msgid "Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
 msgid "Force Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:962
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
 msgid "Import Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:967
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
 msgid "Add Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:971
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
 msgid "Decaying Tool"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
 msgid "View Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:989
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
 msgid "Edit Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1007
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr "Aggiungi Feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr "Importa elenchi di Feed da JSON"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1018
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr "Matrice di analisi sovrapposizioni feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1023
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr "Esporta le impostazioni dei feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr "Modifica Feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1036
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1042
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr "Anteprima Indice"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1048
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr "Anteprima Evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1066
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr "Visualizza News"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1071
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr "Aggiungi News"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1077
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr "Modifica News"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1092
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr "Aggiorna le Galaxy"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1093
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 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:1098
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr "Forza aggiornamento Galaxy"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1099
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 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 galaxy dal sotto modulo?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1106;1122
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr "Visualizza Galaxy"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr "Visualizza Cluster"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1135
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr "Aggiorna Oggetti"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1141
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr "Visualizza Oggetto Modello"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1149
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
 #: View/Sightingdb/add.ctp:6
 msgid "Add SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1157
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
 msgid "Edit SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1162
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
 msgid "List SightingDB connections"
 msgstr ""
 
@@ -9000,7 +9419,7 @@ msgid "Fix Database Index Schema"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
 msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
 msgstr ""
 
@@ -9008,7 +9427,7 @@ msgstr ""
 msgid "The current database schema does not match the expected format."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;131
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
 msgid "Database schema diagnostic: "
 msgstr ""
 
@@ -9036,52 +9455,52 @@ msgstr ""
 msgid "Actual schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:118
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
 msgid "Fix Database schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:130
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
 msgid "The current database is correct"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:141
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
 msgid "Expected DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:145
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
 msgid "The current database version matches the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:146;151
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
 msgid "Actual DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:150
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
 msgid "The current database version does not match the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
 msgid "Updates are locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158;162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
 msgid "Updates are not locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 #: View/Servers/update_progress.ctp:32
 msgid "Updates are locked due to to many update fails"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 msgid "Updates unlocked in %s"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:167;168
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
 msgid "DataSource: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:203
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
 msgid "Column diagnostic"
 msgstr ""
 
@@ -9743,7 +10162,7 @@ msgstr "Worker PID"
 #: View/TagCollections/index.ctp:14
 #: View/UserSettings/index.ctp:56
 #: View/Users/admin_view.ctp:109
-#: View/Users/view.ctp:58
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr "Utente"
 
@@ -9788,8 +10207,8 @@ msgid "Start a worker"
 msgstr "Avvia un worker"
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
-msgstr "Riavvia tutti i worker"
+msgid "Restart dead workers"
+msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
 msgid "Set pull rules"
@@ -9945,10 +10364,6 @@ msgstr "Descrizione modello"
 msgid "Template ID"
 msgstr "ID modello"
 
-#: View/Elements/templateElements/populateTemplateDescription.ctp:8
-msgid "Template Name"
-msgstr "Nome modello"
-
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
 #: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
@@ -10134,7 +10549,7 @@ msgid "Recipient"
 msgstr ""
 
 #: View/EventDelegations/index.ctp:82
-#: View/Events/automation.ctp:269;276
+#: View/Events/automation.ctp:279;286
 #: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
@@ -10358,478 +10773,475 @@ msgstr ""
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 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 "La tua chiave: <code>%s</code>.\n"
-"    Puoi %s la chiave."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
+msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr "reset"
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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
+#: View/Events/automation.ctp:27
 #: 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:18
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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
+#: View/Events/automation.ctp:32
 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
+#: View/Events/automation.ctp:33
 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/automation.ctp:34
 #: 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:25
+#: View/Events/automation.ctp:35
 #: 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:26
+#: View/Events/automation.ctp:36
 #: 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:27
+#: View/Events/automation.ctp:37
 #: 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:28
+#: View/Events/automation.ctp:38
 #: 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:29
+#: View/Events/automation.ctp:39
 #: 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:30;150
+#: View/Events/automation.ctp:40;160
 #: 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:31;151
+#: View/Events/automation.ctp:41;161
 #: 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:32
+#: View/Events/automation.ctp:42
 #: 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/automation.ctp:43
 #: 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/automation.ctp:44
 #: 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/automation.ctp:45
 #: 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
+#: View/Events/automation.ctp:46
 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/automation.ctp:47
 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/automation.ctp:48
 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/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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/automation.ctp:52
 #: 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/automation.ctp:53
 #: 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
+#: View/Events/automation.ctp:54
 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
+#: View/Events/automation.ctp:55
 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
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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:81
+#: View/Events/automation.ctp:91
 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:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr "Parametri dell'URL"
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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:97
+#: View/Events/automation.ctp:107
 #: 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:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: 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:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr "Esportazione verso Bro IDS"
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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:118
+#: View/Events/automation.ctp:128
 #: 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:136
+#: View/Events/automation.ctp:146
 #: 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:138
+#: View/Events/automation.ctp:148
 #: 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:145
+#: View/Events/automation.ctp:155
 #: 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:148
+#: View/Events/automation.ctp:158
 #: 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:149
+#: View/Events/automation.ctp:159
 #: 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:152
+#: View/Events/automation.ctp:162
 #: 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:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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:156
+#: View/Events/automation.ctp:166
 #: 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:159
+#: View/Events/automation.ctp:169
 #: 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:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr "Scarica allegato o sample malware"
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr "Scarica sample malware tramite hash"
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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:172
+#: View/Events/automation.ctp:182
 #: 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:173
+#: View/Events/automation.ctp:183
 #: 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:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr "POST message payload (XML)"
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr "POST message payload (XML)"
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: 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:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: 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:187
+#: View/Events/automation.ctp:197
 #: 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:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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:191
+#: View/Events/automation.ctp:201
 #: 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:192
+#: View/Events/automation.ctp:202
 #: 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:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr "Sono attesi i seguenti parametri facoltativi"
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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:205
+#: View/Events/automation.ctp:215
 #: 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:206
+#: View/Events/automation.ctp:216
 #: 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:207
+#: View/Events/automation.ctp:217
 #: 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:208
+#: View/Events/automation.ctp:218
 #: 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:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: 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:211
+#: View/Events/automation.ctp:221
 #: 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:214
+#: View/Events/automation.ctp:224
 #: 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:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr "Proposte e l'API"
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: 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:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr "HTTP"
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:74
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -10837,200 +11249,200 @@ msgstr "HTTP"
 msgid "URL"
 msgstr "URL"
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr "Istruzioni"
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr "Expected Payload"
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
 #: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr "Response"
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr "Visualizza una proposta"
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr "Oggetto ShadowAttribute"
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: 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:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr "Oggetti ShadowAttribute"
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: 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:253
+#: View/Events/automation.ctp:263
 #: 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:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr "Proporre una modifica a un attributo"
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr "Accetta proposta"
 
-#: View/Events/automation.ctp:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr "Scarta proposta"
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: 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:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr "Filtra i metadati dell'evento"
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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:291
+#: View/Events/automation.ctp:301
 #: 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:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr "L'elenco dei parametri validi"
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: 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:305
+#: View/Events/automation.ctp:315
 #: 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:306
+#: View/Events/automation.ctp:316
 #: 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:307
+#: View/Events/automation.ctp:317
 #: 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:308
+#: View/Events/automation.ctp:318
 #: 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:309
+#: View/Events/automation.ctp:319
 #: 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:310
+#: View/Events/automation.ctp:320
 #: 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:311
+#: View/Events/automation.ctp:321
 #: 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:312
+#: View/Events/automation.ctp:322
 #: 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:313
+#: View/Events/automation.ctp:323
 #: 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:314
+#: View/Events/automation.ctp:324
 #: 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:315
+#: View/Events/automation.ctp:325
 #: 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:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 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:322
+#: View/Events/automation.ctp:332
 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:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -11226,7 +11638,7 @@ msgid "Ongoing"
 msgstr "In corso"
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr "Obiettivo"
@@ -11278,18 +11690,18 @@ msgstr "Input file"
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 msgid "Events"
 msgstr "Eventi"
 
 #: View/Events/index.ctp:34
 #: View/Logs/admin_index.ctp:54
 #: View/Servers/preview_index.ctp:37
-#: View/Users/admin_index.ctp:54
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr "Modifica filtri"
 
@@ -11325,6 +11737,12 @@ msgstr "Le funzionalità di automazione sono progettate per generare automaticam
 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/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/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."
@@ -11777,7 +12195,6 @@ msgstr "Attributi aggiunti con successo"
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -11918,6 +12335,7 @@ msgid "View request details"
 msgstr "Guarda i dettagli dell'evento"
 
 #: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
 #: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr "Disabilitato"
@@ -12079,7 +12497,7 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: View/Feeds/index.ctp:105
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -12113,78 +12531,81 @@ msgstr "Questa operazione cancella tutte le correlazioni esistenti per questo at
 msgid "Add MISP Feed"
 msgstr "Aggiungi MISP feed"
 
-#: View/Feeds/add.ctp:5
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
+msgstr ""
+
+#: View/Feeds/add.ctp:12
 msgid "Add a new MISP feed source."
 msgstr "Agiungi una nuova sorgente feed."
 
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
+#: View/Feeds/add.ctp:14
 #: View/Feeds/view.ctp:64
 msgid "Caching enabled"
 msgstr ""
 
-#: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr ""
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:21
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr "Nome feed"
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
 #: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:26
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr "Sorgente di input"
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:66
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr ""
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:75
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr "URL del feed"
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:79
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr "Formato sorgente"
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:38
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr ""
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:42
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr ""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:46
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr "Inserisci autenticazione base"
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:50
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr "Username"
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:54
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -12193,127 +12614,126 @@ msgstr "Username"
 msgid "Password"
 msgstr "Password"
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:58
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr "Inserisci header di authenticazione"
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:88
-msgid "Target Event"
-msgstr "Evento di destinazione"
-
 #: View/Feeds/add.ctp:94
 #: View/Feeds/edit.ctp:98
-msgid "Target Event ID"
-msgstr "ID evento di destinazione"
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:100
-msgid "Leave blank unless you want to reuse an existing event."
+msgid "Creator organisation"
 msgstr ""
 
 #: View/Feeds/add.ctp:104
 #: View/Feeds/edit.ctp:108
-msgid "Value field(s) in the CSV"
-msgstr ""
+msgid "Target Event"
+msgstr "Evento di destinazione"
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:109
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr ""
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:111
-msgid "2,3,4 (column position separated by commas)"
-msgstr ""
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:119
-msgid "Delimiter"
-msgstr "Separatore"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
+msgstr "ID evento di destinazione"
 
 #: View/Feeds/add.ctp:116
 #: View/Feeds/edit.ctp:120
-msgid "Set the default CSV delimiter (default = \",\")"
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr ""
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr ""
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
 msgstr ""
 
 #: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:130
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr ""
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr "Separatore"
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
+msgid "Set the default CSV delimiter (default = \",\")"
+msgstr ""
+
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr "Regex esclusivo"
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:131
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr ""
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:141
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr "Auto pubblicazione"
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 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:148
-#: View/Feeds/edit.ctp:150
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr "Ignora i flag IDS"
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:151
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr "Se abilitato ai flag IDS verrà sempre assegnato il valore 'off' quando scaricati da questo feed"
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:160
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr "Unione differenziale"
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:161
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr "Unisci gli attributi (aggiungi nuovi attributi, rimuovi attributi revocati)"
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr "Default Tag"
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:193
-msgid "Filter rules"
-msgstr "Regole di filtro"
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:194
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr "Eventi con i seguenti tag permessi"
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:195
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr "Eventi con i seguenti tag bloccati"
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:196
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr "Gli eventi con le seguenti organizzazioni sono abilitati"
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:197
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr "Gli eventi con le seguenti organizzazioni sono bloccati"
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:198
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
 #: View/Servers/add.ctp:116
 #: View/Servers/edit.ctp:155;162
 msgid "Modify"
@@ -12331,64 +12751,64 @@ msgstr ""
 msgid "Edit MISP Feed"
 msgstr "Modifica feed del MISP"
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr "Modifica un nuovo feed MISP."
 
-#: View/Feeds/edit.ctp:133
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr "Pattern regex, per esempio: \"/^https://myfeedurl/i\""
 
-#: View/Feeds/edit.ctp:213
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr "Indica la url del server esterno con cui sincronizzarsi. Esempio: https://misppriv.circl.lu"
 
-#: View/Feeds/edit.ctp:214
+#: View/Feeds/edit.ctp:234
 #: View/Servers/add.ctp:146
 #: View/Servers/edit.ctp:190
 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:215
+#: View/Feeds/edit.ctp:235
 #: View/Servers/add.ctp:147
 #: View/Servers/edit.ctp:189
 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:216
+#: View/Feeds/edit.ctp:236
 #: View/Servers/add.ctp:148
 #: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:217
+#: View/Feeds/edit.ctp:237
 #: View/Servers/add.ctp:149
 #: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
-#: View/Feeds/edit.ctp:218
+#: View/Feeds/edit.ctp:238
 #: View/Servers/add.ctp:150
 #: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:219
+#: View/Feeds/edit.ctp:239
 #: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:220
+#: View/Feeds/edit.ctp:240
 #: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:221
+#: View/Feeds/edit.ctp:241
 #: View/Servers/edit.ctp:196
 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:222
+#: View/Feeds/edit.ctp:242
 #: View/Servers/add.ctp:154
 #: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
@@ -12418,137 +12838,128 @@ msgstr ""
 msgid "Feed metadata JSON"
 msgstr ""
 
-#: View/Feeds/index.ctp:2
-msgid "Feeds"
-msgstr "Feeds"
-
-#: 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 "Recuperare e archiviare i dati di tutti i feed"
-
-#: View/Feeds/index.ctp:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr "Attiva selezionati"
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr "Disattiva selezionati"
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr "Disattivare la cache per selezionato"
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr "Feeds predefiniti"
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr "Feed personalizzati"
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr "Tutti i feeds"
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr "Abilita feeds"
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr ""
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr "Formato feed"
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr "Input"
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr "Sovrascrivere IDS"
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr "Caching"
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: View/Pages/doc/using_the_system.ctp:145
+#: View/Sightings/ajax/list_sightings.ctp:8
+#: View/Users/statistics_sightings.ctp:9
+msgid "Source"
+msgstr "Fonte"
+
+#: View/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr ""
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:55
-#: View/Servers/index.ctp:120;121
-msgid "Rules"
-msgstr "Regole"
+msgid "Override"
+msgstr ""
 
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
-msgstr "Errore: Evento non valido!"
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
+msgstr ""
 
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
-msgstr "Eventi corretti %s"
+#: View/Feeds/index.ctp:196
+msgid "Visible"
+msgstr ""
 
 #: View/Feeds/index.ctp:211
-msgid "New fixed event"
+msgid "Feeds"
+msgstr "Feeds"
+
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
 msgstr ""
 
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:141
-msgid "Age: "
-msgstr "Età: "
-
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:149
-msgid "Not cached"
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr "Recuperare e archiviare i dati di tutti i feed"
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr "Esplorare gli eventi in modalità remota"
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr "Tutti gli eventi"
 
-#: View/Feeds/index.ctp:283
-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:294
+msgid "Are you sure you want to permanently remove the feed?"
+msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -12601,26 +13012,39 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr "versione"
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
 #: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr "Namespace"
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr "Galaxy ID"
 
-#: View/Galaxies/view.ctp:29
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr ""
 
@@ -12628,33 +13052,30 @@ msgstr ""
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:23
-#: View/Pages/doc/using_the_system.ctp:145
-#: View/Sightings/ajax/list_sightings.ctp:8
-#: View/Users/statistics_sightings.ctp:9
-msgid "Source"
-msgstr "Fonte"
-
-#: View/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr "Autori"
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -12663,22 +13084,16 @@ msgstr ""
 msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr "Sinonimi"
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
 msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
@@ -12689,6 +13104,27 @@ msgstr "Chiave"
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Inbox/index.ctp:31
+#: 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 "Titolo"
+
+#: View/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr ""
@@ -12709,12 +13145,6 @@ msgstr "Completato."
 msgid "Show all queues"
 msgstr "Visualizza tutte le code"
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr "Default"
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr "Visualizza la coda predefinita"
@@ -12752,6 +13182,11 @@ msgstr ""
 msgid "Job type"
 msgstr ""
 
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
+msgstr "Input"
+
 #: View/Jobs/index.ctp:106
 #: View/Pages/doc/administration.ctp:229
 msgid "Retries"
@@ -12833,6 +13268,7 @@ msgstr "dall'IP"
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
 #: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -12840,13 +13276,6 @@ msgstr "dall'IP"
 msgid "Organisation"
 msgstr "Organizzazione"
 
-#: 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 "Titolo"
-
 #: View/Logs/admin_search.ctp:21
 #: View/Pages/doc/administration.ctp:186;199
 msgid "Change"
@@ -12897,10 +13326,6 @@ msgstr "ref"
 msgid "geographical_area"
 msgstr "area geografica"
 
-#: View/Noticelists/index.ctp:35
-msgid "version"
-msgstr "versione"
-
 #: View/Noticelists/index.ctp:36
 #: View/Pages/doc/using_the_system.ctp:371
 msgid "enabled"
@@ -13468,7 +13893,7 @@ msgstr "Mostra tutto"
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr "Logo"
 
@@ -13502,12 +13927,12 @@ msgid "Last modified"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:37
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:35
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr "Nazionalità"
 
@@ -14049,7 +14474,7 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:76
+#: View/Users/admin_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -14060,7 +14485,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -14073,7 +14498,7 @@ 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr ""
 
@@ -14126,6 +14551,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -15440,10 +15866,6 @@ msgstr ""
 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 "clicca qui"
-
 #: 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 ""
@@ -17225,10 +17647,6 @@ msgstr ""
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:164
-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 ""
@@ -17609,10 +18027,6 @@ msgstr ""
 msgid "Distribution List"
 msgstr ""
 
-#: View/SharingGroups/view.ctp:12
-msgid "Selectable"
-msgstr ""
-
 #: View/SharingGroups/view.ctp:28
 msgid "Synced by"
 msgstr ""
@@ -17621,10 +18035,6 @@ msgstr ""
 msgid "Quick Search"
 msgstr ""
 
-#: View/Sightingdb/index.ctp:55
-msgid "Owner"
-msgstr ""
-
 #: View/Sightingdb/index.ctp:61
 msgid "Host"
 msgstr ""
@@ -17785,6 +18195,11 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+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 ""
@@ -18125,6 +18540,45 @@ msgstr ""
 msgid "Are you sure you wish to delete this entry?"
 msgstr ""
 
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr ""
@@ -18182,12 +18636,12 @@ msgstr ""
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr ""
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr ""
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
@@ -18197,7 +18651,7 @@ msgstr ""
 
 #: View/Users/admin_edit.ctp:69
 #: View/Users/admin_view.ctp:69
-#: View/Users/view.ctp:29
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr ""
 
@@ -18300,30 +18754,68 @@ msgstr "Rimuovi filtri"
 msgid "Apply filters"
 msgstr "Applica filtri"
 
-#: 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 "Utenti"
-
-#: View/Users/admin_index.ctp:7
+#: View/Users/admin_index.ctp:3
 msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
 msgstr ""
 
-#: View/Users/admin_index.ctp:10
+#: View/Users/admin_index.ctp:6
 msgid "here"
 msgstr ""
 
-#: View/Users/admin_index.ctp:13;14
+#: View/Users/admin_index.ctp:9;10
 msgid "Reset all sync user API keys"
 msgstr ""
 
-#: View/Users/admin_index.ctp:17
+#: View/Users/admin_index.ctp:13
 msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
 msgstr ""
 
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -18336,11 +18828,6 @@ msgstr ""
 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"
@@ -18359,7 +18846,7 @@ msgid "Org_admin"
 msgstr ""
 
 #: View/Users/admin_view.ctp:68
-#: View/Users/view.ctp:28
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr ""
 
@@ -18368,22 +18855,22 @@ msgid "Password change"
 msgstr ""
 
 #: View/Users/admin_view.ctp:78
-#: View/Users/view.ctp:37
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr ""
 
 #: View/Users/admin_view.ctp:83
-#: View/Users/view.ctp:42
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr ""
 
 #: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:49
+#: View/Users/view.ctp:50
 msgid "S/MIME Public certificate"
 msgstr ""
 
 #: View/Users/admin_view.ctp:119
-#: View/Users/view.ctp:64
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr ""
 
@@ -18399,10 +18886,102 @@ msgstr ""
 msgid "SMIME Public certificate (PEM format)"
 msgstr ""
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr ""
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr ""
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+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"
@@ -18418,6 +18997,13 @@ msgstr ""
 msgid "Proposals active"
 msgstr ""
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr "Utenti"
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -18473,15 +19059,15 @@ msgstr ""
 msgid "A heatmap showing the usage of %s."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:38
+#: View/Users/statistics_orgs.ctp:40
 msgid "Activity (1 year)"
 msgstr ""
 
@@ -18537,6 +19123,14 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -18695,6 +19289,7 @@ msgid "boolean"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/Dashboard.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
diff --git a/app/Locale/jpn/LC_MESSAGES/default.po b/app/Locale/jpn/LC_MESSAGES/default.po
index f27211352..09f249c3b 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: 2020-04-24 01:14\n"
+"PO-Revision-Date: 2021-03-26 04:21\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -9,13 +9,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: ja\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: ja_JP\n"
 
 #: Console/Command/AdminShell.php:72
 msgid "Database updated: "
-msgstr ""
+msgstr "データベースの更新日時: "
 
 #: Console/Command/AdminShell.php:74
 msgid "Could not update the database: "
@@ -71,7 +73,8 @@ msgid "MISP mass sync authkey reset command line tool.\n\n"
 msgstr ""
 
 #: Console/Command/AdminShell.php:536
-#: Controller/UsersController.php:1234
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
 msgid "Invalid user."
 msgstr ""
 
@@ -99,7 +102,7 @@ msgstr ""
 #: Console/Command/EventShell.php:15
 #: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1122;1606;1691;2221;2297;2301;2305;2433;2530;2585;2633;2705;2795;3128;5252;5474;5478;5487
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
 #: Model/Galaxy.php:293
 msgid "Invalid event"
@@ -126,51 +129,51 @@ msgstr "冗長モード"
 msgid "interactive mode"
 msgstr "対話モード"
 
-#: Controller/AppController.php:377
+#: Controller/AppController.php:382
 msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
 msgstr ""
 
-#: Controller/AppController.php:377
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
 msgid "Update Progress"
 msgstr "アップデートの状況"
 
-#: Controller/AppController.php:384
+#: Controller/AppController.php:389
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
 msgstr ""
 
-#: Controller/AppController.php:502
+#: Controller/AppController.php:519
 msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
 msgstr ""
 
-#: Controller/AppController.php:710
-#: Controller/AttributesController.php:1876;1985;2089
-#: Controller/EventsController.php:3260
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr "この認証キーには、エクスポートに使用する権限がありません。管理者に問い合わせてください。"
 
-#: Controller/AppController.php:719
-#: Controller/AttributesController.php:2093
-#: Controller/EventsController.php:3264
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr "ログインする必要があります。"
 
-#: Controller/AppController.php:735
+#: Controller/AppController.php:764
 #: Controller/Component/IndexFilterComponent.php:23
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr ""
 
-#: Controller/AppController.php:873
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr "すべて完了しました。attribute_count generated from scratch for "
 
-#: Controller/AppController.php:996
-#: Controller/AttributesController.php:2147
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
 #: Controller/ShadowAttributesController.php:1267
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "ジョブはキューに入れられました。アクティブなジョブビュー (管理 - >ジョブ) に移動すると、進行状況を表示できます。"
 
-#: Controller/AppController.php:1178
+#: Controller/AppController.php:1211
 msgid "RestSearch is not implemented (yet) for this scope."
 msgstr ""
 
@@ -183,19 +186,19 @@ msgstr "イベント ID が設定されていません。"
 msgid "You do not have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:132;422;602;832;3127;3142
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:2092;2113;2147
+#: Controller/EventsController.php:2107;2128;2162
 #: Controller/ObjectsController.php:837
-#: Model/Attribute.php:4304;4308
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "実行する権限がありません。"
 
-#: Controller/AttributesController.php:345;800;805;824;1032;1121;2163;2177;2210;2232;2800;2811;2817;2886;3024;3036;3040
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
 #: Controller/ObjectsController.php:641
 #: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
 #: Controller/TagsController.php:506
-#: Model/Attribute.php:4296
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "無効なアトリビュート"
 
@@ -209,7 +212,7 @@ msgid "Attribute not an attachment or malware-sample"
 msgstr "アトリビュートは添付ファイルまたはマルウェアサンプルではありません"
 
 #: Controller/AttributesController.php:419;586;892;1348
-#: Controller/EventsController.php:4414;4428;5201;5215
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "無効なイベントです。"
 
@@ -259,7 +262,7 @@ msgid "Invalid event id."
 msgstr "無効なイベントID"
 
 #: Controller/AttributesController.php:1072
-#: Controller/EventsController.php:2451
+#: Controller/EventsController.php:2466
 #: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "無効な入力です。"
@@ -284,7 +287,7 @@ msgstr "アトリビュートは削除されました"
 msgid "Attribute was not deleted"
 msgstr "アトリビュートは削除されませんでした"
 
-#: Controller/AttributesController.php:1281;2634
+#: Controller/AttributesController.php:1281;2675
 #: Controller/ShadowAttributesController.php:853
 msgid "Invalid Attribute"
 msgstr "無効なアトリビュート"
@@ -305,104 +308,104 @@ msgstr "このメソッドは AJAX からのみアクセス可能です。"
 msgid "You are not authorized to edit this event."
 msgstr "このイベントを編集する権限がありません。"
 
-#: Controller/AttributesController.php:1516
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "イベント ID が与えられていません。"
 
-#: Controller/AttributesController.php:1561
-#: Controller/GalaxiesController.php:243
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "シノニム: "
 
-#: Controller/AttributesController.php:1871;1978
+#: Controller/AttributesController.php:1912;2019
 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:1884
+#: Controller/AttributesController.php:1925
 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:1904
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "イベントを閲覧する権限がありません。"
 
-#: Controller/AttributesController.php:1967
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "該当はありません。"
 
-#: Controller/AttributesController.php:1989;1998
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "無効なアトリビュートか、閲覧権限がありません。"
 
-#: Controller/AttributesController.php:2124
+#: Controller/AttributesController.php:2165
 #: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "すべて完了しました。 "
 
-#: Controller/AttributesController.php:2156;2203
+#: Controller/AttributesController.php:2197;2244
 #: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "無効な項目がリクエストされました。"
 
-#: Controller/AttributesController.php:2159;2206
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "この機能は AJAX からのみアクセス可能です。"
 
-#: Controller/AttributesController.php:2241
+#: Controller/AttributesController.php:2282
 msgid "You do not have permission to do that"
 msgstr ""
 
-#: Controller/AttributesController.php:2271;2279
-#: Controller/EventsController.php:3643;3796;4999
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "イベントが見つからないか、アトリビュートを作成する権限がありません"
 
-#: Controller/AttributesController.php:2300
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "このアクションは AJAX からのみアクセス可能です。"
 
-#: Controller/AttributesController.php:2309;2560;2574;2585
-#: Controller/OrganisationsController.php:432
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
 #: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "それをする権限がありません。"
 
-#: Controller/AttributesController.php:2414
-#: Controller/EventsController.php:4207
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "この機能には API キーのアクセスが必要です。"
 
-#: Controller/AttributesController.php:2422
+#: Controller/AttributesController.php:2463
 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:2434
+#: Controller/AttributesController.php:2475
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "ハッシュまたはイベント ID を受け取りませんでしたした。2つのうちの少なくとも1つを設定する必要があります。"
 
-#: Controller/AttributesController.php:2595
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "無効なスクリプトです。"
 
-#: Controller/AttributesController.php:2662
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr "このアトリビュートに対する有効なエンリッチメントオプションが見つかりません。"
 
-#: Controller/AttributesController.php:2760
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "無効なタイプがリクエストされました。"
 
-#: Controller/AttributesController.php:2823;3030
+#: Controller/AttributesController.php:2864;3071
 #: Controller/TagCollectionsController.php:254
 msgid "Invalid tag"
 msgstr ""
 
-#: Controller/AttributesController.php:3120
-#: Controller/EventsController.php:5197
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "このインスタンスでは相関の無効化が許可されていません。"
 
-#: Controller/AttributesController.php:3124;3139
+#: Controller/AttributesController.php:3165;3180
 #: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "無効なアトリビュートです。"
@@ -419,6 +422,63 @@ msgstr ""
 msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
 msgstr ""
 
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
 #: Controller/DecayingModelController.php:20
 msgid "Default decaying models updated"
 msgstr ""
@@ -584,452 +644,456 @@ msgstr "無効なイベント ID です。"
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr ""
 
-#: Controller/EventsController.php:879
+#: Controller/EventsController.php:894
 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:881
+#: Controller/EventsController.php:896
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "GnuPG キーが設定されていません。アトリビュートをメールで受け取る場合、公開鍵をプロフィールに追加してください。"
 
-#: Controller/EventsController.php:887
+#: Controller/EventsController.php:902
 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:889
+#: Controller/EventsController.php:904
 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:1716
+#: Controller/EventsController.php:1731
 msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1927
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr "イベントを作成する権限がありません"
 
-#: Controller/EventsController.php:1933
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr "有効なイベントデータを受け取っていません。"
 
-#: Controller/EventsController.php:1969
+#: Controller/EventsController.php:1984
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "無効な共有グループまたは権限がありません (同期ユーザーが共有グループに含まれていません)。"
 
-#: Controller/EventsController.php:1973;1977
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
 msgstr "無効な共有グループ、もしくは権限がありません。"
 
-#: Controller/EventsController.php:2001
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr "ローカルのブラックリストによりイベントがブロックされました。"
 
-#: Controller/EventsController.php:2014;2101;2377
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "イベントが保存されました"
 
-#: Controller/EventsController.php:2022
+#: Controller/EventsController.php:2037
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "イベントはすでに存在しています。編集する場合は、location ヘッダー内の url を使用してください。"
 
-#: Controller/EventsController.php:2028
+#: Controller/EventsController.php:2043
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "ブラックリストのエントリーにより、あなたはイベントを作成できません。 このインスタンスの管理チームに連絡してください"
 
-#: Controller/EventsController.php:2030;2380
+#: Controller/EventsController.php:2045;2395
 msgid "The event could not be saved. Please, try again."
 msgstr "イベントを保存できませんでした。もう一度やり直してください。"
 
-#: Controller/EventsController.php:2079
+#: Controller/EventsController.php:2094
 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:2127
+#: Controller/EventsController.php:2142
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "MISP XML または MISP JSON ファイルのみアップロードできます。"
 
-#: Controller/EventsController.php:2128
+#: Controller/EventsController.php:2143
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "ファイルのアップロードに失敗したか、ファイルの拡張子が予期されたもの (.xml / .json) ではありません。"
 
-#: Controller/EventsController.php:2189
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr "SITX ドキュメントがインポートされ、イベントが作成されました: "
 
-#: Controller/EventsController.php:2192
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr "SITX ドキュメントがインポートされました。"
 
-#: Controller/EventsController.php:2195
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr "SITX ドキュメントをインポートできませんでした: "
 
-#: Controller/EventsController.php:2202
+#: Controller/EventsController.php:2217
 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:2226;2311
+#: Controller/EventsController.php:2241;2326
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "この動作を実行する権限がありません。「アトリビュートの提案」機能を使用してください。"
 
-#: Controller/EventsController.php:2234
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr "無効なイベント ID が入力されました。"
 
-#: Controller/EventsController.php:2239
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr "選択したイベントを読む権限がありません。"
 
-#: Controller/EventsController.php:2536;2640;2711
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr "実行する権限がありません。"
 
-#: Controller/EventsController.php:2545
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr ""
 
-#: Controller/EventsController.php:2652;2722
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr ""
 
-#: Controller/EventsController.php:2804
+#: Controller/EventsController.php:2819
 msgid "You must specify a message."
 msgstr ""
 
-#: Controller/EventsController.php:2823
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr "報告者にメールを送信しました。"
 
-#: Controller/EventsController.php:2832
+#: Controller/EventsController.php:2847
 msgid "Sending of email failed."
 msgstr ""
 
-#: Controller/EventsController.php:2883
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr ""
 
-#: Controller/EventsController.php:2971
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr "この機能は現在無効化されています"
 
-#: Controller/EventsController.php:3097
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr "許可されていないファイル名です。"
 
-#: Controller/EventsController.php:3117
+#: Controller/EventsController.php:3134
 msgid "Problem with writing the IoC file. Please report to site admin."
 msgstr ""
 
-#: Controller/EventsController.php:3211
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr "有効な MISP XML ファイルではありません。"
 
-#: Controller/EventsController.php:3253
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr "未実装"
 
-#: Controller/EventsController.php:3271;3275
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr "無効なイベント、もしくは権限がありません。"
 
-#: Controller/EventsController.php:3467
+#: Controller/EventsController.php:3484
 #: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr "無効なタグです。"
 
-#: Controller/EventsController.php:3483
+#: Controller/EventsController.php:3500
 #: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr "タグはすでにこのイベントに追加されています。"
 
-#: Controller/EventsController.php:3497
+#: Controller/EventsController.php:3514
 msgid "Tag is not allowed due to taxonomy exclusivity settings"
 msgstr ""
 
-#: Controller/EventsController.php:3528;3534
+#: Controller/EventsController.php:3545;3551
 #: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr "タグが追加されました。"
 
-#: Controller/EventsController.php:3530
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr "タグを追加することができませんでした。"
 
-#: Controller/EventsController.php:3536
+#: Controller/EventsController.php:3553
 #: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr ""
 
-#: Controller/EventsController.php:3800;5003;5025;5532;5536
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
 #: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "無効なイベントです。"
 
-#: Controller/EventsController.php:3855;3885;3901
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr "実行する権限がありません。"
 
-#: Controller/EventsController.php:3966;4106
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr "無効な ID"
 
-#: Controller/EventsController.php:3970;4110;4685
+#: Controller/EventsController.php:3987;4128;4703
 msgid "Event not found or you are not authorised to view it."
 msgstr "イベントが見つからない、またはイベントを表示する権限がありません。"
 
-#: Controller/EventsController.php:4116
+#: Controller/EventsController.php:4134
 msgid "Freetext Import"
 msgstr ""
 
-#: Controller/EventsController.php:4122
+#: Controller/EventsController.php:4140
 msgid "Populate using a Template"
 msgstr ""
 
-#: Controller/EventsController.php:4128
+#: Controller/EventsController.php:4146
 msgid "OpenIOC Import"
 msgstr ""
 
-#: Controller/EventsController.php:4133
+#: Controller/EventsController.php:4151
 msgid "ThreatConnect Import"
 msgstr ""
 
-#: Controller/EventsController.php:4138
+#: Controller/EventsController.php:4156
 msgid "(Experimental) Forensic analysis - Mactime"
 msgstr ""
 
-#: Controller/EventsController.php:4157
+#: Controller/EventsController.php:4175
 msgid "MISP standard (recommended exchange format - lossless)"
 msgstr ""
 
-#: Controller/EventsController.php:4163
+#: Controller/EventsController.php:4181
 msgid "STIX 1.1.1 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4168
+#: Controller/EventsController.php:4186
 msgid "STIX 2.0 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4210;4217
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr "オートメーションページの説明に従ってサンプルを POST してください。"
 
-#: Controller/EventsController.php:4246
+#: Controller/EventsController.php:4264
 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:4254
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "イベントが見つかりません"
 
-#: Controller/EventsController.php:4277
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "イベントが見つかりません。"
 
-#: Controller/EventsController.php:4287
+#: Controller/EventsController.php:4305
 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:4312
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "提供された情報を元にした新しいイベントの作成に失敗しました。"
 
-#: Controller/EventsController.php:4451;4472;4531;4556;4581;4611;4632
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr "無効なタイプです。"
 
-#: Controller/EventsController.php:4750
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr "無効なメソッドです。"
 
-#: Controller/EventsController.php:4832
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr "%s サービスが有効化されていません。"
 
-#: Controller/EventsController.php:4836
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "アトリビュートが見つからない、またはアトリビュートを表示する権限がありません。"
 
-#: Controller/EventsController.php:4841
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr "このアトリビュートに対する有効な %s オプションが見つかりません。"
 
-#: Controller/EventsController.php:4896;4942
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr "%s サービスにリーチできません。"
 
-#: Controller/EventsController.php:4908
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr ""
 
-#: Controller/EventsController.php:4959
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ": %s 経由でエンリッチ"
 
-#: Controller/EventsController.php:5114
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr "インポートサービスにリーチできません。"
 
-#: Controller/EventsController.php:5204;5218
+#: Controller/EventsController.php:5222;5236
 #: Controller/PostsController.php:60;84
 #: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
 msgid "You don't have permission to do that."
 msgstr "実行する権限がありません。"
 
-#: Controller/EventsController.php:5345
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr "無効な ID です。"
 
-#: Controller/EventsController.php:5393
+#: Controller/EventsController.php:5411
 #: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr "無効なイベント"
 
-#: Controller/EventsController.php:5414
+#: Controller/EventsController.php:5432
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "エンリッチメントタスクはバックグラウンド処理用のキューに追加されました。後ほど結果を確認してください。"
 
-#: Controller/EventsController.php:5665
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr ""
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr "それを実行するために必要な権限がありません。"
 
-#: Controller/FeedsController.php:241;340
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr "フィードが追加されました。"
 
-#: Controller/FeedsController.php:249
-msgid "Feed could not be added. Invalid field: %s"
-msgstr "フィードを追加できませんでした。無効な項目: %s"
+#: Controller/FeedsController.php:291
+msgid "Feed could not be added. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:274;375;397;526;567;778
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr "無効なフィードです。"
 
-#: Controller/FeedsController.php:348
-msgid "Feed could not be updated. Invalid fields: %s"
-msgstr "フィードを更新できませんでした。無効な項目: %s"
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:371
-#: Controller/OrganisationsController.php:237
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
 #: Controller/SharingGroupsController.php:237
-#: Controller/UsersController.php:1015
+#: Controller/UsersController.php:1044
 msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:404;530
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "フィードは現在有効になっていません。有効化してください。"
 
-#: Controller/FeedsController.php:417;483
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr "フィードから取得を開始します。"
 
-#: Controller/FeedsController.php:428
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr "バックグラウンド実行のためにキューからプル"
 
-#: Controller/FeedsController.php:433;435
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr "フィードの取得に失敗しました。"
 
-#: Controller/FeedsController.php:439;500
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr "フィードの取得が正常に完了しました。"
 
-#: Controller/FeedsController.php:512
+#: Controller/FeedsController.php:563
 msgid "No feed enabled."
 msgstr ""
 
-#: Controller/FeedsController.php:536;555
+#: Controller/FeedsController.php:587;606
 #: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr "ダウンロードに失敗しました。"
 
-#: Controller/FeedsController.php:543
+#: Controller/FeedsController.php:594
 msgid "Event added."
 msgstr "イベントが追加されました。"
 
-#: Controller/FeedsController.php:546
+#: Controller/FeedsController.php:597
 msgid "Event already up to date."
 msgstr "イベントは既に最新です。"
 
-#: Controller/FeedsController.php:548
+#: Controller/FeedsController.php:599
 msgid "Event updated."
 msgstr "イベントが更新されました。"
 
-#: Controller/FeedsController.php:552
+#: Controller/FeedsController.php:603
 msgid "Could not %s event."
 msgstr "イベントを %s できませんでした。"
 
-#: Controller/FeedsController.php:649
+#: Controller/FeedsController.php:700
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "フィードを取得できませんでした。返ってきた HTTP エラーコードは次のとおりです: "
 
-#: Controller/FeedsController.php:688;739
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr "無効なフィードのタイプです。"
 
-#: Controller/FeedsController.php:784;816
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr "選択されたイベントをダウンロードできませんでした"
 
-#: Controller/FeedsController.php:814
+#: Controller/FeedsController.php:865
 msgid "This event is blocked by the Feed filters."
 msgstr "このイベントはフィードのフィルターによってブロックされています。"
 
-#: Controller/FeedsController.php:852;856
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr "無効なフィードです。"
 
-#: Controller/FeedsController.php:877
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr "POST リクエストのみが許可されています。"
 
-#: Controller/FeedsController.php:881
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: Controller/FeedsController.php:890
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr "データがプルされました。"
 
-#: Controller/FeedsController.php:892
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "選択したデータをプルできませんでした。理由: %s"
 
-#: Controller/FeedsController.php:909
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr "フィードのキャッシングを開始しています。"
 
-#: Controller/FeedsController.php:924
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr "フィードのキャッシングに失敗しました。"
 
-#: Controller/FeedsController.php:927
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr "フィードのキャッシングが正常に完了しました。"
 
-#: Controller/FeedsController.php:961
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr "無効なフィードのリストを受け取りました。"
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr "すべてのクラスター"
 
-#: Controller/GalaxiesController.php:174
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr "すべてのネームスペース"
 
-#: Controller/GalaxiesController.php:304
+#: Controller/GalaxiesController.php:337
 msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:307
+#: Controller/GalaxiesController.php:340
 msgid "Failed to parse request."
 msgstr "リクエストをパースできませんでした。"
 
@@ -1112,7 +1176,7 @@ msgid "Object could not be saved."
 msgstr ""
 
 #: Controller/ObjectsController.php:373;1006
-#: Model/Event.php:6171
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr "無効なオブジェクトです。"
 
@@ -1180,43 +1244,43 @@ msgstr ""
 msgid "The organisation could not be added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:156;289;295
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr "無効な組織です。"
 
-#: Controller/OrganisationsController.php:162;242;248;301;328;361
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
 msgid "Invalid organisation"
 msgstr "無効な組織"
 
-#: Controller/OrganisationsController.php:201
+#: Controller/OrganisationsController.php:208
 msgid "Organisation updated."
 msgstr "組織が更新されました。"
 
-#: Controller/OrganisationsController.php:216
+#: Controller/OrganisationsController.php:223
 msgid "The organisation could not be updated."
 msgstr "組織を更新することができませんでした。"
 
-#: Controller/OrganisationsController.php:265
+#: Controller/OrganisationsController.php:272
 msgid "Organisation deleted"
 msgstr "組織が削除されました。"
 
-#: Controller/OrganisationsController.php:272
+#: Controller/OrganisationsController.php:279
 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/OrganisationsController.php:366
+#: Controller/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr "この組織用のランディングページが作成されていません。"
 
-#: Controller/OrganisationsController.php:415
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr ""
 
-#: Controller/OrganisationsController.php:437
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr ""
 
-#: Controller/OrganisationsController.php:440
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr ""
 
@@ -1348,7 +1412,7 @@ msgstr "uuid が既に使用されているため、組織を作成できませ
 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:350;532;2154
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr "サーバーが保存されました"
 
@@ -1356,8 +1420,8 @@ msgstr "サーバーが保存されました"
 msgid "The server could not be saved. Please, try again."
 msgstr "サーバーを保存できませんでした。もう一度やり直してください。"
 
-#: Controller/ServersController.php:411;608;653;656;665;729;735;1489;1506
-#: Model/Server.php:5737
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "無効なサーバー"
 
@@ -1365,7 +1429,7 @@ msgstr "無効なサーバー"
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr "新しい組織を作成できませんでした。uuid が正しいフォーマットであることを確認してください。"
 
-#: Controller/ServersController.php:604;2171;2213
+#: Controller/ServersController.php:604;2183;2225
 msgid "This endpoint expects POST requests."
 msgstr ""
 
@@ -1564,79 +1628,79 @@ msgstr ""
 msgid "This setting can only be edited via the CLI."
 msgstr ""
 
-#: Controller/ServersController.php:1365
+#: Controller/ServersController.php:1365;1377
 msgid "Restarting workers."
 msgstr ""
 
-#: Controller/ServersController.php:1389
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "ファイルが見つかりません"
 
-#: Controller/ServersController.php:1395
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "ファイルを削除できませんでした。"
 
-#: Controller/ServersController.php:1418;1434
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr "アップロードに失敗しました。"
 
-#: Controller/ServersController.php:1426
+#: Controller/ServersController.php:1438
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "ファイルは既に存在します。更新したい場合、まず古いファイルを削除してください。"
 
-#: Controller/ServersController.php:1493
+#: Controller/ServersController.php:1505
 msgid "Invalid user or user not found."
 msgstr ""
 
-#: Controller/ServersController.php:2040
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr "サーバーのキャッシングを開始しています。"
 
-#: Controller/ServersController.php:2055
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:2058
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
-#: Controller/ServersController.php:2088
+#: Controller/ServersController.php:2100
 msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2097
+#: Controller/ServersController.php:2109
 msgid "Configured host org not found. Please make sure that the setting is current on the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2161
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ServersController.php:2182
+#: Controller/ServersController.php:2194
 msgid "API key updated."
 msgstr ""
 
-#: Controller/ServersController.php:2195
+#: Controller/ServersController.php:2207
 msgid "ID has to be a valid server connection"
 msgstr ""
 
-#: Controller/ServersController.php:2198
+#: Controller/ServersController.php:2210
 msgid "Invalid direction. Valid options: "
 msgstr ""
 
-#: Controller/ServersController.php:2202
+#: Controller/ServersController.php:2214
 msgid "Priority changed."
 msgstr ""
 
-#: Controller/ServersController.php:2205
+#: Controller/ServersController.php:2217
 msgid "Priority could not be changed."
 msgstr ""
 
-#: Controller/ServersController.php:2216
+#: Controller/ServersController.php:2228
 msgid "Only site admin accounts can release the update lock."
 msgstr ""
 
-#: Controller/ServersController.php:2226
+#: Controller/ServersController.php:2238
 msgid "Only site admin accounts get the DB schema diagnostic."
 msgstr ""
 
@@ -1967,164 +2031,174 @@ msgstr "追加されたイベント、 "
 msgid "Event populated, but "
 msgstr "追加されたイベント、しかし "
 
-#: Controller/UserSettingsController.php:123;312
+#: Controller/UserSettingsController.php:129;276
 msgid "Invalid ID passed."
 msgstr ""
 
-#: Controller/UserSettingsController.php:133;137;322;326
+#: Controller/UserSettingsController.php:139;143;286;290
 msgid "Invalid user setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:151;192;278;290
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
 msgid "Invalid setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:155;196;330
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
 msgid "This setting is restricted and requires the following permission(s): %s"
 msgstr ""
 
-#: Controller/UserSettingsController.php:189
-msgid "This endpoint expects both a setting and a value to be set."
-msgstr ""
-
-#: Controller/UserSettingsController.php:229
+#: Controller/UserSettingsController.php:193
 msgid "Setting saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:242
+#: Controller/UserSettingsController.php:206
 msgid "Setting could not be saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:337
+#: Controller/UserSettingsController.php:301
 msgid "Setting deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:345
+#: Controller/UserSettingsController.php:309
 msgid "Setting could not be deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:358
+#: Controller/UserSettingsController.php:322
 msgid "Expecting POST or DELETE request."
 msgstr ""
 
-#: Controller/UsersController.php:42;310
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr "無効なユーザ、もしくは権限がありません。"
 
-#: Controller/UsersController.php:62;538;786;805;1030
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "無効なユーザー"
 
-#: Controller/UsersController.php:150;693;858
+#: Controller/UsersController.php:154;722;887
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr "無効なEメールドメインです。ユーザーは、次のいずれかのドメインに限定されます。 "
 
-#: Controller/UsersController.php:202
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr "このプロフィールはアップデートされました"
 
-#: Controller/UsersController.php:207
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr "プロフィールを更新できませんでした。もう一度やり直してください。"
 
-#: Controller/UsersController.php:247
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:256
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:276
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "パスワードが変更されました。"
 
-#: Controller/UsersController.php:285
+#: Controller/UsersController.php:299
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "パスワードを更新できませんでした。パスワードの最小長/複雑さの要件を満たしてください。"
 
-#: Controller/UsersController.php:422;440;547
-#: Model/Log.php:370
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:704
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr "ユーザーを保存できませんでした。無効な組織です。"
 
-#: Controller/UsersController.php:726
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "ユーザーが保存されました。"
 
-#: Controller/UsersController.php:735;966
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr "ユーザーを保存できませんでした。もう一度やり直してください。"
 
-#: Controller/UsersController.php:958
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "ユーザーが保存されました。"
 
-#: Controller/UsersController.php:1038
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "ユーザが削除されました"
 
-#: Controller/UsersController.php:1042
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "ユーザが削除されませんでした"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "無効なユーザー名またはパスワード、もう一度やり直してください。"
 
-#: Controller/UsersController.php:1208
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr "さようなら"
 
-#: Controller/UsersController.php:1230
-msgid "Invalid action."
-msgstr ""
-
-#: Controller/UsersController.php:1237
-msgid "New authkey generated."
-msgstr "新しい認証キーが生成されました。"
-
-#: Controller/UsersController.php:1248
+#: Controller/UsersController.php:1273;1297
 msgid "This functionality is only accessible via POST requests."
 msgstr ""
 
-#: Controller/UsersController.php:1252
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
+msgid "New authkey generated."
+msgstr "新しい認証キーが生成されました。"
+
+#: Controller/UsersController.php:1301
 msgid "Job initiated."
 msgstr ""
 
-#: Controller/UsersController.php:1254
+#: Controller/UsersController.php:1303
 msgid "%s authkeys reset, %s could not be reset."
 msgstr ""
 
-#: Controller/UsersController.php:1368
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr "あなたは利用規約に同意しました。"
 
-#: Controller/UsersController.php:1496
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1501
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1538
+#: Controller/UsersController.php:1587
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr "メールを送信しましたが、次の宛先への配信に失敗しました: "
 
-#: Controller/UsersController.php:1540
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr "メールが送信されました。"
 
-#: Controller/UsersController.php:1614
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr ""
 
-#: Controller/UsersController.php:1615
+#: Controller/UsersController.php:1664
 #: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
@@ -2134,11 +2208,11 @@ msgstr ""
 msgid "Organisations"
 msgstr "組織"
 
-#: Controller/UsersController.php:1616
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr ""
 
-#: Controller/UsersController.php:1617
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
 #: View/DecayingModel/decaying_tool_rest_search.ctp:28
 #: View/Elements/eventattribute.ctp:151
@@ -2164,18 +2238,160 @@ msgstr ""
 msgid "Tags"
 msgstr "タグ"
 
-#: Controller/UsersController.php:1618
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr ""
 
-#: Controller/UsersController.php:1619
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1620
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr ""
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "Yes"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "No"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr ""
@@ -2256,11 +2472,11 @@ msgstr ""
 msgid "No valid data received."
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:614
+#: Controller/Component/ACLComponent.php:634
 msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:668
+#: Controller/Component/ACLComponent.php:688
 msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
 msgstr ""
 
@@ -2741,87 +2957,87 @@ msgstr ""
 msgid "Invalid %s."
 msgstr ""
 
-#: Model/AppModel.php:1416
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr ""
 
-#: Model/AppModel.php:1430
+#: Model/AppModel.php:1480
 msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1452
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1453
+#: Model/AppModel.php:1503
 msgid "The executed SQL query was: %s"
 msgstr ""
 
-#: Model/AppModel.php:1455
+#: Model/AppModel.php:1505
 msgid "Successfuly executed the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1466;1530
+#: Model/AppModel.php:1516;1580
 msgid "Issues executing the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1469
+#: Model/AppModel.php:1519
 msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1478
+#: Model/AppModel.php:1528
 msgid "However, as this error is whitelisted, the update went through."
 msgstr ""
 
-#: Model/AppModel.php:1497
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/AppModel.php:1500
+#: Model/AppModel.php:1550
 msgid "Failed to add index"
 msgstr ""
 
-#: Model/AppModel.php:1502
+#: Model/AppModel.php:1552
 msgid "The returned error is:"
 msgstr ""
 
-#: Model/AppModel.php:1531
+#: Model/AppModel.php:1581
 msgid "Database updates stopped as some errors occured and the stop flag is enabled."
 msgstr ""
 
-#: Model/AppModel.php:1690
+#: Model/AppModel.php:1740
 msgid "Invalid JSON."
 msgstr ""
 
-#: Model/AppModel.php:1783;1841
+#: Model/AppModel.php:1833;1891
 msgid "Issues executing run_updates"
 msgstr ""
 
-#: Model/AppModel.php:1784
+#: Model/AppModel.php:1834
 msgid "Database updates are locked. Worker not spawned"
 msgstr ""
 
-#: Model/AppModel.php:1788;1846;1881
+#: Model/AppModel.php:1838;1896;1931
 msgid "Update done"
 msgstr ""
 
-#: Model/AppModel.php:1842
+#: Model/AppModel.php:1892
 msgid "Updates are locked. Stopping worker gracefully"
 msgstr ""
 
-#: Model/AppModel.php:1861
+#: Model/AppModel.php:1911
 msgid "Running update %s"
 msgstr ""
 
-#: Model/AppModel.php:1887
+#: Model/AppModel.php:1937
 msgid "Update done in another worker. Gracefuly stopping."
 msgstr ""
 
@@ -3805,19 +4021,19 @@ msgstr "値は0以上の数値でなければなりません。"
 msgid "The value has to be a number between 0 and 10."
 msgstr "値は0から10の間の数値でなければなりません。"
 
-#: Model/Attribute.php:2278;2346
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr "ユーザーを読み込みできません。"
 
-#: Model/Attribute.php:2282
+#: Model/Attribute.php:2301
 msgid "Invalid hash type."
 msgstr "無効なハッシュのタイプです。"
 
-#: Model/Attribute.php:2973
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr "この項目は必須です。"
 
-#: Model/Attribute.php:3540
+#: Model/Attribute.php:3559
 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 を受信しました。"
 
@@ -3837,6 +4053,10 @@ msgstr ""
 msgid "Community not found."
 msgstr ""
 
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
 #: Model/DecayingModel.php:162
 msgid "Models could not be loaded or default decaying models folder is empty"
 msgstr ""
@@ -3908,67 +4128,75 @@ msgstr ""
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5722
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr "stix ファイルの読み込み中に問題が発生しました。  "
 
-#: Model/Event.php:5724
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr "maec ライブラリの問題。 "
 
-#: Model/Event.php:5726
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "インジェスチョンスクリプト実行時の問題または無効な入力です。 "
 
-#: Model/Event.php:5729
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr "Please ask your administrator to "
 
-#: Model/Event.php:5731
+#: Model/Event.php:5808
 msgid "Please "
 msgstr "Please "
 
-#: Model/Event.php:5733
+#: Model/Event.php:5810
 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:5765
+#: Model/Event.php:5842
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:5774
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr "%s が設定されていません"
 
-#: Model/Event.php:6023
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr "タグを追加できませんでした。"
 
-#: Model/Event.php:6505
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:1444;1488
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1458
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Feed.php:1635
+#: Model/Feed.php:1687
 msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Feed.php:1638
+#: Model/Feed.php:1690
 msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
 msgstr ""
 
-#: Model/Feed.php:1643
+#: Model/Feed.php:1695
 msgid "Invalid user id."
 msgstr ""
 
-#: Model/Feed.php:1663
+#: Model/Feed.php:1715
 msgid "Events related to feed %s purged."
 msgstr ""
 
@@ -3976,1164 +4204,1208 @@ msgstr ""
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:1057
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
-#: Model/Server.php:140
+#: Model/Server.php:123
+msgid "Server unreachable"
+msgstr ""
+
+#: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
 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:141
+#: Model/Server.php:151
 msgid "Administering MISP via the CLI"
 msgstr "CLI 経由での MISP の管理"
 
-#: Model/Server.php:153
+#: Model/Server.php:163
 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:154
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "特定のコンソールタスクの自動化"
 
-#: Model/Server.php:163
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:164
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:173
+#: Model/Server.php:183
 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:175
+#: Model/Server.php:185
 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:181
+#: Model/Server.php:191
 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:189
+#: Model/Server.php:199
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr "true に設定しない限り、サイト管理者のみがインスタンスにアクセスできます。"
 
-#: Model/Server.php:197
+#: Model/Server.php:207
 msgid "Select the language MISP should use. The default is english."
 msgstr "MISP で使用する言語を選択します。デフォルトは英語です。"
 
-#: Model/Server.php:207
+#: Model/Server.php:217
 msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
-#: Model/Server.php:216
+#: Model/Server.php:226
 msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
 msgstr ""
 
-#: Model/Server.php:225
+#: Model/Server.php:235
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "パフォーマンスが重い相関を有効化 (現時点では CIDR の相関)"
 
-#: Model/Server.php:234
+#: Model/Server.php:244
 msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
 msgstr ""
 
-#: Model/Server.php:243
+#: Model/Server.php:253
 msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
 msgstr ""
 
-#: Model/Server.php:254
+#: Model/Server.php:264
 msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
 msgstr ""
 
-#: Model/Server.php:264
+#: Model/Server.php:274
 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:273
+#: Model/Server.php:283
 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:281
+#: Model/Server.php:291
 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:290
+#: Model/Server.php:300
 msgid "The message that users will see if the instance is not live."
 msgstr "インスタンスが動作していない場合、ユーザーに表示されるメッセージ。"
 
-#: Model/Server.php:292
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr "設定されていない場合、デフォルト値が使用されます。"
 
-#: Model/Server.php:298;306;333;357;365;373;381;438;486;494;561
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr "この設定は廃止されたので、安全に削除できます。"
 
-#: Model/Server.php:314
+#: Model/Server.php:324
 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:324
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr ""
 
-#: Model/Server.php:341
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "\"Powered by MISP\" テキストの前にあるフッターのテキスト。"
 
-#: Model/Server.php:349
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "\"Powered by MISP\" テキストに続くフッターのテキスト。"
 
-#: Model/Server.php:389
+#: Model/Server.php:399
 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:397
+#: Model/Server.php:407
 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:405
+#: Model/Server.php:415
 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:413
+#: Model/Server.php:423
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr "ホスティング組織の組織タグ。 Eメールのサブジェクトで使用されます。"
 
-#: Model/Server.php:421
+#: Model/Server.php:431
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr "このインスタンスのホスティング組織。 これを選択しない限り、レプリケーションインスタンスを追加することができません。"
 
-#: Model/Server.php:430
+#: Model/Server.php:440
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr "MISP インスタンスの UUID。 UUID は、インスタンスを識別するために使用されます。"
 
-#: Model/Server.php:432
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr "有効な UUID が設定されていません"
 
-#: Model/Server.php:446
+#: Model/Server.php:456
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr "この設定を 'false' に設定すると、組織名 / ロゴがすべて非表示になります。"
 
-#: Model/Server.php:454
+#: Model/Server.php:464
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr "通知Eメールのサブジェクトに、イベントの脅威レベルを挿入します。"
 
-#: Model/Server.php:462
+#: Model/Server.php:472
 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:470
+#: Model/Server.php:480
 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:478
+#: Model/Server.php:488
 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:502
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr "MISP のバックグラウンド処理を有効化します。"
 
-#: Model/Server.php:510
+#: Model/Server.php:520
 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:520
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "XML キャッシュにエンコードされた添付ファイルを含むことを許可します。"
 
-#: Model/Server.php:528
+#: Model/Server.php:538
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr "ユーザーがブラウザで読み込んだとき、常に添付ファイルをダウンロードする"
 
-#: Model/Server.php:536
+#: Model/Server.php:546
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr "MISP がすべての通知に使用するEメールアドレス"
 
-#: Model/Server.php:544
+#: Model/Server.php:554
 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:553
+#: Model/Server.php:563
 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:569
+#: Model/Server.php:579
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr "Vulnerability タイプのアトリビュートを、提供された CVE 検索と関連づけるリンクに変換"
 
-#: Model/Server.php:577
+#: Model/Server.php:587
 msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
 msgstr ""
 
-#: Model/Server.php:585
+#: Model/Server.php:595
 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:593
+#: Model/Server.php:603
 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:601
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr "イベント用のデフォルトのディストリビューション設定 (0-3)。"
 
-#: Model/Server.php:610
+#: Model/Server.php:620
 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:619
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr "イベントを作成する際のデフォルトの脅威レベル。"
 
-#: Model/Server.php:628
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:637
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr "MISP のタグ付け機能を有効化します。これを強くお勧めします。"
 
-#: Model/Server.php:645
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr "イベントインデックスですべてのタグ名を表示します。"
 
-#: Model/Server.php:654
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr "ログインページにおいて、MISP のロゴの前に使用"
 
-#: Model/Server.php:662
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr "ログインページにおいて、MISP のロゴの後に使用"
 
-#: Model/Server.php:670
+#: Model/Server.php:689
 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:678
+#: Model/Server.php:697
 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:686
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr "ページタイトルにおいて、ページの名前の後に使用"
 
-#: Model/Server.php:694
+#: Model/Server.php:713
 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:702
+#: Model/Server.php:721
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr "利用規約をインラインで表示するか (false) またはダウンロードして表示するか (true) を選択"
 
-#: Model/Server.php:710
+#: Model/Server.php:729
 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:718
+#: Model/Server.php:737
 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:726
+#: Model/Server.php:745
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr "True は、未公開イベントに対して、サイト管理者以外の投稿者の所属組織外のユーザーからのアクセスを拒否します。"
 
-#: Model/Server.php:735
+#: Model/Server.php:754
 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:744
+#: Model/Server.php:763
 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:752
+#: Model/Server.php:771
 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:759
+#: Model/Server.php:778
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr "ブラックリスト化された組織によるイベントの作成を防ぐために、組織のUUIDをブラックリストに登録します。"
 
-#: Model/Server.php:766
+#: Model/Server.php:785
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr "有効化すると、すべてのログエントリーにユーザーの IP アドレスが含まれます。"
 
-#: Model/Server.php:775
+#: Model/Server.php:794
 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:783
+#: Model/Server.php:802
 msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
 msgstr ""
 
-#: Model/Server.php:785
+#: Model/Server.php:804
 msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
 msgstr ""
 
-#: Model/Server.php:792
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:801
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:810
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:819
+#: Model/Server.php:838
 msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
 msgstr ""
 
-#: Model/Server.php:828
+#: Model/Server.php:847
 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:837
+#: Model/Server.php:856
 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:846
+#: Model/Server.php:865
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr "有効化すると、イベントへの提案の数がインデックスに表示されます。"
 
-#: Model/Server.php:855
+#: Model/Server.php:874
 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:864
+#: Model/Server.php:883
 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:873
+#: Model/Server.php:892
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr "有効化すると、組織とサイトの管理者のみがユーザーのプロフィールを編集することができます。"
 
-#: Model/Server.php:883
+#: Model/Server.php:902
 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:892
+#: Model/Server.php:911
 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:901
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:910
+#: Model/Server.php:929
 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:919
+#: Model/Server.php:938
 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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:928
+#: Model/Server.php:947
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:937
+#: Model/Server.php:956
 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:947
+#: Model/Server.php:966
 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:956
+#: Model/Server.php:975
 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:965
+#: Model/Server.php:984
 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:974
+#: Model/Server.php:993
 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:984
+#: Model/Server.php:1003
 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:993
+#: Model/Server.php:1012
 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:1001
+#: Model/Server.php:1020
 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:1009
+#: Model/Server.php:1028
 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:1017
+#: Model/Server.php:1036
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr "一般的な MISP タスクに使用する Redis サーバーのパスワード (存在する場合)。"
 
-#: Model/Server.php:1026
+#: Model/Server.php:1045
 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:1034
+#: Model/Server.php:1053
 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:1042
+#: Model/Server.php:1061
 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:1051
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:1062
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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:1071
+#: Model/Server.php:1099
 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:1079
+#: Model/Server.php:1107
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr "暗号化されていないEメールの本文にイベントに関する詳細を含めることを許可 (false) します。"
 
-#: Model/Server.php:1087
+#: Model/Server.php:1115
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr "GnuPG Eメールの署名を有効化します。 デフォルトでは、GnuPG Eメールは署名されます"
 
-#: Model/Server.php:1095
+#: Model/Server.php:1123
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr "このインスタンスの GnuPG キーと紐づいているEメールアドレス。"
 
-#: Model/Server.php:1103
+#: Model/Server.php:1131
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr "このインスタンスの GnuPG キーのパスワード (設定されている場合)。"
 
-#: Model/Server.php:1112
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr "GnuPG ホームディレクトリの場所。"
 
-#: Model/Server.php:1123
+#: Model/Server.php:1151
 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:1131
+#: Model/Server.php:1159
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr "このインスタンスの SMIME キーと紐づいているEメールアドレス。"
 
-#: Model/Server.php:1139
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr "署名証明書の public half の場所。"
 
-#: Model/Server.php:1147
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr "署名証明書の private half の場所。"
 
-#: Model/Server.php:1155
+#: Model/Server.php:1183
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr "このインスタンスの SMIME キーのパスワード (設定されている場合)。"
 
-#: Model/Server.php:1167
+#: Model/Server.php:1195
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr "外部の同期リクエスト用の HTTP プロキシのホスト名。 プロキシーを使用しない場合は空のままにします。"
 
-#: Model/Server.php:1175
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr "HTTP プロキシ用の TCP ポート。"
 
-#: Model/Server.php:1183
+#: Model/Server.php:1211
 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:1191
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr "HTTP プロキシの認証ユーザー名。"
 
-#: Model/Server.php:1199
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr "HTTP プロキシの認証パスワード。"
 
-#: Model/Server.php:1210
+#: Model/Server.php:1238
 msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
 msgstr ""
 
-#: Model/Server.php:1219
+#: Model/Server.php:1247
 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:1229
+#: Model/Server.php:1257
 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:1238
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1246
+#: Model/Server.php:1292
 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:1254
+#: Model/Server.php:1300
 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:1263
+#: Model/Server.php:1309
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr "この設定を有効にすると、ソフト削除時にアトリビュートの内容がサニタイズされます"
 
-#: Model/Server.php:1272
+#: Model/Server.php:1318
 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:1281
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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:1283
+#: Model/Server.php:1339
 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:1290
+#: Model/Server.php:1346
 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:1299
+#: Model/Server.php:1355
 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:1308
+#: Model/Server.php:1364
 msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr "ブルートフォースの保護を開始する前に、ユーザーがログインに失敗できるトライ回数。"
 
-#: Model/Server.php:1328
+#: Model/Server.php:1393
 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:1339
+#: Model/Server.php:1404
 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:1347
+#: Model/Server.php:1412
 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:1355
+#: Model/Server.php:1420
 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:1364
+#: Model/Server.php:1429
 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:1372
+#: Model/Server.php:1437
 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:1383
+#: Model/Server.php:1448
 msgid "The default policy action for the values added to the RPZ."
 msgstr "RPZ に追加された値のデフォルトのポリシーアクション。"
 
-#: Model/Server.php:1392
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1473
 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:1416
+#: Model/Server.php:1481
 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:1424
+#: Model/Server.php:1489
 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:1432
+#: Model/Server.php:1497
 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:1440
+#: Model/Server.php:1505
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "ゾーンファイルの TTL。 (秒単位、または15分などの短期間)"
 
-#: Model/Server.php:1448
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr ""
 
-#: Model/Server.php:1456
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr "代替ネームサーバー"
 
-#: Model/Server.php:1464
+#: Model/Server.php:1529
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr "ゾーンファイルの SOA 部分で指定されたEメールアドレス。"
 
-#: Model/Server.php:1472
+#: Model/Server.php:1537
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1480
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr ""
 
-#: Model/Server.php:1488
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr ""
 
-#: Model/Server.php:1496;1743
+#: Model/Server.php:1561;1808
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr "マルウェアサンプル/添付ファイルを base64 でエンコードしたペイロードを出力に含めるには、この設定を有効化します。"
 
-#: Model/Server.php:1504;1751
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr "イベントの作成/編集/削除の公開を有効化または無効化します。"
 
-#: Model/Server.php:1512
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1520
+#: Model/Server.php:1585
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1528
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr ""
 
-#: Model/Server.php:1536;1759
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr "オブジェクトの作成/編集/削除の公開を有効化または無効化します。"
 
-#: Model/Server.php:1544
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1552;1767
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr "オブジェクト参照の作成/削除の公開を有効化または無効化します。"
 
-#: Model/Server.php:1560
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1568;1775
+#: Model/Server.php:1633;1840
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr "アトリビュートの作成/編集/ソフト削除の公開を有効化または無効化します。"
 
-#: Model/Server.php:1576
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1584
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1592
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1600;1783
+#: Model/Server.php:1665;1848
 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:1608
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1616
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr ""
 
-#: Model/Server.php:1624
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr ""
 
-#: Model/Server.php:1632
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr ""
 
-#: Model/Server.php:1640
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr ""
 
-#: Model/Server.php:1648
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1656
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1664
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1672
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr ""
 
-#: Model/Server.php:1680
+#: Model/Server.php:1745
 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:1689
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr "pub/sub 機能が使用するポート。"
 
-#: Model/Server.php:1698
+#: Model/Server.php:1763
 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:1707
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr "Redis がリッスンしているポート。"
 
-#: Model/Server.php:1716
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr "パスワード、Redis に設定されている場合。"
 
-#: Model/Server.php:1725
+#: Model/Server.php:1790
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr "pub/sub 機能のメッセージをキューに入れるために使用されるデータベース。"
 
-#: Model/Server.php:1734
+#: Model/Server.php:1799
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr "pub/sub 機能のメッセージをキューに入れるために使用されるネームスペース。"
 
-#: Model/Server.php:1791
+#: Model/Server.php:1856
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr "新しいサイティングの ZMW pubsub フィードへの公開を有効化または無効化します。"
 
-#: Model/Server.php:1799
+#: Model/Server.php:1864
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr "新しい/変更されたユーザを ZMQ pubsub フィードに公開することを有効化または無効化します。"
 
-#: Model/Server.php:1807
+#: Model/Server.php:1872
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr "新しい/変更された組織を ZMQ pubsub フィードに公開することを有効化または無効化します。"
 
-#: Model/Server.php:1815
+#: Model/Server.php:1880
 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:1823
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "ElasticSearch インスタンスへのロギングを有効化"
 
-#: Model/Server.php:1831
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1839
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr "ログを配置するインデックス"
 
-#: Model/Server.php:1847
+#: Model/Server.php:1912
 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:1855
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr "アップロード先のバケット名"
 
-#: Model/Server.php:1863
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr "S3 バケットが存在するリージョン"
 
-#: Model/Server.php:1871
+#: Model/Server.php:1936
 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:1879
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr "サンプルをアップロードする際に使用する AWS シークレットキー"
 
-#: Model/Server.php:1887
+#: Model/Server.php:1952
 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:1896
+#: Model/Server.php:1961
 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:1904
+#: Model/Server.php:1969
 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:1912
+#: Model/Server.php:1977
 msgid "Enable SightingDB integration."
 msgstr ""
 
-#: Model/Server.php:1920
+#: Model/Server.php:1985
 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:1930
+#: Model/Server.php:1995
 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:1939
+#: Model/Server.php:2004
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr "認証ヘッダーにヘッダーのネームスペースを使用する - デフォルト設定では有効"
 
-#: Model/Server.php:1948
+#: Model/Server.php:2013
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr "認証ヘッダーのデフォルトのネームスペース - デフォルト設定は HTTP_"
 
-#: Model/Server.php:1957
+#: Model/Server.php:2022
 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:1966
+#: Model/Server.php:2031
 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:1975
+#: Model/Server.php:2040
 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:1984
+#: Model/Server.php:2049
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr "外部認証メカニズムを使用して認証するユーザー用のログアウトボタンを無効化します。"
 
-#: Model/Server.php:1992
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr "エンリッチメント サービスの有効化/無効化"
 
-#: Model/Server.php:2000
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr "エンリッチメント サービスのタイムアウトを設定"
 
-#: Model/Server.php:2008
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr "インポートサービスの有効化/無効化"
 
-#: Model/Server.php:2016
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr "インポートサービスのタイムアウトを設定"
 
-#: Model/Server.php:2024
+#: Model/Server.php:2089
 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:2032
+#: Model/Server.php:2097
 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:2040
+#: Model/Server.php:2105
 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:2048
+#: Model/Server.php:2113
 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:2056
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr "エクスポート サービスの有効化/無効化"
 
-#: Model/Server.php:2064
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr "エクスポート サービスのタイムアウトを設定"
 
-#: Model/Server.php:2072
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr "エンリッチメントモジュールから取得した情報のホバーの有効化/無効化"
 
-#: Model/Server.php:2080
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr "ホバー サービスのタイムアウトを設定"
 
-#: Model/Server.php:2088
+#: Model/Server.php:2153
 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:2096
+#: Model/Server.php:2161
 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:2104
+#: Model/Server.php:2169
 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:2112
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr "Cortex へのアクセスに使用されるポート。デフォルトでは、9000 ポート"
 
-#: Model/Server.php:2120
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2128
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "Cortex に受け渡される認証キーを設定"
 
-#: Model/Server.php:2137
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2145
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr "SSL 検証を無効にするには、false に設定します。これは推奨されません。"
 
-#: Model/Server.php:2154
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr "証明書の検証時にホスト名の一致エラーを無視する場合、false に設定します。"
 
-#: Model/Server.php:2163
+#: Model/Server.php:2228
 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:2172
+#: Model/Server.php:2237
 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:2181
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr "カスタム認証ユーザーに、パスワードをリセットするための認証システムの外部 URL を提供します。"
 
-#: Model/Server.php:2190
+#: Model/Server.php:2255
 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:2200
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr "インスタンスのデバッグレベル、プロダクションのインスタンスでは常に 0 を使用します。"
 
-#: Model/Server.php:2209
+#: Model/Server.php:2274
 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:2376
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2380
+#: Model/Server.php:2445
 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:2407
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr ""
 
-#: Model/Server.php:2413
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr ""
 
-#: Model/Server.php:2492
+#: Model/Server.php:2557
 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:2494
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr ""
 
-#: Model/Server.php:2495
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2507;2509
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr ""
 
-#: Model/Server.php:3049
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr "%s モジュールを有効化または無効化"
 
-#: Model/Server.php:3052
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr "%s モジュールを指定された組織に制限する。"
 
-#: Model/Server.php:3060
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr "この必須モジュールに固有の設定を設定します。"
 
-#: Model/Server.php:3175
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr "値が設定されていません。"
 
-#: Model/Server.php:3196
+#: Model/Server.php:3281
 msgid "Invalid language."
 msgstr ""
 
-#: Model/Server.php:3217
+#: Model/Server.php:3302
 msgid "Invalid tag_collection."
 msgstr ""
 
-#: Model/Server.php:3225
+#: Model/Server.php:3310
 msgid "This setting has to be a number."
 msgstr ""
 
-#: Model/Server.php:3237
+#: Model/Server.php:3322
 msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
 msgstr ""
 
-#: Model/Server.php:3519
+#: Model/Server.php:3619
 msgid "Invalid file path or file not accessible."
 msgstr ""
 
-#: Model/Server.php:3522
+#: Model/Server.php:3622
 msgid "File has to be in .pem format."
 msgstr ""
 
-#: Model/Server.php:3888
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr ""
 
-#: Model/Server.php:4020
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr "組織のロゴ"
 
-#: Model/Server.php:4021
+#: Model/Server.php:4121
 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:4023
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr "48x48 ピクセルの .png ファイル"
 
-#: Model/Server.php:4026;4041
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
 msgstr "ファイル名の形式は次のとおりです: *.png"
 
-#: Model/Server.php:4030
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr "追加の画像ファイル"
 
-#: Model/Server.php:4031
+#: Model/Server.php:4131
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr "このディレクトリにアップロードされた画像ファイルは、ログインページのロゴなど、さまざまな用途に使用されます。"
 
-#: Model/Server.php:4038
+#: Model/Server.php:4138
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr "インラインで提供する場合は text/html、ダウンロードで提供する場合は利用規約を伝えるもの"
 
-#: Model/Server.php:4128
+#: Model/Server.php:4228
 msgid "Invalid server."
 msgstr ""
 
-#: Model/Server.php:4159
+#: Model/Server.php:4259
 msgid "Response was empty."
 msgstr ""
 
-#: Model/Server.php:4235
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:4501
+#: Model/Server.php:4604
 msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
 msgstr ""
 
-#: Model/Server.php:4571
+#: Model/Server.php:4675
 msgid "Can't check database schema for Postgres database type"
 msgstr ""
 
-#: Model/Server.php:4588
+#: Model/Server.php:4692
 msgid "Table `%s` does not exist"
 msgstr ""
 
-#: Model/Server.php:4615
+#: Model/Server.php:4719
 msgid "Column `%s` exists but should not"
 msgstr ""
 
-#: Model/Server.php:4648
+#: Model/Server.php:4752
 msgid "Column `%s` is different"
 msgstr ""
 
-#: Model/Server.php:4658
+#: Model/Server.php:4762
 msgid "Column `%s` does not exist but should"
 msgstr ""
 
-#: Model/Server.php:4671
+#: Model/Server.php:4775
 msgid "Table `%s` is an additional table"
 msgstr ""
 
-#: Model/Server.php:4695
+#: Model/Server.php:4799
 msgid "Column `%s` should be indexed"
 msgstr ""
 
-#: Model/Server.php:4718
+#: Model/Server.php:4822
 msgid "Column `%s` is indexed but should not"
 msgstr ""
 
-#: Model/Server.php:5141
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr "死亡したワーカーを削除します。"
 
-#: Model/Server.php:5142
+#: Model/Server.php:5253
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr "死亡したワーカーのデータを削除します。ワーカーのタイプは %s で、pid は %s です"
 
-#: Model/Server.php:5146
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr "ワーカーを停止しています。"
 
-#: Model/Server.php:5147
+#: Model/Server.php:5258
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr "ワーカーを停止します。ワーカーのタイプは %s で、pidは %s です"
 
-#: Model/Server.php:5449
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:5449;5478
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:5461
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:5462
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:5593
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:5600
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:5607
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr ""
 
-#: Model/Server.php:5787
+#: Model/Server.php:5911
 msgid "Could not reset the remote authentication key."
 msgstr ""
 
-#: Model/Server.php:5864
+#: Model/Server.php:5988
 msgid "Could not parse JSON: "
 msgstr ""
 
-#: Model/Server.php:5884
+#: Model/Server.php:6008
 msgid "Could not reset fetch remote user account."
 msgstr ""
 
-#: Model/Server.php:5906
+#: Model/Server.php:6030
 msgid "No user object received in response."
 msgstr ""
 
@@ -5201,6 +5473,10 @@ msgstr ""
 msgid "API key reset by administrator"
 msgstr ""
 
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
 #: Model/DecayingModelsFormulas/Polynomial.php:7
 msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
 msgstr ""
@@ -5233,7 +5509,7 @@ msgstr "以下のアイテムと依存関係があります。"
 
 #: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "アトリビュートを追加"
@@ -5260,8 +5536,8 @@ msgstr ""
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
 #: View/Events/add.ctp:33
-#: View/Feeds/add.ctp:178
-#: View/Feeds/edit.ctp:179
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
 #: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
@@ -5270,7 +5546,7 @@ msgstr "共有グループ"
 #: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -5286,15 +5562,15 @@ msgstr "コンテクスチュアル コメント"
 msgid "for Intrusion Detection System"
 msgstr "侵入検知システム用"
 
-#: View/Attributes/add.ctp:154
+#: View/Attributes/add.ctp:155
 msgid "Timezone missing, auto-detected as: "
 msgstr ""
 
-#: View/Attributes/add.ctp:155
+#: View/Attributes/add.ctp:156
 msgid "The following value will be submited instead: "
 msgstr ""
 
-#: View/Attributes/add.ctp:163
+#: View/Attributes/add.ctp:164
 msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr ""
 
@@ -5355,10 +5631,13 @@ msgstr "イベントID"
 #: View/DecayingModel/decaying_tool_rest_search.ctp:24
 #: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr "組織"
 
@@ -5417,7 +5696,7 @@ msgid "Values"
 msgstr "値"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:57
@@ -5439,7 +5718,7 @@ msgid "Replaceattributes"
 msgstr "アトリビュートを置換"
 
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:80
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Elements/view_galaxy_matrix.ctp:76;211
 #: View/Elements/genericElements/Form/submitButton.ctp:8;25
@@ -5467,7 +5746,7 @@ msgstr "アトリビュートを置換"
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:67
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/UserSettings/set_setting.ctp:36
-#: View/Users/admin_add.ctp:97
+#: View/Users/admin_add.ctp:98
 #: View/Users/admin_edit.ctp:91
 #: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
@@ -5479,7 +5758,7 @@ msgid "Submit"
 msgstr "送信"
 
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
 #: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/exportSearch.ctp:32
@@ -5488,6 +5767,7 @@ msgstr "送信"
 #: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
 #: View/Elements/view_galaxy_matrix.ctp:212
+#: View/Elements/genericElements/infoModal.ctp:40
 #: View/Elements/genericElements/Form/submitButton.ctp:13
 #: View/Elements/serverRuleElements/pull.ctp:73
 #: View/Elements/serverRuleElements/push.ctp:72
@@ -5578,7 +5858,7 @@ msgstr "警告: 機密性のあるデータを共有しようとしています
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
 #: View/Users/statistics_data.ctp:19
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr "アトリビュート"
 
@@ -5629,10 +5909,7 @@ msgstr "すべてのアトリビュートの結果"
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -5657,7 +5934,6 @@ msgstr "すべてのアトリビュートの結果"
 #: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:32;106
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -5680,10 +5956,7 @@ msgstr "前へ"
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -5708,7 +5981,6 @@ msgstr "前へ"
 #: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:34;108
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -5737,7 +6009,6 @@ msgstr "日付"
 #: View/Elements/global_menu.ctp:94
 #: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr "ギャラクシー"
@@ -5775,7 +6046,7 @@ msgstr "サイティング"
 #: View/Attributes/index.ctp:62
 #: View/Elements/eventattribute.ctp:166
 #: View/Events/view.ctp:262
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr "アクティビティ"
@@ -5785,7 +6056,7 @@ msgstr "アクティビティ"
 #: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/genericElements/IndexTable/headers.ctp:31
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -5794,10 +6065,7 @@ msgstr "アクティビティ"
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -5833,10 +6101,7 @@ msgstr "アクション"
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -5861,7 +6126,6 @@ msgstr "アクション"
 #: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:99
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -5952,13 +6216,12 @@ msgstr "本当にアトリビュート #%s を削除しますか? アトリビ
 #: View/Elements/Events/eventIndexTable.ctp:234
 #: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:597
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -5975,106 +6238,6 @@ msgstr "本当にアトリビュート #%s を削除しますか? アトリビ
 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/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: 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:92
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
-#: 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 "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
-#: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
-#: 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:92
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
-#: 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 "No"
-
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
@@ -6108,9 +6271,10 @@ msgstr "現在の設定を変更しないでください"
 #: View/Events/resolved_attributes.ctp:51
 #: View/Events/resolved_misp_format.ctp:98;293
 #: View/Events/view.ctp:159
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:171
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
+#: View/Feeds/index.ctp:184
 #: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
 #: View/Objects/revise_object.ctp:35;69
@@ -6126,23 +6290,27 @@ msgstr "ディストリビューション"
 msgid "For Intrusion Detection System"
 msgstr "侵入検知システム用"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr "選択したアトリビュートのコメント項目を変更しない場合、この項目を空のままにします。"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
@@ -6232,12 +6400,16 @@ msgid "Unvetted"
 msgstr ""
 
 #: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
 #: View/EventBlacklists/index.ctp:35
 #: View/EventDelegations/index.ctp:41
 #: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
 #: View/Feeds/preview_index.ctp:25
 #: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
 #: View/ObjectTemplates/index.ctp:47
 #: View/Organisations/index.ctp:75
 #: View/Servers/preview_index.ctp:64
@@ -6245,31 +6417,41 @@ msgstr ""
 #: View/Sightingdb/index.ctp:10
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:81
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
 msgid "Filter"
 msgstr "フィルター"
 
 #: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
 #: View/Elements/eventattributetoolbar.ctp:231
 #: View/EventBlacklists/index.ctp:36
 #: View/EventDelegations/index.ctp:42
 #: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
 #: View/Feeds/preview_index.ctp:26
 #: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
 #: View/ObjectTemplates/index.ctp:48
 #: View/Organisations/index.ctp:76
 #: View/Servers/preview_index.ctp:65
 #: View/ShadowAttributes/index.ctp:38
 #: View/Sightingdb/index.ctp:11
-#: View/Users/admin_index.ctp:82
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
 msgid "Enter value to search"
 msgstr ""
 
 #: View/Communities/index.ctp:34
 #: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
 #: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
 #: View/Feeds/search_caches.ctp:35
 #: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
 #: View/ObjectTemplates/view.ctp:3
 #: View/Organisations/view.ctp:5
 #: View/Pages/doc/administration.ctp:180;221;236
@@ -6278,7 +6460,9 @@ msgstr ""
 #: View/Taxonomies/view.ctp:4
 #: View/Templates/view.ctp:4
 #: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
 #: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
 #: View/Users/view.ctp:3
 #: View/Warninglists/view.ctp:9
 msgid "Id"
@@ -6297,6 +6481,8 @@ msgid "Community name"
 msgstr ""
 
 #: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
 #: View/DecayingModel/index.ctp:89
 #: View/DecayingModel/view.ctp:21
 #: View/Elements/Servers/View/row_object.ctp:24
@@ -6310,8 +6496,10 @@ msgstr ""
 #: View/Elements/templateElements/templateRowAttribute.ctp:21
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
 #: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:22;113;210
 #: View/Objects/group_attributes_into_object.ctp:8
@@ -6333,10 +6521,18 @@ msgid "Description"
 msgstr "説明"
 
 #: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
 msgid "Communities index"
 msgstr ""
 
-#: View/Communities/index.ctp:64
+#: View/Communities/index.ctp:72
 msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
 msgstr ""
 
@@ -6405,9 +6601,11 @@ msgid "Message:"
 msgstr ""
 
 #: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
 #: View/Elements/Events/View/row_object.ctp:72
 #: View/Events/resolved_misp_format.ctp:93;288
-#: View/GalaxyClusters/view.ctp:19
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
 #: View/ObjectTemplates/index.ctp:66
 #: View/ObjectTemplates/view.ctp:6
 #: View/Objects/revise_object.ctp:68
@@ -6424,16 +6622,19 @@ msgid "UUID"
 msgstr "UUID"
 
 #: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
 #: View/DecayingModel/index.ctp:88
 #: View/DecayingModel/view.ctp:14
 #: View/Elements/Servers/View/row_object.ctp:19
 #: View/Elements/templateElements/templateRowAttribute.ctp:12
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
 #: View/Feeds/search_caches.ctp:47
 #: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
 #: View/ObjectTemplates/view.ctp:4
 #: View/Objects/add.ctp:206
 #: View/Objects/revise_object.ctp:27
@@ -6445,7 +6646,7 @@ msgstr "UUID"
 #: View/SharingGroups/view.ctp:42;67
 #: View/Sightingdb/index.ctp:51
 #: View/Templates/view.ctp:9
-#: View/Users/statistics_orgs.ctp:31
+#: View/Users/statistics_orgs.ctp:33
 #: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "名前"
@@ -6469,7 +6670,7 @@ msgstr ""
 #: View/Users/admin_edit.ctp:64
 #: View/Users/admin_view.ctp:72
 #: View/Users/edit.ctp:23
-#: View/Users/view.ctp:31
+#: View/Users/view.ctp:32
 msgid "GnuPG key"
 msgstr "GnuPGキー"
 
@@ -6478,10 +6679,105 @@ msgid "Community "
 msgstr ""
 
 #: View/Communities/view.ctp:51
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:617
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
 msgid "Request Access"
 msgstr ""
 
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr "選択可能"
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr "デフォルト"
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr "テンプレート名"
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
 #: View/DecayingModel/add.ctp:4
 msgid " Decaying Model"
 msgstr ""
@@ -6596,8 +6892,8 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/EventBlacklists/edit.ctp:37
 #: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:200
-#: View/Feeds/index.ctp:282
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
 #: View/News/index.ctp:22
 #: View/OrgBlacklists/edit.ctp:30
 #: View/OrgBlacklists/index.ctp:36
@@ -6689,6 +6985,7 @@ msgstr ""
 #: View/Events/show_i_o_c_results.ctp:12
 #: View/Feeds/freetext_index.ctp:32
 #: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
 #: View/Objects/revise_object.ctp:64
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
@@ -6700,7 +6997,7 @@ msgstr ""
 #: 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:36
+#: View/Users/statistics_orgs.ctp:38
 #: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr "タイプ"
@@ -6714,6 +7011,7 @@ msgstr "タイプ"
 #: View/Events/resolved_misp_format.ctp:92;287
 #: View/Events/show_i_o_c_results.ctp:13
 #: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
 #: View/Noticelists/view.ctp:42
 #: View/Objects/add.ctp:115
 #: View/Objects/group_attributes_into_object.ctp:58
@@ -6734,12 +7032,14 @@ msgstr ""
 #: View/DecayingModel/decaying_tool_rest_search.ctp:31
 #: View/Events/resolved_attributes.ctp:52
 #: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
 #: View/ObjectReferences/ajax/add.ctp:30
 #: View/Objects/add.ctp:67;119
 #: View/Objects/group_attributes_into_object.ctp:30
 #: View/Objects/revise_object.ctp:49;67
 #: View/Pages/doc/using_the_system.ctp:234;284
 #: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
 msgid "Comment"
 msgstr "コメント"
 
@@ -6758,7 +7058,7 @@ msgid "Decaying Model RestSearch"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_simulation.ctp:45
-#: View/Events/automation.ctp:14
+#: View/Events/automation.ctp:24
 #: View/Logs/admin_index.ctp:20;21
 #: View/Logs/admin_search.ctp:25
 msgid "Search"
@@ -6836,7 +7136,7 @@ msgstr ""
 #: View/Elements/genericElements/org_picker.ctp:17
 #: View/EventBlacklists/add.ctp:36
 #: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
+#: View/Feeds/add.ctp:220
 #: View/Feeds/import_feeds.ctp:20
 #: View/OrgBlacklists/add.ctp:29
 #: View/Regexp/admin_add.ctp:32
@@ -6913,7 +7213,7 @@ msgstr ""
 
 #: View/DecayingModel/index.ctp:97
 #: View/DecayingModel/view.ctp:25
-#: View/Galaxies/view.ctp:22
+#: View/Galaxies/view.ctp:10
 #: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
 #: View/Warninglists/view.ctp:12
@@ -6923,6 +7223,7 @@ msgstr "バージョン"
 #: View/DecayingModel/index.ctp:98
 #: View/DecayingModel/view.ctp:31
 #: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
 #: View/Feeds/view.ctp:63
 #: View/Noticelists/index.ctp:63
 #: View/ObjectTemplates/index.ctp:35
@@ -7036,7 +7337,6 @@ msgstr "すべて表示"
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr "すべて選択"
 
@@ -7103,6 +7403,8 @@ msgstr "すべてのアトリビュートを表示"
 
 #: View/Elements/eventattributetoolbar.ctp:6
 #: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
@@ -7140,7 +7442,7 @@ msgstr "偽陽性の可能性があるアトリビュートのみを表示"
 
 #: View/Elements/eventattributetoolbar.ctp:41
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr "警告"
@@ -7252,11 +7554,9 @@ msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: View/Logs/admin_index.ctp:62
 #: View/Servers/preview_index.ctp:57
 #: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:74
 msgid "Remove filters"
 msgstr "フィルターを削除"
 
@@ -7445,14 +7745,14 @@ msgid "Event Actions"
 msgstr "イベントアクション"
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:221;264
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: 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:226;270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
 #: View/Events/add.ctp:7
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
@@ -7460,80 +7760,80 @@ msgid "Add Event"
 msgstr "イベントを追加"
 
 #: View/Elements/global_menu.ctp:23
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:289
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: 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:294
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: 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:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr "REST クライアント"
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:310
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "提案を表示"
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr "提案のあるイベント"
 
 #: View/Elements/global_menu.ctp:47
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:320
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
 msgid "View delegation requests"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:861
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "タグの一覧"
 
 #: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr "タグコレクションの一覧"
 
 #: View/Elements/global_menu.ctp:61
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:866
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr "タグを追加"
 
 #: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:895
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr "タクソノミーの一覧"
 
 #: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:923
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "テンプレートの一覧"
 
 #: View/Elements/global_menu.ctp:74
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:928
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "テンプレートを追加"
 
 #: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
@@ -7541,7 +7841,7 @@ msgid "Export"
 msgstr "エクスポート"
 
 #: View/Elements/global_menu.ctp:86
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -7551,7 +7851,7 @@ msgid "Automation"
 msgstr "自動化"
 
 #: View/Elements/global_menu.ctp:98
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1086
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr "ギャラクシーの一覧"
 
@@ -7579,7 +7879,7 @@ msgid "Signature Whitelist"
 msgstr "シグネチャーホワイトリスト"
 
 #: View/Elements/global_menu.ctp:128
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:378
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr "警告リストの一覧"
 
@@ -7600,45 +7900,45 @@ msgid "News"
 msgstr "ニュース"
 
 #: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "マイプロフィール"
 
 #: View/Elements/global_menu.ctp:151
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
 msgid "My Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:155
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:467;699
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
 msgid "Set Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:159
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:471
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "ダッシュボード"
 
 #: View/Elements/global_menu.ctp:168
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:490
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "ロールの権限"
 
 #: View/Elements/global_menu.ctp:175
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1130
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr "オブジェクトテンプレートの一覧"
 
 #: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:507
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr "共有グループの一覧"
 
 #: View/Elements/global_menu.ctp:186
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr "共有グループを追加"
 
@@ -7647,12 +7947,12 @@ msgid "Decaying Models Tool"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:199
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:977
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
 msgid "List Decaying Models"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:206
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:520
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
@@ -7664,12 +7964,12 @@ msgid "Categories & Types"
 msgstr "カテゴリーとタイプ"
 
 #: View/Elements/global_menu.ctp:214
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr "利用規約"
 
 #: View/Elements/global_menu.ctp:218
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:528
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -7699,28 +7999,28 @@ msgid "Sync Actions"
 msgstr "同期アクション"
 
 #: View/Elements/global_menu.ctp:240
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:536
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr "同期用コンフィグの作成"
 
 #: View/Elements/global_menu.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:542
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr "サーバー設定のインポート"
 
 #: View/Elements/global_menu.ctp:250
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "サーバーの一覧"
 
 #: View/Elements/global_menu.ctp:255
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:998
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr "フィードの一覧"
 
 #: View/Elements/global_menu.ctp:260
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr "フィードキャッシュの検索"
 
@@ -7733,7 +8033,7 @@ msgid "Add SightingDB Connection"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:612
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
 msgid "List Communities"
 msgstr ""
 
@@ -7748,7 +8048,7 @@ msgid "Administration"
 msgstr "管理"
 
 #: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:687
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "ユーザーの一覧"
@@ -7763,93 +8063,97 @@ msgid "Set User Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:300
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:682
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr "ユーザーを追加"
 
 #: View/Elements/global_menu.ctp:304
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:704
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "ユーザーに連絡"
 
-#: View/Elements/global_menu.ctp:311
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:477;739
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr "組織の一覧"
 
-#: View/Elements/global_menu.ctp:315
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:322
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "ロールの一覧"
 
-#: View/Elements/global_menu.ctp:326
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr "サーバーの設定・保守"
 
-#: View/Elements/global_menu.ctp:343
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:768
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "ジョブ"
 
-#: View/Elements/global_menu.ctp:352
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:774
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:361
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr "イベントのブラックリスト"
 
-#: View/Elements/global_menu.ctp:366
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr "イベントのブラック リストを管理"
 
-#: View/Elements/global_menu.ctp:375
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr "組織のブラックリスト"
 
-#: View/Elements/global_menu.ctp:380
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr "組織のブラックリストの管理"
 
-#: View/Elements/global_menu.ctp:388
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "監査"
 
-#: View/Elements/global_menu.ctp:392
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "ログの一覧"
 
-#: View/Elements/global_menu.ctp:396
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:811
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "ログを検索"
 
-#: View/Elements/global_menu.ctp:424
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "ログアウト"
@@ -7872,7 +8176,8 @@ msgstr "組織ごとのアトリビュート"
 
 #: View/Elements/view_event_distribution_graph.ctp:9
 #: View/Elements/view_timeline.ctp:23
-#: View/Layouts/default.ctp:92
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "ロード中"
@@ -7907,7 +8212,6 @@ msgstr "ディスプレイ"
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:67
 msgid "Filters"
 msgstr "フィルター"
 
@@ -7934,6 +8238,7 @@ msgid "Time scope"
 msgstr ""
 
 #: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
 #: View/Taxonomies/view.ctp:83
 msgid "Tag"
 msgstr ""
@@ -7965,7 +8270,6 @@ msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr "現在のページの全てのイベントを選択"
 
@@ -8022,7 +8326,9 @@ msgstr "ポスト数"
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr "Eメール"
@@ -8033,8 +8339,6 @@ msgstr "Eメール"
 #: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
 #: View/Events/proposal_event_index.ctp:45;49
 #: View/Feeds/preview_index.ctp:73
-#: View/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
@@ -8060,7 +8364,7 @@ msgid "NEW"
 msgstr "新しい"
 
 #: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr "イベントを公開"
 
@@ -8074,7 +8378,7 @@ msgid "Not published"
 msgstr "非公開"
 
 #: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;364;431;598;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
 #: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr "本当に # %s を削除しますか?"
@@ -8281,11 +8585,11 @@ msgstr "16進数表現"
 msgid "Switch to binary representation"
 msgstr "バイナリ形式に切り替え"
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr "警告、これは正しくないようです "
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr " 値"
 
@@ -8388,11 +8692,11 @@ msgstr "ステータス"
 #: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
 #: View/Events/view.ctp:191
-#: View/GalaxyClusters/view.ctp:32
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
 #: View/Users/admin_view.ctp:95
 msgid "N/A"
@@ -8426,8 +8730,10 @@ msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
@@ -8441,15 +8747,17 @@ msgstr "最終ログイン"
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
 #: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr "作成日時"
 
 #: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 msgid "Create new credentials and inform user"
 msgstr "新しいクレデンシャルを作成し、ユーザーに通知"
 
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr "本当に # %s を削除しますか? 「削除」の代わりに「無効化」することを強くお勧めします。"
 
@@ -8486,488 +8794,599 @@ msgstr "提案のあるイベント: "
 msgid "Delegation requests: "
 msgstr "委譲リクエスト: "
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
-msgid "Populate From Template"
-msgstr "テンプレートから追加"
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
+msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
-msgid "Enrichment Module Result"
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr "フィルターのルール"
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr "ルール"
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr "年齢: "
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr "未キャッシュ"
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr "ここをクリック"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr "エラー: 無効なイベントです!"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr "修正されるイベント %s"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr "新しい修正されるイベント"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+msgid "Populate From Template"
+msgstr "テンプレートから追加"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+msgid "Enrichment Module Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr "フリーテキスト インポートの結果"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr "イベントを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;887;1116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr "相関グラフを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr "イベント履歴を表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
 #: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr "イベントを編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr "イベントを削除"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr "オブジェクトを追加"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr "添付ファイルを追加"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr "... から追加"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr "イベントをエンリッチ"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr "... からアトリビュートを結合"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr "アトリビュートを提案"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr "添付ファイルを提案"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr "公開 (Eメールなし)"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
 msgid "Publish Sightings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr "公開を委任"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr "委譲リクエストを承認"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr "委譲リクエストを破棄"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr "ZeroMQにイベントを発行"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:200
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:208
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr "レポーターに連絡"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:216;303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
 msgstr "... としてダウンロード"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239;244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:251
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr "Import from..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr "正規表現の一覧"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr "新しい正規表現"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:351
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr "存在するものを実行"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:352
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:359
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr "正規表現を編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr "正規表現を削除"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr "警告リストを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr "警告リストの更新"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:385
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:393
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr "通告リストを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:403
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr "通告リストを更新"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:404
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:414
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr "ホワイトリストの一覧"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:419
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr "新しいホワイトリスト"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr "ホワイトリストを編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:430
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr "ホワイトリストを削除"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:440
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr "マイプロフィールを編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:451;649
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr "パスワードをリセット"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:484;733
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr "組織を表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:496
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr "共有グループを編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr "共有グループを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:551;581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr "リモートサーバーを探索"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:559
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr "リモートイベントを探索"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570;1056
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr "イベントの取得"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:571;1057
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:589
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
 #: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr "サーバーを編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr "新しいサーバー"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:622
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
 msgid "View community"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:630
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
 msgid "Request E-mail"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:642
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr "ユーザーを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:654
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr "ユーザーを編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr "ユーザーを削除"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:668
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr "ロールを編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr "ロールを削除"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:694
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
 msgid "User settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:712
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr "組織を追加"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr "組織を編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:726
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr "組織を統合"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:745
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr "ロールを追加"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:781
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr "イベントをブラックリスト"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:793
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr "組織のブラックリスト"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:820;834
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr "スレッドを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:825
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr "ポストを追加"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:839
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr "ポストを編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr "スレッドの一覧"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:849
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr "新しいスレッド"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:857
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr "お気に入りのタグの一覧"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:873
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr "タグを編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:881;900
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr "タキソノミーを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:908
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr "タクソノミーを削除"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:915
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:935
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr "テンプレートを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:941
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr "テンプレートの編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:952
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
 msgid "Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
 msgid "Force Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:962
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
 msgid "Import Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:967
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
 msgid "Add Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:971
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
 msgid "Decaying Tool"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
 msgid "View Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:989
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
 msgid "Edit Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1007
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr "フィードの追加"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr "JSONからフィードをインポート"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1018
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr "フィード オーバーラップ 解析マトリックス"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1023
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr "フィード設定のエクスポート"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr "フィードを編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1036
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1042
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr "プレビューインデックス"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1048
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr "プレビューイベント"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1066
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr "ニュースを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1071
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr "ニュース項目を追加"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1077
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr "ニュース項目を編集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1092
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr "ギャラクシーを更新"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1093
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr "本当にすべてのギャラクシーをサブモジュールから再インポートしますか?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1098
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr "ギャラクシーを強制的に更新"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1099
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr "本当にすべてのギャラクシーをドロップし、サブモジュールから再インポートしますか?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1106;1122
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr "ギャラクシーを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr "クラスターを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1135
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr "オブジェクトの更新"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1141
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr "オブジェクトテンプレートを表示"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1149
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
 #: View/Sightingdb/add.ctp:6
 msgid "Add SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1157
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
 msgid "Edit SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1162
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
 msgid "List SightingDB connections"
 msgstr ""
 
@@ -8997,7 +9416,7 @@ msgid "Fix Database Index Schema"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
 msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
 msgstr ""
 
@@ -9005,7 +9424,7 @@ msgstr ""
 msgid "The current database schema does not match the expected format."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;131
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
 msgid "Database schema diagnostic: "
 msgstr ""
 
@@ -9033,52 +9452,52 @@ msgstr ""
 msgid "Actual schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:118
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
 msgid "Fix Database schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:130
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
 msgid "The current database is correct"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:141
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
 msgid "Expected DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:145
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
 msgid "The current database version matches the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:146;151
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
 msgid "Actual DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:150
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
 msgid "The current database version does not match the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
 msgid "Updates are locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158;162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
 msgid "Updates are not locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 #: View/Servers/update_progress.ctp:32
 msgid "Updates are locked due to to many update fails"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 msgid "Updates unlocked in %s"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:167;168
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
 msgid "DataSource: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:203
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
 msgid "Column diagnostic"
 msgstr ""
 
@@ -9740,7 +10159,7 @@ msgstr "ワーカーのPID"
 #: View/TagCollections/index.ctp:14
 #: View/UserSettings/index.ctp:56
 #: View/Users/admin_view.ctp:109
-#: View/Users/view.ctp:58
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr "ユーザー"
 
@@ -9785,8 +10204,8 @@ msgid "Start a worker"
 msgstr "ワーカーを起動"
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
-msgstr "すべてのワーカーを再起動"
+msgid "Restart dead workers"
+msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
 msgid "Set pull rules"
@@ -9942,10 +10361,6 @@ msgstr "テンプレートの説明"
 msgid "Template ID"
 msgstr "テンプレートID"
 
-#: 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
@@ -10131,7 +10546,7 @@ msgid "Recipient"
 msgstr "受信者"
 
 #: View/EventDelegations/index.ctp:82
-#: View/Events/automation.ctp:269;276
+#: View/Events/automation.ctp:279;286
 #: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
@@ -10355,255 +10770,252 @@ msgstr ""
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 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 "あなたの現在のキーは: <code>%s</code> です。\n"
-"あなたはこのキーを %s できます。"
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
+msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr "リセット"
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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/automation.ctp:27
 #: 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
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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
+#: View/Events/automation.ctp:32
 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
+#: View/Events/automation.ctp:33
 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/automation.ctp:34
 #: 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/automation.ctp:35
 #: 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:26
+#: View/Events/automation.ctp:36
 #: 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:27
+#: View/Events/automation.ctp:37
 #: 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/automation.ctp:38
 #: 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/automation.ctp:39
 #: 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:30;150
+#: View/Events/automation.ctp:40;160
 #: 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:31;151
+#: View/Events/automation.ctp:41;161
 #: 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:32
+#: View/Events/automation.ctp:42
 #: 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/automation.ctp:43
 #: 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/automation.ctp:44
 #: 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/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr "UUIDに基づいて結果を制限"
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:46
 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/automation.ctp:47
 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/automation.ctp:48
 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/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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/automation.ctp:52
 #: 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/automation.ctp:53
 #: 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
+#: View/Events/automation.ctp:54
 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
+#: View/Events/automation.ctp:55
 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
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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:81
+#: View/Events/automation.ctp:91
 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:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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:97
+#: View/Events/automation.ctp:107
 #: 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:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: 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:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr "Bro IDSエクスポート"
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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:118
+#: View/Events/automation.ctp:128
 #: 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:136
+#: View/Events/automation.ctp:146
 #: 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:138
+#: View/Events/automation.ctp:148
 #: 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:145
+#: View/Events/automation.ctp:155
 #: 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"
@@ -10612,47 +11024,47 @@ msgstr "結果にタグを含めるには、このパラメーターにその名
 "また、いくつかのタグコマンドを '&amp;&amp;' オペレーターでまとめることができます。タグ検索ではコロン (:) が使えないことに注意してください。\n"
 "代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)。"
 
-#: View/Events/automation.ctp:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr "結果を与えられたイベント IDs のみに限定する。"
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: 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:152
+#: View/Events/automation.ctp:162
 #: 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:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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:156
+#: View/Events/automation.ctp:166
 #: 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:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr "指定されたタイプのイベントのアトリビュートを XML としてエクスポートする"
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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"
@@ -10660,176 +11072,176 @@ msgid "sigOnly is an optional flag that will block all attributes from being exp
 msgstr "sigOnly は IDS フラグがオンになっていないすべてのアトリビュートがエクスポートされるのをブロックするオプションのフラグです。'&amp;&amp;' 演算子でいくつかのタイプを検索し、'!' 演算子で値を除外することができます。\n"
 "例えば、イベント25から、すべての md5 と sha256 タイプの IDS シグネチャーのアトリビュートで、しかし filename | md5 and filename | sha256 ではないものを取得するには、次を使用します"
 
-#: View/Events/automation.ctp:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr "添付ファイル or マルウェアサンプルのダウンロード"
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr "ハッシュによるマルウェアサンプルのダウンロード"
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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:172
+#: View/Events/automation.ctp:182
 #: 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:173
+#: View/Events/automation.ctp:183
 #: 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:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr "POST メッセージのペイロード (XML)"
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr "POST メッセージのペイロード (json)"
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr "渡されたオブジェクトのすべてのパラメーターの簡単な説明"
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: 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:187
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr "\"サンプルのアップロード\" API を使用してマルウェアサンプルをアップロードする"
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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:191
+#: View/Events/automation.ctp:201
 #: 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:192
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr "期待されるオブジェクトの一般的な構造は次のとおりです"
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr "以下のオプションパラメーターが期待されます"
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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:205
+#: View/Events/automation.ctp:215
 #: 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:206
+#: View/Events/automation.ctp:216
 #: 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:207
+#: View/Events/automation.ctp:217
 #: 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:208
+#: View/Events/automation.ctp:218
 #: 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:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr "イベントにタグを追加または削除"
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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:214
+#: View/Events/automation.ctp:224
 #: 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:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr "提案及びAPI"
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: 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:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr "HTTP"
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:74
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -10837,201 +11249,201 @@ msgstr "HTTP"
 msgid "URL"
 msgstr "URL"
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr "説明"
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr "期待されるペイロード"
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
 #: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr "応答"
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr "提案を表示"
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr "シャドウ アトリビュート オブジェクト"
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr "所属組織のイベントへのすべての提案を表示"
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr "シャドウ アトリビュート オブジェクト"
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr "イベントの提案をすべて表示"
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr "イベントへ新しいアトリビュートを提案"
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr "アトリビュートの編集を提案"
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr "提案を承認"
 
-#: View/Events/automation.ctp:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr "提案を破棄"
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr "シャドウアトリビュート オブジェクトをポストする場合、以下のフォーマットを使用してください"
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr "イベントメタデータのフィルタリング"
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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:291
+#: View/Events/automation.ctp:301
 #: 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:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr "有効なパラーメーターのリスト"
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr "公開 or 非公開イベントのフィルター [0, 1] - 否定可能"
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr "イベント情報上の文字列のフィルター - 否定可能"
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr "追加されたタグ名のフィルター - 否定可能"
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr "特定のイベント ID のフィルター - 否定可能"
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: 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:309
+#: View/Events/automation.ctp:319
 #: 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:310
+#: View/Events/automation.ctp:320
 #: 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:311
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr "含まれているアトリビュート値のフィルター - 否定可能"
 
-#: View/Events/automation.ctp:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr "作成者の組織のフィルター - 否定可能"
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr "作成ユーザーのEメールアドレスのフィルター (管理者のみ) - 否定可能"
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:324
 #: 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:315
+#: View/Events/automation.ctp:325
 #: 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:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 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:322
+#: View/Events/automation.ctp:332
 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:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -11229,7 +11641,7 @@ msgid "Ongoing"
 msgstr "実行中"
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr "対象"
@@ -11281,18 +11693,18 @@ msgstr "入力ファイル"
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 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:54
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr "フィルターを変更"
 
@@ -11326,6 +11738,12 @@ msgstr "自動化機能は、侵入検知システムのシグネチャーを自
 msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr "そのキーでデータベース全体にアクセスできてしまうので、秘密にしておいてください!"
 
+#: 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/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 に認証鍵を含める従来の方法は、一時的にサポートされていますが、推奨しません。"
@@ -11785,7 +12203,6 @@ msgstr "追加されたアトリビュート"
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -11926,6 +12343,7 @@ msgid "View request details"
 msgstr "リクエストの詳細を表示"
 
 #: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
 #: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr "無効"
@@ -12087,7 +12505,7 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr "公開するけれどアラートメールを送信しないのですか? 軽微な変更の場合のみにしてください!"
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: View/Feeds/index.ctp:105
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -12121,78 +12539,81 @@ msgstr "相関をオフにすると、これまでの相関関係が全て失わ
 msgid "Add MISP Feed"
 msgstr "MISPフィードを追加"
 
-#: View/Feeds/add.ctp:5
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
+msgstr ""
+
+#: View/Feeds/add.ctp:12
 msgid "Add a new MISP feed source."
 msgstr "新しい MISP フィードのソースを追加する。"
 
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
+#: View/Feeds/add.ctp:14
 #: View/Feeds/view.ctp:64
 msgid "Caching enabled"
 msgstr ""
 
-#: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr ""
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:21
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr "フィード名"
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
 #: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr "プロバイダー"
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:26
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr "コンテンツプロバイダーの名前"
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr "入力ソース"
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:66
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr "取得後に入力を削除"
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:75
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr "フィードのURL"
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:79
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr "ソースフォーマット"
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:38
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr "リクエストに渡される任意のヘッダー (例: Authorization)"
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:42
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr "\"headername: value\" フォーマットで改行で区切られたヘッダーのリスト"
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:46
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr "Basic 認証を追加"
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:50
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr "ユーザー名"
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:54
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -12201,127 +12622,126 @@ msgstr "ユーザー名"
 msgid "Password"
 msgstr "パスワード"
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:58
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr "Basic 認証ヘッダーを追加"
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:88
-msgid "Target Event"
-msgstr "対象のイベント"
-
 #: View/Feeds/add.ctp:94
 #: View/Feeds/edit.ctp:98
-msgid "Target Event ID"
-msgstr "対象のイベント ID"
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:100
-msgid "Leave blank unless you want to reuse an existing event."
-msgstr "既存のイベントを再利用する場合以外は、空白のままにしてください。"
+msgid "Creator organisation"
+msgstr ""
 
 #: View/Feeds/add.ctp:104
 #: View/Feeds/edit.ctp:108
-msgid "Value field(s) in the CSV"
-msgstr "CSV 中のバリュー項目"
+msgid "Target Event"
+msgstr "対象のイベント"
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:109
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr "CSV パーサーによってパースされ、MISP アトリビュートに変換される1つまたは複数の項目を選択する"
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:111
-msgid "2,3,4 (column position separated by commas)"
-msgstr "2,3,4 (カラムの番号をカンマ区切りで)"
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:119
-msgid "Delimiter"
-msgstr "区切り文字"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
+msgstr "対象のイベント ID"
 
 #: View/Feeds/add.ctp:116
 #: View/Feeds/edit.ctp:120
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr "既存のイベントを再利用する場合以外は、空白のままにしてください。"
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr "CSV 中のバリュー項目"
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
+msgstr "CSV パーサーによってパースされ、MISP アトリビュートに変換される1つまたは複数の項目を選択する"
+
+#: View/Feeds/add.ctp:127
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr "2,3,4 (カラムの番号をカンマ区切りで)"
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr "区切り文字"
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
 msgid "Set the default CSV delimiter (default = \",\")"
 msgstr "CSV のデフォルト区切り文字(デフォルト = \",\")の設定"
 
-#: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:130
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr "除外用正規表現"
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:131
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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 "除外されるべきIOCの正規表現パターンを追加 (例えばレポートやフィードへの各種参照を除外するのに便利です)"
 
-#: View/Feeds/add.ctp:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr "正規表現パターン、例えば: \"/^https://myfeedurl/i"
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:141
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr "自動公開"
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 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:148
-#: View/Feeds/edit.ctp:150
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr "IDS フラグをオーバーライド"
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:151
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr "チェックすると、このフィードからプルする際に IDS フラグを常に off に設定します。"
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:160
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr "デルタマージ"
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:161
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr "アトリビュートをマージ (新しいアトリビュートだけを追加し、取り消されたアトリビュートを削除)"
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr "デフォルトタグ"
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:193
-msgid "Filter rules"
-msgstr "フィルターのルール"
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:194
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr "以下のタグが許可されたイベント"
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:195
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr "以下のタグがブロックされたイベント"
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:196
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr "以下の組織が許可されたイベント"
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:197
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr "以下の組織がブロックされたイベント"
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:198
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
 #: View/Servers/add.ctp:116
 #: View/Servers/edit.ctp:155;162
 msgid "Modify"
@@ -12339,64 +12759,64 @@ msgstr ""
 msgid "Edit MISP Feed"
 msgstr "MISP フィードを編集"
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr "新しい MISP フィードのソースを編集する。"
 
-#: View/Feeds/edit.ctp:133
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr "正規表現パターン、例えば: \"/^https://myfeedurl/i\""
 
-#: View/Feeds/edit.ctp:213
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr "同期したい外部サーバーのベース url。例: https://misppriv.circl.lu"
 
-#: View/Feeds/edit.ctp:214
+#: View/Feeds/edit.ctp:234
 #: View/Servers/add.ctp:146
 #: View/Servers/edit.ctp:190
 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:215
+#: View/Feeds/edit.ctp:235
 #: View/Servers/add.ctp:147
 #: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr "同期したい外部サーバーを持つ組織です。 例: BE"
 
-#: View/Feeds/edit.ctp:216
+#: View/Feeds/edit.ctp:236
 #: View/Servers/add.ctp:148
 #: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr "外部サーバー上のプロフィールの認証キーを検索できます。"
 
-#: View/Feeds/edit.ctp:217
+#: View/Feeds/edit.ctp:237
 #: View/Servers/add.ctp:149
 #: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr "イベントとアトリビュートのアップロードを許可します。"
 
-#: View/Feeds/edit.ctp:218
+#: View/Feeds/edit.ctp:238
 #: View/Servers/add.ctp:150
 #: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr "サーバーからイベントとアトリビュートのダウンロードを許可します。"
 
-#: View/Feeds/edit.ctp:219
+#: View/Feeds/edit.ctp:239
 #: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr "新しいイベントを非公開 (プッシュイベントと連動)"
 
-#: View/Feeds/edit.ctp:220
+#: View/Feeds/edit.ctp:240
 #: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr "新しいイベントを公開 (プルイベントと連動)"
 
-#: View/Feeds/edit.ctp:221
+#: View/Feeds/edit.ctp:241
 #: View/Servers/edit.ctp:196
 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:222
+#: View/Feeds/edit.ctp:242
 #: View/Servers/add.ctp:154
 #: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
@@ -12426,137 +12846,128 @@ msgstr "フィードを追加するために以下に MISP フィードのメタ
 msgid "Feed metadata JSON"
 msgstr "フィードメタデータ JSON"
 
-#: 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 "フリーテキスト/CSV フィードのキャッシュ"
-
-#: View/Feeds/index.ctp:7
-msgid "Cache MISP feeds"
-msgstr "MISPのフィードをキャッシュ"
-
-#: View/Feeds/index.ctp:8
-msgid "Fetch and store all feed data"
-msgstr "すべてのフィードデータを取得し保存"
-
-#: View/Feeds/index.ctp:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr "選択を有効化"
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr "選択を無効化"
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr "選択されたもの用のキャッシュを有効化"
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr "選択されたもの用のキャッシュを無効化"
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr "デフォルトフィード"
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr "カスタム フィード"
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr "有効なフィード"
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr ""
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr "フィードのフォーマット"
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr "入力"
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr "IDS をオーバーライド"
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr "キャッシュ"
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: 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/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr "Headers"
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:55
-#: View/Servers/index.ctp:120;121
-msgid "Rules"
-msgstr "ルール"
-
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
-msgstr "エラー: 無効なイベントです!"
-
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
-msgstr "修正されるイベント %s"
-
-#: View/Feeds/index.ctp:211
-msgid "New fixed event"
-msgstr "新しい修正されるイベント"
-
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:141
-msgid "Age: "
-msgstr "年齢: "
-
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:149
-msgid "Not cached"
-msgstr "未キャッシュ"
-
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
+msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
+msgstr ""
+
+#: View/Feeds/index.ctp:196
+msgid "Visible"
+msgstr ""
+
+#: View/Feeds/index.ctp:211
+msgid "Feeds"
+msgstr "フィード"
+
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
+msgstr "フィードルックアップキャッシュの生成またはフィードデータの取得 (有効なフィードのみ)"
+
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
+msgstr ""
+
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
+msgstr "すべてのフィードをキャッシュ"
+
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr "フリーテキスト/CSV フィードのキャッシュ"
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr "MISPのフィードをキャッシュ"
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr "すべてのフィードデータを取得し保存"
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr "リモートでイベントを探索"
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr "すべてのイベントを取得"
 
-#: View/Feeds/index.ctp:283
-msgid "Are you sure you want to permanently remove the feed (%s)?"
-msgstr "本当にフィード (%s) を完全に削除しますか?"
+#: View/Feeds/index.ctp:294
+msgid "Are you sure you want to permanently remove the feed?"
+msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr "フィードのメタデータを JSON としてダウンロード"
 
@@ -12609,26 +13020,39 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr "バージョン"
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
 #: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr "ネームスペース"
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr "ギャラクシー ID"
 
-#: View/Galaxies/view.ctp:29
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr ""
 
@@ -12636,33 +13060,30 @@ msgstr ""
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:23
-#: 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/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -12671,22 +13092,16 @@ msgstr ""
 msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr "グラフを表示"
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
 msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
@@ -12697,6 +13112,27 @@ msgstr ""
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Inbox/index.ctp:31
+#: 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/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr "ジョブエントリーをパージ:"
@@ -12717,12 +13153,6 @@ msgstr "完了しました。"
 msgid "Show all queues"
 msgstr "すべてのキューを表示"
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr "デフォルト"
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr "デフォルトのキューを表示"
@@ -12760,6 +13190,11 @@ msgstr "ワーカー"
 msgid "Job type"
 msgstr ""
 
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
+msgstr "入力"
+
 #: View/Jobs/index.ctp:106
 #: View/Pages/doc/administration.ctp:229
 msgid "Retries"
@@ -12841,6 +13276,7 @@ msgstr "from IP"
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
 #: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -12848,13 +13284,6 @@ msgstr "from IP"
 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"
@@ -12905,10 +13334,6 @@ msgstr "参照"
 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"
@@ -13476,7 +13901,7 @@ msgstr "すべて表示"
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr "ロゴ"
 
@@ -13510,12 +13935,12 @@ msgid "Last modified"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:37
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr "セクター"
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:35
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr "国籍"
 
@@ -14058,7 +14483,7 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr "ドロップダウンリストで、ユーザーが所属するロールグループを選択できます。ロールはユーザーの権限を定義します。ロールの詳細については<a href=#roles>ここをクリック</a>してください。"
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:76
+#: View/Users/admin_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -14069,7 +14494,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr "このオプションを選択すると、新しいユーザーはイベントが発行されるたびに自動的に生成されるEメールを購読します。"
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -14082,7 +14507,7 @@ 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr "認証キー"
 
@@ -14135,6 +14560,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr "ユーザーのEメールアドレス (及びログイン名)。"
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -15454,10 +15880,6 @@ msgstr "このフォームでアトリビュートを追加できます。"
 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 "このドロップダウンメニューでは、アトリビュートのカテゴリーが説明されています。つまり、このアトリビュートが説明するマルウェアの特徴を示しています。これは、マルウェアやネットワークアクティビティなどの永続的メカニズムを意味する可能性があります。有効なカテゴリーの一覧は %s"
 
-#: 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 "カテゴリーは、イベントが記述する特徴を決定します。タイプは、その特徴が何を意味するのかを説明します。例えば、攻撃の送信元 IP、送信元Eメールアドレスまたは添付ファイルはすべてマルウェアのペイロードデリバリーと記述することができます。これらは、ペイロードデリバリーのカテゴリーを持つアトリビュートのタイプになります。それぞれのタイプと有効なカテゴリーの組み合わせがどのようなものかについての説明は、%s。"
@@ -17248,10 +17670,6 @@ msgstr "レスポンスコード"
 msgid "Request duration"
 msgstr "リクエストの所要時間"
 
-#: View/Servers/rest.ctp:164
-msgid "Headers"
-msgstr "Headers"
-
 #: 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 "警告: app/Config/config.phpは書き込み可能ではありません。そのため、ここで行われた設定変更は保存されません。"
@@ -17634,10 +18052,6 @@ msgstr "パッシブな共有グループ"
 msgid "Distribution List"
 msgstr "ディストリビューションのリスト"
 
-#: View/SharingGroups/view.ctp:12
-msgid "Selectable"
-msgstr "選択可能"
-
 #: View/SharingGroups/view.ctp:28
 msgid "Synced by"
 msgstr "同期者:"
@@ -17646,10 +18060,6 @@ msgstr "同期者:"
 msgid "Quick Search"
 msgstr ""
 
-#: View/Sightingdb/index.ctp:55
-msgid "Owner"
-msgstr ""
-
 #: View/Sightingdb/index.ctp:61
 msgid "Host"
 msgstr ""
@@ -17810,6 +18220,11 @@ msgstr "タグ付きアトリビュート"
 msgid "Favourite"
 msgstr "お気に入り"
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+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 に設定すると、タスクは繰り返されません。上記の設定を変更するには、スケジュールタスクの編集の完了後に該当する項目をクリックし\"すべてをアップデート\"をクリックします。"
@@ -18150,6 +18565,45 @@ msgstr ""
 msgid "Are you sure you wish to delete this entry?"
 msgstr ""
 
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr "管理 ユーザーを追加"
@@ -18207,12 +18661,12 @@ msgstr "SMIME キー"
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr "ユーザーの SMIME 公開キーをここに PEM フォーマットで貼り付けます。"
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr "このユーザーアカウントを無効化"
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr "資格情報を自動的に送信"
 
@@ -18222,7 +18676,7 @@ msgstr "管理 ユーザーを編集"
 
 #: View/Users/admin_edit.ctp:69
 #: View/Users/admin_view.ctp:69
-#: View/Users/view.ctp:29
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr "利用規約の承認"
 
@@ -18325,30 +18779,68 @@ msgstr "フィルターを削除"
 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_index.ctp:7
+#: View/Users/admin_index.ctp:3
 msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
 msgstr ""
 
-#: View/Users/admin_index.ctp:10
+#: View/Users/admin_index.ctp:6
 msgid "here"
 msgstr ""
 
-#: View/Users/admin_index.ctp:13;14
+#: View/Users/admin_index.ctp:9;10
 msgid "Reset all sync user API keys"
 msgstr ""
 
-#: View/Users/admin_index.ctp:17
+#: View/Users/admin_index.ctp:13
 msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
 msgstr ""
 
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr "連絡先アラート"
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr "%s に連絡"
@@ -18361,11 +18853,6 @@ 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:27
-#: View/Users/view.ctp:8
-msgid "Contactalert"
-msgstr "連絡先アラート"
-
 #: View/Users/admin_view.ctp:30
 #: View/Users/view.ctp:11
 msgid "Request API access"
@@ -18384,7 +18871,7 @@ msgid "Org_admin"
 msgstr ""
 
 #: View/Users/admin_view.ctp:68
-#: View/Users/view.ctp:28
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr "NIDS スタート SID"
 
@@ -18393,22 +18880,22 @@ msgid "Password change"
 msgstr "パスワードの変更"
 
 #: View/Users/admin_view.ctp:78
-#: View/Users/view.ctp:37
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr "GnuPG フィンガープリント"
 
 #: View/Users/admin_view.ctp:83
-#: View/Users/view.ctp:42
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr "GnuPG ステータス"
 
 #: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:49
+#: View/Users/view.ctp:50
 msgid "S/MIME Public certificate"
 msgstr ""
 
 #: View/Users/admin_view.ctp:119
-#: View/Users/view.ctp:64
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr ""
 
@@ -18424,10 +18911,102 @@ msgstr "失敗したコンポジットはありません"
 msgid "SMIME Public certificate (PEM format)"
 msgstr "SMIME 公開証明書 (PEM フォーマット)"
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr "ログイン"
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr ""
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+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"
@@ -18443,6 +19022,13 @@ msgstr "相関を発見"
 msgid "Proposals active"
 msgstr "アクティブな提案"
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr "ユーザー"
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -18498,15 +19084,15 @@ msgstr ""
 msgid "A heatmap showing the usage of %s."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr "組織のリスト"
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr "インスタンス上に存在する、またはこのインスタンスに認識されている組織の概要。"
 
-#: View/Users/statistics_orgs.ctp:38
+#: View/Users/statistics_orgs.ctp:40
 msgid "Activity (1 year)"
 msgstr ""
 
@@ -18562,6 +19148,14 @@ msgstr "証明書のバリデーション"
 msgid "GnuPG key validation"
 msgstr "GnuPG キーのバリデーション"
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -18720,6 +19314,7 @@ msgid "boolean"
 msgstr "真偽値"
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/Dashboard.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
diff --git a/app/Locale/kor/LC_MESSAGES/default.po b/app/Locale/kor/LC_MESSAGES/default.po
index ef16193d3..54f3a3139 100644
--- a/app/Locale/kor/LC_MESSAGES/default.po
+++ b/app/Locale/kor/LC_MESSAGES/default.po
@@ -1,90 +1,123 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-09-30 01:23\n"
-"Last-Translator: Steve Clement (SteveClement)\n"
+"PO-Revision-Date: 2021-03-26 04:20\n"
+"Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Korean\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: ko\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: ko_KR\n"
 
-#: Console/Command/AdminShell.php:59
+#: Console/Command/AdminShell.php:72
 msgid "Database updated: "
 msgstr ""
 
-#: Console/Command/AdminShell.php:61
+#: Console/Command/AdminShell.php:74
 msgid "Could not update the database: "
 msgstr ""
 
-#: Console/Command/AdminShell.php:73
+#: Console/Command/AdminShell.php:87
 msgid "Worker restarted."
 msgstr ""
 
-#: Console/Command/AdminShell.php:75
+#: Console/Command/AdminShell.php:89
 msgid "Could not restart the worker. Reason: %s"
 msgstr ""
 
-#: Console/Command/AdminShell.php:96
+#: Console/Command/AdminShell.php:111
 msgid "Worker killed."
 msgstr ""
 
-#: Console/Command/AdminShell.php:112
+#: Console/Command/AdminShell.php:128
 msgid "Worker started."
 msgstr ""
 
-#: Console/Command/AdminShell.php:123
+#: Console/Command/AdminShell.php:141
 msgid "%s updated."
 msgstr ""
 
-#: Console/Command/AdminShell.php:128
+#: Console/Command/AdminShell.php:146
 msgid "Could not update %s."
 msgstr ""
 
-#: Console/Command/AdminShell.php:455
+#: Console/Command/AdminShell.php:466
 msgid "Update the JSON definitions of MISP."
 msgstr ""
 
-#: Console/Command/AdminShell.php:458
+#: Console/Command/AdminShell.php:469
 msgid "Update the submodules before ingestion."
 msgstr ""
 
-#: Console/Command/AdminShell.php:487
+#: Console/Command/AdminShell.php:499
 msgid "Last DB num which was successfully executed: "
 msgstr ""
 
-#: Console/Command/AdminShell.php:496
+#: Console/Command/AdminShell.php:508
 msgid "Something went wrong. Could not find the existing db version"
 msgstr ""
 
-#: Console/Command/AdminShell.php:499
+#: Console/Command/AdminShell.php:511
 msgid "DB was never successfully updated or we are on a fresh install"
 msgstr ""
 
-#: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:125;129;133
+#: Console/Command/AdminShell.php:528
+msgid "MISP mass sync authkey reset command line tool.\n\n"
+"Usage: %sConsole/cake resetSyncAuthkeys [user_id]"
+msgstr ""
+
+#: Console/Command/AdminShell.php:536
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
+msgid "Invalid user."
+msgstr ""
+
+#: Console/Command/AdminShell.php:539
+msgid "User has to be a site admin."
+msgstr ""
+
+#: Console/Command/AdminShell.php:563
+msgid "\n"
+"Error: %s\n"
+msgstr ""
+
+#: Console/Command/AdminShell.php:565
+msgid "%s events purged.\n"
+msgstr ""
+
+#: Console/Command/AdminShell.php:587
+msgid "> Database schema dumped on disk"
+msgstr ""
+
+#: Console/Command/AdminShell.php:589
+msgid "Something went wrong. Could not find the existing db version or fetch the current database schema."
+msgstr ""
+
+#: Console/Command/EventShell.php:15
+#: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1085;1510;1514;1518;1593;2102;2178;2182;2186;2404;2453;2524;2613;3137;5506;5727;5731;5740
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
-#: Model/Galaxy.php:292
+#: Model/Galaxy.php:293
 msgid "Invalid event"
 msgstr "유효하지 않은 이벤트"
 
-#: Console/Command/PasswordShell.php:43
+#: Console/Command/PasswordShell.php:46
 msgid "override password change"
 msgstr ""
 
-#: Console/Command/ServerShell.php:49
-#: Controller/ServersController.php:636
-msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+#: Console/Command/ServerShell.php:83
+#: Controller/ServersController.php:674
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled, %s sightings pulled."
 msgstr ""
 
-#: Console/Command/ServerShell.php:51
+#: Console/Command/ServerShell.php:85
 msgid "ERROR: %s"
 msgstr "오류: %s"
 
@@ -96,706 +129,974 @@ msgstr ""
 msgid "interactive mode"
 msgstr ""
 
-#: Controller/AppController.php:385
+#: Controller/AppController.php:382
+msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
+msgstr ""
+
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
+msgid "Update Progress"
+msgstr ""
+
+#: Controller/AppController.php:389
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
 msgstr ""
 
-#: Controller/AppController.php:629
-#: Controller/AttributesController.php:1999;2108;2158;2241;2327
-#: Controller/EventsController.php:2846;2962;3024;3390;4006;4069
+#: Controller/AppController.php:519
+msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
+msgstr ""
+
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr "이 인증키는 export 권한이 없습니다. 관리자에게 문의하세요."
 
-#: Controller/AppController.php:638
-#: Controller/AttributesController.php:2162;2245;2331
-#: Controller/EventsController.php:2850;2967;3029;3394;4010;4073
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr "로그인이 필요합니다."
 
-#: Controller/AppController.php:655
+#: Controller/AppController.php:764
+#: Controller/Component/IndexFilterComponent.php:23
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr ""
 
-#: Controller/AppController.php:780
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr "모두 완료. 처음부터 생성 된 attribute_count "
 
-#: Controller/AppController.php:903
-#: Controller/AttributesController.php:2385
-#: Controller/ShadowAttributesController.php:1278
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
+#: Controller/ShadowAttributesController.php:1267
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "작업이 대기중 입니다. 활성화된 작업 진행 상황은 (관리 -> 작업) 에서 확인하실 수 있습니다."
 
-#: Controller/AttributesController.php:116;1389
+#: Controller/AppController.php:1211
+msgid "RestSearch is not implemented (yet) for this scope."
+msgstr ""
+
+#: Controller/AttributesController.php:109;1339
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "이벤트 ID가 설정되지 않았습니다."
 
-#: Controller/AttributesController.php:119
-msgid "You don't have permissions to create attributes"
-msgstr "Attribute를 생성할 권한이 없습니다."
+#: Controller/AttributesController.php:112
+msgid "You do not have permissions to create attributes"
+msgstr ""
 
-#: Controller/AttributesController.php:139;492;672
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1985;2006;2040
-#: Controller/ObjectsController.php:622
+#: Controller/EventsController.php:2107;2128;2162
+#: Controller/ObjectsController.php:837
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "권한이 없습니다."
 
-#: Controller/AttributesController.php:415;870;875;879;1087;1167;1209;2401;2415;2448;2470;2479;3106;3210;3214
-#: Controller/ShadowAttributesController.php:824;1069;1093;1126;1136
-#: Controller/TagsController.php:492
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
+#: Controller/ObjectsController.php:641
+#: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
+#: Controller/TagsController.php:506
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "올바르지 않은 속성"
 
-#: Controller/AttributesController.php:425
-#: Controller/ShadowAttributesController.php:501
+#: Controller/AttributesController.php:355
+#: Controller/ShadowAttributesController.php:483
 msgid "You do not have the permission to view this event."
 msgstr "이 이벤트를 볼 수 있는 권한이 없습니다."
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:402
 msgid "Attribute not an attachment or malware-sample"
 msgstr "속성이 첨부파일이나 멀웨어-샘플이 아닙니다."
 
-#: Controller/AttributesController.php:489;656;947;1398
-#: Controller/EventsController.php:4706;4720;5455;5469
+#: Controller/AttributesController.php:419;586;892;1348
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "유효하지 않은 이벤트."
 
-#: Controller/AttributesController.php:507;683
-#: Controller/ShadowAttributesController.php:548
+#: Controller/AttributesController.php:437;613
+#: Controller/DecayingModelController.php:56
+#: Controller/ShadowAttributesController.php:530
 msgid "PHP says file was not uploaded. Are you attacking me?"
 msgstr "PHP에서 파일이 업로드 되지 안았습니다. 웹해킹 중이신가요?"
 
-#: Controller/AttributesController.php:686
-#: Controller/ShadowAttributesController.php:551;561
+#: Controller/AttributesController.php:616
+#: Controller/ShadowAttributesController.php:533;543
 msgid "There was a problem to upload the file."
 msgstr "파일 업로드에 문제가 발생했습니다."
 
-#: Controller/AttributesController.php:830
+#: Controller/AttributesController.php:760
 msgid "The ThreatConnect data has been imported."
 msgstr "ThreatConnect 데이터를 가져 왔습니다."
 
-#: Controller/AttributesController.php:833
+#: Controller/AttributesController.php:763
 msgid "%s entries imported."
 msgstr "%s 항목을 가져왔습니다."
 
-#: Controller/AttributesController.php:837
+#: Controller/AttributesController.php:767
 msgid "%s entries could not be imported."
 msgstr "%s 항목을 가져올 수 없습니다."
 
-#: Controller/AttributesController.php:887;935;937
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "올바르지 않은 속성."
-
-#: Controller/AttributesController.php:931
+#: Controller/AttributesController.php:876
 msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
 msgstr "Attribute을 저장 할 수 없습니다. 요청된 Attribute가 로컬 복사본보다 최신이 아닙니다."
 
-#: Controller/AttributesController.php:964
+#: Controller/AttributesController.php:880;882
+#: Controller/ShadowAttributesController.php:817
+msgid "Invalid attribute."
+msgstr "올바르지 않은 속성."
+
+#: Controller/AttributesController.php:909
 msgid "The attribute has been saved"
 msgstr "속성이 저장되었습니다"
 
-#: Controller/AttributesController.php:999
+#: Controller/AttributesController.php:944
 msgid "The attribute could not be saved. Please, try again."
 msgstr "속성이 저장되지 않았습니다. 다시 시도하세요."
 
-#: Controller/AttributesController.php:1091
+#: Controller/AttributesController.php:1036
+#: Controller/ObjectsController.php:515
 msgid "Invalid event id."
 msgstr "올바르지 않은 이벤트 id."
 
-#: Controller/AttributesController.php:1121
-#: Controller/EventsController.php:2326
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1072
+#: Controller/EventsController.php:2466
+#: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "올바르지 않은 입력."
 
-#: Controller/AttributesController.php:1126
+#: Controller/AttributesController.php:1077
 msgid "Invalid field."
 msgstr "유효하지 않은 필드."
 
-#: Controller/AttributesController.php:1171;1213
+#: Controller/AttributesController.php:1125;1161
 msgid "Invalid attribute id."
 msgstr "올바르지 않은 속성 id."
 
-#: Controller/AttributesController.php:1299;1309
-msgid "Attribute deleted"
-msgstr "속성이 삭제되었습니다"
-
-#: Controller/AttributesController.php:1304;1306
-msgid "Attribute was not deleted"
-msgstr "속성이 삭제되지 않았습니다"
-
-#: Controller/AttributesController.php:1331;2872
-#: Controller/ShadowAttributesController.php:865
-msgid "Invalid Attribute"
-msgstr "올바르지 않은 속성"
-
-#: Controller/AttributesController.php:1358
-msgid "Could not restore the attribute"
-msgstr "Attribute를 복원 할 수 없습니다."
-
-#: Controller/AttributesController.php:1369
+#: Controller/AttributesController.php:1242;1319
 msgid "This function is only accessible via POST requests."
 msgstr "이 함수는 POST로만 접근 가능합니다."
 
-#: Controller/AttributesController.php:1424
+#: Controller/AttributesController.php:1249;1259
+msgid "Attribute deleted"
+msgstr "속성이 삭제되었습니다"
+
+#: Controller/AttributesController.php:1254;1256
+msgid "Attribute was not deleted"
+msgstr "속성이 삭제되지 않았습니다"
+
+#: Controller/AttributesController.php:1281;2675
+#: Controller/ShadowAttributesController.php:853
+msgid "Invalid Attribute"
+msgstr "올바르지 않은 속성"
+
+#: Controller/AttributesController.php:1308
+msgid "Could not restore the attribute"
+msgstr "Attribute를 복원 할 수 없습니다."
+
+#: Controller/AttributesController.php:1374
 msgid "No matching attributes found."
 msgstr "매칭된 Attributes가 없습니다."
 
-#: Controller/AttributesController.php:1458
+#: Controller/AttributesController.php:1408
 msgid "This method can only be accessed via AJAX."
 msgstr "이 메서드는 AJAX로만 접근 가능합니다."
 
-#: Controller/AttributesController.php:1468
+#: Controller/AttributesController.php:1418
 msgid "You are not authorized to edit this event."
 msgstr "이 이벤트를 수정할 권한이 없습니다."
 
-#: Controller/AttributesController.php:1566
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "이벤트 ID가 제공되지 않았습니다."
 
-#: Controller/AttributesController.php:1611
-#: Controller/GalaxiesController.php:235
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "동의어: "
 
-#: Controller/AttributesController.php:1994;2101
+#: Controller/AttributesController.php:1912;2019
 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:2007
+#: Controller/AttributesController.php:1925
 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:2027
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "이벤트에 접근할 수 없습니다."
 
-#: Controller/AttributesController.php:2090
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "검색결과 없음."
 
-#: Controller/AttributesController.php:2112;2121
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "잘못된 attribute 거나 보기 권한이 없습니다."
 
-#: Controller/AttributesController.php:2189
-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:2253
-msgid "Invalid event ID format."
-msgstr "잘못된 이벤트 ID 형태입니다."
-
-#: Controller/AttributesController.php:2362
-#: Controller/ShadowAttributesController.php:1256
+#: Controller/AttributesController.php:2165
+#: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "모두 완료. "
 
-#: Controller/AttributesController.php:2394;2441
-#: Controller/ShadowAttributesController.php:1064
+#: Controller/AttributesController.php:2197;2244
+#: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "잘못 된 필드 요청입니다."
 
-#: Controller/AttributesController.php:2397;2444
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "이 기능은 AJAX에서만 액세스 할 수 있습니다."
 
-#: Controller/AttributesController.php:2509;2517
-#: Controller/EventsController.php:3833;3982;5261
+#: Controller/AttributesController.php:2282
+msgid "You do not have permission to do that"
+msgstr ""
+
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "이벤트가 없거나 attribute를 만들 권한이 없습니다"
 
-#: Controller/AttributesController.php:2538
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "이 작업은 AJAX에서만 액세스 할 수 있습니다."
 
-#: Controller/AttributesController.php:2547;2798;2812;2823
-#: Controller/OrganisationsController.php:418
-#: Controller/ServersController.php:623;691
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
+#: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "그것을 할 수있는 권한이 없습니다."
 
-#: Controller/AttributesController.php:2652
-#: Controller/EventsController.php:4499
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "이 기능은 API 키가 필요합니다."
 
-#: Controller/AttributesController.php:2660
+#: Controller/AttributesController.php:2463
 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:2672
+#: Controller/AttributesController.php:2475
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "해시 또는 이벤트 ID가 접수되지 않았습니다. 두 가지 중 하나는 설정해야합니다."
 
-#: Controller/AttributesController.php:2833
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "잘못된 스크립트."
 
-#: Controller/AttributesController.php:2900
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr "Attribute에 맞는 enrichment를 찾지 못했습니다."
 
-#: Controller/AttributesController.php:2998
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "잘못된 유형이 요청되었습니다."
 
-#: Controller/AttributesController.php:3277
-#: Controller/EventsController.php:5451
+#: Controller/AttributesController.php:2864;3071
+#: Controller/TagCollectionsController.php:254
+msgid "Invalid tag"
+msgstr ""
+
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "이 인스턴스는 연관분석 해제가 허용되지 않습니다."
 
-#: Controller/AttributesController.php:3281;3296
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3165;3180
+#: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "잘못된 속성"
 
-#: Controller/AttributesController.php:3284;3299
-#: Controller/EventsController.php:5458;5472
-#: Controller/PostsController.php:60;84
-#: Controller/TaxonomiesController.php:100;131;163;245;275;305;335;365;374;383
-msgid "You don't have permission to do that."
-msgstr "실행할 수 있는 권한이 없습니다."
+#: Controller/CommunitiesController.php:150
+msgid "Request sent."
+msgstr ""
+
+#: Controller/CommunitiesController.php:150
+msgid "Something went wrong and the request could not be sent."
+msgstr ""
+
+#: Controller/CommunitiesController.php:166
+msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
+msgstr ""
+
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
+#: Controller/DecayingModelController.php:20
+msgid "Default decaying models updated"
+msgstr ""
+
+#: Controller/DecayingModelController.php:28
+msgid "This method is not allowed"
+msgstr ""
+
+#: Controller/DecayingModelController.php:36;105;207;243;264;276;354;387;399;409;430;442;452;544
+#: Controller/DecayingModelMappingController.php:25
+#: Model/DecayingModel.php:483;619
+#: Model/DecayingModelMapping.php:30;59
+msgid "No Decaying Model with the provided ID exists"
+msgstr ""
+
+#: Controller/DecayingModelController.php:47
+msgid "Only one import field can be used"
+msgstr ""
+
+#: Controller/DecayingModelController.php:65
+msgid "Error while decoding JSON"
+msgstr ""
+
+#: Controller/DecayingModelController.php:90
+msgid "The model has been imported."
+msgstr ""
+
+#: Controller/DecayingModelController.php:92
+msgid "The model has been imported. However importing mapping failed."
+msgstr ""
+
+#: Controller/DecayingModelController.php:95
+msgid "Error while importing model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:186
+msgid "The model must have a name"
+msgstr ""
+
+#: Controller/DecayingModelController.php:198;269
+msgid "The model has been saved."
+msgstr ""
+
+#: Controller/DecayingModelController.php:201
+msgid "The model has been saved. However importing mapping failed."
+msgstr ""
+
+#: Controller/DecayingModelController.php:220;224;281
+msgid "The model could not be saved. Please try again."
+msgstr ""
+
+#: Controller/DecayingModelController.php:308
+msgid "Invalid JSON `Settings`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:314
+msgid "Invalid parameter `lifetime`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:318
+msgid "Invalid parameter `decay_speed`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:322
+msgid "Invalid parameter `threshold`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:326
+msgid "Invalid parameter `default_base_score`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:333
+msgid "Invalid parameter `base_score_config`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:342
+msgid "Missing JSON key `parameters`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:360
+msgid "You are not authorised to delete this model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:368
+msgid "Decaying Model deleted."
+msgstr ""
+
+#: Controller/DecayingModelController.php:371
+msgid "The Decaying Model could not be deleted."
+msgstr ""
+
+#: Controller/DecayingModelController.php:391
+msgid "You are not authorised to enable this model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:404
+msgid "Decaying Model enabled."
+msgstr ""
+
+#: Controller/DecayingModelController.php:414;417;457
+msgid "Error while enabling decaying model"
+msgstr ""
+
+#: Controller/DecayingModelController.php:434
+msgid "You are not authorised to disable this model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:447
+msgid "Decaying Model disabled."
+msgstr ""
+
+#: Controller/DecayingModelController.php:460
+msgid "Error while disabling decaying model"
+msgstr ""
+
+#: Controller/DecayingModelController.php:478
+#: View/DecayingModel/add.ctp:37
+msgid "Lifetime"
+msgstr ""
+
+#: Controller/DecayingModelController.php:479
+#: View/DecayingModel/add.ctp:37
+msgid "Lifetime of the attribute, or time after which the score will be 0"
+msgstr ""
+
+#: Controller/DecayingModelController.php:486
+#: View/DecayingModel/add.ctp:46
+msgid "Decay speed"
+msgstr ""
+
+#: Controller/DecayingModelController.php:487
+#: View/DecayingModel/add.ctp:46
+msgid "Decay speed at which an indicator will loose score"
+msgstr ""
+
+#: Controller/DecayingModelController.php:494
+#: View/DecayingModel/add.ctp:56
+msgid "Cutoff threshold"
+msgstr ""
+
+#: Controller/DecayingModelController.php:495
+#: View/DecayingModel/add.ctp:56
+msgid "Cutoff value at which an indicator will be marked as decayed instead of 0"
+msgstr ""
+
+#: Controller/DecayingModelController.php:563
+msgid "Error Processing Request, can't parse the body"
+msgstr ""
+
+#: Controller/DecayingModelController.php:712
+msgid "This method is only accessible via AJAX."
+msgstr ""
 
 #: Controller/EventBlacklistsController.php:15
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "이벤트 블랙리스팅이 현재 인스턴스에서 활성화 되어 있지 않습니다."
 
-#: Controller/EventBlacklistsController.php:73;95
+#: Controller/EventBlacklistsController.php:76;98
 msgid "Invalid event IDs."
 msgstr ""
 
-#: Controller/EventBlacklistsController.php:84
+#: Controller/EventBlacklistsController.php:87
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr ""
 
-#: Controller/EventsController.php:855
+#: Controller/EventsController.php:894
 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:857
+#: Controller/EventsController.php:896
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "GnuPG 키가 설정되어 있지 않습니다. 메일로받을 경우 공개 키를 프로필에 추가하십시오."
 
-#: Controller/EventsController.php:863
+#: Controller/EventsController.php:902
 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:865
+#: Controller/EventsController.php:904
 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:1617
-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:1731
+msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
+msgstr ""
 
-#: Controller/EventsController.php:1827
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr "이벤트를 생성할 수있는 권한이 없습니다"
 
-#: Controller/EventsController.php:1833
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr "유효한 이벤트 데이터가 수신되지 않았습니다."
 
-#: Controller/EventsController.php:1869
+#: Controller/EventsController.php:1984
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "잘못된 공유 그룹이거나 권한이 없습니다(동기화 사용자가 공유 그룹에 포함되어있지 않습니다)."
 
-#: Controller/EventsController.php:1873;1877
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
 msgstr "잘못된 공유 그룹이거나 권한이 없습니다"
 
-#: Controller/EventsController.php:1901
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr "로컬 블랙리스트에 의해 이벤트가 차단되어 있습니다."
 
-#: Controller/EventsController.php:1914;1994;2258
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "이벤트가 저장되었습니다"
 
-#: Controller/EventsController.php:1922
+#: Controller/EventsController.php:2037
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "이벤트가 이미 존재합니다, 편집하고 싶다면 Location 헤더에 있는 url을 이용하십시오."
 
-#: Controller/EventsController.php:1928
+#: Controller/EventsController.php:2043
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "블랙리스트 항목을 통해 이벤트를 만들 수 없습니다. 관리 팀에 문의하십시오."
 
-#: Controller/EventsController.php:1930;2261
+#: Controller/EventsController.php:2045;2395
 msgid "The event could not be saved. Please, try again."
 msgstr "이벤트가 저장되지 않았습니다. 다시 시도하세요."
 
-#: Controller/EventsController.php:1970
+#: Controller/EventsController.php:2094
 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:2020
+#: Controller/EventsController.php:2142
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "MISP XML 또는 MISP JSON 파일만 업로드할 수 있습니다."
 
-#: Controller/EventsController.php:2021
+#: Controller/EventsController.php:2143
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "파일 업로드에 실패했거나, 파일의 예상한 확장자(.xml / .json)가 없습니다."
 
-#: Controller/EventsController.php:2070
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr "SITX 문서로 가져온 이벤트가 생성되었습니다: "
 
-#: Controller/EventsController.php:2073
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr "STIX 문서를 가져왔다."
 
-#: Controller/EventsController.php:2076
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr "STIX 문서를 가져올 수 없습니다. "
 
-#: Controller/EventsController.php:2083
+#: Controller/EventsController.php:2217
 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:2107;2192
+#: Controller/EventsController.php:2241;2326
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "이 동작을 수행 할 권한이 없습니다. \"attribute의 제안\"기능을 사용하십시오."
 
-#: Controller/EventsController.php:2115
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr "올바르지 않은 이벤트 ID 가 입력되었습니다."
 
-#: Controller/EventsController.php:2120
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr "선택한 이벤트를 읽기 권한이 없습니다."
 
-#: Controller/EventsController.php:2410;2460;2530
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr "실행할 수있는 권한이 없습니다."
 
-#: Controller/EventsController.php:2419
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr "이벤트가 게시되지 않았습니다."
 
-#: Controller/EventsController.php:2472;2541
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr ""
 
-#: Controller/EventsController.php:2624
+#: Controller/EventsController.php:2819
+msgid "You must specify a message."
+msgstr ""
+
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr "보고자에게 이메일이 발송되었습니다."
 
-#: Controller/EventsController.php:2626
-msgid "Sending of email failed"
-msgstr "이메일 발송 실패"
+#: Controller/EventsController.php:2847
+msgid "Sending of email failed."
+msgstr ""
 
-#: Controller/EventsController.php:2671
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr ""
 
-#: Controller/EventsController.php:2759
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr "이 기능은 비활성화되어 있습니다"
 
-#: Controller/EventsController.php:2801;4015;4083
-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:2837
-msgid "Invalid Event ID."
-msgstr "잘못된 이벤트 ID입니다."
-
-#: Controller/EventsController.php:2884
-msgid "No events found that match the passed parameters."
-msgstr "전달된 파라메터에 맞는 이벤트를 찾지 못했습니다."
-
-#: Controller/EventsController.php:2909
-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:2984
-msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
-msgstr ""
-
-#: Controller/EventsController.php:3003
-#: Model/Attribute.php:2069
-msgid "Invalid hash type."
-msgstr "잘못된 해시 유형입니다."
-
-#: Controller/EventsController.php:3106
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr "허용되지 않은 파일 이름입니다."
 
-#: Controller/EventsController.php:3126
-msgid "Problem with writing the ioc file. Please report to administrator."
-msgstr "Ioc 파일을 만드는 데 문제가 발생했습니다. 관리자에게 문의하십시오."
+#: Controller/EventsController.php:3134
+msgid "Problem with writing the IoC file. Please report to site admin."
+msgstr ""
 
-#: Controller/EventsController.php:3220
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr "유효한 MISP XML 파일이 아닙니다."
 
-#: Controller/EventsController.php:3383
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr "구현되어 있지 않습니다"
 
-#: Controller/EventsController.php:3401;3405
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr "잘못된 이벤트 또는 권한이 없습니다."
 
-#: Controller/EventsController.php:3425;3495
-msgid "You don't have the privileges to access this."
-msgstr "이것에 접근할 권한이 없습니다."
-
-#: Controller/EventsController.php:3706
-#: Controller/TagCollectionsController.php:311
+#: Controller/EventsController.php:3484
+#: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr "유효하지 않은 태그입니다."
 
-#: Controller/EventsController.php:3722
-#: Controller/TagCollectionsController.php:327
+#: Controller/EventsController.php:3500
+#: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr "이 이벤트에 이미 태그가 첨부되어 있습니다."
 
-#: Controller/EventsController.php:3733;3739
-#: Controller/TagCollectionsController.php:334
+#: Controller/EventsController.php:3514
+msgid "Tag is not allowed due to taxonomy exclusivity settings"
+msgstr ""
+
+#: Controller/EventsController.php:3545;3551
+#: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr "태그(들) 추가됨."
 
-#: Controller/EventsController.php:3735
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr "태그를 추가하지 못했습니다."
 
-#: Controller/EventsController.php:3741
-#: Controller/TagCollectionsController.php:342
+#: Controller/EventsController.php:3553
+#: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr "모든 태그가 추가되어 있어 추가할것이 없습니다."
 
-#: Controller/EventsController.php:3986;5265;5287;5785;5789
-#: Controller/ObjectsController.php:46;190;194;618;1028
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
+#: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "잘못된 이벤트입니다."
 
-#: Controller/EventsController.php:4146;4176;4192
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr "실행할 수있는 권한이 없습니다."
 
-#: Controller/EventsController.php:4257;4397
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr "잘못된 ID"
 
-#: Controller/EventsController.php:4261;4401;4948
+#: Controller/EventsController.php:3987;4128;4703
 msgid "Event not found or you are not authorised to view it."
 msgstr ""
 
-#: Controller/EventsController.php:4502;4509
+#: Controller/EventsController.php:4134
+msgid "Freetext Import"
+msgstr ""
+
+#: Controller/EventsController.php:4140
+msgid "Populate using a Template"
+msgstr ""
+
+#: Controller/EventsController.php:4146
+msgid "OpenIOC Import"
+msgstr ""
+
+#: Controller/EventsController.php:4151
+msgid "ThreatConnect Import"
+msgstr ""
+
+#: Controller/EventsController.php:4156
+msgid "(Experimental) Forensic analysis - Mactime"
+msgstr ""
+
+#: Controller/EventsController.php:4175
+msgid "MISP standard (recommended exchange format - lossless)"
+msgstr ""
+
+#: Controller/EventsController.php:4181
+msgid "STIX 1.1.1 format (lossy)"
+msgstr ""
+
+#: Controller/EventsController.php:4186
+msgid "STIX 2.0 format (lossy)"
+msgstr ""
+
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4538
+#: Controller/EventsController.php:4264
 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:4546
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "이벤트를 찾을 수 없습니다"
 
-#: Controller/EventsController.php:4569
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "이벤트를 찾을 수 없습니다."
 
-#: Controller/EventsController.php:4579
+#: Controller/EventsController.php:4305
 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:4604
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "제공된 정보를 바탕으로 새로운 이벤트를 만들 수 없습니다."
 
-#: Controller/EventsController.php:4743;4764;4797;4822;4847;4877;4898
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr "잘못된 형식"
 
-#: Controller/EventsController.php:5012
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr "잘못 된 방법입니다."
 
-#: Controller/EventsController.php:5094
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr "%s 서비스가 활성화되어 있지 않습니다."
 
-#: Controller/EventsController.php:5098
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "속성이 없거나 속성을 볼 수있는 권한이 없습니다."
 
-#: Controller/EventsController.php:5103
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr "이 속성에 대한 유효한 %s 옵션이 없습니다."
 
-#: Controller/EventsController.php:5158;5204
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr "%s 서비스에 도달 할 수 없습니다."
 
-#: Controller/EventsController.php:5170
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr ""
 
-#: Controller/EventsController.php:5221
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:5373
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr "Import 서비스에 도달 할 수 없습니다."
 
-#: Controller/EventsController.php:5598
+#: Controller/EventsController.php:5222;5236
+#: Controller/PostsController.php:60;84
+#: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
+msgid "You don't have permission to do that."
+msgstr "실행할 수 있는 권한이 없습니다."
+
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr "잘못된 ID."
 
-#: Controller/EventsController.php:5646
-#: Controller/ShadowAttributesController.php:313;318;534
+#: Controller/EventsController.php:5411
+#: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr "잘못 된 이벤트"
 
-#: Controller/EventsController.php:5667
+#: Controller/EventsController.php:5432
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "Enrichment 작업은 백그라운드 처리를 위해 큐에 추가되었습니다. 나중에 결과를 확인하십시오."
 
-#: Controller/EventsController.php:5918
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr ""
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr "그것을 실행하는 데 필요한 권한이 없습니다."
 
-#: Controller/FeedsController.php:238;337
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr "피드가 추가되었습니다."
 
-#: Controller/FeedsController.php:246
-msgid "Feed could not be added. Invalid field: %s"
-msgstr "피드를 추가 할 수 없습니다. 잘못된 항목: %s"
+#: Controller/FeedsController.php:291
+msgid "Feed could not be added. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:271;372;394;516;551;755
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr "잘못 된 피드입니다."
 
-#: Controller/FeedsController.php:345
-msgid "Feed could not be updated. Invalid fields: %s"
-msgstr "피드를 업데이트 할 수 없습니다. 잘못된 항목: %s"
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:368
-msgid "This action requires a post request."
-msgstr "이 작업은 post 요청이 필요합니다."
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
+#: Controller/SharingGroupsController.php:237
+#: Controller/UsersController.php:1044
+msgid "Action not allowed, post or delete request expected."
+msgstr ""
 
-#: Controller/FeedsController.php:401;520
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "피드는 현재 활성화되어 있지 않습니다. 활성화하십시오."
 
-#: Controller/FeedsController.php:414;480
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr "피드의를 시작합니다."
 
-#: Controller/FeedsController.php:425
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr "Pull이 백그라운드 실행을 위해 큐에 들어갔습니다."
 
-#: Controller/FeedsController.php:430;432
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr "피드를 가져 오는 데 실패했습니다."
 
-#: Controller/FeedsController.php:436;497
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr "피드 가져 오기가 완료되었습니다."
 
-#: Controller/FeedsController.php:527
-msgid "Event added."
-msgstr "이벤트가 추가되었습니다."
+#: Controller/FeedsController.php:563
+msgid "No feed enabled."
+msgstr ""
 
-#: Controller/FeedsController.php:530
-msgid "Event already up to date."
-msgstr "이벤트는 이미 최신입니다."
-
-#: Controller/FeedsController.php:532
-msgid "Event updated."
-msgstr "이벤트가 업데이트되었습니다."
-
-#: Controller/FeedsController.php:536
-msgid "Could not %s event."
-msgstr "이벤트를 %s 수 없습니다."
-
-#: Controller/FeedsController.php:539
+#: Controller/FeedsController.php:587;606
+#: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr "다운로드에 실패했습니다."
 
-#: Controller/FeedsController.php:631
+#: Controller/FeedsController.php:594
+msgid "Event added."
+msgstr "이벤트가 추가되었습니다."
+
+#: Controller/FeedsController.php:597
+msgid "Event already up to date."
+msgstr "이벤트는 이미 최신입니다."
+
+#: Controller/FeedsController.php:599
+msgid "Event updated."
+msgstr "이벤트가 업데이트되었습니다."
+
+#: Controller/FeedsController.php:603
+msgid "Could not %s event."
+msgstr "이벤트를 %s 수 없습니다."
+
+#: Controller/FeedsController.php:700
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "피드를 가져올 수 없습니다. 리턴된 HTTP 오류 코드는 다음과 같습니다: "
 
-#: Controller/FeedsController.php:670;721
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr "잘못된 피드 유형입니다."
 
-#: Controller/FeedsController.php:787
-msgid "This event is blocked by the Feed filters."
-msgstr "이 이벤트는 피드 필터에 의해 차단되어 있습니다."
-
-#: Controller/FeedsController.php:789
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr "선택한 이벤트를 다운로드 할 수 없습니다"
 
-#: Controller/FeedsController.php:825;829
+#: Controller/FeedsController.php:865
+msgid "This event is blocked by the Feed filters."
+msgstr "이 이벤트는 피드 필터에 의해 차단되어 있습니다."
+
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr "잘못된 피드입니다."
 
-#: Controller/FeedsController.php:850
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr "POST 요청 만 허용되어 있습니다."
 
-#: Controller/FeedsController.php:854
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr "피드가 없습니다."
 
-#: Controller/FeedsController.php:863
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr "데이터를 가져왔습니다."
 
-#: Controller/FeedsController.php:865
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "선택한 데이터를 가져올 수 없습니다. 이유: %s"
 
-#: Controller/FeedsController.php:882
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr "피드 캐싱 시작."
 
-#: Controller/FeedsController.php:897
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr "피드를 캐싱에 실패 했습니다."
 
-#: Controller/FeedsController.php:900
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr "피드 캐싱을 성공적으로 완료 했습니다."
 
-#: Controller/FeedsController.php:934
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr "잘못 된 피드 리스트를 받았습니다."
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr "모든 클러스터"
 
-#: Controller/GalaxiesController.php:167
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr "모든 네임 스페이스"
 
-#: Controller/GalaxiesController.php:293
+#: Controller/GalaxiesController.php:337
+msgid "Failed to parse request or no clusters picked."
+msgstr ""
+
+#: Controller/GalaxiesController.php:340
 msgid "Failed to parse request."
 msgstr "요청을 파싱하지 못헀습니다."
 
-#: Controller/GalaxiesController.php:296
-msgid "No clusters picked."
-msgstr "선택한 클러스터가 없습니다."
-
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr "모든 완료 된 작업이 제거 되었습니다."
@@ -829,10 +1130,11 @@ msgid "News item could not be deleted."
 msgstr ""
 
 #: Controller/ObjectReferencesController.php:37
+#: Controller/ObjectsController.php:511;607;650;671;686;757;768;786
 msgid "Invalid object"
 msgstr "올바르지 않은 객체"
 
-#: Controller/ObjectReferencesController.php:161
+#: Controller/ObjectReferencesController.php:163
 msgid "Invalid object reference"
 msgstr "올바르지 않은 객체 참조"
 
@@ -856,7 +1158,7 @@ msgstr "오브젝트템플릿이 삭제 되었습니다."
 msgid "This action can only be reached via POST requests"
 msgstr "이 행위는 POST 요청을 통해 서만 이용할 수 있습니다."
 
-#: Controller/ObjectsController.php:69;82;1055
+#: Controller/ObjectsController.php:69;82;1272
 msgid "Invalid sharing group."
 msgstr "잘못 된 공유 그룹입니다."
 
@@ -864,41 +1166,65 @@ msgstr "잘못 된 공유 그룹입니다."
 msgid "You don't have permissions to create objects."
 msgstr "오브젝트를 생성할 수있는 권한이 없습니다."
 
-#: Controller/ObjectsController.php:181;1040;1092
+#: Controller/ObjectsController.php:181;1257;1309
 #: Model/Template.php:25
 msgid "Invalid template."
 msgstr "올바르지 않은 양식입니다."
 
-#: Controller/ObjectsController.php:364
-msgid "You don't have permissions to edit objects."
-msgstr "오브젝트를 수정할 수있는 권한이 없습니다."
+#: Controller/ObjectsController.php:295;424;430
+msgid "Object could not be saved."
+msgstr ""
 
-#: Controller/ObjectsController.php:378;389;607
-#: Model/Event.php:6207
+#: Controller/ObjectsController.php:373;1006
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr "유효하지 않은 객체"
 
-#: Controller/ObjectsController.php:601
+#: Controller/ObjectsController.php:377
+msgid "Insufficient permissions to edit this object."
+msgstr ""
+
+#: Controller/ObjectsController.php:449
+msgid "Object attributes saved."
+msgstr ""
+
+#: Controller/ObjectsController.php:518
+msgid "This function can only be accessed via POST or PUT"
+msgstr ""
+
+#: Controller/ObjectsController.php:711
+msgid "Invalid template"
+msgstr ""
+
+#: Controller/ObjectsController.php:789
+msgid "Invalid fields"
+msgstr ""
+
+#: Controller/ObjectsController.php:796
+msgid "Invalid field"
+msgstr ""
+
+#: Controller/ObjectsController.php:822
 msgid "You don't have permissions to delete objects."
 msgstr "객체를 삭제할 권한이 없습니다."
 
-#: Controller/ObjectsController.php:711;718;722
+#: Controller/ObjectsController.php:926;933;937
 msgid "Object not found or not authorised."
 msgstr "객체를 찾지 못했거나 권한이 없습니다."
 
-#: Controller/ObjectsController.php:986
+#: Controller/ObjectsController.php:1203
 msgid "%s objects successfully reconstructed."
 msgstr "%s 객체가 성공적으로 재구성되었습니다."
 
-#: Controller/ObjectsController.php:996;1032
+#: Controller/ObjectsController.php:1213;1249
 msgid "This action can only be reached via AJAX."
 msgstr ""
 
-#: Controller/ObjectsController.php:1073
+#: Controller/ObjectsController.php:1290
 msgid "Failed to create an Object from Attributes. Error: "
 msgstr ""
 
-#: Controller/ObjectsController.php:1084
+#: Controller/ObjectsController.php:1301
 msgid "No Attribute selected."
 msgstr ""
 
@@ -918,47 +1244,43 @@ msgstr ""
 msgid "The organisation could not be added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:155;234;287;314;347
-msgid "Invalid organisation"
-msgstr ""
-
-#: Controller/OrganisationsController.php:194
-msgid "Organisation updated."
-msgstr ""
-
-#: Controller/OrganisationsController.php:209
-msgid "The organisation could not be updated."
-msgstr ""
-
-#: Controller/OrganisationsController.php:230
-msgid "Action not allowed, post request expected."
-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/OrganisationsController.php:275;281
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:352
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
+msgid "Invalid organisation"
+msgstr ""
+
+#: Controller/OrganisationsController.php:208
+msgid "Organisation updated."
+msgstr ""
+
+#: Controller/OrganisationsController.php:223
+msgid "The organisation could not be updated."
+msgstr ""
+
+#: Controller/OrganisationsController.php:272
+msgid "Organisation deleted"
+msgstr "조직이 삭제되었습니다."
+
+#: Controller/OrganisationsController.php:279
+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/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:401
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr ""
 
-#: Controller/OrganisationsController.php:423
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr ""
 
-#: Controller/OrganisationsController.php:426
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr ""
 
@@ -1074,88 +1396,97 @@ msgstr ""
 msgid "Default role unset."
 msgstr ""
 
-#: Controller/ServersController.php:225;421
+#: Controller/ServersController.php:237;436
 msgid "The pull filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:235;431
+#: Controller/ServersController.php:247;446
 msgid "The push filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:289;461
+#: Controller/ServersController.php:302;476
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr ""
 
-#: Controller/ServersController.php:301
+#: Controller/ServersController.php:314
 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:336;517;1997
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr ""
 
-#: Controller/ServersController.php:343;524
+#: Controller/ServersController.php:357;539
 msgid "The server could not be saved. Please, try again."
 msgstr "서버를 저장하지 못했습니다. 다시 시도해 주십시오."
 
-#: Controller/ServersController.php:396;593;618;627;687;1403
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "올바르지 않은 서버"
 
-#: Controller/ServersController.php:478
+#: Controller/ServersController.php:493
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr ""
 
-#: Controller/ServersController.php:600
+#: Controller/ServersController.php:604;2183;2225
+msgid "This endpoint expects POST requests."
+msgstr ""
+
+#: Controller/ServersController.php:612
+msgid "You don't have the privileges to do that."
+msgstr ""
+
+#: Controller/ServersController.php:621
 msgid "Server deleted"
 msgstr "서버가 삭제됨"
 
-#: Controller/ServersController.php:603
+#: Controller/ServersController.php:630
 msgid "Server was not deleted"
 msgstr "서버를 삭제되지 않음"
 
-#: Controller/ServersController.php:630
+#: Controller/ServersController.php:668
 msgid "Pull setting not enabled for this server."
 msgstr ""
 
-#: Controller/ServersController.php:653
+#: Controller/ServersController.php:692
 msgid "Pulling."
 msgstr ""
 
-#: Controller/ServersController.php:663
+#: Controller/ServersController.php:702
 msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:700
+#: Controller/ServersController.php:748
 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:713
+#: Controller/ServersController.php:761
 msgid "Push complete. %s events pushed, %s events could not be pushed."
 msgstr ""
 
-#: Controller/ServersController.php:728
+#: Controller/ServersController.php:776
 msgid "Pushing."
 msgstr ""
 
-#: Controller/ServersController.php:738
+#: Controller/ServersController.php:786
 msgid "Push queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:766
+#: Controller/ServersController.php:814
 msgid "Filename not allowed"
 msgstr ""
 
-#: Controller/ServersController.php:771
+#: Controller/ServersController.php:819
 msgid "Incorrect extension or empty file."
 msgstr ""
 
-#: Controller/ServersController.php:853
+#: Controller/ServersController.php:901
 msgid "No organisation selected."
 msgstr ""
 
-#: Controller/ServersController.php:869;870;871;872;873;874;875;876;877;878;879;880;881;882;883
-#: View/Elements/healthElements/diagnostics.ctp:26;170;184;209;269
+#: Controller/ServersController.php:917;918;919;920;921;922;923;924;925;926;927;928;929;930;931
+#: View/Elements/healthElements/diagnostics.ctp:26;170;184;271;331
 #: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/submoduleStatus.ctp:23
@@ -1163,253 +1494,330 @@ msgstr ""
 msgid "OK"
 msgstr "확인"
 
-#: Controller/ServersController.php:869
+#: Controller/ServersController.php:917
 msgid "not found"
 msgstr ""
 
-#: Controller/ServersController.php:869
+#: Controller/ServersController.php:917
 msgid "is not writeable"
 msgstr ""
 
-#: Controller/ServersController.php:870
+#: Controller/ServersController.php:918
 msgid "not readable"
 msgstr ""
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: settings not set"
 msgstr ""
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: Failed to load GnuPG"
 msgstr ""
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: Issues with the key/passphrase"
 msgstr ""
 
-#: Controller/ServersController.php:871
-msgid "FAIL: encrypt failed"
+#: Controller/ServersController.php:919
+msgid "FAIL: sign failed"
 msgstr ""
 
-#: Controller/ServersController.php:872
+#: Controller/ServersController.php:920
 msgid "not configured (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:872
+#: Controller/ServersController.php:920
 msgid "Getting URL via proxy failed"
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "not enabled (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "Python ZeroMQ library not installed correctly."
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "ZeroMQ script not running."
 msgstr ""
 
-#: Controller/ServersController.php:874
+#: Controller/ServersController.php:922
 msgid "Some of the libraries related to STIX are not installed. Make sure that all libraries listed below are correctly installed."
 msgstr ""
 
-#: Controller/ServersController.php:875
+#: Controller/ServersController.php:923
 msgid "Incorrect STIX version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:876
+#: Controller/ServersController.php:924
 msgid "Incorrect STIX2 version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:877
+#: Controller/ServersController.php:925
 msgid "Incorrect CyBox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:878
+#: Controller/ServersController.php:926
 msgid "Incorrect mixbox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:879
+#: Controller/ServersController.php:927
 msgid "Incorrect maec version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:880
+#: Controller/ServersController.php:928
 msgid "Incorrect PyMISP version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:881
+#: Controller/ServersController.php:929
 msgid "Incorrect plyara version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 #: View/Events/filter_event_index.ctp:32;188
 #: View/Pages/doc/using_the_system.ctp:68;173
 msgid "High"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 msgid "Alternative setting used"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 msgid "Test failed"
 msgstr ""
 
-#: Controller/ServersController.php:883
+#: Controller/ServersController.php:931
 msgid "System not enabled"
 msgstr ""
 
-#: Controller/ServersController.php:883
+#: Controller/ServersController.php:931
 msgid "No modules found"
 msgstr ""
 
-#: Controller/ServersController.php:890
+#: Controller/ServersController.php:938
 msgid "MISP will not operate correctly or will be unsecure until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:894
+#: Controller/ServersController.php:942
 msgid "Some of the features of MISP cannot be utilised until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:898
+#: Controller/ServersController.php:946
 msgid "There are some optional tweaks that could be done to improve the looks of your MISP instance."
 msgstr ""
 
-#: Controller/ServersController.php:1106
+#: Controller/ServersController.php:1165
+msgid "Only one `update` worker can run at a time"
+msgstr ""
+
+#: Controller/ServersController.php:1177
 msgid "Worker start signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1121
+#: Controller/ServersController.php:1192
 msgid "Worker stop signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1191
+#: Controller/ServersController.php:1249
+msgid "This setting is redacted."
+msgstr ""
+
+#: Controller/ServersController.php:1274
 msgid "This setting can only be edited via the CLI."
 msgstr ""
 
-#: Controller/ServersController.php:1300
+#: Controller/ServersController.php:1365;1377
+msgid "Restarting workers."
+msgstr ""
+
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "파일을 찾을 수 없습니다."
 
-#: Controller/ServersController.php:1306
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "파일을 삭제할 수 없습니다."
 
-#: Controller/ServersController.php:1329;1345
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr "업로드 실패."
 
-#: Controller/ServersController.php:1337
+#: Controller/ServersController.php:1438
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "이미 존재하는 파일입니다. 교체하길 원하신다면, 먼저 기존 파일을 삭제해주세요."
 
-#: Controller/ServersController.php:1896
+#: Controller/ServersController.php:1505
+msgid "Invalid user or user not found."
+msgstr ""
+
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr ""
 
-#: Controller/ServersController.php:1911
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:1914
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
-#: Controller/ServersController.php:2004
+#: Controller/ServersController.php:2100
+msgid "Cannot create sync config - no host org ID configured for the instance."
+msgstr ""
+
+#: Controller/ServersController.php:2109
+msgid "Configured host org not found. Please make sure that the setting is current on the instance."
+msgstr ""
+
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:212
-msgid "Moving of the file that this attachment references failed."
+#: Controller/ServersController.php:2194
+msgid "API key updated."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:281
+#: Controller/ServersController.php:2207
+msgid "ID has to be a valid server connection"
+msgstr ""
+
+#: Controller/ServersController.php:2210
+msgid "Invalid direction. Valid options: "
+msgstr ""
+
+#: Controller/ServersController.php:2214
+msgid "Priority changed."
+msgstr ""
+
+#: Controller/ServersController.php:2217
+msgid "Priority could not be changed."
+msgstr ""
+
+#: Controller/ServersController.php:2228
+msgid "Only site admin accounts can release the update lock."
+msgstr ""
+
+#: Controller/ServersController.php:2238
+msgid "Only site admin accounts get the DB schema diagnostic."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:263
 msgid "Could not discard proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:342
+#: Controller/ShadowAttributesController.php:324
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:390;393;402
+#: Controller/ShadowAttributesController.php:372;375;384
 msgid "The lines"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:442
+#: Controller/ShadowAttributesController.php:424
 msgid "The proposal has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:454;763
+#: Controller/ShadowAttributesController.php:436;749
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:456
+#: Controller/ShadowAttributesController.php:438
 msgid "The proposal could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:493
+#: Controller/ShadowAttributesController.php:475
 msgid "Invalid Proposal"
 msgstr "올바르지 않은 제안"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:505
 msgid "Proposal not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:601
 msgid "The attachment has been uploaded"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:603
 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:606
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:740
 msgid "The proposed Attribute has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:751
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:896;906
+#: Controller/ShadowAttributesController.php:884;894
 msgid "Invalid proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:950
-msgid "No proposals found or invalid event."
-msgstr ""
-
-#: Controller/ShadowAttributesController.php:982;1018
+#: Controller/ShadowAttributesController.php:1010
 msgid "This feature is only available using the API to Sync users"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:985
+#: Controller/ShadowAttributesController.php:1013
 msgid "Invalid UUID"
 msgstr "올바르지 않은 UUID"
 
-#: Controller/ShadowAttributesController.php:1021
-msgid "This feature is only available using POST requests"
-msgstr ""
-
-#: Controller/SharingGroupsController.php:237
+#: Controller/SharingGroupsController.php:251
 msgid "Sharing Group deleted"
 msgstr ""
 
-#: Controller/SharingGroupsController.php:242
+#: Controller/SharingGroupsController.php:256
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr ""
 
+#: Controller/SightingdbController.php:32
+msgid "SightingDB connection added."
+msgstr ""
+
+#: Controller/SightingdbController.php:32
+msgid "SightingDB connection could not be added."
+msgstr ""
+
+#: Controller/SightingdbController.php:49;99;143
+msgid " Reason: %s"
+msgstr ""
+
+#: Controller/SightingdbController.php:71;123
+#: Model/Sightingdb.php:325
+msgid "Invalid SightingDB entry."
+msgstr ""
+
+#: Controller/SightingdbController.php:87
+msgid "SightingDB connection updated."
+msgstr ""
+
+#: Controller/SightingdbController.php:87
+msgid "SightingDB connection could not be updated."
+msgstr ""
+
+#: Controller/SightingdbController.php:128
+msgid "SightingDB connection removed."
+msgstr ""
+
+#: Controller/SightingdbController.php:130
+msgid "SightingDB connection could not be removed."
+msgstr ""
+
+#: Controller/SightingdbController.php:196
+msgid "Pass a valid SightingDB ID"
+msgstr ""
+
 #: Controller/SightingsController.php:83
 msgid "Could not add the Sighting. Reason: "
 msgstr ""
 
-#: Controller/SightingsController.php:93;96
+#: Controller/SightingsController.php:96
 msgid "Sighting added"
 msgstr ""
 
@@ -1418,6 +1826,7 @@ msgid "You are not authorised to remove sightings data as you don't have permiss
 msgstr ""
 
 #: Controller/SightingsController.php:155
+#: Model/DecayingModel.php:464
 msgid "Attribute not found"
 msgstr "속성을 찾을 수 없습니다."
 
@@ -1453,7 +1862,7 @@ msgstr ""
 msgid "You don't have editing rights on this Tag Collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:201;385
+#: Controller/TagCollectionsController.php:201;391
 msgid "Invalid tag collection."
 msgstr ""
 
@@ -1469,115 +1878,147 @@ msgstr "태그 컬렉션을 삭제하지 못했습니다."
 msgid "You are not allowed to delete that."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:336
+#: Controller/TagCollectionsController.php:241
+msgid "Invalid tag collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:342
 msgid "Tag(s) could not be added."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:389
+#: Controller/TagCollectionsController.php:395
 msgid "Insufficient privileges to remove the tag from the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:400
+#: Controller/TagCollectionsController.php:406
 msgid "Invalid tag or tag not associated with the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:404
+#: Controller/TagCollectionsController.php:410
 msgid "Failed to remove tag from the collection."
 msgstr ""
 
-#: Controller/TagsController.php:367
+#: Controller/TagsController.php:370
 msgid "Tag deleted"
 msgstr "태그가 삭제되었습니다"
 
-#: Controller/TagsController.php:372
+#: Controller/TagsController.php:375
 msgid "Tag was not deleted"
 msgstr "태그가 삭제되지 않았습니다"
 
-#: Controller/TagsController.php:580
+#: Controller/TagsController.php:599
 msgid "Favourite Tags"
 msgstr "즐겨찾는 태그"
 
-#: Controller/TagsController.php:586
+#: Controller/TagsController.php:605
 #: View/TagCollections/index.ctp:4
 msgid "Tag Collections"
 msgstr "태그 컬렉션"
 
-#: Controller/TagsController.php:591
+#: Controller/TagsController.php:610
 msgid "Custom Tags"
 msgstr ""
 
-#: Controller/TagsController.php:595
+#: Controller/TagsController.php:614
 msgid "All Tags"
 msgstr "모든 태그"
 
-#: Controller/TagsController.php:603
+#: Controller/TagsController.php:622
 #: View/Taxonomies/view.ctp:2
 msgid "Taxonomy Library"
 msgstr ""
 
-#: Controller/TagsController.php:772
+#: Controller/TagsController.php:790
 msgid "Includes: "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:57
+#: Controller/TagsController.php:867
+msgid "This functionality requires tagging permission."
+msgstr ""
+
+#: Controller/TagsController.php:881;905
+msgid "Cannot alter the tags of this data, only the organisation that has created the data (orgc) can modify global tags."
+msgstr ""
+
+#: Controller/TagsController.php:883;907
+msgid "Please consider using local tags if you are in the host organisation of the instance."
+msgstr ""
+
+#: Controller/TagsController.php:912;1058
+msgid "Invalid Target."
+msgstr ""
+
+#: Controller/TagsController.php:951
+msgid "Local tags can only be added by users of the host organisation."
+msgstr ""
+
+#: Controller/TagsController.php:964
+msgid "Unable to create tag. Reason: "
+msgstr ""
+
+#: Controller/TagsController.php:1075
+msgid "Insufficient privileges to remove local tags from events you do not own."
+msgstr ""
+
+#: Controller/TaxonomiesController.php:68
 msgid "Taxonomy not found."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:123
+#: Controller/TaxonomiesController.php:134
 msgid "Taxonomy enabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:155
+#: Controller/TaxonomiesController.php:166
 msgid "Taxonomy disabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:223
+#: Controller/TaxonomiesController.php:234
 msgid "All taxonomy libraries are up to date already."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:226
+#: Controller/TaxonomiesController.php:237
 msgid "Could not update any of the taxonomy libraries"
 msgstr ""
 
-#: Controller/TaxonomiesController.php:229
+#: Controller/TaxonomiesController.php:240
 #: Controller/WarninglistsController.php:107
 msgid "Successfully updated "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:229;231
+#: Controller/TaxonomiesController.php:240;242
 msgid " taxonomy libraries."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:231
+#: Controller/TaxonomiesController.php:242
 #: Controller/WarninglistsController.php:109
 msgid " However, could not update "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:265;295;325
+#: Controller/TaxonomiesController.php:276;314;344
 msgid "The tag(s) has been saved."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:267;297;327
+#: Controller/TaxonomiesController.php:282;316;346
 msgid "The tag(s) could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:355
+#: Controller/TaxonomiesController.php:374
 msgid "The tag(s) has been hidden."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:357
+#: Controller/TaxonomiesController.php:376
 msgid "The tag(s) could not be hidden. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:394
+#: Controller/TaxonomiesController.php:413
 msgid "Taxonomy successfuly deleted."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:397
+#: Controller/TaxonomiesController.php:416
 msgid "Taxonomy could not be deleted."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:405
+#: Controller/TaxonomiesController.php:424
 #: Controller/WarninglistsController.php:262
 msgid "This function can only be reached via AJAX."
 msgstr ""
@@ -1590,109 +2031,175 @@ msgstr ""
 msgid "Event populated, but "
 msgstr ""
 
-#: Controller/UsersController.php:42;247
+#: Controller/UserSettingsController.php:129;276
+msgid "Invalid ID passed."
+msgstr ""
+
+#: Controller/UserSettingsController.php:139;143;286;290
+msgid "Invalid user setting."
+msgstr ""
+
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
+msgid "Invalid setting."
+msgstr ""
+
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
+msgid "This setting is restricted and requires the following permission(s): %s"
+msgstr ""
+
+#: Controller/UserSettingsController.php:193
+msgid "Setting saved."
+msgstr ""
+
+#: Controller/UserSettingsController.php:206
+msgid "Setting could not be saved."
+msgstr ""
+
+#: Controller/UserSettingsController.php:301
+msgid "Setting deleted."
+msgstr ""
+
+#: Controller/UserSettingsController.php:309
+msgid "Setting could not be deleted."
+msgstr ""
+
+#: Controller/UserSettingsController.php:322
+msgid "Expecting POST or DELETE request."
+msgstr ""
+
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr "사용자가 올바르지 않거나 승인되지 않았습니다."
 
-#: Controller/UsersController.php:54;467;706;725;953
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "올바르지 않은 사용자"
 
-#: Controller/UsersController.php:119;613;778
+#: Controller/UsersController.php:154;722;887
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
-#: Controller/UsersController.php:146
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr "프로필을 업데이트했습니다."
 
-#: Controller/UsersController.php:150
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:184
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:193
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:213
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "비밀번호가 변경되었습니다."
 
-#: Controller/UsersController.php:222
+#: Controller/UsersController.php:299
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "비밀번호를 갱신 할 수 없습니다. 비밀번호 복잡도와 최소길이를 충족하는지 확인하세요."
 
-#: Controller/UsersController.php:359;377;477
-#: Model/Log.php:320
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:624
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr "사용자를 저장할 수 없습니다. 올바르지 않은 조직입니다."
 
-#: Controller/UsersController.php:646
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "사용자가 저장되었습니다."
 
-#: Controller/UsersController.php:655;889
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr "사용자가 저장되지 않았습니다. 다시 시도하세요."
 
-#: Controller/UsersController.php:881
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "사용자가 저장되었습니다."
 
-#: Controller/UsersController.php:961
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "사용자가 삭제되었습니다"
 
-#: Controller/UsersController.php:965
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "사용자가 삭제되지 않았습니다"
 
-#: Controller/UsersController.php:1043
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "올바르지 않은 사용자 이름 또는 비밀번호 입니다. 다시 시도하세요."
 
-#: Controller/UsersController.php:1130
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr "잘가요!"
 
-#: Controller/UsersController.php:1171
+#: Controller/UsersController.php:1273;1297
+msgid "This functionality is only accessible via POST requests."
+msgstr ""
+
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
 msgid "New authkey generated."
 msgstr "새로운 인증키가 생성되었습니다."
 
-#: Controller/UsersController.php:1280
+#: Controller/UsersController.php:1301
+msgid "Job initiated."
+msgstr ""
+
+#: Controller/UsersController.php:1303
+msgid "%s authkeys reset, %s could not be reset."
+msgstr ""
+
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1462
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1467
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1504
+#: Controller/UsersController.php:1587
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1506
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr "이메일이 발송되었습니다."
 
-#: Controller/UsersController.php:1580
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr ""
 
-#: Controller/UsersController.php:1581
-#: View/Elements/global_menu.ctp:151
+#: Controller/UsersController.php:1664
+#: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
@@ -1701,18 +2208,19 @@ msgstr ""
 msgid "Organisations"
 msgstr ""
 
-#: Controller/UsersController.php:1582
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr ""
 
-#: Controller/UsersController.php:1583
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
-#: View/Elements/eventattribute.ctp:150
+#: View/DecayingModel/decaying_tool_rest_search.ctp:28
+#: View/Elements/eventattribute.ctp:151
 #: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Elements/Feeds/eventattribute.ctp:46
+#: View/Elements/Servers/eventattribute.ctp:46
 #: View/Events/resolved_attributes.ctp:53
-#: View/Events/resolved_misp_format.ctp:66;93;263
+#: View/Events/resolved_misp_format.ctp:66;94;289
 #: View/Events/view.ctp:127
 #: View/Feeds/preview_event.ctp:16
 #: View/Feeds/preview_index.ctp:39
@@ -1730,18 +2238,160 @@ msgstr ""
 msgid "Tags"
 msgstr "태그"
 
-#: Controller/UsersController.php:1584
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr ""
 
-#: Controller/UsersController.php:1585
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1586
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr ""
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "예"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "아니오"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr ""
@@ -1822,6 +2472,14 @@ msgstr ""
 msgid "No valid data received."
 msgstr ""
 
+#: Controller/Component/ACLComponent.php:634
+msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
+msgstr ""
+
+#: Controller/Component/ACLComponent.php:688
+msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
+msgstr ""
+
 #: Controller/Component/AdminCrudComponent.php:20
 msgid "The %s has been saved."
 msgstr ""
@@ -1870,2154 +2528,2967 @@ msgstr ""
 msgid "Could not remove the blacklist entry"
 msgstr ""
 
-#: Model/AppModel.php:1232
+#: Controller/Component/DeprecationComponent.php:18
+msgid "Use /attributes/restSearch to export RPZ rules."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:19
+msgid "Use /attributes/restSearch to export flat indicator lists."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:22
+msgid "Use MISP modules to import in OpenIOC format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:23
+msgid "Use /events/restSearch to export in CSV format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:24
+msgid "Use the REST client to refine your search conditions and export in any of the given formats with much more control."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:25
+msgid "Use /events/restSearch to export hashes."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:26
+msgid "Use /events/restSearch to export in the various NIDS formats."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:27
+msgid "Use /events/restSearch to export in STIX format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:28
+msgid "Use /events/restSearch to export in STIX2 format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:29
+msgid "Use /events/restSearch to export in XML format. It is highly recommended to use JSON whenever possible."
+msgstr ""
+
+#: Controller/Component/RateLimitComponent.php:29
+msgid "API searches are not allowed for this user role."
+msgstr ""
+
+#: Controller/Component/RateLimitComponent.php:41
+msgid "Rate limit exceeded."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:603
+msgid "The action that the user performed"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:609
+msgid "Is the sharing group selectable (active) when chosing distribution"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:614;1356
+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 ""
+
+#: Controller/Component/RestResponseComponent.php:620
+msgid "All organisations contained on the instance will be part of the sharing group"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:626
+msgid "hard-delete already soft-deleted attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:633
+msgid "Maturity of the event"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:640
+msgid "Anonymise the information regarding the server on which the request was issued"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:646
+msgid "Filter on attribute value"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:652
+msgid "The authorisation key found on the external server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:658
+msgid "The user receive alerts when events are published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:664
+msgid "The email's body"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:670
+msgid "The feed is cached"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:682
+msgid "A valid x509 certificate "
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:688
+msgid "The text contained in the change field"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:694
+msgid "The user will be prompted the change the password"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:700
+msgid "A valid hexadecimal colour `#ffffff`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:711
+msgid "Contact details for the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:717
+msgid "The user receive alerts from `contact reporter` requests"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:734
+msgid "Base64 encoded file contents"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:746
+msgid "The user set date field on the event level. If you are using restSearch, you can use any of the valid time related filters (examples: 7d, timestamps, [14d, 7d] for ranges, etc.)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:781
+msgid "The role is a default role (selected by default)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:787
+msgid "Remove file after ingestion"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:793
+msgid "Include deleted elements"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:799
+msgid "Merge attributes (only add new attribute, remove revoked attributes)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:810
+msgid "Disable the user account"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:822
+msgid "Filter on user email"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:828
+msgid "Set the password manually"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:839
+msgid "When uploading malicious samples, set this flag to tell MISP to encrpyt the sample and extract the file hashes. This will create a MISP object with the appropriate attributes."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:850
+msgid "Should the warning list be enforced. Adds `blocked` field for matching attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:863
+msgid "The timestamp at which the event was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:870
+msgid "The timestamp at which the attribute was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:882;1021
+msgid "Quick event description"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:888
+msgid "The tag is exported when synchronising with other instances"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:900
+msgid "Exclude local tags from the export"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:906
+msgid "The organisation have write access to this sharing group (they can add/remove other organisation)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:912
+msgid "An external authorisation is required for this user"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:918
+msgid "A valid external auth key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:931
+msgid "target_event option might be considered"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:943
+msgid "The date from which the event was published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:949
+msgid "A valid GPG key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:955
+msgid "The event contains proposals"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:961
+msgid "Headers to be passed with the requests. All separated by `\\n`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:967
+msgid "The tag is hidden (not selectable)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:979
+msgid "Include matching attributes in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:991
+msgid "Include matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:997
+msgid "Include matching eventUuids in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1003
+msgid "Include tags of matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1015
+msgid "Include proposals of matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1028
+msgid "Specify whether the source (url field) is a directory (local) or an geniun url (network)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1034
+msgid "The IP of a login attempt"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1040
+msgid "JSON containing ID, UUID and name"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1046
+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)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1059
+msgid "Limit on the pagination"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1065
+msgid "If the organisation should have access to this instance, make sure that the Local organisation setting is checked. If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1071
+msgid "The lookup will not be visible in the feed correlation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1077
+msgid "Message to be included"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1083
+msgid "Will not return Attributes, shadow attribute and objects"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1089
+msgid "Will only return  id, timestamp, published and uuid"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1096
+msgid "Mock the query"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1120
+msgid "The last time the sharing group was modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1138
+msgid "The news are read"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1145
+msgid "The unique Signature Identification"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1151
+msgid "Can be either the ORG_ID or the ORG_NAME"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1157
+msgid "Describe the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1163
+msgid "Organisation identifier (name)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1175;1181
+msgid "Globally used uuid of an organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1187
+msgid "The IDS flags will be set to off for this feed"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1194
+msgid "Page number for the pagination"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1200
+msgid "The hardcoded password"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1272
+msgid "The name of the feed provider"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1278
+msgid "The event will be published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1301
+msgid "Allow the download of events and their attribute from the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1307
+msgid "Allow the upload of events and their attribute to the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1313
+msgid "Allow the upload of sightings to the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1319
+msgid "Concise summary for who this sharing group is releasable to"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1337
+msgid "Pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1362
+msgid "The sector of the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1374
+msgid "Will only return the sharing group ID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1387
+msgid "Sharing group ID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1393
+msgid "The source of the Sighting (e.g. honeypot_1)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1405
+msgid "The email's subject"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1411;1417
+msgid "Base64 encoded certificate"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1435
+msgid "A tad ID to attach to created events"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1448
+msgid "The provided ID will be reused as an existing event"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1471
+msgid "Time of the sighting with the form `h:i:s`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1483
+msgid "The title of the log"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1495
+msgid "The date to which the event was published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1501
+msgid "The state of the `to_ids` flag"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1507
+msgid "The type of the attribute"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1535
+msgid "Placeholder containing values to sight"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1548
+msgid "Not supported (warninglist->checkvalues) expect an array"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1554
+msgid "Not supported (removeTag)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1560;1566;1572;1579;1585;1591;1597;1603;1614
+msgid "Not supported"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1771
+msgid "Seen within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m)"
+msgstr ""
+
+#: Controller/Component/ToolboxComponent.php:18;26
+#: Model/Galaxy.php:220;277;287;301
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr ""
 
-#: Model/AppModel.php:1246
-msgid "Issues executing the pre-update test `"
+#: Model/AppModel.php:1480
+msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1246
-msgid "`. The returned error is: "
-msgstr ""
-
-#: Model/AppModel.php:1268;1271
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1269;1282
+#: Model/AppModel.php:1503
+msgid "The executed SQL query was: %s"
+msgstr ""
+
+#: Model/AppModel.php:1505
+msgid "Successfuly executed the SQL query for %s"
+msgstr ""
+
+#: Model/AppModel.php:1516;1580
+msgid "Issues executing the SQL query for %s"
+msgstr ""
+
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1281;1284
-msgid "Issues executing the SQL query for "
-msgstr ""
-
-#: Model/AppModel.php:1282
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1284
-msgid ". The returned error is: "
+#: Model/AppModel.php:1519
+msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1306
+#: Model/AppModel.php:1528
+msgid "However, as this error is whitelisted, the update went through."
+msgstr ""
+
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/Attribute.php:59
+#: Model/AppModel.php:1550
+msgid "Failed to add index"
+msgstr ""
+
+#: Model/AppModel.php:1552
+msgid "The returned error is:"
+msgstr ""
+
+#: Model/AppModel.php:1581
+msgid "Database updates stopped as some errors occured and the stop flag is enabled."
+msgstr ""
+
+#: Model/AppModel.php:1740
+msgid "Invalid JSON."
+msgstr ""
+
+#: Model/AppModel.php:1833;1891
+msgid "Issues executing run_updates"
+msgstr ""
+
+#: Model/AppModel.php:1834
+msgid "Database updates are locked. Worker not spawned"
+msgstr ""
+
+#: Model/AppModel.php:1838;1896;1931
+msgid "Update done"
+msgstr ""
+
+#: Model/AppModel.php:1892
+msgid "Updates are locked. Stopping worker gracefully"
+msgstr ""
+
+#: Model/AppModel.php:1911
+msgid "Running update %s"
+msgstr ""
+
+#: Model/AppModel.php:1937
+msgid "Update done in another worker. Gracefuly stopping."
+msgstr ""
+
+#: Model/Attribute.php:63
 #: View/Events/filter_event_index.ctp:46;182
 msgid "Your organisation only"
 msgstr ""
 
-#: Model/Attribute.php:60
+#: Model/Attribute.php:64
 #: View/Events/filter_event_index.ctp:46;183
 msgid "This community only"
 msgstr ""
 
-#: Model/Attribute.php:61
+#: Model/Attribute.php:65
 #: View/Events/filter_event_index.ctp:46;184
 #: View/Pages/doc/using_the_system.ctp:51
 msgid "Connected communities"
 msgstr ""
 
-#: Model/Attribute.php:62
+#: Model/Attribute.php:66
 #: View/Events/filter_event_index.ctp:46;185
 #: View/Pages/doc/using_the_system.ctp:58
 msgid "All communities"
 msgstr ""
 
-#: Model/Attribute.php:63
+#: Model/Attribute.php:67
 #: View/Elements/view_event_distribution_graph.ctp:24
 msgid "Sharing group"
 msgstr ""
 
-#: Model/Attribute.php:64
+#: Model/Attribute.php:68
 msgid "Inherit event"
 msgstr ""
 
-#: Model/Attribute.php:69
+#: Model/Attribute.php:76
 msgid "Reference used by the publishing party (e.g. ticket number)"
 msgstr ""
 
-#: Model/Attribute.php:73
+#: Model/Attribute.php:80
 msgid "Internal Attack Targeting and Compromise Information"
 msgstr ""
 
-#: Model/Attribute.php:74
+#: Model/Attribute.php:81
 msgid "Targeting information to include recipient email, infected machines, department, and or locations."
 msgstr ""
 
-#: Model/Attribute.php:78
+#: Model/Attribute.php:85
 msgid "All the info about how the malware is detected by the antivirus products"
 msgstr ""
 
-#: Model/Attribute.php:79
+#: Model/Attribute.php:86
 msgid "List of anti-virus vendors detecting the malware or information on detection performance (e.g. 13/43 or 67%). Attachment with list of detection or link to VirusTotal could be placed here as well."
 msgstr ""
 
-#: Model/Attribute.php:83
+#: Model/Attribute.php:90
 msgid "Information about how the malware is delivered"
 msgstr ""
 
-#: Model/Attribute.php:84
+#: Model/Attribute.php:91
 msgid "Information about the way the malware payload is initially delivered, for example information about the email or web-site, vulnerability used, originating IP etc. Malware sample itself should be attached here."
 msgstr ""
 
-#: Model/Attribute.php:88
+#: Model/Attribute.php:95
 msgid "Any artifact (files, registry keys etc.) dropped by the malware or other modifications to the system"
 msgstr ""
 
-#: Model/Attribute.php:92
+#: Model/Attribute.php:99
 msgid "Info on where the malware gets installed in the system"
 msgstr ""
 
-#: Model/Attribute.php:93
+#: Model/Attribute.php:100
 msgid "Location where the payload was placed in the system and the way it was installed. For example, a filename|md5 type attribute can be added here like this: c:\\windows\\system32\\malicious.exe|41d8cd98f00b204e9800998ecf8427e."
 msgstr ""
 
-#: Model/Attribute.php:97
+#: Model/Attribute.php:104
 msgid "Mechanisms used by the malware to start at boot"
 msgstr ""
 
-#: Model/Attribute.php:98
+#: Model/Attribute.php:105
 msgid "Mechanisms used by the malware to start at boot. This could be a registry key, legitimate driver modification, LNK file in startup"
 msgstr ""
 
-#: Model/Attribute.php:102
+#: Model/Attribute.php:109
 msgid "Information about network traffic generated by the malware"
 msgstr ""
 
-#: Model/Attribute.php:106
+#: Model/Attribute.php:113
 msgid "Information about the final payload(s)"
 msgstr ""
 
-#: Model/Attribute.php:107
+#: Model/Attribute.php:114
 msgid "Information about the final payload(s). Can contain a function of the payload, e.g. keylogger, RAT, or a name if identified, such as Poison Ivy."
 msgstr ""
 
-#: Model/Attribute.php:111
+#: Model/Attribute.php:118
 msgid "Identification of the group, organisation, or country behind the attack"
 msgstr ""
 
-#: Model/Attribute.php:115
+#: Model/Attribute.php:122
 msgid "Any other result from additional analysis of the malware like tools output"
 msgstr ""
 
-#: Model/Attribute.php:116
+#: Model/Attribute.php:123
 msgid "Any other result from additional analysis of the malware like tools output Examples: pdf-parser output, automated sandbox analysis, reverse engineering report."
 msgstr ""
 
-#: Model/Attribute.php:120
+#: Model/Attribute.php:127
 msgid "Financial Fraud indicators"
 msgstr ""
 
-#: Model/Attribute.php:121
+#: Model/Attribute.php:128
 msgid "Financial Fraud indicators, for example: IBAN Numbers, BIC codes, Credit card numbers, etc."
 msgstr ""
 
-#: Model/Attribute.php:125
+#: Model/Attribute.php:132
 msgid "Tools supporting analysis or detection of the event"
 msgstr ""
 
-#: Model/Attribute.php:129
+#: Model/Attribute.php:136
 msgid "Social networks and platforms"
 msgstr ""
 
-#: Model/Attribute.php:134
+#: Model/Attribute.php:141
 msgid "A human being - natural person"
 msgstr ""
 
-#: Model/Attribute.php:138
+#: Model/Attribute.php:145
 msgid "Attributes that are not part of any other category or are meant to be used as a component in MISP objects in the future"
 msgstr ""
 
-#: Model/Attribute.php:144;228
+#: Model/Attribute.php:154;243
 msgid "A checksum in md5 format"
 msgstr ""
 
-#: Model/Attribute.php:144
+#: Model/Attribute.php:154
 msgid "You are encouraged to use filename|md5 instead. A checksum in md5 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:155
 msgid "A checksum in sha1 format"
 msgstr ""
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:155
 msgid "You are encouraged to use filename|sha1 instead. A checksum in sha1 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:146
+#: Model/Attribute.php:156
 msgid "A checksum in sha256 format"
 msgstr ""
 
-#: Model/Attribute.php:146
+#: Model/Attribute.php:156
 msgid "You are encouraged to use filename|sha256 instead. A checksum in sha256 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:147
+#: Model/Attribute.php:157
 #: View/Elements/healthElements/files.ctp:29
 msgid "Filename"
 msgstr "파일명"
 
-#: Model/Attribute.php:148
+#: Model/Attribute.php:158
 msgid "Microsoft Program database (PDB) path information"
 msgstr ""
 
-#: Model/Attribute.php:149
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:149
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:150
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:150
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:151
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:151
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:152
+#: Model/Attribute.php:162
 msgid "A source IP address of the attacker"
 msgstr ""
 
-#: Model/Attribute.php:153
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server"
 msgstr ""
 
-#: Model/Attribute.php:153
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server. Also set the IDS flag on when this IP is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker. Also set the IDS flag on when this hostname is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware. Use this instead of hostname when the upper domain is important or can be used to create links between events."
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:157
+#: Model/Attribute.php:167
 msgid "The email address used to send the malware."
 msgstr ""
 
-#: Model/Attribute.php:158
-msgid "A recipient email address"
-msgstr ""
-
-#: Model/Attribute.php:158
-msgid "A recipient email address that is not related to your constituency."
-msgstr ""
-
-#: Model/Attribute.php:159
-msgid "The subject of the email"
-msgstr ""
-
-#: Model/Attribute.php:160
-msgid "File name of the email attachment."
-msgstr ""
-
-#: Model/Attribute.php:161
-msgid "Email body"
-msgstr ""
-
-#: Model/Attribute.php:162
-msgid "A floating point value."
-msgstr ""
-
-#: Model/Attribute.php:163
-msgid "url"
-msgstr ""
-
-#: Model/Attribute.php:164
-msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
-msgstr ""
-
-#: Model/Attribute.php:165
-msgid "The user-agent used by the malware in the HTTP request."
-msgstr ""
-
-#: Model/Attribute.php:166
-msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
-msgstr ""
-
-#: Model/Attribute.php:167
-msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
-msgstr ""
-
 #: Model/Attribute.php:168
-msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
+msgid "eduPersonPrincipalName - eppn - the NetId of the person for the purposes of inter-institutional authentication. Should be stored in the form of user@univ.edu, where univ.edu is the name of the local security domain."
 msgstr ""
 
 #: Model/Attribute.php:169
-msgid "Registry key or value"
+msgid "A recipient email address"
+msgstr ""
+
+#: Model/Attribute.php:169
+msgid "A recipient email address that is not related to your constituency."
 msgstr ""
 
 #: Model/Attribute.php:170
-msgid "Registry value + data separated by |"
+msgid "The subject of the email"
 msgstr ""
 
 #: Model/Attribute.php:171
-msgid "Autonomous system"
+msgid "File name of the email attachment."
 msgstr ""
 
 #: Model/Attribute.php:172
-msgid "An IDS rule in Snort rule-format"
-msgstr ""
-
-#: Model/Attribute.php:172
-msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
+msgid "Email body"
 msgstr ""
 
 #: Model/Attribute.php:173
-msgid "An NIDS rule in the Bro rule-format"
-msgstr ""
-
-#: Model/Attribute.php:173
-msgid "An NIDS rule in the Bro rule-format."
+msgid "A floating point value."
 msgstr ""
 
 #: Model/Attribute.php:174
-msgid "An NIDS rule in the Zeek rule-format"
-msgstr ""
-
-#: Model/Attribute.php:174
-msgid "An NIDS rule in the Zeek rule-format."
+msgid "url"
 msgstr ""
 
 #: Model/Attribute.php:175
-msgid "Pattern in file that identifies the malware"
+msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
 msgstr ""
 
 #: Model/Attribute.php:176
-msgid "Pattern in network traffic that identifies the malware"
+msgid "The user-agent used by the malware in the HTTP request."
 msgstr ""
 
 #: Model/Attribute.php:177
-msgid "Pattern in memory dump that identifies the malware"
+msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
 msgstr ""
 
 #: Model/Attribute.php:178
-msgid "Yara signature"
+msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
 #: Model/Attribute.php:179
-msgid "STIX 2 pattern"
+msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
 #: Model/Attribute.php:180
-msgid "Sigma - Generic Signature Format for SIEM Systems"
+msgid "Registry key or value"
 msgstr ""
 
 #: Model/Attribute.php:181
-msgid "GENE - Go Evtx sigNature Engine"
+msgid "Registry value + data separated by |"
 msgstr ""
 
 #: Model/Attribute.php:182
-msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
+msgid "Autonomous system"
 msgstr ""
 
 #: Model/Attribute.php:183
-msgid "Identity card number"
+msgid "An IDS rule in Snort rule-format"
+msgstr ""
+
+#: Model/Attribute.php:183
+msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
 msgstr ""
 
 #: Model/Attribute.php:184
-msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
+msgid "An NIDS rule in the Bro rule-format"
+msgstr ""
+
+#: Model/Attribute.php:184
+msgid "An NIDS rule in the Bro rule-format."
 msgstr ""
 
 #: Model/Attribute.php:185
-msgid "A reference to the vulnerability used in the exploit"
+msgid "An NIDS rule in the Zeek rule-format"
+msgstr ""
+
+#: Model/Attribute.php:185
+msgid "An NIDS rule in the Zeek rule-format."
 msgstr ""
 
 #: Model/Attribute.php:186
-msgid "Attachment with external information"
-msgstr ""
-
-#: Model/Attribute.php:186;187
-msgid "Please upload files using the <em>Upload Attachment</em> button."
+msgid "a community ID flow hashing algorithm to map multiple traffic monitors into common flow id"
 msgstr ""
 
 #: Model/Attribute.php:187
-msgid "Attachment containing encrypted malware sample"
+msgid "Pattern in file that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:188
-msgid "Link to an external information"
+msgid "Pattern in network traffic that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:189
-msgid "Comment or description in a human language"
-msgstr ""
-
-#: Model/Attribute.php:189
-msgid "Comment or description in a human language.  This will not be correlated with other attributes"
+msgid "Pattern in memory dump that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:190
-msgid "Name, ID or a reference"
+msgid "Yara signature"
 msgstr ""
 
 #: Model/Attribute.php:191
-msgid "A value in hexadecimal format"
+msgid "STIX 2 pattern"
 msgstr ""
 
 #: Model/Attribute.php:192
-msgid "Other attribute"
+msgid "Sigma - Generic Signature Format for SIEM Systems"
 msgstr ""
 
 #: Model/Attribute.php:193
-msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
+msgid "GENE - Go Evtx sigNature Engine"
 msgstr ""
 
 #: Model/Attribute.php:194
-msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
+msgid "Kusto query - Kusto from Microsoft Azure is a service for storing and running interactive analytics over Big Data."
 msgstr ""
 
 #: Model/Attribute.php:195
-msgid "Attack Targets Username(s)"
+msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
 msgstr ""
 
 #: Model/Attribute.php:196
-msgid "Attack Targets Email(s)"
+msgid "Identity card number"
 msgstr ""
 
 #: Model/Attribute.php:197
-msgid "Attack Targets Machine Name(s)"
+msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
 msgstr ""
 
 #: Model/Attribute.php:198
-msgid "Attack Targets Department or Organization(s)"
+msgid "A reference to the vulnerability used in the exploit"
 msgstr ""
 
 #: Model/Attribute.php:199
-msgid "Attack Targets Physical Location(s)"
+msgid "A reference to the weakness used in the exploit"
 msgstr ""
 
 #: Model/Attribute.php:200
-msgid "External Target Organizations Affected by this Attack"
+msgid "Attachment with external information"
+msgstr ""
+
+#: Model/Attribute.php:200;201
+msgid "Please upload files using the <em>Upload Attachment</em> button."
 msgstr ""
 
 #: Model/Attribute.php:201
-msgid "Bitcoin Address"
+msgid "Attachment containing encrypted malware sample"
 msgstr ""
 
 #: Model/Attribute.php:202
-msgid "Monero Address"
+msgid "Link to an external information"
 msgstr ""
 
 #: Model/Attribute.php:203
-msgid "International Bank Account Number"
+msgid "Comment or description in a human language"
+msgstr ""
+
+#: Model/Attribute.php:203
+msgid "Comment or description in a human language.  This will not be correlated with other attributes"
 msgstr ""
 
 #: Model/Attribute.php:204
-msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
+msgid "Name, ID or a reference"
 msgstr ""
 
 #: Model/Attribute.php:205
-msgid "Bank account number without any routing number"
+msgid "A value in hexadecimal format"
 msgstr ""
 
 #: Model/Attribute.php:206
-msgid "ABA routing transit number"
+msgid "Other attribute"
 msgstr ""
 
 #: Model/Attribute.php:207
-msgid "Bank Identification Number"
+msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
 msgstr ""
 
 #: Model/Attribute.php:208
-msgid "Credit-Card Number"
+msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
 msgstr ""
 
 #: Model/Attribute.php:209
-msgid "Premium-Rate Telephone Number"
+msgid "Attack Targets Username(s)"
 msgstr ""
 
 #: Model/Attribute.php:210
-msgid "Telephone Number"
+msgid "Attack Targets Email(s)"
 msgstr ""
 
 #: Model/Attribute.php:211
-msgid "A string identifying the threat actor"
+msgid "Attack Targets Machine Name(s)"
 msgstr ""
 
 #: Model/Attribute.php:212
-msgid "Associated campaign name"
+msgid "Attack Targets Department or Organization(s)"
 msgstr ""
 
 #: Model/Attribute.php:213
-msgid "Associated campaign ID"
+msgid "Attack Targets Physical Location(s)"
+msgstr ""
+
+#: Model/Attribute.php:214
+msgid "External Target Organizations Affected by this Attack"
 msgstr ""
 
 #: Model/Attribute.php:215
-msgid "Uniform Resource Identifier"
+msgid "Bitcoin Address"
 msgstr ""
 
 #: Model/Attribute.php:216
-msgid "Authenticode executable signature hash"
-msgstr ""
-
-#: Model/Attribute.php:216
-msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:217;229
-msgid "A checksum in ssdeep format"
+msgid "Dash Address"
 msgstr ""
 
 #: Model/Attribute.php:217
-msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:218;230
-msgid "Import hash - a hash created based on the imports in the sample."
+msgid "Monero Address"
 msgstr ""
 
 #: Model/Attribute.php:218
-msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
+msgid "International Bank Account Number"
 msgstr ""
 
 #: Model/Attribute.php:219
-msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
+msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
 msgstr ""
 
 #: Model/Attribute.php:220
-msgid "A fuzzy hash of import table of Portable Executable format"
-msgstr ""
-
-#: Model/Attribute.php:220
-msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
+msgid "Bank account number without any routing number"
 msgstr ""
 
 #: Model/Attribute.php:221
-msgid "A checksum in sha-224 format"
-msgstr ""
-
-#: Model/Attribute.php:221
-msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
+msgid "ABA routing transit number"
 msgstr ""
 
 #: Model/Attribute.php:222
-msgid "A checksum in sha-384 format"
-msgstr ""
-
-#: Model/Attribute.php:222
-msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
+msgid "Bank Identification Number"
 msgstr ""
 
 #: Model/Attribute.php:223
-msgid "A checksum in sha-512 format"
-msgstr ""
-
-#: Model/Attribute.php:223
-msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
+msgid "Credit-Card Number"
 msgstr ""
 
 #: Model/Attribute.php:224
-msgid "A checksum in the sha-512/224 format"
-msgstr ""
-
-#: Model/Attribute.php:224
-msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
+msgid "Premium-Rate Telephone Number"
 msgstr ""
 
 #: Model/Attribute.php:225
-msgid "A checksum in the sha-512/256 format"
-msgstr ""
-
-#: Model/Attribute.php:225
-msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
+msgid "Telephone Number"
 msgstr ""
 
 #: Model/Attribute.php:226
-msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
-msgstr ""
-
-#: Model/Attribute.php:226
-msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
+msgid "A string identifying the threat actor"
 msgstr ""
 
 #: Model/Attribute.php:227
-msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
+msgid "Associated campaign name"
+msgstr ""
+
+#: Model/Attribute.php:228
+msgid "Associated campaign ID"
+msgstr ""
+
+#: Model/Attribute.php:230
+msgid "Uniform Resource Identifier"
 msgstr ""
 
 #: Model/Attribute.php:231
-msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
+msgid "Authenticode executable signature hash"
+msgstr ""
+
+#: Model/Attribute.php:231
+msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:232;244
+msgid "A checksum in ssdeep format"
 msgstr ""
 
 #: Model/Attribute.php:232
-msgid "A filename and a PEhash separated by a |"
+msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:233;245
+msgid "Import hash - a hash created based on the imports in the sample."
 msgstr ""
 
 #: Model/Attribute.php:233
-msgid "A filename and a sha-224 hash separated by a |"
+msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:234
-msgid "A filename and a sha-384 hash separated by a |"
+msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
 msgstr ""
 
 #: Model/Attribute.php:235
-msgid "A filename and a sha-512 hash separated by a |"
+msgid "A fuzzy hash of import table of Portable Executable format"
+msgstr ""
+
+#: Model/Attribute.php:235
+msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:236
-msgid "A filename and a sha-512/224 hash separated by a |"
+msgid "A checksum in sha-224 format"
+msgstr ""
+
+#: Model/Attribute.php:236
+msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:237
-msgid "A filename and a sha-512/256 hash separated by a |"
+msgid "A checksum in sha-384 format"
+msgstr ""
+
+#: Model/Attribute.php:237
+msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:238
-msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
+msgid "A checksum in sha-512 format"
+msgstr ""
+
+#: Model/Attribute.php:238
+msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:239
-msgid "A scheduled task in windows"
+msgid "A checksum in the sha-512/224 format"
+msgstr ""
+
+#: Model/Attribute.php:239
+msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:240
-msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
+msgid "A checksum in the sha-512/256 format"
+msgstr ""
+
+#: Model/Attribute.php:240
+msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:241
-msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
+msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
+msgstr ""
+
+#: Model/Attribute.php:241
+msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:242
-msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:243
-msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:244
-msgid "The name of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:245
-msgid "The org of a domain's registrant, obtained from the WHOIS information."
+msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
 msgstr ""
 
 #: Model/Attribute.php:246
-msgid "The registrar of the domain, obtained from the WHOIS information."
+msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
 msgstr ""
 
 #: Model/Attribute.php:247
-msgid "The date of domain's creation, obtained from the WHOIS information."
+msgid "A filename and a PEhash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:248
+msgid "A filename and a sha-224 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:249
+msgid "A filename and a sha-384 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:250
+msgid "A filename and a sha-512 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:251
+msgid "A filename and a sha-512/224 hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:252
-msgid "X509 fingerprint in SHA-1 format"
+msgid "A filename and a sha-512/256 hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:253
-msgid "X509 fingerprint in MD5 format"
+msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:254
-msgid "X509 fingerprint in SHA-256 format"
+msgid "A scheduled task in windows"
 msgstr ""
 
 #: Model/Attribute.php:255
-msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
+msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
 msgstr ""
 
 #: Model/Attribute.php:256
-msgid "Size expressed in bytes"
+msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
 msgstr ""
 
 #: Model/Attribute.php:257
-msgid "An integer counter, generally to be used in objects"
+msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:258
-msgid "Datetime in the ISO 8601 format"
+msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:259
-msgid "Common platform enumeration"
+msgid "The name of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:260
-msgid "Port number"
+msgid "The org of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:261
-msgid "IP destination and port number seperated by a |"
+msgid "The registrar of the domain, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:262
-msgid "IP source and port number seperated by a |"
-msgstr ""
-
-#: Model/Attribute.php:263
-msgid "Hostname and port number seperated by a |"
-msgstr ""
-
-#: Model/Attribute.php:264
-msgid "Mac address"
-msgstr ""
-
-#: Model/Attribute.php:265
-msgid "Mac EUI-64 address"
+msgid "The date of domain's creation, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:267
-msgid "Email destination display name"
+msgid "X509 fingerprint in SHA-1 format"
 msgstr ""
 
 #: Model/Attribute.php:268
-msgid "Email source display name"
+msgid "X509 fingerprint in MD5 format"
 msgstr ""
 
 #: Model/Attribute.php:269
-msgid "Email header"
+msgid "X509 fingerprint in SHA-256 format"
 msgstr ""
 
 #: Model/Attribute.php:270
-msgid "Email reply to header"
+msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
 msgstr ""
 
 #: Model/Attribute.php:271
-msgid "Email x-mailer header"
+msgid "Size expressed in bytes"
 msgstr ""
 
 #: Model/Attribute.php:272
-msgid "The email mime boundary separating parts in a multipart email"
+msgid "An integer counter, generally to be used in objects"
 msgstr ""
 
 #: Model/Attribute.php:273
-msgid "The email thread index header"
+msgid "Datetime in the ISO 8601 format"
 msgstr ""
 
 #: Model/Attribute.php:274
-msgid "The email message ID"
+msgid "Common platform enumeration"
 msgstr ""
 
 #: Model/Attribute.php:275
-msgid "A github user name"
+msgid "Port number"
 msgstr ""
 
 #: Model/Attribute.php:276
-msgid "A github repository"
+msgid "IP destination and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:277
-msgid "A github organisation"
+msgid "IP source and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:278
-msgid "Jabber ID"
+msgid "Hostname and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:279
-msgid "Twitter ID"
+msgid "Mac address"
 msgstr ""
 
 #: Model/Attribute.php:280
-msgid "First name of a natural person"
-msgstr ""
-
-#: Model/Attribute.php:281
-msgid "Middle name of a natural person"
+msgid "Mac EUI-64 address"
 msgstr ""
 
 #: Model/Attribute.php:282
-msgid "Last name of a natural person"
+msgid "Email destination display name"
 msgstr ""
 
 #: Model/Attribute.php:283
-msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
+msgid "Email source display name"
 msgstr ""
 
 #: Model/Attribute.php:284
-msgid "Place of birth of a natural person"
+msgid "Email header"
 msgstr ""
 
 #: Model/Attribute.php:285
-msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
+msgid "Email reply to header"
 msgstr ""
 
 #: Model/Attribute.php:286
-msgid "The passport number of a natural person"
+msgid "Email x-mailer header"
 msgstr ""
 
 #: Model/Attribute.php:287
-msgid "The country in which the passport was issued"
+msgid "The email mime boundary separating parts in a multipart email"
 msgstr ""
 
 #: Model/Attribute.php:288
-msgid "The expiration date of a passport"
+msgid "The email thread index header"
 msgstr ""
 
 #: Model/Attribute.php:289
-msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
+msgid "The email message ID"
 msgstr ""
 
 #: Model/Attribute.php:290
-msgid "The nationality of a natural person"
+msgid "A github user name"
 msgstr ""
 
 #: Model/Attribute.php:291
-msgid "Visa number"
+msgid "A github repository"
 msgstr ""
 
 #: Model/Attribute.php:292
-msgid "The date on which the visa was issued"
+msgid "A github organisation"
 msgstr ""
 
 #: Model/Attribute.php:293
-msgid "The primary residence of a natural person"
+msgid "Jabber ID"
 msgstr ""
 
 #: Model/Attribute.php:294
-msgid "The country of residence of a natural person"
+msgid "Twitter ID"
 msgstr ""
 
 #: Model/Attribute.php:295
-msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
+msgid "First name of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:296
-msgid "The frequent flyer number of a passenger"
+msgid "Middle name of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:297
+msgid "Last name of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:298
+msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
 msgstr ""
 
 #: Model/Attribute.php:299
-msgid "Travel details"
+msgid "Place of birth of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:300
-msgid "Payment details"
+msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
 msgstr ""
 
 #: Model/Attribute.php:301
-msgid "The orignal port of embarkation"
+msgid "The passport number of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:302
-msgid "The port of clearance"
+msgid "The country in which the passport was issued"
 msgstr ""
 
 #: Model/Attribute.php:303
-msgid "A Port where the passenger is transiting to"
+msgid "The expiration date of a passport"
 msgstr ""
 
 #: Model/Attribute.php:304
-msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
+msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
 msgstr ""
 
 #: Model/Attribute.php:305
-msgid "The application id of a mobile application"
+msgid "The nationality of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:306
-msgid "Cortex analysis result"
+msgid "Visa number"
 msgstr ""
 
 #: Model/Attribute.php:307
+msgid "The date on which the visa was issued"
+msgstr ""
+
+#: Model/Attribute.php:308
+msgid "The primary residence of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:309
+msgid "The country of residence of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:310
+msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
+msgstr ""
+
+#: Model/Attribute.php:311
+msgid "The frequent flyer number of a passenger"
+msgstr ""
+
+#: Model/Attribute.php:314
+msgid "Travel details"
+msgstr ""
+
+#: Model/Attribute.php:315
+msgid "Payment details"
+msgstr ""
+
+#: Model/Attribute.php:316
+msgid "The orignal port of embarkation"
+msgstr ""
+
+#: Model/Attribute.php:317
+msgid "The port of clearance"
+msgstr ""
+
+#: Model/Attribute.php:318
+msgid "A Port where the passenger is transiting to"
+msgstr ""
+
+#: Model/Attribute.php:319
+msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
+msgstr ""
+
+#: Model/Attribute.php:320
+msgid "The application id of a mobile application"
+msgstr ""
+
+#: Model/Attribute.php:321
+msgid "Chrome extension id"
+msgstr ""
+
+#: Model/Attribute.php:322
+msgid "Cortex analysis result"
+msgstr ""
+
+#: Model/Attribute.php:323
 msgid "Boolean value - to be used in objects"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship."
 msgstr ""
 
-#: Model/Attribute.php:603
+#: Model/Attribute.php:644
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:728
+#: Model/Attribute.php:791
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:862
+#: Model/Attribute.php:935
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:987
+#: Model/Attribute.php:1074
 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:994
+#: Model/Attribute.php:1081
 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:1001
+#: Model/Attribute.php:1088
 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:1012
+#: Model/Attribute.php:1099
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:1023
+#: Model/Attribute.php:1110
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:1030
+#: Model/Attribute.php:1117
 msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
 msgstr ""
 
-#: Model/Attribute.php:1045
+#: Model/Attribute.php:1132
 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:1063
+#: Model/Attribute.php:1150
 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:1068
+#: Model/Attribute.php:1155
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1079
+#: Model/Attribute.php:1166
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr ""
 
-#: Model/Attribute.php:1087
+#: Model/Attribute.php:1174
 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:1098
+#: Model/Attribute.php:1185
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1105;1156
+#: Model/Attribute.php:1192;1243
 msgid "IP address has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1110
+#: Model/Attribute.php:1197
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr ""
 
-#: Model/Attribute.php:1139
+#: Model/Attribute.php:1226
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1159
+#: Model/Attribute.php:1246
 msgid "Domain name has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1172
+#: Model/Attribute.php:1260
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1180
+#: Model/Attribute.php:1268
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr ""
 
-#: Model/Attribute.php:1191
+#: Model/Attribute.php:1276
+msgid "Invalid format. Expected: CWE-x..."
+msgstr ""
+
+#: Model/Attribute.php:1287
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1306
+#: Model/Attribute.php:1405
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr ""
 
-#: Model/Attribute.php:1312
+#: Model/Attribute.php:1411
 msgid "The value has to be a number greater or equal 0."
 msgstr ""
 
-#: Model/Attribute.php:1319
+#: Model/Attribute.php:1418
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:2065;2133
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2757
+#: Model/Attribute.php:2301
+msgid "Invalid hash type."
+msgstr "잘못된 해시 유형입니다."
+
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr ""
 
-#: Model/Attribute.php:3233
+#: Model/Attribute.php:3559
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/Attribute.php:3921;3928;3932
-msgid "Attribute not found or not authorised."
-msgstr "Attribute를 찾을 수 없거나 권한이 없습니다."
+#: Model/Community.php:26;67
+msgid "Default community list not found."
+msgstr ""
 
-#: Model/Event.php:378
+#: Model/Community.php:30;71
+msgid "Default community list empty."
+msgstr ""
+
+#: Model/Community.php:35;76
+msgid "Default community list not in the expected format."
+msgstr ""
+
+#: Model/Community.php:93
+msgid "Community not found."
+msgstr ""
+
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
+#: Model/DecayingModel.php:162
+msgid "Models could not be loaded or default decaying models folder is empty"
+msgstr ""
+
+#: Model/DecayingModel.php:351
+msgid "No tags nor predicates with `numerical_value`"
+msgstr ""
+
+#: Model/DecayingModel.php:358
+msgid "No predicate"
+msgstr ""
+
+#: Model/DecayingModel.php:437
+msgid "The class for `%s` was not found or not loaded correctly"
+msgstr ""
+
+#: Model/Event.php:390
 msgid "Click this to download all events and attributes that you have access to in MISP JSON format."
 msgstr ""
 
-#: Model/Event.php:386
+#: Model/Event.php:398
 msgid "Click this to download all events and attributes that you have access to in MISP XML format."
 msgstr ""
 
-#: Model/Event.php:394
+#: Model/Event.php:406
 #: View/Events/export_alternate.ctp:19
 msgid "Click this to download all attributes that are indicators and that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:402
+#: Model/Event.php:414
 #: View/Events/export_alternate.ctp:26
 msgid "Click this to download all attributes that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:410
+#: Model/Event.php:422
 msgid "Click this to download all network related attributes that you have access to under the Suricata rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:418
+#: Model/Event.php:430
 msgid "Click this to download all network related attributes that you have access to under the Snort rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:426
+#: Model/Event.php:438
 msgid "Click this to download all network related attributes that you have access to under the Bro rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:434
+#: Model/Event.php:446
 msgid "Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:442
+#: Model/Event.php:454
 msgid "Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:450
+#: Model/Event.php:462
 #: 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 ""
 
-#: Model/Event.php:458
+#: Model/Event.php:470
 msgid "Click on one of the buttons below to download all the attributes with the matching type. This list can be used to feed forensic software when searching for susipicious files. Only published events and attributes marked as IDS Signature are exported."
 msgstr ""
 
-#: Model/Event.php:466
+#: Model/Event.php:478
 msgid "Click this to download Yara rules generated from all relevant attributes."
 msgstr ""
 
-#: Model/Event.php:474
+#: Model/Event.php:486
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5774
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:5776
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:5778
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:5781
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:5783
+#: Model/Event.php:5808
 msgid "Please "
 msgstr ""
 
-#: Model/Event.php:5785
+#: Model/Event.php:5810
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:5817
+#: Model/Event.php:5842
 msgid "#"
 msgstr ""
 
-#: Model/Event.php:5826
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr ""
 
-#: Model/Event.php:6068
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr "태그를 추가 할 수 없습니다."
 
-#: Model/Event.php:6538
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:1545;1589
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1559
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Galaxy.php:219;276;286;300
-msgid "Invalid %s."
+#: Model/Feed.php:1687
+msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Galaxy.php:416
+#: Model/Feed.php:1690
+msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
+msgstr ""
+
+#: Model/Feed.php:1695
+msgid "Invalid user id."
+msgstr ""
+
+#: Model/Feed.php:1715
+msgid "Events related to feed %s purged."
+msgstr ""
+
+#: Model/Galaxy.php:421
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:808
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
 #: Model/Server.php:123
-msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
+msgid "Server unreachable"
 msgstr ""
 
 #: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
+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:151
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:134
+#: Model/Server.php:163
 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:135
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:144
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:145
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:154
+#: Model/Server.php:183
 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:156
+#: Model/Server.php:185
 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:162
+#: Model/Server.php:191
 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:170
+#: Model/Server.php:199
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:178
+#: Model/Server.php:207
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:188
-msgid "Enable some performance heavy correlations (currently CIDR correlation)"
-msgstr ""
-
-#: Model/Server.php:197
-msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
-msgstr ""
-
-#: Model/Server.php:206
-msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
-msgstr ""
-
 #: Model/Server.php:217
-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."
+msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
 #: Model/Server.php:226
+msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
+msgstr ""
+
+#: Model/Server.php:235
+msgid "Enable some performance heavy correlations (currently CIDR correlation)"
+msgstr ""
+
+#: Model/Server.php:244
+msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
+msgstr ""
+
+#: Model/Server.php:253
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:264
+msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:274
+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:283
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:234
+#: Model/Server.php:291
 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:243
+#: Model/Server.php:300
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:245
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:251;259;286;310;318;326;334;391;439;447;514
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr "이 설정은 더 이상 사용되지 않으며 안전하게 제거 할 수 있습니다."
 
-#: Model/Server.php:267
+#: Model/Server.php:324
 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:277
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr ""
 
-#: Model/Server.php:294
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:302
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:342
+#: Model/Server.php:399
 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:350
+#: Model/Server.php:407
 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:358
+#: Model/Server.php:415
 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:366
+#: Model/Server.php:423
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:374
+#: Model/Server.php:431
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:383
+#: Model/Server.php:440
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:385
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:399
+#: Model/Server.php:456
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:407
+#: Model/Server.php:464
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:415
+#: Model/Server.php:472
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:423
+#: Model/Server.php:480
 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:431
+#: Model/Server.php:488
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:455
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:463
+#: Model/Server.php:520
 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:473
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:481
+#: Model/Server.php:538
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:489
+#: Model/Server.php:546
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:497
+#: Model/Server.php:554
 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:506
+#: Model/Server.php:563
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:522
+#: Model/Server.php:579
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:530
+#: Model/Server.php:587
+msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
+msgstr ""
+
+#: Model/Server.php:595
 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:538
+#: Model/Server.php:603
 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:546
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:555
+#: Model/Server.php:620
 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:564
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:582
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:590
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:599
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr "로그인 페이지의 MISP 로고 앞에 사용됨"
 
-#: Model/Server.php:607
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr "로그인 페이지의 MISP 로고 뒤에 사용됨"
 
-#: Model/Server.php:615
+#: Model/Server.php:689
 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:623
+#: Model/Server.php:697
 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:631
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:639
+#: Model/Server.php:713
 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:647
+#: Model/Server.php:721
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:655
+#: Model/Server.php:729
 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:663
+#: Model/Server.php:737
 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:671
+#: Model/Server.php:745
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:680
+#: Model/Server.php:754
 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:689
+#: Model/Server.php:763
 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:697
+#: Model/Server.php:771
 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:704
+#: Model/Server.php:778
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:711
+#: Model/Server.php:785
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:720
+#: Model/Server.php:794
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:728
+#: Model/Server.php:802
+msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
+msgstr ""
+
+#: Model/Server.php:804
+msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
+msgstr ""
+
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:737
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:746
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:755
+#: Model/Server.php:838
+msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
+msgstr ""
+
+#: Model/Server.php:847
 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:764
+#: Model/Server.php:856
 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:773
+#: Model/Server.php:865
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:782
+#: Model/Server.php:874
 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:791
+#: Model/Server.php:883
 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:800
+#: Model/Server.php:892
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:810
+#: Model/Server.php:902
 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:819
+#: Model/Server.php:911
 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 설정이 지정되면, 이 설정값에 정의된 태그로 태그 지정된 이벤트에 대한 경보 메일이 차단됩니다."
 
-#: Model/Server.php:828
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:837
+#: Model/Server.php:929
 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:846
-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"
+#: Model/Server.php:938
+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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:855
+#: Model/Server.php:947
+msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:956
 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:865
+#: Model/Server.php:966
 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:874
+#: Model/Server.php:975
 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:883
+#: Model/Server.php:984
 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:892
+#: Model/Server.php:993
 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:902
+#: Model/Server.php:1003
 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:911
+#: Model/Server.php:1012
 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:919
+#: Model/Server.php:1020
 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:927
+#: Model/Server.php:1028
 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:935
+#: Model/Server.php:1036
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:944
+#: Model/Server.php:1045
 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:952
+#: Model/Server.php:1053
 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:960
+#: Model/Server.php:1061
 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:969
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:980
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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:989
+#: Model/Server.php:1099
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1107
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:1005
+#: Model/Server.php:1115
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:1013
+#: Model/Server.php:1123
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:1021
+#: Model/Server.php:1131
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:1030
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:1041
+#: Model/Server.php:1151
 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:1049
+#: Model/Server.php:1159
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:1057
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1065
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1073
+#: Model/Server.php:1183
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:1085
+#: Model/Server.php:1195
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:1093
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1101
+#: Model/Server.php:1211
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:1109
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1117
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1128
+#: Model/Server.php:1238
+msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
+msgstr ""
+
+#: Model/Server.php:1247
 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:1137
+#: Model/Server.php:1257
 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:1146
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1154
+#: Model/Server.php:1292
 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:1162
+#: Model/Server.php:1300
 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:1171
+#: Model/Server.php:1309
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1180
+#: Model/Server.php:1318
 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:1189
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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:1191
+#: Model/Server.php:1339
 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:1198
+#: Model/Server.php:1346
 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:1207
+#: Model/Server.php:1355
 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:1219
+#: Model/Server.php:1364
+msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
+msgstr ""
+
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1227
+#: Model/Server.php:1393
 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:1238
+#: Model/Server.php:1404
 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:1246
+#: Model/Server.php:1412
 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:1254
+#: Model/Server.php:1420
 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:1263
+#: Model/Server.php:1429
 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:1271
+#: Model/Server.php:1437
 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:1282
+#: Model/Server.php:1448
 msgid "The default policy action for the values added to the RPZ."
 msgstr ""
 
-#: Model/Server.php:1291
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1299
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:1307
+#: Model/Server.php:1473
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1315
+#: Model/Server.php:1481
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1323
+#: Model/Server.php:1489
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1331
+#: Model/Server.php:1497
 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:1339
+#: Model/Server.php:1505
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1347
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr ""
 
-#: Model/Server.php:1355
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1363
+#: Model/Server.php:1529
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1371
+#: Model/Server.php:1537
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1379
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr ""
 
-#: Model/Server.php:1387
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr ""
 
-#: Model/Server.php:1395;1642
+#: Model/Server.php:1561;1808
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1403;1650
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1411
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1419
+#: Model/Server.php:1585
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1427
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr ""
 
-#: Model/Server.php:1435;1658
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1443
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1451;1666
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1459
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1467;1674
+#: Model/Server.php:1633;1840
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1475
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1483
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1491
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1499;1682
+#: Model/Server.php:1665;1848
 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:1507
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1515
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr ""
 
-#: Model/Server.php:1523
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr ""
 
-#: Model/Server.php:1531
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr ""
 
-#: Model/Server.php:1539
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr ""
 
-#: Model/Server.php:1547
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1555
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1563
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1571
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr ""
 
-#: Model/Server.php:1579
+#: Model/Server.php:1745
 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:1588
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1597
+#: Model/Server.php:1763
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1606
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1615
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1624
+#: Model/Server.php:1790
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1799
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1690
+#: Model/Server.php:1856
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1698
+#: Model/Server.php:1864
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1706
+#: Model/Server.php:1872
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1714
+#: Model/Server.php:1880
 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:1722
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1730
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1738
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1746
+#: Model/Server.php:1912
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1754
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1762
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1770
+#: Model/Server.php:1936
 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:1778
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1786
+#: Model/Server.php:1952
 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:1795
+#: Model/Server.php:1961
 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:1803
+#: Model/Server.php:1969
 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:1811
+#: Model/Server.php:1977
+msgid "Enable SightingDB integration."
+msgstr ""
+
+#: Model/Server.php:1985
 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:1821
+#: Model/Server.php:1995
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1830
+#: Model/Server.php:2004
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1839
+#: Model/Server.php:2013
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1848
+#: Model/Server.php:2022
 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:1857
+#: Model/Server.php:2031
 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:1866
+#: Model/Server.php:2040
 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:1875
+#: Model/Server.php:2049
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1883
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1891
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1899
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1907
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1915
+#: Model/Server.php:2089
 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:1923
+#: Model/Server.php:2097
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1931
+#: Model/Server.php:2105
 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:1939
+#: Model/Server.php:2113
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1947
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1955
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1963
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1971
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1979
+#: Model/Server.php:2153
 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:1987
+#: Model/Server.php:2161
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1995
+#: Model/Server.php:2169
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:2003
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:2011
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2019
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:2028
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2036
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:2045
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:2054
+#: Model/Server.php:2228
 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:2063
+#: Model/Server.php:2237
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:2072
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:2081
+#: Model/Server.php:2255
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:2091
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:2100
+#: Model/Server.php:2274
 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:2254
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2258
+#: Model/Server.php:2445
 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:2285
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr ""
 
-#: Model/Server.php:2291
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr ""
 
-#: Model/Server.php:2369
+#: Model/Server.php:2557
 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:2371
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr ""
 
-#: Model/Server.php:2372
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2384;2386
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr ""
 
-#: Model/Server.php:2850
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2853
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2861
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2976
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3676
+#: Model/Server.php:3281
+msgid "Invalid language."
+msgstr ""
+
+#: Model/Server.php:3302
+msgid "Invalid tag_collection."
+msgstr ""
+
+#: Model/Server.php:3310
+msgid "This setting has to be a number."
+msgstr ""
+
+#: Model/Server.php:3322
+msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
+msgstr ""
+
+#: Model/Server.php:3619
+msgid "Invalid file path or file not accessible."
+msgstr ""
+
+#: Model/Server.php:3622
+msgid "File has to be in .pem format."
+msgstr ""
+
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr ""
 
-#: Model/Server.php:3808
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr ""
 
-#: Model/Server.php:3809
+#: Model/Server.php:4121
 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:3811
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr ""
 
-#: Model/Server.php:3814;3829
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
 msgstr ""
 
-#: Model/Server.php:3818
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr ""
 
-#: Model/Server.php:3819
+#: Model/Server.php:4131
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:3826
+#: Model/Server.php:4138
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:4014
+#: Model/Server.php:4228
+msgid "Invalid server."
+msgstr ""
+
+#: Model/Server.php:4259
+msgid "Response was empty."
+msgstr ""
+
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:4471
+#: Model/Server.php:4604
+msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
+msgstr ""
+
+#: Model/Server.php:4675
+msgid "Can't check database schema for Postgres database type"
+msgstr ""
+
+#: Model/Server.php:4692
+msgid "Table `%s` does not exist"
+msgstr ""
+
+#: Model/Server.php:4719
+msgid "Column `%s` exists but should not"
+msgstr ""
+
+#: Model/Server.php:4752
+msgid "Column `%s` is different"
+msgstr ""
+
+#: Model/Server.php:4762
+msgid "Column `%s` does not exist but should"
+msgstr ""
+
+#: Model/Server.php:4775
+msgid "Table `%s` is an additional table"
+msgstr ""
+
+#: Model/Server.php:4799
+msgid "Column `%s` should be indexed"
+msgstr ""
+
+#: Model/Server.php:4822
+msgid "Column `%s` is indexed but should not"
+msgstr ""
+
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:4472
+#: Model/Server.php:5253
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:4476
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:4477
+#: Model/Server.php:5258
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:4805
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:4805;4834
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:4817
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:4818
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:4931
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:4938
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:4945
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr ""
 
+#: Model/Server.php:5911
+msgid "Could not reset the remote authentication key."
+msgstr ""
+
+#: Model/Server.php:5988
+msgid "Could not parse JSON: "
+msgstr ""
+
+#: Model/Server.php:6008
+msgid "Could not reset fetch remote user account."
+msgstr ""
+
+#: Model/Server.php:6030
+msgid "No user object received in response."
+msgstr ""
+
+#: Model/Sightingdb.php:346
+msgid "Could not resolve Sightingdb address."
+msgstr ""
+
+#: Model/Sightingdb.php:348
+msgid "Something went wrong. Could not contact the SightingDB server."
+msgstr ""
+
+#: Model/Sightingdb.php:363
+msgid "The SightingDB returned an invalid response."
+msgstr ""
+
+#: Model/Sightingdb.php:366
+msgid "No response from the SightingDB server."
+msgstr ""
+
+#: Model/Taxonomy.php:619
+msgid "Taxonomy `%s` is an exclusive Taxonomy"
+msgstr ""
+
+#: Model/Taxonomy.php:626
+msgid "Predicate `%s` is exclusive"
+msgstr ""
+
+#: Model/User.php:1254
+msgid "reset_all_sync_api_keys"
+msgstr ""
+
+#: Model/User.php:1255
+msgid "Reseting all API keys"
+msgstr ""
+
+#: Model/User.php:1317
+msgid "Reset in progress - %s/%s."
+msgstr ""
+
+#: Model/User.php:1322
+msgid "%s authkeys reset, %s could not be reset"
+msgstr ""
+
+#: Model/User.php:1347
+msgid "Authentication key for user %s (%s) updated."
+msgstr ""
+
+#: Model/User.php:1359
+msgid "Dear user,\n\n"
+"an API key reset has been triggered by an administrator for your user account on %s.\n\n"
+"Your new API key is: %s\n\n"
+"Please update your server's sync setup to reflect this change.\n\n"
+"We apologise for the inconvenience."
+msgstr ""
+
+#: Model/User.php:1364
+msgid "Dear user,\n\n"
+"an API key reset has been triggered by an administrator for your user account on %s.\n\n"
+"Your new API key can be retrieved by logging in using this sync user's account.\n\n"
+"Please update your server's sync setup to reflect this change.\n\n"
+"We apologise for the inconvenience."
+msgstr ""
+
+#: Model/User.php:1373
+msgid "API key reset by administrator"
+msgstr ""
+
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/Polynomial.php:7
+msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/PolynomialExtended.php:7
+msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms` with support of the `Retention` taxonomy which overrides the final score."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/PolynomialExtended.php:17
+msgid "`Retention` taxonomy not available"
+msgstr ""
+
 #: Plugin/Assets/models/behaviors/LogableBehavior.php:361
 msgid "deleted"
 msgstr ""
@@ -4036,19 +5507,19 @@ msgstr ""
 msgid "it has the following dependent items"
 msgstr ""
 
-#: View/Attributes/add.ctp:7
+#: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
 
-#: View/Attributes/add.ctp:7
+#: View/Attributes/add.ctp:6
 #: View/Attributes/edit.ctp:4
 msgid "Edit Attribute"
 msgstr ""
 
-#: View/Attributes/add.ctp:14
+#: View/Attributes/add.ctp:18
 #: View/Attributes/attribute_replace.ctp:12
 #: View/Attributes/edit.ctp:8
 #: View/ShadowAttributes/add.ctp:10
@@ -4056,53 +5527,26 @@ msgstr ""
 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)"
+#: View/Attributes/add.ctp:25
+msgid "(choose category first)"
 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.ctp:39
 #: 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:178
-#: View/Feeds/edit.ctp:173
+#: View/Events/add.ctp:33
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
+#: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
 msgstr ""
 
-#: View/Attributes/add.ctp:67
+#: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -4111,133 +5555,52 @@ msgstr ""
 msgid "Contextual Comment"
 msgstr ""
 
-#: View/Attributes/add.ctp:76
+#: View/Attributes/add.ctp:57
 #: 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;202
-#: View/Events/contact.ctp:29
-#: View/Events/edit.ctp:61
-#: View/Events/free_text_import.ctp:27
-#: View/Events/resolved_misp_format.ctp:350
-#: View/News/add.ctp:33
-#: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:131
-#: View/Objects/add.ctp:153
-#: View/Organisations/admin_add.ctp:49
-#: View/Organisations/admin_edit.ctp:60
-#: View/Posts/add.ctp:66
-#: View/Posts/edit.ctp:20
-#: View/Servers/add.ctp:119
-#: View/Servers/edit.ctp:164
-#: View/Servers/ondemand_action.ctp:53
-#: 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/Users/statistics_galaxymatrix.ctp:31
-#: View/Whitelists/admin_edit.ctp:13
-msgid "Submit"
-msgstr "제출"
+#: View/Attributes/add.ctp:155
+msgid "Timezone missing, auto-detected as: "
+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:203
-#: 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/resolved_misp_format.ctp:351
-#: View/Events/ajax/enrich_event.ctp:22
-#: View/Events/ajax/enrichmentChoice.ctp:35
-#: 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:135
-#: View/ObjectReferences/ajax/delete.ctp:37
-#: View/Objects/add.ctp:159
-#: View/Objects/revise_object.ctp:105
-#: 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.ctp:156
+msgid "The following value will be submited instead: "
+msgstr ""
+
+#: View/Attributes/add.ctp:164
+msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
+msgstr ""
 
 #: View/Attributes/add_attachment.ctp:4
 msgid "Add Attachment(s)"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:64
+#: 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_attachment.ctp:24
+#: View/Attributes/edit.ctp:24
+#: View/Objects/ajax/quickAddAttributeForm.ctp:59
+msgid "Distribution "
+msgstr ""
+
+#: View/Attributes/add_attachment.ctp:63
 msgid "Is a malware sample (encrypt and hash)"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:73
+#: View/Attributes/add_attachment.ctp:72
 msgid "Advanced extraction (if installed)"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:78
+#: View/Attributes/add_attachment.ctp:77
 #: View/Elements/healthElements/files.ctp:92
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
@@ -4259,24 +5622,30 @@ msgid "This is a list of events that match the given search criteria sorted acco
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:6
+#: View/EventDelegations/index.ctp:70
 msgid "Event id"
 msgstr "이벤트 id"
 
 #: View/Attributes/alternate_search_result.ctp:7
 #: View/Attributes/index.ctp:49
-#: View/Elements/eventattribute.ctp:146
+#: View/DecayingModel/decaying_tool_rest_search.ctp:24
+#: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:8
-#: View/Elements/Events/View/row_attribute.ctp:68
+#: View/Elements/Events/View/row_attribute.ctp:71
 #: View/EventBlacklists/add.ctp:24
 #: View/EventBlacklists/edit.ctp:25
+#: View/EventDelegations/index.ctp:78
 #: View/Events/add_misp_export_result.ctp:5
 #: View/Events/resolved_misp_format.ctp:51
 msgid "Event info"
@@ -4287,7 +5656,7 @@ msgid "Event date"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:472
+#: View/Events/view.ctp:509
 msgid "Event graph"
 msgstr "이벤트 그래프"
 
@@ -4309,6 +5678,13 @@ msgstr ""
 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:15
+#: View/Attributes/edit.ctp:12
+#: View/ShadowAttributes/add.ctp:15
+#: View/ShadowAttributes/edit.ctp:13
+msgid "(first choose category)"
+msgstr ""
+
 #: View/Attributes/attribute_replace.ctp:19
 msgid "Mark all new attributes as to IDS"
 msgstr ""
@@ -4320,10 +5696,10 @@ msgid "Values"
 msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
-#: View/ShadowAttributes/add.ctp:46
+#: View/ShadowAttributes/add.ctp:57
 #: 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
@@ -4341,6 +5717,115 @@ msgstr ""
 msgid "Replaceattributes"
 msgstr ""
 
+#: View/Attributes/attribute_replace.ctp:38
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Elements/view_galaxy_matrix.ctp:76;211
+#: View/Elements/genericElements/Form/submitButton.ctp:8;25
+#: View/Events/contact.ctp:29
+#: View/Events/free_text_import.ctp:27
+#: View/Events/resolved_misp_format.ctp:386
+#: View/News/add.ctp:33
+#: View/News/edit.ctp:34
+#: View/ObjectReferences/ajax/add.ctp:131
+#: View/Objects/add.ctp:166
+#: View/Objects/ajax/quickAddAttributeForm.ctp:119
+#: View/Organisations/admin_add.ctp:48
+#: View/Organisations/admin_edit.ctp:59
+#: View/Posts/add.ctp:66
+#: View/Posts/edit.ctp:20
+#: View/Servers/add.ctp:129
+#: View/Servers/edit.ctp:171
+#: View/Servers/ondemand_action.ctp:54
+#: 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/UserSettings/set_setting.ctp:36
+#: View/Users/admin_add.ctp:98
+#: 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/Users/statistics_galaxymatrix.ctp:31
+#: View/Whitelists/admin_edit.ctp:13
+msgid "Submit"
+msgstr "제출"
+
+#: View/Attributes/attribute_replace.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
+#: 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:212
+#: View/Elements/genericElements/infoModal.ctp:40
+#: View/Elements/genericElements/Form/submitButton.ctp:13
+#: View/Elements/serverRuleElements/pull.ctp:73
+#: 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/resolved_misp_format.ctp:387
+#: View/Events/ajax/enrich_event.ctp:22
+#: View/Events/ajax/enrichmentChoice.ctp:35
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:135
+#: View/ObjectReferences/ajax/delete.ctp:37
+#: View/Objects/add.ctp:172
+#: View/Objects/revise_object.ctp:112
+#: 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:69
+#: View/ShadowAttributes/edit.ctp:68
+#: 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:26
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:32
+#: View/Warninglists/ajax/delete_confirmation.ctp:25
+msgid "Cancel"
+msgstr "취소"
+
 #: View/Attributes/check_composites.ctp:2
 msgid "Failed Composites"
 msgstr ""
@@ -4349,24 +5834,31 @@ msgstr ""
 msgid "No Failed Composites"
 msgstr ""
 
+#: View/Attributes/edit.ctp:13
+#: View/ShadowAttributes/add.ctp:16
+#: View/ShadowAttributes/edit.ctp:14
+msgid "Type "
+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
+#: View/ShadowAttributes/add.ctp:66
+#: View/ShadowAttributes/edit.ctp:56;65
 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:481
+#: View/Events/view.ctp:521
 #: 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
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr ""
 
@@ -4403,22 +5895,21 @@ msgid "Results for all attributes"
 msgstr ""
 
 #: View/Attributes/index.ctp:39;128
-#: View/Elements/eventattribute.ctp:60;227
+#: View/DecayingModel/decaying_tool_rest_search.ctp:12;64
+#: View/DecayingModel/index.ctp:13;169
+#: View/Elements/eventattribute.ctp:60;247
 #: 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/Elements/genericElements/IndexTable/pagination.ctp:10
+#: View/Elements/Feeds/eventattribute.ctp:20;87
+#: View/Elements/Servers/eventattribute.ctp:20;87
+#: View/Elements/genericElements/IndexTable/pagination.ctp:14
 #: View/EventBlacklists/index.ctp:13;85
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -4431,19 +5922,18 @@ msgstr ""
 #: 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;95
+#: View/Roles/admin_index.ctp:13;105
 #: View/Roles/index.ctp:13;68
-#: View/Servers/index.ctp:13;156
+#: View/Servers/index.ctp:13;202
 #: View/Servers/preview_index.ctp:15;190
-#: View/ShadowAttributes/index.ctp:12;118
-#: View/SharingGroups/index.ctp:13;105
+#: View/ShadowAttributes/index.ctp:12;128
+#: View/SharingGroups/index.ctp:13;107
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;65
 #: 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
@@ -4452,22 +5942,21 @@ msgid "previous"
 msgstr ""
 
 #: View/Attributes/index.ctp:41;130
-#: View/Elements/eventattribute.ctp:62;229
+#: View/DecayingModel/decaying_tool_rest_search.ctp:14;66
+#: View/DecayingModel/index.ctp:15;171
+#: View/Elements/eventattribute.ctp:62;249
 #: 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/Elements/genericElements/IndexTable/pagination.ctp:12
+#: View/Elements/Feeds/eventattribute.ctp:22;89
+#: View/Elements/Servers/eventattribute.ctp:22;89
+#: View/Elements/genericElements/IndexTable/pagination.ctp:16
 #: View/EventBlacklists/index.ctp:15;87
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -4480,19 +5969,18 @@ msgstr ""
 #: 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;97
+#: View/Roles/admin_index.ctp:15;107
 #: View/Roles/index.ctp:15;70
-#: View/Servers/index.ctp:15;158
+#: View/Servers/index.ctp:15;204
 #: View/Servers/preview_index.ctp:17;192
-#: View/ShadowAttributes/index.ctp:14;120
-#: View/SharingGroups/index.ctp:15;107
+#: View/ShadowAttributes/index.ctp:14;130
+#: View/SharingGroups/index.ctp:15;109
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;67
 #: 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
@@ -4500,26 +5988,41 @@ msgstr ""
 msgid "next"
 msgstr "다음"
 
+#: View/Attributes/index.ctp:47
+#: View/DecayingModel/decaying_tool_rest_search.ctp:23
+#: View/Elements/eventattribute.ctp:139
+#: View/Elements/Feeds/eventattribute.ctp:41
+#: View/Elements/Servers/eventattribute.ctp:41
+#: View/Events/proposal_event_index.ctp:30
+#: View/Events/view.ctp:143
+#: View/Feeds/preview_event.ctp:25
+#: View/Objects/group_attributes_into_object.ctp:56
+#: 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/Attributes/index.ctp:54
-#: View/Elements/eventattribute.ctp:157
-#: View/Elements/global_menu.ctp:90
-#: View/Events/view.ctp:493
+#: View/DecayingModel/decaying_tool_rest_search.ctp:30
+#: View/Elements/eventattribute.ctp:158
+#: View/Elements/global_menu.ctp:94
+#: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr ""
 
 #: View/Attributes/index.ctp:56
-#: View/Elements/eventattribute.ctp:159
+#: View/Elements/eventattribute.ctp:160
 msgid "Correlate"
 msgstr ""
 
 #: View/Attributes/index.ctp:57
-#: View/Elements/eventattribute.ctp:160
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:336
+#: View/Elements/eventattribute.ctp:161
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+#: View/Events/view.ctp:372
 #: View/Feeds/preview_event.ctp:73
 #: View/Pages/doc/using_the_system.ctp:235
 #: View/Servers/preview_event.ctp:95
@@ -4527,30 +6030,33 @@ msgid "Related Events"
 msgstr ""
 
 #: View/Attributes/index.ctp:58
-#: View/Elements/eventattribute.ctp:161
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:49
 msgid "Feed hits"
 msgstr ""
 
 #: View/Attributes/index.ctp:61
-#: View/Elements/eventattribute.ctp:164
-#: View/Events/view.ctp:251
+#: View/DecayingModel/decaying_tool_rest_search.ctp:33
+#: View/Elements/eventattribute.ctp:165
+#: View/Events/view.ctp:252
 msgid "Sightings"
 msgstr ""
 
 #: View/Attributes/index.ctp:62
-#: View/Elements/eventattribute.ctp:165
-#: View/Events/view.ctp:261
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:262
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr ""
 
 #: View/Attributes/index.ctp:63
-#: View/Elements/eventattribute.ctp:166
+#: View/DecayingModel/index.ctp:99
+#: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -4559,10 +6065,7 @@ msgstr ""
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -4570,12 +6073,12 @@ msgstr ""
 #: 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/Roles/admin_index.ctp:36
+#: View/Servers/index.ctp:41
 #: View/Servers/preview_index.ctp:106
 #: View/SharingGroups/add.ctp:74;94
 #: View/SharingGroups/edit.ctp:74;102
-#: View/SharingGroups/index.ctp:47
+#: View/SharingGroups/index.ctp:48
 #: View/Sightings/ajax/list_sightings.ctp:11
 #: View/TagCollections/index.ctp:16
 #: View/Tags/index.ctp:76
@@ -4588,6 +6091,8 @@ msgid "Actions"
 msgstr ""
 
 #: View/Attributes/index.ctp:121
+#: View/DecayingModel/decaying_tool_rest_search.ctp:57
+#: View/DecayingModel/index.ctp:162
 #: View/Elements/eventdiscussion.ctp:119
 #: View/Elements/generic_table.ctp:53
 #: View/Elements/generic_table_row.ctp:45
@@ -4596,10 +6101,7 @@ msgstr ""
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -4612,19 +6114,18 @@ msgstr ""
 #: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
-#: View/Roles/admin_index.ctp:88
+#: View/Roles/admin_index.ctp:98
 #: View/Roles/index.ctp:61
-#: View/Servers/index.ctp:149
+#: View/Servers/index.ctp:195
 #: View/Servers/preview_index.ctp:182
-#: View/ShadowAttributes/index.ctp:111
-#: View/SharingGroups/index.ctp:98
+#: View/ShadowAttributes/index.ctp:121
+#: View/SharingGroups/index.ctp:100
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:58
 #: 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
@@ -4690,11 +6191,12 @@ msgstr ""
 msgid "Alternate Search Result (Events)"
 msgstr ""
 
-#: View/Attributes/search.ctp:38
-#: View/Events/automation.ctp:14
-#: View/Logs/admin_index.ctp:20;21
-#: View/Logs/admin_search.ctp:25
-msgid "Search"
+#: View/Attributes/search.ctp:47
+msgid "First seen and Last seen."
+msgstr ""
+
+#: View/Attributes/search.ctp:48
+msgid "Attributes not having first seen or last seen set might not appear in the search"
 msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:6
@@ -4711,16 +6213,15 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90;98
-#: View/Elements/Events/eventIndexTable.ctp:245
-#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -4729,117 +6230,21 @@ msgstr ""
 #: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:80
-#: View/Servers/index.ctp:137
-#: View/SharingGroups/index.ctp:87
+#: View/Roles/admin_index.ctp:90
+#: View/Servers/index.ctp:183
+#: View/SharingGroups/index.ctp:89
 #: View/Tags/index.ctp:125
 #: View/Whitelists/admin_index.ctp:32
 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/Feeds/View/row_attribute.ctp:87
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:190
-#: 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:85
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:42;50
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:74;75;76;112;113;118;119
-#: 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/Feeds/View/row_attribute.ctp:87
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:190
-#: 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:85
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:42;50
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:74;75;76;108;112;113;118;119
-#: 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
+#: View/Objects/ajax/objectEditCommentForm.ctp:5
+#: View/Objects/ajax/objectEditDistributionForm.ctp:5
 msgid "Accept change"
 msgstr ""
 
@@ -4848,6 +6253,8 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
+#: View/Objects/ajax/objectEditCommentForm.ctp:6
+#: View/Objects/ajax/objectEditDistributionForm.ctp:6
 msgid "Discard change"
 msgstr ""
 
@@ -4862,14 +6269,15 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:51
-#: View/Events/resolved_misp_format.ctp:97;267
-#: View/Events/view.ctp:158
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:165
+#: View/Events/resolved_misp_format.ctp:98;293
+#: View/Events/view.ctp:159
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
-#: View/Objects/add.ctp:47;105;201
+#: View/Feeds/index.ctp:184
+#: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
-#: View/Objects/revise_object.ctp:35;62
+#: View/Objects/revise_object.ctp:35;69
 #: 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
@@ -4882,23 +6290,27 @@ msgstr ""
 msgid "For Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
@@ -4979,41 +6391,952 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Communities/index.ctp:14
+msgid "Vetted by the MISP-project team"
+msgstr ""
+
+#: View/Communities/index.ctp:19
+msgid "Unvetted"
+msgstr ""
+
+#: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
+#: View/EventBlacklists/index.ctp:35
+#: View/EventDelegations/index.ctp:41
+#: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
+#: View/Feeds/preview_index.ctp:25
+#: View/Feeds/search_caches.ctp:26
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
+#: View/ObjectTemplates/index.ctp:47
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
+#: View/ShadowAttributes/index.ctp:37
+#: View/Sightingdb/index.ctp:10
+#: View/Tags/index.ctp:56
+#: View/Taxonomies/view.ctp:65
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
+msgid "Filter"
+msgstr ""
+
+#: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
+#: View/Elements/eventattributetoolbar.ctp:231
+#: View/EventBlacklists/index.ctp:36
+#: View/EventDelegations/index.ctp:42
+#: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
+#: View/Feeds/preview_index.ctp:26
+#: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
+#: View/ObjectTemplates/index.ctp:48
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+#: View/ShadowAttributes/index.ctp:38
+#: View/Sightingdb/index.ctp:11
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
+msgid "Enter value to search"
+msgstr ""
+
+#: View/Communities/index.ctp:34
+#: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
+#: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
+#: View/Feeds/search_caches.ctp:35
+#: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Sightingdb/index.ctp:26
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
+#: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/Communities/index.ctp:40
+msgid "Vetted"
+msgstr ""
+
+#: View/Communities/index.ctp:46
+msgid "Host org"
+msgstr ""
+
+#: View/Communities/index.ctp:53
+msgid "Community name"
+msgstr ""
+
+#: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
+#: View/DecayingModel/index.ctp:89
+#: View/DecayingModel/view.ctp:21
+#: View/Elements/Servers/View/row_object.ctp:24
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: 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:26
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
+#: View/ObjectTemplates/view.ctp:9
+#: View/Objects/add.ctp:22;113;210
+#: View/Objects/group_attributes_into_object.ctp:8
+#: View/Objects/propose_objects_from_attributes.ctp:17
+#: 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:46
+#: View/Sightingdb/index.ctp:88
+#: View/TagCollections/index.ctp:15
+#: View/Taxonomies/view.ctp:14
+#: View/Templates/view.ctp:14
+#: View/Warninglists/view.ctp:11
+msgid "Description"
+msgstr ""
+
+#: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
+msgid "Communities index"
+msgstr ""
+
+#: View/Communities/index.ctp:72
+msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
+msgstr ""
+
+#: View/Communities/request_access.ctp:7
+msgid "Describe both yourself and your organisation as best as you can - keep in mind this information is to be used by the hosts of the community you are requesting access to in order to determine whether you're a good fit for their community. The sending server's basic metadata is included by default, you can opt out using the \"anonymise\" checkbox (server url, uuid, version are shared otherwise - though this can be a useful step in establishing trust.)."
+msgstr ""
+
+#: View/Communities/request_access.ctp:10
+msgid "Requestor E-mail address"
+msgstr ""
+
+#: View/Communities/request_access.ctp:15
+#: View/Jobs/index.ctp:104
+#: View/OrgBlacklists/add.ctp:17
+#: View/OrgBlacklists/index.ctp:22
+#: View/Organisations/view.ctp:6
+msgid "Organisation name"
+msgstr ""
+
+#: View/Communities/request_access.ctp:20
+msgid "Organisation uuid"
+msgstr ""
+
+#: View/Communities/request_access.ctp:25
+msgid "Description of the requestor organisation"
+msgstr ""
+
+#: View/Communities/request_access.ctp:31
+msgid "Message to the community host organisation"
+msgstr ""
+
+#: View/Communities/request_access.ctp:37
+msgid "PGP public key"
+msgstr ""
+
+#: View/Communities/request_access.ctp:44
+msgid "Request sync access"
+msgstr ""
+
+#: View/Communities/request_access.ctp:49
+msgid "Anonymise information on the server used to issue the request"
+msgstr ""
+
+#: View/Communities/request_access.ctp:54
+msgid "Generate e-mail for later use, but do not send it"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:5
+msgid "Email to send in order to request access"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:6
+msgid "Emailing is currently disabled on the instance, but we have generated the e-mail that would normally be sent out below."
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:7
+msgid "Please find a generated e-mail below that you can use to contact the community in question"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:8
+msgid "Headers:"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:10
+msgid "Message:"
+msgstr ""
+
+#: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
+#: View/Elements/Events/View/row_object.ctp:72
+#: View/Events/resolved_misp_format.ctp:93;288
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
+#: View/ObjectTemplates/index.ctp:66
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:68
+#: View/OrgBlacklists/index.ctp:23
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:58;65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+#: View/SharingGroups/index.ctp:43
+#: View/TagCollections/index.ctp:8
+msgid "UUID"
+msgstr ""
+
+#: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
+#: View/DecayingModel/index.ctp:88
+#: View/DecayingModel/view.ctp:14
+#: View/Elements/Servers/View/row_object.ctp:19
+#: View/Elements/templateElements/templateRowAttribute.ctp:12
+#: View/Elements/templateElements/templateRowFile.ctp:12
+#: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
+#: View/Feeds/search_caches.ctp:47
+#: View/Feeds/view.ctp:4
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
+#: View/ObjectTemplates/view.ctp:4
+#: View/Objects/add.ctp:206
+#: View/Objects/revise_object.ctp:27
+#: 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/Sightingdb/index.ctp:51
+#: View/Templates/view.ctp:9
+#: View/Users/statistics_orgs.ctp:33
+#: View/Warninglists/view.ctp:10
+msgid "Name"
+msgstr ""
+
+#: View/Communities/view.ctp:7
+#: View/SharingGroups/view.ctp:68
+msgid "Url"
+msgstr ""
+
+#: View/Communities/view.ctp:8
+msgid "Host organisation"
+msgstr ""
+
+#: View/Communities/view.ctp:10
+msgid "Vetted by MISP-project"
+msgstr ""
+
+#: View/Communities/view.ctp:27
+#: View/Elements/footer.ctp:15
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:64
+#: View/Users/admin_view.ctp:72
+#: View/Users/edit.ctp:23
+#: View/Users/view.ctp:32
+msgid "GnuPG key"
+msgstr ""
+
+#: View/Communities/view.ctp:42
+msgid "Community "
+msgstr ""
+
+#: View/Communities/view.ctp:51
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
+msgid "Request Access"
+msgstr ""
+
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
+#: View/DecayingModel/add.ctp:4
+msgid " Decaying Model"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:7
+msgid "You are editing a Default Model, only restricted edition is allowed."
+msgstr ""
+
+#: View/DecayingModel/add.ctp:9;28
+msgid "Can other organization use this model"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:37
+msgid "days"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:46;56;65
+msgid "float"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:65
+msgid "Default base_score"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:65
+msgid "Default base_score value if no tags are attached to the indicator"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:75
+msgid "Base Score configuration"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:84
+msgid "Model Settings"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:9
+msgid "Show All Types"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:13
+msgid "Show MISP Objects"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:15
+msgid "Search Attribute Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:22
+msgid "Check all"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:23
+msgid "Attribute Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:24
+#: View/DecayingModel/decaying_tool_rest_search.ctp:25
+#: View/Elements/templateElements/templateRowAttribute.ctp:30
+#: View/Elements/templateElements/templateRowFile.ctp:30
+#: View/Events/resolved_attributes.ctp:47
+#: View/Events/resolved_misp_format.ctp:90;285
+#: View/Events/show_i_o_c_results.ctp:11
+#: View/Feeds/freetext_index.ctp:31
+#: View/Objects/add.ctp:114
+#: View/Objects/group_attributes_into_object.ctp:57
+#: View/Objects/propose_objects_from_attributes.ctp:16
+#: View/Objects/revise_object.ctp:63
+#: 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:65
+#: 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/DecayingModel/decaying_tool.ctp:25
+#: View/DecayingModel/view.ctp:3
+#: View/Logs/admin_index.ctp:75
+#: View/Logs/admin_search.ctp:14
+msgid "Model ID"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:47
+msgid "Belong to a MISP Object"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:51
+msgid "To IDS flag set"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:100
+msgid "Adjust base  score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:108
+msgid "Simulate this model"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:129
+msgid "Model's Settings"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Elements/eventdiscussion.ctp:89;97
+#: View/Elements/Events/eventIndexTable.ctp:231
+#: View/Elements/Events/View/row_attribute.ctp:413
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Users/userIndexTable.ctp:90
+#: View/EventBlacklists/edit.ctp:37
+#: View/EventBlacklists/index.ctp:69
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
+#: View/News/index.ctp:22
+#: View/OrgBlacklists/edit.ctp:30
+#: View/OrgBlacklists/index.ctp:36
+#: View/Organisations/index.ctp:138
+#: View/Pages/doc/using_the_system.ctp:191
+#: View/Regexp/admin_index.ctp:34
+#: View/Roles/admin_edit.ctp:56
+#: View/Roles/admin_index.ctp:89
+#: View/Servers/index.ctp:182
+#: View/SharingGroups/index.ctp:88
+#: View/Tags/edit.ctp:36
+#: View/Tags/index.ctp:124
+#: View/Templates/edit.ctp:49
+#: View/Whitelists/admin_index.ctp:31
+msgid "Edit"
+msgstr "편집"
+
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Templates/add.ctp:49
+msgid "Create"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:146
+msgid "All available models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:149
+msgid "My models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:152
+msgid "Default models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:3
+msgid "Search Taxonomy"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:4
+msgid "Clear search field"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:5
+msgid " not having numerical value"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:7
+msgid "Default basescore"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:13
+#: View/Taxonomies/index.ctp:2
+msgid "Taxonomies"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:14
+msgid "Weight"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:91
+msgid "Excluded"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:112
+msgid "Placeholder for `Organisation source confidence`"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:115
+msgid "Example"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:141;146;151
+msgid "Pick a Taxonomy"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:157
+msgid "Computation steps"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:160
+msgid "Apply base score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:26
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
+#: View/Events/export.ctp:26
+#: View/Events/resolved_attributes.ctp:48
+#: View/Events/resolved_misp_format.ctp:91;286
+#: View/Events/show_i_o_c_results.ctp:12
+#: View/Feeds/freetext_index.ctp:32
+#: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
+#: View/Objects/revise_object.ctp:64
+#: 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:53;68
+#: 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:38
+#: View/Warninglists/view.ctp:13
+msgid "Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:27
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+#: 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/resolved_misp_format.ctp:92;287
+#: View/Events/show_i_o_c_results.ctp:13
+#: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
+#: View/Noticelists/view.ctp:42
+#: View/Objects/add.ctp:115
+#: View/Objects/group_attributes_into_object.ctp:58
+#: View/Objects/revise_object.ctp:65
+#: View/Objects/ajax/quickAddAttributeForm.ctp:78
+#: 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/UserSettings/index.ctp:68
+#: View/Users/admin_filter_user_index.ctp:71
+msgid "Value"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:29
+msgid "Event Tags"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:31
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
+#: View/ObjectReferences/ajax/add.ctp:30
+#: View/Objects/add.ctp:67;119
+#: View/Objects/group_attributes_into_object.ctp:30
+#: View/Objects/revise_object.ctp:49;67
+#: View/Pages/doc/using_the_system.ctp:234;284
+#: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
+msgid "Comment"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:35
+#: View/Elements/eventattribute.ctp:179
+msgid "Score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:84
+#: View/DecayingModel/decaying_tool_simulation.ctp:184
+msgid "Failed to perform RestSearch"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search_form.ctp:3
+msgid "Decaying Model RestSearch"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:45
+#: View/Events/automation.ctp:24
+#: View/Logs/admin_index.ctp:20;21
+#: View/Logs/admin_search.ctp:25
+msgid "Search"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:49
+msgid "Specific Attribute"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:53
+msgid "Attribute ID or UUID"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:55
+msgid "Simulate"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:66
+msgid "Base score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:68;71
+msgid "Base score configuration"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:68
+msgid "not set. But default value sets."
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:71
+msgid "not set"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:79
+msgid "Sighting"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:83
+msgid "Current score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:132
+msgid "Basescore computation steps"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:266
+msgid "Failed to perform the simulation"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:4
+msgid "Import model data"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:5
+msgid "Paste a MISP model JSON or provide a JSON file below to add models."
+msgstr ""
+
+#: View/DecayingModel/import.ctp:10
+#: View/Feeds/import_feeds.ctp:10
+#: View/Servers/import.ctp:10
+#: View/TagCollections/import.ctp:10
+msgid "JSON"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:11
+msgid "Model JSON"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:18
+msgid "JSON file"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:25
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:15
+#: View/Elements/genericElements/org_picker.ctp:17
+#: View/EventBlacklists/add.ctp:36
+#: View/Events/filter_event_index.ctp:125
+#: View/Feeds/add.ctp:220
+#: View/Feeds/import_feeds.ctp:20
+#: View/OrgBlacklists/add.ctp:29
+#: View/Regexp/admin_add.ctp:32
+#: View/Regexp/admin_edit.ctp:42
+#: View/Roles/admin_add.ctp:57
+#: View/Servers/import.ctp:20
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:20
+#: View/Tags/add.ctp:35
+#: View/Users/admin_filter_user_index.ctp:62
+#: View/Whitelists/admin_add.ctp:13
+msgid "Add"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:2
+msgid "Decaying Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:30;31
+msgid "All Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:41
+msgid "My models only"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:42
+msgid "My Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:53
+msgid "Models available to everyone"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:54
+msgid "Shared Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:65
+msgid "Default models only"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:66
+msgid "Default Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:86
+#: View/Pages/doc/using_the_system.ctp:398
+msgid "Organization"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:87
+msgid "Usable to everyone"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:91
+#: View/DecayingModel/view.ctp:40
+msgid "Parameters"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:92
+msgid "Pretty print"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:95
+#: View/DecayingModel/view.ctp:35
+msgid "Formula"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:96
+msgid "# Assigned Types"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:97
+#: View/DecayingModel/view.ctp:25
+#: View/Galaxies/view.ctp:10
+#: View/ObjectTemplates/view.ctp:7
+#: View/Taxonomies/view.ctp:19
+#: View/Warninglists/view.ctp:12
+msgid "Version"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:98
+#: View/DecayingModel/view.ctp:31
+#: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
+#: View/Feeds/view.ctp:63
+#: View/Noticelists/index.ctp:63
+#: View/ObjectTemplates/index.ctp:35
+#: View/Sightingdb/index.ctp:19
+#: View/Taxonomies/view.ctp:24
+#: View/Warninglists/view.ctp:16
+msgid "Enabled"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:114
+#: View/DecayingModel/view.ctp:18
+msgid "Default Model from MISP Project"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:137
+msgid "Download model"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:142
+msgid "Are you sure you want to delete DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:148
+msgid "Are you sure you want to disable DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:150
+msgid "Are you sure you want to enable DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:5
+#: View/Events/view.ctp:86
+msgid "Creator org"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:27
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
+#: View/SharingGroups/view.ctp:69
+#: View/TagCollections/index.ctp:12
+msgid "All orgs"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:41
+msgid "Reference(s)"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:42
+msgid "Associated types"
+msgstr ""
+
+#: View/DecayingModel/ajax/disable_form.ctp:3
+msgid "Disable model"
+msgstr ""
+
+#: View/DecayingModel/ajax/enable_form.ctp:3
+msgid "Enable model"
+msgstr ""
+
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:4
+msgid "Add DecayingModelMapping"
+msgstr ""
+
+#: View/Elements/ajaxAttributeTags.ctp:29
 #: View/Elements/ajaxTagCollectionTags.ctp:16
-#: View/Elements/ajaxTags.ctp:45
+#: View/Elements/ajaxTags.ctp:104
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Elements/ajaxAttributeTags.ctp:43
 #: 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:48
+#: View/Elements/ajaxTags.ctp:73;74
+msgid "Local tag"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:73;74
+msgid "Global tag"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:107
 msgid "Remove tag %s"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:58;61
+#: View/Elements/ajaxTags.ctp:123;124
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 #: View/Templates/add.ctp:28
 #: View/Templates/edit.ctp:28
 msgid "Add a tag"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:67;69;234;236
-#: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
-#: View/Elements/Servers/eventattribute.ctp:28;31;94;97
+#: View/Elements/ajaxTags.ctp:141;142
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
+msgid "Add a local tag"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:67;69;254;256
+#: View/Elements/Feeds/eventattribute.ctp:28;31;95;98
+#: View/Elements/Servers/eventattribute.ctp:28;31;95;98
 msgid "view all"
 msgstr ""
 
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr ""
 
@@ -5022,40 +7345,51 @@ msgid "Select all attributes/proposals on current page"
 msgstr ""
 
 #: View/Elements/eventattribute.ctp:138
-#: View/Elements/Feeds/eventattribute.ctp:41
-#: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/proposal_event_index.ctp:30
-#: View/Events/view.ctp:142
-#: View/Feeds/preview_event.ctp:25
-#: View/Objects/group_attributes_into_object.ctp:56
-#: 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"
+#: View/Elements/Feeds/eventattribute.ctp:42
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:52
+msgid "First seen"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:142
-#: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:218;229
+#: View/Elements/eventattribute.ctp:138
+#: View/Elements/Feeds/eventattribute.ctp:42
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:56
+msgid "Last seen"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:143
+#: View/Elements/eventdiscussion.ctp:143
+#: View/Events/view.ctp:219;230
 #: 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
+#: View/ShadowAttributes/index.ctp:48
 msgid "Event"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:153
+#: View/Elements/eventattribute.ctp:154
+#: View/Elements/eventattributetoolbar.ctp:201
 msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:207
+#: View/Elements/eventattribute.ctp:171
+#: View/Elements/eventattributetoolbar.ctp:185
+msgid "SightingDB"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:178
+msgid "Decaying Score"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:227
 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:211
+#: View/Elements/eventattribute.ctp:231
 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 ""
 
@@ -5068,12 +7402,15 @@ msgid "Show all attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:6
-#: View/Elements/Events/eventIndexTable.ctp:216
+#: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
 #: View/Regexp/admin_edit.ctp:18
 #: View/Sightings/ajax/advanced.ctp:5
+#: View/UserSettings/index.ctp:41
 msgid "All"
 msgstr ""
 
@@ -5095,7 +7432,7 @@ msgid "Only show correlating attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:33
-#: View/Events/view.ctp:305
+#: View/Events/view.ctp:306
 msgid "Correlation"
 msgstr ""
 
@@ -5104,6 +7441,8 @@ msgid "Only show potentially false positive attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr "경고"
@@ -5113,105 +7452,111 @@ msgstr "경고"
 msgid "Add attribute"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:59
+#: View/Elements/eventattributetoolbar.ctp:52
+msgid "Add proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:60
 msgid "Edit selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:67
+#: View/Elements/eventattributetoolbar.ctp:68
 msgid "Tag selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:75
+#: View/Elements/eventattributetoolbar.ctp:76
 msgid "Add new cluster to selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:84
+#: View/Elements/eventattributetoolbar.ctp:85
 msgid "Group selected Attributes into an Object"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:93
+#: View/Elements/eventattributetoolbar.ctp:94
 msgid "Delete selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:101
+#: View/Elements/eventattributetoolbar.ctp:102
 msgid "Accept selected Proposals"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:109
+#: View/Elements/eventattributetoolbar.ctp:110
 msgid "Discard selected Proposals"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:117
+#: View/Elements/eventattributetoolbar.ctp:118
 msgid "Sightings display for selected attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:128
+#: View/Elements/eventattributetoolbar.ctp:129
 msgid "Populate using a template"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:136
+#: View/Elements/eventattributetoolbar.ctp:137
 msgid "Populate using the freetext import tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:143
+#: View/Elements/eventattributetoolbar.ctp:144
 msgid "Replace all attributes of a category/type combination within the event"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:157
+#: View/Elements/eventattributetoolbar.ctp:158
 msgid "Use a list of simple scopes to filter the data"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:158
+#: View/Elements/eventattributetoolbar.ctp:159
 msgid "Scope toggle"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:163
+#: View/Elements/eventattributetoolbar.ctp:164
 msgid "Include deleted attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:165
+#: View/Elements/eventattributetoolbar.ctp:166
 msgid "Deleted"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:173
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Show attribute decaying score"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:176
+msgid "Decay score"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:183
+msgid "Show SightingDB lookup results"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:192
 msgid "Show attribute context fields"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:175
+#: View/Elements/eventattributetoolbar.ctp:194
 msgid "Context"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:180
+#: View/Elements/eventattributetoolbar.ctp:199
+msgid "Show related tags"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:208
 msgid "Advanced filtering tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:184
+#: View/Elements/eventattributetoolbar.ctp:212
 msgid "Filtering tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:188
+#: View/Elements/eventattributetoolbar.ctp:216
 msgid "%s active rule(s)"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:203
-#: View/EventBlacklists/index.ctp:36
-#: View/Events/index.ctp:95
-#: View/Feeds/preview_index.ctp:26
-#: View/Feeds/search_caches.ctp:27
-#: View/ObjectTemplates/index.ctp:48
-#: View/Organisations/index.ctp:76
-#: View/Servers/preview_index.ctp:65
-#: View/Users/admin_index.ctp:62
-msgid "Enter value to search"
-msgstr ""
-
-#: View/Elements/eventattributetoolbar.ctp:207
+#: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: 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 ""
 
@@ -5231,32 +7576,6 @@ msgstr ""
 msgid "User "
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:242
-#: View/Elements/Events/View/row_attribute.ctp:393
-#: View/Elements/TagCollections/index_row.ctp:43
-#: View/Elements/Users/userIndexTable.ctp:90
-#: View/EventBlacklists/edit.ctp:37
-#: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:194
-#: View/Feeds/index.ctp:282
-#: View/News/index.ctp:22
-#: View/OrgBlacklists/edit.ctp:30
-#: View/OrgBlacklists/index.ctp:36
-#: View/Organisations/index.ctp:138
-#: View/Pages/doc/using_the_system.ctp:191
-#: View/Regexp/admin_index.ctp:34
-#: View/Roles/admin_edit.ctp:42
-#: View/Roles/admin_index.ctp:79
-#: View/Servers/index.ctp:136
-#: View/SharingGroups/index.ctp:86
-#: View/Tags/edit.ctp:36
-#: View/Tags/index.ctp:124
-#: View/Templates/edit.ctp:49
-#: View/Whitelists/admin_index.ctp:31
-msgid "Edit"
-msgstr "편집"
-
 #: View/Elements/eventdiscussion.ctp:90;98
 msgid "Are you sure you want to delete this post?"
 msgstr ""
@@ -5265,51 +7584,51 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:141
+#: View/Elements/eventdiscussion.ctp:142
 #: 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/Elements/eventdiscussion.ctp:142
 #: View/Posts/add.ctp:32
 msgid "Quote"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:142
+#: View/Elements/eventdiscussion.ctp:143
 msgid "Insert a link to an event - just enter the event ID between the [event][/event] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:143
+#: View/Elements/eventdiscussion.ctp:144
 #: 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/Elements/eventdiscussion.ctp:144
 #: View/Posts/add.ctp:34
 msgid "Thread"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Insert a link [link][/link] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Link"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Insert a code [code][/code] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Code"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:156
+#: View/Elements/eventdiscussion.ctp:157
 #: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr ""
@@ -5331,15 +7650,6 @@ msgstr ""
 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/edit.ctp:23
-#: View/Users/view.ctp:31
-msgid "GnuPG key"
-msgstr ""
-
 #: View/Elements/footer.ctp:17
 msgid "Could not locate the GnuPG public key."
 msgstr ""
@@ -5348,72 +7658,80 @@ msgstr ""
 msgid "Could not locate SMIME certificate."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:8
-msgid "View details about this galaxy"
+#: View/Elements/form_seen_input.ctp:53
+msgid "First seen date"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:8
-msgid "View galaxy"
+#: View/Elements/form_seen_input.ctp:57
+msgid "Last seen date"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:19
-#: View/Elements/galaxyQuickViewMini.ctp:69
+#: View/Elements/form_seen_input.ctp:63
+msgid "First seen time"
+msgstr ""
+
+#: View/Elements/form_seen_input.ctp:64;69
+msgid "Expected format: HH:MM:SS.ssssss+TT:TT"
+msgstr ""
+
+#: View/Elements/form_seen_input.ctp:68
+msgid "Last seen time"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:79
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:19
-#: View/Elements/galaxyQuickViewMini.ctp:69
-#: View/Elements/Events/eventIndexTable.ctp:138
+#: View/Elements/galaxyQuickView.ctp:77
+#: View/Elements/galaxyQuickViewMini.ctp:80
 msgid "View cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:20
-#: View/Elements/galaxyQuickViewMini.ctp:70
+#: View/Elements/galaxyQuickView.ctp:83;84
+#: View/Elements/galaxyQuickViewMini.ctp:86;87
 msgid "View all events containing this cluster."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:24
+#: View/Elements/galaxyQuickView.ctp:97
 msgid "detach"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:24
+#: View/Elements/galaxyQuickView.ctp:98
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:96
-#: View/Elements/galaxyQuickViewMini.ctp:89
-#: View/EventBlacklists/add.ctp:36
-#: View/Events/add.ctp:71
-#: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
-#: View/Feeds/import_feeds.ctp:20
-#: View/OrgBlacklists/add.ctp:29
-#: View/Regexp/admin_add.ctp:32
-#: View/Regexp/admin_edit.ctp:42
-#: View/Roles/admin_add.ctp:44
-#: View/Servers/import.ctp:20
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
-#: View/Sightings/ajax/add_sighting.ctp:33
-#: View/TagCollections/import.ctp:20
-#: View/Tags/add.ctp:35
-#: View/Users/admin_filter_user_index.ctp:62
-#: View/Whitelists/admin_add.ctp:13
-msgid "Add"
+#: View/Elements/galaxyQuickView.ctp:114
+msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:74
-msgid "Are you sure you want to detach %s from this %s?"
+#: View/Elements/galaxyQuickView.ctp:115
+msgid "View galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:89
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:205
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
+msgid "Add new local cluster"
+msgstr ""
+
+#: View/Elements/galaxyQuickViewMini.ctp:100
+msgid "Are you sure you want to detach %s from this %s?"
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:187
+msgid "No item picked"
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:209
 msgid "Due to the large number of options, no contextual information is provided."
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:273
+#: View/Elements/generic_picker.ctp:277
 msgid "Nothing to pick"
 msgstr ""
 
@@ -5427,98 +7745,103 @@ msgid "Event Actions"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;252
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: 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:214;258
-#: View/Events/add.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
+#: View/Events/add.ctp:7
 #: 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:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: 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:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: 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:270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:298
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:49
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:47
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "View delegation requests"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "태그 목록"
 
-#: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:803
+#: View/Elements/global_menu.ctp:61
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr "태그 추가"
 
-#: View/Elements/global_menu.ctp:62
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:832
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:860
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "템플릿 목록"
 
-#: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:865
+#: View/Elements/global_menu.ctp:74
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "템플릿 추가"
 
-#: View/Elements/global_menu.ctp:78
+#: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:308
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: 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:314
+#: View/Elements/global_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -5527,17 +7850,17 @@ msgstr "내보내기"
 msgid "Automation"
 msgstr "자동화"
 
-#: View/Elements/global_menu.ctp:94
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:966
+#: View/Elements/global_menu.ctp:98
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:101
+#: View/Elements/global_menu.ctp:105
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:104;109
+#: View/Elements/global_menu.ctp:108;113
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -5546,7 +7869,7 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:114;119
+#: View/Elements/global_menu.ctp:118;123
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -5555,79 +7878,98 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:124
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:361
+#: View/Elements/global_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:128
+#: View/Elements/global_menu.ctp:132
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:135
+#: View/Elements/global_menu.ctp:139
 #: View/Pages/doc/general.ctp:22;54
 msgid "Global Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:139
+#: View/Elements/global_menu.ctp:143
 #: 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:440
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/global_menu.ctp:151
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
+msgid "My Settings"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:155
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
+msgid "Set Setting"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:159
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "대시보드"
 
-#: View/Elements/global_menu.ctp:156
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:463
+#: View/Elements/global_menu.ctp:168
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:163
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1010
+#: View/Elements/global_menu.ctp:175
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:480
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:174
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:486
+#: View/Elements/global_menu.ctp:186
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:493
+#: View/Elements/global_menu.ctp:194
+msgid "Decaying Models Tool"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:199
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
+msgid "List Decaying Models"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:206
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: 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
+#: View/Elements/global_menu.ctp:210
 msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:190
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:497
+#: View/Elements/global_menu.ctp:214
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:194
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:218
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -5641,48 +7983,61 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:201
+#: View/Elements/global_menu.ctp:225
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:205
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:212
+#: View/Elements/global_menu.ctp:236
 #: View/Pages/doc/general.ctp:23;66
 msgid "Sync Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:216
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:509
+#: View/Elements/global_menu.ctp:240
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:221
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:515
+#: View/Elements/global_menu.ctp:245
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
+#: View/Elements/global_menu.ctp:250
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:231
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:887
+#: View/Elements/global_menu.ctp:255
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:236
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:891
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:244
+#: View/Elements/global_menu.ctp:265
+msgid "List SightingDB Connections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:270
+msgid "Add SightingDB Connection"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:275
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+msgid "List Communities"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:283
 #: View/Pages/doc/administration.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
@@ -5692,100 +8047,113 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:249
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:638
+#: View/Elements/global_menu.ctp:288
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:253
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:633
+#: View/Elements/global_menu.ctp:292
+msgid "List User Settings"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:296
+#: View/UserSettings/set_setting.ctp:5
+msgid "Set User Setting"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:300
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr "사용자 추가"
 
-#: View/Elements/global_menu.ctp:257
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
+#: View/Elements/global_menu.ctp:304
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:264
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:450;680
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:268
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:692
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:279
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:297
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "작업"
 
-#: View/Elements/global_menu.ctp:306
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:711
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:315
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:320
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:329
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:342
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:346
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:744
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "로그 목록"
 
-#: View/Elements/global_menu.ctp:350
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:748
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "로그 검색"
 
-#: View/Elements/global_menu.ctp:377;382
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -5807,7 +8175,9 @@ msgid "Attributes per organization"
 msgstr ""
 
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:91
+#: View/Elements/view_timeline.ctp:23
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -5834,6 +8204,7 @@ msgid "Physics"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:13
+#: View/Elements/view_timeline.ctp:12
 msgid "Display"
 msgstr ""
 
@@ -5841,7 +8212,6 @@ msgstr ""
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr ""
 
@@ -5849,11 +8219,8 @@ msgstr ""
 msgid "History"
 msgstr ""
 
-#: View/Elements/view_event_graph.ctp:18
-msgid "Search for an item"
-msgstr ""
-
 #: View/Elements/view_event_graph.ctp:22
+#: View/Elements/view_timeline.ctp:26
 #: View/Events/view_graph.ctp:17
 msgid "Toggle fullscreen"
 msgstr ""
@@ -5862,13 +8229,47 @@ msgstr ""
 msgid "Show all"
 msgstr ""
 
-#: View/Elements/view_galaxy_matrix.ctp:121
+#: View/Elements/view_galaxy_matrix.ctp:129
 msgid "(%s items)"
 msgstr ""
 
+#: View/Elements/view_timeline.ctp:9
+msgid "Time scope"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
+#: View/Taxonomies/view.ctp:83
+msgid "Tag"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:6
+msgid "Computation"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:7
+#: View/Events/add_misp_export_result.ctp:6
+msgid "Result"
+msgstr "결과"
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:10
+msgid "Taxonomy effective ratio"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:10
+msgid "Eff. Ratio"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+msgid "Tag numerical value"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:19
+msgid "Pick an Attribute"
+msgstr ""
+
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr ""
 
@@ -5925,72 +8326,73 @@ msgstr ""
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:82;86;248
+#: View/Elements/Events/eventIndexTable.ctp:82;86;237
 #: 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/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
 #: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/index.ctp:103
 #: View/Servers/preview_index.ctp:174
-#: View/SharingGroups/index.ctp:89
+#: View/SharingGroups/index.ctp:91
 #: View/Taxonomies/index.ctp:49
 #: View/Warninglists/index.ctp:60
 msgid "View"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:168
+#: View/Elements/Events/eventIndexTable.ctp:157
 msgid " correlation(s). Show filtered event with correlation only."
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:186;191
+#: View/Elements/Events/eventIndexTable.ctp:175;180
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:196
+#: View/Elements/Events/eventIndexTable.ctp:185
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:237
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:237
+#: View/Elements/Events/eventIndexTable.ctp:226
 #: 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:238
+#: View/Elements/Events/eventIndexTable.ctp:227
 msgid "Not published"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;347;414;571;625
-#: View/Servers/index.ctp:137
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
+#: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr ""
 
-#: View/Elements/Events/View/attribute_correlations.ctp:7
+#: View/Elements/Events/View/attribute_correlations.ctp:17
 msgid "Show "
 msgstr ""
 
-#: View/Elements/Events/View/attribute_correlations.ctp:7
+#: View/Elements/Events/View/attribute_correlations.ctp:17
 msgid " more..."
 msgstr ""
 
-#: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:362
+#: View/Elements/Events/View/attribute_correlations.ctp:53
+#: View/Events/view.ctp:399
 #: View/Feeds/preview_event.ctp:88
 #: View/Servers/preview_event.ctp:116
 msgid "Collapse…"
@@ -6004,131 +8406,122 @@ msgstr ""
 msgid "Advanced Sightings"
 msgstr ""
 
+#: View/Elements/Events/View/related_event.ctp:26
+msgid "This related event contains %s unique correlation(s)"
+msgstr ""
+
 #: View/Elements/Events/View/row_attribute.ctp:43
 msgid "Select attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:152
-#: View/Elements/Events/View/row_proposal.ctp:110
-#: View/Elements/Feeds/View/row_attribute.ctp:61
-#: View/Elements/Servers/View/row_attribute.ctp:68
+#: View/Elements/Events/View/row_attribute.ctp:155
+#: View/Elements/Events/View/row_proposal.ctp:113
+#: View/Elements/Feeds/View/row_attribute.ctp:63
+#: View/Elements/Servers/View/row_attribute.ctp:70
 msgid "warning"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:196;197
+#: View/Elements/Events/View/row_attribute.ctp:199;200
 #: View/Events/ajax/toggle_correlation.ctp:20
 msgid "Toggle correlation"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:323
+#: View/Elements/Events/View/row_attribute.ctp:326
 msgid "Toggle IDS flag"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:356
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Restore attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:357;397
+#: View/Elements/Events/View/row_attribute.ctp:377;417
 msgid "Permanently delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:364
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:364
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:369
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:369
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:373
+#: View/Elements/Events/View/row_attribute.ctp:393
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:374
+#: View/Elements/Events/View/row_attribute.ctp:394
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:384;389
+#: View/Elements/Events/View/row_attribute.ctp:404;409
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:389
+#: View/Elements/Events/View/row_attribute.ctp:409
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:401
+#: View/Elements/Events/View/row_attribute.ctp:421
 msgid "Soft-delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:65
-#: View/Elements/Feeds/View/row_object.ctp:16
-#: View/Events/resolved_misp_format.ctp:109
+#: View/Elements/Events/View/row_object.ctp:68
+#: View/Elements/Feeds/View/row_object.ctp:19
+#: View/Events/resolved_misp_format.ctp:113
 msgid "Name: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:66
+#: View/Elements/Events/View/row_object.ctp:69
 #: 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.ctp:20
 #: 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.ctp:20
 #: View/Elements/Servers/View/row_object_reference.ctp:7
 #: View/Elements/Servers/View/row_object_referenced_by.ctp:7
-#: View/Events/resolved_misp_format.ctp:110;120
+#: View/Events/resolved_misp_format.ctp:114;135
 msgid "Expand or Collapse"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:69
-#: View/Events/resolved_misp_format.ctp:92;262
-#: View/GalaxyClusters/view.ctp:19
-#: View/ObjectTemplates/index.ctp:66
-#: View/ObjectTemplates/view.ctp:6
-#: View/Objects/revise_object.ctp:61
-#: View/OrgBlacklists/index.ctp:23
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/view.ctp:24
-#: View/Organisations/ajax/merge.ctp:58;65
-#: View/SharingGroups/add.ctp:72
-#: View/SharingGroups/edit.ctp:72
-#: View/TagCollections/index.ctp:8
-msgid "UUID"
-msgstr ""
-
-#: View/Elements/Events/View/row_object.ctp:70
+#: View/Elements/Events/View/row_object.ctp:73
 msgid "Meta-category: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:71
-#: View/Elements/Feeds/View/row_object.ctp:21
+#: View/Elements/Events/View/row_object.ctp:74
+#: View/Elements/Feeds/View/row_object.ctp:24
 msgid "Description: "
 msgstr "설명: "
 
-#: View/Elements/Events/View/row_object.ctp:72
-#: View/Elements/Feeds/View/row_object.ctp:22
+#: View/Elements/Events/View/row_object.ctp:75
+#: View/Elements/Feeds/View/row_object.ctp:25
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:125
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:125
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Soft delete object"
 msgstr ""
 
+#: View/Elements/Events/View/row_object.ctp:164
+msgid "Add an Object Attribute"
+msgstr ""
+
 #: View/Elements/Events/View/row_object_reference.ctp:1
 #: View/Elements/Feeds/View/row_object_reference.ctp:1
-#: View/Events/resolved_misp_format.ctp:115
+#: View/Events/resolved_misp_format.ctp:130
 msgid "References: "
 msgstr "참조: "
 
@@ -6150,18 +8543,18 @@ msgstr ""
 msgid "Select proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:183
-#: View/Elements/Events/View/row_proposal_delete.ctp:77
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept Proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:183
-#: View/Elements/Events/View/row_proposal_delete.ctp:77
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:188
-#: View/Elements/Events/View/row_proposal_delete.ctp:82
+#: View/Elements/Events/View/row_proposal.ctp:199
+#: View/Elements/Events/View/row_proposal_delete.ctp:85
 msgid "Discard proposal"
 msgstr ""
 
@@ -6181,24 +8574,22 @@ msgid "Advanced sightings"
 msgstr ""
 
 #: View/Elements/Events/View/value_field.ctp:52
-#: View/Elements/Servers/View/value_field.ctp:43
+msgid "Cortex object"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:68
 msgid "Hexadecimal representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:52
-#: View/Elements/Feeds/View/value_field.ctp:43
-#: View/Elements/Servers/View/value_field.ctp:43
+#: View/Elements/Events/View/value_field.ctp:69
 msgid "Switch to binary representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:58
-#: View/Elements/Feeds/View/value_field.ctp:48
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:58
-#: View/Elements/Feeds/View/value_field.ctp:48
-#: View/Elements/Servers/View/value_field.ctp:48
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr ""
 
@@ -6222,19 +8613,14 @@ msgstr ""
 msgid "Check coverage"
 msgstr ""
 
-#: View/Elements/Feeds/View/row_object.ctp:20
-#: View/Elements/Servers/View/row_object.ctp:20
+#: View/Elements/Feeds/View/row_object.ctp:23
+#: View/Elements/Servers/View/row_object.ctp:23
 #: View/ObjectTemplates/index.ctp:69
 #: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:31
 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/Objects/object_similarities.ctp:76
 msgid "Update template and merge"
 msgstr ""
@@ -6279,98 +8665,44 @@ msgstr ""
 msgid "-- Select an option --"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:31;97
+#: View/Elements/Servers/eventattribute.ctp:31;98
 msgid "all"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:50
 #: View/Elements/templateElements/templateRowAttribute.ctp:82
 #: View/Events/resolved_attributes.ctp:49
-#: View/Events/resolved_misp_format.ctp:94;264
+#: View/Events/resolved_misp_format.ctp:95;290
 #: View/Feeds/freetext_index.ctp:34
-#: View/Objects/add.ctp:103
+#: View/Objects/add.ctp:116
 #: 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:305
+#: View/Elements/healthElements/diagnostics.ctp:367
 #: View/Pages/doc/administration.ctp:56;228
 #: View/Servers/ajax/submoduleStatus.ctp:6
 msgid "Status"
 msgstr ""
 
-#: View/Elements/Servers/View/row_attribute.ctp:93
+#: View/Elements/Servers/View/row_attribute.ctp:95
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
+#: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
-#: View/Events/view.ctp:190
-#: View/GalaxyClusters/view.ctp:32
+#: View/Events/view.ctp:191
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
-#: View/Users/admin_view.ctp:63;84
-#: View/Users/view.ctp:33
+#: View/Users/admin_view.ctp:95
 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/Feeds/search_caches.ctp:47
-#: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
-#: View/ObjectTemplates/view.ctp:4
-#: View/Objects/add.ctp:193
-#: View/Objects/revise_object.ctp:27
-#: 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:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
-#: View/ObjectTemplates/view.ctp:9
-#: View/Objects/add.ctp:22;100;197
-#: View/Objects/group_attributes_into_object.ctp:8
-#: View/Objects/propose_objects_from_attributes.ctp:17
-#: 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/TagCollections/index.ctp:15
-#: 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/Elements/Servers/View/row_object.ctp:25
 #: View/Objects/propose_objects_from_attributes.ctp:14
 #: View/Templates/view.ctp:2
 msgid "Template"
@@ -6386,20 +8718,22 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
-#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/TagCollections/index_row.ctp:45
 #: View/Tags/index.ctp:125
 #: View/Whitelists/admin_index.ctp:32
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: View/Elements/TagCollections/index_row.ctp:50
+#: View/Elements/TagCollections/index_row.ctp:51;52
 msgid "Download configuration"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
@@ -6412,20 +8746,18 @@ 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
+#: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:88
-msgid "Initiate password refresh"
-msgstr ""
-
-#: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 msgid "Create new credentials and inform user"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:611
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -6442,6 +8774,7 @@ msgid "Events published: "
 msgstr ""
 
 #: View/Elements/dashboard/dashboard_events.ctp:7
+#: View/Servers/index.ctp:107
 msgid "Reset"
 msgstr ""
 
@@ -6461,439 +8794,713 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
-msgid "Populate From Template"
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
-msgid "Enrichment Module Result"
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr "오류: 올바르지 않은 이벤트!"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+msgid "Enrichment Module Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;824;996
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
-#: View/Events/edit.ctp:8
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+msgid "Publish Sightings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:180
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:181
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:197
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:204;291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:227;232
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:265
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:334
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:346
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:367
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:376
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:386
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:387
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:397
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:402
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:413
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:423
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:427
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:434;600
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr "비밀번호 재설정"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:469
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524;554
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:543
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:562
-#: View/Servers/edit.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:593
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
+msgid "View community"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
+msgid "Request E-mail"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:605
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:610
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:619
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:624
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:653
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
+msgid "User settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757;771
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr "스레드 보기"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:762
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr "게시물 추가"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:776
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr "게시물 편집"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:782
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr "스레드 목록"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr "새로운 스레드"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:794
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr "즐겨찾는 태그 목록"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:810
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr "태그 편집"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:818;837
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:852
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr "템플릿 보기"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr "템플릿 편집"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+msgid "Update Default Models"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
+msgid "Force Update Default Models"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
+msgid "Import Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
+msgid "Add Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+msgid "Decaying Tool"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
+msgid "View Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
+msgid "Edit Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:901
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:907
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:912
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:920
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:925
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:946
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:951
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:972
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:973
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:978
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:979
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:986;1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:991
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1015
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1021
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
+#: View/Sightingdb/add.ctp:6
+msgid "Add SightingDB connection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
+msgid "Edit SightingDB connection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
+msgid "List SightingDB connections"
+msgstr ""
+
 #: View/Elements/genericElements/SideMenu/side_menu_post_link.ctp:26
 #: View/Errors/error403.ctp:4
 msgid "%s"
 msgstr ""
 
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:4
+msgid "Show database indexes"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:9
+msgid "Index diagnostic:"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:12
+msgid "Notice"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:13
+msgid "The highlighted issues may be benign. if you are unsure, please open an issue and ask for clarification."
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:47
+msgid "Fix Database Index Schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
+msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:62
+msgid "The current database schema does not match the expected format."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
+msgid "Database schema diagnostic: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:68;74
+msgid "The MISP database state does not match the expected schema. Resolving these issues is recommended."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:69;75
+msgid "⚠ This diagnostic tool is in experimental state - the highlighted issues may be benign. If you are unsure, please open an issue on with the issues identified over at https://github.com/MISP/MISP for clarification."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:79
+msgid "Reveal benign deltas"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Table name"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Expected schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Actual schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
+msgid "Fix Database schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
+msgid "The current database is correct"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
+msgid "Expected DB_version: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
+msgid "The current database version matches the expected one"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
+msgid "Actual DB_version: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
+msgid "The current database version does not match the expected one"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
+msgid "Updates are locked"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
+msgid "Updates are not locked"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+#: View/Servers/update_progress.ctp:32
+msgid "Updates are locked due to to many update fails"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+msgid "Updates unlocked in %s"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
+msgid "DataSource: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
+msgid "Column diagnostic"
+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 ""
@@ -6956,7 +9563,7 @@ msgid "Click the following button to go to the update progress page. This page l
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:69
-msgid "Update Progress"
+msgid "View Update Progress"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:71
@@ -7046,7 +9653,7 @@ msgid "PHP CLI Version"
 msgstr "PHP CLI 버전"
 
 #: View/Elements/healthElements/diagnostics.ctp:162
-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: "
+msgid "Please note that the support for Python versions below 3.6 and below PHP 7.2 has been dropped as of 2020-01-01 and are henceforth considered unsupported. More info: "
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:163
@@ -7071,237 +9678,293 @@ msgstr ""
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:197
-msgid "Advanced attachment handler"
+#: View/Elements/healthElements/diagnostics.ctp:206
+msgid "Table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:198
-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:203
-msgid "PyMISP"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:203
-msgid "Not installed or version outdated."
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:215
-msgid "STIX and Cybox libraries"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:216
-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."
+#: View/Elements/healthElements/diagnostics.ctp:211
+msgid "Used"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:217
-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"
+msgid "Reclaimable"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:223
+msgid "SQL database status"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:224
-msgid "Other versions might work but are not tested / recommended."
+msgid "Size of each individual table on disk, along with the size that can be freed via SQL optimize. Make sure that you always have at least 3x the size of the largest table in free space in order for the update scripts to work as expected."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:233
-msgid "STIX and CyBox"
-msgstr "STIX 와 CyBox"
-
-#: View/Elements/healthElements/diagnostics.ctp:233
-msgid "Could not read test script (stixtest.py)."
+#: View/Elements/healthElements/diagnostics.ctp:229
+msgid "Schema status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:247
-msgid " library version"
-msgstr " 라이브러리 버전"
+#: View/Elements/healthElements/diagnostics.ctp:246
+msgid "Redis info"
+msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:264
-msgid "Yara"
+#: View/Elements/healthElements/diagnostics.ctp:248
+msgid "PHP extension version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:248
+msgid "Not installed."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:250
+msgid "Redis version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:251
+msgid "Memory allocator"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:252
+msgid "Memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:253
+msgid "Peak memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:254
+msgid "Total system memory"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:259
+msgid "Advanced attachment handler"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:260
+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:265
-msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
+msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:272
-msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
+#: View/Elements/healthElements/diagnostics.ctp:265
+msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:274
-msgid "plyara library installed"
+#: View/Elements/healthElements/diagnostics.ctp:277
+msgid "STIX and Cybox libraries"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:278
-msgid "GnuPG"
+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:279
+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:286
+msgid "Other versions might work but are not tested / recommended."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:295
+msgid "STIX and CyBox"
+msgstr "STIX 와 CyBox"
+
+#: View/Elements/healthElements/diagnostics.ctp:295
+msgid "Could not read test script (stixtest.py)."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:309
+msgid " library version"
+msgstr " 라이브러리 버전"
+
+#: View/Elements/healthElements/diagnostics.ctp:326
+msgid "Yara"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:327
+msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:334
+msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:336
+msgid "plyara library installed"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:340
+msgid "GnuPG"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:341
 msgid "This tool tests whether your GnuPG is set up correctly or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:287
+#: View/Elements/healthElements/diagnostics.ctp:349
 msgid "GnuPG installation and settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:290
+#: View/Elements/healthElements/diagnostics.ctp:352
 msgid "ZeroMQ"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:291
+#: View/Elements/healthElements/diagnostics.ctp:353
 msgid "This tool tests whether the ZeroMQ extension is installed and functional."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:299
+#: View/Elements/healthElements/diagnostics.ctp:361
 msgid "ZeroMQ settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start"
 msgstr "시작"
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop"
 msgstr "중지"
 
-#: View/Elements/healthElements/diagnostics.ctp:305
+#: View/Elements/healthElements/diagnostics.ctp:367
 msgid "Check ZeroMQ service status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:307
+#: View/Elements/healthElements/diagnostics.ctp:369
 msgid "Proxy"
 msgstr "프록시"
 
-#: View/Elements/healthElements/diagnostics.ctp:308
+#: View/Elements/healthElements/diagnostics.ctp:370
 msgid "This tool tests whether your HTTP proxy settings are correct."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:316
+#: View/Elements/healthElements/diagnostics.ctp:378
 #: View/Pages/doc/administration.ctp:35
 msgid "Proxy settings"
 msgstr "프록시 설정"
 
-#: View/Elements/healthElements/diagnostics.ctp:319
+#: View/Elements/healthElements/diagnostics.ctp:381
 msgid "Module System"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:320
+#: View/Elements/healthElements/diagnostics.ctp:382
 msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:335
+#: View/Elements/healthElements/diagnostics.ctp:397
 msgid " module system"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:341
+#: View/Elements/healthElements/diagnostics.ctp:403
 msgid "Session table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:342
+#: View/Elements/healthElements/diagnostics.ctp:404
 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:349
+#: View/Elements/healthElements/diagnostics.ctp:411
 msgid "Expired sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:355
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Purge sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:359
+#: View/Elements/healthElements/diagnostics.ctp:421
 msgid "Clean model cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:360
+#: View/Elements/healthElements/diagnostics.ctp:422
 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:361
+#: View/Elements/healthElements/diagnostics.ctp:423
 msgid "Clean cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:362
-msgid "Overwritten objects"
+#: View/Elements/healthElements/diagnostics.ctp:427
+msgid "Check for deprecated function usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:363
-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."
+#: View/Elements/healthElements/diagnostics.ctp:428
+msgid "In an effort to identify the usage of deprecated functionalities, MISP has started aggregating the count of access requests to these endpoints. Check the frequency of their use below along with the users to potentially warn about better ways of achieving their goals."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:364
-msgid "Reconstruct overwritten objects"
+#: View/Elements/healthElements/diagnostics.ctp:431;432;434
+msgid "View deprecated endpoint usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:365;368
+#: View/Elements/healthElements/diagnostics.ctp:438;441
 msgid "Orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:366
+#: View/Elements/healthElements/diagnostics.ctp:439
 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:368;382
+#: View/Elements/healthElements/diagnostics.ctp:441;455
 msgid "Run the test below"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attribute"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:371
+#: View/Elements/healthElements/diagnostics.ctp:444
 msgid "Remove orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:372
+#: View/Elements/healthElements/diagnostics.ctp:445
 msgid "Remove published empty events"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:373;375
+#: View/Elements/healthElements/diagnostics.ctp:446;448
 #: View/Servers/ondemand_action.ctp:7
 msgid "Administrator On-demand Action"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:374
+#: View/Elements/healthElements/diagnostics.ctp:447
 msgid "Click the following button to go to the Administrator On-demand Action page."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:376;378
+#: View/Elements/healthElements/diagnostics.ctp:449;451
 msgid "Legacy Administrative Tools"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:377
+#: View/Elements/healthElements/diagnostics.ctp:450
 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:379
+#: View/Elements/healthElements/diagnostics.ctp:452
 msgid "Verify bad link on attachments"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:380
+#: View/Elements/healthElements/diagnostics.ctp:453
 msgid "Verify each attachment referenced in database is accessible on filesystem."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:382
+#: View/Elements/healthElements/diagnostics.ctp:455
 msgid "Non existing attachments referenced in Database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:384
+#: View/Elements/healthElements/diagnostics.ctp:457
 msgid "Check bad link on attachments"
 msgstr ""
 
@@ -7340,8 +10003,8 @@ msgstr "권한"
 #: View/Elements/healthElements/files.ctp:73
 #: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:80
-#: View/SharingGroups/index.ctp:87
+#: View/Roles/admin_index.ctp:90
+#: View/SharingGroups/index.ctp:89
 msgid "Are you sure you want to delete %s?"
 msgstr "'%s' 을(를) 삭제하시겠습니까?"
 
@@ -7362,27 +10025,10 @@ msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
+#: View/Sightingdb/index.ctp:32
 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/resolved_misp_format.ctp:91;261
-#: View/Events/show_i_o_c_results.ctp:13
-#: View/Feeds/freetext_index.ctp:33
-#: View/Noticelists/view.ctp:42
-#: View/Objects/add.ctp:102
-#: View/Objects/group_attributes_into_object.ctp:58
-#: View/Objects/revise_object.ctp:58
-#: 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 ""
@@ -7422,6 +10068,7 @@ msgstr ""
 
 #: View/Elements/healthElements/settings_table.ctp:4
 #: View/Pages/doc/administration.ctp:46
+#: View/UserSettings/index.ctp:62
 msgid "Setting"
 msgstr ""
 
@@ -7510,8 +10157,9 @@ msgstr ""
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
 #: View/TagCollections/index.ctp:14
-#: View/Users/admin_view.ctp:98
-#: View/Users/view.ctp:58
+#: View/UserSettings/index.ctp:56
+#: View/Users/admin_view.ctp:109
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr "사용자"
 
@@ -7556,7 +10204,7 @@ msgid "Start a worker"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
+msgid "Restart dead workers"
 msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
@@ -7648,11 +10296,15 @@ msgstr ""
 msgid "Blocked Orgs (AND NOT)"
 msgstr ""
 
-#: View/Elements/serverRuleElements/pull.ctp:65
+#: View/Elements/serverRuleElements/pull.ctp:60
+msgid "Additional sync parameters (based on the event index filters)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:68
 msgid "Accept changes"
 msgstr ""
 
-#: View/Elements/serverRuleElements/pull.ctp:65
+#: View/Elements/serverRuleElements/pull.ctp:68
 #: View/Elements/serverRuleElements/push.ctp:67
 msgid "Update"
 msgstr "업데이트"
@@ -7679,29 +10331,6 @@ msgstr ""
 msgid "Field"
 msgstr ""
 
-#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
-#: View/Events/export.ctp:26
-#: View/Events/resolved_attributes.ctp:48
-#: View/Events/resolved_misp_format.ctp:90;260
-#: View/Events/show_i_o_c_results.ctp:12
-#: View/Feeds/freetext_index.ctp:32
-#: View/Feeds/search_caches.ctp:41
-#: View/Objects/revise_object.ctp:57
-#: 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 ""
@@ -7732,10 +10361,6 @@ msgstr ""
 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
@@ -7758,33 +10383,12 @@ msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
 #: View/ObjectReferences/ajax/add.ctp:86
-#: View/Objects/revise_object.ctp:55
+#: View/Objects/revise_object.ctp:62
 #: 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/resolved_misp_format.ctp:89;259
-#: View/Events/show_i_o_c_results.ctp:11
-#: View/Feeds/freetext_index.ctp:31
-#: View/Objects/add.ctp:101
-#: View/Objects/group_attributes_into_object.ctp:57
-#: View/Objects/propose_objects_from_attributes.ctp:16
-#: View/Objects/revise_object.ctp:56
-#: 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
@@ -7907,20 +10511,6 @@ msgstr ""
 msgid "Event Blacklists"
 msgstr ""
 
-#: View/EventBlacklists/index.ctp:35
-#: View/Events/index.ctp:94
-#: View/Feeds/preview_index.ctp:25
-#: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
-#: View/ObjectTemplates/index.ctp:47
-#: View/Organisations/index.ctp:75
-#: View/Servers/preview_index.ctp:64
-#: View/Tags/index.ctp:56
-#: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:61
-msgid "Filter"
-msgstr ""
-
 #: View/EventBlacklists/index.ctp:51
 #: View/Events/resolved_misp_format.ctp:39
 msgid "Event UUID"
@@ -7938,6 +10528,42 @@ msgstr ""
 msgid "Are you sure you want to delete from the blacklist the selected events?"
 msgstr ""
 
+#: View/EventDelegations/index.ctp:30
+msgid "Pending"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:35
+msgid "Issued"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:56
+msgid "Requester"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:63
+#: View/Pages/doc/administration.ctp:134
+msgid "Recipient"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:82
+#: View/Events/automation.ctp:279;286
+#: 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/EventDelegations/index.ctp:86
+msgid "Delegation index"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:87
+#: View/Posts/add.ctp:33
+msgid ""
+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 ""
@@ -8051,35 +10677,29 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/Events/add.ctp:45
-#: View/Events/edit.ctp:36
-msgid "Threat Level "
-msgstr "위협 레벨 "
+#: View/Events/add.ctp:39
+#: View/Events/view.ctp:148
+#: 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/add.ctp:50
-#: View/Events/edit.ctp:40
-msgid "Analysis "
-msgstr "분석 "
-
-#: View/Events/add.ctp:54
-#: View/Events/edit.ctp:45
-#: View/ShadowAttributes/index.ctp:52
+#: View/Events/add.ctp:49
+#: View/ShadowAttributes/index.ctp:59
 msgid "Event Info"
 msgstr "이벤트 정보"
 
-#: View/Events/add.ctp:58
-#: View/Events/edit.ctp:49
+#: View/Events/add.ctp:52
 msgid "Quick Event Description or Tracking Info"
 msgstr ""
 
-#: View/Events/add.ctp:61
-#: View/Events/edit.ctp:52
-msgid "Extends event"
+#: View/Events/add.ctp:57
+msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr ""
 
-#: View/Events/add.ctp:65
-#: View/Events/edit.ctp:55
-msgid "Event UUID or ID. Leave blank if not applicable."
+#: View/Events/add.ctp:58
+msgid "Extends Event"
 msgstr ""
 
 #: View/Events/add_i_o_c.ctp:4
@@ -8111,10 +10731,6 @@ msgstr ""
 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 "세부사항"
@@ -8143,7 +10759,7 @@ msgid "Automation functionality is designed to automatically feed other tools an
 msgstr ""
 
 #: View/Events/automation.ctp:5
-msgid "You can use the <a href=\"servers/rest\">ReST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
+msgid "You can use the <a href=\"/servers/rest\">REST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
 msgstr ""
 
 #: View/Events/automation.ctp:6
@@ -8154,477 +10770,475 @@ msgstr ""
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 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."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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/automation.ctp:27
 #: 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
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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
+#: View/Events/automation.ctp:32
 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
+#: View/Events/automation.ctp:33
 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/automation.ctp:34
 #: 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/automation.ctp:35
 #: 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/automation.ctp:36
 #: 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/automation.ctp:37
 #: 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/automation.ctp:38
 #: 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/automation.ctp:39
 #: 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;150
+#: View/Events/automation.ctp:40;160
 #: 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;151
+#: View/Events/automation.ctp:41;161
 #: 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/automation.ctp:42
 #: 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/automation.ctp:43
 #: 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/automation.ctp:44
 #: 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/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:46
 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/automation.ctp:47
 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/automation.ctp:48
 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/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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/automation.ctp:52
 #: 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/automation.ctp:53
 #: 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
+#: View/Events/automation.ctp:54
 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
+#: View/Events/automation.ctp:55
 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
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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:81
+#: View/Events/automation.ctp:91
 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:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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:97
+#: View/Events/automation.ctp:107
 #: 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:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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:118
+#: View/Events/automation.ctp:128
 #: 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:136
+#: View/Events/automation.ctp:146
 #: 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:138
+#: View/Events/automation.ctp:148
 #: 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:145
+#: View/Events/automation.ctp:155
 #: 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:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:152
+#: View/Events/automation.ctp:162
 #: 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:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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:156
+#: View/Events/automation.ctp:166
 #: 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:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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:172
+#: View/Events/automation.ctp:182
 #: 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:173
+#: View/Events/automation.ctp:183
 #: 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:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:187
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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:191
+#: View/Events/automation.ctp:201
 #: 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:192
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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:205
+#: View/Events/automation.ctp:215
 #: 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:206
+#: View/Events/automation.ctp:216
 #: 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:207
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:208
+#: View/Events/automation.ctp:218
 #: 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:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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:214
+#: View/Events/automation.ctp:224
 #: 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:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: 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:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:68
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -8632,208 +11246,200 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
-#: View/Servers/rest.ctp:160
+#: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:269;276
-#: 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:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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:291
+#: View/Events/automation.ctp:301
 #: 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:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:309
+#: View/Events/automation.ctp:319
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:310
+#: View/Events/automation.ctp:320
 #: 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:311
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:324
 #: 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:315
+#: View/Events/automation.ctp:325
 #: 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:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 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:322
+#: View/Events/automation.ctp:332
 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:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -9029,7 +11635,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -9075,24 +11681,24 @@ msgstr ""
 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
+#: View/Events/import_module.ctp:99
 msgid "Input File"
 msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 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
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr ""
 
@@ -9126,6 +11732,11 @@ msgstr ""
 msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
+#: View/Events/legacy_automation.ctp:7
+msgid "Your current key is: <code>%s</code>.\n"
+"    You can %s this key."
+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 ""
@@ -9443,7 +12054,7 @@ msgid "You can also use search for IP addresses using CIDR. Make sure that you u
 msgstr ""
 
 #: View/Events/merge.ctp:4
-msgid "Merge events"
+msgid "Merge events - WARNING: this feature is very outdated and should not be used anymore."
 msgstr ""
 
 #: View/Events/merge.ctp:9
@@ -9508,22 +12119,11 @@ msgid "Similar Attributes"
 msgstr ""
 
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/resolved_misp_format.ctp:95;265
-#: View/Objects/add.ctp:104
+#: View/Events/resolved_misp_format.ctp:96;291
+#: View/Objects/add.ctp:117
 msgid "Disable Correlation"
 msgstr ""
 
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/resolved_misp_format.ctp:96;266
-#: View/ObjectReferences/ajax/add.ctp:30
-#: View/Objects/add.ctp:67;106
-#: View/Objects/group_attributes_into_object.ctp:30
-#: View/Objects/revise_object.ctp:49;60
-#: 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:195
 msgid "Remove resolved attribute"
 msgstr ""
@@ -9559,15 +12159,19 @@ msgstr ""
 msgid "#Resolved Attributes"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:107
+#: View/Events/resolved_misp_format.ctp:89;284
+msgid "Import"
+msgstr ""
+
+#: View/Events/resolved_misp_format.ctp:111
 msgid "ID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:112
+#: View/Events/resolved_misp_format.ctp:127
 msgid "UUID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:113
+#: View/Events/resolved_misp_format.ctp:128
 msgid "Meta Category: "
 msgstr ""
 
@@ -9585,7 +12189,6 @@ msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -9640,35 +12243,24 @@ msgstr ""
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:86
-msgid "Creator org"
-msgstr ""
-
-#: View/Events/view.ctp:147
-#: 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:153
+#: View/Events/view.ctp:154
 #: 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:177
+#: View/Events/view.ctp:178
 msgid "Toggle advanced sharing network viewer"
 msgstr ""
 
-#: View/Events/view.ctp:183
+#: View/Events/view.ctp:184
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr ""
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:188
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
@@ -9676,156 +12268,161 @@ msgstr ""
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:193
+#: View/Events/view.ctp:194
 msgid " (%s Objects)"
 msgstr ""
 
-#: View/Events/view.ctp:193
+#: View/Events/view.ctp:194
 msgid " (%s Object)"
 msgstr ""
 
-#: View/Events/view.ctp:195
+#: View/Events/view.ctp:196
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:199
+#: View/Events/view.ctp:200
 msgid "First recorded change"
 msgstr ""
 
-#: View/Events/view.ctp:203
+#: View/Events/view.ctp:204
 msgid "Last change"
 msgstr ""
 
-#: View/Events/view.ctp:207
+#: View/Events/view.ctp:208
 msgid "Modification map"
 msgstr ""
 
-#: View/Events/view.ctp:213
+#: View/Events/view.ctp:214
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:232
+#: View/Events/view.ctp:233
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:239
+#: View/Events/view.ctp:240
 msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:239
+#: View/Events/view.ctp:240
 msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:270
+#: View/Events/view.ctp:271
 msgid "%s has requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:276
+#: View/Events/view.ctp:277
 msgid "%s has requested that you take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:282
+#: View/Events/view.ctp:283
 msgid "You have requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:287
+#: View/Events/view.ctp:288
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:299
+#: View/Events/view.ctp:300
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:309
-#: View/Users/admin_view.ctp:86
+#: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
+#: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:309
-#: View/Feeds/view.ctp:62
-#: View/Noticelists/index.ctp:63
-#: View/ObjectTemplates/index.ctp:35
-#: View/Taxonomies/view.ctp:24
-msgid "Enabled"
-msgstr ""
-
-#: View/Events/view.ctp:318
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "enable"
 msgstr ""
 
-#: View/Events/view.ctp:318
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:329
+#: View/Events/view.ctp:330
 msgid "Extended view"
 msgstr ""
 
-#: View/Events/view.ctp:346
+#: View/Events/view.ctp:337
+msgid "Warning: Taxonomy inconsistencies"
+msgstr ""
+
+#: View/Events/view.ctp:382
 #: View/Feeds/preview_event.ctp:84
 #: View/Servers/preview_event.ctp:112
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:406;441
+#: View/Events/view.ctp:443;478
 msgid "This event has "
 msgstr ""
 
-#: View/Events/view.ctp:407;442
+#: View/Events/view.ctp:444;479
 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:450
+#: View/Events/view.ctp:487
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:466
+#: View/Events/view.ctp:503
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:466
+#: View/Events/view.ctp:503
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:469
+#: View/Events/view.ctp:506
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:469
+#: View/Events/view.ctp:506
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:472
+#: View/Events/view.ctp:509
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:475
+#: View/Events/view.ctp:512
+msgid "Toggle Event timeline"
+msgstr ""
+
+#: View/Events/view.ctp:512
+msgid "Event timeline"
+msgstr ""
+
+#: View/Events/view.ctp:515
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:475
+#: View/Events/view.ctp:515
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:478
+#: View/Events/view.ctp:518
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:478
+#: View/Events/view.ctp:518
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:481
+#: View/Events/view.ctp:521
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:484
+#: View/Events/view.ctp:524
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:484
+#: View/Events/view.ctp:524
 msgid "Discussion"
 msgstr ""
 
@@ -9886,11 +12483,15 @@ msgid "Are you sure you wish to unpublish the event?"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:20
+msgid "Are you sure you wish publish and synchronise all sightings attached to this event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:22
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
-#: View/Feeds/index.ctp:105
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -9924,78 +12525,81 @@ msgstr ""
 msgid "Add MISP Feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:5
-msgid "Add a new MISP feed source."
-msgstr ""
-
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
-#: View/Feeds/view.ctp:63
-msgid "Caching enabled"
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
 msgstr ""
 
 #: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+msgid "Add a new MISP feed source."
+msgstr ""
+
+#: View/Feeds/add.ctp:14
+#: View/Feeds/view.ctp:64
+msgid "Caching enabled"
+msgstr ""
+
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr ""
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:15
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr ""
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
-#: View/Feeds/view.ctp:30
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
+#: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:20
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr ""
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:60
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr ""
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:69
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:73
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr ""
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:32
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr ""
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:36
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr ""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:40
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr ""
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:44
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr ""
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:48
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -10004,129 +12608,128 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:52
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr ""
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:82
-msgid "Target Event"
-msgstr ""
-
 #: View/Feeds/add.ctp:94
-#: View/Feeds/edit.ctp:92
-msgid "Target Event ID"
-msgstr ""
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:94
-msgid "Leave blank unless you want to reuse an existing event."
+#: View/Feeds/edit.ctp:98
+msgid "Creator organisation"
 msgstr ""
 
 #: View/Feeds/add.ctp:104
-#: View/Feeds/edit.ctp:102
-msgid "Value field(s) in the CSV"
+#: View/Feeds/edit.ctp:108
+msgid "Target Event"
 msgstr ""
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:103
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr ""
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:105
-msgid "2,3,4 (column position separated by commas)"
-msgstr ""
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:113
-msgid "Delimiter"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
 msgstr ""
 
 #: View/Feeds/add.ctp:116
-#: View/Feeds/edit.ctp:114
-msgid "Set the default CSV delimiter (default = \",\")"
+#: View/Feeds/edit.ctp:120
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr ""
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr ""
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
 msgstr ""
 
 #: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:124
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr ""
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr ""
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
+msgid "Set the default CSV delimiter (default = \",\")"
+msgstr ""
+
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr ""
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:125
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr ""
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:135
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr ""
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 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:148
-#: View/Feeds/edit.ctp:144
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr ""
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:145
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:154
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr ""
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:155
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr ""
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:182
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr ""
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:187
-msgid "Filter rules"
-msgstr ""
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:189
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:190
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:191
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:192
-#: View/Servers/add.ctp:106
-#: View/Servers/edit.ctp:149;155
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
+#: View/Servers/add.ctp:116
+#: View/Servers/edit.ctp:155;162
 msgid "Modify"
 msgstr ""
 
@@ -10142,66 +12745,66 @@ msgstr ""
 msgid "Edit MISP Feed"
 msgstr ""
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr ""
 
-#: View/Feeds/edit.ctp:127
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr ""
 
-#: View/Feeds/edit.ctp:207
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr ""
 
-#: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:136
-#: View/Servers/edit.ctp:183
+#: View/Feeds/edit.ctp:234
+#: View/Servers/add.ctp:146
+#: View/Servers/edit.ctp:190
 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:209
-#: View/Servers/add.ctp:137
-#: View/Servers/edit.ctp:182
+#: View/Feeds/edit.ctp:235
+#: View/Servers/add.ctp:147
+#: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
-#: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:138
-#: View/Servers/edit.ctp:184
+#: View/Feeds/edit.ctp:236
+#: View/Servers/add.ctp:148
+#: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:139
-#: View/Servers/edit.ctp:185
+#: View/Feeds/edit.ctp:237
+#: View/Servers/add.ctp:149
+#: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
-#: View/Feeds/edit.ctp:212
-#: View/Servers/add.ctp:140
-#: View/Servers/edit.ctp:186
+#: View/Feeds/edit.ctp:238
+#: View/Servers/add.ctp:150
+#: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:187
+#: View/Feeds/edit.ctp:239
+#: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:188
+#: View/Feeds/edit.ctp:240
+#: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:215
-#: View/Servers/edit.ctp:189
+#: View/Feeds/edit.ctp:241
+#: View/Servers/edit.ctp:196
 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:216
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:191
+#: View/Feeds/edit.ctp:242
+#: View/Servers/add.ctp:154
+#: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -10225,147 +12828,132 @@ msgstr ""
 msgid "Paste a MISP feed metadata JSON below to add feeds."
 msgstr ""
 
-#: View/Feeds/import_feeds.ctp:10
-#: View/Servers/import.ctp:10
-#: View/TagCollections/import.ctp:10
-msgid "JSON"
-msgstr ""
-
 #: View/Feeds/import_feeds.ctp:11
 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:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr ""
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr ""
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr ""
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr ""
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: 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/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr ""
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:54
-#: View/Servers/index.ctp:75;76
-msgid "Rules"
+msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
-msgstr "오류: 올바르지 않은 이벤트!"
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
+msgstr ""
 
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
+#: View/Feeds/index.ctp:196
+msgid "Visible"
 msgstr ""
 
 #: View/Feeds/index.ctp:211
-msgid "New fixed event"
+msgid "Feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:95
-msgid "Age: "
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
 msgstr ""
 
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:103
-msgid "Not cached"
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr ""
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:283
-msgid "Are you sure you want to permanently remove the feed (%s)?"
+#: View/Feeds/index.ctp:294
+msgid "Are you sure you want to permanently remove the feed?"
 msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -10386,20 +12974,6 @@ msgstr ""
 msgid "Fetch the event"
 msgstr ""
 
-#: View/Feeds/search_caches.ctp:35
-#: View/Feeds/view.ctp:3
-#: 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/Feeds/search_caches.ctp:53
 msgid "Feed URL"
 msgstr ""
@@ -10420,44 +12994,51 @@ msgstr ""
 msgid "Source format"
 msgstr ""
 
-#: View/Feeds/view.ctp:57
+#: View/Feeds/view.ctp:58
 msgid "Settings"
 msgstr ""
 
-#: View/Feeds/view.ctp:70
+#: View/Feeds/view.ctp:71
 msgid "Coverage by other feeds"
 msgstr ""
 
-#: View/Feeds/view.ctp:79
+#: View/Feeds/view.ctp:80
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr ""
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
+#: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr ""
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 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
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr ""
 
@@ -10465,33 +13046,30 @@ msgstr ""
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:23
-#: 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/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -10500,22 +13078,16 @@ msgstr ""
 msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
 msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
@@ -10526,6 +13098,27 @@ msgstr ""
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Inbox/index.ctp:31
+#: 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/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr ""
@@ -10546,12 +13139,6 @@ msgstr ""
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr ""
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr ""
@@ -10589,11 +13176,9 @@ msgstr ""
 msgid "Job type"
 msgstr ""
 
-#: View/Jobs/index.ctp:104
-#: View/OrgBlacklists/add.ctp:17
-#: View/OrgBlacklists/index.ctp:22
-#: View/Organisations/view.ctp:6
-msgid "Organisation name"
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
 msgstr ""
 
 #: View/Jobs/index.ctp:106
@@ -10670,17 +13255,14 @@ msgstr ""
 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:67
 #: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
+#: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -10688,13 +13270,6 @@ msgstr ""
 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"
@@ -10745,10 +13320,6 @@ msgstr ""
 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"
@@ -10904,87 +13475,87 @@ msgstr ""
 msgid "Meta category"
 msgstr ""
 
-#: View/Objects/add.ctp:85
+#: View/Objects/add.ctp:98
 msgid "Warning, issues found with the template"
 msgstr ""
 
-#: View/Objects/add.ctp:98
+#: View/Objects/add.ctp:111
 msgid "Save"
 msgstr ""
 
-#: View/Objects/add.ctp:99
+#: View/Objects/add.ctp:112
 msgid "Name :: type"
 msgstr ""
 
-#: View/Objects/add.ctp:156;167
+#: View/Objects/add.ctp:169;180
 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:171
+#: View/Objects/add.ctp:184
 msgid "Back"
 msgstr ""
 
-#: View/Objects/add.ctp:183
+#: View/Objects/add.ctp:196
 msgid "Pre-update object's template"
 msgstr ""
 
-#: View/Objects/add.ctp:189
+#: View/Objects/add.ctp:202
 #: View/Objects/group_attributes_into_object.ctp:54
 #: View/Organisations/ajax/merge.ctp:56;63
 #: View/Pages/doc/using_the_system.ctp:163;203
 msgid "ID"
 msgstr ""
 
-#: View/Objects/add.ctp:205
+#: View/Objects/add.ctp:218
 #: View/Objects/revise_object.ctp:45
 msgid "Template version"
 msgstr ""
 
-#: View/Objects/add.ctp:212;272
+#: View/Objects/add.ctp:225;285
 msgid "Can not be merged automatically"
 msgstr ""
 
-#: View/Objects/add.ctp:217;277
+#: View/Objects/add.ctp:230;290
 msgid "This attribute type is missing from the new template. It will be lost if not taken care of right now."
 msgstr ""
 
-#: View/Objects/add.ctp:239
+#: View/Objects/add.ctp:252
 msgid "Insert"
 msgstr ""
 
-#: View/Objects/add.ctp:242
+#: View/Objects/add.ctp:255
 msgid "No valid type. This attribute will be lost."
 msgstr ""
 
-#: View/Objects/add.ctp:249
+#: View/Objects/add.ctp:262
 msgid "This attribute can be merged automatically. Injection in the template done."
 msgstr ""
 
-#: View/Objects/add.ctp:264
+#: View/Objects/add.ctp:277
 msgid "Attributes to merge"
 msgstr ""
 
-#: View/Objects/add.ctp:265
+#: View/Objects/add.ctp:278
 msgid "Contextual information and actions"
 msgstr ""
 
-#: View/Objects/add.ctp:275
+#: View/Objects/add.ctp:288
 msgid "Overwrite the current attribute value with this one"
 msgstr ""
 
-#: View/Objects/add.ctp:285
+#: View/Objects/add.ctp:298
 msgid "Original value: "
 msgstr ""
 
-#: View/Objects/add.ctp:290
+#: View/Objects/add.ctp:303
 msgid "Can be merged automatically. Injection done."
 msgstr ""
 
-#: View/Objects/add.ctp:293
-msgid "An instance of this attribute already exists. However, as multiple instanciation is allowed by this template, the two attributes will be keept."
+#: View/Objects/add.ctp:306
+msgid "An instance of this attribute already exists. However, as multiple instances are allowed by this template, the two attributes will be kept."
 msgstr ""
 
-#: View/Objects/add.ctp:321;332
+#: View/Objects/add.ctp:335;346
 msgid "Enter value manually"
 msgstr ""
 
@@ -11100,35 +13671,35 @@ msgstr ""
 msgid "Make sure that the below Object reflects your expectation before submiting it."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:59
+#: View/Objects/revise_object.ctp:66
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:103
+#: View/Objects/revise_object.ctp:110
 msgid "Create new object"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:104
+#: View/Objects/revise_object.ctp:111
 msgid "Back to review"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:107
+#: View/Objects/revise_object.ctp:114
 msgid "This event contains similar objects."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:108
+#: View/Objects/revise_object.ctp:115
 msgid "Instead of creating a new object, would you like to merge your new object into one of the following?"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:125
+#: View/Objects/revise_object.ctp:132
 msgid "All similar objects not displayed..."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:126
+#: View/Objects/revise_object.ctp:133
 msgid "%s Similar objects found. %s not displayed"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:163
+#: View/Objects/revise_object.ctp:170
 msgid "This attribute will NOT be merged into the similar object as it is conflicting with another attribute."
 msgstr ""
 
@@ -11144,6 +13715,10 @@ msgstr ""
 msgid "Are you sure you want to %sdelete Object #%s? %s"
 msgstr ""
 
+#: View/Objects/ajax/quickAddAttributeForm.ctp:15
+msgid "Add Object attribute"
+msgstr ""
+
 #: View/OrgBlacklists/add.ctp:4
 msgid "Add Organisation Blacklist Entries"
 msgstr ""
@@ -11192,73 +13767,68 @@ msgstr ""
 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
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
 msgid "Paste UUID or click generate"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:25
-#: View/Organisations/admin_edit.ctp:24
+#: View/Organisations/admin_add.ctp:24
+#: View/Organisations/admin_edit.ctp:23
 msgid "Generate UUID"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:25
-#: View/Organisations/admin_edit.ctp:24
+#: View/Organisations/admin_add.ctp:24
+#: View/Organisations/admin_edit.ctp:23
 msgid "Generate a new UUID for the organisation"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:27
-#: View/Organisations/admin_edit.ctp:38
+#: View/Organisations/admin_add.ctp:26
+#: View/Organisations/admin_edit.ctp:37
 msgid "A brief description of the organisation"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:27
-#: View/Organisations/admin_edit.ctp:38
+#: View/Organisations/admin_add.ctp:26
+#: View/Organisations/admin_edit.ctp:37
 msgid "A description of the organisation that is purely informational."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:30
-#: View/Organisations/admin_edit.ctp:41
+#: View/Organisations/admin_add.ctp:29
+#: View/Organisations/admin_edit.ctp:40
 msgid "Bind user accounts to domains (line separated)"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:30
-#: View/Organisations/admin_edit.ctp:41
+#: View/Organisations/admin_add.ctp:29
+#: View/Organisations/admin_edit.ctp:40
 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
+#: View/Organisations/admin_add.ctp:32
+#: View/Organisations/admin_edit.ctp:43
 msgid "The following fields are all optional."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:38
-#: View/Organisations/admin_edit.ctp:49
+#: View/Organisations/admin_add.ctp:37
+#: View/Organisations/admin_edit.ctp:48
 msgid "Logo (48x48 png)"
 msgstr ""
 
+#: View/Organisations/admin_add.ctp:43
+#: View/Organisations/admin_edit.ctp:54
+msgid "For example \"financial\"."
+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
+#: View/Organisations/admin_add.ctp:44
+#: View/Organisations/admin_edit.ctp:55
 msgid "Freetext description of the org."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:46
-#: View/Organisations/admin_edit.ctp:57
+#: View/Organisations/admin_add.ctp:45
+#: View/Organisations/admin_edit.ctp:56
 msgid "You can add some contact details for the organisation here, if applicable."
 msgstr ""
 
@@ -11266,15 +13836,15 @@ msgstr ""
 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
+#: View/Organisations/admin_edit.ctp:29
 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
+#: View/Organisations/admin_edit.ctp:31
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/admin_edit.ctp:57
+#: View/Organisations/admin_edit.ctp:56
 msgid "Contacts"
 msgstr ""
 
@@ -11317,7 +13887,7 @@ msgstr ""
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr ""
 
@@ -11351,12 +13921,12 @@ msgid "Last modified"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:36
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr ""
 
@@ -11702,7 +14272,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
-#: View/Servers/edit.ctp:84
+#: View/Servers/edit.ctp:90
 msgid "Misc settings"
 msgstr ""
 
@@ -11898,7 +14468,7 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:76
+#: View/Users/admin_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -11909,7 +14479,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -11922,7 +14492,7 @@ 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr ""
 
@@ -11975,6 +14545,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -12005,7 +14576,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:84
+#: View/Users/admin_view.ctp:95
 msgid "Newsread"
 msgstr ""
 
@@ -12077,10 +14648,6 @@ msgstr ""
 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 ""
@@ -13293,10 +15860,6 @@ msgstr ""
 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 ""
@@ -14346,10 +16909,6 @@ msgstr ""
 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 ""
@@ -14439,7 +16998,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:129
+#: View/Servers/index.ctp:175
 msgid "Push all"
 msgstr ""
 
@@ -14448,7 +17007,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:126
+#: View/Servers/index.ctp:172
 msgid "Pull all"
 msgstr ""
 
@@ -14566,11 +17125,6 @@ msgstr ""
 msgid "In response to"
 msgstr ""
 
-#: View/Posts/add.ctp:33
-msgid ""
-msgstr ""
-""
-
 #: View/Posts/edit.ctp:12
 msgid "Contents"
 msgstr ""
@@ -14609,6 +17163,16 @@ msgstr ""
 msgid "Maximum execution time"
 msgstr ""
 
+#: View/Roles/admin_add.ctp:26
+#: View/Roles/admin_edit.ctp:26
+msgid "Enforce search rate limit"
+msgstr ""
+
+#: View/Roles/admin_add.ctp:32
+#: View/Roles/admin_edit.ctp:32
+msgid "# of searches / 15 min"
+msgstr ""
+
 #: View/Roles/admin_index.ctp:24
 msgid "Restricted to site admins"
 msgstr ""
@@ -14617,11 +17181,15 @@ msgstr ""
 msgid "Max execution time"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:40
+#: View/Roles/admin_index.ctp:35
+msgid "Searches / 15 mins"
+msgstr ""
+
+#: View/Roles/admin_index.ctp:41
 msgid "Default role"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:52
+#: View/Roles/admin_index.ctp:53
 #: View/Roles/index.ctp:47
 msgid "%s permission %s"
 msgstr ""
@@ -14647,6 +17215,7 @@ msgid "Permission level"
 msgstr ""
 
 #: View/Servers/add.ctp:4
+#: View/Servers/edit.ctp:5
 msgid "Add Server"
 msgstr ""
 
@@ -14665,17 +17234,17 @@ msgid "You can set this instance up as an internal instance by checking the chec
 msgstr ""
 
 #: View/Servers/add.ctp:20
-#: View/Servers/edit.ctp:20
+#: View/Servers/edit.ctp:17
 msgid "Internal instance"
 msgstr ""
 
 #: View/Servers/add.ctp:30
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:25
 msgid "Instance ownership and credentials"
 msgstr ""
 
 #: View/Servers/add.ctp:31
-#: View/Servers/edit.ctp:32
+#: View/Servers/edit.ctp:26
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
@@ -14684,86 +17253,86 @@ msgid "Remote Sync Organisation Type"
 msgstr ""
 
 #: View/Servers/add.ctp:42
-#: View/Servers/edit.ctp:43
+#: View/Servers/edit.ctp:40
 msgid "External Organisation"
 msgstr ""
 
-#: View/Servers/add.ctp:48
+#: View/Servers/add.ctp:57
 msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:54
-#: View/Servers/edit.ctp:65
+#: View/Servers/add.ctp:63
+#: View/Servers/edit.ctp:70
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:58
-#: View/Servers/edit.ctp:69
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:74
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:67
-#: View/Servers/edit.ctp:76
+#: View/Servers/add.ctp:76
+#: View/Servers/edit.ctp:81
 msgid "Ask the owner of the remote instance for a sync account on their instance, log into their MISP using the sync user's credentials and retrieve your API key by navigating to Global actions -> My profile. This key is used to authenticate with the remote instance."
 msgstr ""
 
-#: View/Servers/add.ctp:71
-#: View/Servers/edit.ctp:80
+#: View/Servers/add.ctp:80
+#: View/Servers/edit.ctp:85
 msgid "Enabled synchronisation methods"
 msgstr ""
 
-#: View/Servers/add.ctp:90
+#: View/Servers/add.ctp:100
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:96
+#: View/Servers/add.ctp:106
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:101
-#: View/Servers/edit.ctp:144
+#: View/Servers/add.ctp:111
+#: View/Servers/edit.ctp:150
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:102;108
-#: View/Servers/edit.ctp:145;151
+#: View/Servers/add.ctp:112;118
+#: View/Servers/edit.ctp:151;157
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:103;109
-#: View/Servers/edit.ctp:146;152
+#: View/Servers/add.ctp:113;119
+#: View/Servers/edit.ctp:152;158
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:104;110
-#: View/Servers/edit.ctp:147;153
+#: View/Servers/add.ctp:114;120
+#: View/Servers/edit.ctp:153;159
 msgid "Events with the following organisations allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:105;111
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:115;121
+#: View/Servers/edit.ctp:154;160
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:107
-#: View/Servers/edit.ctp:150
+#: View/Servers/add.ctp:117
+#: View/Servers/edit.ctp:156
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:135
-#: View/Servers/edit.ctp:181
+#: View/Servers/add.ctp:145
+#: View/Servers/edit.ctp:188
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:141
+#: View/Servers/add.ctp:151
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:142
+#: View/Servers/add.ctp:152
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:143
+#: View/Servers/add.ctp:153
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
@@ -14771,43 +17340,47 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: View/Servers/edit.ctp:17
+#: View/Servers/edit.ctp:15
 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
+#: View/Servers/edit.ctp:31
 msgid "Organisation Type"
 msgstr ""
 
-#: View/Servers/edit.ctp:54
+#: View/Servers/edit.ctp:55
 msgid "Local Organisation"
 msgstr ""
 
-#: View/Servers/edit.ctp:77
+#: View/Servers/edit.ctp:82
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:101
+#: View/Servers/edit.ctp:107
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:109;131
+#: View/Servers/edit.ctp:115;137
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:110;132
+#: View/Servers/edit.ctp:116;138
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:123
+#: View/Servers/edit.ctp:129
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:161
+msgid "Additional parameters: "
+msgstr ""
+
+#: View/Servers/edit.ctp:197
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:247;251
+#: View/Servers/edit.ctp:263;267
 msgid "Not set."
 msgstr ""
 
@@ -14840,42 +17413,75 @@ msgid "Servers"
 msgstr ""
 
 #: View/Servers/index.ctp:23
+msgid "Prio"
+msgstr ""
+
+#: View/Servers/index.ctp:24
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:31
+#: View/Servers/index.ctp:25
+msgid "Sync user"
+msgstr ""
+
+#: View/Servers/index.ctp:26
+msgid "Reset API key"
+msgstr ""
+
+#: View/Servers/index.ctp:35
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:70
+msgid "URL params"
+msgstr ""
+
+#: View/Servers/index.ctp:85;86
+msgid "Move server priority up"
+msgstr ""
+
+#: View/Servers/index.ctp:85;86
+msgid "Move server priority down"
+msgstr ""
+
+#: View/Servers/index.ctp:102
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:102
+#: View/Sightingdb/index.ctp:35
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:74
+#: View/Servers/index.ctp:103
+msgid "View the sync user of the remote instance"
+msgstr ""
+
+#: View/Servers/index.ctp:111;112
+msgid "Remotely reset API key"
+msgstr ""
+
+#: View/Servers/index.ctp:119
 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:74
+#: View/Servers/index.ctp:119
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:123
+#: View/Servers/index.ctp:169
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:125
+#: View/Servers/index.ctp:171
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
-#: View/Servers/index.ctp:125
+#: View/Servers/index.ctp:171
 msgid "Pull updates"
 msgstr ""
 
-#: View/Servers/index.ctp:132
+#: View/Servers/index.ctp:178
 msgid "Cache instance"
 msgstr ""
 
@@ -14891,19 +17497,19 @@ msgstr ""
 msgid "Show Update Progress Page"
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:37
+#: View/Servers/ondemand_action.ctp:38
 msgid "Running this script may take a very long time depending of the size of your database. It is adviced that you <b>back your database up</b> before running it."
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:43
+#: View/Servers/ondemand_action.ctp:44
 msgid "Running this script will make this instance unusable for all users (not site-admin) during the time of upgrade."
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:53
+#: View/Servers/ondemand_action.ctp:54
 msgid "Action: "
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:60
+#: View/Servers/ondemand_action.ctp:61
 msgid "This action has been done and cannot be run again."
 msgstr ""
 
@@ -14955,6 +17561,14 @@ msgstr ""
 msgid "No proposals pulled"
 msgstr ""
 
+#: View/Servers/pull.ctp:35
+msgid "Sightings pulled"
+msgstr ""
+
+#: View/Servers/pull.ctp:38
+msgid "No sightings pulled"
+msgstr ""
+
 #: View/Servers/push.ctp:2
 msgid "Failed pushes"
 msgstr ""
@@ -14975,60 +17589,56 @@ msgstr ""
 msgid "HTTP method to use"
 msgstr ""
 
-#: View/Servers/rest.ctp:61
+#: View/Servers/rest.ctp:62
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:68
+#: View/Servers/rest.ctp:69
 msgid "Use full path - disclose my apikey"
 msgstr ""
 
-#: View/Servers/rest.ctp:72
+#: View/Servers/rest.ctp:73
 msgid "Bookmark query"
 msgstr ""
 
-#: View/Servers/rest.ctp:81
+#: View/Servers/rest.ctp:82
 msgid "Bookmark name"
 msgstr ""
 
-#: View/Servers/rest.ctp:89
+#: View/Servers/rest.ctp:90
 msgid "Show result"
 msgstr ""
 
-#: View/Servers/rest.ctp:94
+#: View/Servers/rest.ctp:95
 msgid "Skip SSL validation"
 msgstr ""
 
-#: View/Servers/rest.ctp:101
+#: View/Servers/rest.ctp:102
 msgid "HTTP headers"
 msgstr ""
 
-#: View/Servers/rest.ctp:114
+#: View/Servers/rest.ctp:115
 msgid " Inject"
 msgstr ""
 
-#: View/Servers/rest.ctp:115
+#: View/Servers/rest.ctp:116
 msgid " Show rules"
 msgstr ""
 
-#: View/Servers/rest.ctp:124
+#: View/Servers/rest.ctp:125
 msgid "HTTP body"
 msgstr ""
 
-#: View/Servers/rest.ctp:132
+#: View/Servers/rest.ctp:133
 msgid "Run query"
 msgstr ""
 
-#: View/Servers/rest.ctp:161
+#: View/Servers/rest.ctp:162
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:162
-msgid "Request duration"
-msgstr ""
-
 #: View/Servers/rest.ctp:163
-msgid "Headers"
+msgid "Request duration"
 msgstr ""
 
 #: View/Servers/server_settings.ctp:3
@@ -15039,26 +17649,66 @@ msgstr ""
 msgid "To edit a setting, simply double click it."
 msgstr ""
 
-#: View/Servers/update_progress.ctp:18
-msgid "Database Update progress"
+#: View/Servers/update_progress.ctp:34
+msgid "Updates are locked due to an ongoing update process. Release lock only if you know what you are doing."
 msgstr ""
 
-#: View/Servers/update_progress.ctp:85
+#: View/Servers/update_progress.ctp:35
+msgid "automatically unlock in %smin %ssec"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:40
+msgid "Release update lock"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:54
+msgid "Complete update progression"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:55
+msgid "%s remaining"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:62
+msgid "Database Update progress for update %s"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:133
 msgid "Update "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:88
+#: View/Servers/update_progress.ctp:136
 msgid "Started @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:92
+#: View/Servers/update_progress.ctp:140
 msgid "Elapsed Time @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:144
+#: View/Servers/update_progress.ctp:192
 msgid "No update in progress"
 msgstr ""
 
+#: View/Servers/update_progress.ctp:213
+msgid "Follow updates"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:13
+msgid "Total"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:27
+msgid "View details on the usage of %s on the %s controller"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:39
+msgid "View user ID "
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:40
+msgid "User #%s"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:2
 msgid "Select instances to add"
 msgstr ""
@@ -15136,9 +17786,9 @@ msgstr ""
 msgid "Add Proposal"
 msgstr ""
 
-#: View/ShadowAttributes/add.ctp:52;65
+#: View/ShadowAttributes/add.ctp:63;76
 #: View/ShadowAttributes/add_attachment.ctp:35
-#: View/ShadowAttributes/edit.ctp:51
+#: View/ShadowAttributes/edit.ctp:62
 msgid "Propose"
 msgstr ""
 
@@ -15154,23 +17804,23 @@ msgstr ""
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:43
+#: View/ShadowAttributes/index.ctp:50
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:49
+#: View/ShadowAttributes/index.ctp:56
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:55
+#: View/ShadowAttributes/index.ctp:62
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:81
+#: View/ShadowAttributes/index.ctp:91
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:83
+#: View/ShadowAttributes/index.ctp:93
 msgid "New Attribute"
 msgstr ""
 
@@ -15240,7 +17890,7 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:53
 #: View/SharingGroups/edit.ctp:53
-#: View/SharingGroups/index.ctp:46
+#: View/SharingGroups/index.ctp:47
 msgid "Releasable to"
 msgstr ""
 
@@ -15315,13 +17965,6 @@ msgstr ""
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:93
-#: View/SharingGroups/edit.ctp:101
-#: View/SharingGroups/view.ctp:69
-#: View/TagCollections/index.ctp:12
-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 ""
@@ -15374,20 +18017,49 @@ msgstr ""
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:80
+#: View/SharingGroups/index.ctp:82
 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"
+#: View/Sightingdb/index.ctp:41
+msgid "Quick Search"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:61
+msgid "Host"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:66
+msgid "Port"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:76
+msgid "Skip Proxy"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:82
+msgid "Skip SSL"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:92
+#: View/UserSettings/index.ctp:74
+msgid "Restricted to"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:98
+msgid "SightingDB index"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:99
+msgid "SightingDB is an alternate sighting database that MISP interconnects with. Configure connections to sighting databases below."
+msgstr ""
+
+#: View/Sightingdb/index.ctp:114
+msgid "Are you sure you want to remove the connection to this SightingDB?"
 msgstr ""
 
 #: View/Sightings/ajax/add_sighting.ctp:11
@@ -15517,6 +18189,11 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+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 ""
@@ -15541,10 +18218,6 @@ msgstr ""
 msgid "Update all"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:2
-msgid "Taxonomies"
-msgstr ""
-
 #: View/Taxonomies/index.ctp:26
 msgid "Required"
 msgstr ""
@@ -15591,10 +18264,6 @@ msgstr ""
 msgid "Unhide selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:83
-msgid "Tag"
-msgstr ""
-
 #: View/Taxonomies/view.ctp:84
 msgid "Expanded"
 msgstr ""
@@ -15793,10 +18462,6 @@ msgstr ""
 msgid "A description of the template"
 msgstr ""
 
-#: View/Templates/add.ctp:49
-msgid "Create"
-msgstr ""
-
 #: View/Templates/index.ctp:2
 msgid "Templates"
 msgstr ""
@@ -15853,6 +18518,61 @@ msgstr ""
 msgid "View Discussion"
 msgstr ""
 
+#: View/UserSettings/index.ctp:30
+msgid "Me"
+msgstr ""
+
+#: View/UserSettings/index.ctp:79
+msgid "User settings management"
+msgstr ""
+
+#: View/UserSettings/index.ctp:80
+msgid "Manage the individual user settings."
+msgstr ""
+
+#: View/UserSettings/index.ctp:97
+msgid "Are you sure you wish to delete this entry?"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr ""
@@ -15886,7 +18606,7 @@ msgstr ""
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
 #: View/Users/edit.ctp:23
-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."
+msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
 msgstr ""
 
 #: View/Users/admin_add.ctp:72
@@ -15910,12 +18630,12 @@ msgstr ""
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr ""
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr ""
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
@@ -15924,8 +18644,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
-#: View/Users/admin_view.ctp:58
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:69
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr ""
 
@@ -16028,12 +18748,66 @@ msgstr ""
 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"
+#: View/Users/admin_index.ctp:3
+msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
+msgstr ""
+
+#: View/Users/admin_index.ctp:6
+msgid "here"
+msgstr ""
+
+#: View/Users/admin_index.ctp:9;10
+msgid "Reset all sync user API keys"
+msgstr ""
+
+#: View/Users/admin_index.ctp:13
+msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
+msgstr ""
+
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
 #: View/Users/admin_quick_email.ctp:2
@@ -16048,50 +18822,49 @@ msgstr ""
 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
+#: View/Users/admin_view.ctp:47
+msgid "Customauth header"
+msgstr ""
+
+#: View/Users/admin_view.ctp:55
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:56
+#: View/Users/admin_view.ctp:67
 msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:57
-#: View/Users/view.ctp:28
+#: View/Users/admin_view.ctp:68
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr ""
 
-#: View/Users/admin_view.ctp:59
+#: View/Users/admin_view.ctp:70
 msgid "Password change"
 msgstr ""
 
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:37
+#: View/Users/admin_view.ctp:78
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:72
-#: View/Users/view.ctp:42
+#: View/Users/admin_view.ctp:83
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:79
-#: View/Users/view.ctp:49
-msgid "SMIME Public certificate"
+#: View/Users/admin_view.ctp:90
+#: View/Users/view.ctp:50
+msgid "S/MIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:108
-#: View/Users/view.ctp:64
+#: View/Users/admin_view.ctp:119
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr ""
 
@@ -16107,10 +18880,102 @@ msgstr ""
 msgid "SMIME Public certificate (PEM format)"
 msgstr ""
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr ""
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr ""
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+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"
@@ -16126,6 +18991,13 @@ msgstr ""
 msgid "Proposals active"
 msgstr ""
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr ""
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -16181,14 +19053,18 @@ msgstr ""
 msgid "A heatmap showing the usage of %s."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr ""
 
+#: View/Users/statistics_orgs.ctp:40
+msgid "Activity (1 year)"
+msgstr ""
+
 #: View/Users/statistics_sightings.ctp:6
 msgid "A toplist of the top sources for the sightings of your organisation."
 msgstr ""
@@ -16241,6 +19117,14 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -16253,19 +19137,27 @@ msgstr ""
 msgid "Choose the key that you would like to use"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:6
+#: View/Users/ajax/fetchpgpkey.ctp:4
+msgid "Do not blindly trust fetched keys and check the fingerprint from other source."
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:5
+msgid "And do not check just Key ID, but whole fingerprint."
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:10
 msgid "Key ID"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:7
+#: View/Users/ajax/fetchpgpkey.ctp:11
 msgid "Creation date"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:8
+#: View/Users/ajax/fetchpgpkey.ctp:12
 msgid "Associated E-mail addresses"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:12
+#: View/Users/ajax/fetchpgpkey.ctp:16
 msgid "Select GnuPG key"
 msgstr ""
 
@@ -16317,7 +19209,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:14;16
+#: View/Warninglists/view.ctp:14
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -16384,13 +19276,14 @@ 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/Server.php:validation for field push;validation for field pull;validation for field push_sightings
 #: 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/Dashboard.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
@@ -16410,7 +19303,14 @@ msgstr ""
 msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group, Inherit event"
 msgstr ""
 
+#: Model/Attribute.php:validation for field first_seen;validation for field last_seen
+#: Model/MispObject.php:validation for field first_seen;validation for field last_seen
+#: Model/ShadowAttribute.php:validation for field first_seen;validation for field last_seen
+msgid "Invalid ISO 8601 format"
+msgstr ""
+
 #: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
+#: Model/DecayingModelMapping.php:validation for field attribute_type;validation for field model_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
@@ -16463,7 +19363,7 @@ msgstr ""
 #: 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/Server.php:validation for field authkey;validation for field name
 #: 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
@@ -16509,6 +19409,14 @@ msgstr ""
 msgid "Please enter a valid base-url."
 msgstr ""
 
+#: Model/Server.php:validation for field name
+msgid "allowEmpty"
+msgstr ""
+
+#: Model/Server.php:validation for field name
+msgid "required"
+msgstr ""
+
 #: Model/SharingGroup.php:validation for field name
 msgid "A sharing group with this name already exists."
 msgstr ""
@@ -16517,6 +19425,22 @@ msgstr ""
 msgid "Invalid type. Valid options are: 0 (Sighting), 1 (False-positive), 2 (Expiration)."
 msgstr ""
 
+#: Model/Sightingdb.php:validation for field name
+msgid "Name not set."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field host
+msgid "Host not set."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field port
+msgid "Port needs to be numeric."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field owner
+msgid "Owner not set."
+msgstr ""
+
 #: Model/Tag.php:validation for field name
 msgid "This field is required."
 msgstr ""
@@ -16593,6 +19517,10 @@ msgstr ""
 msgid "A SID should be an integer."
 msgstr ""
 
+#: Model/UserSetting.php:validation for field json
+msgid "isValidJson"
+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/no/LC_MESSAGES/default.po b/app/Locale/no/LC_MESSAGES/default.po
index 8509c2ffa..7752f46df 100644
--- a/app/Locale/no/LC_MESSAGES/default.po
+++ b/app/Locale/no/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2020-04-24 01:14\n"
+"PO-Revision-Date: 2021-03-26 04:20\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian\n"
 "MIME-Version: 1.0\n"
@@ -9,8 +9,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: no\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: no_NO\n"
 
 #: Console/Command/AdminShell.php:72
@@ -71,7 +73,8 @@ msgid "MISP mass sync authkey reset command line tool.\n\n"
 msgstr ""
 
 #: Console/Command/AdminShell.php:536
-#: Controller/UsersController.php:1234
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
 msgid "Invalid user."
 msgstr ""
 
@@ -99,7 +102,7 @@ msgstr ""
 #: Console/Command/EventShell.php:15
 #: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1122;1606;1691;2221;2297;2301;2305;2433;2530;2585;2633;2705;2795;3128;5252;5474;5478;5487
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
 #: Model/Galaxy.php:293
 msgid "Invalid event"
@@ -126,51 +129,51 @@ msgstr "verbal modus"
 msgid "interactive mode"
 msgstr "interaktiv modus"
 
-#: Controller/AppController.php:377
+#: Controller/AppController.php:382
 msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
 msgstr ""
 
-#: Controller/AppController.php:377
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
 msgid "Update Progress"
 msgstr ""
 
-#: Controller/AppController.php:384
+#: Controller/AppController.php:389
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
 msgstr "Noe gikk galt. Din brukerkonto du er autentisert med eksisterer ikke lenger."
 
-#: Controller/AppController.php:502
+#: Controller/AppController.php:519
 msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
 msgstr ""
 
-#: Controller/AppController.php:710
-#: Controller/AttributesController.php:1876;1985;2089
-#: Controller/EventsController.php:3260
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr "Denne autentiseringsnøkkelen er ikke autorisert til brukes til eksport. Kontakt administratoren din."
 
-#: Controller/AppController.php:719
-#: Controller/AttributesController.php:2093
-#: Controller/EventsController.php:3264
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr "Du må være logget inn for å gjøre det."
 
-#: Controller/AppController.php:735
+#: Controller/AppController.php:764
 #: Controller/Component/IndexFilterComponent.php:23
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr "Enten spesifiser søkeordene i webadressen, eller POST en json med filterparametrene."
 
-#: Controller/AppController.php:873
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Ferdig. attribute_count generert fra grunnen "
 
-#: Controller/AppController.php:996
-#: Controller/AttributesController.php:2147
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
 #: Controller/ShadowAttributesController.php:1267
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "Jobb er lagt til i køen. Du kan se fremdriften hvis du navigerer til visning av aktive jobber (administrasjon -> jobber)."
 
-#: Controller/AppController.php:1178
+#: Controller/AppController.php:1211
 msgid "RestSearch is not implemented (yet) for this scope."
 msgstr ""
 
@@ -183,19 +186,19 @@ msgstr "Ingen hendelses ID satt."
 msgid "You do not have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:132;422;602;832;3127;3142
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:2092;2113;2147
+#: Controller/EventsController.php:2107;2128;2162
 #: Controller/ObjectsController.php:837
-#: Model/Attribute.php:4304;4308
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "Du har ikke tillatelse til å gjøre det."
 
-#: Controller/AttributesController.php:345;800;805;824;1032;1121;2163;2177;2210;2232;2800;2811;2817;2886;3024;3036;3040
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
 #: Controller/ObjectsController.php:641
 #: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
 #: Controller/TagsController.php:506
-#: Model/Attribute.php:4296
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "Ugyldig attributt"
 
@@ -209,7 +212,7 @@ msgid "Attribute not an attachment or malware-sample"
 msgstr "Attributt ikke et vedlegg eller en skadevare-prøve"
 
 #: Controller/AttributesController.php:419;586;892;1348
-#: Controller/EventsController.php:4414;4428;5201;5215
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "Ugyldig hendelse."
 
@@ -259,7 +262,7 @@ msgid "Invalid event id."
 msgstr "Ugyldig hendelses-ID."
 
 #: Controller/AttributesController.php:1072
-#: Controller/EventsController.php:2451
+#: Controller/EventsController.php:2466
 #: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "Ugyldig input."
@@ -284,7 +287,7 @@ msgstr "Egenskap slettet"
 msgid "Attribute was not deleted"
 msgstr "Egenskapen ble ikke slettet"
 
-#: Controller/AttributesController.php:1281;2634
+#: Controller/AttributesController.php:1281;2675
 #: Controller/ShadowAttributesController.php:853
 msgid "Invalid Attribute"
 msgstr "Ugyldig Egenskap"
@@ -305,104 +308,104 @@ msgstr "Denne metoden kan bare nås via AJAX."
 msgid "You are not authorized to edit this event."
 msgstr "Du er ikke autorisert til å redigere denne hendelsen."
 
-#: Controller/AttributesController.php:1516
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "Ingen hendelses-ID oppgitt."
 
-#: Controller/AttributesController.php:1561
-#: Controller/GalaxiesController.php:243
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "synonymer: "
 
-#: Controller/AttributesController.php:1871;1978
+#: Controller/AttributesController.php:1912;2019
 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 autorisert. Vennligst send autorisasjonsoverskriften med auth-nøkkelen din sammen med en aksepteringshoved for application/xml."
 
-#: Controller/AttributesController.php:1884
+#: Controller/AttributesController.php:1925
 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 "Enten spesifiser søkeordene i webadressen, eller POST a json array / xml (med roten elementet \"request\" og angi de riktige akseptene og innholdstypene)."
 
-#: Controller/AttributesController.php:1904
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "Du har ikke tilgang til den hendelsen."
 
-#: Controller/AttributesController.php:1967
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "Ingen treff."
 
-#: Controller/AttributesController.php:1989;1998
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Ugyldig attributt eller ingen autorisasjon for å vise den."
 
-#: Controller/AttributesController.php:2124
+#: Controller/AttributesController.php:2165
 #: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "Ferdig."
 
-#: Controller/AttributesController.php:2156;2203
+#: Controller/AttributesController.php:2197;2244
 #: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "Ugyldig felt forespurt."
 
-#: Controller/AttributesController.php:2159;2206
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "Denne funksjonen kan bare nås via AJAX."
 
-#: Controller/AttributesController.php:2241
+#: Controller/AttributesController.php:2282
 msgid "You do not have permission to do that"
 msgstr ""
 
-#: Controller/AttributesController.php:2271;2279
-#: Controller/EventsController.php:3643;3796;4999
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "Hendelse ikke funnet, eller du har ikke tillatelser til å opprette attributter"
 
-#: Controller/AttributesController.php:2300
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "Denne handlingen kan bare nås via AJAX."
 
-#: Controller/AttributesController.php:2309;2560;2574;2585
-#: Controller/OrganisationsController.php:432
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
 #: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "Du er ikke autorisert til å gjøre det."
 
-#: Controller/AttributesController.php:2414
-#: Controller/EventsController.php:4207
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "Denne funksjonaliteten krever tilgang til API-nøkkel."
 
-#: Controller/AttributesController.php:2422
+#: Controller/AttributesController.php:2463
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "Denne handlingen er bare for API. Vennligst se automasjonssiden for informasjon om hvordan du bruker den."
 
-#: Controller/AttributesController.php:2434
+#: Controller/AttributesController.php:2475
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "Ingen hash- eller hendelse-ID mottatt. Du må sette minst en av de to."
 
-#: Controller/AttributesController.php:2595
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "Ugyldig skript."
 
-#: Controller/AttributesController.php:2662
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr "Ingen gyldige anrikningsalternativer funnet for dette attributtet."
 
-#: Controller/AttributesController.php:2760
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "Ugyldig type forespurt."
 
-#: Controller/AttributesController.php:2823;3030
+#: Controller/AttributesController.php:2864;3071
 #: Controller/TagCollectionsController.php:254
 msgid "Invalid tag"
 msgstr ""
 
-#: Controller/AttributesController.php:3120
-#: Controller/EventsController.php:5197
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Deaktivering av korrelasjonen er ikke tillatt i dette tilfellet."
 
-#: Controller/AttributesController.php:3124;3139
+#: Controller/AttributesController.php:3165;3180
 #: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "Ugyldig Egenskap."
@@ -419,6 +422,63 @@ msgstr ""
 msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
 msgstr ""
 
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
 #: Controller/DecayingModelController.php:20
 msgid "Default decaying models updated"
 msgstr ""
@@ -584,452 +644,456 @@ msgstr ""
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr ""
 
-#: Controller/EventsController.php:879
+#: Controller/EventsController.php:894
 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 "Ingen x509-sertifikat eller GnuPG-nøkkel er angitt i profilen din. For å motta e-post, send inn ditt offentlige sertifikat eller GnuPG-nøkkel i profilen din."
 
-#: Controller/EventsController.php:881
+#: Controller/EventsController.php:896
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "Ingen GnuPG-nøkkel angitt i profilen din. For å motta e-post, send inn din offentlige nøkkel i profilen din."
 
-#: Controller/EventsController.php:887
+#: Controller/EventsController.php:902
 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 "Ingen x509-sertifikat eller GnuPG-nøkkel er angitt i profilen din. For å motta attributter i e-post, send inn ditt offentlige sertifikat eller GnuPG-nøkkel i profilen din."
 
-#: Controller/EventsController.php:889
+#: Controller/EventsController.php:904
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr "Ingen GnuPG-nøkkel angitt i profilen din. For å motta attributter i e-postmeldinger, send inn din offentlige nøkkel i profilen din."
 
-#: Controller/EventsController.php:1716
+#: Controller/EventsController.php:1731
 msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1927
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr "Du har ikke tillatelser til å opprette hendelser"
 
-#: Controller/EventsController.php:1933
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr "Ingen gyldige hendelsesdata mottatt."
 
-#: Controller/EventsController.php:1969
+#: Controller/EventsController.php:1984
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "Ugyldig delingsgruppe eller ikke autorisert (Synkroniser bruker ikke i delingsgruppen)."
 
-#: Controller/EventsController.php:1973;1977
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
 msgstr "Ugyldig delingsgruppe eller ikke autorisert."
 
-#: Controller/EventsController.php:2001
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr "Hendelse blokkert av lokal svarteliste."
 
-#: Controller/EventsController.php:2014;2101;2377
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "Hendelsen er blitt lagret"
 
-#: Controller/EventsController.php:2022
+#: Controller/EventsController.php:2037
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "Hendelsen eksisterer allerede, hvis du vil redigere den, bruker du adressen i posisjonsoverskriften."
 
-#: Controller/EventsController.php:2028
+#: Controller/EventsController.php:2043
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "En svartelisteoppføring blokkerer deg fra å skape noen hendelser. Ta kontakt med administrasjonsgruppen i denne forekomsten"
 
-#: Controller/EventsController.php:2030;2380
+#: Controller/EventsController.php:2045;2395
 msgid "The event could not be saved. Please, try again."
 msgstr "Hendelsen kunne ikke lagres. Vær så snill, prøv på nytt."
 
-#: Controller/EventsController.php:2079
+#: Controller/EventsController.php:2094
 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 "Hendelsen opprettet vil være synlig for organisasjonene som har en konto på denne plattformen, men ikke synkronisert med andre MISP-forekomster til den publiseres."
 
-#: Controller/EventsController.php:2127
+#: Controller/EventsController.php:2142
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "Du får bare laste opp MISP XML eller MISP JSON filer."
 
-#: Controller/EventsController.php:2128
+#: Controller/EventsController.php:2143
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "Filopplasting mislyktes, eller filen har ikke den forventede utvidelsen (.xml / .json)."
 
-#: Controller/EventsController.php:2189
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr "STIX-dokument importert, event er opprettet: "
 
-#: Controller/EventsController.php:2192
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr "STIX-dokument importert."
 
-#: Controller/EventsController.php:2195
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr "Kunne ikke importere STIX-dokument:"
 
-#: Controller/EventsController.php:2202
+#: Controller/EventsController.php:2217
 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 "Filopplasting mislyktes. Pass på at du velger en stix-fil som skal lastes opp, og at filen ikke overskrider den maksimale filstørrelsen på "
 
-#: Controller/EventsController.php:2226;2311
+#: Controller/EventsController.php:2241;2326
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "Du er ikke autorisert til å gjøre det. Vennligst vurder bruk av funksjonen 'foreslå attributt'."
 
-#: Controller/EventsController.php:2234
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr "Ugyldig hendelse-ID angitt."
 
-#: Controller/EventsController.php:2239
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr "Du er ikke autorisert til å lese den valgte hendelsen."
 
-#: Controller/EventsController.php:2536;2640;2711
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr "Du har ikke tillatelse til å gjøre det."
 
-#: Controller/EventsController.php:2545
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr "Hendelse upublisert."
 
-#: Controller/EventsController.php:2652;2722
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr "Kunne ikke publisere hendelse - ingen tag for nødvendige taksonomier mangler: %s"
 
-#: Controller/EventsController.php:2804
+#: Controller/EventsController.php:2819
 msgid "You must specify a message."
 msgstr ""
 
-#: Controller/EventsController.php:2823
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr "E-post sendt til reporteren."
 
-#: Controller/EventsController.php:2832
+#: Controller/EventsController.php:2847
 msgid "Sending of email failed."
 msgstr ""
 
-#: Controller/EventsController.php:2883
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr ""
 
-#: Controller/EventsController.php:2971
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr "Denne funksjonen er for øyeblikket deaktivert"
 
-#: Controller/EventsController.php:3097
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr "Filnavn ikke tillatt."
 
-#: Controller/EventsController.php:3117
+#: Controller/EventsController.php:3134
 msgid "Problem with writing the IoC file. Please report to site admin."
 msgstr ""
 
-#: Controller/EventsController.php:3211
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr "Dette er ikke en gyldig MISP XML-fil."
 
-#: Controller/EventsController.php:3253
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr "Ikke implementert ennå"
 
-#: Controller/EventsController.php:3271;3275
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr "Ugyldig hendelse eller ikke autorisert."
 
-#: Controller/EventsController.php:3467
+#: Controller/EventsController.php:3484
 #: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr "Ugyldig tagg."
 
-#: Controller/EventsController.php:3483
+#: Controller/EventsController.php:3500
 #: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr "Merket er allerede knyttet til denne hendelsen."
 
-#: Controller/EventsController.php:3497
+#: Controller/EventsController.php:3514
 msgid "Tag is not allowed due to taxonomy exclusivity settings"
 msgstr ""
 
-#: Controller/EventsController.php:3528;3534
+#: Controller/EventsController.php:3545;3551
 #: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr "Merk (er) lagt til."
 
-#: Controller/EventsController.php:3530
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr "Merket kunne ikke legges til."
 
-#: Controller/EventsController.php:3536
+#: Controller/EventsController.php:3553
 #: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr "Alle tagger er allerede til stede, ingenting å legge til."
 
-#: Controller/EventsController.php:3800;5003;5025;5532;5536
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
 #: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "Ugyldig hendelse."
 
-#: Controller/EventsController.php:3855;3885;3901
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr "Du har ikke tillatelse til å gjøre det."
 
-#: Controller/EventsController.php:3966;4106
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr "Ugyldig ID"
 
-#: Controller/EventsController.php:3970;4110;4685
+#: Controller/EventsController.php:3987;4128;4703
 msgid "Event not found or you are not authorised to view it."
 msgstr "Event ikke funnet eller du er ikke autorisert til å se den."
 
-#: Controller/EventsController.php:4116
+#: Controller/EventsController.php:4134
 msgid "Freetext Import"
 msgstr ""
 
-#: Controller/EventsController.php:4122
+#: Controller/EventsController.php:4140
 msgid "Populate using a Template"
 msgstr ""
 
-#: Controller/EventsController.php:4128
+#: Controller/EventsController.php:4146
 msgid "OpenIOC Import"
 msgstr ""
 
-#: Controller/EventsController.php:4133
+#: Controller/EventsController.php:4151
 msgid "ThreatConnect Import"
 msgstr ""
 
-#: Controller/EventsController.php:4138
+#: Controller/EventsController.php:4156
 msgid "(Experimental) Forensic analysis - Mactime"
 msgstr ""
 
-#: Controller/EventsController.php:4157
+#: Controller/EventsController.php:4175
 msgid "MISP standard (recommended exchange format - lossless)"
 msgstr ""
 
-#: Controller/EventsController.php:4163
+#: Controller/EventsController.php:4181
 msgid "STIX 1.1.1 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4168
+#: Controller/EventsController.php:4186
 msgid "STIX 2.0 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4210;4217
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr "Vennligst POST prøvene som beskrevet på automasjonssiden."
 
-#: Controller/EventsController.php:4246
+#: Controller/EventsController.php:4264
 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 mottatt, eller prøver ikke i riktig format. Vennligst se API-dokumentasjonen på automasjonssiden."
 
-#: Controller/EventsController.php:4254
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "Event ikke funnet"
 
-#: Controller/EventsController.php:4277
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "Event ikke funnet."
 
-#: Controller/EventsController.php:4287
+#: Controller/EventsController.php:4305
 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 "Distribusjonsnivå 5 støttes ikke når du laster opp en prøve uten å sende en hendelse-ID. Distribusjonsnivå 5 er ment å ta på distribusjonsnivået til en eksisterende begivenhet."
 
-#: Controller/EventsController.php:4312
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "Opprettelsen av en ny begivenhet med den medfølgende informasjonen har mislyktes."
 
-#: Controller/EventsController.php:4451;4472;4531;4556;4581;4611;4632
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr "Ugyldig type."
 
-#: Controller/EventsController.php:4750
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr "Ugyldig metode."
 
-#: Controller/EventsController.php:4832
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr "%s tjenester er ikke aktivert."
 
-#: Controller/EventsController.php:4836
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "Egenskapen ikke funnet, eller du er ikke autorisert til å se den."
 
-#: Controller/EventsController.php:4841
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr "Ingen gyldige%s alternativer funnet for dette attributtet."
 
-#: Controller/EventsController.php:4896;4942
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr "%s tjenesten ikke tilgjengelig."
 
-#: Controller/EventsController.php:4908
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr ""
 
-#: Controller/EventsController.php:4959
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ": Beriket via %s"
 
-#: Controller/EventsController.php:5114
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr "Importtjenesten kan ikke nås."
 
-#: Controller/EventsController.php:5204;5218
+#: Controller/EventsController.php:5222;5236
 #: Controller/PostsController.php:60;84
 #: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
 msgid "You don't have permission to do that."
 msgstr "Du har ikke tillatelse til å gjøre det."
 
-#: Controller/EventsController.php:5345
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr "Ugyldig ID."
 
-#: Controller/EventsController.php:5393
+#: Controller/EventsController.php:5411
 #: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr "Ugyldig hendelse"
 
-#: Controller/EventsController.php:5414
+#: Controller/EventsController.php:5432
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "Berikningsoppgave kø for bakgrunnsbehandling. Sjekk tilbake senere for å se resultatene."
 
-#: Controller/EventsController.php:5665
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr ""
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr "Du har ikke de nødvendige rettighetene til å gjøre det."
 
-#: Controller/FeedsController.php:241;340
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr "Feed lagt til."
 
-#: Controller/FeedsController.php:249
-msgid "Feed could not be added. Invalid field: %s"
-msgstr "Feed kunne ikke legges til. Ugyldig felt: %s"
+#: Controller/FeedsController.php:291
+msgid "Feed could not be added. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:274;375;397;526;567;778
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr "Ugyldig feed."
 
-#: Controller/FeedsController.php:348
-msgid "Feed could not be updated. Invalid fields: %s"
-msgstr "Feed kunne ikke oppdateres. Ugyldige felt: %s"
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:371
-#: Controller/OrganisationsController.php:237
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
 #: Controller/SharingGroupsController.php:237
-#: Controller/UsersController.php:1015
+#: Controller/UsersController.php:1044
 msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:404;530
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "Feed er for øyeblikket ikke aktivert. Pass på at du aktiverer den."
 
-#: Controller/FeedsController.php:417;483
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr "Starter henting fra Feed."
 
-#: Controller/FeedsController.php:428
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr "Trekk i kø for utførelse av bakgrunnen."
 
-#: Controller/FeedsController.php:433;435
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr "Henting Feed ble mislykket."
 
-#: Controller/FeedsController.php:439;500
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr "Henter fôret har blitt fullført."
 
-#: Controller/FeedsController.php:512
+#: Controller/FeedsController.php:563
 msgid "No feed enabled."
 msgstr ""
 
-#: Controller/FeedsController.php:536;555
+#: Controller/FeedsController.php:587;606
 #: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr "Nedlasting mislyktes."
 
-#: Controller/FeedsController.php:543
+#: Controller/FeedsController.php:594
 msgid "Event added."
 msgstr "Event tilføyd."
 
-#: Controller/FeedsController.php:546
+#: Controller/FeedsController.php:597
 msgid "Event already up to date."
 msgstr "Event allerede oppdatert."
 
-#: Controller/FeedsController.php:548
+#: Controller/FeedsController.php:599
 msgid "Event updated."
 msgstr "Event oppdatert."
 
-#: Controller/FeedsController.php:552
+#: Controller/FeedsController.php:603
 msgid "Could not %s event."
 msgstr "Kunne ikke %s-hendelsen."
 
-#: Controller/FeedsController.php:649
+#: Controller/FeedsController.php:700
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "Feed kunne ikke hentes. HTTP-feilkoden returnert var: "
 
-#: Controller/FeedsController.php:688;739
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr "Ugyldig feed-type."
 
-#: Controller/FeedsController.php:784;816
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr "Kunne ikke laste ned den valgte hendelsen"
 
-#: Controller/FeedsController.php:814
+#: Controller/FeedsController.php:865
 msgid "This event is blocked by the Feed filters."
 msgstr "Denne hendelsen er blokkert av feed-filtrene."
 
-#: Controller/FeedsController.php:852;856
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr "Ugyldig feed."
 
-#: Controller/FeedsController.php:877
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr "Bare POST-forespørsler er tillatt."
 
-#: Controller/FeedsController.php:881
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr "Feed ikke funnet."
 
-#: Controller/FeedsController.php:890
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr "Data trukket."
 
-#: Controller/FeedsController.php:892
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "Kunne ikke trekke de valgte dataene. Begrunnet: %s"
 
-#: Controller/FeedsController.php:909
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr "Starter feilsøking."
 
-#: Controller/FeedsController.php:924
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr "Caching feeds har mislyktes."
 
-#: Controller/FeedsController.php:927
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr "Caching feeds har fullført."
 
-#: Controller/FeedsController.php:961
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr "Ugyldig mateliste mottatt."
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr "Alle klynger"
 
-#: Controller/GalaxiesController.php:174
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr "Alle navneområder"
 
-#: Controller/GalaxiesController.php:304
+#: Controller/GalaxiesController.php:337
 msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:307
+#: Controller/GalaxiesController.php:340
 msgid "Failed to parse request."
 msgstr "Kunne ikke analysere forespørsel."
 
@@ -1112,7 +1176,7 @@ msgid "Object could not be saved."
 msgstr ""
 
 #: Controller/ObjectsController.php:373;1006
-#: Model/Event.php:6171
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr "Ugyldig objekt."
 
@@ -1180,43 +1244,43 @@ msgstr "Organisasjonen har blitt lagt til."
 msgid "The organisation could not be added."
 msgstr "Organisasjonen kunne ikke legges til."
 
-#: Controller/OrganisationsController.php:156;289;295
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr "Ugyldig organisasjon."
 
-#: Controller/OrganisationsController.php:162;242;248;301;328;361
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
 msgid "Invalid organisation"
 msgstr "Ugyldig organisasjon"
 
-#: Controller/OrganisationsController.php:201
+#: Controller/OrganisationsController.php:208
 msgid "Organisation updated."
 msgstr "Organisasjon oppdatert."
 
-#: Controller/OrganisationsController.php:216
+#: Controller/OrganisationsController.php:223
 msgid "The organisation could not be updated."
 msgstr "Organisasjonen kunne ikke oppdateres."
 
-#: Controller/OrganisationsController.php:265
+#: Controller/OrganisationsController.php:272
 msgid "Organisation deleted"
 msgstr "Organisasjonen slettet"
 
-#: Controller/OrganisationsController.php:272
+#: Controller/OrganisationsController.php:279
 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 "Organisasjonen kunne ikke slettes. Generelt bør organisasjoner aldri slettes, i stedet vurdere å flytte dem til den kjente fjernorganisasjonslisten. Alternativt, hvis du er sikker på at du vil fjerne en organisasjon og er klar over effekten, må du sørge for at det ikke er noen brukere eller hendelser knyttet til denne organisasjonen før du sletter den."
 
-#: Controller/OrganisationsController.php:366
+#: Controller/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr "Ingen destinasjonsside er opprettet for denne organisasjonen."
 
-#: Controller/OrganisationsController.php:415
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr "Denne handlingen er begrenset til å synkronisere brukere"
 
-#: Controller/OrganisationsController.php:437
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr "Organisasjonen har blitt slått sammen."
 
-#: Controller/OrganisationsController.php:440
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr "Det oppstod en feil under sammenslåing av organisasjonene. For å finne ut mer om hva som gikk galt, se revisjonsloggene. Hvis du vil tilbakestille endringene, kan du finne en .sql-fil"
 
@@ -1348,7 +1412,7 @@ msgstr "Den organisasjonen kunne ikke opprettes da uuid er i bruk allerede."
 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 lagre den nye organisasjonen, er du sikker på at uuid er i riktig format? Sørg også for at organisasjonens navn ikke kolliderer med en eksisterende."
 
-#: Controller/ServersController.php:350;532;2154
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr "Serveren er lagret"
 
@@ -1356,8 +1420,8 @@ msgstr "Serveren er lagret"
 msgid "The server could not be saved. Please, try again."
 msgstr "Serveren kunne ikke lagres. Vær så snill å prøv igjen."
 
-#: Controller/ServersController.php:411;608;653;656;665;729;735;1489;1506
-#: Model/Server.php:5737
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
@@ -1365,7 +1429,7 @@ msgstr "Ugyldig server"
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr "Kunne ikke lagre den nye organisasjonen, er du sikker på at uuid er i riktig format?."
 
-#: Controller/ServersController.php:604;2171;2213
+#: Controller/ServersController.php:604;2183;2225
 msgid "This endpoint expects POST requests."
 msgstr ""
 
@@ -1564,79 +1628,79 @@ msgstr ""
 msgid "This setting can only be edited via the CLI."
 msgstr ""
 
-#: Controller/ServersController.php:1365
+#: Controller/ServersController.php:1365;1377
 msgid "Restarting workers."
 msgstr ""
 
-#: Controller/ServersController.php:1389
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "Fil ikke funnet."
 
-#: Controller/ServersController.php:1395
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "Filen kunne ikke slettes."
 
-#: Controller/ServersController.php:1418;1434
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr "Opplasting mislyktes."
 
-#: Controller/ServersController.php:1426
+#: Controller/ServersController.php:1438
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "Filen finnes allerede. Hvis du vil erstatte den, fjern den gamle først."
 
-#: Controller/ServersController.php:1493
+#: Controller/ServersController.php:1505
 msgid "Invalid user or user not found."
 msgstr ""
 
-#: Controller/ServersController.php:2040
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr "Starte server caching."
 
-#: Controller/ServersController.php:2055
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr "Caching serverne har mislyktes."
 
-#: Controller/ServersController.php:2058
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr "Caching serverne har fullført."
 
-#: Controller/ServersController.php:2088
+#: Controller/ServersController.php:2100
 msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2097
+#: Controller/ServersController.php:2109
 msgid "Configured host org not found. Please make sure that the setting is current on the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2161
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ServersController.php:2182
+#: Controller/ServersController.php:2194
 msgid "API key updated."
 msgstr ""
 
-#: Controller/ServersController.php:2195
+#: Controller/ServersController.php:2207
 msgid "ID has to be a valid server connection"
 msgstr ""
 
-#: Controller/ServersController.php:2198
+#: Controller/ServersController.php:2210
 msgid "Invalid direction. Valid options: "
 msgstr ""
 
-#: Controller/ServersController.php:2202
+#: Controller/ServersController.php:2214
 msgid "Priority changed."
 msgstr ""
 
-#: Controller/ServersController.php:2205
+#: Controller/ServersController.php:2217
 msgid "Priority could not be changed."
 msgstr ""
 
-#: Controller/ServersController.php:2216
+#: Controller/ServersController.php:2228
 msgid "Only site admin accounts can release the update lock."
 msgstr ""
 
-#: Controller/ServersController.php:2226
+#: Controller/ServersController.php:2238
 msgid "Only site admin accounts get the DB schema diagnostic."
 msgstr ""
 
@@ -1967,164 +2031,174 @@ msgstr "Begivenhet beriket,"
 msgid "Event populated, but "
 msgstr "Hendelse beriket, men"
 
-#: Controller/UserSettingsController.php:123;312
+#: Controller/UserSettingsController.php:129;276
 msgid "Invalid ID passed."
 msgstr ""
 
-#: Controller/UserSettingsController.php:133;137;322;326
+#: Controller/UserSettingsController.php:139;143;286;290
 msgid "Invalid user setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:151;192;278;290
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
 msgid "Invalid setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:155;196;330
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
 msgid "This setting is restricted and requires the following permission(s): %s"
 msgstr ""
 
-#: Controller/UserSettingsController.php:189
-msgid "This endpoint expects both a setting and a value to be set."
-msgstr ""
-
-#: Controller/UserSettingsController.php:229
+#: Controller/UserSettingsController.php:193
 msgid "Setting saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:242
+#: Controller/UserSettingsController.php:206
 msgid "Setting could not be saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:337
+#: Controller/UserSettingsController.php:301
 msgid "Setting deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:345
+#: Controller/UserSettingsController.php:309
 msgid "Setting could not be deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:358
+#: Controller/UserSettingsController.php:322
 msgid "Expecting POST or DELETE request."
 msgstr ""
 
-#: Controller/UsersController.php:42;310
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr "Ugyldig bruker eller ikke autorisert."
 
-#: Controller/UsersController.php:62;538;786;805;1030
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "Ugyldig bruker"
 
-#: Controller/UsersController.php:150;693;858
+#: Controller/UsersController.php:154;722;887
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr "Ugyldig e-postdomener. Brukeren din er begrenset til å opprette brukere for følgende domene:"
 
-#: Controller/UsersController.php:202
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr "Profilen er oppdatert"
 
-#: Controller/UsersController.php:207
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr "Profilen kunne ikke oppdateres. Vær så snill å prøv igjen."
 
-#: Controller/UsersController.php:247
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr "Ugyldig passord. Vennligst skriv inn ditt nåværende passord for å fortsette."
 
-#: Controller/UsersController.php:256
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr "Vennligst skriv inn ditt nåværende passord for å fortsette."
 
-#: Controller/UsersController.php:276
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "Passord endret."
 
-#: Controller/UsersController.php:285
+#: Controller/UsersController.php:299
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "Passordet kunne ikke oppdateres. Sørg for at du oppfyller kravene til minimumskravende / kompleksitet."
 
-#: Controller/UsersController.php:422;440;547
-#: Model/Log.php:370
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:704
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr "Brukeren kunne ikke lagres. Ugyldig organisasjon."
 
-#: Controller/UsersController.php:726
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "Brukeren har blitt lagret."
 
-#: Controller/UsersController.php:735;966
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr "Brukeren kunne ikke lagres. Vær så snill, prøv igjen."
 
-#: Controller/UsersController.php:958
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "Brukeren har blitt lagret"
 
-#: Controller/UsersController.php:1038
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "Bruker slettet"
 
-#: Controller/UsersController.php:1042
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "Brukeren ble ikke slettet"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "Ugyldig brukernavn eller passord, prøv igjen"
 
-#: Controller/UsersController.php:1208
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr "Ha det"
 
-#: Controller/UsersController.php:1230
-msgid "Invalid action."
-msgstr ""
-
-#: Controller/UsersController.php:1237
-msgid "New authkey generated."
-msgstr "Ny authkey generert."
-
-#: Controller/UsersController.php:1248
+#: Controller/UsersController.php:1273;1297
 msgid "This functionality is only accessible via POST requests."
 msgstr ""
 
-#: Controller/UsersController.php:1252
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
+msgid "New authkey generated."
+msgstr "Ny authkey generert."
+
+#: Controller/UsersController.php:1301
 msgid "Job initiated."
 msgstr ""
 
-#: Controller/UsersController.php:1254
+#: Controller/UsersController.php:1303
 msgid "%s authkeys reset, %s could not be reset."
 msgstr ""
 
-#: Controller/UsersController.php:1368
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr "Du har akseptert vilkårene og betingelsene."
 
-#: Controller/UsersController.php:1496
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr "Mottaker e-post ikke oppgitt"
 
-#: Controller/UsersController.php:1501
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr "Mottakerorganisasjon ikke oppgitt"
 
-#: Controller/UsersController.php:1538
+#: Controller/UsersController.php:1587
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr "E-post sendt, men klarte ikke å levere meldingene til følgende mottakere:"
 
-#: Controller/UsersController.php:1540
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr "E-post sendt."
 
-#: Controller/UsersController.php:1614
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr "Brukerdata"
 
-#: Controller/UsersController.php:1615
+#: Controller/UsersController.php:1664
 #: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
@@ -2134,11 +2208,11 @@ msgstr "Brukerdata"
 msgid "Organisations"
 msgstr "organisasjoner"
 
-#: Controller/UsersController.php:1616
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr "Bruker- og organisasjonsstatistikk"
 
-#: Controller/UsersController.php:1617
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
 #: View/DecayingModel/decaying_tool_rest_search.ctp:28
 #: View/Elements/eventattribute.ctp:151
@@ -2164,18 +2238,160 @@ msgstr "Bruker- og organisasjonsstatistikk"
 msgid "Tags"
 msgstr "Merker"
 
-#: Controller/UsersController.php:1618
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr "Attributthistogram"
 
-#: Controller/UsersController.php:1619
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1620
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr "Galakse Matrise"
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "Ja"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "Nei"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr "Denne handlingen er bare tilgjengelig via POST-forespørsler."
@@ -2256,11 +2472,11 @@ msgstr "Advarselslister kunne ikke slettes."
 msgid "No valid data received."
 msgstr "Ingen gyldige data mottatt."
 
-#: Controller/Component/ACLComponent.php:614
+#: Controller/Component/ACLComponent.php:634
 msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:668
+#: Controller/Component/ACLComponent.php:688
 msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
 msgstr ""
 
@@ -2741,87 +2957,87 @@ msgstr ""
 msgid "Invalid %s."
 msgstr "Ugyldig %s."
 
-#: Model/AppModel.php:1416
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr "Indekserer "
 
-#: Model/AppModel.php:1430
+#: Model/AppModel.php:1480
 msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1452
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1453
+#: Model/AppModel.php:1503
 msgid "The executed SQL query was: %s"
 msgstr ""
 
-#: Model/AppModel.php:1455
+#: Model/AppModel.php:1505
 msgid "Successfuly executed the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1466;1530
+#: Model/AppModel.php:1516;1580
 msgid "Issues executing the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr " Den returnerte feilen: "
 
-#: Model/AppModel.php:1469
+#: Model/AppModel.php:1519
 msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1478
+#: Model/AppModel.php:1528
 msgid "However, as this error is whitelisted, the update went through."
 msgstr ""
 
-#: Model/AppModel.php:1497
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr "Indeksering var vellykket "
 
-#: Model/AppModel.php:1500
+#: Model/AppModel.php:1550
 msgid "Failed to add index"
 msgstr ""
 
-#: Model/AppModel.php:1502
+#: Model/AppModel.php:1552
 msgid "The returned error is:"
 msgstr ""
 
-#: Model/AppModel.php:1531
+#: Model/AppModel.php:1581
 msgid "Database updates stopped as some errors occured and the stop flag is enabled."
 msgstr ""
 
-#: Model/AppModel.php:1690
+#: Model/AppModel.php:1740
 msgid "Invalid JSON."
 msgstr ""
 
-#: Model/AppModel.php:1783;1841
+#: Model/AppModel.php:1833;1891
 msgid "Issues executing run_updates"
 msgstr ""
 
-#: Model/AppModel.php:1784
+#: Model/AppModel.php:1834
 msgid "Database updates are locked. Worker not spawned"
 msgstr ""
 
-#: Model/AppModel.php:1788;1846;1881
+#: Model/AppModel.php:1838;1896;1931
 msgid "Update done"
 msgstr ""
 
-#: Model/AppModel.php:1842
+#: Model/AppModel.php:1892
 msgid "Updates are locked. Stopping worker gracefully"
 msgstr ""
 
-#: Model/AppModel.php:1861
+#: Model/AppModel.php:1911
 msgid "Running update %s"
 msgstr ""
 
-#: Model/AppModel.php:1887
+#: Model/AppModel.php:1937
 msgid "Update done in another worker. Gracefuly stopping."
 msgstr ""
 
@@ -3805,19 +4021,19 @@ msgstr "Verdien må være et tall større eller lik 0."
 msgid "The value has to be a number between 0 and 10."
 msgstr "Verdien må være et tall mellom 0 og 10."
 
-#: Model/Attribute.php:2278;2346
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr "Kunne ikke lese brukeren."
 
-#: Model/Attribute.php:2282
+#: Model/Attribute.php:2301
 msgid "Invalid hash type."
 msgstr "Ugyldig hash-type."
 
-#: Model/Attribute.php:2973
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr "Dette feltet er obligatorisk."
 
-#: Model/Attribute.php:3540
+#: Model/Attribute.php:3559
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr "Noe gikk galt. Mottatt en ikke-numerisk hendelses-ID mens du forsøkte å lage et zip-arkiv for en lastet skadevareprøve."
 
@@ -3837,6 +4053,10 @@ msgstr ""
 msgid "Community not found."
 msgstr ""
 
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
 #: Model/DecayingModel.php:162
 msgid "Models could not be loaded or default decaying models folder is empty"
 msgstr ""
@@ -3908,67 +4128,75 @@ msgstr ""
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5722
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr "Problemer mens du laster inn stixfilen."
 
-#: Model/Event.php:5724
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr "Problemer med maec-biblioteket."
 
-#: Model/Event.php:5726
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "Problemer med å utføre inntaksskriptet eller ugyldig inngang."
 
-#: Model/Event.php:5729
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr "Spør administratoren din til"
 
-#: Model/Event.php:5731
+#: Model/Event.php:5808
 msgid "Please "
 msgstr "Vær så snill"
 
-#: Model/Event.php:5733
+#: Model/Event.php:5810
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr "sjekk om avhengighetene for STIX er oppfylt via diagnostisk verktøy."
 
-#: Model/Event.php:5765
+#: Model/Event.php:5842
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:5774
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr "%s ikke satt"
 
-#: Model/Event.php:6023
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr "Kunne ikke legge til merker."
 
-#: Model/Event.php:6505
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:1444;1488
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1458
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Feed.php:1635
+#: Model/Feed.php:1687
 msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Feed.php:1638
+#: Model/Feed.php:1690
 msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
 msgstr ""
 
-#: Model/Feed.php:1643
+#: Model/Feed.php:1695
 msgid "Invalid user id."
 msgstr ""
 
-#: Model/Feed.php:1663
+#: Model/Feed.php:1715
 msgid "Events related to feed %s purged."
 msgstr ""
 
@@ -3976,1164 +4204,1208 @@ msgstr ""
 msgid "Galaxy cannot be represented as a matrix"
 msgstr "Galaksen kan ikke representeres som en matrise"
 
-#: Model/MispObject.php:1057
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
-#: Model/Server.php:140
+#: Model/Server.php:123
+msgid "Server unreachable"
+msgstr ""
+
+#: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
 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 oppgaver er utsatt for API, disse hjelper med å opprettholde og konfigurere MISP på en automatisk måte / via eksterne verktøy."
 
-#: Model/Server.php:141
+#: Model/Server.php:151
 msgid "Administering MISP via the CLI"
 msgstr "Administrere MISP via CLI"
 
-#: Model/Server.php:153
+#: Model/Server.php:163
 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 oppgaver som caching feeds eller trekke fra server instanser, kan du gjøre det ved hjelp av følgende kommandolinjeverktøy. Bare utfør de oppgitte kommandoene via kommandolinjen / opprett cron-jobber lett ut av dem."
 
-#: Model/Server.php:154
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "Automatiserer bestemte konsolloppgaver"
 
-#: Model/Server.php:163
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr "Bakgrunnsarbeidere kan administreres via CLI i tillegg til verktøyene for brukergrensesnitt / API"
 
-#: Model/Server.php:164
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr "Administrere bakgrunnsarbeidere"
 
-#: Model/Server.php:173
+#: Model/Server.php:183
 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 "Basisadressen til søknaden (i formatet https://www.mymispinstance.com). Flere funksjoner avhenger av at denne innstillingen er riktig satt til å fungere."
 
-#: Model/Server.php:175
+#: Model/Server.php:185
 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 nåværende settbasen samsvarer ikke med nettadressen som du har tilgang til siden. Se bort fra dette hvis du får tilgang til siden via en alternativ nettadresse (for eksempel via IP-adresse)."
 
-#: Model/Server.php:181
+#: Model/Server.php:191
 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 "Basisadressen til søknaden (i formatet https://www.mymispinstance.com) som synlig eksternt / av andre MISPs. MISP vil kode denne nettadressen i delingsgrupper når den inkluderes. Hvis denne verdien ikke er angitt, brukes baseurl som tilbakebetaling."
 
-#: Model/Server.php:189
+#: Model/Server.php:199
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr "Med mindre det er satt til sant, vil forekomsten bare være tilgjengelig av stedadministratorer."
 
-#: Model/Server.php:197
+#: Model/Server.php:207
 msgid "Select the language MISP should use. The default is english."
 msgstr "Velg språket MISP skal bruke. Standard er engelsk."
 
-#: Model/Server.php:207
+#: Model/Server.php:217
 msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
-#: Model/Server.php:216
+#: Model/Server.php:226
 msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
 msgstr ""
 
-#: Model/Server.php:225
+#: Model/Server.php:235
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "Aktiver noen ytelse tunge korrelasjoner (for tiden CIDR korrelasjon)"
 
-#: Model/Server.php:234
+#: Model/Server.php:244
 msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
 msgstr ""
 
-#: Model/Server.php:243
+#: Model/Server.php:253
 msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
 msgstr "Det anbefales å installere alle pythonavhengighetene i en virtualenv. Den anbefalte plasseringen er:%s / venv"
 
-#: Model/Server.php:254
+#: Model/Server.php:264
 msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
 msgstr ""
 
-#: Model/Server.php:264
+#: Model/Server.php:274
 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 noen tilfeller kan et tungt brukt MISP-eksempel generere uønskede svarthullfeil på grunn av et stort antall forespørsler som rammer serveren. Deaktiver funksjonen for automatisk logging for å lette byrden på systemet."
 
-#: Model/Server.php:273
+#: Model/Server.php:283
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr "Sett ssdeep-poenget for å vurdere to ssdeep-hash som korrelerer [1-100]"
 
-#: Model/Server.php:281
+#: Model/Server.php:291
 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 "Angir maksimalt antall korrelasjoner som kan hentes med en enkelt hendelse. For ekstreme kantsaker kan dette forhindre minneproblemer. Standardverdien er 5k."
 
-#: Model/Server.php:290
+#: Model/Server.php:300
 msgid "The message that users will see if the instance is not live."
 msgstr "Meldingen som brukere vil se om forekomsten ikke er live."
 
-#: Model/Server.php:292
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr "Hvis dette ikke er angitt, vil standardverdien bli brukt."
 
-#: Model/Server.php:298;306;333;357;365;373;381;438;486;494;561
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr "Denne innstillingen er utdatert og kan fjernes trygt."
 
-#: Model/Server.php:314
+#: Model/Server.php:324
 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 "Bufret eksport kan ta opp en betydelig mengde plass og kan deaktiveres eksempelvis ved hjelp av denne innstillingen. Hvis du deaktiverer den cachede eksporten, anbefales det ikke at det er en verdifull funksjon, men hvis serveren din har gratis plassproblemer, kan det være fornuftig å ta dette trinnet."
 
-#: Model/Server.php:324
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr "Deaktiver visning / modifikasjoner til trusselenivået helt på forekomsten (avskrevet felt)."
 
-#: Model/Server.php:341
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "Bunnteksttekst forutsetning av \"Drevet av MISP\" -teksten."
 
-#: Model/Server.php:349
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "Bunnteksttekst etter \"Drevet av MISP\" -teksten."
 
-#: Model/Server.php:389
+#: Model/Server.php:399
 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 innstillingen er angitt, kan denne innstillingen vise en logo på høyre side av bunnteksten. Last opp det som et tilpasset bilde i filhåndteringsverktøyet."
 
-#: Model/Server.php:397
+#: Model/Server.php:407
 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 innstilt, lar denne innstillingen deg vise en logo som hjemmepiktogrammet. Last opp det som et tilpasset bilde i filhåndteringsverktøyet."
 
-#: Model/Server.php:405
+#: Model/Server.php:415
 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 det er satt, erstatter bildet som er angitt her, den viktigste MISP-logoen på påloggingsskjermen. Last opp det som et tilpasset bilde i filhåndteringsverktøyet."
 
-#: Model/Server.php:413
+#: Model/Server.php:423
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr "Organisasjonsmerket til vertsorganisasjonen. Dette brukes i e-postfagene."
 
-#: Model/Server.php:421
+#: Model/Server.php:431
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr "Vertsorganisasjonen for denne forekomsten. Hvis dette ikke er valgt, kan ikke replikeringsinstanser legges til."
 
-#: Model/Server.php:430
+#: Model/Server.php:440
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr "MISP-forekomsten UUID. Denne UUID brukes til å identifisere denne forekomsten."
 
-#: Model/Server.php:432
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr "Ingen gyldig UUID-sett"
 
-#: Model/Server.php:446
+#: Model/Server.php:456
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr "Hvis du angir denne innstillingen til 'false', vil de skjule alle organisasjonsnavn / logoer."
 
-#: Model/Server.php:454
+#: Model/Server.php:464
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr "Sett hendelsesnivået i e-postmeldingen under varselet."
 
-#: Model/Server.php:462
+#: Model/Server.php:472
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr "Dette er TLP-strengen for e-post når email_subject_tag ikke er funnet."
 
-#: Model/Server.php:470
+#: Model/Server.php:480
 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 denne taggen er angitt på et arrangement, blir verdien sendt i E-postfeltet. Hvis taggen ikke er angitt, vil email_subject_TLP_string bli brukt."
 
-#: Model/Server.php:478
+#: Model/Server.php:488
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr "Inkluder i navnet på email_subject_tag i emnet. Når det bare er falsk, brukes merkverdien."
 
-#: Model/Server.php:502
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr "Gjør det mulig å bruke MISPs bakgrunnsbehandling."
 
-#: Model/Server.php:510
+#: Model/Server.php:520
 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 "Katalog hvor vedlegg er lagret. MISP vil IKKE migrere eksisterende data hvis du endrer denne innstillingen. Den eneste sikre måten å endre denne innstillingen på er i config.php, når MISP ikke kjører, og etter at de har flyttet / kopiert eksisterende data til den nye plasseringen. Denne katalogen må allerede eksistere og være skrivbar og lesbar av MISP-applikasjonen."
 
-#: Model/Server.php:520
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "Tillat XML-cachene å inkludere de kodede vedleggene."
 
-#: Model/Server.php:528
+#: Model/Server.php:538
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr "Last ned vedlegg alltid når den lastes av en bruker i en nettleser"
 
-#: Model/Server.php:536
+#: Model/Server.php:546
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr "E-postadressen som MISP skal bruke for alle varsler"
 
-#: Model/Server.php:544
+#: Model/Server.php:554
 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 all e-post ved hjelp av denne innstillingen. Når aktivert, vil ingen utgående e-post sendes av MISP."
 
-#: Model/Server.php:553
+#: Model/Server.php:563
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr "E-postadressen som MISP skal inneholde som en kontaktadresse for instansens supportteam."
 
-#: Model/Server.php:569
+#: Model/Server.php:579
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr "Slå sårbarhetstypeattributter til koblinger som kobler til den angitte CVE-oppslaget"
 
-#: Model/Server.php:577
+#: Model/Server.php:587
 msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
 msgstr ""
 
-#: Model/Server.php:585
+#: Model/Server.php:595
 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 innstillingen styrer om e-post med e-post vil bli sendt når en hendelse er opprettet via REST-grensesnittet. Det kan være lurt å deaktivere denne innstillingen når du først oppretter en kobling til en annen forekomst for å unngå å spammere brukerne dine under den første trekkingen. Rask oppsummering: True = E-postmeldinger er IKKE sendt, False = E-postmeldinger sendes på hendelser publisert via synkronisering / REST."
 
-#: Model/Server.php:593
+#: Model/Server.php:603
 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 av dette flagget vil tillate at hendelsesbeskrivelsen overføres i varselens e-postfag. Vær oppmerksom på at dette ikke er kryptert av GnuPG, så bare aktiver det hvis du godtar at en del av arrangementsbeskrivelsen vil bli sendt ut i klar tekst."
 
-#: Model/Server.php:601
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr "Standardfordelingsinnstillingen for hendelser (0-3)."
 
-#: Model/Server.php:610
+#: Model/Server.php:620
 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 "Standard distribusjonsinnstillingen for attributter, sett den til 'hendelse' hvis du vil at attributter skal være standard for hendelsesfordelingsnivået. (0-3 eller \"event\")"
 
-#: Model/Server.php:619
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr "Standard trusselenivåinnstillingen når du oppretter hendelser."
 
-#: Model/Server.php:628
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr "Taggsamlingen som skal brukes på alle hendelser som er opprettet manuelt."
 
-#: Model/Server.php:637
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr "Aktiver merkingsfunksjonen til MISP. Dette anbefales sterkt."
 
-#: Model/Server.php:645
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr "Vis fulltagsnavnene på hendelsesindeksen."
 
-#: Model/Server.php:654
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr "Brukes på påloggingssiden, før MISP-logoen"
 
-#: Model/Server.php:662
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr "Brukes på påloggingssiden, etter MISP-logoen"
 
-#: Model/Server.php:670
+#: Model/Server.php:689
 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 "Brukes på påloggingssiden, til venstre for MISP-logoen, laster den opp som et tilpasset bilde i filhåndteringsverktøyet."
 
-#: Model/Server.php:678
+#: Model/Server.php:697
 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 "Brukes på påloggingssiden, til høyre for MISP-logoen, last den opp som et tilpasset bilde i filhåndteringsverktøyet."
 
-#: Model/Server.php:686
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr "Brukes i sidetittelen, etter navnet på siden"
 
-#: Model/Server.php:694
+#: Model/Server.php:713
 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 "Tillater brukere å ta eierskap til en hendelse som er lastet opp via \"Legg til MISP XML\" -knappen. Dette tillater spoofing av skaperen av en manuelt importert hendelse, og det kan også bryte muligens bryte den opprinnelige, avsatte løsbarheten. Synkronisering med en forekomst som har en annen skaperen for samme arrangement kan føre til uønskede konsekvenser."
 
-#: Model/Server.php:702
+#: Model/Server.php:721
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr "Velg om vilkårene og betingelsene skal vises inline (false) eller tilbys som en nedlasting (sann)"
 
-#: Model/Server.php:710
+#: Model/Server.php:729
 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 vilkårene og betingelsene fil. Kontroller at filen ligger i MISP / app / files / terms-katalogen"
 
-#: Model/Server.php:718
+#: Model/Server.php:737
 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 aktiverer de alternative org feltene for hendelsesindeksen (kilde org og medlem org) i stedet for den tradisjonelle måten å vise bare et org-felt. Dette tillater brukere å se om en hendelse ble lastet opp av en medlemsorganisasjon på deres MISP-forekomst, eller om den oppsto i en sammenkoblet forekomst."
 
-#: Model/Server.php:726
+#: Model/Server.php:745
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr "True vil nekte tilgang til upubliserte hendelser til brukere utenfor organisasjonen av innsenderen unntatt nettstedadministratorer."
 
-#: Model/Server.php:735
+#: Model/Server.php:754
 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 "Meldingen som sendes til brukeren etter opprettelsen av kontoen (må sendes manuelt fra administrasjonsgrensesnittet). Bruk \\ n for linjeskift. Følgende variabler blir automatisk erstattet i teksten: $password = et nytt midlertidig passord som MISP genererer, $username = brukerens e-postadresse, $misp = nettadressen til denne forekomsten, $org = organisasjonen som forekomsten tilhører til, som angitt i MISP.org, $contact = e-postadressen som brukes til å kontakte supportteamet, som angitt i MISP.contact. For eksempel vil \"passordet for $username er $password\" vises til en bruker med e-postadressen user@misp.org som \"passordet for user@misp.org er hNamJae81\"."
 
-#: Model/Server.php:744
+#: Model/Server.php:763
 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 "Meldingen som sendes til brukerne når en tilbakestilling av passord utløses. Bruk \\ n for linjeskift. Følgende variabler blir automatisk erstattet i teksten: $ password = et nytt midlertidig passord som MISP genererer, $ brukernavn = brukerens e-postadresse, $ misp = nettadressen til denne forekomsten, $ contact = e-postadressen som ble brukt for å kontakte supportteamet, som angitt i MISP.contact. For eksempel vil \"passordet for $ brukernavn er $ passord\" vises til en bruker med e-postadressen user@misp.org som \"passordet for user@misp.org er hNamJae81\"."
 
-#: Model/Server.php:752
+#: Model/Server.php:771
 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 versjon 2.3.107 kan du starte blacklisting event UUIDs for å hindre dem fra å bli presset til din forekomst. Denne funksjonaliteten vil også skje tydelig når en hendelse slettes, og forhindrer at en slettet hendelse skyves tilbake fra en annen forekomst."
 
-#: Model/Server.php:759
+#: Model/Server.php:778
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr "Blacklisting organization UUIDs for å forhindre etableringen av noe arrangement som er opprettet av den svarteliste organisasjonen."
 
-#: Model/Server.php:766
+#: Model/Server.php:785
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr "Hvis aktivert, vil alle loggoppføringer inneholde brukerens IP-adresse."
 
-#: Model/Server.php:775
+#: Model/Server.php:794
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr "Hvis aktivert, vil MISP logge alle vellykkede godkjenninger ved hjelp av API-nøkler. De forespurte nettadressene logges også."
 
-#: Model/Server.php:783
+#: Model/Server.php:802
 msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
 msgstr ""
 
-#: Model/Server.php:785
+#: Model/Server.php:804
 msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
 msgstr ""
 
-#: Model/Server.php:792
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:801
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:810
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:819
+#: Model/Server.php:838
 msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
 msgstr ""
 
-#: Model/Server.php:828
+#: Model/Server.php:847
 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 funksjonen tillater brukere å opprette org bare hendelser og be en annen organisasjon om å ta eierskap av arrangementet. Dette tillater organisasjoner å forbli anonyme ved å be en partner å publisere en hendelse for dem."
 
-#: Model/Server.php:837
+#: Model/Server.php:856
 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 det er aktivert, vil antall korrelasjoner som er synlige for den innloggede brukeren, være synlig på hendelsesindeksens brukergrensesnitt. Dette kommer til en ytelseskost, men kan være svært nyttig for å se korrelerende hendelser på et øyeblikk."
 
-#: Model/Server.php:846
+#: Model/Server.php:865
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr "Når aktivert, vises antall forslag til hendelsene på indeksen."
 
-#: Model/Server.php:855
+#: Model/Server.php:874
 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 aktivert, blir det samlede antall attributtobservasjoner i hendelsen synlig for den innloggede brukeren på hendelsesindeks-brukergrensesnittet."
 
-#: Model/Server.php:864
+#: Model/Server.php:883
 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 aktivert, blir det samlede antall diskusjonsposter for arrangementet synlig for den innloggede brukeren på hendelsesindeks-brukergrensesnittet."
 
-#: Model/Server.php:873
+#: Model/Server.php:892
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr "Når bare aktivert, kan Org og Site admins redigere en brukers profil."
 
-#: Model/Server.php:883
+#: Model/Server.php:902
 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 "Aktiver denne innstillingen for å begynne å blokkere varsel-e-post for hendelser med en bestemt kode. Definer merket i MISP.block_event_alert_tag."
 
-#: Model/Server.php:892
+#: Model/Server.php:911
 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 innstillingen MISP.block_event_alert er satt, vil varsel e-post for hendelser merket med taggen som er definert av denne innstillingen, bli blokkert."
 
-#: Model/Server.php:901
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:910
+#: Model/Server.php:929
 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 "Aktiver denne innstillingen for å begynne å blokkere varsel-e-post for gamle hendelser. Den nøyaktige timingen for hva som utgjør en gammel begivenhet er definert av MISP.block_old_event_alert_age."
 
-#: Model/Server.php:919
+#: Model/Server.php:938
 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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:928
+#: Model/Server.php:947
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:937
+#: Model/Server.php:956
 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 "Oppgi tempkatalogen du vil bruke for visse funksjoner i MISP. Som standard er dette satt til / tmp og vil bli brukt blant annet til å lagre visse midlertidige filer hentet fra import under importprosessen."
 
-#: Model/Server.php:947
+#: Model/Server.php:966
 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 "Hvis du vil tilpasse css, bare slipp en css-fil i mappen / var / www / MISP / app / webroot / css og skriv inn navnet her."
 
-#: Model/Server.php:956
+#: Model/Server.php:975
 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 "Aktiver denne innstillingen for å tillate blokkeringsattributter fra to_ids sensitiv eksport hvis et forslag er gjort til det for å fjerne IDS-flagget eller for å fjerne attributten helt. Dette er et kraftig verktøy for å håndtere falske positiver effektivt."
 
-#: Model/Server.php:965
+#: Model/Server.php:984
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr "Aktiver disse innstillingene hvis nye koder synkronisert / lagt til via innkommende hendelser fra en hvilken som helst kilde, ikke bør velges av brukerne som standard."
 
-#: Model/Server.php:974
+#: Model/Server.php:993
 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 innstillingen vil deaktivere korrelasjonen i dette tilfelle og fjerne eventuelle eksisterende lagrede korrelasjoner. Aktivering av dette vil utløse en fullstendig omvendelse av alle data som er en ekstremt lang og kostbar prosedyre. Bare aktiver dette hvis du vet hva du gjør."
 
-#: Model/Server.php:984
+#: Model/Server.php:1003
 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 innstillingen vil gi eventskapere muligheten til å deaktivere korrelasjonen mellom individuelle hendelser / attributter de har opprettet."
 
-#: Model/Server.php:993
+#: Model/Server.php:1012
 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 "Verten som kjører redis-serveren som skal brukes til generiske MISP-oppgaver som caching. Dette skal ikke forveksles med redis-serveren som brukes av bakgrunnsbehandlingen."
 
-#: Model/Server.php:1001
+#: Model/Server.php:1020
 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 "Porten som brukes av redis-serveren som skal brukes til generiske MISP-oppgaver som caching. Dette skal ikke forveksles med redis-serveren som brukes av bakgrunnsbehandlingen."
 
-#: Model/Server.php:1009
+#: Model/Server.php:1028
 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 som skal brukes til generiske MISP-oppgaver. Hvis du kjører flere enn en MISP-forekomst, må du sørge for å bruke en annen database på hver forekomst."
 
-#: Model/Server.php:1017
+#: Model/Server.php:1036
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr "Passordet på redis-serveren (hvis noen) skal brukes til generiske MISP-oppgaver."
 
-#: Model/Server.php:1026
+#: Model/Server.php:1045
 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 "Angi hvilke felt du vil filtrere på når du søker på hendelsesvisningen. Standardverdier er: \"id, uuid, verdi, kommentar, type, kategori, Tag.name\""
 
-#: Model/Server.php:1034
+#: Model/Server.php:1053
 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 "Angi dette til falsk hvis du vil deaktivere MISP som administrerer sine egne arbeidsprosesser (for eksempel hvis du styrer arbeidstakere med en systemd enhet)."
 
-#: Model/Server.php:1042
+#: Model/Server.php:1061
 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 "Bare aktiver dette hvis du har noen verktøy som bruker MISP med ekstrem høy konsistens. Generell ytelse vil bli lavere som normalt som visse transaksjonsforespørsler unngås til fordel for kortere bordlås."
 
-#: Model/Server.php:1051
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:1062
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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 "Plasseringen av GnuPG kjørbar. Hvis du vil bruke en annen GnuPG kjørbar enn / usr / bin / gpg, kan du sette den her. Hvis standardinnstillingen er bra, bare hold innstillingen foreslått av MISP."
 
-#: Model/Server.php:1071
+#: Model/Server.php:1099
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr "Tillat (falske) ukrypterte e-postmeldinger som skal sendes til brukere som ikke har en GnuPG-nøkkel."
 
-#: Model/Server.php:1079
+#: Model/Server.php:1107
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr "Tillat (falsk) kroppen av ukrypterte e-poster for å inneholde detaljer om hendelsen."
 
-#: Model/Server.php:1087
+#: Model/Server.php:1115
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr "Aktiver signering av GnuPG e-post. Som standard er GnuPG-e-postmeldinger signert"
 
-#: Model/Server.php:1095
+#: Model/Server.php:1123
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr "E-postadressen som forekomstens GnuPG-nøkkel er knyttet til."
 
-#: Model/Server.php:1103
+#: Model/Server.php:1131
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr "Passordet (hvis det er angitt) av GnuPG-tasten i forekomsten."
 
-#: Model/Server.php:1112
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr "Plasseringen av GnuPG homedir."
 
-#: Model/Server.php:1123
+#: Model/Server.php:1151
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr "Aktiver SMIME kryptering. Krypteringsstilling av GnuPG.onlyencrypted og GnuPG.bodyonlyencrypted innstillinger er arvet hvis SMIME er aktivert."
 
-#: Model/Server.php:1131
+#: Model/Server.php:1159
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr "E-postadressen som forekomstens SMIME-nøkkel er knyttet til."
 
-#: Model/Server.php:1139
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr "Plasseringen av den offentlige halvdelen av signeringsbeviset."
 
-#: Model/Server.php:1147
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr "Plasseringen av den private halvdelen av signeringsbeviset."
 
-#: Model/Server.php:1155
+#: Model/Server.php:1183
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr "Passordet (hvis det er angitt) av SMIME-nøkkelen til forekomsten."
 
-#: Model/Server.php:1167
+#: Model/Server.php:1195
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr "Vertsnavnet til en HTTP-proxy for utgående synkroniseringsforespørsler. La være tomt for ikke å bruke en proxy."
 
-#: Model/Server.php:1175
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr "TCP-porten for HTTP-proxyen."
 
-#: Model/Server.php:1183
+#: Model/Server.php:1211
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr "Autentiseringsmetoden for HTTP-proxyen. For øyeblikket støttes er Basic eller Digest. La være tom for ingen proxy-godkjenning."
 
-#: Model/Server.php:1191
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr "Autentiseringsnavnet for HTTP-proxyen."
 
-#: Model/Server.php:1199
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr "Autentiseringspassordet for HTTP-proxyen."
 
-#: Model/Server.php:1210
+#: Model/Server.php:1238
 msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
 msgstr ""
 
-#: Model/Server.php:1219
+#: Model/Server.php:1247
 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 "Saltet som brukes til de hakkede passordene. Du kan ikke tilbakestille dette fra GUI, bare manuelt fra settings.php-filen. Husk, dette vil ugyldiggjøre alle passordene i databasen."
 
-#: Model/Server.php:1229
+#: Model/Server.php:1257
 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 "Aktiver denne innstillingen for å sende alle revisjonsloggoppføringene direkte til syslog. Husk at dette er ordentlig og vil inneholde bruker, organisasjon, hendelsesdata."
 
-#: Model/Server.php:1238
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr "Passord lengde krav. Hvis den ikke er satt eller den er satt til 0, antas standardverdien (12)."
 
-#: Model/Server.php:1246
+#: Model/Server.php:1292
 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 "Passord kompleksitet krav. La det være tomt for standardinnstillingen (3 av 4, med enten et siffer eller et spesielt kar) eller skriv inn din egen regex. Husk at lengden er merket i en annen nøkkel. Standard (enkelt 3 av 4 eller minst 16 tegn): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 
-#: Model/Server.php:1254
+#: Model/Server.php:1300
 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 av denne innstillingen krever at brukerne sender inn sitt nåværende passord ved eventuelle endringer i profilen deres (inkludert en utløst passordendring). For administratorer vil bekreftelsen bli påkrevet når du endrer profilen til en bruker. Kan potensielt redusere en angriper som prøver å endre et kompromittert brukerens passord for å opprette vedholdenhet, men at denne funksjonen vil være svært irriterende for brukerne."
 
-#: Model/Server.php:1263
+#: Model/Server.php:1309
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr "Aktivering av denne innstillingen vil desinfisere innholdet i et attributt på en myk sletning"
 
-#: Model/Server.php:1272
+#: Model/Server.php:1318
 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 av denne innstillingen vil blokkere organisasjonsindeksen fra å være synlig for alle, i tillegg til nettstedet administratorer i gjeldende instans. Husk at brukere fortsatt kan se organisasjoner som produserer data via hendelser, forslag, loggposter for hendelseslogg, etc."
 
-#: Model/Server.php:1281
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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 "Tillater passering av API-nøkkelen via den navngitte URL-parameteren \"apikey\" - anbefales sterkt ikke å aktivere dette, men hvis du har noen dodgy arvverktøy som ikke kan passere autorisasjonsoverskriften, kan det fungere som en løsning. Igjen, bruk bare dette som en siste utvei."
 
-#: Model/Server.php:1283
+#: Model/Server.php:1339
 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 aktivert passering av API-nøkler via URL-parametere. Dette er sterkt anbefalt mot, vil du virkelig avsløre API-taster i loggene dine? ..."
 
-#: Model/Server.php:1290
+#: Model/Server.php:1346
 msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
 msgstr "Tillat opprinnelsesforespørsler til denne forekomsten, samsvarende opprinnelse gitt i Security.cors_origins. Sett til falsk for å deaktivere helt"
 
-#: Model/Server.php:1299
+#: Model/Server.php:1355
 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 "Angi opprinnelsen der MISP vil tillate forespørsler om kryssopprinnelse. Nyttig for ekstern integrering. Comma seperate hvis du trenger mer enn en."
 
-#: Model/Server.php:1308
+#: Model/Server.php:1364
 msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr "Antallet prøver en bruker kan prøve å logge inn og mislykkes før bruteforce-beskyttelsen går inn."
 
-#: Model/Server.php:1328
+#: Model/Server.php:1393
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr "Varigheten (i sekunder) av hvor lenge brukeren vil bli sperret når det tillatte antall påloggingsforsøk er oppbrukt."
 
-#: Model/Server.php:1339
+#: Model/Server.php:1404
 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 "Sett til true for å automatisk regenerere økter etter x antall forespørsler. Dette kan føre til at brukeren blir autentisert og er frustrerende generelt, så bare aktiver den hvis du virkelig trenger å regenerere øktene. (Ikke anbefalt)"
 
-#: Model/Server.php:1347
+#: Model/Server.php:1412
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr "Sett til true for å sjekke etter brukeragentstrengen i hver forespørsel. Dette kan føre til sporadisk logout (ikke anbefalt)."
 
-#: Model/Server.php:1355
+#: Model/Server.php:1420
 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 "Sesjonstypen som brukes av MISP. Standardinnstillingen er php, som vil bruke øktinnstillingene konfigurert i php.ini for øktdataene (støttede alternativer: php, database). Det anbefalte alternativet er php og angir at PHP skal bruke redis-økter via php.ini. Bare legg til 'session.save_handler = redis' og \"session.save_path = 'tcp://localhost:6379'\" (erstatt sistnevnte med redis-tilkoblingen) til"
 
-#: Model/Server.php:1364
+#: Model/Server.php:1429
 msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
 msgstr "Timeout varigheten av økter (i MINUTES). 0 betyr ikke uendelig for PHP-sessionshåndtereren, i stedet vil sessene ugyldiggjøre umiddelbart."
 
-#: Model/Server.php:1372
+#: Model/Server.php:1437
 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 "Utløpet av cookien (i MINUTES). Session timeout blir ofte oppdatert, men informasjonskapslene gjør det ikke. Generelt anbefales det å ha en mye høyere cookie_timeout enn timeout."
 
-#: Model/Server.php:1383
+#: Model/Server.php:1448
 msgid "The default policy action for the values added to the RPZ."
 msgstr "Standardpolitisk tiltak for verdiene lagt til RPZ."
 
-#: Model/Server.php:1392
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1473
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Oppdateringen spesifisert i SOA-delen av sonen filen. (i sekunder eller kortvarighet som 15m)"
 
-#: Model/Server.php:1416
+#: Model/Server.php:1481
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Retrykket angitt i SOA-delen av sonen filen. (i sekunder eller kortvarighet som 15m)"
 
-#: Model/Server.php:1424
+#: Model/Server.php:1489
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Utløpet er angitt i SOA-delen av sonen filen. (i sekunder eller kortvarighet som 15m)"
 
-#: Model/Server.php:1432
+#: Model/Server.php:1497
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Minste TTL spesifisert i SOA-delen av sonen filen. (i sekunder eller kortvarighet som 15m)"
 
-#: Model/Server.php:1440
+#: Model/Server.php:1505
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "TTL av sonen filen. (i sekunder eller kortvarighet som 15m)"
 
-#: Model/Server.php:1448
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr ""
 
-#: Model/Server.php:1456
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr "Alternativ navneserver"
 
-#: Model/Server.php:1464
+#: Model/Server.php:1529
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr "E-postadressen angitt i SOA-delen av sonen filen."
 
-#: Model/Server.php:1472
+#: Model/Server.php:1537
 msgid "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."
 msgstr "Aktiverer eller deaktiverer Kafka pub-funksjonen i MISP. Pass på at du installerer kravene til plugin for å jobbe. Se installasjonsinstruksjonene for mer informasjon."
 
-#: Model/Server.php:1480
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr "En kommaseparert liste over Kafka bootstrap meglere"
 
-#: Model/Server.php:1488
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr "En bane til en ini-fil med konfigurasjonsalternativer som skal sendes til rdkafka. Seksjonsoverskrifter i ini-filen vil bli ignorert."
 
-#: Model/Server.php:1496;1743
+#: Model/Server.php:1561;1808
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr "Aktiver denne innstillingen for å inkludere base64-kodet nyttelast av skadevareprøver/vedlegg i utgangen."
 
-#: Model/Server.php:1504;1751
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr "Aktiverer eller deaktiverer publisering av eventbegivenheter/redigeringer/slettinger."
 
-#: Model/Server.php:1512
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr "Emne for publisering av eventskapelser/redigeringer/slettinger."
 
-#: Model/Server.php:1520
+#: Model/Server.php:1585
 msgid "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."
 msgstr "Hvis aktivert, vil den publisere til Kafka hendelsen på det tidspunktet hendelsen blir publisert i MISP. Hendelseshandlinger (opprettelse eller redigering) vil ikke bli publisert til Kafka."
 
-#: Model/Server.php:1528
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr "Emne for publisering av hendelsesinformasjon om publisering."
 
-#: Model/Server.php:1536;1759
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr "Aktiverer eller deaktiverer publisering av objekter kreasjoner/endringer/slettinger."
 
-#: Model/Server.php:1544
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr "Emne for publisering av objektskapninger/redigeringer/slettinger."
 
-#: Model/Server.php:1552;1767
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr "Aktiverer eller deaktiverer publisering av objekter for objektreferanser/slettinger."
 
-#: Model/Server.php:1560
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr "Emne for publisering av objektreferanse kreasjoner/slettinger."
 
-#: Model/Server.php:1568;1775
+#: Model/Server.php:1633;1840
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr "Aktiverer eller deaktiverer publisering av noen attributtskaper/redigeringer/myke slettinger."
 
-#: Model/Server.php:1576
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr "Emne for publisering av attributtskapelser/redigeringer/myke slettinger."
 
-#: Model/Server.php:1584
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr "Aktiverer eller deaktiverer publisering av eventuelle forslagskaper/redigeringer/slettinger."
 
-#: Model/Server.php:1592
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr "Emne for publisering av forslagskaper/redigeringer/slettinger."
 
-#: Model/Server.php:1600;1783
+#: Model/Server.php:1665;1848
 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 eller deaktiverer publisering av noen tagskaper/redigeringer/slettinger, samt tagger som er festet til / løsrevet fra forskjellige MISP-elementer."
 
-#: Model/Server.php:1608
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr "Emne for publisering av tagskaper/redigeringer/slettelser, samt tagger som er festet til / løsrevet fra forskjellige MISP-elementer."
 
-#: Model/Server.php:1616
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr "Aktiverer eller deaktiverer publisering av nye observasjoner."
 
-#: Model/Server.php:1624
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr "Emne for publisering av observasjoner."
 
-#: Model/Server.php:1632
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr "Aktiverer eller deaktiverer publisering av nye/endrede brukere."
 
-#: Model/Server.php:1640
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr "Emne for publisering av nye/endrede brukere."
 
-#: Model/Server.php:1648
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr "Aktiverer eller deaktiverer publisering av nye/endrede organisasjoner."
 
-#: Model/Server.php:1656
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr "Emne for publisering av nye/endrede organisasjoner."
 
-#: Model/Server.php:1664
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr "Aktiverer eller deaktiverer publisering av loggoppføringer. Husk, dette kan bli ganske ordentlig, avhengig av logginnstillingene dine."
 
-#: Model/Server.php:1672
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr "Emne for publisering av loggoppføringer."
 
-#: Model/Server.php:1680
+#: Model/Server.php:1745
 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 eller deaktiverer pub/sub-funksjonen til MISP. Pass på at du installerer kravene til plugin for å jobbe. Se installasjonsinstruksjonene for mer informasjon."
 
-#: Model/Server.php:1689
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr "Porten som pub/sub-funksjonen vil bruke."
 
-#: Model/Server.php:1698
+#: Model/Server.php:1763
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr "Plassering av Redis db brukt av MISP og Python PUB-skriptet til kødata som skal publiseres."
 
-#: Model/Server.php:1707
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr "Porten som Redis lytter på."
 
-#: Model/Server.php:1716
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr "Passordet, hvis angitt for Redis."
 
-#: Model/Server.php:1725
+#: Model/Server.php:1790
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr "Databasen som skal brukes til å kjøre meldinger for pub/sub-funksjonaliteten."
 
-#: Model/Server.php:1734
+#: Model/Server.php:1799
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr "Navneområdet som skal brukes til å kjøre meldinger for pub/sub-funksjonaliteten."
 
-#: Model/Server.php:1791
+#: Model/Server.php:1856
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr "Aktiverer eller deaktiverer publisering av nye observasjoner til ZMQ pubsub feed."
 
-#: Model/Server.php:1799
+#: Model/Server.php:1864
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr "Aktiverer eller deaktiverer publisering av nye/modifiserte brukere til ZMQ pubsub feed."
 
-#: Model/Server.php:1807
+#: Model/Server.php:1872
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr "Aktiverer eller deaktiverer publisering av nye/endrede organisasjoner til ZMQ pubsub feed."
 
-#: Model/Server.php:1815
+#: Model/Server.php:1880
 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 eller deaktiverer publisering av loggoppføringer til ZMQ pubsub feed. Husk, dette kan bli ganske ordentlig, avhengig av logginnstillingene dine."
 
-#: Model/Server.php:1823
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "Aktivert logging til en ElasticSearch-forekomst"
 
-#: Model/Server.php:1831
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr "Nettadressen(e) med tilgang til ElasticSearch - komma separat hvis du vil ha mer enn én."
 
-#: Model/Server.php:1839
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr "Indeksen for å plassere logger"
 
-#: Model/Server.php:1847
+#: Model/Server.php:1912
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr "Aktiverer eller deaktiverer opplasting av skadelig programvare til S3 i stedet for disk (ADVARSEL: Få tillatelse fra Amazon først!)"
 
-#: Model/Server.php:1855
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr "Bucket navn å laste opp til"
 
-#: Model/Server.php:1863
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr "Region der din S3 bøtte ligger"
 
-#: Model/Server.php:1871
+#: Model/Server.php:1936
 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økkel til bruk når du laster opp prøver (ADVARSEL: Det anbefales sterkt at du bruker EC2 IAM-roller hvis det er mulig)"
 
-#: Model/Server.php:1879
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr "AWS hemmelig nøkkel til bruk når du laster opp prøver"
 
-#: Model/Server.php:1887
+#: Model/Server.php:1952
 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 innstillingen definerer hvem som har tilgang til å se de rapporterte observasjonene. Standardinnstillingen er hendelse-eieren alene (i tillegg til alle som ser sitt eget bidrag), med de andre alternativene som Sighting-reportere (som betyr hendelseseieren og alle som har gitt observasjonsdata om hendelsen) og Alle (som betyr at alle som har tilgang til å se hendelsen / attributtet)."
 
-#: Model/Server.php:1896
+#: Model/Server.php:1961
 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 "Å aktivere anonymisering av observasjoner vil bare samle alle observasjoner i stedet for å vise organisasjonene som har rapportert en observasjon. Brukere vil kunne fortelle antall observasjoner organisasjonen har lagt inn og antall observasjoner for andre organisasjoner"
 
-#: Model/Server.php:1904
+#: Model/Server.php:1969
 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 "Angi rekkevidden der observasjoner vil bli tatt hensyn til når du genererer grafer. For eksempel kan en observasjon med en sighted_date på 7 år siden ikke være relevant lenger. Innstilling gitt i antall dager, standard er 365 dager"
 
-#: Model/Server.php:1912
+#: Model/Server.php:1977
 msgid "Enable SightingDB integration."
 msgstr ""
 
-#: Model/Server.php:1920
+#: Model/Server.php:1985
 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 "Aktiver denne funksjonaliteten hvis du vil håndtere autentisering via et eksternt verktøy og godkjenne med MISP ved hjelp av en egendefinert overskrift."
 
-#: Model/Server.php:1930
+#: Model/Server.php:1995
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr "Still inn overskriften som MISP skal se etter her. Hvis tomt er tomt, vil det være standard for autorisasjonsoverskriften."
 
-#: Model/Server.php:1939
+#: Model/Server.php:2004
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr "Bruk et overskriftsnavnområde for auth header - standardinnstillingen er aktivert"
 
-#: Model/Server.php:1948
+#: Model/Server.php:2013
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr "Standard topptekstnavnet for auth header - standardinnstillingen er HTTP_"
 
-#: Model/Server.php:1957
+#: Model/Server.php:2022
 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 "Hvis denne innstillingen er aktivert, vil den eneste måten å autentisere bruke den egendefinerte overskriften. Altnertativt kan du kjøre i blandet modus som vil logge brukere inn via overskriften hvis funnet, ellers vil brukerne bli omdirigert til den normale loggingssiden."
 
-#: Model/Server.php:1966
+#: Model/Server.php:2031
 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 "Hvis du bruker et eksternt verktøy for å godkjenne med MISP, og bare vil tillate at verktøyets URL er et gyldig inngangspunkt, må du angi dette feltet."
 
-#: Model/Server.php:1975
+#: Model/Server.php:2040
 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å godkjenningsmetoden, dette er bare kosmetisk og vil bli vist på brukerens opprettelsesside og logger."
 
-#: Model/Server.php:1984
+#: Model/Server.php:2049
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr "Deaktiver logout-knappen for brukere autentisere med ekstern auth mekanisme."
 
-#: Model/Server.php:1992
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr "Aktiver / deaktiver anrikningstjenestene"
 
-#: Model/Server.php:2000
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr "Angi en timeout for anrikningstjenestene"
 
-#: Model/Server.php:2008
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr "Aktiver / deaktiver importtjenestene"
 
-#: Model/Server.php:2016
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr "Angi en timeout for importtjenestene"
 
-#: Model/Server.php:2024
+#: Model/Server.php:2089
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "Nettadressen ble brukt for å få tilgang til importtjenestene. Som standard er den tilgjengelig på http://127.0.0.1:6666"
 
-#: Model/Server.php:2032
+#: Model/Server.php:2097
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Porten brukte tilgang til importtjenestene. Som standard er den tilgjengelig på 127.0.0.1:6666"
 
-#: Model/Server.php:2040
+#: Model/Server.php:2105
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "Nettadressen ble brukt for å få tilgang til eksporttjenestene. Som standard er den tilgjengelig på http://127.0.0.1:6666"
 
-#: Model/Server.php:2048
+#: Model/Server.php:2113
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Porten brukte tilgang til eksporttjenestene. Som standard er den tilgjengelig på 127.0.0.1:6666"
 
-#: Model/Server.php:2056
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr "Aktiver / deaktiver eksporttjenestene"
 
-#: Model/Server.php:2064
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr "Angi en timeout for eksporttjenestene"
 
-#: Model/Server.php:2072
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr "Aktiver / deaktiver svingeren over informasjon hentet fra anrikningsmodulene"
 
-#: Model/Server.php:2080
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr "Angi en timeout for hover-tjenestene"
 
-#: Model/Server.php:2088
+#: Model/Server.php:2153
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "Nettadressen ble brukt for å få tilgang til anrikningstjenestene. Som standard er den tilgjengelig på http://127.0.0.1:6666"
 
-#: Model/Server.php:2096
+#: Model/Server.php:2161
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Havnen brukte tilgang til anrikningstjenestene. Som standard er den tilgjengelig på 127.0.0.1:6666"
 
-#: Model/Server.php:2104
+#: Model/Server.php:2169
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr "Nettadressen ble brukt for å få tilgang til Cortex. Som standard er den tilgjengelig på http: // cortex-url"
 
-#: Model/Server.php:2112
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr "Porten brukte tilgang til Cortex. Som standard er dette port 9000"
 
-#: Model/Server.php:2120
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr "Aktiver / deaktiver Cortex-tjenestene"
 
-#: Model/Server.php:2128
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "Angi en godkjenningsnøkkel som skal sendes til Cortex"
 
-#: Model/Server.php:2137
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr "Angi en timeout for Cortex-tjenestene"
 
-#: Model/Server.php:2145
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr "Angi som falsk for å deaktivere SSL-verifisering. Dette anbefales ikke."
 
-#: Model/Server.php:2154
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr "Sett til false hvis du ønsker å ignorere kampanjer for vertsnavn når du bekrefter sertifikater."
 
-#: Model/Server.php:2163
+#: Model/Server.php:2228
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr "Sett til true for å aktivere selvsignerte sertifikater som skal aksepteres. Dette krever at Cortex_ssl_verify_peer er aktivert."
 
-#: Model/Server.php:2172
+#: Model/Server.php:2237
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr "Sett til den absolutte banen til sertifikatautoritetsfilen du vil bruke til å bekrefte SSL-sertifikater."
 
-#: Model/Server.php:2181
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr "Gi dine egendefinerte godkjenningsbrukere en ekstern nettadresse til autentiseringssystemet for å tilbakestille passordene sine."
 
-#: Model/Server.php:2190
+#: Model/Server.php:2255
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr "Gi en egendefinert utloggingsadresse for brukerne som logger dem ut ved hjelp av autentiseringssystemet du bruker."
 
-#: Model/Server.php:2200
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr "Feilsøkingsnivået til forekomsten, bruk alltid 0 for produksjonsinstanser."
 
-#: Model/Server.php:2209
+#: Model/Server.php:2274
 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 "Feilsøkingsnivået for forekomsten for nettstedadministratorer. Denne funksjonen tillater at webansvarlige kan kjøre feilsøkingsmodus på en levende forekomst uten å utsette den for andre brukere. Det mest fordelaktige alternativet for feilsøking og site_admin_debug brukes til administratorer på nettstedet."
 
-#: Model/Server.php:2376
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr "Mislyktes (delvis?) På grunn av valideringsfeil: "
 
-#: Model/Server.php:2380
+#: Model/Server.php:2445
 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 "Blokkert en redigering til en aktivitet som ble opprettet lokalt. Dette kan skje hvis en synkronisert hendelse som ble opprettet i denne forekomsten ble endret av en administrator på fjernsiden."
 
-#: Model/Server.php:2407
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr ""
 
-#: Model/Server.php:2413
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr "mislyktes nedlasting av hendelsen"
 
-#: Model/Server.php:2492
+#: Model/Server.php:2557
 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 "Ikke autorisert. Dette skyldes enten en ugyldig auth-nøkkel eller på grunn av at synkroniseringsbrukeren ikke har godkjenningsrettigheter aktivert på den eksterne serveren. En annen grunn kan være en feil synkroniseringsserverinnstilling."
 
-#: Model/Server.php:2494
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr "Beklager, dette er ikke implementert ennå"
 
-#: Model/Server.php:2495
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr "Noe gikk galt under forsøk på å trekke"
 
-#: Model/Server.php:2507;2509
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr "Ukjent problem."
 
-#: Model/Server.php:3049
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr "Aktiver eller deaktiver modulen %s."
 
-#: Model/Server.php:3052
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr "Begrens %s-modulen til den oppgitte organisasjonen."
 
-#: Model/Server.php:3060
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr "Angi denne nødvendige spesifikke innstillingen for modulen."
 
-#: Model/Server.php:3175
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr "Verdi ikke satt."
 
-#: Model/Server.php:3196
+#: Model/Server.php:3281
 msgid "Invalid language."
 msgstr ""
 
-#: Model/Server.php:3217
+#: Model/Server.php:3302
 msgid "Invalid tag_collection."
 msgstr ""
 
-#: Model/Server.php:3225
+#: Model/Server.php:3310
 msgid "This setting has to be a number."
 msgstr ""
 
-#: Model/Server.php:3237
+#: Model/Server.php:3322
 msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
 msgstr ""
 
-#: Model/Server.php:3519
+#: Model/Server.php:3619
 msgid "Invalid file path or file not accessible."
 msgstr ""
 
-#: Model/Server.php:3522
+#: Model/Server.php:3622
 msgid "File has to be in .pem format."
 msgstr ""
 
-#: Model/Server.php:3888
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr "Noe gikk galt. MISP prøvde å lagre en feilformet config-fil. Innstilling av endring tilbakestilt."
 
-#: Model/Server.php:4020
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr "Organisasjonslogoer"
 
-#: Model/Server.php:4021
+#: Model/Server.php:4121
 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 "Logoen som brukes av en organisasjon på hendelsesindeksen, hendelsesvisningen, diskusjoner, forslag, etc. Kontroller at filnavnet er i org.png-formatet, hvor org er det sakssensitive organisasjonsnavnet."
 
-#: Model/Server.php:4023
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr "48x48 piksler .png-filer"
 
-#: Model/Server.php:4026;4041
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
 msgstr "Filnavn må være i følgende format: *.png"
 
-#: Model/Server.php:4030
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr "Ytterligere bildefiler"
 
-#: Model/Server.php:4031
+#: Model/Server.php:4131
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr "Bildefiler som er lastet opp i denne katalogen, kan brukes til forskjellige formål, for eksempel på loggbokene for påloggingssiden"
 
-#: Model/Server.php:4038
+#: Model/Server.php:4138
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr "tekst/html hvis det serveres inline, noe som formidler bruksvilkårene hvis det vises som nedlasting"
 
-#: Model/Server.php:4128
+#: Model/Server.php:4228
 msgid "Invalid server."
 msgstr ""
 
-#: Model/Server.php:4159
+#: Model/Server.php:4259
 msgid "Response was empty."
 msgstr ""
 
-#: Model/Server.php:4235
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr "Feil: Server sendte ikke forventet respons. Dette kan skyldes at den eksterne serverversjonen er utdatert."
 
-#: Model/Server.php:4501
+#: Model/Server.php:4604
 msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
 msgstr ""
 
-#: Model/Server.php:4571
+#: Model/Server.php:4675
 msgid "Can't check database schema for Postgres database type"
 msgstr ""
 
-#: Model/Server.php:4588
+#: Model/Server.php:4692
 msgid "Table `%s` does not exist"
 msgstr ""
 
-#: Model/Server.php:4615
+#: Model/Server.php:4719
 msgid "Column `%s` exists but should not"
 msgstr ""
 
-#: Model/Server.php:4648
+#: Model/Server.php:4752
 msgid "Column `%s` is different"
 msgstr ""
 
-#: Model/Server.php:4658
+#: Model/Server.php:4762
 msgid "Column `%s` does not exist but should"
 msgstr ""
 
-#: Model/Server.php:4671
+#: Model/Server.php:4775
 msgid "Table `%s` is an additional table"
 msgstr ""
 
-#: Model/Server.php:4695
+#: Model/Server.php:4799
 msgid "Column `%s` should be indexed"
 msgstr ""
 
-#: Model/Server.php:4718
+#: Model/Server.php:4822
 msgid "Column `%s` is indexed but should not"
 msgstr ""
 
-#: Model/Server.php:5141
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr "Fjerner en dødsarbeider."
 
-#: Model/Server.php:5142
+#: Model/Server.php:5253
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr "Fjerning av data fra dødarbeideren. Arbeider var av typen %s med pid %s"
 
-#: Model/Server.php:5146
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr "Stoppe en arbeidstaker."
 
-#: Model/Server.php:5147
+#: Model/Server.php:5258
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr "Stoppe en arbeidstaker. Arbeider var av typen%s med pid %s"
 
-#: Model/Server.php:5449
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr "Ugyldig submodule."
 
-#: Model/Server.php:5449;5478
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr "ukjent"
 
-#: Model/Server.php:5461
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:5462
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr "oppdatering:"
 
-#: Model/Server.php:5593
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr "Ugyldig arbeidstaker."
 
-#: Model/Server.php:5600
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr "Bakgrunnsarbeidere er ikke aktivert."
 
-#: Model/Server.php:5607
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr "Ugyldig arbeidstype."
 
-#: Model/Server.php:5787
+#: Model/Server.php:5911
 msgid "Could not reset the remote authentication key."
 msgstr ""
 
-#: Model/Server.php:5864
+#: Model/Server.php:5988
 msgid "Could not parse JSON: "
 msgstr ""
 
-#: Model/Server.php:5884
+#: Model/Server.php:6008
 msgid "Could not reset fetch remote user account."
 msgstr ""
 
-#: Model/Server.php:5906
+#: Model/Server.php:6030
 msgid "No user object received in response."
 msgstr ""
 
@@ -5201,6 +5473,10 @@ msgstr ""
 msgid "API key reset by administrator"
 msgstr ""
 
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
 #: Model/DecayingModelsFormulas/Polynomial.php:7
 msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
 msgstr ""
@@ -5233,7 +5509,7 @@ msgstr "den har følgende avhengige elementer"
 
 #: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Legg til attributt"
@@ -5260,8 +5536,8 @@ msgstr ""
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
 #: View/Events/add.ctp:33
-#: View/Feeds/add.ctp:178
-#: View/Feeds/edit.ctp:179
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
 #: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
@@ -5270,7 +5546,7 @@ msgstr "Delegruppe"
 #: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -5286,15 +5562,15 @@ msgstr "Kontekstuell kommentar"
 msgid "for Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/add.ctp:154
+#: View/Attributes/add.ctp:155
 msgid "Timezone missing, auto-detected as: "
 msgstr ""
 
-#: View/Attributes/add.ctp:155
+#: View/Attributes/add.ctp:156
 msgid "The following value will be submited instead: "
 msgstr ""
 
-#: View/Attributes/add.ctp:163
+#: View/Attributes/add.ctp:164
 msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr ""
 
@@ -5355,10 +5631,13 @@ msgstr "Hendelses-ID"
 #: View/DecayingModel/decaying_tool_rest_search.ctp:24
 #: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr ""
 
@@ -5417,7 +5696,7 @@ msgid "Values"
 msgstr "Verdier"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:57
@@ -5439,7 +5718,7 @@ msgid "Replaceattributes"
 msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:80
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Elements/view_galaxy_matrix.ctp:76;211
 #: View/Elements/genericElements/Form/submitButton.ctp:8;25
@@ -5467,7 +5746,7 @@ msgstr ""
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:67
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/UserSettings/set_setting.ctp:36
-#: View/Users/admin_add.ctp:97
+#: View/Users/admin_add.ctp:98
 #: View/Users/admin_edit.ctp:91
 #: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
@@ -5479,7 +5758,7 @@ msgid "Submit"
 msgstr "Sende inn"
 
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
 #: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/exportSearch.ctp:32
@@ -5488,6 +5767,7 @@ msgstr "Sende inn"
 #: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
 #: View/Elements/view_galaxy_matrix.ctp:212
+#: View/Elements/genericElements/infoModal.ctp:40
 #: View/Elements/genericElements/Form/submitButton.ctp:13
 #: View/Elements/serverRuleElements/pull.ctp:73
 #: View/Elements/serverRuleElements/push.ctp:72
@@ -5578,7 +5858,7 @@ msgstr "Advarsel: Du er i ferd med å dele data som er av følsom karakter (Attr
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
 #: View/Users/statistics_data.ctp:19
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr "Egenskaper"
 
@@ -5629,10 +5909,7 @@ msgstr "Resultater for alle attributter"
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -5657,7 +5934,6 @@ msgstr "Resultater for alle attributter"
 #: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:32;106
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -5680,10 +5956,7 @@ msgstr "tidligere"
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -5708,7 +5981,6 @@ msgstr "tidligere"
 #: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:34;108
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -5737,7 +6009,6 @@ msgstr "Dato"
 #: View/Elements/global_menu.ctp:94
 #: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr "Galakser"
@@ -5775,7 +6046,7 @@ msgstr "Observasjoner"
 #: View/Attributes/index.ctp:62
 #: View/Elements/eventattribute.ctp:166
 #: View/Events/view.ctp:262
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr "Aktivitet"
@@ -5785,7 +6056,7 @@ msgstr "Aktivitet"
 #: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/genericElements/IndexTable/headers.ctp:31
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -5794,10 +6065,7 @@ msgstr "Aktivitet"
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -5833,10 +6101,7 @@ msgstr "Handlinger"
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -5861,7 +6126,6 @@ msgstr "Handlinger"
 #: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:99
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -5952,13 +6216,12 @@ msgstr "Er du sikker på at du vil myke-slett Attribute #%s? Egenskapen blir bar
 #: View/Elements/Events/eventIndexTable.ctp:234
 #: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:597
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -5975,106 +6238,6 @@ msgstr "Er du sikker på at du vil myke-slett Attribute #%s? Egenskapen blir bar
 msgid "Delete"
 msgstr "Slett"
 
-#: 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/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: 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:92
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
-#: 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 "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
-#: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
-#: 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:92
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
-#: 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 "Nei"
-
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
@@ -6108,9 +6271,10 @@ msgstr "Ikke endre gjeldende innstillinger"
 #: View/Events/resolved_attributes.ctp:51
 #: View/Events/resolved_misp_format.ctp:98;293
 #: View/Events/view.ctp:159
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:171
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
+#: View/Feeds/index.ctp:184
 #: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
 #: View/Objects/revise_object.ctp:35;69
@@ -6126,23 +6290,27 @@ msgstr "Distrubisjon"
 msgid "For Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr "La dette feltet stå tomt for å legge igjen kommentarfeltet for de valgte attributter uendret."
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr "Merker å <b>fjerne</b>"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr "Merker å <b>legge til</b>"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr "Klynger å <b>fjerne</b>"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr "Klynger å <b>legge til</b>"
 
@@ -6232,12 +6400,16 @@ msgid "Unvetted"
 msgstr ""
 
 #: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
 #: View/EventBlacklists/index.ctp:35
 #: View/EventDelegations/index.ctp:41
 #: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
 #: View/Feeds/preview_index.ctp:25
 #: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
 #: View/ObjectTemplates/index.ctp:47
 #: View/Organisations/index.ctp:75
 #: View/Servers/preview_index.ctp:64
@@ -6245,31 +6417,41 @@ msgstr ""
 #: View/Sightingdb/index.ctp:10
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:81
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
 msgid "Filter"
 msgstr ""
 
 #: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
 #: View/Elements/eventattributetoolbar.ctp:231
 #: View/EventBlacklists/index.ctp:36
 #: View/EventDelegations/index.ctp:42
 #: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
 #: View/Feeds/preview_index.ctp:26
 #: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
 #: View/ObjectTemplates/index.ctp:48
 #: View/Organisations/index.ctp:76
 #: View/Servers/preview_index.ctp:65
 #: View/ShadowAttributes/index.ctp:38
 #: View/Sightingdb/index.ctp:11
-#: View/Users/admin_index.ctp:82
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
 msgid "Enter value to search"
 msgstr "Skriv inn verdien for å søke"
 
 #: View/Communities/index.ctp:34
 #: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
 #: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
 #: View/Feeds/search_caches.ctp:35
 #: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
 #: View/ObjectTemplates/view.ctp:3
 #: View/Organisations/view.ctp:5
 #: View/Pages/doc/administration.ctp:180;221;236
@@ -6278,7 +6460,9 @@ msgstr "Skriv inn verdien for å søke"
 #: View/Taxonomies/view.ctp:4
 #: View/Templates/view.ctp:4
 #: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
 #: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
 #: View/Users/view.ctp:3
 #: View/Warninglists/view.ctp:9
 msgid "Id"
@@ -6297,6 +6481,8 @@ msgid "Community name"
 msgstr ""
 
 #: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
 #: View/DecayingModel/index.ctp:89
 #: View/DecayingModel/view.ctp:21
 #: View/Elements/Servers/View/row_object.ctp:24
@@ -6310,8 +6496,10 @@ msgstr ""
 #: View/Elements/templateElements/templateRowAttribute.ctp:21
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
 #: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:22;113;210
 #: View/Objects/group_attributes_into_object.ctp:8
@@ -6333,10 +6521,18 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
 msgid "Communities index"
 msgstr ""
 
-#: View/Communities/index.ctp:64
+#: View/Communities/index.ctp:72
 msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
 msgstr ""
 
@@ -6405,9 +6601,11 @@ msgid "Message:"
 msgstr ""
 
 #: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
 #: View/Elements/Events/View/row_object.ctp:72
 #: View/Events/resolved_misp_format.ctp:93;288
-#: View/GalaxyClusters/view.ctp:19
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
 #: View/ObjectTemplates/index.ctp:66
 #: View/ObjectTemplates/view.ctp:6
 #: View/Objects/revise_object.ctp:68
@@ -6424,16 +6622,19 @@ msgid "UUID"
 msgstr ""
 
 #: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
 #: View/DecayingModel/index.ctp:88
 #: View/DecayingModel/view.ctp:14
 #: View/Elements/Servers/View/row_object.ctp:19
 #: View/Elements/templateElements/templateRowAttribute.ctp:12
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
 #: View/Feeds/search_caches.ctp:47
 #: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
 #: View/ObjectTemplates/view.ctp:4
 #: View/Objects/add.ctp:206
 #: View/Objects/revise_object.ctp:27
@@ -6445,7 +6646,7 @@ msgstr ""
 #: View/SharingGroups/view.ctp:42;67
 #: View/Sightingdb/index.ctp:51
 #: View/Templates/view.ctp:9
-#: View/Users/statistics_orgs.ctp:31
+#: View/Users/statistics_orgs.ctp:33
 #: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "Navn"
@@ -6469,7 +6670,7 @@ msgstr ""
 #: View/Users/admin_edit.ctp:64
 #: View/Users/admin_view.ctp:72
 #: View/Users/edit.ctp:23
-#: View/Users/view.ctp:31
+#: View/Users/view.ctp:32
 msgid "GnuPG key"
 msgstr "GnuPG-nøkkel"
 
@@ -6478,10 +6679,105 @@ msgid "Community "
 msgstr ""
 
 #: View/Communities/view.ctp:51
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:617
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
 msgid "Request Access"
 msgstr ""
 
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr "valgbar"
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr "Misligholde"
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr "Malnavn"
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
 #: View/DecayingModel/add.ctp:4
 msgid " Decaying Model"
 msgstr ""
@@ -6596,8 +6892,8 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/EventBlacklists/edit.ctp:37
 #: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:200
-#: View/Feeds/index.ctp:282
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
 #: View/News/index.ctp:22
 #: View/OrgBlacklists/edit.ctp:30
 #: View/OrgBlacklists/index.ctp:36
@@ -6689,6 +6985,7 @@ msgstr ""
 #: View/Events/show_i_o_c_results.ctp:12
 #: View/Feeds/freetext_index.ctp:32
 #: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
 #: View/Objects/revise_object.ctp:64
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
@@ -6700,7 +6997,7 @@ msgstr ""
 #: 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:36
+#: View/Users/statistics_orgs.ctp:38
 #: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr ""
@@ -6714,6 +7011,7 @@ msgstr ""
 #: View/Events/resolved_misp_format.ctp:92;287
 #: View/Events/show_i_o_c_results.ctp:13
 #: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
 #: View/Noticelists/view.ctp:42
 #: View/Objects/add.ctp:115
 #: View/Objects/group_attributes_into_object.ctp:58
@@ -6734,12 +7032,14 @@ msgstr ""
 #: View/DecayingModel/decaying_tool_rest_search.ctp:31
 #: View/Events/resolved_attributes.ctp:52
 #: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
 #: View/ObjectReferences/ajax/add.ctp:30
 #: View/Objects/add.ctp:67;119
 #: View/Objects/group_attributes_into_object.ctp:30
 #: View/Objects/revise_object.ctp:49;67
 #: View/Pages/doc/using_the_system.ctp:234;284
 #: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -6758,7 +7058,7 @@ msgid "Decaying Model RestSearch"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_simulation.ctp:45
-#: View/Events/automation.ctp:14
+#: View/Events/automation.ctp:24
 #: View/Logs/admin_index.ctp:20;21
 #: View/Logs/admin_search.ctp:25
 msgid "Search"
@@ -6836,7 +7136,7 @@ msgstr ""
 #: View/Elements/genericElements/org_picker.ctp:17
 #: View/EventBlacklists/add.ctp:36
 #: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
+#: View/Feeds/add.ctp:220
 #: View/Feeds/import_feeds.ctp:20
 #: View/OrgBlacklists/add.ctp:29
 #: View/Regexp/admin_add.ctp:32
@@ -6913,7 +7213,7 @@ msgstr ""
 
 #: View/DecayingModel/index.ctp:97
 #: View/DecayingModel/view.ctp:25
-#: View/Galaxies/view.ctp:22
+#: View/Galaxies/view.ctp:10
 #: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
 #: View/Warninglists/view.ctp:12
@@ -6923,6 +7223,7 @@ msgstr "Versjon"
 #: View/DecayingModel/index.ctp:98
 #: View/DecayingModel/view.ctp:31
 #: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
 #: View/Feeds/view.ctp:63
 #: View/Noticelists/index.ctp:63
 #: View/ObjectTemplates/index.ctp:35
@@ -7036,7 +7337,6 @@ msgstr "se alt"
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr "Velg alle"
 
@@ -7105,6 +7405,8 @@ msgstr "Vis alle attributter"
 
 #: View/Elements/eventattributetoolbar.ctp:6
 #: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
@@ -7142,7 +7444,7 @@ msgstr "Vis bare potensielt falske positive attributter"
 
 #: View/Elements/eventattributetoolbar.ctp:41
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr "Advarsel"
@@ -7254,11 +7556,9 @@ msgstr "%s aktiv regel(er)"
 
 #: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: View/Logs/admin_index.ctp:62
 #: View/Servers/preview_index.ctp:57
 #: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:74
 msgid "Remove filters"
 msgstr "Fjern filtre"
 
@@ -7447,14 +7747,14 @@ msgid "Event Actions"
 msgstr "Hendelseshandlinger"
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:221;264
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr "Liste hendelser"
 
 #: View/Elements/global_menu.ctp:18
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:226;270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
 #: View/Events/add.ctp:7
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
@@ -7462,80 +7762,80 @@ msgid "Add Event"
 msgstr "Legg til arrangement"
 
 #: View/Elements/global_menu.ctp:23
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:289
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr "Egenskapsliste"
 
 #: View/Elements/global_menu.ctp:27
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:294
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr "Søk i egenskaper"
 
 #: View/Elements/global_menu.ctp:31
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr "REST klient"
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:310
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "Se forslag"
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr "Hendelser med forslag"
 
 #: View/Elements/global_menu.ctp:47
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:320
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
 msgid "View delegation requests"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:861
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "Merkeliste"
 
 #: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr "Liste av merkesamlinger"
 
 #: View/Elements/global_menu.ctp:61
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:866
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr "Legg til merke"
 
 #: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:895
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr "Liste Taxonomier"
 
 #: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:923
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "Liste maler"
 
 #: View/Elements/global_menu.ctp:74
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:928
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "Legg til mal"
 
 #: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
@@ -7543,7 +7843,7 @@ msgid "Export"
 msgstr "Eksport"
 
 #: View/Elements/global_menu.ctp:86
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -7553,7 +7853,7 @@ msgid "Automation"
 msgstr "Automasjon"
 
 #: View/Elements/global_menu.ctp:98
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1086
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr "Liste galakser"
 
@@ -7581,7 +7881,7 @@ msgid "Signature Whitelist"
 msgstr "Signatur hviteliste"
 
 #: View/Elements/global_menu.ctp:128
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:378
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr "Vis advarselister"
 
@@ -7602,45 +7902,45 @@ msgid "News"
 msgstr "Nyheter"
 
 #: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Min profil"
 
 #: View/Elements/global_menu.ctp:151
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
 msgid "My Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:155
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:467;699
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
 msgid "Set Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:159
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:471
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "Dashbord"
 
 #: View/Elements/global_menu.ctp:168
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:490
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "Rolle Tillatelser"
 
 #: View/Elements/global_menu.ctp:175
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1130
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr "Objektmalerlister"
 
 #: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:507
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr "Delinggrupperlister"
 
 #: View/Elements/global_menu.ctp:186
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr "Legg til delingsgruppe"
 
@@ -7649,12 +7949,12 @@ msgid "Decaying Models Tool"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:199
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:977
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
 msgid "List Decaying Models"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:206
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:520
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
@@ -7666,12 +7966,12 @@ msgid "Categories & Types"
 msgstr "Kategorier og typer"
 
 #: View/Elements/global_menu.ctp:214
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr "Betingelser og vilkår"
 
 #: View/Elements/global_menu.ctp:218
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:528
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -7701,28 +8001,28 @@ msgid "Sync Actions"
 msgstr "Synkroniser handlinger"
 
 #: View/Elements/global_menu.ctp:240
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:536
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:542
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:250
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "Liste servere"
 
 #: View/Elements/global_menu.ctp:255
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:998
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr "Feed-liste"
 
 #: View/Elements/global_menu.ctp:260
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr "Søk i Feed-mellomlagring"
 
@@ -7735,7 +8035,7 @@ msgid "Add SightingDB Connection"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:612
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
 msgid "List Communities"
 msgstr ""
 
@@ -7750,7 +8050,7 @@ msgid "Administration"
 msgstr "Administrasjon"
 
 #: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:687
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Liste brukere"
@@ -7765,93 +8065,97 @@ msgid "Set User Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:300
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:682
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr "Legg til bruker"
 
 #: View/Elements/global_menu.ctp:304
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:704
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "Kontakt brukere"
 
-#: View/Elements/global_menu.ctp:311
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:477;739
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr "Liste Organisasjoner"
 
-#: View/Elements/global_menu.ctp:315
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr "Legg til organisasjoner"
 
-#: View/Elements/global_menu.ctp:322
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "Liste Roller"
 
-#: View/Elements/global_menu.ctp:326
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr "Legg til roller"
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr "Serverinnstillinger og vedlikehold"
 
-#: View/Elements/global_menu.ctp:343
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:768
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "Jobber"
 
-#: View/Elements/global_menu.ctp:352
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:774
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr "Planlagte oppgaver"
 
-#: View/Elements/global_menu.ctp:361
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr "Handlingssvarteliste"
 
-#: View/Elements/global_menu.ctp:366
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr "Administrere handlingssvartelistene"
 
-#: View/Elements/global_menu.ctp:375
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr "Organisasjonssvarteliste"
 
-#: View/Elements/global_menu.ctp:380
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr "Administrer organisasjonssvartelister"
 
-#: View/Elements/global_menu.ctp:388
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "Revidere"
 
-#: View/Elements/global_menu.ctp:392
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "Logglister"
 
-#: View/Elements/global_menu.ctp:396
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:811
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "Søk Logger"
 
-#: View/Elements/global_menu.ctp:424
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "Logg ut"
@@ -7874,7 +8178,8 @@ msgstr "Attributter per organisasjon"
 
 #: View/Elements/view_event_distribution_graph.ctp:9
 #: View/Elements/view_timeline.ctp:23
-#: View/Layouts/default.ctp:92
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "Laster"
@@ -7909,7 +8214,6 @@ msgstr "Vise"
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:67
 msgid "Filters"
 msgstr "Filtre"
 
@@ -7936,6 +8240,7 @@ msgid "Time scope"
 msgstr ""
 
 #: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
 #: View/Taxonomies/view.ctp:83
 msgid "Tag"
 msgstr ""
@@ -7967,7 +8272,6 @@ msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr "Velg alle hendelser på gjeldende side"
 
@@ -8024,7 +8328,9 @@ msgstr ""
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr "E-post"
@@ -8035,8 +8341,6 @@ msgstr "E-post"
 #: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
 #: View/Events/proposal_event_index.ctp:45;49
 #: View/Feeds/preview_index.ctp:73
-#: View/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
@@ -8062,7 +8366,7 @@ msgid "NEW"
 msgstr "NY"
 
 #: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr "Publiser hendelsen"
 
@@ -8076,7 +8380,7 @@ msgid "Not published"
 msgstr "Ikke publisert"
 
 #: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;364;431;598;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
 #: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr "Er du sikker på at du vil slette # %s?"
@@ -8283,11 +8587,11 @@ msgstr "Hexadecimal representasjon"
 msgid "Switch to binary representation"
 msgstr "Bytt til binær representasjon"
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr "Advarsel, dette synes ikke å være et legitimt"
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr " verdi"
 
@@ -8390,11 +8694,11 @@ msgstr ""
 #: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
 #: View/Events/view.ctp:191
-#: View/GalaxyClusters/view.ctp:32
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
 #: View/Users/admin_view.ctp:95
 msgid "N/A"
@@ -8428,8 +8732,10 @@ msgstr "Last ned konfigurasjon"
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
@@ -8443,15 +8749,17 @@ msgstr "Siste innlogging"
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
 #: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr "laget"
 
 #: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 msgid "Create new credentials and inform user"
 msgstr "Opprett ny legitimasjon og informer brukeren"
 
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr "Er du sikker på at du vil slette #%s? Det anbefales å aldri slette brukere, men å deaktivere dem i stedet."
 
@@ -8488,488 +8796,599 @@ msgstr "Hendelser med forslag:"
 msgid "Delegation requests: "
 msgstr "Delegasjonsforespørsler:"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
+msgstr ""
+
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr "Filter regler"
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr "Regler"
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr "Alder: "
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr "Ikke bufret"
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr "Cache-feed"
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr "klikk her"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr "Feil: Ugyldig hendelse!"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr "Fast hendelse%s"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr "Ny fast hendelse"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
 msgid "Populate From Template"
 msgstr "Sett inn fra mal"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
 msgid "Enrichment Module Result"
 msgstr "Berikningsmodul Resultat"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr "Fritekst Importresultat"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr "Se hendelsen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;887;1116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr "Se korrelasjonsgraf"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr "Se hendelseshistorikk"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
 #: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr "Rediger begivenhet"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr "Slett hendelsen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr "Legg til objekt"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr "Legg til vedlegg"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr "Populere fra ..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr "Berik Event"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr "Merge attributter fra..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr "Foreslå Egenskap"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr "Foreslå vedlegg"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr "Publiser (ingen e-post)"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr "Avpubliser"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
 msgid "Publish Sightings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr "Godta delegasjonsforespørsel"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr "Kast bort delegasjonsforespørsel"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr "Publiser hendelsen til ZMQ"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr "Er du sikker på at du ønsker å publisere gjeldende hendelse til ZMQ-kanalen?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:200
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr "Publiser hendelsen til Kafka"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr "Er du sikker på at du ønsker å publisere den aktuelle hendelsen til Kafka-emnet?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:208
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr "Kontakt Reporter"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:216;303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
 msgstr "Last ned som ..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239;244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr "Legg til tagg samling"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:251
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr "Eksporter tagsamlinger"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr "Importer etikett samlinger"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr "Import fra…"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr "Liste Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr "Ny Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:351
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr "Utfør på eksisterende"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:352
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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 "Er du sikker på at du vil gjenta alle regexreglene på hver attributt i databasen? Denne oppgaven tar lang tid og vil endre data uansett basert på reglene som er konfigurert."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:359
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr "Rediger Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr "Slett Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr "Se advarseliste"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr "Oppdater advarsellister"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:385
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr "Er du sikker på at du vil oppdatere alle advarselslister?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:393
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr "Se notisliste"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr "Oppføre notislister"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:403
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr "Oppdater notislister"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:404
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr "Ønsker du å fortsette og oppdatere alle noticelists?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:414
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr "hvitelister"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:419
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr "Ny hviteliste"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr "Rediger hviteliste"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:430
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr "Slett Whitelist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:440
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr "Rediger Min Profil"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: View/Pages/doc/administration.ctp:126
 #: View/Users/admin_edit.ctp:70
 #: View/Users/change_pw.ctp:4
 msgid "Change Password"
 msgstr "Bytt passord"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:451;649
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr "Tilbakestille passord"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:484;733
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr "Se organisasjon"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:496
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr "Rediger delingsgruppe"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr "Vis delingsgruppe"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:551;581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr "Utforsk ekstern server"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:559
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr "Utforsk Remote Event"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570;1056
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr "Hent denne hendelsen"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:571;1057
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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 "Er du sikker på at du vil hente og lagre denne hendelsen på din instans?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
 #: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr "Rediger server"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr "Nye servere"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:622
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
 msgid "View community"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:630
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
 msgid "Request E-mail"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:642
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr "Vis bruker"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:654
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr "Rediger bruker"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr "Slett bruker"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:668
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr "Rediger rolle"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr "Slett rolle"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:694
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
 msgid "User settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:712
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr "Legg til organisasjon"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr "Rediger organisasjon"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:726
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr "Merge Organisasjon"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:745
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr "Legg til rolle"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:781
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr "Svarteliste hendelse"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:793
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr "Svarteliste Organization"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:820;834
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr "Se tråden"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:825
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr "Legg til innlegg"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:839
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr "Rediger innlegg"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr "Liste tråder"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:849
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr "Ny tråd"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:857
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr "Liste Favorittetiketter"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:873
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr "Rediger merke"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:881;900
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr "Se taksonomi"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:908
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr "Slett Taxonomy"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:915
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr "Oppdater taksonomier"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:935
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr "Se mal"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:941
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr "Rediger mal"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:952
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
 msgid "Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
 msgid "Force Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:962
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
 msgid "Import Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:967
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
 msgid "Add Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:971
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
 msgid "Decaying Tool"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
 msgid "View Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:989
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
 msgid "Edit Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1007
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr "Legg til feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr "Importer feeds fra JSON"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1018
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr "Feed overlapningsanalyse matrise"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1023
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr "Eksporter Feed innstillinger"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr "Rediger feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1036
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr "Se feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1042
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1048
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1066
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr "Se nyheter"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1071
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr "Legg til nyhetselement"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1077
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr "Rediger nyhetselement"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1092
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr "Oppdater galakser"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1093
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr "Er du sikker på at du vil importere alle galakser fra submodulen?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1098
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1099
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr "Er du sikker på at du vil slippe og importere alle galakser fra submodulen?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1106;1122
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr "Se Galaxy"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr "Se klynge"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1135
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr "Oppdater objekter"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1141
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr "Se objektmal"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1149
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
 #: View/Sightingdb/add.ctp:6
 msgid "Add SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1157
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
 msgid "Edit SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1162
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
 msgid "List SightingDB connections"
 msgstr ""
 
@@ -8999,7 +9418,7 @@ msgid "Fix Database Index Schema"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
 msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
 msgstr ""
 
@@ -9007,7 +9426,7 @@ msgstr ""
 msgid "The current database schema does not match the expected format."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;131
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
 msgid "Database schema diagnostic: "
 msgstr ""
 
@@ -9035,52 +9454,52 @@ msgstr ""
 msgid "Actual schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:118
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
 msgid "Fix Database schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:130
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
 msgid "The current database is correct"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:141
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
 msgid "Expected DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:145
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
 msgid "The current database version matches the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:146;151
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
 msgid "Actual DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:150
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
 msgid "The current database version does not match the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
 msgid "Updates are locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158;162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
 msgid "Updates are not locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 #: View/Servers/update_progress.ctp:32
 msgid "Updates are locked due to to many update fails"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 msgid "Updates unlocked in %s"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:167;168
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
 msgid "DataSource: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:203
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
 msgid "Column diagnostic"
 msgstr ""
 
@@ -9742,7 +10161,7 @@ msgstr "Arbeider PID"
 #: View/TagCollections/index.ctp:14
 #: View/UserSettings/index.ctp:56
 #: View/Users/admin_view.ctp:109
-#: View/Users/view.ctp:58
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr "Bruker"
 
@@ -9787,8 +10206,8 @@ msgid "Start a worker"
 msgstr "Start en arbeider"
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
-msgstr "Start alle arbeidere på nytt"
+msgid "Restart dead workers"
+msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
 msgid "Set pull rules"
@@ -9944,10 +10363,6 @@ msgstr "Malbeskrivelse"
 msgid "Template ID"
 msgstr "Mal ID"
 
-#: View/Elements/templateElements/populateTemplateDescription.ctp:8
-msgid "Template Name"
-msgstr "Malnavn"
-
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
 #: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
@@ -10133,7 +10548,7 @@ msgid "Recipient"
 msgstr "Mottaker"
 
 #: View/EventDelegations/index.ctp:82
-#: View/Events/automation.ctp:269;276
+#: View/Events/automation.ctp:279;286
 #: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
@@ -10358,255 +10773,252 @@ msgstr "Pass på at du beholder API-nøkkelen din hemmelig, da den gir tilgang t
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 msgstr "For å se den gamle MISP-automatiseringssiden, klikk <a href=\"automation/1\">her</a> ."
 
-#: 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 nåværende nøkkel er: <code>%s</code>.\n"
-" Du kan %s denne nøkkelen."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
+msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr "tilbakestille"
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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 mulig å søke i databasen for attributter basert på en liste over kriterier."
 
-#: View/Events/automation.ctp:17
+#: View/Events/automation.ctp:27
 #: 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 en hendelse eller en liste over hendelser i et ønsket format, bruker du følgende syntaks"
 
-#: View/Events/automation.ctp:18
+#: View/Events/automation.ctp:28
 msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
 msgstr "Mens en liste over parametere er gitt nedenfor, er det ikke nødvendigvis uttømmende, bestemte eksportformater kan ha flere parametere."
 
-#: View/Events/automation.ctp:21
+#: View/Events/automation.ctp:31
 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 "Angi returformatet for søket (For øyeblikket støttes: json, xml, openioc, suricata, snort - flere formater blir flyttet til hvileSøk med målet at alle søk skal skje gjennom denne APIen). Kan sendes som den første parameteren etter hvileSøk eller via JSON nyttelast."
 
-#: View/Events/automation.ctp:22
+#: View/Events/automation.ctp:32
 msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr "Begrens antall resultater som returneres, avhengig av omfanget (for eksempel 10 attributter eller 10 fulle hendelser)."
 
-#: View/Events/automation.ctp:23
+#: View/Events/automation.ctp:33
 msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
 msgstr "Hvis en grense er angitt, angir siden som skal returneres. side 3, grense 100 vil returnere poster 201->300)."
 
-#: View/Events/automation.ctp:24
+#: View/Events/automation.ctp:34
 #: View/Events/legacy_automation.ctp:268;297
 msgid "Search for the given value in the attributes' value field."
 msgstr "Søk etter den oppgitte verdien i attributternes verdifelt."
 
-#: View/Events/automation.ctp:25
+#: View/Events/automation.ctp:35
 #: View/Events/legacy_automation.ctp:62;199;269;298
 msgid "The attribute type, any valid MISP attribute type is accepted."
 msgstr "Attributtypen, enhver gyldig MISP-attributtype, aksepteres."
 
-#: View/Events/automation.ctp:26
+#: View/Events/automation.ctp:36
 #: View/Events/legacy_automation.ctp:61;270;299
 msgid "The attribute category, any valid MISP attribute category is accepted."
 msgstr "Attributtkategorien, en gyldig MISP-attributtkategori, aksepteres."
 
-#: View/Events/automation.ctp:27
+#: View/Events/automation.ctp:37
 #: View/Events/legacy_automation.ctp:271;300
 msgid "Search by the creator organisation by supplying the organisation identifier."
 msgstr "Søk av skaperen organisasjonen ved å levere organisasjonsidentifikatoren."
 
-#: View/Events/automation.ctp:28
+#: View/Events/automation.ctp:38
 #: 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 å inkludere en tag i resultatene, skriv bare navnene i denne parameteren. For å ekskludere en tag, prepter den med en!!"
 
-#: View/Events/automation.ctp:29
+#: View/Events/automation.ctp:39
 #: 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 "Aktivering av dette (ved å sende \"1\" som argumentet) vil gjøre søket ignorere alle de andre argumentene, bortsett fra auth-nøkkelen og verdien. MISP returnerer en xml / json (avhengig av overskriften sendt) av alle hendelser som har en understrengskamp på verdi i hendelsesinfo, hendelses orgc eller noen av attributverdiene1 / verdi2-feltene, eller i attributtkommentaren."
 
-#: View/Events/automation.ctp:30;150
+#: View/Events/automation.ctp:40;160
 #: 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 "Hendelser med datoen satt til en dato etter den som er angitt i feltet fra (format: 2015-02-15). Dette filteret vil bruke datoen for arrangementet."
 
-#: View/Events/automation.ctp:31;151
+#: View/Events/automation.ctp:41;161
 #: 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 "Hendelser med datoen satt til en dato før den som er angitt i feltet (format: 2015-02-15). Dette filteret vil bruke datoen for arrangementet."
 
-#: View/Events/automation.ctp:32
+#: View/Events/automation.ctp:42
 #: View/Events/legacy_automation.ctp:282;307
 msgid "The events that should be included / excluded from the search"
 msgstr "Hendelsene som skal inkluderes / utelukkes fra søket"
 
-#: View/Events/automation.ctp:33
+#: View/Events/automation.ctp:43
 #: 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 satt, koder vedleggene / zippet malware prøver som base64 i datafeltet innenfor hvert attributt"
 
-#: View/Events/automation.ctp:34
+#: View/Events/automation.ctp:44
 #: View/Events/legacy_automation.ctp:284
 msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
 msgstr "Bare metadataene (hendelser, koder, relasjoner) returneres, attributtene og forslagene utelates."
 
-#: View/Events/automation.ctp:35
+#: View/Events/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr "Begrens resultatene av uuid."
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:46
 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 "Begrens resultatene ved tidsstempel for den siste utgaven av arrangementet. Inngangen kan være en tidsplan eller en kort tidsbeskrivelse (f.eks. 7d eller 24h). Du kan også sende en liste med to verdier for å angi et tidsintervall (for eksempel [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:37
+#: View/Events/automation.ctp:47
 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 "(Utdatert synonym for publish_timestamp) Begrens resultatene ved tidsstempel for siste publisering av arrangementet. Inngangen kan være en tidsplan eller en kort tidsbeskrivelse (f.eks. 7d eller 24h). Du kan også sende en liste med to verdier for å angi et tidsintervall (for eksempel [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:38
+#: View/Events/automation.ctp:48
 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 "Begrens resultatene ved tidsstempel (siste redigering). Eventuelle hendelser med en tidsstempel som er nyere enn den angitte tidsstempel, vil bli returnert. Hvis du har å gjøre med / attributter som omfang, vil attributets tidsstempel brukes til oppslaget. Inngangen kan være en tidsplan eller en kort tidsbeskrivelse (f.eks. 7d eller 24h). Du kan også sende en liste med to verdier for å angi et tidsintervall (for eksempel [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:39
+#: View/Events/automation.ctp:49
 #: 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 "Angi om publiserte eller upubliserte hendelser skal returneres. Ikke sett parameteren hvis du vil ha begge deler."
 
-#: View/Events/automation.ctp:40
+#: View/Events/automation.ctp:50
 #: 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 som ville føre til et treff på en advarselslisteoppføring."
 
-#: View/Events/automation.ctp:41
+#: View/Events/automation.ctp:51
 #: 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 "Som standard (0) returneres alle attributter som samsvarer med de andre filterparametrene, uavhengig av deres to_ids-innstilling. For å begrense det returnerte datasettet til to_ids bare attributter, sett denne parameteren til 1. Du kan bare bruke den spesielle \"ekskluder\" -innstillingen for å bare returnere attributter som har to_ids-flagget deaktivert."
 
-#: View/Events/automation.ctp:42
+#: View/Events/automation.ctp:52
 #: 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 "Hvis denne parameteren er satt til 1, vil den returnere myke slettede attributter sammen med aktive. Ved å bruke \"only\" som en parameter, vil det begrense det returnerte datasettet til bare slettede data."
 
-#: View/Events/automation.ctp:43
+#: View/Events/automation.ctp:53
 #: 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 bare å inkludere hendelses-ID, inkluderer også arrangementet UUID i hvert av attributter."
 
-#: View/Events/automation.ctp:44
+#: View/Events/automation.ctp:54
 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 "Returner bare attributter fra hendelser som har mottatt en endring etter det angitte tidsstempelet. Inngangen kan være en tidsplan eller en kort tidsbeskrivelse (f.eks. 7d eller 24h). Du kan også sende en liste med to verdier for å angi et tidsintervall (for eksempel [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:45
+#: View/Events/automation.ctp:55
 msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
 msgstr "Hvis dette flagget er angitt, vil ikke delingsgruppeobjekter bli inkludert, i stedet blir bare delingsgruppen ID satt."
 
-#: View/Events/automation.ctp:46
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr "Filtrer på informasjonens felt."
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr "Hvis du vil eksportere alle attributter av typer ip-src og ip-dst som har en TLP-merking og ikke er merket TLP: rød, bruk syntaksen nedenfor. Stringsøk er som standard eksakte oppslag, men du kan bruke mysql stil \"%\" jokertegn for å gjøre undersøkelser."
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr "CSV-spesifikke parametere for restenSearch-APIer"
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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 "Bare CSV, velg feltene du vil inkludere i CSV-eksporten. Ved å sette inn hendelsesnivåfelt i tillegg, inkludererContext ikke nødvendig å få hendelse-metadata."
 
-#: View/Events/automation.ctp:81
+#: View/Events/automation.ctp:91
 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 "Bare CSV, legg til flere hendelsesnivådata til eksporten. De ekstra feltene kan legges til via requested_attributes også med mer granularitet."
 
-#: View/Events/automation.ctp:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr "Den CSV som er opprettet når denne innstillingen er satt til sann, vil ikke inneholde toppraden."
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr "URL-parametere"
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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 "Det er også mulig å sende alle ovennevnte parametere via URL-parametere, men dette er svært motløs. Hvis du imidlertid ikke har andre alternativer, bare passere parametrene på følgende måte:"
 
-#: View/Events/automation.ctp:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr "Som du kan se over, kan \"||\" brukes til å legge til flere verdier til en \"liste\" og alle parametere blir sendt som nøkkel: verdig komponentene til nettadressen. Husk at visse spesialtegn i nettadresser kan forårsake problemer, søkene dine kan ende opp med å bli lekket til logger under transitt, og det er lengdebegrensninger å ta hensyn til. Bruk dette som en siste utvei."
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr "RPZ-spesifikke parametere for restSearch-APIer"
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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-sonefiler for DNS-brannmur ved å bruke RPZ-eksportfunksjonaliteten til MISP. Filen som genereres vil inkludere alle IDS-merkede domene, vertsnavn og IP-src / IP-dst-attributtverdier som du har tilgang til."
 
-#: View/Events/automation.ctp:97
+#: View/Events/automation.ctp:107
 #: 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 injisere headerverdier i sonefilen, samt definere handlingen som er tatt for hver av verdiene som alle kan overstyres. Disse verdiene er som standard enten standardverdiene som sendes med programmet, eller de som er overstyrt av nettstedets administrator. Verdiene er som følger"
 
-#: View/Events/automation.ctp:101
+#: View/Events/automation.ctp:111
 #: View/Events/legacy_automation.ctp:180
 msgid "To override the above values, either use the url parameters as described below"
 msgstr "For å overstyre de ovennevnte verdiene, bruk enten urlparametrene som beskrevet nedenfor"
 
-#: View/Events/automation.ctp:103
+#: View/Events/automation.ctp:113
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr "eller POST et XML- eller JSON-objekt med de ovenfor angitte alternativene"
 
-#: View/Events/automation.ctp:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr "Bro IDS eksport"
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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 av alle attributter av en bestemt brotype til en formatert ren tekstfil. Som standard blir bare publiserte og IDS-flaggede attributter eksportert."
 
-#: View/Events/automation.ctp:109
+#: View/Events/automation.ctp:119
 #: 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 verktøyene dine for å automatisk laste ned en fil en av Bro-typene."
 
-#: View/Events/automation.ctp:115
+#: View/Events/automation.ctp:125
 #: 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 å begrense resultatene med koder, bruk vanlig syntaks. Vær oppmerksom på kolonene (:) kan ikke brukes i taggssøkingen. Bruk somikolon i stedet (søket søker automatisk etter kolon i stedet). For å få ip-verdier fra hendelser merket tag1, men ikke tag2 bruk"
 
-#: View/Events/automation.ctp:118
+#: View/Events/automation.ctp:128
 #: 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 mulig å begrense broeksporten basert på et sett med filtre. Legg et JSON-objekt eller et XML på Bro API for å filtrere resultatene."
 
-#: View/Events/automation.ctp:136
+#: View/Events/automation.ctp:146
 #: 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å mulig å sende filtre via parameterne i nettadressen, men det anbefales å bruke POST-forespørsler med JSON-objekter i stedet. Formatet er som beskrevet nedenfor"
 
-#: View/Events/automation.ctp:138
+#: View/Events/automation.ctp:148
 #: 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 er akseptert. Kartleggingen mellom Bro og MISP-typer er som følger"
 
-#: View/Events/automation.ctp:145
+#: View/Events/automation.ctp:155
 #: 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"
@@ -10615,47 +11027,47 @@ msgstr "For å inkludere en tag i resultatene, skriv bare navnene i denne parame
 " Du kan også koble flere tagkommandoer sammen med operatøren '&amp;&amp;'. Vær oppmerksom på kolonene (:) kan ikke brukes i taggssøkingen.\n"
 " Bruk somikoloner i stedet (søket søker automatisk etter kolonner i stedet)."
 
-#: View/Events/automation.ctp:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr "Begrens resultatene til de angitte hendelses-IDene."
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr "Tillat at attributter skal eksporteres som ikke er merket som \"to_ids\"."
 
-#: View/Events/automation.ctp:152
+#: View/Events/automation.ctp:162
 #: 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 "Hendelser publisert innen den siste x tid, hvor x kan defineres i dager, timer, minutter (for eksempel 5d eller 12h eller 30m). Dette filteret vil bruke det publiserte tidsstempelet til arrangementet."
 
-#: View/Events/automation.ctp:153
+#: View/Events/automation.ctp:163
 #: 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 som har et treff på en advarsel, vil bli ekskludert."
 
-#: View/Events/automation.ctp:155
+#: View/Events/automation.ctp:165
 #: 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økeordene falske eller null skal brukes til valgfrie tomme parametere i nettadressen."
 
-#: View/Events/automation.ctp:156
+#: View/Events/automation.ctp:166
 #: 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 for eksempel vil hente alle attributter for hendelsen # 5, inkludert ikke-IDS-merkede attributter, bruker du følgende linje"
 
-#: View/Events/automation.ctp:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr "Eksporter attributter av hendelsen med spesifisert type som XML"
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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 "Hvis du vil eksportere alle attributter av en forhåndsdefinert type som tilhører en hendelse, bruker du følgende syntaks"
 
-#: View/Events/automation.ctp:162
+#: View/Events/automation.ctp:172
 #: 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"
@@ -10664,176 +11076,176 @@ msgstr "sigOnly er et valgfritt flagg som vil blokkere alle attributter fra å b
 " Det er mulig å søke etter flere typer med &amp;&amp;-operatøren og ekskludere verdier med '!' operatør. \n"
 " For eksempel å få alle IDS-signaturattributter av typen md5 og sha256, men ikke filnavn | md5 og filnavn | sha256 fra hendelse 25, bruk følgende"
 
-#: View/Events/automation.ctp:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr "Last ned vedlegg eller skadelig programvareeksempel"
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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 "Hvis du kjenner attributt-IDen til en malware-prøve eller et vedlegg, kan du laste den ned med følgende syntaks"
 
-#: View/Events/automation.ctp:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr "Last ned malware-utvalg etter hash"
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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 "Du kan også laste ned prøver ved å kjenne sin MD5 hash. Bare passer hashen som et JSON / XML-objekt eller i URL-adressen (med URL-adressen som overstyrer de bestått objektene) for å motta et JSON / XML-objekt tilbake med den zippede sample base64 kodet sammen med noe kontekstuell informasjon."
 
-#: View/Events/automation.ctp:172
+#: View/Events/automation.ctp:182
 #: 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 "Du kan også bruke denne API for å få alle eksempler fra hendelser som inneholder passordet hash. For denne funksjonaliteten, bare passere \"allSamples\" flagg langs. Merk at hvis du får alle prøver fra matchende hendelser, kan du bruke alle støttede hashtyper (%s) for oppslaget. </p>"
 
-#: View/Events/automation.ctp:173
+#: View/Events/automation.ctp:183
 #: 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 "Du kan også få alle prøvene fra et arrangement med en gitt hendelses-ID, ved å passere eventID-parameteren. Pass på at enten en hendelse-ID eller en hash er sendt videre, ellers vil en feilmelding bli returnert. Også, hvis ingen hash er satt, vil allSamples-flagget settes automatisk."
 
-#: View/Events/automation.ctp:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr "POST-meldings nyttelast (XML)"
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr "POST-meldings nyttelast (json)"
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr "En rask beskrivelse av alle parametrene i det bestått objektet"
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:194
 #: 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 satt, kan dette være ett av følgende: %s"
 
-#: View/Events/automation.ctp:185
+#: View/Events/automation.ctp:195
 #: 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 "Hvis den er satt, vil den returnere alle prøver fra hendelser som har en match for hashen som er angitt ovenfor."
 
-#: View/Events/automation.ctp:186
+#: View/Events/automation.ctp:196
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr "Hvis den er satt, vil den bare hente data fra den angitte hendelses-IDen."
 
-#: View/Events/automation.ctp:187
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr "Last opp malware-prøver ved hjelp av \"Upload Sample\" API"
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:199
 #: 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 "Denne API-en tillater deg å fylle ut et arrangement som du har rett til å endre med malware-prøver (og alle relaterte hashes). Alternativt, hvis du ikke leverer en hendelse-ID, vil den skape en ny hendelse for deg."
 
-#: View/Events/automation.ctp:190
+#: View/Events/automation.ctp:200
 #: 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 "Filene må være base64 kodet og POSTed som forklart nedenfor. Alle eksempler vil bli zippet og passordbeskyttet (med passordet er \"infisert\"). Raskene i den opprinnelige filen vil bli tatt som ekstra attributter."
 
-#: View/Events/automation.ctp:191
+#: View/Events/automation.ctp:201
 #: 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 "Hendelses-ID er valgfritt. MISP vil akseptere enten et JSON eller et XML-objekt som er lagt inn på nettadressen ovenfor."
 
-#: View/Events/automation.ctp:192
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr "Den generelle strukturen til de forventede objektene er som følger"
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr "Følgende valgfrie parametre er forventet"
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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 "Hendelsens ID er valgfritt. Det kan enten leveres via URL eller POSTed-objektet, men nettadressen har prioritet hvis begge er oppgitt. Hvis du ikke leverer en hendelse-ID, vil MISP skape en enkelt ny hendelse for alle POSTed-malware-prøvene. Du kan definere standardinnstillingene for hendelsen, ellers vil et sett med standardinnstillinger bli brukt."
 
-#: View/Events/automation.ctp:203
+#: View/Events/automation.ctp:213
 #: 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 "Distribusjonsinnstillingen som brukes for attributter og for den nyopprettede hendelsen, hvis relevant. [0-3]"
 
-#: View/Events/automation.ctp:204
+#: View/Events/automation.ctp:214
 #: 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 "Du kan flagge alle attributter opprettet under transaksjonen som skal merkes som \"to_ids\" eller ikke."
 
-#: View/Events/automation.ctp:205
+#: View/Events/automation.ctp:215
 #: 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 "Kategorien som vil bli tildelt de opplastede prøvene. Gyldige alternativer er: Levering av nyttelast, Artefacts droppet, Lastbelastning, Ekstern analyse."
 
-#: View/Events/automation.ctp:206
+#: View/Events/automation.ctp:216
 #: 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 "Brukes til å fylle feltet for hendelsesinfo hvis ingen hendelses-ID er levert. Alternativt, hvis ikke satt, vil MISP ganske enkelt generere en melding som viser at det er en skadevaresamling generert på den oppgitte dagen."
 
-#: View/Events/automation.ctp:207
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr "Analysenivået for den nyopprettede hendelsen, hvis aktuelt. [0-2]"
 
-#: View/Events/automation.ctp:208
+#: View/Events/automation.ctp:218
 #: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr "Tredje nivå ID for den nyopprettede hendelsen, hvis aktuelt. [0-3]"
 
-#: View/Events/automation.ctp:209
+#: View/Events/automation.ctp:219
 #: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr "Dette vil fylle ut kommentarfeltet for ethvert attributt som er opprettet ved hjelp av denne APIen."
 
-#: View/Events/automation.ctp:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr "Legg til eller fjern tagger fra hendelser"
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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 legge til eller fjerne en eksisterende tag fra en hendelse på følgende måte"
 
-#: View/Events/automation.ctp:214
+#: View/Events/automation.ctp:224
 #: 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 "Bare POST en json-objekt i følgende format (til riktig API, avhengig av om du vil legge til eller slette en tag fra en hendelse)"
 
-#: View/Events/automation.ctp:216
+#: View/Events/automation.ctp:226
 #: 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 "Hvor \"tag\" er IDen til taggen. Du kan også bruke navnet på taggen på følgende måte"
 
-#: View/Events/automation.ctp:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr "Forslag og API"
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: 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 samhandle med forslagene via API direkte siden versjon 2.3.148"
 
-#: View/Events/automation.ctp:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:74
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -10841,201 +11253,201 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr "Forklaring"
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr "Forventet nyttelast"
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
 #: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr "Respons"
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr "Se et forslag"
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr "ShadowAttribute-objekt"
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr "Se alle forslag til org-arrangementene mine"
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr "ShadowAttribute objekter"
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr "Se alle forslag til en begivenhet"
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr "Foreslå et nytt attributt til en hendelse"
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr "Foreslå en redigering til et attributt"
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr "Godta et forslag"
 
-#: View/Events/automation.ctp:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr "Kast et forslag"
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr "Når du legger inn et skyggeattributtobjekt, bruker du følgende formater"
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:294
 #: 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 "Ingen av de ovennevnte feltene er obligatorisk, men minst en av dem må oppgis."
 
-#: View/Events/automation.ctp:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr "Filtrering av hendelsesmetadata"
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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 "Som beskrevet i REST-delen, er det mulig å hente en liste over hendelser sammen med metadataene sine ved å sende en GET-forespørsel til / hendelses-API. Imidlertid er denne API-en spesielt litt mer allsidig. Du kan sende søkeparametre sammen for å søke blant hendelsene i ulike felt og hente en liste over matchende hendelser (sammen med metadataene sine). Bruk følgende URL"
 
-#: View/Events/automation.ctp:291
+#: View/Events/automation.ctp:301
 #: 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 "Legg et JSON-objekt med de ønskede oppslagsfeltene og verdiene for å motta en JSON-tilbake. <br /> \n"
 " Et eksempel på en gyldig oppslag"
 
-#: View/Events/automation.ctp:302
+#: View/Events/automation.ctp:312
 #: 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 "Ovennevnte ville returnere noe som publiseres, ikke bare begrenset til organisasjonen din, som har begrepet \"Locky\" i hendelsesbeskrivelsen. Du kan bruke utropstegn for å negere en verdi der det er aktuelt."
 
-#: View/Events/automation.ctp:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr "Listen over gyldige parametere"
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr "Filtre på publiserte eller upubliserte hendelser [0,1] - negatable"
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr "Filtre på strenger funnet i hendelsesinfo - negativ"
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr "Filtre på vedlagte tagnavn - negatable"
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr "Filtre på bestemte hendelses-IDer - negativ"
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr "Filtre på et gitt begivenhetsrisiko nivå [1,2,3,4] - negatable"
 
-#: View/Events/automation.ctp:309
+#: View/Events/automation.ctp:319
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr "Filtre på distribusjonsnivået [0,1,2,3] - negatable"
 
-#: View/Events/automation.ctp:310
+#: View/Events/automation.ctp:320
 #: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr "Filtre på den aktuelle analysefasen av hendelsen [0,1,2] - negativ"
 
-#: View/Events/automation.ctp:311
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr "Filtre på en inneholdt attributtverdi - negativ"
 
-#: View/Events/automation.ctp:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr "Filtre på skaperen organisasjonen - negativ"
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr "Filtre på skaperen brukerens e-postadresse (kun admin) - negativ"
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:324
 #: 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 "Filtre på datoen, noe som er nyere enn den oppgitte datoen i YYYY-MM-DD-format, er tatt - ikke-negativ"
 
-#: View/Events/automation.ctp:315
+#: View/Events/automation.ctp:325
 #: 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, noe som er eldre enn den oppgitte datoen i YYYY-MM-DD-format, er tatt - ikke-negativ"
 
-#: View/Events/automation.ctp:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr "Freetext importverktøyet er også utsatt for API."
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
 msgstr "Bare POST innholdet som skal analyseres og enten direkte opprette attributter ut av dem eller bare returnere resultatene for analysering."
 
-#: View/Events/automation.ctp:322
+#: View/Events/automation.ctp:332
 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 "Bruk de boolske (0/1) adhere_to_warninglists og return_meta_attributes url parametere for å filtrere ut verdier som sniker seg over en advarselliste og bestemme om du vil lagre attributene som analyseres eller bare returnere dem som meta attributter."
 
-#: View/Events/automation.ctp:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr "Innholdet i POST-kroppen skal være teksten som skal analyseres."
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -11246,7 +11658,7 @@ msgid "Ongoing"
 msgstr "Pågående"
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr "Mål"
@@ -11298,18 +11710,18 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 msgid "Events"
 msgstr "Hendelser"
 
 #: View/Events/index.ctp:34
 #: View/Logs/admin_index.ctp:54
 #: View/Servers/preview_index.ctp:37
-#: View/Users/admin_index.ctp:54
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr "Endre filtre"
 
@@ -11345,6 +11757,12 @@ msgstr "Automatiseringsfunksjonalitet er laget for å automatisk generere signat
 msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr "Pass på at du holder nøkkelen hemmelig, da den gir tilgang til hele databasen !"
 
+#: View/Events/legacy_automation.ctp:7
+msgid "Your current key is: <code>%s</code>.\n"
+"    You can %s this key."
+msgstr "Din nåværende nøkkel er: <code>%s</code>.\n"
+" Du kan %s denne nøkkelen."
+
 #: 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 versjon 2.2 er bruken av godkjenningsnøkkelen i nettadressen utdatert. I stedet, send auth-nøkkelen i en autorisasjonsoverskrift i forespørselen. Det arvelige alternativet med å ha auth-nøkkelen i nettadressen, støttes midlertidig, men anbefales ikke."
@@ -11804,7 +12222,6 @@ msgstr "Vellykkede attributter"
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -11945,6 +12362,7 @@ msgid "View request details"
 msgstr "Se forespørselsdetaljer"
 
 #: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
 #: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr "Funksjonshemmet"
@@ -12106,7 +12524,7 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr "Publiser, men ikke send varsel email? Bare for mindre endringer!"
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: View/Feeds/index.ctp:105
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -12140,78 +12558,81 @@ msgstr "Dette fjerner alle korrelasjoner som allerede eksisterer for arrangement
 msgid "Add MISP Feed"
 msgstr "Legg til MISP Feed"
 
-#: View/Feeds/add.ctp:5
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
+msgstr ""
+
+#: View/Feeds/add.ctp:12
 msgid "Add a new MISP feed source."
 msgstr "Legg til en ny MISP-kilde."
 
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
+#: View/Feeds/add.ctp:14
 #: View/Feeds/view.ctp:64
 msgid "Caching enabled"
 msgstr "Caching aktivert"
 
-#: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr "Oppslag synlig"
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:21
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr "Feed navn"
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
 #: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr "Forsørger"
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:26
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr "Navn på innholdsleverandøren"
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr "Inngangskilde"
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:66
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr "Fjern inntak etter inntak"
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:75
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr "Nettadressen til feedet"
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:79
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr "Kildeformat"
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:38
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr "Eventuelle overskrifter som skal sendes med forespørsler (for eksempel: Autorisasjon)"
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:42
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr "Linjeskift separert liste over overskrifter i formatet \"overskriftnavn: verdi\""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:46
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr "Legg til Basic Auth"
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:50
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr "Brukernavn"
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:54
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -12220,127 +12641,126 @@ msgstr "Brukernavn"
 msgid "Password"
 msgstr "Passord"
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:58
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr "Legg til grunnleggende auth header"
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:88
-msgid "Target Event"
-msgstr "Målbegivenhet"
-
 #: View/Feeds/add.ctp:94
 #: View/Feeds/edit.ctp:98
-msgid "Target Event ID"
+msgid "Creator organisation"
 msgstr ""
 
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:100
-msgid "Leave blank unless you want to reuse an existing event."
-msgstr "La være tom hvis du ikke vil gjenbruke en eksisterende begivenhet."
-
 #: View/Feeds/add.ctp:104
 #: View/Feeds/edit.ctp:108
-msgid "Value field(s) in the CSV"
-msgstr "Verdifelt (e) i CSV"
+msgid "Target Event"
+msgstr "Målbegivenhet"
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:109
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr "Velg ett eller flere felt som skal analyseres av CSV-parseren og konverteres til MISP-attributter"
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:111
-msgid "2,3,4 (column position separated by commas)"
-msgstr "2,3,4 (kolonneposisjon adskilt av kommaer)"
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:119
-msgid "Delimiter"
-msgstr "delimiter"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
+msgstr ""
 
 #: View/Feeds/add.ctp:116
 #: View/Feeds/edit.ctp:120
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr "La være tom hvis du ikke vil gjenbruke en eksisterende begivenhet."
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr "Verdifelt (e) i CSV"
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
+msgstr "Velg ett eller flere felt som skal analyseres av CSV-parseren og konverteres til MISP-attributter"
+
+#: View/Feeds/add.ctp:127
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr "2,3,4 (kolonneposisjon adskilt av kommaer)"
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr "delimiter"
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
 msgid "Set the default CSV delimiter (default = \",\")"
 msgstr "Angi standard CSV-avgrenser (standard = \",\")"
 
-#: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:130
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr "Utelukkelse Regex"
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:131
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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 "Legg til et regex-mønster for å oppdage iocs som skal hoppes over (dette kan være nyttig for å utelukke eventuelle referanser til den faktiske rapporten / feeden for eksempel)"
 
-#: View/Feeds/add.ctp:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr "Regex mønster, for eksempel: \"/ ^ https: // myfeedurl / i"
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:141
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr "Automatisk publisering"
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 msgid "Publish events directly after pulling the feed - if you would like to review the event before publishing uncheck this"
 msgstr "Publiser hendelser direkte etter at du har trukket inn feedet - hvis du vil vurdere hendelsen før du publiserer, fjerner du merket for dette"
 
-#: View/Feeds/add.ctp:148
-#: View/Feeds/edit.ctp:150
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr "Overstyr IDS-flagg"
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:151
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr "Hvis det er merket, vil IDS-flaggene alltid bli satt til av når du trekker fra denne strømmen"
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:160
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr ""
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:161
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr "Slett attributter (bare legg til nye attributter, fjern tilbakekalte attributter)"
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr "Standard-tagg"
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:193
-msgid "Filter rules"
-msgstr "Filter regler"
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:194
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr "Hendelser med følgende tagger tillatt"
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:195
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr "Hendelser med følgende koder er blokkert"
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:196
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr "Hendelser med følgende organisasjoner tillatt"
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:197
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr "Hendelser med følgende organisasjoner blokkert"
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:198
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
 #: View/Servers/add.ctp:116
 #: View/Servers/edit.ctp:155;162
 msgid "Modify"
@@ -12358,64 +12778,64 @@ msgstr ""
 msgid "Edit MISP Feed"
 msgstr "Rediger MISP Feed"
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr "Rediger en ny MISP-feedkilde."
 
-#: View/Feeds/edit.ctp:133
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr "Regex-mønster, for eksempel: \"/ ^ https: // myfeedurl / i\""
 
-#: View/Feeds/edit.ctp:213
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr "Basisadressen til den eksterne serveren du vil synkronisere med. Eksempel: https://misppriv.circl.lu"
 
-#: View/Feeds/edit.ctp:214
+#: View/Feeds/edit.ctp:234
 #: View/Servers/add.ctp:146
 #: View/Servers/edit.ctp:190
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr "Et navn som gjør det klart for brukerne hva denne forekomsten er. For eksempel: Organisasjons A-forekomst"
 
-#: View/Feeds/edit.ctp:215
+#: View/Feeds/edit.ctp:235
 #: View/Servers/add.ctp:147
 #: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr "Organisasjonen har den eksterne serveren du vil synkronisere med. Eksempel: BE"
 
-#: View/Feeds/edit.ctp:216
+#: View/Feeds/edit.ctp:236
 #: View/Servers/add.ctp:148
 #: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr "Du kan finne godkjenningsnøkkelen på profilen din på den eksterne serveren."
 
-#: View/Feeds/edit.ctp:217
+#: View/Feeds/edit.ctp:237
 #: View/Servers/add.ctp:149
 #: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr "Tillat opplasting av hendelser og deres attributter."
 
-#: View/Feeds/edit.ctp:218
+#: View/Feeds/edit.ctp:238
 #: View/Servers/add.ctp:150
 #: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr "Tillat nedlasting av hendelser og deres attributter fra serveren."
 
-#: View/Feeds/edit.ctp:219
+#: View/Feeds/edit.ctp:239
 #: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr "Unpublish ny aktivitet (arbeider med Push-hendelse)."
 
-#: View/Feeds/edit.ctp:220
+#: View/Feeds/edit.ctp:240
 #: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr "Publiser ny aktivitet uten e-post (jobber med Pull-hendelse)."
 
-#: View/Feeds/edit.ctp:221
+#: View/Feeds/edit.ctp:241
 #: View/Servers/edit.ctp:196
 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å laste opp en sertifikatfil hvis forekomsten du prøver å koble til, har sin egen signeringsmyndighet."
 
-#: View/Feeds/edit.ctp:222
+#: View/Feeds/edit.ctp:242
 #: View/Servers/add.ctp:154
 #: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
@@ -12445,137 +12865,128 @@ msgstr "Lim inn en MISP-feedmetadata JSON nedenfor for å legge til feeds."
 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 "Generer feed oppslag caches eller hente feed data (bare aktiverte feeds)"
-
-#: View/Feeds/index.ctp:5
-msgid "Cache all feeds"
-msgstr "Cache alle feeds"
-
-#: View/Feeds/index.ctp:6
-msgid "Cache freetext/CSV feeds"
-msgstr "Cachefreetext / CSV feeds"
-
-#: View/Feeds/index.ctp:7
-msgid "Cache MISP feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:8
-msgid "Fetch and store all feed data"
-msgstr "Hent og lagre alle matdata"
-
-#: View/Feeds/index.ctp:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr "Aktiver valgt"
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr "Deaktiver valgt"
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr "Aktiver caching for valgt"
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr "Deaktiver caching for valgt"
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr "Standard feeds"
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr "Tilpassede feeder"
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr "Alle feeds"
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr "Aktiverte feeder"
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr "Gjør det mulig å trekke feedet inn i MISP som hendelser / attributter."
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr "Aktiver caching av fôret til Redis - slik at korrelasjoner til feedet kan vises."
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr "Feedformat"
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr ""
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr "Overstyr IDS"
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr "caching"
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
-msgstr "Se feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr "Aktiver caching av fôret til Redis - slik at korrelasjoner til feedet kan vises."
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: View/Pages/doc/using_the_system.ctp:145
+#: View/Sightings/ajax/list_sightings.ctp:8
+#: View/Users/statistics_sightings.ctp:9
+msgid "Source"
+msgstr "Kilde"
+
+#: View/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr "overskrifter"
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
+msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:55
-#: View/Servers/index.ctp:120;121
-msgid "Rules"
-msgstr "Regler"
+msgid "Override"
+msgstr ""
 
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
-msgstr "Feil: Ugyldig hendelse!"
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
+msgstr ""
 
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
-msgstr "Fast hendelse%s"
+#: View/Feeds/index.ctp:196
+msgid "Visible"
+msgstr ""
 
 #: View/Feeds/index.ctp:211
-msgid "New fixed event"
-msgstr "Ny fast hendelse"
+msgid "Feeds"
+msgstr ""
 
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:141
-msgid "Age: "
-msgstr "Alder: "
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
+msgstr "Generer feed oppslag caches eller hente feed data (bare aktiverte feeds)"
 
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:149
-msgid "Not cached"
-msgstr "Ikke bufret"
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
+msgstr ""
 
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
-msgstr "Cache-feed"
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
+msgstr "Cache alle feeds"
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr "Cachefreetext / CSV feeds"
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr "Hent og lagre alle matdata"
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr "Utforsk hendelsene eksternt"
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr "Hent alle hendelser"
 
-#: View/Feeds/index.ctp:283
-msgid "Are you sure you want to permanently remove the feed (%s)?"
-msgstr "Er du sikker på at du vil fjerne feedet (%s) permanent?"
+#: View/Feeds/index.ctp:294
+msgid "Are you sure you want to permanently remove the feed?"
+msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr "Last ned feedmetadata som JSON"
 
@@ -12628,26 +13039,39 @@ msgstr "Dekning av andre feeds"
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr "Ikon"
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr "versjon"
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
 #: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr "namespace"
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
-msgstr "Er du sikker på at du vil slette Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
+msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr ""
 
-#: View/Galaxies/view.ctp:29
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr "Drep kjedeordre"
 
@@ -12655,33 +13079,30 @@ msgstr "Drep kjedeordre"
 msgid "Toggle ATT&CK Matrix"
 msgstr "Bytt ATT&CK Matrix"
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr "Foreldre Galaxy"
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr "Samling UUID"
 
-#: View/GalaxyClusters/view.ctp:23
-#: View/Pages/doc/using_the_system.ctp:145
-#: View/Sightings/ajax/list_sightings.ctp:8
-#: View/Users/statistics_sightings.ctp:9
-msgid "Source"
-msgstr "Kilde"
-
-#: View/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr "Forfattere"
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -12690,23 +13111,17 @@ msgstr ""
 msgid "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."
 msgstr "Er du sikker på at du vil slette Galaxy Cluster%s? <br /> Tilknyttede koder blir ikke fjernet. Du kan når som helst laste på Galaxy Cluster ved å oppdatere dine galakser."
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr "Synonymer"
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr "#Arrangementer"
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr "Se graf"
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
-msgstr "Slett galakse-klyngen"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
+msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
 msgid "Key"
@@ -12716,6 +13131,27 @@ msgstr ""
 msgid "Start the galaxy matrix picker"
 msgstr "Start galakseringsmatrisen"
 
+#: View/Inbox/index.ctp:31
+#: 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 "Tittel"
+
+#: View/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr "Rense jobboppføringer:"
@@ -12736,12 +13172,6 @@ msgstr "Fullført."
 msgid "Show all queues"
 msgstr "Vis alle køer"
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr "Misligholde"
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr "Vis standard kø"
@@ -12779,6 +13209,11 @@ msgstr "Arbeider"
 msgid "Job type"
 msgstr "Type jobb"
 
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
+msgstr ""
+
 #: View/Jobs/index.ctp:106
 #: View/Pages/doc/administration.ctp:229
 msgid "Retries"
@@ -12860,6 +13295,7 @@ msgstr "fra IP"
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
 #: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -12867,13 +13303,6 @@ msgstr "fra IP"
 msgid "Organisation"
 msgstr "Organisasjonen"
 
-#: 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 "Tittel"
-
 #: View/Logs/admin_search.ctp:21
 #: View/Pages/doc/administration.ctp:186;199
 msgid "Change"
@@ -12924,10 +13353,6 @@ msgstr ""
 msgid "geographical_area"
 msgstr "geografisk område"
 
-#: View/Noticelists/index.ctp:35
-msgid "version"
-msgstr "versjon"
-
 #: View/Noticelists/index.ctp:36
 #: View/Pages/doc/using_the_system.ctp:371
 msgid "enabled"
@@ -13495,7 +13920,7 @@ msgstr "Se alt"
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr "logo"
 
@@ -13529,12 +13954,12 @@ msgid "Last modified"
 msgstr "Sist endret"
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:37
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr "Sektor"
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:35
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr "Nasjonalitet"
 
@@ -14076,7 +14501,7 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr "En rullegardinliste lar deg velge en rollegruppe som brukeren skal tilhøre. Roller definerer brukerens privilegier. For å lære mer om roller, <a href=#roles>klikk her</a> ."
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:76
+#: View/Users/admin_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -14087,7 +14512,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr "Dette alternativet abonnerer den nye brukeren til automatisk generert e-post når en hendelse blir publisert."
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -14100,7 +14525,7 @@ msgstr "Dette alternativet abonnerer den nye brukeren på e-postmeldinger som ge
 #: 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr ""
 
@@ -14153,6 +14578,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr "E-postadressen (og innloggingsnavn) til brukeren."
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -15483,10 +15909,6 @@ msgstr "Dette skjemaet lar deg legge til attributter."
 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 "Denne rullegardinmenyen forklarer kategorien av attributtet, noe som betyr hvilket aspekt av malware dette attributet beskriver. Dette kan bety utholdenhetsmekanismer for skadelig programvare eller nettverksaktivitet, etc. For en liste over gyldige kategorier,%s"
 
-#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
-msgid "click here"
-msgstr "klikk her"
-
 #: 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 "Mens kategorier bestemmer hvilket aspekt av en hendelse de beskriver, forklarer typen ved hvilken måte aspektet beskrives. Eksempelvis kan kilde-IP-adressen til et angrep, en kilde-e-postadresse eller en fil som sendes gjennom et vedlegg, alle beskrive nyttelastens levering av en skadelig programvare. Disse er typene attributter med kategorien for nyttelast. For en forklaring på hva hver type ser ut sammen med gyldige kombinasjoner av kategorier og typer,%s."
@@ -17276,10 +17698,6 @@ msgstr "Svarskode"
 msgid "Request duration"
 msgstr "Forespørsel varighet"
 
-#: View/Servers/rest.ctp:164
-msgid "Headers"
-msgstr "overskrifter"
-
 #: 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 "Advarsel: app / Config / config.php er ikke skrivbar. Dette betyr at eventuelle innstillingsendringer som er gjort her, IKKE vil bli lagret."
@@ -17662,10 +18080,6 @@ msgstr "Passive delingsgrupper"
 msgid "Distribution List"
 msgstr "Distribusjonsliste"
 
-#: View/SharingGroups/view.ctp:12
-msgid "Selectable"
-msgstr "valgbar"
-
 #: View/SharingGroups/view.ctp:28
 msgid "Synced by"
 msgstr "Synkronisert av"
@@ -17674,10 +18088,6 @@ msgstr "Synkronisert av"
 msgid "Quick Search"
 msgstr ""
 
-#: View/Sightingdb/index.ctp:55
-msgid "Owner"
-msgstr ""
-
 #: View/Sightingdb/index.ctp:61
 msgid "Host"
 msgstr ""
@@ -17838,6 +18248,11 @@ msgstr "Merkede attributter"
 msgid "Favourite"
 msgstr "Favoritt"
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+msgstr "Se graf"
+
 #: 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 planlegge forhåndsdefinerte oppgaver som skal utføres hver x time. Du kan endre dato og klokkeslett for neste planlagte utførelse og hyppigheten der den skal gjentas (uttrykt i timer). Hvis du stiller frekvensen til 0, vil oppgaven ikke bli gjentatt. For å endre og av de ovennevnte innstillingene klikker du bare på det aktuelle feltet og treffer oppdatering alt når du er ferdig med å redigere planlagte oppgaver."
@@ -18178,6 +18593,45 @@ msgstr ""
 msgid "Are you sure you wish to delete this entry?"
 msgstr ""
 
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr "Admin Legg til bruker"
@@ -18235,12 +18689,12 @@ msgstr "SMIME-nøkkel"
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr "Lim inn brukerens SMIME-offentlig nøkkel i PEM-format her."
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr "Deaktiver denne brukerkontoen"
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr "Send legitimasjon automatisk"
 
@@ -18250,7 +18704,7 @@ msgstr "Admin Rediger bruker"
 
 #: View/Users/admin_edit.ctp:69
 #: View/Users/admin_view.ctp:69
-#: View/Users/view.ctp:29
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr "Vilkår akseptert"
 
@@ -18354,30 +18808,68 @@ msgstr "Fjern filter"
 msgid "Apply filters"
 msgstr "Bruk filtre"
 
-#: 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 "brukere"
-
-#: View/Users/admin_index.ctp:7
+#: View/Users/admin_index.ctp:3
 msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
 msgstr ""
 
-#: View/Users/admin_index.ctp:10
+#: View/Users/admin_index.ctp:6
 msgid "here"
 msgstr ""
 
-#: View/Users/admin_index.ctp:13;14
+#: View/Users/admin_index.ctp:9;10
 msgid "Reset all sync user API keys"
 msgstr ""
 
-#: View/Users/admin_index.ctp:17
+#: View/Users/admin_index.ctp:13
 msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
 msgstr ""
 
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr "Kontaktvarsel"
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr "Kontakt%s"
@@ -18390,11 +18882,6 @@ msgstr "ADVARSEL: Denne brukeren har ikke en krypteringsnøkkel. Sikkerhetsstill
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr "%s nøkkel funnet for brukeren, vil e-posten bli sendt kryptert ved hjelp av denne nøkkelen."
 
-#: View/Users/admin_view.ctp:27
-#: View/Users/view.ctp:8
-msgid "Contactalert"
-msgstr "Kontaktvarsel"
-
 #: View/Users/admin_view.ctp:30
 #: View/Users/view.ctp:11
 msgid "Request API access"
@@ -18413,7 +18900,7 @@ msgid "Org_admin"
 msgstr ""
 
 #: View/Users/admin_view.ctp:68
-#: View/Users/view.ctp:28
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr ""
 
@@ -18422,22 +18909,22 @@ msgid "Password change"
 msgstr "Passord endring"
 
 #: View/Users/admin_view.ctp:78
-#: View/Users/view.ctp:37
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr "GnuPG fingeravtrykk"
 
 #: View/Users/admin_view.ctp:83
-#: View/Users/view.ctp:42
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr ""
 
 #: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:49
+#: View/Users/view.ctp:50
 msgid "S/MIME Public certificate"
 msgstr ""
 
 #: View/Users/admin_view.ctp:119
-#: View/Users/view.ctp:64
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr "Last ned brukerprofil for dataportabilitet"
 
@@ -18453,10 +18940,102 @@ msgstr "Ingen mislykkede kompositter"
 msgid "SMIME Public certificate (PEM format)"
 msgstr "SMIME Offentlig sertifikat (PEM-format)"
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr "Logg Inn"
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr ""
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+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"
@@ -18472,6 +19051,13 @@ msgstr "Korrelasjoner funnet"
 msgid "Proposals active"
 msgstr "Forslag aktiv"
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr "brukere"
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -18527,15 +19113,15 @@ msgstr "Gjennomsnittlige brukere / Org"
 msgid "A heatmap showing the usage of %s."
 msgstr "En varmekart som viser bruken av%s."
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr "Organisasjonsliste"
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr "Rask oversikt over organisasjonene som ligger på eller kjent av denne forekomsten."
 
-#: View/Users/statistics_orgs.ctp:38
+#: View/Users/statistics_orgs.ctp:40
 msgid "Activity (1 year)"
 msgstr ""
 
@@ -18591,6 +19177,14 @@ msgstr "Sertifikat validering"
 msgid "GnuPG key validation"
 msgstr "GnuPG-nøkkelvalidering"
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr "Bekreft sending"
@@ -18749,6 +19343,7 @@ msgid "boolean"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/Dashboard.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
diff --git a/app/Locale/pol/LC_MESSAGES/default.po b/app/Locale/pol/LC_MESSAGES/default.po
index b052938d7..306a13a05 100644
--- a/app/Locale/pol/LC_MESSAGES/default.po
+++ b/app/Locale/pol/LC_MESSAGES/default.po
@@ -1,90 +1,124 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-09-30 01:23\n"
-"Last-Translator: Steve Clement (SteveClement)\n"
+"PO-Revision-Date: 2021-03-26 04:20\n"
+"Last-Translator: NAME <EMAIL@ADDRESS>\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-Project-ID: 306440\n"
 "X-Crowdin-Language: pl\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: pl_PL\n"
 
-#: Console/Command/AdminShell.php:59
+#: Console/Command/AdminShell.php:72
 msgid "Database updated: "
 msgstr "Baza danych zaktualizowana: "
 
-#: Console/Command/AdminShell.php:61
+#: Console/Command/AdminShell.php:74
 msgid "Could not update the database: "
 msgstr "Nie można zaktualizować bazy danych: "
 
-#: Console/Command/AdminShell.php:73
+#: Console/Command/AdminShell.php:87
 msgid "Worker restarted."
 msgstr "Proces producenta został uruchomiony ponownie."
 
-#: Console/Command/AdminShell.php:75
+#: Console/Command/AdminShell.php:89
 msgid "Could not restart the worker. Reason: %s"
 msgstr "Nie udało się uruchomić ponownie procesu producenta. Powód: %s"
 
-#: Console/Command/AdminShell.php:96
+#: Console/Command/AdminShell.php:111
 msgid "Worker killed."
 msgstr "Proces producenta został zatrzymany."
 
-#: Console/Command/AdminShell.php:112
+#: Console/Command/AdminShell.php:128
 msgid "Worker started."
 msgstr "Proces producenta został uruchomiony."
 
-#: Console/Command/AdminShell.php:123
+#: Console/Command/AdminShell.php:141
 msgid "%s updated."
 msgstr "%s zaktualizowany."
 
-#: Console/Command/AdminShell.php:128
+#: Console/Command/AdminShell.php:146
 msgid "Could not update %s."
 msgstr "Nie można zaktualizować %s."
 
-#: Console/Command/AdminShell.php:455
+#: Console/Command/AdminShell.php:466
 msgid "Update the JSON definitions of MISP."
 msgstr "Zaktualizuj definicje JSON'owe MISPa."
 
-#: Console/Command/AdminShell.php:458
+#: Console/Command/AdminShell.php:469
 msgid "Update the submodules before ingestion."
 msgstr "Zaktualizuj submoduły przed pobraniem."
 
-#: Console/Command/AdminShell.php:487
+#: Console/Command/AdminShell.php:499
 msgid "Last DB num which was successfully executed: "
 msgstr ""
 
-#: Console/Command/AdminShell.php:496
+#: Console/Command/AdminShell.php:508
 msgid "Something went wrong. Could not find the existing db version"
 msgstr ""
 
-#: Console/Command/AdminShell.php:499
+#: Console/Command/AdminShell.php:511
 msgid "DB was never successfully updated or we are on a fresh install"
 msgstr ""
 
-#: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:125;129;133
+#: Console/Command/AdminShell.php:528
+msgid "MISP mass sync authkey reset command line tool.\n\n"
+"Usage: %sConsole/cake resetSyncAuthkeys [user_id]"
+msgstr ""
+
+#: Console/Command/AdminShell.php:536
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
+msgid "Invalid user."
+msgstr "Nieprawidłowy użytkownik."
+
+#: Console/Command/AdminShell.php:539
+msgid "User has to be a site admin."
+msgstr ""
+
+#: Console/Command/AdminShell.php:563
+msgid "\n"
+"Error: %s\n"
+msgstr "\n"
+"Błąd: %s\n"
+
+#: Console/Command/AdminShell.php:565
+msgid "%s events purged.\n"
+msgstr ""
+
+#: Console/Command/AdminShell.php:587
+msgid "> Database schema dumped on disk"
+msgstr ""
+
+#: Console/Command/AdminShell.php:589
+msgid "Something went wrong. Could not find the existing db version or fetch the current database schema."
+msgstr ""
+
+#: Console/Command/EventShell.php:15
+#: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1085;1510;1514;1518;1593;2102;2178;2182;2186;2404;2453;2524;2613;3137;5506;5727;5731;5740
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
-#: Model/Galaxy.php:292
+#: Model/Galaxy.php:293
 msgid "Invalid event"
 msgstr "Nieprawidłowe zdarzenie"
 
-#: Console/Command/PasswordShell.php:43
+#: Console/Command/PasswordShell.php:46
 msgid "override password change"
 msgstr "ignoruj zmianę hasła"
 
-#: Console/Command/ServerShell.php:49
-#: Controller/ServersController.php:636
-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:83
+#: Controller/ServersController.php:674
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled, %s sightings pulled."
+msgstr ""
 
-#: Console/Command/ServerShell.php:51
+#: Console/Command/ServerShell.php:85
 msgid "ERROR: %s"
 msgstr "BŁĄD: %s"
 
@@ -96,704 +130,972 @@ msgstr "tryb gadatliwy"
 msgid "interactive mode"
 msgstr "tryb interaktywny"
 
-#: Controller/AppController.php:385
+#: Controller/AppController.php:382
+msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
+msgstr ""
+
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
+msgid "Update Progress"
+msgstr "Postęp aktualizacji"
+
+#: Controller/AppController.php:389
 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:629
-#: Controller/AttributesController.php:1999;2108;2158;2241;2327
-#: Controller/EventsController.php:2846;2962;3024;3390;4006;4069
+#: Controller/AppController.php:519
+msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
+msgstr ""
+
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 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:638
-#: Controller/AttributesController.php:2162;2245;2331
-#: Controller/EventsController.php:2850;2967;3029;3394;4010;4073
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr "Musisz być zalogowany, aby to zrobić."
 
-#: Controller/AppController.php:655
+#: Controller/AppController.php:764
+#: Controller/Component/IndexFilterComponent.php:23
 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:780
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr ""
 
-#: Controller/AppController.php:903
-#: Controller/AttributesController.php:2385
-#: Controller/ShadowAttributesController.php:1278
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
+#: Controller/ShadowAttributesController.php:1267
 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;1389
+#: Controller/AppController.php:1211
+msgid "RestSearch is not implemented (yet) for this scope."
+msgstr ""
+
+#: Controller/AttributesController.php:109;1339
 #: 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:112
+msgid "You do not have permissions to create attributes"
+msgstr ""
 
-#: Controller/AttributesController.php:139;492;672
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1985;2006;2040
-#: Controller/ObjectsController.php:622
+#: Controller/EventsController.php:2107;2128;2162
+#: Controller/ObjectsController.php:837
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "Nie masz do tego uprawnień."
 
-#: Controller/AttributesController.php:415;870;875;879;1087;1167;1209;2401;2415;2448;2470;2479;3106;3210;3214
-#: Controller/ShadowAttributesController.php:824;1069;1093;1126;1136
-#: Controller/TagsController.php:492
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
+#: Controller/ObjectsController.php:641
+#: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
+#: Controller/TagsController.php:506
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "Nieprawidłowy atrybut"
 
-#: Controller/AttributesController.php:425
-#: Controller/ShadowAttributesController.php:501
+#: Controller/AttributesController.php:355
+#: Controller/ShadowAttributesController.php:483
 msgid "You do not have the permission to view this event."
 msgstr "Nie masz wystarczających uprawnień aby wyświetlić to zdarzenie."
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:402
 msgid "Attribute not an attachment or malware-sample"
 msgstr "Atrybut nie jest załącznikiem lub próbką malware"
 
-#: Controller/AttributesController.php:489;656;947;1398
-#: Controller/EventsController.php:4706;4720;5455;5469
+#: Controller/AttributesController.php:419;586;892;1348
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "Nieprawidłowe zdarzenie."
 
-#: Controller/AttributesController.php:507;683
-#: Controller/ShadowAttributesController.php:548
+#: Controller/AttributesController.php:437;613
+#: Controller/DecayingModelController.php:56
+#: Controller/ShadowAttributesController.php:530
 msgid "PHP says file was not uploaded. Are you attacking me?"
 msgstr "PHP mówi, że plik nie został załadowany. Próbujesz mnie atakować?"
 
-#: Controller/AttributesController.php:686
-#: Controller/ShadowAttributesController.php:551;561
+#: Controller/AttributesController.php:616
+#: Controller/ShadowAttributesController.php:533;543
 msgid "There was a problem to upload the file."
 msgstr "Wystąpił problem podczas wgrywania pliku."
 
-#: Controller/AttributesController.php:830
+#: Controller/AttributesController.php:760
 msgid "The ThreatConnect data has been imported."
 msgstr "Dane z ThreatConnect zostały zaimportowane."
 
-#: Controller/AttributesController.php:833
+#: Controller/AttributesController.php:763
 msgid "%s entries imported."
 msgstr "%s wpisów zaimportowano."
 
-#: Controller/AttributesController.php:837
+#: Controller/AttributesController.php:767
 msgid "%s entries could not be imported."
 msgstr "%s wpisów nie udało się zaimportować."
 
-#: Controller/AttributesController.php:887;935;937
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "Nieprawidłowy atrybut."
-
-#: Controller/AttributesController.php:931
+#: Controller/AttributesController.php:876
 msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
 msgstr "Nie można zapisać atrybutu: atrybut w żądaniu nie jest nowszy niż kopia lokalna."
 
-#: Controller/AttributesController.php:964
+#: Controller/AttributesController.php:880;882
+#: Controller/ShadowAttributesController.php:817
+msgid "Invalid attribute."
+msgstr "Nieprawidłowy atrybut."
+
+#: Controller/AttributesController.php:909
 msgid "The attribute has been saved"
 msgstr "Atrybut został zapisany"
 
-#: Controller/AttributesController.php:999
+#: Controller/AttributesController.php:944
 msgid "The attribute could not be saved. Please, try again."
 msgstr "Nie można zapisać atrybutu. Proszę spróbować ponownie."
 
-#: Controller/AttributesController.php:1091
+#: Controller/AttributesController.php:1036
+#: Controller/ObjectsController.php:515
 msgid "Invalid event id."
 msgstr "Nieprawidłowy identyfikator zdarzenia."
 
-#: Controller/AttributesController.php:1121
-#: Controller/EventsController.php:2326
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1072
+#: Controller/EventsController.php:2466
+#: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "Nieprawidłowa wartość."
 
-#: Controller/AttributesController.php:1126
+#: Controller/AttributesController.php:1077
 msgid "Invalid field."
 msgstr "Nieprawidłowe pole."
 
-#: Controller/AttributesController.php:1171;1213
+#: Controller/AttributesController.php:1125;1161
 msgid "Invalid attribute id."
 msgstr "Nieprawidłowy identyfikator atrybutu."
 
-#: Controller/AttributesController.php:1299;1309
-msgid "Attribute deleted"
-msgstr "Atrybut skasowany"
-
-#: Controller/AttributesController.php:1304;1306
-msgid "Attribute was not deleted"
-msgstr "Atrybut nie został skasowany"
-
-#: Controller/AttributesController.php:1331;2872
-#: Controller/ShadowAttributesController.php:865
-msgid "Invalid Attribute"
-msgstr "Nieprawidłowy atrybut"
-
-#: Controller/AttributesController.php:1358
-msgid "Could not restore the attribute"
-msgstr "Nie można przywrócić atrybutu"
-
-#: Controller/AttributesController.php:1369
+#: Controller/AttributesController.php:1242;1319
 msgid "This function is only accessible via POST requests."
 msgstr "Ta funkcja jest dostępna tylko za pomocą żądania POST."
 
-#: Controller/AttributesController.php:1424
+#: Controller/AttributesController.php:1249;1259
+msgid "Attribute deleted"
+msgstr "Atrybut skasowany"
+
+#: Controller/AttributesController.php:1254;1256
+msgid "Attribute was not deleted"
+msgstr "Atrybut nie został skasowany"
+
+#: Controller/AttributesController.php:1281;2675
+#: Controller/ShadowAttributesController.php:853
+msgid "Invalid Attribute"
+msgstr "Nieprawidłowy atrybut"
+
+#: Controller/AttributesController.php:1308
+msgid "Could not restore the attribute"
+msgstr "Nie można przywrócić atrybutu"
+
+#: Controller/AttributesController.php:1374
 msgid "No matching attributes found."
 msgstr "Brakuje pasujących atrybutów."
 
-#: Controller/AttributesController.php:1458
+#: Controller/AttributesController.php:1408
 msgid "This method can only be accessed via AJAX."
 msgstr "Do tej metody można się odwołać wyłącznie przez AJAX."
 
-#: Controller/AttributesController.php:1468
+#: Controller/AttributesController.php:1418
 msgid "You are not authorized to edit this event."
 msgstr "Nie masz uprawnień do edytowania tego zdarzenia."
 
-#: Controller/AttributesController.php:1566
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "Nie podano ID zdarzenia."
 
-#: Controller/AttributesController.php:1611
-#: Controller/GalaxiesController.php:235
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "Synonimy: "
 
-#: Controller/AttributesController.php:1994;2101
+#: Controller/AttributesController.php:1912;2019
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr "Akcja zabroniona. Prześlij w nagłówku pole Authorization z kluczem API oraz pole Accept z wartością application/xml."
 
-#: Controller/AttributesController.php:2007
+#: Controller/AttributesController.php:1925
 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 "Określ warunki wyszukiwania w URLu lub prześlij POSTem tablicę json lub xml (elementem nadrzędnym powinien być \"request\", powinny być też określone pola accept i content type w nagłówku)."
 
-#: Controller/AttributesController.php:2027
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "Nie masz dostępu do tego zdarzenia."
 
-#: Controller/AttributesController.php:2090
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "Brak pasujących elementów."
 
-#: Controller/AttributesController.php:2112;2121
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Nieprawidłowy atrybut lub nie masz uprawnień do jego wyświetlenia."
 
-#: Controller/AttributesController.php:2189
-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:2253
-msgid "Invalid event ID format."
-msgstr "Nieprawidłowe ID zdarzenia."
-
-#: Controller/AttributesController.php:2362
-#: Controller/ShadowAttributesController.php:1256
+#: Controller/AttributesController.php:2165
+#: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "Gotowe!"
 
-#: Controller/AttributesController.php:2394;2441
-#: Controller/ShadowAttributesController.php:1064
+#: Controller/AttributesController.php:2197;2244
+#: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "Zapytano o niewłaściwe pole."
 
-#: Controller/AttributesController.php:2397;2444
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "Do tej metody można się odwołać wyłącznie przez AJAX."
 
-#: Controller/AttributesController.php:2509;2517
-#: Controller/EventsController.php:3833;3982;5261
+#: Controller/AttributesController.php:2282
+msgid "You do not have permission to do that"
+msgstr ""
+
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "Nie znaleziono zdarzenia lub nie masz uprawnień do tworzenia atrybutów"
 
-#: Controller/AttributesController.php:2538
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "Do tej metody można się odwołać wyłącznie przez AJAX."
 
-#: Controller/AttributesController.php:2547;2798;2812;2823
-#: Controller/OrganisationsController.php:418
-#: Controller/ServersController.php:623;691
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
+#: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "Nie masz uprawnień aby to zrobić."
 
-#: Controller/AttributesController.php:2652
-#: Controller/EventsController.php:4499
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "Ta funkcja wymaga dostępu za pomocą klucza API."
 
-#: Controller/AttributesController.php:2660
+#: Controller/AttributesController.php:2463
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "Tą czynność można wykonać tylko przez API. Szczegółowa informacja o składni znajduje się na stronie poświęconej automatyzacji."
 
-#: Controller/AttributesController.php:2672
+#: Controller/AttributesController.php:2475
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "Nie przesłano skrótu (hash) lub ID zdarzenia. Musisz podać przynajmniej jedno z nich."
 
-#: Controller/AttributesController.php:2833
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
-msgstr ""
+msgstr "Nieprawidłowy skrypt."
 
-#: Controller/AttributesController.php:2900
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:2998
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr ""
 
-#: Controller/AttributesController.php:3277
-#: Controller/EventsController.php:5451
+#: Controller/AttributesController.php:2864;3071
+#: Controller/TagCollectionsController.php:254
+msgid "Invalid tag"
+msgstr ""
+
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr ""
 
-#: Controller/AttributesController.php:3281;3296
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3165;3180
+#: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "Nieprawidłowy Atrybut."
 
-#: Controller/AttributesController.php:3284;3299
-#: Controller/EventsController.php:5458;5472
-#: Controller/PostsController.php:60;84
-#: Controller/TaxonomiesController.php:100;131;163;245;275;305;335;365;374;383
-msgid "You don't have permission to do that."
-msgstr "Nie masz do tego uprawnień."
+#: Controller/CommunitiesController.php:150
+msgid "Request sent."
+msgstr ""
+
+#: Controller/CommunitiesController.php:150
+msgid "Something went wrong and the request could not be sent."
+msgstr ""
+
+#: Controller/CommunitiesController.php:166
+msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
+msgstr ""
+
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
+#: Controller/DecayingModelController.php:20
+msgid "Default decaying models updated"
+msgstr ""
+
+#: Controller/DecayingModelController.php:28
+msgid "This method is not allowed"
+msgstr ""
+
+#: Controller/DecayingModelController.php:36;105;207;243;264;276;354;387;399;409;430;442;452;544
+#: Controller/DecayingModelMappingController.php:25
+#: Model/DecayingModel.php:483;619
+#: Model/DecayingModelMapping.php:30;59
+msgid "No Decaying Model with the provided ID exists"
+msgstr ""
+
+#: Controller/DecayingModelController.php:47
+msgid "Only one import field can be used"
+msgstr ""
+
+#: Controller/DecayingModelController.php:65
+msgid "Error while decoding JSON"
+msgstr "Błąd podczas dekodowania JSON"
+
+#: Controller/DecayingModelController.php:90
+msgid "The model has been imported."
+msgstr ""
+
+#: Controller/DecayingModelController.php:92
+msgid "The model has been imported. However importing mapping failed."
+msgstr ""
+
+#: Controller/DecayingModelController.php:95
+msgid "Error while importing model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:186
+msgid "The model must have a name"
+msgstr ""
+
+#: Controller/DecayingModelController.php:198;269
+msgid "The model has been saved."
+msgstr ""
+
+#: Controller/DecayingModelController.php:201
+msgid "The model has been saved. However importing mapping failed."
+msgstr ""
+
+#: Controller/DecayingModelController.php:220;224;281
+msgid "The model could not be saved. Please try again."
+msgstr ""
+
+#: Controller/DecayingModelController.php:308
+msgid "Invalid JSON `Settings`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:314
+msgid "Invalid parameter `lifetime`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:318
+msgid "Invalid parameter `decay_speed`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:322
+msgid "Invalid parameter `threshold`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:326
+msgid "Invalid parameter `default_base_score`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:333
+msgid "Invalid parameter `base_score_config`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:342
+msgid "Missing JSON key `parameters`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:360
+msgid "You are not authorised to delete this model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:368
+msgid "Decaying Model deleted."
+msgstr ""
+
+#: Controller/DecayingModelController.php:371
+msgid "The Decaying Model could not be deleted."
+msgstr ""
+
+#: Controller/DecayingModelController.php:391
+msgid "You are not authorised to enable this model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:404
+msgid "Decaying Model enabled."
+msgstr ""
+
+#: Controller/DecayingModelController.php:414;417;457
+msgid "Error while enabling decaying model"
+msgstr ""
+
+#: Controller/DecayingModelController.php:434
+msgid "You are not authorised to disable this model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:447
+msgid "Decaying Model disabled."
+msgstr ""
+
+#: Controller/DecayingModelController.php:460
+msgid "Error while disabling decaying model"
+msgstr ""
+
+#: Controller/DecayingModelController.php:478
+#: View/DecayingModel/add.ctp:37
+msgid "Lifetime"
+msgstr ""
+
+#: Controller/DecayingModelController.php:479
+#: View/DecayingModel/add.ctp:37
+msgid "Lifetime of the attribute, or time after which the score will be 0"
+msgstr ""
+
+#: Controller/DecayingModelController.php:486
+#: View/DecayingModel/add.ctp:46
+msgid "Decay speed"
+msgstr ""
+
+#: Controller/DecayingModelController.php:487
+#: View/DecayingModel/add.ctp:46
+msgid "Decay speed at which an indicator will loose score"
+msgstr ""
+
+#: Controller/DecayingModelController.php:494
+#: View/DecayingModel/add.ctp:56
+msgid "Cutoff threshold"
+msgstr ""
+
+#: Controller/DecayingModelController.php:495
+#: View/DecayingModel/add.ctp:56
+msgid "Cutoff value at which an indicator will be marked as decayed instead of 0"
+msgstr ""
+
+#: Controller/DecayingModelController.php:563
+msgid "Error Processing Request, can't parse the body"
+msgstr ""
+
+#: Controller/DecayingModelController.php:712
+msgid "This method is only accessible via AJAX."
+msgstr ""
 
 #: Controller/EventBlacklistsController.php:15
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr ""
 
-#: Controller/EventBlacklistsController.php:73;95
+#: Controller/EventBlacklistsController.php:76;98
 msgid "Invalid event IDs."
 msgstr ""
 
-#: Controller/EventBlacklistsController.php:84
+#: Controller/EventBlacklistsController.php:87
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr ""
 
-#: Controller/EventsController.php:855
+#: Controller/EventsController.php:894
 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:857
+#: Controller/EventsController.php:896
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:863
+#: Controller/EventsController.php:902
 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:865
+#: Controller/EventsController.php:904
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:1617
-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."
+#: Controller/EventsController.php:1731
+msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1827
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr "Nie masz uprawnień, aby stworzyć zdarzenie"
 
-#: Controller/EventsController.php:1833
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr ""
 
-#: Controller/EventsController.php:1869
+#: Controller/EventsController.php:1984
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr ""
 
-#: Controller/EventsController.php:1873;1877
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:1901
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr ""
 
-#: Controller/EventsController.php:1914;1994;2258
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "Zdarzenie zostało zapisane"
 
-#: Controller/EventsController.php:1922
+#: Controller/EventsController.php:2037
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr ""
 
-#: Controller/EventsController.php:1928
+#: Controller/EventsController.php:2043
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr ""
 
-#: Controller/EventsController.php:1930;2261
+#: Controller/EventsController.php:2045;2395
 msgid "The event could not be saved. Please, try again."
 msgstr "Nie można zapisać zdarzenia. Proszę spróbować ponownie."
 
-#: Controller/EventsController.php:1970
+#: Controller/EventsController.php:2094
 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:2020
+#: Controller/EventsController.php:2142
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr ""
 
-#: Controller/EventsController.php:2021
+#: Controller/EventsController.php:2143
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr ""
 
-#: Controller/EventsController.php:2070
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr ""
 
-#: Controller/EventsController.php:2073
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr ""
 
-#: Controller/EventsController.php:2076
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr ""
 
-#: Controller/EventsController.php:2083
+#: Controller/EventsController.php:2217
 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:2107;2192
+#: Controller/EventsController.php:2241;2326
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr ""
 
-#: Controller/EventsController.php:2115
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr ""
 
-#: Controller/EventsController.php:2120
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr ""
 
-#: Controller/EventsController.php:2410;2460;2530
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:2419
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr ""
 
-#: Controller/EventsController.php:2472;2541
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr ""
 
-#: Controller/EventsController.php:2624
+#: Controller/EventsController.php:2819
+msgid "You must specify a message."
+msgstr ""
+
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr ""
 
-#: Controller/EventsController.php:2626
-msgid "Sending of email failed"
+#: Controller/EventsController.php:2847
+msgid "Sending of email failed."
 msgstr ""
 
-#: Controller/EventsController.php:2671
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr ""
 
-#: Controller/EventsController.php:2759
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr ""
 
-#: Controller/EventsController.php:2801;4015;4083
-msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
-msgstr ""
-
-#: Controller/EventsController.php:2837
-msgid "Invalid Event ID."
-msgstr ""
-
-#: Controller/EventsController.php:2884
-msgid "No events found that match the passed parameters."
-msgstr ""
-
-#: Controller/EventsController.php:2909
-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:2984
-msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
-msgstr ""
-
-#: Controller/EventsController.php:3003
-#: Model/Attribute.php:2069
-msgid "Invalid hash type."
-msgstr ""
-
-#: Controller/EventsController.php:3106
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
+msgstr "Nazwa pliku jest niedozwolona."
+
+#: Controller/EventsController.php:3134
+msgid "Problem with writing the IoC file. Please report to site admin."
 msgstr ""
 
-#: Controller/EventsController.php:3126
-msgid "Problem with writing the ioc file. Please report to administrator."
-msgstr ""
-
-#: Controller/EventsController.php:3220
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr ""
 
-#: Controller/EventsController.php:3383
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr ""
 
-#: Controller/EventsController.php:3401;3405
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:3425;3495
-msgid "You don't have the privileges to access this."
-msgstr ""
-
-#: Controller/EventsController.php:3706
-#: Controller/TagCollectionsController.php:311
+#: Controller/EventsController.php:3484
+#: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr ""
 
-#: Controller/EventsController.php:3722
-#: Controller/TagCollectionsController.php:327
+#: Controller/EventsController.php:3500
+#: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr ""
 
-#: Controller/EventsController.php:3733;3739
-#: Controller/TagCollectionsController.php:334
+#: Controller/EventsController.php:3514
+msgid "Tag is not allowed due to taxonomy exclusivity settings"
+msgstr ""
+
+#: Controller/EventsController.php:3545;3551
+#: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr ""
 
-#: Controller/EventsController.php:3735
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr ""
 
-#: Controller/EventsController.php:3741
-#: Controller/TagCollectionsController.php:342
+#: Controller/EventsController.php:3553
+#: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr ""
 
-#: Controller/EventsController.php:3986;5265;5287;5785;5789
-#: Controller/ObjectsController.php:46;190;194;618;1028
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
+#: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "Nieprawidłowe zdarzenie."
 
-#: Controller/EventsController.php:4146;4176;4192
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:4257;4397
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
-msgstr ""
+msgstr "Błędny ID"
 
-#: Controller/EventsController.php:4261;4401;4948
+#: Controller/EventsController.php:3987;4128;4703
 msgid "Event not found or you are not authorised to view it."
 msgstr ""
 
-#: Controller/EventsController.php:4502;4509
+#: Controller/EventsController.php:4134
+msgid "Freetext Import"
+msgstr ""
+
+#: Controller/EventsController.php:4140
+msgid "Populate using a Template"
+msgstr ""
+
+#: Controller/EventsController.php:4146
+msgid "OpenIOC Import"
+msgstr "Import OpenIOC"
+
+#: Controller/EventsController.php:4151
+msgid "ThreatConnect Import"
+msgstr ""
+
+#: Controller/EventsController.php:4156
+msgid "(Experimental) Forensic analysis - Mactime"
+msgstr ""
+
+#: Controller/EventsController.php:4175
+msgid "MISP standard (recommended exchange format - lossless)"
+msgstr ""
+
+#: Controller/EventsController.php:4181
+msgid "STIX 1.1.1 format (lossy)"
+msgstr ""
+
+#: Controller/EventsController.php:4186
+msgid "STIX 2.0 format (lossy)"
+msgstr ""
+
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4538
+#: Controller/EventsController.php:4264
 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:4546
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "Nie znaleziono zdarzenia"
 
-#: Controller/EventsController.php:4569
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "Nie znaleziono zdarzenia."
 
-#: Controller/EventsController.php:4579
+#: Controller/EventsController.php:4305
 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:4604
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4743;4764;4797;4822;4847;4877;4898
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr ""
 
-#: Controller/EventsController.php:5012
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr ""
 
-#: Controller/EventsController.php:5094
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr ""
 
-#: Controller/EventsController.php:5098
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:5103
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:5158;5204
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5170
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr ""
 
-#: Controller/EventsController.php:5221
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:5373
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5598
+#: Controller/EventsController.php:5222;5236
+#: Controller/PostsController.php:60;84
+#: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
+msgid "You don't have permission to do that."
+msgstr "Nie masz do tego uprawnień."
+
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
-msgstr ""
+msgstr "Błędny ID."
 
-#: Controller/EventsController.php:5646
-#: Controller/ShadowAttributesController.php:313;318;534
+#: Controller/EventsController.php:5411
+#: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr ""
 
-#: Controller/EventsController.php:5667
+#: Controller/EventsController.php:5432
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr ""
 
-#: Controller/EventsController.php:5918
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr ""
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:238;337
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr ""
 
-#: Controller/FeedsController.php:246
-msgid "Feed could not be added. Invalid field: %s"
+#: Controller/FeedsController.php:291
+msgid "Feed could not be added. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:271;372;394;516;551;755
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr ""
 
-#: Controller/FeedsController.php:345
-msgid "Feed could not be updated. Invalid fields: %s"
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:368
-msgid "This action requires a post request."
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
+#: Controller/SharingGroupsController.php:237
+#: Controller/UsersController.php:1044
+msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:401;520
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:414;480
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:425
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:430;432
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:436;497
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:527
+#: Controller/FeedsController.php:563
+msgid "No feed enabled."
+msgstr ""
+
+#: Controller/FeedsController.php:587;606
+#: Controller/ServersController.php:116;161
+msgid "Download failed."
+msgstr "Pobieranie nie powiodło się."
+
+#: Controller/FeedsController.php:594
 msgid "Event added."
 msgstr ""
 
-#: Controller/FeedsController.php:530
+#: Controller/FeedsController.php:597
 msgid "Event already up to date."
 msgstr ""
 
-#: Controller/FeedsController.php:532
+#: Controller/FeedsController.php:599
 msgid "Event updated."
 msgstr ""
 
-#: Controller/FeedsController.php:536
+#: Controller/FeedsController.php:603
 msgid "Could not %s event."
 msgstr ""
 
-#: Controller/FeedsController.php:539
-msgid "Download failed."
-msgstr ""
-
-#: Controller/FeedsController.php:631
+#: Controller/FeedsController.php:700
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr ""
 
-#: Controller/FeedsController.php:670;721
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr ""
 
-#: Controller/FeedsController.php:787
-msgid "This event is blocked by the Feed filters."
-msgstr ""
-
-#: Controller/FeedsController.php:789
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr ""
 
-#: Controller/FeedsController.php:825;829
+#: Controller/FeedsController.php:865
+msgid "This event is blocked by the Feed filters."
+msgstr ""
+
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:850
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: Controller/FeedsController.php:854
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr ""
 
-#: Controller/FeedsController.php:863
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr ""
 
-#: Controller/FeedsController.php:865
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:882
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr ""
 
-#: Controller/FeedsController.php:897
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:900
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:934
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr ""
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr ""
 
-#: Controller/GalaxiesController.php:167
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr ""
 
-#: Controller/GalaxiesController.php:293
-msgid "Failed to parse request."
+#: Controller/GalaxiesController.php:337
+msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:296
-msgid "No clusters picked."
+#: Controller/GalaxiesController.php:340
+msgid "Failed to parse request."
 msgstr ""
 
 #: Controller/JobsController.php:156
@@ -829,10 +1131,11 @@ msgid "News item could not be deleted."
 msgstr ""
 
 #: Controller/ObjectReferencesController.php:37
+#: Controller/ObjectsController.php:511;607;650;671;686;757;768;786
 msgid "Invalid object"
 msgstr ""
 
-#: Controller/ObjectReferencesController.php:161
+#: Controller/ObjectReferencesController.php:163
 msgid "Invalid object reference"
 msgstr ""
 
@@ -856,7 +1159,7 @@ msgstr ""
 msgid "This action can only be reached via POST requests"
 msgstr ""
 
-#: Controller/ObjectsController.php:69;82;1055
+#: Controller/ObjectsController.php:69;82;1272
 msgid "Invalid sharing group."
 msgstr ""
 
@@ -864,41 +1167,65 @@ msgstr ""
 msgid "You don't have permissions to create objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:181;1040;1092
+#: Controller/ObjectsController.php:181;1257;1309
 #: Model/Template.php:25
 msgid "Invalid template."
 msgstr ""
 
-#: Controller/ObjectsController.php:364
-msgid "You don't have permissions to edit objects."
+#: Controller/ObjectsController.php:295;424;430
+msgid "Object could not be saved."
 msgstr ""
 
-#: Controller/ObjectsController.php:378;389;607
-#: Model/Event.php:6207
+#: Controller/ObjectsController.php:373;1006
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr ""
 
-#: Controller/ObjectsController.php:601
+#: Controller/ObjectsController.php:377
+msgid "Insufficient permissions to edit this object."
+msgstr ""
+
+#: Controller/ObjectsController.php:449
+msgid "Object attributes saved."
+msgstr ""
+
+#: Controller/ObjectsController.php:518
+msgid "This function can only be accessed via POST or PUT"
+msgstr ""
+
+#: Controller/ObjectsController.php:711
+msgid "Invalid template"
+msgstr ""
+
+#: Controller/ObjectsController.php:789
+msgid "Invalid fields"
+msgstr ""
+
+#: Controller/ObjectsController.php:796
+msgid "Invalid field"
+msgstr ""
+
+#: Controller/ObjectsController.php:822
 msgid "You don't have permissions to delete objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:711;718;722
+#: Controller/ObjectsController.php:926;933;937
 msgid "Object not found or not authorised."
 msgstr ""
 
-#: Controller/ObjectsController.php:986
+#: Controller/ObjectsController.php:1203
 msgid "%s objects successfully reconstructed."
 msgstr ""
 
-#: Controller/ObjectsController.php:996;1032
+#: Controller/ObjectsController.php:1213;1249
 msgid "This action can only be reached via AJAX."
 msgstr ""
 
-#: Controller/ObjectsController.php:1073
+#: Controller/ObjectsController.php:1290
 msgid "Failed to create an Object from Attributes. Error: "
 msgstr ""
 
-#: Controller/ObjectsController.php:1084
+#: Controller/ObjectsController.php:1301
 msgid "No Attribute selected."
 msgstr ""
 
@@ -918,47 +1245,43 @@ msgstr ""
 msgid "The organisation could not be added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:155;234;287;314;347
-msgid "Invalid organisation"
-msgstr ""
-
-#: Controller/OrganisationsController.php:194
-msgid "Organisation updated."
-msgstr ""
-
-#: Controller/OrganisationsController.php:209
-msgid "The organisation could not be updated."
-msgstr ""
-
-#: Controller/OrganisationsController.php:230
-msgid "Action not allowed, post request expected."
-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/OrganisationsController.php:275;281
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:352
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
+msgid "Invalid organisation"
+msgstr ""
+
+#: Controller/OrganisationsController.php:208
+msgid "Organisation updated."
+msgstr ""
+
+#: Controller/OrganisationsController.php:223
+msgid "The organisation could not be updated."
+msgstr ""
+
+#: Controller/OrganisationsController.php:272
+msgid "Organisation deleted"
+msgstr ""
+
+#: Controller/OrganisationsController.php:279
+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/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:401
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr ""
 
-#: Controller/OrganisationsController.php:423
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr ""
 
-#: Controller/OrganisationsController.php:426
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr ""
 
@@ -1044,7 +1367,7 @@ msgstr ""
 
 #: Controller/RolesController.php:33
 msgid "Invalid role"
-msgstr ""
+msgstr "Nieprawidłowa rola"
 
 #: Controller/RolesController.php:59;100
 msgid "The Role has been saved"
@@ -1056,15 +1379,15 @@ msgstr ""
 
 #: Controller/RolesController.php:85;151
 msgid "Invalid Role"
-msgstr ""
+msgstr "Nieprawidłowa rola"
 
 #: Controller/RolesController.php:157
 msgid "Role deleted"
-msgstr ""
+msgstr "Rola usunięta"
 
 #: Controller/RolesController.php:164
 msgid "Role could not be deleted"
-msgstr ""
+msgstr "Rola nie może zostać usunięta"
 
 #: Controller/RolesController.php:200
 msgid "Default role set."
@@ -1074,88 +1397,97 @@ msgstr ""
 msgid "Default role unset."
 msgstr ""
 
-#: Controller/ServersController.php:225;421
+#: Controller/ServersController.php:237;436
 msgid "The pull filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:235;431
+#: Controller/ServersController.php:247;446
 msgid "The push filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:289;461
+#: Controller/ServersController.php:302;476
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr ""
 
-#: Controller/ServersController.php:301
+#: Controller/ServersController.php:314
 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:336;517;1997
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
-msgstr ""
+msgstr "Serwer został zapisany"
 
-#: Controller/ServersController.php:343;524
+#: Controller/ServersController.php:357;539
 msgid "The server could not be saved. Please, try again."
-msgstr ""
+msgstr "Serwer nie mógł zostać zapisany. Spróbuj ponownie."
 
-#: Controller/ServersController.php:396;593;618;627;687;1403
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "Niepoprawny serwer"
 
-#: Controller/ServersController.php:478
+#: Controller/ServersController.php:493
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr ""
 
-#: Controller/ServersController.php:600
-msgid "Server deleted"
+#: Controller/ServersController.php:604;2183;2225
+msgid "This endpoint expects POST requests."
 msgstr ""
 
-#: Controller/ServersController.php:603
-msgid "Server was not deleted"
+#: Controller/ServersController.php:612
+msgid "You don't have the privileges to do that."
 msgstr ""
 
+#: Controller/ServersController.php:621
+msgid "Server deleted"
+msgstr "Serwer usunięty"
+
 #: Controller/ServersController.php:630
+msgid "Server was not deleted"
+msgstr "Serwer nie został usunięty"
+
+#: Controller/ServersController.php:668
 msgid "Pull setting not enabled for this server."
 msgstr ""
 
-#: Controller/ServersController.php:653
+#: Controller/ServersController.php:692
 msgid "Pulling."
 msgstr ""
 
-#: Controller/ServersController.php:663
+#: Controller/ServersController.php:702
 msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:700
+#: Controller/ServersController.php:748
 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:713
+#: Controller/ServersController.php:761
 msgid "Push complete. %s events pushed, %s events could not be pushed."
 msgstr ""
 
-#: Controller/ServersController.php:728
+#: Controller/ServersController.php:776
 msgid "Pushing."
 msgstr ""
 
-#: Controller/ServersController.php:738
+#: Controller/ServersController.php:786
 msgid "Push queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:766
+#: Controller/ServersController.php:814
 msgid "Filename not allowed"
-msgstr ""
+msgstr "Nazwa pliku jest niedozwolona"
 
-#: Controller/ServersController.php:771
+#: Controller/ServersController.php:819
 msgid "Incorrect extension or empty file."
-msgstr ""
+msgstr "Nieprawidłowe rozszerzenie lub pusty plik."
 
-#: Controller/ServersController.php:853
+#: Controller/ServersController.php:901
 msgid "No organisation selected."
 msgstr ""
 
-#: Controller/ServersController.php:869;870;871;872;873;874;875;876;877;878;879;880;881;882;883
-#: View/Elements/healthElements/diagnostics.ctp:26;170;184;209;269
+#: Controller/ServersController.php:917;918;919;920;921;922;923;924;925;926;927;928;929;930;931
+#: View/Elements/healthElements/diagnostics.ctp:26;170;184;271;331
 #: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/submoduleStatus.ctp:23
@@ -1163,253 +1495,330 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: Controller/ServersController.php:869
+#: Controller/ServersController.php:917
 msgid "not found"
 msgstr ""
 
-#: Controller/ServersController.php:869
+#: Controller/ServersController.php:917
 msgid "is not writeable"
 msgstr ""
 
-#: Controller/ServersController.php:870
+#: Controller/ServersController.php:918
 msgid "not readable"
 msgstr ""
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: settings not set"
 msgstr ""
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: Failed to load GnuPG"
-msgstr ""
+msgstr "Nieudane: Nie udało się załadować GnuPG"
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: Issues with the key/passphrase"
 msgstr ""
 
-#: Controller/ServersController.php:871
-msgid "FAIL: encrypt failed"
+#: Controller/ServersController.php:919
+msgid "FAIL: sign failed"
 msgstr ""
 
-#: Controller/ServersController.php:872
+#: Controller/ServersController.php:920
 msgid "not configured (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:872
+#: Controller/ServersController.php:920
 msgid "Getting URL via proxy failed"
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "not enabled (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "Python ZeroMQ library not installed correctly."
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "ZeroMQ script not running."
 msgstr ""
 
-#: Controller/ServersController.php:874
+#: Controller/ServersController.php:922
 msgid "Some of the libraries related to STIX are not installed. Make sure that all libraries listed below are correctly installed."
 msgstr ""
 
-#: Controller/ServersController.php:875
+#: Controller/ServersController.php:923
 msgid "Incorrect STIX version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:876
+#: Controller/ServersController.php:924
 msgid "Incorrect STIX2 version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:877
+#: Controller/ServersController.php:925
 msgid "Incorrect CyBox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:878
+#: Controller/ServersController.php:926
 msgid "Incorrect mixbox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:879
+#: Controller/ServersController.php:927
 msgid "Incorrect maec version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:880
+#: Controller/ServersController.php:928
 msgid "Incorrect PyMISP version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:881
+#: Controller/ServersController.php:929
 msgid "Incorrect plyara version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 #: View/Events/filter_event_index.ctp:32;188
 #: View/Pages/doc/using_the_system.ctp:68;173
 msgid "High"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 msgid "Alternative setting used"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 msgid "Test failed"
 msgstr ""
 
-#: Controller/ServersController.php:883
+#: Controller/ServersController.php:931
 msgid "System not enabled"
 msgstr ""
 
-#: Controller/ServersController.php:883
+#: Controller/ServersController.php:931
 msgid "No modules found"
 msgstr ""
 
-#: Controller/ServersController.php:890
+#: Controller/ServersController.php:938
 msgid "MISP will not operate correctly or will be unsecure until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:894
+#: Controller/ServersController.php:942
 msgid "Some of the features of MISP cannot be utilised until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:898
+#: Controller/ServersController.php:946
 msgid "There are some optional tweaks that could be done to improve the looks of your MISP instance."
 msgstr ""
 
-#: Controller/ServersController.php:1106
+#: Controller/ServersController.php:1165
+msgid "Only one `update` worker can run at a time"
+msgstr ""
+
+#: Controller/ServersController.php:1177
 msgid "Worker start signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1121
+#: Controller/ServersController.php:1192
 msgid "Worker stop signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1191
+#: Controller/ServersController.php:1249
+msgid "This setting is redacted."
+msgstr ""
+
+#: Controller/ServersController.php:1274
 msgid "This setting can only be edited via the CLI."
 msgstr ""
 
-#: Controller/ServersController.php:1300
+#: Controller/ServersController.php:1365;1377
+msgid "Restarting workers."
+msgstr ""
+
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "Nie znaleziono pliku."
 
-#: Controller/ServersController.php:1306
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "Plik nie może zostać usunięty."
 
-#: Controller/ServersController.php:1329;1345
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr ""
 
-#: Controller/ServersController.php:1337
+#: Controller/ServersController.php:1438
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr ""
 
-#: Controller/ServersController.php:1896
+#: Controller/ServersController.php:1505
+msgid "Invalid user or user not found."
+msgstr "Nieprawidłowy użytkownik lub użytkownik nie został znaleziony."
+
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr ""
 
-#: Controller/ServersController.php:1911
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:1914
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
-#: Controller/ServersController.php:2004
+#: Controller/ServersController.php:2100
+msgid "Cannot create sync config - no host org ID configured for the instance."
+msgstr ""
+
+#: Controller/ServersController.php:2109
+msgid "Configured host org not found. Please make sure that the setting is current on the instance."
+msgstr ""
+
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:212
-msgid "Moving of the file that this attachment references failed."
+#: Controller/ServersController.php:2194
+msgid "API key updated."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:281
+#: Controller/ServersController.php:2207
+msgid "ID has to be a valid server connection"
+msgstr ""
+
+#: Controller/ServersController.php:2210
+msgid "Invalid direction. Valid options: "
+msgstr ""
+
+#: Controller/ServersController.php:2214
+msgid "Priority changed."
+msgstr ""
+
+#: Controller/ServersController.php:2217
+msgid "Priority could not be changed."
+msgstr ""
+
+#: Controller/ServersController.php:2228
+msgid "Only site admin accounts can release the update lock."
+msgstr ""
+
+#: Controller/ServersController.php:2238
+msgid "Only site admin accounts get the DB schema diagnostic."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:263
 msgid "Could not discard proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:342
+#: Controller/ShadowAttributesController.php:324
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:390;393;402
+#: Controller/ShadowAttributesController.php:372;375;384
 msgid "The lines"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:442
+#: Controller/ShadowAttributesController.php:424
 msgid "The proposal has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:454;763
+#: Controller/ShadowAttributesController.php:436;749
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:456
+#: Controller/ShadowAttributesController.php:438
 msgid "The proposal could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:493
+#: Controller/ShadowAttributesController.php:475
 msgid "Invalid Proposal"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:505
 msgid "Proposal not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:601
 msgid "The attachment has been uploaded"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:603
 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:606
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:740
 msgid "The proposed Attribute has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:751
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:896;906
+#: Controller/ShadowAttributesController.php:884;894
 msgid "Invalid proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:950
-msgid "No proposals found or invalid event."
-msgstr ""
-
-#: Controller/ShadowAttributesController.php:982;1018
+#: Controller/ShadowAttributesController.php:1010
 msgid "This feature is only available using the API to Sync users"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:985
+#: Controller/ShadowAttributesController.php:1013
 msgid "Invalid UUID"
 msgstr "Nieprawidłowy UUID"
 
-#: Controller/ShadowAttributesController.php:1021
-msgid "This feature is only available using POST requests"
-msgstr ""
-
-#: Controller/SharingGroupsController.php:237
+#: Controller/SharingGroupsController.php:251
 msgid "Sharing Group deleted"
 msgstr ""
 
-#: Controller/SharingGroupsController.php:242
+#: Controller/SharingGroupsController.php:256
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr ""
 
+#: Controller/SightingdbController.php:32
+msgid "SightingDB connection added."
+msgstr ""
+
+#: Controller/SightingdbController.php:32
+msgid "SightingDB connection could not be added."
+msgstr ""
+
+#: Controller/SightingdbController.php:49;99;143
+msgid " Reason: %s"
+msgstr ""
+
+#: Controller/SightingdbController.php:71;123
+#: Model/Sightingdb.php:325
+msgid "Invalid SightingDB entry."
+msgstr ""
+
+#: Controller/SightingdbController.php:87
+msgid "SightingDB connection updated."
+msgstr ""
+
+#: Controller/SightingdbController.php:87
+msgid "SightingDB connection could not be updated."
+msgstr ""
+
+#: Controller/SightingdbController.php:128
+msgid "SightingDB connection removed."
+msgstr ""
+
+#: Controller/SightingdbController.php:130
+msgid "SightingDB connection could not be removed."
+msgstr ""
+
+#: Controller/SightingdbController.php:196
+msgid "Pass a valid SightingDB ID"
+msgstr ""
+
 #: Controller/SightingsController.php:83
 msgid "Could not add the Sighting. Reason: "
 msgstr ""
 
-#: Controller/SightingsController.php:93;96
+#: Controller/SightingsController.php:96
 msgid "Sighting added"
 msgstr ""
 
@@ -1418,6 +1827,7 @@ msgid "You are not authorised to remove sightings data as you don't have permiss
 msgstr ""
 
 #: Controller/SightingsController.php:155
+#: Model/DecayingModel.php:464
 msgid "Attribute not found"
 msgstr ""
 
@@ -1453,7 +1863,7 @@ msgstr ""
 msgid "You don't have editing rights on this Tag Collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:201;385
+#: Controller/TagCollectionsController.php:201;391
 msgid "Invalid tag collection."
 msgstr ""
 
@@ -1469,115 +1879,147 @@ msgstr ""
 msgid "You are not allowed to delete that."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:336
+#: Controller/TagCollectionsController.php:241
+msgid "Invalid tag collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:342
 msgid "Tag(s) could not be added."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:389
+#: Controller/TagCollectionsController.php:395
 msgid "Insufficient privileges to remove the tag from the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:400
+#: Controller/TagCollectionsController.php:406
 msgid "Invalid tag or tag not associated with the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:404
+#: Controller/TagCollectionsController.php:410
 msgid "Failed to remove tag from the collection."
 msgstr ""
 
-#: Controller/TagsController.php:367
+#: Controller/TagsController.php:370
 msgid "Tag deleted"
 msgstr ""
 
-#: Controller/TagsController.php:372
+#: Controller/TagsController.php:375
 msgid "Tag was not deleted"
 msgstr ""
 
-#: Controller/TagsController.php:580
+#: Controller/TagsController.php:599
 msgid "Favourite Tags"
 msgstr ""
 
-#: Controller/TagsController.php:586
+#: Controller/TagsController.php:605
 #: View/TagCollections/index.ctp:4
 msgid "Tag Collections"
 msgstr ""
 
-#: Controller/TagsController.php:591
+#: Controller/TagsController.php:610
 msgid "Custom Tags"
 msgstr ""
 
-#: Controller/TagsController.php:595
+#: Controller/TagsController.php:614
 msgid "All Tags"
 msgstr ""
 
-#: Controller/TagsController.php:603
+#: Controller/TagsController.php:622
 #: View/Taxonomies/view.ctp:2
 msgid "Taxonomy Library"
 msgstr ""
 
-#: Controller/TagsController.php:772
+#: Controller/TagsController.php:790
 msgid "Includes: "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:57
+#: Controller/TagsController.php:867
+msgid "This functionality requires tagging permission."
+msgstr ""
+
+#: Controller/TagsController.php:881;905
+msgid "Cannot alter the tags of this data, only the organisation that has created the data (orgc) can modify global tags."
+msgstr ""
+
+#: Controller/TagsController.php:883;907
+msgid "Please consider using local tags if you are in the host organisation of the instance."
+msgstr ""
+
+#: Controller/TagsController.php:912;1058
+msgid "Invalid Target."
+msgstr ""
+
+#: Controller/TagsController.php:951
+msgid "Local tags can only be added by users of the host organisation."
+msgstr ""
+
+#: Controller/TagsController.php:964
+msgid "Unable to create tag. Reason: "
+msgstr ""
+
+#: Controller/TagsController.php:1075
+msgid "Insufficient privileges to remove local tags from events you do not own."
+msgstr ""
+
+#: Controller/TaxonomiesController.php:68
 msgid "Taxonomy not found."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:123
+#: Controller/TaxonomiesController.php:134
 msgid "Taxonomy enabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:155
+#: Controller/TaxonomiesController.php:166
 msgid "Taxonomy disabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:223
+#: Controller/TaxonomiesController.php:234
 msgid "All taxonomy libraries are up to date already."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:226
+#: Controller/TaxonomiesController.php:237
 msgid "Could not update any of the taxonomy libraries"
 msgstr ""
 
-#: Controller/TaxonomiesController.php:229
+#: Controller/TaxonomiesController.php:240
 #: Controller/WarninglistsController.php:107
 msgid "Successfully updated "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:229;231
+#: Controller/TaxonomiesController.php:240;242
 msgid " taxonomy libraries."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:231
+#: Controller/TaxonomiesController.php:242
 #: Controller/WarninglistsController.php:109
 msgid " However, could not update "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:265;295;325
+#: Controller/TaxonomiesController.php:276;314;344
 msgid "The tag(s) has been saved."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:267;297;327
+#: Controller/TaxonomiesController.php:282;316;346
 msgid "The tag(s) could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:355
+#: Controller/TaxonomiesController.php:374
 msgid "The tag(s) has been hidden."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:357
+#: Controller/TaxonomiesController.php:376
 msgid "The tag(s) could not be hidden. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:394
+#: Controller/TaxonomiesController.php:413
 msgid "Taxonomy successfuly deleted."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:397
+#: Controller/TaxonomiesController.php:416
 msgid "Taxonomy could not be deleted."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:405
+#: Controller/TaxonomiesController.php:424
 #: Controller/WarninglistsController.php:262
 msgid "This function can only be reached via AJAX."
 msgstr ""
@@ -1590,129 +2032,196 @@ msgstr ""
 msgid "Event populated, but "
 msgstr ""
 
-#: Controller/UsersController.php:42;247
-msgid "Invalid user or not authorised."
+#: Controller/UserSettingsController.php:129;276
+msgid "Invalid ID passed."
 msgstr ""
 
-#: Controller/UsersController.php:54;467;706;725;953
+#: Controller/UserSettingsController.php:139;143;286;290
+msgid "Invalid user setting."
+msgstr "Nieprawidłowe ustawienie użytkownika."
+
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
+msgid "Invalid setting."
+msgstr "Nieprawidłowe ustawienie."
+
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
+msgid "This setting is restricted and requires the following permission(s): %s"
+msgstr ""
+
+#: Controller/UserSettingsController.php:193
+msgid "Setting saved."
+msgstr "Ustawienia zapisane."
+
+#: Controller/UserSettingsController.php:206
+msgid "Setting could not be saved."
+msgstr "Ustawienie nie może zostać zapisane."
+
+#: Controller/UserSettingsController.php:301
+msgid "Setting deleted."
+msgstr "Ustawienie usunięte."
+
+#: Controller/UserSettingsController.php:309
+msgid "Setting could not be deleted."
+msgstr ""
+
+#: Controller/UserSettingsController.php:322
+msgid "Expecting POST or DELETE request."
+msgstr ""
+
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
+msgid "Invalid user or not authorised."
+msgstr "Nieprawidłowy użytkownik lub nieautoryzowany."
+
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "Nieprawidłowy użytkownik"
 
-#: Controller/UsersController.php:119;613;778
+#: Controller/UsersController.php:154;722;887
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
-#: Controller/UsersController.php:146
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr "Zaktualizowano profil"
 
-#: Controller/UsersController.php:150
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr "Nie można zapisać profilu. Proszę spróbować ponownie."
 
-#: Controller/UsersController.php:184
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:193
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:213
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "Hasło zostało zmienione."
 
-#: Controller/UsersController.php:222
+#: Controller/UsersController.php:299
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr ""
 
-#: Controller/UsersController.php:359;377;477
-#: Model/Log.php:320
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:624
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr ""
 
-#: Controller/UsersController.php:646
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "Użytkownik został zapisany."
 
-#: Controller/UsersController.php:655;889
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr "Nie można zapisać użytkownika. Proszę spróbować ponownie."
 
-#: Controller/UsersController.php:881
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "Użytkownik został zapisany"
 
-#: Controller/UsersController.php:961
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "Użytkownik usunięty"
 
-#: Controller/UsersController.php:965
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "Użytkownik nie został usunięty"
 
-#: Controller/UsersController.php:1043
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło, spróbuj ponownie"
 
-#: Controller/UsersController.php:1130
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr ""
 
-#: Controller/UsersController.php:1171
+#: Controller/UsersController.php:1273;1297
+msgid "This functionality is only accessible via POST requests."
+msgstr ""
+
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
 msgid "New authkey generated."
 msgstr ""
 
-#: Controller/UsersController.php:1280
+#: Controller/UsersController.php:1301
+msgid "Job initiated."
+msgstr ""
+
+#: Controller/UsersController.php:1303
+msgid "%s authkeys reset, %s could not be reset."
+msgstr ""
+
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1462
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1467
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1504
+#: Controller/UsersController.php:1587
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1506
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
-msgstr ""
+msgstr "E-maile zostały wysłane."
 
-#: Controller/UsersController.php:1580
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr ""
 
-#: Controller/UsersController.php:1581
-#: View/Elements/global_menu.ctp:151
+#: Controller/UsersController.php:1664
+#: View/Elements/global_menu.ctp:163
 #: 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 ""
+msgstr "Organizacja"
 
-#: Controller/UsersController.php:1582
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr ""
 
-#: Controller/UsersController.php:1583
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
-#: View/Elements/eventattribute.ctp:150
+#: View/DecayingModel/decaying_tool_rest_search.ctp:28
+#: View/Elements/eventattribute.ctp:151
 #: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Elements/Feeds/eventattribute.ctp:46
+#: View/Elements/Servers/eventattribute.ctp:46
 #: View/Events/resolved_attributes.ctp:53
-#: View/Events/resolved_misp_format.ctp:66;93;263
+#: View/Events/resolved_misp_format.ctp:66;94;289
 #: View/Events/view.ctp:127
 #: View/Feeds/preview_event.ctp:16
 #: View/Feeds/preview_index.ctp:39
@@ -1730,18 +2239,160 @@ msgstr ""
 msgid "Tags"
 msgstr "Tagi"
 
-#: Controller/UsersController.php:1584
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr ""
 
-#: Controller/UsersController.php:1585
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1586
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr ""
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "Tak"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "Nie"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr ""
@@ -1822,6 +2473,14 @@ msgstr ""
 msgid "No valid data received."
 msgstr ""
 
+#: Controller/Component/ACLComponent.php:634
+msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
+msgstr ""
+
+#: Controller/Component/ACLComponent.php:688
+msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
+msgstr ""
+
 #: Controller/Component/AdminCrudComponent.php:20
 msgid "The %s has been saved."
 msgstr ""
@@ -1832,7 +2491,7 @@ msgstr "Nie można zapisać %s. Proszę spróbować ponownie."
 
 #: Controller/Component/AdminCrudComponent.php:52;85
 msgid "Invalid %s"
-msgstr ""
+msgstr "Nieprawidłowy %s"
 
 #: Controller/Component/AdminCrudComponent.php:57
 msgid "The %s has been saved"
@@ -1870,2154 +2529,2967 @@ msgstr ""
 msgid "Could not remove the blacklist entry"
 msgstr ""
 
-#: Model/AppModel.php:1232
+#: Controller/Component/DeprecationComponent.php:18
+msgid "Use /attributes/restSearch to export RPZ rules."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:19
+msgid "Use /attributes/restSearch to export flat indicator lists."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:22
+msgid "Use MISP modules to import in OpenIOC format."
+msgstr "Użyj modułów MISP do importu w formacie OpenIOC."
+
+#: Controller/Component/DeprecationComponent.php:23
+msgid "Use /events/restSearch to export in CSV format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:24
+msgid "Use the REST client to refine your search conditions and export in any of the given formats with much more control."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:25
+msgid "Use /events/restSearch to export hashes."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:26
+msgid "Use /events/restSearch to export in the various NIDS formats."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:27
+msgid "Use /events/restSearch to export in STIX format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:28
+msgid "Use /events/restSearch to export in STIX2 format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:29
+msgid "Use /events/restSearch to export in XML format. It is highly recommended to use JSON whenever possible."
+msgstr ""
+
+#: Controller/Component/RateLimitComponent.php:29
+msgid "API searches are not allowed for this user role."
+msgstr ""
+
+#: Controller/Component/RateLimitComponent.php:41
+msgid "Rate limit exceeded."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:603
+msgid "The action that the user performed"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:609
+msgid "Is the sharing group selectable (active) when chosing distribution"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:614;1356
+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 ""
+
+#: Controller/Component/RestResponseComponent.php:620
+msgid "All organisations contained on the instance will be part of the sharing group"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:626
+msgid "hard-delete already soft-deleted attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:633
+msgid "Maturity of the event"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:640
+msgid "Anonymise the information regarding the server on which the request was issued"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:646
+msgid "Filter on attribute value"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:652
+msgid "The authorisation key found on the external server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:658
+msgid "The user receive alerts when events are published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:664
+msgid "The email's body"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:670
+msgid "The feed is cached"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:682
+msgid "A valid x509 certificate "
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:688
+msgid "The text contained in the change field"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:694
+msgid "The user will be prompted the change the password"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:700
+msgid "A valid hexadecimal colour `#ffffff`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:711
+msgid "Contact details for the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:717
+msgid "The user receive alerts from `contact reporter` requests"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:734
+msgid "Base64 encoded file contents"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:746
+msgid "The user set date field on the event level. If you are using restSearch, you can use any of the valid time related filters (examples: 7d, timestamps, [14d, 7d] for ranges, etc.)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:781
+msgid "The role is a default role (selected by default)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:787
+msgid "Remove file after ingestion"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:793
+msgid "Include deleted elements"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:799
+msgid "Merge attributes (only add new attribute, remove revoked attributes)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:810
+msgid "Disable the user account"
+msgstr "Wyłącz konto użytkownika"
+
+#: Controller/Component/RestResponseComponent.php:822
+msgid "Filter on user email"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:828
+msgid "Set the password manually"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:839
+msgid "When uploading malicious samples, set this flag to tell MISP to encrpyt the sample and extract the file hashes. This will create a MISP object with the appropriate attributes."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:850
+msgid "Should the warning list be enforced. Adds `blocked` field for matching attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:863
+msgid "The timestamp at which the event was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:870
+msgid "The timestamp at which the attribute was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:882;1021
+msgid "Quick event description"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:888
+msgid "The tag is exported when synchronising with other instances"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:900
+msgid "Exclude local tags from the export"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:906
+msgid "The organisation have write access to this sharing group (they can add/remove other organisation)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:912
+msgid "An external authorisation is required for this user"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:918
+msgid "A valid external auth key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:931
+msgid "target_event option might be considered"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:943
+msgid "The date from which the event was published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:949
+msgid "A valid GPG key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:955
+msgid "The event contains proposals"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:961
+msgid "Headers to be passed with the requests. All separated by `\\n`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:967
+msgid "The tag is hidden (not selectable)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:979
+msgid "Include matching attributes in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:991
+msgid "Include matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:997
+msgid "Include matching eventUuids in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1003
+msgid "Include tags of matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1015
+msgid "Include proposals of matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1028
+msgid "Specify whether the source (url field) is a directory (local) or an geniun url (network)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1034
+msgid "The IP of a login attempt"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1040
+msgid "JSON containing ID, UUID and name"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1046
+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)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1059
+msgid "Limit on the pagination"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1065
+msgid "If the organisation should have access to this instance, make sure that the Local organisation setting is checked. If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1071
+msgid "The lookup will not be visible in the feed correlation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1077
+msgid "Message to be included"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1083
+msgid "Will not return Attributes, shadow attribute and objects"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1089
+msgid "Will only return  id, timestamp, published and uuid"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1096
+msgid "Mock the query"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1120
+msgid "The last time the sharing group was modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1138
+msgid "The news are read"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1145
+msgid "The unique Signature Identification"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1151
+msgid "Can be either the ORG_ID or the ORG_NAME"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1157
+msgid "Describe the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1163
+msgid "Organisation identifier (name)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1175;1181
+msgid "Globally used uuid of an organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1187
+msgid "The IDS flags will be set to off for this feed"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1194
+msgid "Page number for the pagination"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1200
+msgid "The hardcoded password"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1272
+msgid "The name of the feed provider"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1278
+msgid "The event will be published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1301
+msgid "Allow the download of events and their attribute from the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1307
+msgid "Allow the upload of events and their attribute to the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1313
+msgid "Allow the upload of sightings to the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1319
+msgid "Concise summary for who this sharing group is releasable to"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1337
+msgid "Pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1362
+msgid "The sector of the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1374
+msgid "Will only return the sharing group ID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1387
+msgid "Sharing group ID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1393
+msgid "The source of the Sighting (e.g. honeypot_1)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1405
+msgid "The email's subject"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1411;1417
+msgid "Base64 encoded certificate"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1435
+msgid "A tad ID to attach to created events"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1448
+msgid "The provided ID will be reused as an existing event"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1471
+msgid "Time of the sighting with the form `h:i:s`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1483
+msgid "The title of the log"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1495
+msgid "The date to which the event was published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1501
+msgid "The state of the `to_ids` flag"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1507
+msgid "The type of the attribute"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1535
+msgid "Placeholder containing values to sight"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1548
+msgid "Not supported (warninglist->checkvalues) expect an array"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1554
+msgid "Not supported (removeTag)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1560;1566;1572;1579;1585;1591;1597;1603;1614
+msgid "Not supported"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1771
+msgid "Seen within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m)"
+msgstr ""
+
+#: Controller/Component/ToolboxComponent.php:18;26
+#: Model/Galaxy.php:220;277;287;301
+msgid "Invalid %s."
+msgstr "Nieprawidłowy %s."
+
+#: Model/AppModel.php:1466
 msgid "Indexing "
+msgstr "Indeksowanie "
+
+#: Model/AppModel.php:1480
+msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1246
-msgid "Issues executing the pre-update test `"
-msgstr ""
-
-#: Model/AppModel.php:1246
-msgid "`. The returned error is: "
-msgstr ""
-
-#: Model/AppModel.php:1268;1271
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1269;1282
+#: Model/AppModel.php:1503
+msgid "The executed SQL query was: %s"
+msgstr ""
+
+#: Model/AppModel.php:1505
+msgid "Successfuly executed the SQL query for %s"
+msgstr ""
+
+#: Model/AppModel.php:1516;1580
+msgid "Issues executing the SQL query for %s"
+msgstr ""
+
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1281;1284
-msgid "Issues executing the SQL query for "
-msgstr ""
-
-#: Model/AppModel.php:1282
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1284
-msgid ". The returned error is: "
+#: Model/AppModel.php:1519
+msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1306
+#: Model/AppModel.php:1528
+msgid "However, as this error is whitelisted, the update went through."
+msgstr ""
+
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/Attribute.php:59
+#: Model/AppModel.php:1550
+msgid "Failed to add index"
+msgstr ""
+
+#: Model/AppModel.php:1552
+msgid "The returned error is:"
+msgstr ""
+
+#: Model/AppModel.php:1581
+msgid "Database updates stopped as some errors occured and the stop flag is enabled."
+msgstr ""
+
+#: Model/AppModel.php:1740
+msgid "Invalid JSON."
+msgstr "Nieprawidłowy JSON."
+
+#: Model/AppModel.php:1833;1891
+msgid "Issues executing run_updates"
+msgstr ""
+
+#: Model/AppModel.php:1834
+msgid "Database updates are locked. Worker not spawned"
+msgstr ""
+
+#: Model/AppModel.php:1838;1896;1931
+msgid "Update done"
+msgstr ""
+
+#: Model/AppModel.php:1892
+msgid "Updates are locked. Stopping worker gracefully"
+msgstr ""
+
+#: Model/AppModel.php:1911
+msgid "Running update %s"
+msgstr ""
+
+#: Model/AppModel.php:1937
+msgid "Update done in another worker. Gracefuly stopping."
+msgstr ""
+
+#: Model/Attribute.php:63
 #: View/Events/filter_event_index.ctp:46;182
 msgid "Your organisation only"
 msgstr ""
 
-#: Model/Attribute.php:60
+#: Model/Attribute.php:64
 #: View/Events/filter_event_index.ctp:46;183
 msgid "This community only"
 msgstr ""
 
-#: Model/Attribute.php:61
+#: Model/Attribute.php:65
 #: View/Events/filter_event_index.ctp:46;184
 #: View/Pages/doc/using_the_system.ctp:51
 msgid "Connected communities"
 msgstr ""
 
-#: Model/Attribute.php:62
+#: Model/Attribute.php:66
 #: View/Events/filter_event_index.ctp:46;185
 #: View/Pages/doc/using_the_system.ctp:58
 msgid "All communities"
 msgstr ""
 
-#: Model/Attribute.php:63
+#: Model/Attribute.php:67
 #: View/Elements/view_event_distribution_graph.ctp:24
 msgid "Sharing group"
 msgstr ""
 
-#: Model/Attribute.php:64
+#: Model/Attribute.php:68
 msgid "Inherit event"
 msgstr ""
 
-#: Model/Attribute.php:69
+#: Model/Attribute.php:76
 msgid "Reference used by the publishing party (e.g. ticket number)"
 msgstr ""
 
-#: Model/Attribute.php:73
+#: Model/Attribute.php:80
 msgid "Internal Attack Targeting and Compromise Information"
 msgstr ""
 
-#: Model/Attribute.php:74
+#: Model/Attribute.php:81
 msgid "Targeting information to include recipient email, infected machines, department, and or locations."
 msgstr ""
 
-#: Model/Attribute.php:78
+#: Model/Attribute.php:85
 msgid "All the info about how the malware is detected by the antivirus products"
 msgstr ""
 
-#: Model/Attribute.php:79
+#: Model/Attribute.php:86
 msgid "List of anti-virus vendors detecting the malware or information on detection performance (e.g. 13/43 or 67%). Attachment with list of detection or link to VirusTotal could be placed here as well."
 msgstr ""
 
-#: Model/Attribute.php:83
+#: Model/Attribute.php:90
 msgid "Information about how the malware is delivered"
 msgstr ""
 
-#: Model/Attribute.php:84
+#: Model/Attribute.php:91
 msgid "Information about the way the malware payload is initially delivered, for example information about the email or web-site, vulnerability used, originating IP etc. Malware sample itself should be attached here."
 msgstr ""
 
-#: Model/Attribute.php:88
+#: Model/Attribute.php:95
 msgid "Any artifact (files, registry keys etc.) dropped by the malware or other modifications to the system"
 msgstr ""
 
-#: Model/Attribute.php:92
+#: Model/Attribute.php:99
 msgid "Info on where the malware gets installed in the system"
 msgstr ""
 
-#: Model/Attribute.php:93
+#: Model/Attribute.php:100
 msgid "Location where the payload was placed in the system and the way it was installed. For example, a filename|md5 type attribute can be added here like this: c:\\windows\\system32\\malicious.exe|41d8cd98f00b204e9800998ecf8427e."
 msgstr ""
 
-#: Model/Attribute.php:97
+#: Model/Attribute.php:104
 msgid "Mechanisms used by the malware to start at boot"
 msgstr ""
 
-#: Model/Attribute.php:98
+#: Model/Attribute.php:105
 msgid "Mechanisms used by the malware to start at boot. This could be a registry key, legitimate driver modification, LNK file in startup"
 msgstr ""
 
-#: Model/Attribute.php:102
+#: Model/Attribute.php:109
 msgid "Information about network traffic generated by the malware"
 msgstr ""
 
-#: Model/Attribute.php:106
+#: Model/Attribute.php:113
 msgid "Information about the final payload(s)"
 msgstr ""
 
-#: Model/Attribute.php:107
+#: Model/Attribute.php:114
 msgid "Information about the final payload(s). Can contain a function of the payload, e.g. keylogger, RAT, or a name if identified, such as Poison Ivy."
 msgstr ""
 
-#: Model/Attribute.php:111
+#: Model/Attribute.php:118
 msgid "Identification of the group, organisation, or country behind the attack"
 msgstr ""
 
-#: Model/Attribute.php:115
+#: Model/Attribute.php:122
 msgid "Any other result from additional analysis of the malware like tools output"
 msgstr ""
 
-#: Model/Attribute.php:116
+#: Model/Attribute.php:123
 msgid "Any other result from additional analysis of the malware like tools output Examples: pdf-parser output, automated sandbox analysis, reverse engineering report."
 msgstr ""
 
-#: Model/Attribute.php:120
+#: Model/Attribute.php:127
 msgid "Financial Fraud indicators"
-msgstr ""
+msgstr "Wskaźniki oszustw finansowych"
 
-#: Model/Attribute.php:121
+#: Model/Attribute.php:128
 msgid "Financial Fraud indicators, for example: IBAN Numbers, BIC codes, Credit card numbers, etc."
 msgstr ""
 
-#: Model/Attribute.php:125
+#: Model/Attribute.php:132
 msgid "Tools supporting analysis or detection of the event"
 msgstr ""
 
-#: Model/Attribute.php:129
+#: Model/Attribute.php:136
 msgid "Social networks and platforms"
-msgstr ""
+msgstr "Sieci i platformy społecznościowe"
 
-#: Model/Attribute.php:134
+#: Model/Attribute.php:141
 msgid "A human being - natural person"
-msgstr ""
+msgstr "Człowiek - osoba fizyczna"
 
-#: Model/Attribute.php:138
+#: Model/Attribute.php:145
 msgid "Attributes that are not part of any other category or are meant to be used as a component in MISP objects in the future"
 msgstr ""
 
-#: Model/Attribute.php:144;228
+#: Model/Attribute.php:154;243
 msgid "A checksum in md5 format"
 msgstr "Suma kontrolna w formacie md5"
 
-#: Model/Attribute.php:144
+#: Model/Attribute.php:154
 msgid "You are encouraged to use filename|md5 instead. A checksum in md5 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:155
 msgid "A checksum in sha1 format"
 msgstr "Suma kontrolna w formacie sha1"
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:155
 msgid "You are encouraged to use filename|sha1 instead. A checksum in sha1 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:146
+#: Model/Attribute.php:156
 msgid "A checksum in sha256 format"
 msgstr "Suma kontrolna w formacie sha256"
 
-#: Model/Attribute.php:146
+#: Model/Attribute.php:156
 msgid "You are encouraged to use filename|sha256 instead. A checksum in sha256 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:147
+#: Model/Attribute.php:157
 #: View/Elements/healthElements/files.ctp:29
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: Model/Attribute.php:148
+#: Model/Attribute.php:158
 msgid "Microsoft Program database (PDB) path information"
 msgstr ""
 
-#: Model/Attribute.php:149
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:149
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:150
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:150
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:151
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:151
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:152
+#: Model/Attribute.php:162
 msgid "A source IP address of the attacker"
 msgstr ""
 
-#: Model/Attribute.php:153
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server"
 msgstr ""
 
-#: Model/Attribute.php:153
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server. Also set the IDS flag on when this IP is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker. Also set the IDS flag on when this hostname is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware. Use this instead of hostname when the upper domain is important or can be used to create links between events."
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:157
+#: Model/Attribute.php:167
 msgid "The email address used to send the malware."
 msgstr ""
 
-#: Model/Attribute.php:158
-msgid "A recipient email address"
-msgstr ""
-
-#: Model/Attribute.php:158
-msgid "A recipient email address that is not related to your constituency."
-msgstr ""
-
-#: Model/Attribute.php:159
-msgid "The subject of the email"
-msgstr ""
-
-#: Model/Attribute.php:160
-msgid "File name of the email attachment."
-msgstr ""
-
-#: Model/Attribute.php:161
-msgid "Email body"
-msgstr "Treść e-maila"
-
-#: Model/Attribute.php:162
-msgid "A floating point value."
-msgstr ""
-
-#: Model/Attribute.php:163
-msgid "url"
-msgstr "url"
-
-#: Model/Attribute.php:164
-msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
-msgstr ""
-
-#: Model/Attribute.php:165
-msgid "The user-agent used by the malware in the HTTP request."
-msgstr ""
-
-#: Model/Attribute.php:166
-msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
-msgstr ""
-
-#: Model/Attribute.php:167
-msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
-msgstr ""
-
 #: Model/Attribute.php:168
-msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
+msgid "eduPersonPrincipalName - eppn - the NetId of the person for the purposes of inter-institutional authentication. Should be stored in the form of user@univ.edu, where univ.edu is the name of the local security domain."
 msgstr ""
 
 #: Model/Attribute.php:169
-msgid "Registry key or value"
+msgid "A recipient email address"
+msgstr ""
+
+#: Model/Attribute.php:169
+msgid "A recipient email address that is not related to your constituency."
 msgstr ""
 
 #: Model/Attribute.php:170
-msgid "Registry value + data separated by |"
+msgid "The subject of the email"
 msgstr ""
 
 #: Model/Attribute.php:171
-msgid "Autonomous system"
+msgid "File name of the email attachment."
 msgstr ""
 
 #: Model/Attribute.php:172
-msgid "An IDS rule in Snort rule-format"
-msgstr ""
-
-#: Model/Attribute.php:172
-msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
-msgstr ""
+msgid "Email body"
+msgstr "Treść e-maila"
 
 #: Model/Attribute.php:173
-msgid "An NIDS rule in the Bro rule-format"
-msgstr ""
-
-#: Model/Attribute.php:173
-msgid "An NIDS rule in the Bro rule-format."
+msgid "A floating point value."
 msgstr ""
 
 #: Model/Attribute.php:174
-msgid "An NIDS rule in the Zeek rule-format"
-msgstr ""
-
-#: Model/Attribute.php:174
-msgid "An NIDS rule in the Zeek rule-format."
-msgstr ""
+msgid "url"
+msgstr "url"
 
 #: Model/Attribute.php:175
-msgid "Pattern in file that identifies the malware"
+msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
 msgstr ""
 
 #: Model/Attribute.php:176
-msgid "Pattern in network traffic that identifies the malware"
+msgid "The user-agent used by the malware in the HTTP request."
 msgstr ""
 
 #: Model/Attribute.php:177
-msgid "Pattern in memory dump that identifies the malware"
+msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
 msgstr ""
 
 #: Model/Attribute.php:178
-msgid "Yara signature"
-msgstr "Sygnatura Yara"
+msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
+msgstr ""
 
 #: Model/Attribute.php:179
-msgid "STIX 2 pattern"
+msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
 #: Model/Attribute.php:180
-msgid "Sigma - Generic Signature Format for SIEM Systems"
-msgstr "Sigma - Generic Signature Format for SIEM Systems"
+msgid "Registry key or value"
+msgstr ""
 
 #: Model/Attribute.php:181
-msgid "GENE - Go Evtx sigNature Engine"
-msgstr "GENE - Go Evtx sigNature Engine"
+msgid "Registry value + data separated by |"
+msgstr ""
 
 #: Model/Attribute.php:182
-msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
+msgid "Autonomous system"
 msgstr ""
 
 #: Model/Attribute.php:183
-msgid "Identity card number"
+msgid "An IDS rule in Snort rule-format"
+msgstr ""
+
+#: Model/Attribute.php:183
+msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
 msgstr ""
 
 #: Model/Attribute.php:184
-msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
+msgid "An NIDS rule in the Bro rule-format"
+msgstr ""
+
+#: Model/Attribute.php:184
+msgid "An NIDS rule in the Bro rule-format."
 msgstr ""
 
 #: Model/Attribute.php:185
-msgid "A reference to the vulnerability used in the exploit"
+msgid "An NIDS rule in the Zeek rule-format"
+msgstr ""
+
+#: Model/Attribute.php:185
+msgid "An NIDS rule in the Zeek rule-format."
 msgstr ""
 
 #: Model/Attribute.php:186
-msgid "Attachment with external information"
-msgstr ""
-
-#: Model/Attribute.php:186;187
-msgid "Please upload files using the <em>Upload Attachment</em> button."
+msgid "a community ID flow hashing algorithm to map multiple traffic monitors into common flow id"
 msgstr ""
 
 #: Model/Attribute.php:187
-msgid "Attachment containing encrypted malware sample"
+msgid "Pattern in file that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:188
-msgid "Link to an external information"
+msgid "Pattern in network traffic that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:189
-msgid "Comment or description in a human language"
-msgstr ""
-
-#: Model/Attribute.php:189
-msgid "Comment or description in a human language.  This will not be correlated with other attributes"
+msgid "Pattern in memory dump that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:190
-msgid "Name, ID or a reference"
-msgstr ""
+msgid "Yara signature"
+msgstr "Sygnatura Yara"
 
 #: Model/Attribute.php:191
-msgid "A value in hexadecimal format"
-msgstr ""
+msgid "STIX 2 pattern"
+msgstr "Schemat STIX 2"
 
 #: Model/Attribute.php:192
-msgid "Other attribute"
-msgstr ""
+msgid "Sigma - Generic Signature Format for SIEM Systems"
+msgstr "Sigma - Generic Signature Format for SIEM Systems"
 
 #: Model/Attribute.php:193
-msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
-msgstr ""
+msgid "GENE - Go Evtx sigNature Engine"
+msgstr "GENE - Go Evtx sigNature Engine"
 
 #: Model/Attribute.php:194
-msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
+msgid "Kusto query - Kusto from Microsoft Azure is a service for storing and running interactive analytics over Big Data."
 msgstr ""
 
 #: Model/Attribute.php:195
-msgid "Attack Targets Username(s)"
+msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
 msgstr ""
 
 #: Model/Attribute.php:196
-msgid "Attack Targets Email(s)"
+msgid "Identity card number"
 msgstr ""
 
 #: Model/Attribute.php:197
-msgid "Attack Targets Machine Name(s)"
+msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
 msgstr ""
 
 #: Model/Attribute.php:198
-msgid "Attack Targets Department or Organization(s)"
+msgid "A reference to the vulnerability used in the exploit"
 msgstr ""
 
 #: Model/Attribute.php:199
-msgid "Attack Targets Physical Location(s)"
+msgid "A reference to the weakness used in the exploit"
 msgstr ""
 
 #: Model/Attribute.php:200
-msgid "External Target Organizations Affected by this Attack"
+msgid "Attachment with external information"
+msgstr ""
+
+#: Model/Attribute.php:200;201
+msgid "Please upload files using the <em>Upload Attachment</em> button."
 msgstr ""
 
 #: Model/Attribute.php:201
-msgid "Bitcoin Address"
-msgstr "Adres Bitcoin"
+msgid "Attachment containing encrypted malware sample"
+msgstr ""
 
 #: Model/Attribute.php:202
-msgid "Monero Address"
-msgstr "Adres Monero"
+msgid "Link to an external information"
+msgstr ""
 
 #: Model/Attribute.php:203
-msgid "International Bank Account Number"
-msgstr "Międzynarodowy number rachunku bankowego"
+msgid "Comment or description in a human language"
+msgstr ""
+
+#: Model/Attribute.php:203
+msgid "Comment or description in a human language.  This will not be correlated with other attributes"
+msgstr ""
 
 #: Model/Attribute.php:204
-msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
+msgid "Name, ID or a reference"
 msgstr ""
 
 #: Model/Attribute.php:205
-msgid "Bank account number without any routing number"
+msgid "A value in hexadecimal format"
 msgstr ""
 
 #: Model/Attribute.php:206
-msgid "ABA routing transit number"
+msgid "Other attribute"
 msgstr ""
 
 #: Model/Attribute.php:207
-msgid "Bank Identification Number"
+msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
 msgstr ""
 
 #: Model/Attribute.php:208
-msgid "Credit-Card Number"
-msgstr "Numer Karty Kredytowej"
+msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
+msgstr ""
 
 #: Model/Attribute.php:209
-msgid "Premium-Rate Telephone Number"
+msgid "Attack Targets Username(s)"
 msgstr ""
 
 #: Model/Attribute.php:210
-msgid "Telephone Number"
-msgstr "Numer telefonu"
+msgid "Attack Targets Email(s)"
+msgstr ""
 
 #: Model/Attribute.php:211
-msgid "A string identifying the threat actor"
+msgid "Attack Targets Machine Name(s)"
 msgstr ""
 
 #: Model/Attribute.php:212
-msgid "Associated campaign name"
+msgid "Attack Targets Department or Organization(s)"
 msgstr ""
 
 #: Model/Attribute.php:213
-msgid "Associated campaign ID"
+msgid "Attack Targets Physical Location(s)"
+msgstr ""
+
+#: Model/Attribute.php:214
+msgid "External Target Organizations Affected by this Attack"
 msgstr ""
 
 #: Model/Attribute.php:215
-msgid "Uniform Resource Identifier"
-msgstr ""
+msgid "Bitcoin Address"
+msgstr "Adres Bitcoin"
 
 #: Model/Attribute.php:216
-msgid "Authenticode executable signature hash"
+msgid "Dash Address"
 msgstr ""
 
-#: Model/Attribute.php:216
-msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:217;229
-msgid "A checksum in ssdeep format"
-msgstr "Suma kontrolna w formacie ssdeep"
-
 #: Model/Attribute.php:217
-msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:218;230
-msgid "Import hash - a hash created based on the imports in the sample."
-msgstr ""
+msgid "Monero Address"
+msgstr "Adres Monero"
 
 #: Model/Attribute.php:218
-msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
-msgstr ""
+msgid "International Bank Account Number"
+msgstr "Międzynarodowy number rachunku bankowego"
 
 #: Model/Attribute.php:219
-msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
+msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
 msgstr ""
 
 #: Model/Attribute.php:220
-msgid "A fuzzy hash of import table of Portable Executable format"
-msgstr ""
-
-#: Model/Attribute.php:220
-msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
+msgid "Bank account number without any routing number"
 msgstr ""
 
 #: Model/Attribute.php:221
-msgid "A checksum in sha-224 format"
-msgstr "Suma kontrolna w formacie sha-224"
-
-#: Model/Attribute.php:221
-msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
+msgid "ABA routing transit number"
 msgstr ""
 
 #: Model/Attribute.php:222
-msgid "A checksum in sha-384 format"
-msgstr "Suma kontrolna w formacie sha-384"
-
-#: Model/Attribute.php:222
-msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
+msgid "Bank Identification Number"
 msgstr ""
 
 #: Model/Attribute.php:223
-msgid "A checksum in sha-512 format"
-msgstr "Suma kontrolna w formacie sha-512"
-
-#: Model/Attribute.php:223
-msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
-msgstr ""
+msgid "Credit-Card Number"
+msgstr "Numer Karty Kredytowej"
 
 #: Model/Attribute.php:224
-msgid "A checksum in the sha-512/224 format"
-msgstr "Suma kontrolna w formacie sha-512/224"
-
-#: Model/Attribute.php:224
-msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
+msgid "Premium-Rate Telephone Number"
 msgstr ""
 
 #: Model/Attribute.php:225
-msgid "A checksum in the sha-512/256 format"
-msgstr "Suma kontrolna w formacie sha-512/256"
-
-#: Model/Attribute.php:225
-msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
-msgstr ""
+msgid "Telephone Number"
+msgstr "Numer telefonu"
 
 #: Model/Attribute.php:226
-msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
-msgstr ""
-
-#: Model/Attribute.php:226
-msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
+msgid "A string identifying the threat actor"
 msgstr ""
 
 #: Model/Attribute.php:227
-msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
+msgid "Associated campaign name"
+msgstr ""
+
+#: Model/Attribute.php:228
+msgid "Associated campaign ID"
+msgstr ""
+
+#: Model/Attribute.php:230
+msgid "Uniform Resource Identifier"
 msgstr ""
 
 #: Model/Attribute.php:231
-msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
+msgid "Authenticode executable signature hash"
 msgstr ""
 
+#: Model/Attribute.php:231
+msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:232;244
+msgid "A checksum in ssdeep format"
+msgstr "Suma kontrolna w formacie ssdeep"
+
 #: Model/Attribute.php:232
-msgid "A filename and a PEhash separated by a |"
+msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:233;245
+msgid "Import hash - a hash created based on the imports in the sample."
 msgstr ""
 
 #: Model/Attribute.php:233
-msgid "A filename and a sha-224 hash separated by a |"
+msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:234
-msgid "A filename and a sha-384 hash separated by a |"
+msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
 msgstr ""
 
 #: Model/Attribute.php:235
-msgid "A filename and a sha-512 hash separated by a |"
+msgid "A fuzzy hash of import table of Portable Executable format"
+msgstr ""
+
+#: Model/Attribute.php:235
+msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:236
-msgid "A filename and a sha-512/224 hash separated by a |"
+msgid "A checksum in sha-224 format"
+msgstr "Suma kontrolna w formacie sha-224"
+
+#: Model/Attribute.php:236
+msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:237
-msgid "A filename and a sha-512/256 hash separated by a |"
+msgid "A checksum in sha-384 format"
+msgstr "Suma kontrolna w formacie sha-384"
+
+#: Model/Attribute.php:237
+msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:238
-msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
+msgid "A checksum in sha-512 format"
+msgstr "Suma kontrolna w formacie sha-512"
+
+#: Model/Attribute.php:238
+msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:239
-msgid "A scheduled task in windows"
+msgid "A checksum in the sha-512/224 format"
+msgstr "Suma kontrolna w formacie sha-512/224"
+
+#: Model/Attribute.php:239
+msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:240
-msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
+msgid "A checksum in the sha-512/256 format"
+msgstr "Suma kontrolna w formacie sha-512/256"
+
+#: Model/Attribute.php:240
+msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:241
-msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
+msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
+msgstr ""
+
+#: Model/Attribute.php:241
+msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:242
-msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:243
-msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:244
-msgid "The name of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:245
-msgid "The org of a domain's registrant, obtained from the WHOIS information."
+msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
 msgstr ""
 
 #: Model/Attribute.php:246
-msgid "The registrar of the domain, obtained from the WHOIS information."
+msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
 msgstr ""
 
 #: Model/Attribute.php:247
-msgid "The date of domain's creation, obtained from the WHOIS information."
+msgid "A filename and a PEhash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:248
+msgid "A filename and a sha-224 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:249
+msgid "A filename and a sha-384 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:250
+msgid "A filename and a sha-512 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:251
+msgid "A filename and a sha-512/224 hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:252
-msgid "X509 fingerprint in SHA-1 format"
+msgid "A filename and a sha-512/256 hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:253
-msgid "X509 fingerprint in MD5 format"
+msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:254
-msgid "X509 fingerprint in SHA-256 format"
+msgid "A scheduled task in windows"
 msgstr ""
 
 #: Model/Attribute.php:255
-msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
+msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
 msgstr ""
 
 #: Model/Attribute.php:256
-msgid "Size expressed in bytes"
+msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
 msgstr ""
 
 #: Model/Attribute.php:257
-msgid "An integer counter, generally to be used in objects"
+msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:258
-msgid "Datetime in the ISO 8601 format"
+msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:259
-msgid "Common platform enumeration"
+msgid "The name of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:260
-msgid "Port number"
-msgstr "Numer portu"
+msgid "The org of a domain's registrant, obtained from the WHOIS information."
+msgstr ""
 
 #: Model/Attribute.php:261
-msgid "IP destination and port number seperated by a |"
+msgid "The registrar of the domain, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:262
-msgid "IP source and port number seperated by a |"
-msgstr ""
-
-#: Model/Attribute.php:263
-msgid "Hostname and port number seperated by a |"
-msgstr ""
-
-#: Model/Attribute.php:264
-msgid "Mac address"
-msgstr "Adres Mac"
-
-#: Model/Attribute.php:265
-msgid "Mac EUI-64 address"
+msgid "The date of domain's creation, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:267
-msgid "Email destination display name"
-msgstr ""
+msgid "X509 fingerprint in SHA-1 format"
+msgstr "Odcisk palca X509 w formacie SHA-1"
 
 #: Model/Attribute.php:268
-msgid "Email source display name"
-msgstr ""
+msgid "X509 fingerprint in MD5 format"
+msgstr "Odcisk palca X509 w formacie MD5"
 
 #: Model/Attribute.php:269
-msgid "Email header"
-msgstr "Nagłówek e-maila"
+msgid "X509 fingerprint in SHA-256 format"
+msgstr "Odcisk palca X509 w formacie SHA-256"
 
 #: Model/Attribute.php:270
-msgid "Email reply to header"
+msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
 msgstr ""
 
 #: Model/Attribute.php:271
-msgid "Email x-mailer header"
-msgstr ""
+msgid "Size expressed in bytes"
+msgstr "Rozmiar wyrażony w bajtach"
 
 #: Model/Attribute.php:272
-msgid "The email mime boundary separating parts in a multipart email"
+msgid "An integer counter, generally to be used in objects"
 msgstr ""
 
 #: Model/Attribute.php:273
-msgid "The email thread index header"
-msgstr ""
+msgid "Datetime in the ISO 8601 format"
+msgstr "Data czasu w formacie ISO 8601"
 
 #: Model/Attribute.php:274
-msgid "The email message ID"
+msgid "Common platform enumeration"
 msgstr ""
 
 #: Model/Attribute.php:275
-msgid "A github user name"
-msgstr "Github - nazwa użytkownika"
+msgid "Port number"
+msgstr "Numer portu"
 
 #: Model/Attribute.php:276
-msgid "A github repository"
-msgstr "Repozytorium github"
+msgid "IP destination and port number separated by a |"
+msgstr ""
 
 #: Model/Attribute.php:277
-msgid "A github organisation"
+msgid "IP source and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:278
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "Hostname and port number separated by a |"
+msgstr ""
 
 #: Model/Attribute.php:279
-msgid "Twitter ID"
-msgstr "Twitter ID"
+msgid "Mac address"
+msgstr "Adres Mac"
 
 #: Model/Attribute.php:280
-msgid "First name of a natural person"
-msgstr ""
-
-#: Model/Attribute.php:281
-msgid "Middle name of a natural person"
-msgstr ""
+msgid "Mac EUI-64 address"
+msgstr "Adres Mac EUI-64"
 
 #: Model/Attribute.php:282
-msgid "Last name of a natural person"
+msgid "Email destination display name"
 msgstr ""
 
 #: Model/Attribute.php:283
-msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
+msgid "Email source display name"
 msgstr ""
 
 #: Model/Attribute.php:284
-msgid "Place of birth of a natural person"
-msgstr ""
+msgid "Email header"
+msgstr "Nagłówek e-maila"
 
 #: Model/Attribute.php:285
-msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
+msgid "Email reply to header"
 msgstr ""
 
 #: Model/Attribute.php:286
-msgid "The passport number of a natural person"
+msgid "Email x-mailer header"
 msgstr ""
 
 #: Model/Attribute.php:287
-msgid "The country in which the passport was issued"
+msgid "The email mime boundary separating parts in a multipart email"
 msgstr ""
 
 #: Model/Attribute.php:288
-msgid "The expiration date of a passport"
+msgid "The email thread index header"
 msgstr ""
 
 #: Model/Attribute.php:289
-msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
+msgid "The email message ID"
 msgstr ""
 
 #: Model/Attribute.php:290
-msgid "The nationality of a natural person"
-msgstr ""
+msgid "A github user name"
+msgstr "Github - nazwa użytkownika"
 
 #: Model/Attribute.php:291
-msgid "Visa number"
-msgstr ""
+msgid "A github repository"
+msgstr "Repozytorium github"
 
 #: Model/Attribute.php:292
-msgid "The date on which the visa was issued"
+msgid "A github organisation"
 msgstr ""
 
 #: Model/Attribute.php:293
-msgid "The primary residence of a natural person"
-msgstr ""
+msgid "Jabber ID"
+msgstr "Jabber ID"
 
 #: Model/Attribute.php:294
-msgid "The country of residence of a natural person"
-msgstr ""
+msgid "Twitter ID"
+msgstr "Twitter ID"
 
 #: Model/Attribute.php:295
-msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
-msgstr ""
+msgid "First name of a natural person"
+msgstr "Imię osoby fizycznej"
 
 #: Model/Attribute.php:296
-msgid "The frequent flyer number of a passenger"
-msgstr ""
+msgid "Middle name of a natural person"
+msgstr "Drugie imię osoby fizycznej"
+
+#: Model/Attribute.php:297
+msgid "Last name of a natural person"
+msgstr "Nazwisko osoby fizycznej"
+
+#: Model/Attribute.php:298
+msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
+msgstr "Data urodzenia osoby fizycznej (w formacie RRRR-MM-DD)"
 
 #: Model/Attribute.php:299
-msgid "Travel details"
-msgstr ""
+msgid "Place of birth of a natural person"
+msgstr "Miejsce urodzenia osoby fizycznej"
 
 #: Model/Attribute.php:300
-msgid "Payment details"
-msgstr ""
+msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
+msgstr "Płeć osoby fizycznej (mężczyzna, kobieta, inne, wolę nie mówić)"
 
 #: Model/Attribute.php:301
-msgid "The orignal port of embarkation"
-msgstr ""
+msgid "The passport number of a natural person"
+msgstr "Numer paszportu osoby fizycznej"
 
 #: Model/Attribute.php:302
-msgid "The port of clearance"
-msgstr ""
+msgid "The country in which the passport was issued"
+msgstr "Kraj, w którym wydano paszport"
 
 #: Model/Attribute.php:303
-msgid "A Port where the passenger is transiting to"
-msgstr ""
+msgid "The expiration date of a passport"
+msgstr "Data wygaśnięcia paszportu"
 
 #: Model/Attribute.php:304
-msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
+msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
 msgstr ""
 
 #: Model/Attribute.php:305
+msgid "The nationality of a natural person"
+msgstr "Obywatelstwo osoby fizycznej"
+
+#: Model/Attribute.php:306
+msgid "Visa number"
+msgstr "Numer wizy"
+
+#: Model/Attribute.php:307
+msgid "The date on which the visa was issued"
+msgstr "Data wydania wizy"
+
+#: Model/Attribute.php:308
+msgid "The primary residence of a natural person"
+msgstr "Główne miejsce zamieszkania osoby fizycznej"
+
+#: Model/Attribute.php:309
+msgid "The country of residence of a natural person"
+msgstr "Kraj zamieszkania osoby fizycznej"
+
+#: Model/Attribute.php:310
+msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
+msgstr ""
+
+#: Model/Attribute.php:311
+msgid "The frequent flyer number of a passenger"
+msgstr ""
+
+#: Model/Attribute.php:314
+msgid "Travel details"
+msgstr "Szczegóły podróży"
+
+#: Model/Attribute.php:315
+msgid "Payment details"
+msgstr "Szczegóły płatności"
+
+#: Model/Attribute.php:316
+msgid "The orignal port of embarkation"
+msgstr ""
+
+#: Model/Attribute.php:317
+msgid "The port of clearance"
+msgstr ""
+
+#: Model/Attribute.php:318
+msgid "A Port where the passenger is transiting to"
+msgstr ""
+
+#: Model/Attribute.php:319
+msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
+msgstr ""
+
+#: Model/Attribute.php:320
 msgid "The application id of a mobile application"
 msgstr ""
 
-#: Model/Attribute.php:306
+#: Model/Attribute.php:321
+msgid "Chrome extension id"
+msgstr "Identyfikator rozszerzenia Chrome"
+
+#: Model/Attribute.php:322
 msgid "Cortex analysis result"
 msgstr ""
 
-#: Model/Attribute.php:307
+#: Model/Attribute.php:323
 msgid "Boolean value - to be used in objects"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship."
 msgstr ""
 
-#: Model/Attribute.php:603
+#: Model/Attribute.php:644
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:728
+#: Model/Attribute.php:791
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:862
+#: Model/Attribute.php:935
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:987
+#: Model/Attribute.php:1074
 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:994
+#: Model/Attribute.php:1081
 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:1001
+#: Model/Attribute.php:1088
 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:1012
+#: Model/Attribute.php:1099
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:1023
+#: Model/Attribute.php:1110
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:1030
+#: Model/Attribute.php:1117
 msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
 msgstr ""
 
-#: Model/Attribute.php:1045
+#: Model/Attribute.php:1132
 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:1063
+#: Model/Attribute.php:1150
 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:1068
+#: Model/Attribute.php:1155
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1079
+#: Model/Attribute.php:1166
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
-msgstr ""
+msgstr "Nieprawidłowy skrót SSDeep (oczekiwany: blocksize:hash:hash)."
 
-#: Model/Attribute.php:1087
+#: Model/Attribute.php:1174
 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:1098
+#: Model/Attribute.php:1185
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1105;1156
+#: Model/Attribute.php:1192;1243
 msgid "IP address has an invalid format."
-msgstr ""
+msgstr "Adres IP ma nieprawidłowy format."
 
-#: Model/Attribute.php:1110
+#: Model/Attribute.php:1197
 msgid "Port numbers have to be positive integers between 1 and 65535."
-msgstr ""
+msgstr "Numer portu musi być dodatnią liczbą całkowitą między 1 a 65535."
 
-#: Model/Attribute.php:1139
+#: Model/Attribute.php:1226
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1159
+#: Model/Attribute.php:1246
 msgid "Domain name has an invalid format."
-msgstr ""
+msgstr "Nazwa domeny ma nieprawidłowy format."
 
-#: Model/Attribute.php:1172
+#: Model/Attribute.php:1260
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1180
+#: Model/Attribute.php:1268
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
-msgstr ""
+msgstr "Nieprawidłowy format. Oczekiwano: CVE-xxxx-xxxx..."
 
-#: Model/Attribute.php:1191
+#: Model/Attribute.php:1276
+msgid "Invalid format. Expected: CWE-x..."
+msgstr "Nieprawidłowy format. Oczekiwano: CWE-x..."
+
+#: Model/Attribute.php:1287
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1306
+#: Model/Attribute.php:1405
 msgid "Datetime has to be in the ISO 8601 format."
-msgstr ""
+msgstr "Data musi być w formacie ISO 8601."
 
-#: Model/Attribute.php:1312
+#: Model/Attribute.php:1411
 msgid "The value has to be a number greater or equal 0."
-msgstr ""
+msgstr "Wartość musi być liczbą większą lub równą 0."
 
-#: Model/Attribute.php:1319
+#: Model/Attribute.php:1418
 msgid "The value has to be a number between 0 and 10."
-msgstr ""
+msgstr "Wartość musi być liczbą pomiędzy 0 a 10."
 
-#: Model/Attribute.php:2065;2133
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2757
-msgid "This field is mandatory."
+#: Model/Attribute.php:2301
+msgid "Invalid hash type."
 msgstr ""
 
-#: Model/Attribute.php:3233
+#: Model/Attribute.php:2992
+msgid "This field is mandatory."
+msgstr "To pole jest wymagane."
+
+#: Model/Attribute.php:3559
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/Attribute.php:3921;3928;3932
-msgid "Attribute not found or not authorised."
-msgstr "Atrybut nie został znaleziony lub wykonanie tej akcji jest nieautoryzowane."
+#: Model/Community.php:26;67
+msgid "Default community list not found."
+msgstr ""
 
-#: Model/Event.php:378
+#: Model/Community.php:30;71
+msgid "Default community list empty."
+msgstr ""
+
+#: Model/Community.php:35;76
+msgid "Default community list not in the expected format."
+msgstr ""
+
+#: Model/Community.php:93
+msgid "Community not found."
+msgstr ""
+
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
+#: Model/DecayingModel.php:162
+msgid "Models could not be loaded or default decaying models folder is empty"
+msgstr ""
+
+#: Model/DecayingModel.php:351
+msgid "No tags nor predicates with `numerical_value`"
+msgstr ""
+
+#: Model/DecayingModel.php:358
+msgid "No predicate"
+msgstr ""
+
+#: Model/DecayingModel.php:437
+msgid "The class for `%s` was not found or not loaded correctly"
+msgstr ""
+
+#: Model/Event.php:390
 msgid "Click this to download all events and attributes that you have access to in MISP JSON format."
 msgstr ""
 
-#: Model/Event.php:386
+#: Model/Event.php:398
 msgid "Click this to download all events and attributes that you have access to in MISP XML format."
 msgstr ""
 
-#: Model/Event.php:394
+#: Model/Event.php:406
 #: View/Events/export_alternate.ctp:19
 msgid "Click this to download all attributes that are indicators and that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:402
+#: Model/Event.php:414
 #: View/Events/export_alternate.ctp:26
 msgid "Click this to download all attributes that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:410
+#: Model/Event.php:422
 msgid "Click this to download all network related attributes that you have access to under the Suricata rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:418
+#: Model/Event.php:430
 msgid "Click this to download all network related attributes that you have access to under the Snort rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:426
+#: Model/Event.php:438
 msgid "Click this to download all network related attributes that you have access to under the Bro rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:434
+#: Model/Event.php:446
 msgid "Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:442
+#: Model/Event.php:454
 msgid "Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:450
+#: Model/Event.php:462
 #: 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 ""
 
-#: Model/Event.php:458
+#: Model/Event.php:470
 msgid "Click on one of the buttons below to download all the attributes with the matching type. This list can be used to feed forensic software when searching for susipicious files. Only published events and attributes marked as IDS Signature are exported."
 msgstr ""
 
-#: Model/Event.php:466
+#: Model/Event.php:478
 msgid "Click this to download Yara rules generated from all relevant attributes."
 msgstr ""
 
-#: Model/Event.php:474
+#: Model/Event.php:486
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5774
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:5776
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:5778
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:5781
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:5783
+#: Model/Event.php:5808
 msgid "Please "
 msgstr ""
 
-#: Model/Event.php:5785
+#: Model/Event.php:5810
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:5817
+#: Model/Event.php:5842
 msgid "#"
-msgstr ""
+msgstr "#"
 
-#: Model/Event.php:5826
+#: Model/Event.php:5851
 msgid "%s not set"
-msgstr ""
+msgstr "%s nie ustawiony"
 
-#: Model/Event.php:6068
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr ""
 
-#: Model/Event.php:6538
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:1545;1589
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr "Zdarzenie %s"
 
-#: Model/Feed.php:1559
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Galaxy.php:219;276;286;300
-msgid "Invalid %s."
+#: Model/Feed.php:1687
+msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Galaxy.php:416
+#: Model/Feed.php:1690
+msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
+msgstr ""
+
+#: Model/Feed.php:1695
+msgid "Invalid user id."
+msgstr "Niewłaściwe id użytkownika."
+
+#: Model/Feed.php:1715
+msgid "Events related to feed %s purged."
+msgstr ""
+
+#: Model/Galaxy.php:421
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:808
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
 #: Model/Server.php:123
+msgid "Server unreachable"
+msgstr "Serwer nieosiągalny"
+
+#: Model/Server.php:124
+msgid "Unexpected error"
+msgstr "Nieoczekiwany błąd"
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr "Błąd autoryzacji"
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr "Wymagana zmiana hasła"
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr "Warunki nie zaakceptowane"
+
+#: Model/Server.php:150
 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:124
+#: Model/Server.php:151
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:134
+#: Model/Server.php:163
 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:135
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:144
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:145
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:154
+#: Model/Server.php:183
 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:156
+#: Model/Server.php:185
 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:162
+#: Model/Server.php:191
 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:170
+#: Model/Server.php:199
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:178
+#: Model/Server.php:207
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:188
-msgid "Enable some performance heavy correlations (currently CIDR correlation)"
-msgstr ""
-
-#: Model/Server.php:197
-msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
-msgstr ""
-
-#: Model/Server.php:206
-msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
-msgstr ""
-
 #: Model/Server.php:217
-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."
+msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
 #: Model/Server.php:226
+msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
+msgstr ""
+
+#: Model/Server.php:235
+msgid "Enable some performance heavy correlations (currently CIDR correlation)"
+msgstr ""
+
+#: Model/Server.php:244
+msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
+msgstr ""
+
+#: Model/Server.php:253
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:264
+msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:274
+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:283
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:234
+#: Model/Server.php:291
 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:243
+#: Model/Server.php:300
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:245
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:251;259;286;310;318;326;334;391;439;447;514
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:267
+#: Model/Server.php:324
 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:277
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr ""
 
-#: Model/Server.php:294
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:302
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:342
+#: Model/Server.php:399
 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:350
+#: Model/Server.php:407
 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:358
+#: Model/Server.php:415
 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:366
+#: Model/Server.php:423
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:374
+#: Model/Server.php:431
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:383
+#: Model/Server.php:440
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:385
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:399
+#: Model/Server.php:456
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:407
+#: Model/Server.php:464
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:415
+#: Model/Server.php:472
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:423
+#: Model/Server.php:480
 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:431
+#: Model/Server.php:488
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:455
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:463
+#: Model/Server.php:520
 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:473
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:481
+#: Model/Server.php:538
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:489
+#: Model/Server.php:546
 msgid "The e-mail address that MISP should use for all notifications"
-msgstr ""
+msgstr "Adres e-mail, którego MISP powinien używać do wszystkich powiadomień"
 
-#: Model/Server.php:497
+#: Model/Server.php:554
 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:506
+#: Model/Server.php:563
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:522
+#: Model/Server.php:579
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:530
+#: Model/Server.php:587
+msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
+msgstr ""
+
+#: Model/Server.php:595
 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:538
+#: Model/Server.php:603
 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:546
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:555
+#: Model/Server.php:620
 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:564
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:582
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:590
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:599
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:607
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:615
+#: Model/Server.php:689
 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:623
+#: Model/Server.php:697
 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:631
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:639
+#: Model/Server.php:713
 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:647
+#: Model/Server.php:721
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:655
+#: Model/Server.php:729
 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:663
+#: Model/Server.php:737
 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:671
+#: Model/Server.php:745
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:680
+#: Model/Server.php:754
 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:689
+#: Model/Server.php:763
 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:697
+#: Model/Server.php:771
 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:704
+#: Model/Server.php:778
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:711
+#: Model/Server.php:785
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:720
+#: Model/Server.php:794
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:728
+#: Model/Server.php:802
+msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
+msgstr ""
+
+#: Model/Server.php:804
+msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
+msgstr ""
+
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:737
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:746
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:755
+#: Model/Server.php:838
+msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
+msgstr ""
+
+#: Model/Server.php:847
 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:764
+#: Model/Server.php:856
 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:773
+#: Model/Server.php:865
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:782
+#: Model/Server.php:874
 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:791
+#: Model/Server.php:883
 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:800
+#: Model/Server.php:892
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:810
+#: Model/Server.php:902
 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:819
+#: Model/Server.php:911
 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:828
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:837
+#: Model/Server.php:929
 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:846
-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"
+#: Model/Server.php:938
+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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:855
+#: Model/Server.php:947
+msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:956
 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:865
+#: Model/Server.php:966
 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:874
+#: Model/Server.php:975
 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:883
+#: Model/Server.php:984
 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:892
+#: Model/Server.php:993
 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:902
+#: Model/Server.php:1003
 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:911
+#: Model/Server.php:1012
 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:919
+#: Model/Server.php:1020
 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:927
+#: Model/Server.php:1028
 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:935
+#: Model/Server.php:1036
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:944
+#: Model/Server.php:1045
 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:952
+#: Model/Server.php:1053
 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:960
+#: Model/Server.php:1061
 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:969
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:980
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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:989
+#: Model/Server.php:1099
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1107
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:1005
+#: Model/Server.php:1115
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:1013
+#: Model/Server.php:1123
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:1021
+#: Model/Server.php:1131
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:1030
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:1041
+#: Model/Server.php:1151
 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:1049
+#: Model/Server.php:1159
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:1057
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1065
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1073
+#: Model/Server.php:1183
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:1085
+#: Model/Server.php:1195
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:1093
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
-msgstr ""
+msgstr "Port TCP dla proxy HTTP."
 
-#: Model/Server.php:1101
+#: Model/Server.php:1211
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:1109
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
-msgstr ""
+msgstr "Nazwa użytkownika uwierzytelniającego dla serwera proxy HTTP."
 
-#: Model/Server.php:1117
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
+msgstr "Hasło uwierzytelniania HTTP proxy."
+
+#: Model/Server.php:1238
+msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
 msgstr ""
 
-#: Model/Server.php:1128
+#: Model/Server.php:1247
 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:1137
+#: Model/Server.php:1257
 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:1146
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1154
+#: Model/Server.php:1292
 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:1162
+#: Model/Server.php:1300
 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:1171
+#: Model/Server.php:1309
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1180
+#: Model/Server.php:1318
 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:1189
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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:1191
+#: Model/Server.php:1339
 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:1198
+#: Model/Server.php:1346
 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:1207
+#: Model/Server.php:1355
 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:1219
+#: Model/Server.php:1364
+msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
+msgstr ""
+
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1227
+#: Model/Server.php:1393
 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:1238
+#: Model/Server.php:1404
 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:1246
+#: Model/Server.php:1412
 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:1254
+#: Model/Server.php:1420
 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:1263
+#: Model/Server.php:1429
 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:1271
+#: Model/Server.php:1437
 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:1282
+#: Model/Server.php:1448
 msgid "The default policy action for the values added to the RPZ."
 msgstr ""
 
-#: Model/Server.php:1291
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1299
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:1307
+#: Model/Server.php:1473
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1315
+#: Model/Server.php:1481
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1323
+#: Model/Server.php:1489
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1331
+#: Model/Server.php:1497
 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:1339
+#: Model/Server.php:1505
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1347
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr "Serwer nazw"
 
-#: Model/Server.php:1355
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr "Alternatywny serwer nazw"
 
-#: Model/Server.php:1363
+#: Model/Server.php:1529
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1371
+#: Model/Server.php:1537
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1379
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr ""
 
-#: Model/Server.php:1387
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr ""
 
-#: Model/Server.php:1395;1642
+#: Model/Server.php:1561;1808
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1403;1650
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1411
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1419
+#: Model/Server.php:1585
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1427
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr ""
 
-#: Model/Server.php:1435;1658
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1443
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1451;1666
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1459
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1467;1674
+#: Model/Server.php:1633;1840
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1475
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1483
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1491
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1499;1682
+#: Model/Server.php:1665;1848
 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:1507
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1515
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr ""
 
-#: Model/Server.php:1523
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr ""
 
-#: Model/Server.php:1531
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr ""
 
-#: Model/Server.php:1539
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr ""
 
-#: Model/Server.php:1547
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1555
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1563
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1571
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr ""
 
-#: Model/Server.php:1579
+#: Model/Server.php:1745
 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:1588
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1597
+#: Model/Server.php:1763
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1606
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1615
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1624
+#: Model/Server.php:1790
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1799
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1690
+#: Model/Server.php:1856
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1698
+#: Model/Server.php:1864
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1706
+#: Model/Server.php:1872
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1714
+#: Model/Server.php:1880
 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:1722
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1730
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1738
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1746
+#: Model/Server.php:1912
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1754
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1762
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1770
+#: Model/Server.php:1936
 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:1778
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1786
+#: Model/Server.php:1952
 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:1795
+#: Model/Server.php:1961
 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:1803
+#: Model/Server.php:1969
 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:1811
+#: Model/Server.php:1977
+msgid "Enable SightingDB integration."
+msgstr "Włącz integrację SightingDB."
+
+#: Model/Server.php:1985
 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:1821
+#: Model/Server.php:1995
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1830
+#: Model/Server.php:2004
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1839
+#: Model/Server.php:2013
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1848
+#: Model/Server.php:2022
 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:1857
+#: Model/Server.php:2031
 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:1866
+#: Model/Server.php:2040
 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:1875
+#: Model/Server.php:2049
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1883
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1891
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1899
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1907
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1915
+#: Model/Server.php:2089
 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:1923
+#: Model/Server.php:2097
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1931
+#: Model/Server.php:2105
 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:1939
+#: Model/Server.php:2113
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1947
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1955
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1963
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1971
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1979
+#: Model/Server.php:2153
 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:1987
+#: Model/Server.php:2161
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1995
+#: Model/Server.php:2169
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:2003
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:2011
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2019
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:2028
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2036
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:2045
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:2054
+#: Model/Server.php:2228
 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:2063
+#: Model/Server.php:2237
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:2072
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:2081
+#: Model/Server.php:2255
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:2091
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:2100
+#: Model/Server.php:2274
 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:2254
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2258
+#: Model/Server.php:2445
 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:2285
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr ""
 
-#: Model/Server.php:2291
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr ""
 
-#: Model/Server.php:2369
+#: Model/Server.php:2557
 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:2371
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
-msgstr ""
+msgstr "Przepraszamy, to nie jest jeszcze zaimplementowane"
 
-#: Model/Server.php:2372
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2384;2386
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
-msgstr ""
+msgstr "Nieznany problem."
 
-#: Model/Server.php:2850
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2853
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2861
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2976
+#: Model/Server.php:3260
 msgid "Value not set."
+msgstr "Wartość nie ustawiona."
+
+#: Model/Server.php:3281
+msgid "Invalid language."
+msgstr "Niepoprawny język."
+
+#: Model/Server.php:3302
+msgid "Invalid tag_collection."
 msgstr ""
 
-#: Model/Server.php:3676
+#: Model/Server.php:3310
+msgid "This setting has to be a number."
+msgstr ""
+
+#: Model/Server.php:3322
+msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
+msgstr ""
+
+#: Model/Server.php:3619
+msgid "Invalid file path or file not accessible."
+msgstr "Nieprawidłowa ścieżka pliku lub plik jest niedostępny."
+
+#: Model/Server.php:3622
+msgid "File has to be in .pem format."
+msgstr "Plik musi być w formacie .pem."
+
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr ""
 
-#: Model/Server.php:3808
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr ""
 
-#: Model/Server.php:3809
+#: Model/Server.php:4121
 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:3811
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr ""
 
-#: Model/Server.php:3814;3829
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
-msgstr ""
+msgstr "Nazwa pliku musi być w następującym formacie: *.png"
 
-#: Model/Server.php:3818
+#: Model/Server.php:4130
 msgid "Additional image files"
-msgstr ""
+msgstr "Dodatkowe pliki obrazów"
 
-#: Model/Server.php:3819
+#: Model/Server.php:4131
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:3826
+#: Model/Server.php:4138
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:4014
+#: Model/Server.php:4228
+msgid "Invalid server."
+msgstr "Nieprawidłowy serwer."
+
+#: Model/Server.php:4259
+msgid "Response was empty."
+msgstr "Odpowiedź była pusta."
+
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:4471
+#: Model/Server.php:4604
+msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
+msgstr ""
+
+#: Model/Server.php:4675
+msgid "Can't check database schema for Postgres database type"
+msgstr ""
+
+#: Model/Server.php:4692
+msgid "Table `%s` does not exist"
+msgstr "Tabela `%s` nie istnieje"
+
+#: Model/Server.php:4719
+msgid "Column `%s` exists but should not"
+msgstr "Kolumna `%s` istnieje, ale nie powinna"
+
+#: Model/Server.php:4752
+msgid "Column `%s` is different"
+msgstr "Kolumna `%s` jest inna"
+
+#: Model/Server.php:4762
+msgid "Column `%s` does not exist but should"
+msgstr "Kolumna `%s` nie istnieje, ale powinna"
+
+#: Model/Server.php:4775
+msgid "Table `%s` is an additional table"
+msgstr ""
+
+#: Model/Server.php:4799
+msgid "Column `%s` should be indexed"
+msgstr "Kolumna `%s` powinna być indeksowana"
+
+#: Model/Server.php:4822
+msgid "Column `%s` is indexed but should not"
+msgstr "Kolumna `%s` jest indeksowana, ale nie powinna"
+
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:4472
+#: Model/Server.php:5253
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:4476
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:4477
+#: Model/Server.php:5258
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:4805
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:4805;4834
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:4817
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:4818
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:4931
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:4938
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:4945
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr ""
 
+#: Model/Server.php:5911
+msgid "Could not reset the remote authentication key."
+msgstr ""
+
+#: Model/Server.php:5988
+msgid "Could not parse JSON: "
+msgstr ""
+
+#: Model/Server.php:6008
+msgid "Could not reset fetch remote user account."
+msgstr ""
+
+#: Model/Server.php:6030
+msgid "No user object received in response."
+msgstr ""
+
+#: Model/Sightingdb.php:346
+msgid "Could not resolve Sightingdb address."
+msgstr ""
+
+#: Model/Sightingdb.php:348
+msgid "Something went wrong. Could not contact the SightingDB server."
+msgstr ""
+
+#: Model/Sightingdb.php:363
+msgid "The SightingDB returned an invalid response."
+msgstr ""
+
+#: Model/Sightingdb.php:366
+msgid "No response from the SightingDB server."
+msgstr ""
+
+#: Model/Taxonomy.php:619
+msgid "Taxonomy `%s` is an exclusive Taxonomy"
+msgstr ""
+
+#: Model/Taxonomy.php:626
+msgid "Predicate `%s` is exclusive"
+msgstr ""
+
+#: Model/User.php:1254
+msgid "reset_all_sync_api_keys"
+msgstr ""
+
+#: Model/User.php:1255
+msgid "Reseting all API keys"
+msgstr ""
+
+#: Model/User.php:1317
+msgid "Reset in progress - %s/%s."
+msgstr ""
+
+#: Model/User.php:1322
+msgid "%s authkeys reset, %s could not be reset"
+msgstr ""
+
+#: Model/User.php:1347
+msgid "Authentication key for user %s (%s) updated."
+msgstr ""
+
+#: Model/User.php:1359
+msgid "Dear user,\n\n"
+"an API key reset has been triggered by an administrator for your user account on %s.\n\n"
+"Your new API key is: %s\n\n"
+"Please update your server's sync setup to reflect this change.\n\n"
+"We apologise for the inconvenience."
+msgstr ""
+
+#: Model/User.php:1364
+msgid "Dear user,\n\n"
+"an API key reset has been triggered by an administrator for your user account on %s.\n\n"
+"Your new API key can be retrieved by logging in using this sync user's account.\n\n"
+"Please update your server's sync setup to reflect this change.\n\n"
+"We apologise for the inconvenience."
+msgstr ""
+
+#: Model/User.php:1373
+msgid "API key reset by administrator"
+msgstr ""
+
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/Polynomial.php:7
+msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/PolynomialExtended.php:7
+msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms` with support of the `Retention` taxonomy which overrides the final score."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/PolynomialExtended.php:17
+msgid "`Retention` taxonomy not available"
+msgstr ""
+
 #: Plugin/Assets/models/behaviors/LogableBehavior.php:361
 msgid "deleted"
 msgstr ""
@@ -4036,73 +5508,46 @@ msgstr ""
 msgid "it has the following dependent items"
 msgstr ""
 
-#: View/Attributes/add.ctp:7
+#: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
 
-#: View/Attributes/add.ctp:7
+#: View/Attributes/add.ctp:6
 #: View/Attributes/edit.ctp:4
 msgid "Edit Attribute"
 msgstr ""
 
-#: View/Attributes/add.ctp:14
+#: View/Attributes/add.ctp:18
 #: 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 ""
+msgstr "(wybierz jeden)"
 
-#: 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:25
+msgid "(choose category first)"
+msgstr "(najpierw wybierz kategorię)"
 
-#: 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.ctp:39
 #: 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:178
-#: View/Feeds/edit.ctp:173
+#: View/Events/add.ctp:33
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
+#: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
 msgstr ""
 
-#: View/Attributes/add.ctp:67
+#: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -4111,140 +5556,59 @@ msgstr ""
 msgid "Contextual Comment"
 msgstr ""
 
-#: View/Attributes/add.ctp:76
+#: View/Attributes/add.ctp:57
 #: 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;202
-#: View/Events/contact.ctp:29
-#: View/Events/edit.ctp:61
-#: View/Events/free_text_import.ctp:27
-#: View/Events/resolved_misp_format.ctp:350
-#: View/News/add.ctp:33
-#: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:131
-#: View/Objects/add.ctp:153
-#: View/Organisations/admin_add.ctp:49
-#: View/Organisations/admin_edit.ctp:60
-#: View/Posts/add.ctp:66
-#: View/Posts/edit.ctp:20
-#: View/Servers/add.ctp:119
-#: View/Servers/edit.ctp:164
-#: View/Servers/ondemand_action.ctp:53
-#: 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/Users/statistics_galaxymatrix.ctp:31
-#: View/Whitelists/admin_edit.ctp:13
-msgid "Submit"
-msgstr "Wyślij"
+#: View/Attributes/add.ctp:155
+msgid "Timezone missing, auto-detected as: "
+msgstr "Brak strefy czasowej, automatycznie wykryto jako: "
 
-#: 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:203
-#: 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/resolved_misp_format.ctp:351
-#: View/Events/ajax/enrich_event.ctp:22
-#: View/Events/ajax/enrichmentChoice.ctp:35
-#: 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:135
-#: View/ObjectReferences/ajax/delete.ctp:37
-#: View/Objects/add.ctp:159
-#: View/Objects/revise_object.ctp:105
-#: 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 "Anuluj"
+#: View/Attributes/add.ctp:156
+msgid "The following value will be submited instead: "
+msgstr ""
+
+#: View/Attributes/add.ctp:164
+msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
+msgstr ""
 
 #: View/Attributes/add_attachment.ctp:4
 msgid "Add Attachment(s)"
+msgstr "Dodaj załącznik(i)"
+
+#: 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 "Kategoria "
+
+#: View/Attributes/add_attachment.ctp:24
+#: View/Attributes/edit.ctp:24
+#: View/Objects/ajax/quickAddAttributeForm.ctp:59
+msgid "Distribution "
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:64
+#: View/Attributes/add_attachment.ctp:63
 msgid "Is a malware sample (encrypt and hash)"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:73
+#: View/Attributes/add_attachment.ctp:72
 msgid "Advanced extraction (if installed)"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:78
+#: View/Attributes/add_attachment.ctp:77
 #: View/Elements/healthElements/files.ctp:92
 #: 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 ""
+msgstr "Prześlij"
 
 #: View/Attributes/add_threatconnect.ctp:4
 msgid "Import ThreatConnect CSV file"
@@ -4259,24 +5623,30 @@ msgid "This is a list of events that match the given search criteria sorted acco
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:6
+#: View/EventDelegations/index.ctp:70
 msgid "Event id"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:7
 #: View/Attributes/index.ctp:49
-#: View/Elements/eventattribute.ctp:146
+#: View/DecayingModel/decaying_tool_rest_search.ctp:24
+#: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:8
-#: View/Elements/Events/View/row_attribute.ctp:68
+#: View/Elements/Events/View/row_attribute.ctp:71
 #: View/EventBlacklists/add.ctp:24
 #: View/EventBlacklists/edit.ctp:25
+#: View/EventDelegations/index.ctp:78
 #: View/Events/add_misp_export_result.ctp:5
 #: View/Events/resolved_misp_format.ctp:51
 msgid "Event info"
@@ -4287,7 +5657,7 @@ msgid "Event date"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:472
+#: View/Events/view.ctp:509
 msgid "Event graph"
 msgstr ""
 
@@ -4309,6 +5679,13 @@ msgstr ""
 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:15
+#: View/Attributes/edit.ctp:12
+#: View/ShadowAttributes/add.ctp:15
+#: View/ShadowAttributes/edit.ctp:13
+msgid "(first choose category)"
+msgstr ""
+
 #: View/Attributes/attribute_replace.ctp:19
 msgid "Mark all new attributes as to IDS"
 msgstr ""
@@ -4320,10 +5697,10 @@ msgid "Values"
 msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
-#: View/ShadowAttributes/add.ctp:46
+#: View/ShadowAttributes/add.ctp:57
 #: 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
@@ -4341,6 +5718,115 @@ msgstr ""
 msgid "Replaceattributes"
 msgstr ""
 
+#: View/Attributes/attribute_replace.ctp:38
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Elements/view_galaxy_matrix.ctp:76;211
+#: View/Elements/genericElements/Form/submitButton.ctp:8;25
+#: View/Events/contact.ctp:29
+#: View/Events/free_text_import.ctp:27
+#: View/Events/resolved_misp_format.ctp:386
+#: View/News/add.ctp:33
+#: View/News/edit.ctp:34
+#: View/ObjectReferences/ajax/add.ctp:131
+#: View/Objects/add.ctp:166
+#: View/Objects/ajax/quickAddAttributeForm.ctp:119
+#: View/Organisations/admin_add.ctp:48
+#: View/Organisations/admin_edit.ctp:59
+#: View/Posts/add.ctp:66
+#: View/Posts/edit.ctp:20
+#: View/Servers/add.ctp:129
+#: View/Servers/edit.ctp:171
+#: View/Servers/ondemand_action.ctp:54
+#: 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/UserSettings/set_setting.ctp:36
+#: View/Users/admin_add.ctp:98
+#: 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/Users/statistics_galaxymatrix.ctp:31
+#: View/Whitelists/admin_edit.ctp:13
+msgid "Submit"
+msgstr "Wyślij"
+
+#: View/Attributes/attribute_replace.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
+#: 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:212
+#: View/Elements/genericElements/infoModal.ctp:40
+#: View/Elements/genericElements/Form/submitButton.ctp:13
+#: View/Elements/serverRuleElements/pull.ctp:73
+#: 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/resolved_misp_format.ctp:387
+#: View/Events/ajax/enrich_event.ctp:22
+#: View/Events/ajax/enrichmentChoice.ctp:35
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:135
+#: View/ObjectReferences/ajax/delete.ctp:37
+#: View/Objects/add.ctp:172
+#: View/Objects/revise_object.ctp:112
+#: 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:69
+#: View/ShadowAttributes/edit.ctp:68
+#: 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:26
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:32
+#: View/Warninglists/ajax/delete_confirmation.ctp:25
+msgid "Cancel"
+msgstr "Anuluj"
+
 #: View/Attributes/check_composites.ctp:2
 msgid "Failed Composites"
 msgstr ""
@@ -4349,24 +5835,31 @@ msgstr ""
 msgid "No Failed Composites"
 msgstr ""
 
+#: View/Attributes/edit.ctp:13
+#: View/ShadowAttributes/add.ctp:16
+#: View/ShadowAttributes/edit.ctp:14
+msgid "Type "
+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
+#: View/ShadowAttributes/add.ctp:66
+#: View/ShadowAttributes/edit.ctp:56;65
 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:481
+#: View/Events/view.ctp:521
 #: 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
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr ""
 
@@ -4403,22 +5896,21 @@ msgid "Results for all attributes"
 msgstr ""
 
 #: View/Attributes/index.ctp:39;128
-#: View/Elements/eventattribute.ctp:60;227
+#: View/DecayingModel/decaying_tool_rest_search.ctp:12;64
+#: View/DecayingModel/index.ctp:13;169
+#: View/Elements/eventattribute.ctp:60;247
 #: 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/Elements/genericElements/IndexTable/pagination.ctp:10
+#: View/Elements/Feeds/eventattribute.ctp:20;87
+#: View/Elements/Servers/eventattribute.ctp:20;87
+#: View/Elements/genericElements/IndexTable/pagination.ctp:14
 #: View/EventBlacklists/index.ctp:13;85
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -4431,19 +5923,18 @@ msgstr ""
 #: 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;95
+#: View/Roles/admin_index.ctp:13;105
 #: View/Roles/index.ctp:13;68
-#: View/Servers/index.ctp:13;156
+#: View/Servers/index.ctp:13;202
 #: View/Servers/preview_index.ctp:15;190
-#: View/ShadowAttributes/index.ctp:12;118
-#: View/SharingGroups/index.ctp:13;105
+#: View/ShadowAttributes/index.ctp:12;128
+#: View/SharingGroups/index.ctp:13;107
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;65
 #: 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
@@ -4452,22 +5943,21 @@ msgid "previous"
 msgstr ""
 
 #: View/Attributes/index.ctp:41;130
-#: View/Elements/eventattribute.ctp:62;229
+#: View/DecayingModel/decaying_tool_rest_search.ctp:14;66
+#: View/DecayingModel/index.ctp:15;171
+#: View/Elements/eventattribute.ctp:62;249
 #: 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/Elements/genericElements/IndexTable/pagination.ctp:12
+#: View/Elements/Feeds/eventattribute.ctp:22;89
+#: View/Elements/Servers/eventattribute.ctp:22;89
+#: View/Elements/genericElements/IndexTable/pagination.ctp:16
 #: View/EventBlacklists/index.ctp:15;87
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -4480,19 +5970,18 @@ msgstr ""
 #: 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;97
+#: View/Roles/admin_index.ctp:15;107
 #: View/Roles/index.ctp:15;70
-#: View/Servers/index.ctp:15;158
+#: View/Servers/index.ctp:15;204
 #: View/Servers/preview_index.ctp:17;192
-#: View/ShadowAttributes/index.ctp:14;120
-#: View/SharingGroups/index.ctp:15;107
+#: View/ShadowAttributes/index.ctp:14;130
+#: View/SharingGroups/index.ctp:15;109
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;67
 #: 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
@@ -4500,26 +5989,41 @@ msgstr ""
 msgid "next"
 msgstr ""
 
+#: View/Attributes/index.ctp:47
+#: View/DecayingModel/decaying_tool_rest_search.ctp:23
+#: View/Elements/eventattribute.ctp:139
+#: View/Elements/Feeds/eventattribute.ctp:41
+#: View/Elements/Servers/eventattribute.ctp:41
+#: View/Events/proposal_event_index.ctp:30
+#: View/Events/view.ctp:143
+#: View/Feeds/preview_event.ctp:25
+#: View/Objects/group_attributes_into_object.ctp:56
+#: 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 "Data"
+
 #: View/Attributes/index.ctp:54
-#: View/Elements/eventattribute.ctp:157
-#: View/Elements/global_menu.ctp:90
-#: View/Events/view.ctp:493
+#: View/DecayingModel/decaying_tool_rest_search.ctp:30
+#: View/Elements/eventattribute.ctp:158
+#: View/Elements/global_menu.ctp:94
+#: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr ""
 
 #: View/Attributes/index.ctp:56
-#: View/Elements/eventattribute.ctp:159
+#: View/Elements/eventattribute.ctp:160
 msgid "Correlate"
 msgstr ""
 
 #: View/Attributes/index.ctp:57
-#: View/Elements/eventattribute.ctp:160
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:336
+#: View/Elements/eventattribute.ctp:161
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+#: View/Events/view.ctp:372
 #: View/Feeds/preview_event.ctp:73
 #: View/Pages/doc/using_the_system.ctp:235
 #: View/Servers/preview_event.ctp:95
@@ -4527,30 +6031,33 @@ msgid "Related Events"
 msgstr ""
 
 #: View/Attributes/index.ctp:58
-#: View/Elements/eventattribute.ctp:161
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:49
 msgid "Feed hits"
 msgstr ""
 
 #: View/Attributes/index.ctp:61
-#: View/Elements/eventattribute.ctp:164
-#: View/Events/view.ctp:251
+#: View/DecayingModel/decaying_tool_rest_search.ctp:33
+#: View/Elements/eventattribute.ctp:165
+#: View/Events/view.ctp:252
 msgid "Sightings"
 msgstr ""
 
 #: View/Attributes/index.ctp:62
-#: View/Elements/eventattribute.ctp:165
-#: View/Events/view.ctp:261
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:262
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
-msgstr ""
+msgstr "Aktywność"
 
 #: View/Attributes/index.ctp:63
-#: View/Elements/eventattribute.ctp:166
+#: View/DecayingModel/index.ctp:99
+#: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -4559,10 +6066,7 @@ msgstr ""
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -4570,12 +6074,12 @@ msgstr ""
 #: 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/Roles/admin_index.ctp:36
+#: View/Servers/index.ctp:41
 #: View/Servers/preview_index.ctp:106
 #: View/SharingGroups/add.ctp:74;94
 #: View/SharingGroups/edit.ctp:74;102
-#: View/SharingGroups/index.ctp:47
+#: View/SharingGroups/index.ctp:48
 #: View/Sightings/ajax/list_sightings.ctp:11
 #: View/TagCollections/index.ctp:16
 #: View/Tags/index.ctp:76
@@ -4588,6 +6092,8 @@ msgid "Actions"
 msgstr ""
 
 #: View/Attributes/index.ctp:121
+#: View/DecayingModel/decaying_tool_rest_search.ctp:57
+#: View/DecayingModel/index.ctp:162
 #: View/Elements/eventdiscussion.ctp:119
 #: View/Elements/generic_table.ctp:53
 #: View/Elements/generic_table_row.ctp:45
@@ -4596,10 +6102,7 @@ msgstr ""
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -4612,19 +6115,18 @@ msgstr ""
 #: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
-#: View/Roles/admin_index.ctp:88
+#: View/Roles/admin_index.ctp:98
 #: View/Roles/index.ctp:61
-#: View/Servers/index.ctp:149
+#: View/Servers/index.ctp:195
 #: View/Servers/preview_index.ctp:182
-#: View/ShadowAttributes/index.ctp:111
-#: View/SharingGroups/index.ctp:98
+#: View/ShadowAttributes/index.ctp:121
+#: View/SharingGroups/index.ctp:100
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:58
 #: 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
@@ -4648,7 +6150,7 @@ msgstr ""
 #: View/Elements/templateElements/populateTemplateFile.ctp:21
 #: View/Errors/error403.ctp:3
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
 
 #: View/Attributes/report_validation_issues_attributes.ctp:13
 msgid "[Attribute details]"
@@ -4690,11 +6192,12 @@ msgstr ""
 msgid "Alternate Search Result (Events)"
 msgstr ""
 
-#: View/Attributes/search.ctp:38
-#: View/Events/automation.ctp:14
-#: View/Logs/admin_index.ctp:20;21
-#: View/Logs/admin_search.ctp:25
-msgid "Search"
+#: View/Attributes/search.ctp:47
+msgid "First seen and Last seen."
+msgstr ""
+
+#: View/Attributes/search.ctp:48
+msgid "Attributes not having first seen or last seen set might not appear in the search"
 msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:6
@@ -4711,16 +6214,15 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90;98
-#: View/Elements/Events/eventIndexTable.ctp:245
-#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -4729,127 +6231,33 @@ msgstr ""
 #: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:80
-#: View/Servers/index.ctp:137
-#: View/SharingGroups/index.ctp:87
+#: View/Roles/admin_index.ctp:90
+#: View/Servers/index.ctp:183
+#: View/SharingGroups/index.ctp:89
 #: View/Tags/index.ctp:125
 #: View/Whitelists/admin_index.ctp:32
 msgid "Delete"
 msgstr "Usuń"
 
-#: 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/Feeds/View/row_attribute.ctp:87
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:190
-#: 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:85
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:42;50
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:74;75;76;112;113;118;119
-#: 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 "Tak"
-
-#: 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/Feeds/View/row_attribute.ctp:87
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:190
-#: 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:85
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:42;50
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:74;75;76;108;112;113;118;119
-#: 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 "Nie"
-
 #: 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
+#: View/Objects/ajax/objectEditCommentForm.ctp:5
+#: View/Objects/ajax/objectEditDistributionForm.ctp:5
 msgid "Accept change"
-msgstr ""
+msgstr "Akceptuj zmianę"
 
 #: 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
+#: View/Objects/ajax/objectEditCommentForm.ctp:6
+#: View/Objects/ajax/objectEditDistributionForm.ctp:6
 msgid "Discard change"
-msgstr ""
+msgstr "Odrzuć zmianę"
 
 #: View/Attributes/ajax/attributeEditMassForm.ctp:6
 msgid "Mass Edit Attributes"
@@ -4862,14 +6270,15 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:51
-#: View/Events/resolved_misp_format.ctp:97;267
-#: View/Events/view.ctp:158
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:165
+#: View/Events/resolved_misp_format.ctp:98;293
+#: View/Events/view.ctp:159
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
-#: View/Objects/add.ctp:47;105;201
+#: View/Feeds/index.ctp:184
+#: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
-#: View/Objects/revise_object.ctp:35;62
+#: View/Objects/revise_object.ctp:35;69
 #: 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
@@ -4882,23 +6291,27 @@ msgstr ""
 msgid "For Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
@@ -4979,41 +6392,952 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Communities/index.ctp:14
+msgid "Vetted by the MISP-project team"
+msgstr ""
+
+#: View/Communities/index.ctp:19
+msgid "Unvetted"
+msgstr ""
+
+#: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
+#: View/EventBlacklists/index.ctp:35
+#: View/EventDelegations/index.ctp:41
+#: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
+#: View/Feeds/preview_index.ctp:25
+#: View/Feeds/search_caches.ctp:26
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
+#: View/ObjectTemplates/index.ctp:47
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
+#: View/ShadowAttributes/index.ctp:37
+#: View/Sightingdb/index.ctp:10
+#: View/Tags/index.ctp:56
+#: View/Taxonomies/view.ctp:65
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
+msgid "Filter"
+msgstr ""
+
+#: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
+#: View/Elements/eventattributetoolbar.ctp:231
+#: View/EventBlacklists/index.ctp:36
+#: View/EventDelegations/index.ctp:42
+#: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
+#: View/Feeds/preview_index.ctp:26
+#: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
+#: View/ObjectTemplates/index.ctp:48
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+#: View/ShadowAttributes/index.ctp:38
+#: View/Sightingdb/index.ctp:11
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
+msgid "Enter value to search"
+msgstr ""
+
+#: View/Communities/index.ctp:34
+#: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
+#: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
+#: View/Feeds/search_caches.ctp:35
+#: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Sightingdb/index.ctp:26
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
+#: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/Communities/index.ctp:40
+msgid "Vetted"
+msgstr ""
+
+#: View/Communities/index.ctp:46
+msgid "Host org"
+msgstr ""
+
+#: View/Communities/index.ctp:53
+msgid "Community name"
+msgstr ""
+
+#: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
+#: View/DecayingModel/index.ctp:89
+#: View/DecayingModel/view.ctp:21
+#: View/Elements/Servers/View/row_object.ctp:24
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: 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:26
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
+#: View/ObjectTemplates/view.ctp:9
+#: View/Objects/add.ctp:22;113;210
+#: View/Objects/group_attributes_into_object.ctp:8
+#: View/Objects/propose_objects_from_attributes.ctp:17
+#: 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:46
+#: View/Sightingdb/index.ctp:88
+#: View/TagCollections/index.ctp:15
+#: View/Taxonomies/view.ctp:14
+#: View/Templates/view.ctp:14
+#: View/Warninglists/view.ctp:11
+msgid "Description"
+msgstr ""
+
+#: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
+msgid "Communities index"
+msgstr ""
+
+#: View/Communities/index.ctp:72
+msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
+msgstr ""
+
+#: View/Communities/request_access.ctp:7
+msgid "Describe both yourself and your organisation as best as you can - keep in mind this information is to be used by the hosts of the community you are requesting access to in order to determine whether you're a good fit for their community. The sending server's basic metadata is included by default, you can opt out using the \"anonymise\" checkbox (server url, uuid, version are shared otherwise - though this can be a useful step in establishing trust.)."
+msgstr ""
+
+#: View/Communities/request_access.ctp:10
+msgid "Requestor E-mail address"
+msgstr ""
+
+#: View/Communities/request_access.ctp:15
+#: View/Jobs/index.ctp:104
+#: View/OrgBlacklists/add.ctp:17
+#: View/OrgBlacklists/index.ctp:22
+#: View/Organisations/view.ctp:6
+msgid "Organisation name"
+msgstr ""
+
+#: View/Communities/request_access.ctp:20
+msgid "Organisation uuid"
+msgstr ""
+
+#: View/Communities/request_access.ctp:25
+msgid "Description of the requestor organisation"
+msgstr ""
+
+#: View/Communities/request_access.ctp:31
+msgid "Message to the community host organisation"
+msgstr ""
+
+#: View/Communities/request_access.ctp:37
+msgid "PGP public key"
+msgstr "Klucz publiczny PGP"
+
+#: View/Communities/request_access.ctp:44
+msgid "Request sync access"
+msgstr ""
+
+#: View/Communities/request_access.ctp:49
+msgid "Anonymise information on the server used to issue the request"
+msgstr ""
+
+#: View/Communities/request_access.ctp:54
+msgid "Generate e-mail for later use, but do not send it"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:5
+msgid "Email to send in order to request access"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:6
+msgid "Emailing is currently disabled on the instance, but we have generated the e-mail that would normally be sent out below."
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:7
+msgid "Please find a generated e-mail below that you can use to contact the community in question"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:8
+msgid "Headers:"
+msgstr "Nagłówki:"
+
+#: View/Communities/request_access_email.ctp:10
+msgid "Message:"
+msgstr ""
+
+#: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
+#: View/Elements/Events/View/row_object.ctp:72
+#: View/Events/resolved_misp_format.ctp:93;288
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
+#: View/ObjectTemplates/index.ctp:66
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:68
+#: View/OrgBlacklists/index.ctp:23
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:58;65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+#: View/SharingGroups/index.ctp:43
+#: View/TagCollections/index.ctp:8
+msgid "UUID"
+msgstr "UUID"
+
+#: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
+#: View/DecayingModel/index.ctp:88
+#: View/DecayingModel/view.ctp:14
+#: View/Elements/Servers/View/row_object.ctp:19
+#: View/Elements/templateElements/templateRowAttribute.ctp:12
+#: View/Elements/templateElements/templateRowFile.ctp:12
+#: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
+#: View/Feeds/search_caches.ctp:47
+#: View/Feeds/view.ctp:4
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
+#: View/ObjectTemplates/view.ctp:4
+#: View/Objects/add.ctp:206
+#: View/Objects/revise_object.ctp:27
+#: 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/Sightingdb/index.ctp:51
+#: View/Templates/view.ctp:9
+#: View/Users/statistics_orgs.ctp:33
+#: View/Warninglists/view.ctp:10
+msgid "Name"
+msgstr ""
+
+#: View/Communities/view.ctp:7
+#: View/SharingGroups/view.ctp:68
+msgid "Url"
+msgstr "Url"
+
+#: View/Communities/view.ctp:8
+msgid "Host organisation"
+msgstr ""
+
+#: View/Communities/view.ctp:10
+msgid "Vetted by MISP-project"
+msgstr ""
+
+#: View/Communities/view.ctp:27
+#: View/Elements/footer.ctp:15
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:64
+#: View/Users/admin_view.ctp:72
+#: View/Users/edit.ctp:23
+#: View/Users/view.ctp:32
+msgid "GnuPG key"
+msgstr "klucz GnuPG"
+
+#: View/Communities/view.ctp:42
+msgid "Community "
+msgstr ""
+
+#: View/Communities/view.ctp:51
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
+msgid "Request Access"
+msgstr ""
+
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
+#: View/DecayingModel/add.ctp:4
+msgid " Decaying Model"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:7
+msgid "You are editing a Default Model, only restricted edition is allowed."
+msgstr ""
+
+#: View/DecayingModel/add.ctp:9;28
+msgid "Can other organization use this model"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:37
+msgid "days"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:46;56;65
+msgid "float"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:65
+msgid "Default base_score"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:65
+msgid "Default base_score value if no tags are attached to the indicator"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:75
+msgid "Base Score configuration"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:84
+msgid "Model Settings"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:9
+msgid "Show All Types"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:13
+msgid "Show MISP Objects"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:15
+msgid "Search Attribute Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:22
+msgid "Check all"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:23
+msgid "Attribute Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:24
+#: View/DecayingModel/decaying_tool_rest_search.ctp:25
+#: View/Elements/templateElements/templateRowAttribute.ctp:30
+#: View/Elements/templateElements/templateRowFile.ctp:30
+#: View/Events/resolved_attributes.ctp:47
+#: View/Events/resolved_misp_format.ctp:90;285
+#: View/Events/show_i_o_c_results.ctp:11
+#: View/Feeds/freetext_index.ctp:31
+#: View/Objects/add.ctp:114
+#: View/Objects/group_attributes_into_object.ctp:57
+#: View/Objects/propose_objects_from_attributes.ctp:16
+#: View/Objects/revise_object.ctp:63
+#: 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:65
+#: 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 "Kategoria"
+
+#: View/DecayingModel/decaying_tool.ctp:25
+#: View/DecayingModel/view.ctp:3
+#: View/Logs/admin_index.ctp:75
+#: View/Logs/admin_search.ctp:14
+msgid "Model ID"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:47
+msgid "Belong to a MISP Object"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:51
+msgid "To IDS flag set"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:100
+msgid "Adjust base  score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:108
+msgid "Simulate this model"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:129
+msgid "Model's Settings"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Elements/eventdiscussion.ctp:89;97
+#: View/Elements/Events/eventIndexTable.ctp:231
+#: View/Elements/Events/View/row_attribute.ctp:413
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Users/userIndexTable.ctp:90
+#: View/EventBlacklists/edit.ctp:37
+#: View/EventBlacklists/index.ctp:69
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
+#: View/News/index.ctp:22
+#: View/OrgBlacklists/edit.ctp:30
+#: View/OrgBlacklists/index.ctp:36
+#: View/Organisations/index.ctp:138
+#: View/Pages/doc/using_the_system.ctp:191
+#: View/Regexp/admin_index.ctp:34
+#: View/Roles/admin_edit.ctp:56
+#: View/Roles/admin_index.ctp:89
+#: View/Servers/index.ctp:182
+#: View/SharingGroups/index.ctp:88
+#: View/Tags/edit.ctp:36
+#: View/Tags/index.ctp:124
+#: View/Templates/edit.ctp:49
+#: View/Whitelists/admin_index.ctp:31
+msgid "Edit"
+msgstr "Edytuj"
+
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Templates/add.ctp:49
+msgid "Create"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:146
+msgid "All available models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:149
+msgid "My models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:152
+msgid "Default models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:3
+msgid "Search Taxonomy"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:4
+msgid "Clear search field"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:5
+msgid " not having numerical value"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:7
+msgid "Default basescore"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:13
+#: View/Taxonomies/index.ctp:2
+msgid "Taxonomies"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:14
+msgid "Weight"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:91
+msgid "Excluded"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:112
+msgid "Placeholder for `Organisation source confidence`"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:115
+msgid "Example"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:141;146;151
+msgid "Pick a Taxonomy"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:157
+msgid "Computation steps"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:160
+msgid "Apply base score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:26
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
+#: View/Events/export.ctp:26
+#: View/Events/resolved_attributes.ctp:48
+#: View/Events/resolved_misp_format.ctp:91;286
+#: View/Events/show_i_o_c_results.ctp:12
+#: View/Feeds/freetext_index.ctp:32
+#: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
+#: View/Objects/revise_object.ctp:64
+#: 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:53;68
+#: 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:38
+#: View/Warninglists/view.ctp:13
+msgid "Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:27
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+#: 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/resolved_misp_format.ctp:92;287
+#: View/Events/show_i_o_c_results.ctp:13
+#: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
+#: View/Noticelists/view.ctp:42
+#: View/Objects/add.ctp:115
+#: View/Objects/group_attributes_into_object.ctp:58
+#: View/Objects/revise_object.ctp:65
+#: View/Objects/ajax/quickAddAttributeForm.ctp:78
+#: 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/UserSettings/index.ctp:68
+#: View/Users/admin_filter_user_index.ctp:71
+msgid "Value"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:29
+msgid "Event Tags"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:31
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
+#: View/ObjectReferences/ajax/add.ctp:30
+#: View/Objects/add.ctp:67;119
+#: View/Objects/group_attributes_into_object.ctp:30
+#: View/Objects/revise_object.ctp:49;67
+#: View/Pages/doc/using_the_system.ctp:234;284
+#: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
+msgid "Comment"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:35
+#: View/Elements/eventattribute.ctp:179
+msgid "Score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:84
+#: View/DecayingModel/decaying_tool_simulation.ctp:184
+msgid "Failed to perform RestSearch"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search_form.ctp:3
+msgid "Decaying Model RestSearch"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:45
+#: View/Events/automation.ctp:24
+#: View/Logs/admin_index.ctp:20;21
+#: View/Logs/admin_search.ctp:25
+msgid "Search"
+msgstr "Szukaj"
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:49
+msgid "Specific Attribute"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:53
+msgid "Attribute ID or UUID"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:55
+msgid "Simulate"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:66
+msgid "Base score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:68;71
+msgid "Base score configuration"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:68
+msgid "not set. But default value sets."
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:71
+msgid "not set"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:79
+msgid "Sighting"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:83
+msgid "Current score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:132
+msgid "Basescore computation steps"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:266
+msgid "Failed to perform the simulation"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:4
+msgid "Import model data"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:5
+msgid "Paste a MISP model JSON or provide a JSON file below to add models."
+msgstr ""
+
+#: View/DecayingModel/import.ctp:10
+#: View/Feeds/import_feeds.ctp:10
+#: View/Servers/import.ctp:10
+#: View/TagCollections/import.ctp:10
+msgid "JSON"
+msgstr "JSON"
+
+#: View/DecayingModel/import.ctp:11
+msgid "Model JSON"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:18
+msgid "JSON file"
+msgstr "Plik JSON"
+
+#: View/DecayingModel/import.ctp:25
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:15
+#: View/Elements/genericElements/org_picker.ctp:17
+#: View/EventBlacklists/add.ctp:36
+#: View/Events/filter_event_index.ctp:125
+#: View/Feeds/add.ctp:220
+#: View/Feeds/import_feeds.ctp:20
+#: View/OrgBlacklists/add.ctp:29
+#: View/Regexp/admin_add.ctp:32
+#: View/Regexp/admin_edit.ctp:42
+#: View/Roles/admin_add.ctp:57
+#: View/Servers/import.ctp:20
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:20
+#: View/Tags/add.ctp:35
+#: View/Users/admin_filter_user_index.ctp:62
+#: View/Whitelists/admin_add.ctp:13
+msgid "Add"
+msgstr "Dodaj"
+
+#: View/DecayingModel/index.ctp:2
+msgid "Decaying Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:30;31
+msgid "All Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:41
+msgid "My models only"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:42
+msgid "My Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:53
+msgid "Models available to everyone"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:54
+msgid "Shared Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:65
+msgid "Default models only"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:66
+msgid "Default Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:86
+#: View/Pages/doc/using_the_system.ctp:398
+msgid "Organization"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:87
+msgid "Usable to everyone"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:91
+#: View/DecayingModel/view.ctp:40
+msgid "Parameters"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:92
+msgid "Pretty print"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:95
+#: View/DecayingModel/view.ctp:35
+msgid "Formula"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:96
+msgid "# Assigned Types"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:97
+#: View/DecayingModel/view.ctp:25
+#: View/Galaxies/view.ctp:10
+#: View/ObjectTemplates/view.ctp:7
+#: View/Taxonomies/view.ctp:19
+#: View/Warninglists/view.ctp:12
+msgid "Version"
+msgstr "Wersja"
+
+#: View/DecayingModel/index.ctp:98
+#: View/DecayingModel/view.ctp:31
+#: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
+#: View/Feeds/view.ctp:63
+#: View/Noticelists/index.ctp:63
+#: View/ObjectTemplates/index.ctp:35
+#: View/Sightingdb/index.ctp:19
+#: View/Taxonomies/view.ctp:24
+#: View/Warninglists/view.ctp:16
+msgid "Enabled"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:114
+#: View/DecayingModel/view.ctp:18
+msgid "Default Model from MISP Project"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:137
+msgid "Download model"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:142
+msgid "Are you sure you want to delete DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:148
+msgid "Are you sure you want to disable DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:150
+msgid "Are you sure you want to enable DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:5
+#: View/Events/view.ctp:86
+msgid "Creator org"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:27
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
+#: View/SharingGroups/view.ctp:69
+#: View/TagCollections/index.ctp:12
+msgid "All orgs"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:41
+msgid "Reference(s)"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:42
+msgid "Associated types"
+msgstr ""
+
+#: View/DecayingModel/ajax/disable_form.ctp:3
+msgid "Disable model"
+msgstr ""
+
+#: View/DecayingModel/ajax/enable_form.ctp:3
+msgid "Enable model"
+msgstr ""
+
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:4
+msgid "Add DecayingModelMapping"
+msgstr ""
+
+#: View/Elements/ajaxAttributeTags.ctp:29
 #: View/Elements/ajaxTagCollectionTags.ctp:16
-#: View/Elements/ajaxTags.ctp:45
+#: View/Elements/ajaxTags.ctp:104
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Elements/ajaxAttributeTags.ctp:43
 #: 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:48
+#: View/Elements/ajaxTags.ctp:73;74
+msgid "Local tag"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:73;74
+msgid "Global tag"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:107
 msgid "Remove tag %s"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:58;61
+#: View/Elements/ajaxTags.ctp:123;124
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 #: View/Templates/add.ctp:28
 #: View/Templates/edit.ctp:28
 msgid "Add a tag"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:67;69;234;236
-#: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
-#: View/Elements/Servers/eventattribute.ctp:28;31;94;97
+#: View/Elements/ajaxTags.ctp:141;142
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
+msgid "Add a local tag"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:67;69;254;256
+#: View/Elements/Feeds/eventattribute.ctp:28;31;95;98
+#: View/Elements/Servers/eventattribute.ctp:28;31;95;98
 msgid "view all"
 msgstr ""
 
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr ""
 
@@ -5022,40 +7346,51 @@ msgid "Select all attributes/proposals on current page"
 msgstr ""
 
 #: View/Elements/eventattribute.ctp:138
-#: View/Elements/Feeds/eventattribute.ctp:41
-#: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/proposal_event_index.ctp:30
-#: View/Events/view.ctp:142
-#: View/Feeds/preview_event.ctp:25
-#: View/Objects/group_attributes_into_object.ctp:56
-#: 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"
+#: View/Elements/Feeds/eventattribute.ctp:42
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:52
+msgid "First seen"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:142
-#: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:218;229
+#: View/Elements/eventattribute.ctp:138
+#: View/Elements/Feeds/eventattribute.ctp:42
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:56
+msgid "Last seen"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:143
+#: View/Elements/eventdiscussion.ctp:143
+#: View/Events/view.ctp:219;230
 #: 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
+#: View/ShadowAttributes/index.ctp:48
 msgid "Event"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:153
+#: View/Elements/eventattribute.ctp:154
+#: View/Elements/eventattributetoolbar.ctp:201
 msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:207
+#: View/Elements/eventattribute.ctp:171
+#: View/Elements/eventattributetoolbar.ctp:185
+msgid "SightingDB"
+msgstr "SightingDB"
+
+#: View/Elements/eventattribute.ctp:178
+msgid "Decaying Score"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:227
 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:211
+#: View/Elements/eventattribute.ctp:231
 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 ""
 
@@ -5065,15 +7400,18 @@ msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:5
 msgid "Show all attributes"
-msgstr ""
+msgstr "Pokaż wszystkie atrybuty"
 
 #: View/Elements/eventattributetoolbar.ctp:6
-#: View/Elements/Events/eventIndexTable.ctp:216
+#: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
 #: View/Regexp/admin_edit.ctp:18
 #: View/Sightings/ajax/advanced.ctp:5
+#: View/UserSettings/index.ctp:41
 msgid "All"
 msgstr ""
 
@@ -5095,7 +7433,7 @@ msgid "Only show correlating attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:33
-#: View/Events/view.ctp:305
+#: View/Events/view.ctp:306
 msgid "Correlation"
 msgstr ""
 
@@ -5104,6 +7442,8 @@ msgid "Only show potentially false positive attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr ""
@@ -5113,105 +7453,111 @@ msgstr ""
 msgid "Add attribute"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:59
+#: View/Elements/eventattributetoolbar.ctp:52
+msgid "Add proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:60
 msgid "Edit selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:67
+#: View/Elements/eventattributetoolbar.ctp:68
 msgid "Tag selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:75
+#: View/Elements/eventattributetoolbar.ctp:76
 msgid "Add new cluster to selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:84
+#: View/Elements/eventattributetoolbar.ctp:85
 msgid "Group selected Attributes into an Object"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:93
+#: View/Elements/eventattributetoolbar.ctp:94
 msgid "Delete selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:101
+#: View/Elements/eventattributetoolbar.ctp:102
 msgid "Accept selected Proposals"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:109
+#: View/Elements/eventattributetoolbar.ctp:110
 msgid "Discard selected Proposals"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:117
+#: View/Elements/eventattributetoolbar.ctp:118
 msgid "Sightings display for selected attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:128
+#: View/Elements/eventattributetoolbar.ctp:129
 msgid "Populate using a template"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:136
+#: View/Elements/eventattributetoolbar.ctp:137
 msgid "Populate using the freetext import tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:143
+#: View/Elements/eventattributetoolbar.ctp:144
 msgid "Replace all attributes of a category/type combination within the event"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:157
+#: View/Elements/eventattributetoolbar.ctp:158
 msgid "Use a list of simple scopes to filter the data"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:158
+#: View/Elements/eventattributetoolbar.ctp:159
 msgid "Scope toggle"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:163
+#: View/Elements/eventattributetoolbar.ctp:164
 msgid "Include deleted attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:165
+#: View/Elements/eventattributetoolbar.ctp:166
 msgid "Deleted"
+msgstr "Usunięty"
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Show attribute decaying score"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:173
+#: View/Elements/eventattributetoolbar.ctp:176
+msgid "Decay score"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:183
+msgid "Show SightingDB lookup results"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:192
 msgid "Show attribute context fields"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:175
+#: View/Elements/eventattributetoolbar.ctp:194
 msgid "Context"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:180
+#: View/Elements/eventattributetoolbar.ctp:199
+msgid "Show related tags"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:208
 msgid "Advanced filtering tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:184
+#: View/Elements/eventattributetoolbar.ctp:212
 msgid "Filtering tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:188
+#: View/Elements/eventattributetoolbar.ctp:216
 msgid "%s active rule(s)"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:203
-#: View/EventBlacklists/index.ctp:36
-#: View/Events/index.ctp:95
-#: View/Feeds/preview_index.ctp:26
-#: View/Feeds/search_caches.ctp:27
-#: View/ObjectTemplates/index.ctp:48
-#: View/Organisations/index.ctp:76
-#: View/Servers/preview_index.ctp:65
-#: View/Users/admin_index.ctp:62
-msgid "Enter value to search"
-msgstr ""
-
-#: View/Elements/eventattributetoolbar.ctp:207
+#: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: 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 "Usuń filtry"
 
@@ -5231,32 +7577,6 @@ msgstr ""
 msgid "User "
 msgstr "Użytkownik "
 
-#: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:242
-#: View/Elements/Events/View/row_attribute.ctp:393
-#: View/Elements/TagCollections/index_row.ctp:43
-#: View/Elements/Users/userIndexTable.ctp:90
-#: View/EventBlacklists/edit.ctp:37
-#: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:194
-#: View/Feeds/index.ctp:282
-#: View/News/index.ctp:22
-#: View/OrgBlacklists/edit.ctp:30
-#: View/OrgBlacklists/index.ctp:36
-#: View/Organisations/index.ctp:138
-#: View/Pages/doc/using_the_system.ctp:191
-#: View/Regexp/admin_index.ctp:34
-#: View/Roles/admin_edit.ctp:42
-#: View/Roles/admin_index.ctp:79
-#: View/Servers/index.ctp:136
-#: View/SharingGroups/index.ctp:86
-#: View/Tags/edit.ctp:36
-#: View/Tags/index.ctp:124
-#: View/Templates/edit.ctp:49
-#: View/Whitelists/admin_index.ctp:31
-msgid "Edit"
-msgstr "Edytuj"
-
 #: View/Elements/eventdiscussion.ctp:90;98
 msgid "Are you sure you want to delete this post?"
 msgstr ""
@@ -5265,63 +7585,63 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:141
+#: View/Elements/eventdiscussion.ctp:142
 #: 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/Elements/eventdiscussion.ctp:142
 #: View/Posts/add.ctp:32
 msgid "Quote"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:142
+#: View/Elements/eventdiscussion.ctp:143
 msgid "Insert a link to an event - just enter the event ID between the [event][/event] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:143
+#: View/Elements/eventdiscussion.ctp:144
 #: 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/Elements/eventdiscussion.ctp:144
 #: View/Posts/add.ctp:34
 msgid "Thread"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Insert a link [link][/link] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Link"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Insert a code [code][/code] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Code"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:156
+#: View/Elements/eventdiscussion.ctp:157
 #: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr "Wyślij"
 
 #: View/Elements/flashErrorMessage.ctp:2
 msgid "Errors"
-msgstr ""
+msgstr "Błędy"
 
 #: View/Elements/flashErrorMessage.ctp:5
 #: View/Jobs/ajax/error.ctp:34
 msgid "Close"
-msgstr ""
+msgstr "Zamknij"
 
 #: View/Elements/footer.ctp:5
 msgid "Keyboard shortcuts for this page"
@@ -5331,89 +7651,88 @@ msgstr ""
 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/edit.ctp:23
-#: View/Users/view.ctp:31
-msgid "GnuPG key"
-msgstr "klucz GnuPG"
-
 #: View/Elements/footer.ctp:17
 msgid "Could not locate the GnuPG public key."
-msgstr ""
+msgstr "Nie można zlokalizować klucza publicznego GnuPG."
 
 #: View/Elements/footer.ctp:24
 msgid "Could not locate SMIME certificate."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:8
-msgid "View details about this galaxy"
+#: View/Elements/form_seen_input.ctp:53
+msgid "First seen date"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:8
-msgid "View galaxy"
+#: View/Elements/form_seen_input.ctp:57
+msgid "Last seen date"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:19
-#: View/Elements/galaxyQuickViewMini.ctp:69
+#: View/Elements/form_seen_input.ctp:63
+msgid "First seen time"
+msgstr ""
+
+#: View/Elements/form_seen_input.ctp:64;69
+msgid "Expected format: HH:MM:SS.ssssss+TT:TT"
+msgstr "Oczekiwany format: HH:MM:SS.ssssss+TT:TT"
+
+#: View/Elements/form_seen_input.ctp:68
+msgid "Last seen time"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:79
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:19
-#: View/Elements/galaxyQuickViewMini.ctp:69
-#: View/Elements/Events/eventIndexTable.ctp:138
+#: View/Elements/galaxyQuickView.ctp:77
+#: View/Elements/galaxyQuickViewMini.ctp:80
 msgid "View cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:20
-#: View/Elements/galaxyQuickViewMini.ctp:70
+#: View/Elements/galaxyQuickView.ctp:83;84
+#: View/Elements/galaxyQuickViewMini.ctp:86;87
 msgid "View all events containing this cluster."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:24
+#: View/Elements/galaxyQuickView.ctp:97
 msgid "detach"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:24
+#: View/Elements/galaxyQuickView.ctp:98
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:96
-#: View/Elements/galaxyQuickViewMini.ctp:89
-#: View/EventBlacklists/add.ctp:36
-#: View/Events/add.ctp:71
-#: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
-#: View/Feeds/import_feeds.ctp:20
-#: View/OrgBlacklists/add.ctp:29
-#: View/Regexp/admin_add.ctp:32
-#: View/Regexp/admin_edit.ctp:42
-#: View/Roles/admin_add.ctp:44
-#: View/Servers/import.ctp:20
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
-#: View/Sightings/ajax/add_sighting.ctp:33
-#: View/TagCollections/import.ctp:20
-#: View/Tags/add.ctp:35
-#: View/Users/admin_filter_user_index.ctp:62
-#: View/Whitelists/admin_add.ctp:13
-msgid "Add"
-msgstr "Dodaj"
-
-#: View/Elements/galaxyQuickViewMini.ctp:74
-msgid "Are you sure you want to detach %s from this %s?"
+#: View/Elements/galaxyQuickView.ctp:114
+msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:89
+#: View/Elements/galaxyQuickView.ctp:115
+msgid "View galaxy"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:205
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
+msgid "Add new local cluster"
+msgstr ""
+
+#: View/Elements/galaxyQuickViewMini.ctp:100
+msgid "Are you sure you want to detach %s from this %s?"
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:187
+msgid "No item picked"
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:209
 msgid "Due to the large number of options, no contextual information is provided."
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:273
+#: View/Elements/generic_picker.ctp:277
 msgid "Nothing to pick"
 msgstr ""
 
@@ -5427,98 +7746,103 @@ msgid "Event Actions"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;252
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: 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:214;258
-#: View/Events/add.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
+#: View/Events/add.ctp:7
 #: 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:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: 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:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: 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:270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:298
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:49
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:47
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "View delegation requests"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:803
+#: View/Elements/global_menu.ctp:61
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:62
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:832
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:860
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:865
+#: View/Elements/global_menu.ctp:74
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:78
+#: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:308
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: 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:314
+#: View/Elements/global_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -5527,17 +7851,17 @@ msgstr ""
 msgid "Automation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:94
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:966
+#: View/Elements/global_menu.ctp:98
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:101
+#: View/Elements/global_menu.ctp:105
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:104;109
+#: View/Elements/global_menu.ctp:108;113
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -5546,7 +7870,7 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:114;119
+#: View/Elements/global_menu.ctp:118;123
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -5555,79 +7879,98 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:124
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:361
+#: View/Elements/global_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:128
+#: View/Elements/global_menu.ctp:132
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:135
+#: View/Elements/global_menu.ctp:139
 #: View/Pages/doc/general.ctp:22;54
 msgid "Global Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:139
+#: View/Elements/global_menu.ctp:143
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
-msgstr ""
+msgstr "Aktualności"
 
-#: View/Elements/global_menu.ctp:143
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:440
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Mój Profil"
 
-#: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/global_menu.ctp:151
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
+msgid "My Settings"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:155
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
+msgid "Set Setting"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:159
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:156
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:463
+#: View/Elements/global_menu.ctp:168
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:163
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1010
+#: View/Elements/global_menu.ctp:175
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:480
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:174
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:486
+#: View/Elements/global_menu.ctp:186
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:493
+#: View/Elements/global_menu.ctp:194
+msgid "Decaying Models Tool"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:199
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
+msgid "List Decaying Models"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:206
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr "Podręcznik użytkownika"
 
-#: View/Elements/global_menu.ctp:186
+#: View/Elements/global_menu.ctp:210
 msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:190
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:497
+#: View/Elements/global_menu.ctp:214
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:194
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:218
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -5641,48 +7984,61 @@ msgstr ""
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: View/Elements/global_menu.ctp:201
+#: View/Elements/global_menu.ctp:225
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:205
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:212
+#: View/Elements/global_menu.ctp:236
 #: View/Pages/doc/general.ctp:23;66
 msgid "Sync Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:216
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:509
+#: View/Elements/global_menu.ctp:240
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:221
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:515
+#: View/Elements/global_menu.ctp:245
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
+#: View/Elements/global_menu.ctp:250
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:231
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:887
+#: View/Elements/global_menu.ctp:255
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:236
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:891
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:244
+#: View/Elements/global_menu.ctp:265
+msgid "List SightingDB Connections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:270
+msgid "Add SightingDB Connection"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:275
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+msgid "List Communities"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:283
 #: View/Pages/doc/administration.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
@@ -5692,103 +8048,116 @@ msgstr ""
 msgid "Administration"
 msgstr "Administracja"
 
-#: View/Elements/global_menu.ctp:249
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:638
+#: View/Elements/global_menu.ctp:288
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Lista Użytkowników"
 
-#: View/Elements/global_menu.ctp:253
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:633
+#: View/Elements/global_menu.ctp:292
+msgid "List User Settings"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:296
+#: View/UserSettings/set_setting.ctp:5
+msgid "Set User Setting"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:300
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr "Dodaj użytkownika"
 
-#: View/Elements/global_menu.ctp:257
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
+#: View/Elements/global_menu.ctp:304
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:264
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:450;680
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
+msgstr "Rejestracja Użytkownika"
+
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:268
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:692
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:279
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:297
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:306
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:711
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:315
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:320
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:329
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:342
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
-msgstr ""
+msgstr "Audyt"
 
-#: View/Elements/global_menu.ctp:346
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:744
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:350
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:748
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:377;382
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
-msgstr ""
+msgstr "Wyloguj się"
 
 #: View/Elements/histogram.ctp:1
 msgid "Attribute Types Histogram"
@@ -5807,7 +8176,9 @@ msgid "Attributes per organization"
 msgstr ""
 
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:91
+#: View/Elements/view_timeline.ctp:23
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -5834,6 +8205,7 @@ msgid "Physics"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:13
+#: View/Elements/view_timeline.ctp:12
 msgid "Display"
 msgstr ""
 
@@ -5841,7 +8213,6 @@ msgstr ""
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr ""
 
@@ -5849,26 +8220,57 @@ msgstr ""
 msgid "History"
 msgstr ""
 
-#: View/Elements/view_event_graph.ctp:18
-msgid "Search for an item"
-msgstr ""
-
 #: View/Elements/view_event_graph.ctp:22
+#: View/Elements/view_timeline.ctp:26
 #: View/Events/view_graph.ctp:17
 msgid "Toggle fullscreen"
 msgstr ""
 
 #: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
+msgstr "Pokaż wszystkie"
+
+#: View/Elements/view_galaxy_matrix.ctp:129
+msgid "(%s items)"
 msgstr ""
 
-#: View/Elements/view_galaxy_matrix.ctp:121
-msgid "(%s items)"
+#: View/Elements/view_timeline.ctp:9
+msgid "Time scope"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
+#: View/Taxonomies/view.ctp:83
+msgid "Tag"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:6
+msgid "Computation"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:7
+#: View/Events/add_misp_export_result.ctp:6
+msgid "Result"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:10
+msgid "Taxonomy effective ratio"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:10
+msgid "Eff. Ratio"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+msgid "Tag numerical value"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:19
+msgid "Pick an Attribute"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr ""
 
@@ -5925,76 +8327,77 @@ msgstr ""
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr "Email"
 
-#: View/Elements/Events/eventIndexTable.ctp:82;86;248
+#: View/Elements/Events/eventIndexTable.ctp:82;86;237
 #: 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/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
 #: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/index.ctp:103
 #: View/Servers/preview_index.ctp:174
-#: View/SharingGroups/index.ctp:89
+#: View/SharingGroups/index.ctp:91
 #: View/Taxonomies/index.ctp:49
 #: View/Warninglists/index.ctp:60
 msgid "View"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:168
+#: View/Elements/Events/eventIndexTable.ctp:157
 msgid " correlation(s). Show filtered event with correlation only."
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:186;191
+#: View/Elements/Events/eventIndexTable.ctp:175;180
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:196
+#: View/Elements/Events/eventIndexTable.ctp:185
 msgid "NEW"
-msgstr ""
+msgstr "NOWY"
 
-#: View/Elements/Events/eventIndexTable.ctp:237
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:237
+#: View/Elements/Events/eventIndexTable.ctp:226
 #: 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:238
+#: View/Elements/Events/eventIndexTable.ctp:227
 msgid "Not published"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;347;414;571;625
-#: View/Servers/index.ctp:137
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
+#: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr ""
 
-#: View/Elements/Events/View/attribute_correlations.ctp:7
+#: View/Elements/Events/View/attribute_correlations.ctp:17
 msgid "Show "
-msgstr ""
+msgstr "Pokaż "
 
-#: View/Elements/Events/View/attribute_correlations.ctp:7
+#: View/Elements/Events/View/attribute_correlations.ctp:17
 msgid " more..."
 msgstr ""
 
-#: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:362
+#: View/Elements/Events/View/attribute_correlations.ctp:53
+#: View/Events/view.ctp:399
 #: View/Feeds/preview_event.ctp:88
 #: View/Servers/preview_event.ctp:116
 msgid "Collapse…"
-msgstr ""
+msgstr "Zwiń…"
 
 #: View/Elements/Events/View/eventSightingValue.ctp:14
 msgid "- restricted to own organisation only."
@@ -6004,131 +8407,122 @@ msgstr ""
 msgid "Advanced Sightings"
 msgstr ""
 
+#: View/Elements/Events/View/related_event.ctp:26
+msgid "This related event contains %s unique correlation(s)"
+msgstr ""
+
 #: View/Elements/Events/View/row_attribute.ctp:43
 msgid "Select attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:152
-#: View/Elements/Events/View/row_proposal.ctp:110
-#: View/Elements/Feeds/View/row_attribute.ctp:61
-#: View/Elements/Servers/View/row_attribute.ctp:68
+#: View/Elements/Events/View/row_attribute.ctp:155
+#: View/Elements/Events/View/row_proposal.ctp:113
+#: View/Elements/Feeds/View/row_attribute.ctp:63
+#: View/Elements/Servers/View/row_attribute.ctp:70
 msgid "warning"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:196;197
+#: View/Elements/Events/View/row_attribute.ctp:199;200
 #: View/Events/ajax/toggle_correlation.ctp:20
 msgid "Toggle correlation"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:323
+#: View/Elements/Events/View/row_attribute.ctp:326
 msgid "Toggle IDS flag"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:356
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Restore attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:357;397
+#: View/Elements/Events/View/row_attribute.ctp:377;417
 msgid "Permanently delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:364
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:364
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:369
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:369
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:373
+#: View/Elements/Events/View/row_attribute.ctp:393
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:374
+#: View/Elements/Events/View/row_attribute.ctp:394
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:384;389
+#: View/Elements/Events/View/row_attribute.ctp:404;409
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:389
+#: View/Elements/Events/View/row_attribute.ctp:409
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:401
+#: View/Elements/Events/View/row_attribute.ctp:421
 msgid "Soft-delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:65
-#: View/Elements/Feeds/View/row_object.ctp:16
-#: View/Events/resolved_misp_format.ctp:109
+#: View/Elements/Events/View/row_object.ctp:68
+#: View/Elements/Feeds/View/row_object.ctp:19
+#: View/Events/resolved_misp_format.ctp:113
 msgid "Name: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:66
+#: View/Elements/Events/View/row_object.ctp:69
 #: 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.ctp:20
 #: 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.ctp:20
 #: View/Elements/Servers/View/row_object_reference.ctp:7
 #: View/Elements/Servers/View/row_object_referenced_by.ctp:7
-#: View/Events/resolved_misp_format.ctp:110;120
+#: View/Events/resolved_misp_format.ctp:114;135
 msgid "Expand or Collapse"
-msgstr ""
+msgstr "Rozwiń lub zwiń"
 
-#: View/Elements/Events/View/row_object.ctp:69
-#: View/Events/resolved_misp_format.ctp:92;262
-#: View/GalaxyClusters/view.ctp:19
-#: View/ObjectTemplates/index.ctp:66
-#: View/ObjectTemplates/view.ctp:6
-#: View/Objects/revise_object.ctp:61
-#: View/OrgBlacklists/index.ctp:23
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/view.ctp:24
-#: View/Organisations/ajax/merge.ctp:58;65
-#: View/SharingGroups/add.ctp:72
-#: View/SharingGroups/edit.ctp:72
-#: View/TagCollections/index.ctp:8
-msgid "UUID"
-msgstr "UUID"
-
-#: View/Elements/Events/View/row_object.ctp:70
+#: View/Elements/Events/View/row_object.ctp:73
 msgid "Meta-category: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:71
-#: View/Elements/Feeds/View/row_object.ctp:21
+#: View/Elements/Events/View/row_object.ctp:74
+#: View/Elements/Feeds/View/row_object.ctp:24
 msgid "Description: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:72
-#: View/Elements/Feeds/View/row_object.ctp:22
+#: View/Elements/Events/View/row_object.ctp:75
+#: View/Elements/Feeds/View/row_object.ctp:25
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:125
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:125
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Soft delete object"
 msgstr ""
 
+#: View/Elements/Events/View/row_object.ctp:164
+msgid "Add an Object Attribute"
+msgstr ""
+
 #: View/Elements/Events/View/row_object_reference.ctp:1
 #: View/Elements/Feeds/View/row_object_reference.ctp:1
-#: View/Events/resolved_misp_format.ctp:115
+#: View/Events/resolved_misp_format.ctp:130
 msgid "References: "
 msgstr ""
 
@@ -6150,18 +8544,18 @@ msgstr ""
 msgid "Select proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:183
-#: View/Elements/Events/View/row_proposal_delete.ctp:77
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept Proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:183
-#: View/Elements/Events/View/row_proposal_delete.ctp:77
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:188
-#: View/Elements/Events/View/row_proposal_delete.ctp:82
+#: View/Elements/Events/View/row_proposal.ctp:199
+#: View/Elements/Events/View/row_proposal_delete.ctp:85
 msgid "Discard proposal"
 msgstr ""
 
@@ -6181,24 +8575,22 @@ msgid "Advanced sightings"
 msgstr ""
 
 #: View/Elements/Events/View/value_field.ctp:52
-#: View/Elements/Servers/View/value_field.ctp:43
+msgid "Cortex object"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:68
 msgid "Hexadecimal representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:52
-#: View/Elements/Feeds/View/value_field.ctp:43
-#: View/Elements/Servers/View/value_field.ctp:43
+#: View/Elements/Events/View/value_field.ctp:69
 msgid "Switch to binary representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:58
-#: View/Elements/Feeds/View/value_field.ctp:48
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:58
-#: View/Elements/Feeds/View/value_field.ctp:48
-#: View/Elements/Servers/View/value_field.ctp:48
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr ""
 
@@ -6222,19 +8614,14 @@ msgstr ""
 msgid "Check coverage"
 msgstr ""
 
-#: View/Elements/Feeds/View/row_object.ctp:20
-#: View/Elements/Servers/View/row_object.ctp:20
+#: View/Elements/Feeds/View/row_object.ctp:23
+#: View/Elements/Servers/View/row_object.ctp:23
 #: View/ObjectTemplates/index.ctp:69
 #: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:31
 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/Objects/object_similarities.ctp:76
 msgid "Update template and merge"
 msgstr ""
@@ -6279,98 +8666,44 @@ msgstr ""
 msgid "-- Select an option --"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:31;97
+#: View/Elements/Servers/eventattribute.ctp:31;98
 msgid "all"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:50
 #: View/Elements/templateElements/templateRowAttribute.ctp:82
 #: View/Events/resolved_attributes.ctp:49
-#: View/Events/resolved_misp_format.ctp:94;264
+#: View/Events/resolved_misp_format.ctp:95;290
 #: View/Feeds/freetext_index.ctp:34
-#: View/Objects/add.ctp:103
+#: View/Objects/add.ctp:116
 #: View/Pages/doc/using_the_system.ctp:236;285
 #: View/Templates/populate_event_from_template_attributes.ctp:10
 msgid "IDS"
 msgstr "IDS"
 
 #: View/Elements/Servers/Module/type.ctp:11
-#: View/Elements/healthElements/diagnostics.ctp:305
+#: View/Elements/healthElements/diagnostics.ctp:367
 #: View/Pages/doc/administration.ctp:56;228
 #: View/Servers/ajax/submoduleStatus.ctp:6
 msgid "Status"
 msgstr ""
 
-#: View/Elements/Servers/View/row_attribute.ctp:93
+#: View/Elements/Servers/View/row_attribute.ctp:95
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
+#: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
-#: View/Events/view.ctp:190
-#: View/GalaxyClusters/view.ctp:32
+#: View/Events/view.ctp:191
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
-#: View/Users/admin_view.ctp:63;84
-#: View/Users/view.ctp:33
+#: View/Users/admin_view.ctp:95
 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/Feeds/search_caches.ctp:47
-#: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
-#: View/ObjectTemplates/view.ctp:4
-#: View/Objects/add.ctp:193
-#: View/Objects/revise_object.ctp:27
-#: 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:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
-#: View/ObjectTemplates/view.ctp:9
-#: View/Objects/add.ctp:22;100;197
-#: View/Objects/group_attributes_into_object.ctp:8
-#: View/Objects/propose_objects_from_attributes.ctp:17
-#: 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/TagCollections/index.ctp:15
-#: 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/Elements/Servers/View/row_object.ctp:25
 #: View/Objects/propose_objects_from_attributes.ctp:14
 #: View/Templates/view.ctp:2
 msgid "Template"
@@ -6386,24 +8719,26 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
-#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/TagCollections/index_row.ctp:45
 #: View/Tags/index.ctp:125
 #: View/Whitelists/admin_index.ctp:32
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: View/Elements/TagCollections/index_row.ctp:50
+#: View/Elements/TagCollections/index_row.ctp:51;52
 msgid "Download configuration"
-msgstr ""
+msgstr "Pobierz konfigurację"
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
-msgstr ""
+msgstr "Rola"
 
 #: View/Elements/Users/userIndexTable.ctp:16
 msgid "Last login"
@@ -6412,20 +8747,18 @@ msgstr "Ostatnie logowanie"
 #: 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
+#: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:88
-msgid "Initiate password refresh"
-msgstr ""
-
-#: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 msgid "Create new credentials and inform user"
 msgstr "Utwórz nowe poświadczenia i poinformuj użytkownika"
 
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:611
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -6442,12 +8775,13 @@ msgid "Events published: "
 msgstr ""
 
 #: View/Elements/dashboard/dashboard_events.ctp:7
+#: View/Servers/index.ctp:107
 msgid "Reset"
 msgstr ""
 
 #: View/Elements/dashboard/dashboard_notifications.ctp:2
 msgid "Notifications"
-msgstr ""
+msgstr "Powiadomienia"
 
 #: View/Elements/dashboard/dashboard_notifications.ctp:4
 msgid "Proposals: "
@@ -6461,439 +8795,713 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
+msgstr ""
+
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
+msgstr "Importuj konfigurację JSON"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr "Eksportuj konfigurację JSON"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
 msgid "Populate From Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
 msgid "Enrichment Module Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;824;996
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
-#: View/Events/edit.ctp:8
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
-msgstr ""
+msgstr "Dodaj załącznik"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
+msgstr "Cofnij publikację"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+msgid "Publish Sightings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:180
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:181
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:197
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:204;291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
-msgstr ""
+msgstr "Pobierz jako..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:227;232
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:265
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:334
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:346
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:367
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:376
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:386
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:387
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:397
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:402
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:413
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:423
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr "Edytuj mój profil"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:427
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: View/Pages/doc/administration.ctp:126
 #: View/Users/admin_edit.ctp:70
 #: View/Users/change_pw.ctp:4
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:434;600
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr "Zresetuj Hasło"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:469
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524;554
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:543
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:562
-#: View/Servers/edit.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Servers/edit.ctp:5
 msgid "Edit Server"
-msgstr ""
+msgstr "Edytuj serwer"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
+msgstr "Nowe serwery"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
+msgid "View community"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:593
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
+msgid "Request E-mail"
+msgstr "Poproś o e-mail"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr "Wyświetl użytkownika"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:605
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr "Edytuj użytkownika"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:610
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr "Usuń użytkownika"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:619
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
-msgstr ""
+msgstr "Edytuj rolę"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:624
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
+msgstr "Usuń rolę"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:653
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
+msgid "User settings"
+msgstr "Ustawienia użytkownika"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr "Dodaj rolę"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr "Skrzynka odbiorcza"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757;771
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:762
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:776
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:782
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:794
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:810
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:818;837
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:852
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+msgid "Update Default Models"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
+msgid "Force Update Default Models"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
+msgid "Import Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
+msgid "Add Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+msgid "Decaying Tool"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
+msgid "View Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
+msgid "Edit Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:901
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:907
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:912
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:920
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:925
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:946
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:951
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:972
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:973
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:978
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:979
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:986;1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:991
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1015
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1021
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
+#: View/Sightingdb/add.ctp:6
+msgid "Add SightingDB connection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
+msgid "Edit SightingDB connection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
+msgid "List SightingDB connections"
+msgstr ""
+
 #: View/Elements/genericElements/SideMenu/side_menu_post_link.ctp:26
 #: View/Errors/error403.ctp:4
 msgid "%s"
 msgstr "%s"
 
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:4
+msgid "Show database indexes"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:9
+msgid "Index diagnostic:"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:12
+msgid "Notice"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:13
+msgid "The highlighted issues may be benign. if you are unsure, please open an issue and ask for clarification."
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:47
+msgid "Fix Database Index Schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
+msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:62
+msgid "The current database schema does not match the expected format."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
+msgid "Database schema diagnostic: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:68;74
+msgid "The MISP database state does not match the expected schema. Resolving these issues is recommended."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:69;75
+msgid "⚠ This diagnostic tool is in experimental state - the highlighted issues may be benign. If you are unsure, please open an issue on with the issues identified over at https://github.com/MISP/MISP for clarification."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:79
+msgid "Reveal benign deltas"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Table name"
+msgstr "Nazwa tabeli"
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Expected schema"
+msgstr "Oczekiwany schemat"
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Actual schema"
+msgstr "Rzeczywisty schemat"
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
+msgid "Fix Database schema"
+msgstr "Napraw schemat bazy danych"
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
+msgid "The current database is correct"
+msgstr "Bieżąca baza danych jest poprawna"
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
+msgid "Expected DB_version: "
+msgstr "Oczekiwana wersja DB: "
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
+msgid "The current database version matches the expected one"
+msgstr "Bieżąca wersja bazy danych odpowiada oczekiwanej"
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
+msgid "Actual DB_version: "
+msgstr "Aktualna wersja DB: "
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
+msgid "The current database version does not match the expected one"
+msgstr "Bieżąca wersja bazy danych nie pasuje do oczekiwanej"
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
+msgid "Updates are locked"
+msgstr "Aktualizacje są zablokowane"
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
+msgid "Updates are not locked"
+msgstr "Aktualizacje nie są zablokowane"
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+#: View/Servers/update_progress.ctp:32
+msgid "Updates are locked due to to many update fails"
+msgstr "Aktualizacje są zablokowane z powodu wielu nieudanych aktualizacji"
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+msgid "Updates unlocked in %s"
+msgstr "Aktualizacje odblokowane za %s"
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
+msgid "DataSource: "
+msgstr "Źródło danych: "
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
+msgid "Column diagnostic"
+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 ""
@@ -6908,36 +9516,36 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:12
 msgid "Currently installed version…"
-msgstr ""
+msgstr "Aktualnie zainstalowana wersja…"
 
 #: View/Elements/healthElements/diagnostics.ctp:18
 msgid "Upcoming development version"
-msgstr ""
+msgstr "Nadchodząca wersja rozwojowa"
 
 #: View/Elements/healthElements/diagnostics.ctp:22
 #: View/Servers/ajax/submoduleStatus.ctp:31
 msgid "Outdated version"
-msgstr ""
+msgstr "Nieaktualna wersja"
 
 #: View/Elements/healthElements/diagnostics.ctp:30
 msgid "Could not retrieve version from github"
-msgstr ""
+msgstr "Nie można pobrać wersji z github"
 
 #: View/Elements/healthElements/diagnostics.ctp:40
 msgid "Unable to fetch current commit id, check apache user read privilege."
-msgstr ""
+msgstr "Nie można pobrać bieżącego identyfikatora zatwierdzenia, sprawdź uprawnienia odczytu użytkownika apache."
 
 #: View/Elements/healthElements/diagnostics.ctp:45
 msgid "Latest available version…"
-msgstr ""
+msgstr "Najnowsza dostępna wersja…"
 
 #: View/Elements/healthElements/diagnostics.ctp:52
 msgid "Status…"
-msgstr ""
+msgstr "Status…"
 
 #: View/Elements/healthElements/diagnostics.ctp:59
 msgid "Current branch…"
-msgstr ""
+msgstr "Obecna gałąź…"
 
 #: View/Elements/healthElements/diagnostics.ctp:64
 msgid "You are not on a branch, Update MISP will fail"
@@ -6945,19 +9553,19 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:68
 msgid "Pull the latest MISP version from github"
-msgstr ""
+msgstr "Pobierz najnowszą wersję MISP z github"
 
 #: View/Elements/healthElements/diagnostics.ctp:68
 msgid "Update MISP"
-msgstr ""
+msgstr "Aktualizuj MISP"
 
 #: View/Elements/healthElements/diagnostics.ctp:69
 msgid "Click the following button to go to the update progress page. This page lists all updates that are currently queued and executed."
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:69
-msgid "Update Progress"
-msgstr ""
+msgid "View Update Progress"
+msgstr "Zobacz postęp aktualizacji"
 
 #: View/Elements/healthElements/diagnostics.ctp:71
 msgid "Submodules version"
@@ -6985,31 +9593,31 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Directories"
-msgstr ""
+msgstr "Katalogi"
 
 #: View/Elements/healthElements/diagnostics.ctp:88
 msgid "Directory "
-msgstr ""
+msgstr "Katalog "
 
 #: View/Elements/healthElements/diagnostics.ctp:96
 msgid "Writeable Files"
-msgstr ""
+msgstr "Zapisywalne pliki"
 
 #: View/Elements/healthElements/diagnostics.ctp:103;117
 msgid "File "
-msgstr ""
+msgstr "Plik "
 
 #: View/Elements/healthElements/diagnostics.ctp:110
 msgid "Readable Files"
-msgstr ""
+msgstr "Odczytywalne pliki"
 
 #: View/Elements/healthElements/diagnostics.ctp:125
 msgid "PHP Settings"
-msgstr ""
+msgstr "Ustawienia PHP"
 
 #: View/Elements/healthElements/diagnostics.ctp:128;140
 msgid "Up to date"
-msgstr ""
+msgstr "Aktualne"
 
 #: View/Elements/healthElements/diagnostics.ctp:134
 #: View/Elements/healthElements/workers.ctp:83;85
@@ -7023,11 +9631,11 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:143;152
 msgid "Update highly recommended"
-msgstr ""
+msgstr "Aktualizacja wysoce zalecana"
 
 #: View/Elements/healthElements/diagnostics.ctp:146;155
 msgid "Version unsupported, update ASAP"
-msgstr ""
+msgstr "Wersja niewspierana, aktualizacja ASAP"
 
 #: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP ini path"
@@ -7046,7 +9654,7 @@ msgid "PHP CLI Version"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:162
-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: "
+msgid "Please note that the support for Python versions below 3.6 and below PHP 7.2 has been dropped as of 2020-01-01 and are henceforth considered unsupported. More info: "
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:163
@@ -7071,237 +9679,293 @@ msgstr ""
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:197
-msgid "Advanced attachment handler"
-msgstr ""
+#: View/Elements/healthElements/diagnostics.ctp:206
+msgid "Table"
+msgstr "Tabela"
 
-#: View/Elements/healthElements/diagnostics.ctp:198
-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:203
-msgid "PyMISP"
-msgstr "PyMISP"
-
-#: View/Elements/healthElements/diagnostics.ctp:203
-msgid "Not installed or version outdated."
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:215
-msgid "STIX and Cybox libraries"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:216
-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."
+#: View/Elements/healthElements/diagnostics.ctp:211
+msgid "Used"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:217
+msgid "Reclaimable"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:223
+msgid "SQL database status"
+msgstr "Status bazy danych SQL"
+
+#: View/Elements/healthElements/diagnostics.ctp:224
+msgid "Size of each individual table on disk, along with the size that can be freed via SQL optimize. Make sure that you always have at least 3x the size of the largest table in free space in order for the update scripts to work as expected."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:229
+msgid "Schema status"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:246
+msgid "Redis info"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:248
+msgid "PHP extension version"
+msgstr "Wersja rozszerzenia PHP"
+
+#: View/Elements/healthElements/diagnostics.ctp:248
+msgid "Not installed."
+msgstr "Nie zainstalowano."
+
+#: View/Elements/healthElements/diagnostics.ctp:250
+msgid "Redis version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:251
+msgid "Memory allocator"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:252
+msgid "Memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:253
+msgid "Peak memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:254
+msgid "Total system memory"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:259
+msgid "Advanced attachment handler"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:260
+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:265
+msgid "PyMISP"
+msgstr "PyMISP"
+
+#: View/Elements/healthElements/diagnostics.ctp:265
+msgid "Not installed or version outdated."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:277
+msgid "STIX and Cybox libraries"
+msgstr "Biblioteki STIX i Cybox"
+
+#: View/Elements/healthElements/diagnostics.ctp:278
+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:279
 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:224
+#: View/Elements/healthElements/diagnostics.ctp:286
 msgid "Other versions might work but are not tested / recommended."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:233
+#: View/Elements/healthElements/diagnostics.ctp:295
 msgid "STIX and CyBox"
 msgstr "STIX i CyBox"
 
-#: View/Elements/healthElements/diagnostics.ctp:233
+#: View/Elements/healthElements/diagnostics.ctp:295
 msgid "Could not read test script (stixtest.py)."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:247
+#: View/Elements/healthElements/diagnostics.ctp:309
 msgid " library version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:264
+#: View/Elements/healthElements/diagnostics.ctp:326
 msgid "Yara"
 msgstr "Yara"
 
-#: View/Elements/healthElements/diagnostics.ctp:265
+#: View/Elements/healthElements/diagnostics.ctp:327
 msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:272
+#: View/Elements/healthElements/diagnostics.ctp:334
 msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:274
+#: View/Elements/healthElements/diagnostics.ctp:336
 msgid "plyara library installed"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:278
+#: View/Elements/healthElements/diagnostics.ctp:340
 msgid "GnuPG"
 msgstr "GnuPG"
 
-#: View/Elements/healthElements/diagnostics.ctp:279
+#: View/Elements/healthElements/diagnostics.ctp:341
 msgid "This tool tests whether your GnuPG is set up correctly or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:287
+#: View/Elements/healthElements/diagnostics.ctp:349
 msgid "GnuPG installation and settings"
-msgstr ""
+msgstr "Instalacja i ustawienia GnuPG"
 
-#: View/Elements/healthElements/diagnostics.ctp:290
+#: View/Elements/healthElements/diagnostics.ctp:352
 msgid "ZeroMQ"
 msgstr "ZeroMQ"
 
-#: View/Elements/healthElements/diagnostics.ctp:291
+#: View/Elements/healthElements/diagnostics.ctp:353
 msgid "This tool tests whether the ZeroMQ extension is installed and functional."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:299
+#: View/Elements/healthElements/diagnostics.ctp:361
 msgid "ZeroMQ settings"
-msgstr ""
+msgstr "Ustawienia ZeroMQ"
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZMQ service"
-msgstr ""
+msgstr "Uruchom usługę ZMQ"
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZeroMQ service"
-msgstr ""
+msgstr "Uruchom usługę ZeroMQ"
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop ZeroMQ service"
-msgstr ""
+msgstr "Zatrzymaj usługę ZeroMQ"
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:305
+#: View/Elements/healthElements/diagnostics.ctp:367
 msgid "Check ZeroMQ service status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:307
+#: View/Elements/healthElements/diagnostics.ctp:369
 msgid "Proxy"
-msgstr ""
+msgstr "Proxy"
 
-#: View/Elements/healthElements/diagnostics.ctp:308
+#: View/Elements/healthElements/diagnostics.ctp:370
 msgid "This tool tests whether your HTTP proxy settings are correct."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:316
+#: View/Elements/healthElements/diagnostics.ctp:378
 #: View/Pages/doc/administration.ctp:35
 msgid "Proxy settings"
-msgstr ""
+msgstr "Ustawienia serwera proxy"
 
-#: View/Elements/healthElements/diagnostics.ctp:319
+#: View/Elements/healthElements/diagnostics.ctp:381
 msgid "Module System"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:320
+#: View/Elements/healthElements/diagnostics.ctp:382
 msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:335
+#: View/Elements/healthElements/diagnostics.ctp:397
 msgid " module system"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:341
+#: View/Elements/healthElements/diagnostics.ctp:403
 msgid "Session table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:342
+#: View/Elements/healthElements/diagnostics.ctp:404
 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:349
+#: View/Elements/healthElements/diagnostics.ctp:411
 msgid "Expired sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:355
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Purge sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:359
+#: View/Elements/healthElements/diagnostics.ctp:421
 msgid "Clean model cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:360
+#: View/Elements/healthElements/diagnostics.ctp:422
 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:361
+#: View/Elements/healthElements/diagnostics.ctp:423
 msgid "Clean cache"
+msgstr "Wyczyść cache"
+
+#: View/Elements/healthElements/diagnostics.ctp:427
+msgid "Check for deprecated function usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:362
-msgid "Overwritten objects"
+#: View/Elements/healthElements/diagnostics.ctp:428
+msgid "In an effort to identify the usage of deprecated functionalities, MISP has started aggregating the count of access requests to these endpoints. Check the frequency of their use below along with the users to potentially warn about better ways of achieving their goals."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:363
-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."
+#: View/Elements/healthElements/diagnostics.ctp:431;432;434
+msgid "View deprecated endpoint usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:364
-msgid "Reconstruct overwritten objects"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:365;368
+#: View/Elements/healthElements/diagnostics.ctp:438;441
 msgid "Orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:366
+#: View/Elements/healthElements/diagnostics.ctp:439
 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:368;382
+#: View/Elements/healthElements/diagnostics.ctp:441;455
 msgid "Run the test below"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attribute"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:371
+#: View/Elements/healthElements/diagnostics.ctp:444
 msgid "Remove orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:372
+#: View/Elements/healthElements/diagnostics.ctp:445
 msgid "Remove published empty events"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:373;375
+#: View/Elements/healthElements/diagnostics.ctp:446;448
 #: View/Servers/ondemand_action.ctp:7
 msgid "Administrator On-demand Action"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:374
+#: View/Elements/healthElements/diagnostics.ctp:447
 msgid "Click the following button to go to the Administrator On-demand Action page."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:376;378
+#: View/Elements/healthElements/diagnostics.ctp:449;451
 msgid "Legacy Administrative Tools"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:377
+#: View/Elements/healthElements/diagnostics.ctp:450
 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:379
+#: View/Elements/healthElements/diagnostics.ctp:452
 msgid "Verify bad link on attachments"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:380
+#: View/Elements/healthElements/diagnostics.ctp:453
 msgid "Verify each attachment referenced in database is accessible on filesystem."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:382
+#: View/Elements/healthElements/diagnostics.ctp:455
 msgid "Non existing attachments referenced in Database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:384
+#: View/Elements/healthElements/diagnostics.ctp:457
 msgid "Check bad link on attachments"
 msgstr ""
 
@@ -7315,7 +9979,7 @@ msgstr ""
 
 #: View/Elements/healthElements/files.ctp:10
 msgid "Path"
-msgstr ""
+msgstr "Ścieżka"
 
 #: View/Elements/healthElements/files.ctp:14
 msgid "Files set for each relevant setting"
@@ -7327,7 +9991,7 @@ msgstr ""
 
 #: View/Elements/healthElements/files.ctp:31
 msgid "Size"
-msgstr ""
+msgstr "Rozmiar"
 
 #: View/Elements/healthElements/files.ctp:32
 #: View/Roles/admin_add.ctp:15
@@ -7340,10 +10004,10 @@ msgstr ""
 #: View/Elements/healthElements/files.ctp:73
 #: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:80
-#: View/SharingGroups/index.ctp:87
+#: View/Roles/admin_index.ctp:90
+#: View/SharingGroups/index.ctp:89
 msgid "Are you sure you want to delete %s?"
-msgstr ""
+msgstr "Czy na pewno chcesz usunąć %s?"
 
 #: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
@@ -7362,27 +10026,10 @@ msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
+#: View/Sightingdb/index.ctp:32
 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/resolved_misp_format.ctp:91;261
-#: View/Events/show_i_o_c_results.ctp:13
-#: View/Feeds/freetext_index.ctp:33
-#: View/Noticelists/view.ctp:42
-#: View/Objects/add.ctp:102
-#: View/Objects/group_attributes_into_object.ctp:58
-#: View/Objects/revise_object.ctp:58
-#: 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 ""
@@ -7422,13 +10069,14 @@ msgstr ""
 
 #: View/Elements/healthElements/settings_table.ctp:4
 #: View/Pages/doc/administration.ctp:46
+#: View/UserSettings/index.ctp:62
 msgid "Setting"
 msgstr ""
 
 #: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
-msgstr ""
+msgstr "Komunikat o Błędzie"
 
 #: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
@@ -7450,7 +10098,7 @@ msgstr ""
 
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
-msgstr ""
+msgstr "Zarządzanie plikami"
 
 #: View/Elements/healthElements/tabs.ctp:50;55
 #: View/Pages/doc/administration.ctp:39
@@ -7460,7 +10108,7 @@ msgstr ""
 #: View/Elements/healthElements/tabs.ctp:65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
-msgstr ""
+msgstr "Pobierz raport"
 
 #: View/Elements/healthElements/tabs.ctp:71
 msgid "Filter the table(s) below"
@@ -7510,8 +10158,9 @@ msgstr ""
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
 #: View/TagCollections/index.ctp:14
-#: View/Users/admin_view.ctp:98
-#: View/Users/view.ctp:58
+#: View/UserSettings/index.ctp:56
+#: View/Users/admin_view.ctp:109
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr "Użytkownik"
 
@@ -7556,7 +10205,7 @@ msgid "Start a worker"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
+msgid "Restart dead workers"
 msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
@@ -7648,11 +10297,15 @@ msgstr ""
 msgid "Blocked Orgs (AND NOT)"
 msgstr ""
 
-#: View/Elements/serverRuleElements/pull.ctp:65
-msgid "Accept changes"
+#: View/Elements/serverRuleElements/pull.ctp:60
+msgid "Additional sync parameters (based on the event index filters)"
 msgstr ""
 
-#: View/Elements/serverRuleElements/pull.ctp:65
+#: View/Elements/serverRuleElements/pull.ctp:68
+msgid "Accept changes"
+msgstr "Akceptuj zmiany"
+
+#: View/Elements/serverRuleElements/pull.ctp:68
 #: View/Elements/serverRuleElements/push.ctp:67
 msgid "Update"
 msgstr ""
@@ -7679,29 +10332,6 @@ msgstr ""
 msgid "Field"
 msgstr ""
 
-#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
-#: View/Events/export.ctp:26
-#: View/Events/resolved_attributes.ctp:48
-#: View/Events/resolved_misp_format.ctp:90;260
-#: View/Events/show_i_o_c_results.ctp:12
-#: View/Feeds/freetext_index.ctp:32
-#: View/Feeds/search_caches.ctp:41
-#: View/Objects/revise_object.ctp:57
-#: 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 ""
@@ -7732,10 +10362,6 @@ msgstr ""
 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
@@ -7750,7 +10376,7 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:4
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:4
 msgid "File"
-msgstr ""
+msgstr "Plik"
 
 #: View/Elements/templateElements/populateTemplateFile.ctp:13
 msgid "s"
@@ -7758,33 +10384,12 @@ msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
 #: View/ObjectReferences/ajax/add.ctp:86
-#: View/Objects/revise_object.ctp:55
+#: View/Objects/revise_object.ctp:62
 #: 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/resolved_misp_format.ctp:89;259
-#: View/Events/show_i_o_c_results.ctp:11
-#: View/Feeds/freetext_index.ctp:31
-#: View/Objects/add.ctp:101
-#: View/Objects/group_attributes_into_object.ctp:57
-#: View/Objects/propose_objects_from_attributes.ctp:16
-#: View/Objects/revise_object.ctp:56
-#: 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
@@ -7818,7 +10423,7 @@ msgstr ""
 #: View/TemplateElements/ajax/template_element_add_file.ctp:38
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:38
 msgid "Malware"
-msgstr ""
+msgstr "Malware"
 
 #: View/Elements/templateElements/templateRowFile.ctp:49
 msgid "Req."
@@ -7836,7 +10441,7 @@ msgstr ""
 
 #: View/Errors/error400.ctp:35
 msgid "CSRF error"
-msgstr ""
+msgstr "Błąd CSRF"
 
 #: 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."
@@ -7849,11 +10454,11 @@ msgstr ""
 #: View/Errors/missing_connection.ctp:1
 #: View/Errors/missing_datasource_config.ctp:1
 msgid "Missing Database Connection"
-msgstr ""
+msgstr "Brak połączenia z bazą danych"
 
 #: View/Errors/pdo_error.ctp:1
 msgid "PDO error"
-msgstr ""
+msgstr "Błąd PDO"
 
 #: View/EventBlacklists/add.ctp:4
 msgid "Add Event Blacklist Entries"
@@ -7907,20 +10512,6 @@ msgstr ""
 msgid "Event Blacklists"
 msgstr ""
 
-#: View/EventBlacklists/index.ctp:35
-#: View/Events/index.ctp:94
-#: View/Feeds/preview_index.ctp:25
-#: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
-#: View/ObjectTemplates/index.ctp:47
-#: View/Organisations/index.ctp:75
-#: View/Servers/preview_index.ctp:64
-#: View/Tags/index.ctp:56
-#: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:61
-msgid "Filter"
-msgstr ""
-
 #: View/EventBlacklists/index.ctp:51
 #: View/Events/resolved_misp_format.ctp:39
 msgid "Event UUID"
@@ -7938,6 +10529,42 @@ msgstr ""
 msgid "Are you sure you want to delete from the blacklist the selected events?"
 msgstr ""
 
+#: View/EventDelegations/index.ctp:30
+msgid "Pending"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:35
+msgid "Issued"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:56
+msgid "Requester"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:63
+#: View/Pages/doc/administration.ctp:134
+msgid "Recipient"
+msgstr "Odbiorca"
+
+#: View/EventDelegations/index.ctp:82
+#: View/Events/automation.ctp:279;286
+#: 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/EventDelegations/index.ctp:86
+msgid "Delegation index"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:87
+#: View/Posts/add.ctp:33
+msgid ""
+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 ""
@@ -8020,7 +10647,7 @@ msgstr ""
 #: View/ShadowAttributes/ajax/attributeEditTypeForm.ctp:5
 #: View/ShadowAttributes/ajax/attributeEditValueForm.ctp:5
 msgid "Accept"
-msgstr ""
+msgstr "Akceptuj"
 
 #: View/EventDelegations/ajax/view.ctp:23
 msgid "Decline and remove delegation request"
@@ -8033,7 +10660,7 @@ msgstr ""
 #: View/ShadowAttributes/ajax/attributeEditTypeForm.ctp:6
 #: View/ShadowAttributes/ajax/attributeEditValueForm.ctp:6
 msgid "Discard"
-msgstr ""
+msgstr "Odrzuć"
 
 #: View/EventGraph/ajax/eventGraph_add_form.ctp:6
 msgid "Add EventGraph"
@@ -8051,35 +10678,29 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/Events/add.ctp:45
-#: View/Events/edit.ctp:36
-msgid "Threat Level "
+#: View/Events/add.ctp:39
+#: View/Events/view.ctp:148
+#: 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/add.ctp:50
-#: View/Events/edit.ctp:40
-msgid "Analysis "
-msgstr ""
-
-#: View/Events/add.ctp:54
-#: View/Events/edit.ctp:45
-#: View/ShadowAttributes/index.ctp:52
+#: View/Events/add.ctp:49
+#: View/ShadowAttributes/index.ctp:59
 msgid "Event Info"
 msgstr ""
 
-#: View/Events/add.ctp:58
-#: View/Events/edit.ctp:49
+#: View/Events/add.ctp:52
 msgid "Quick Event Description or Tracking Info"
 msgstr ""
 
-#: View/Events/add.ctp:61
-#: View/Events/edit.ctp:52
-msgid "Extends event"
+#: View/Events/add.ctp:57
+msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr ""
 
-#: View/Events/add.ctp:65
-#: View/Events/edit.ctp:55
-msgid "Event UUID or ID. Leave blank if not applicable."
+#: View/Events/add.ctp:58
+msgid "Extends Event"
 msgstr ""
 
 #: View/Events/add_i_o_c.ctp:4
@@ -8111,10 +10732,6 @@ msgstr ""
 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 ""
@@ -8143,7 +10760,7 @@ msgid "Automation functionality is designed to automatically feed other tools an
 msgstr ""
 
 #: View/Events/automation.ctp:5
-msgid "You can use the <a href=\"servers/rest\">ReST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
+msgid "You can use the <a href=\"/servers/rest\">REST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
 msgstr ""
 
 #: View/Events/automation.ctp:6
@@ -8154,477 +10771,475 @@ msgstr ""
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 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."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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/automation.ctp:27
 #: 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
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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
+#: View/Events/automation.ctp:32
 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
+#: View/Events/automation.ctp:33
 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/automation.ctp:34
 #: 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/automation.ctp:35
 #: 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/automation.ctp:36
 #: 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/automation.ctp:37
 #: 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/automation.ctp:38
 #: 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/automation.ctp:39
 #: 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;150
+#: View/Events/automation.ctp:40;160
 #: 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;151
+#: View/Events/automation.ctp:41;161
 #: 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/automation.ctp:42
 #: 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/automation.ctp:43
 #: 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/automation.ctp:44
 #: 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/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:46
 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/automation.ctp:47
 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/automation.ctp:48
 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/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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/automation.ctp:52
 #: 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/automation.ctp:53
 #: 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
+#: View/Events/automation.ctp:54
 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
+#: View/Events/automation.ctp:55
 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
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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:81
+#: View/Events/automation.ctp:91
 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:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
-msgstr ""
+msgstr "Parametry URL"
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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:97
+#: View/Events/automation.ctp:107
 #: 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:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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:118
+#: View/Events/automation.ctp:128
 #: 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:136
+#: View/Events/automation.ctp:146
 #: 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:138
+#: View/Events/automation.ctp:148
 #: 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:145
+#: View/Events/automation.ctp:155
 #: 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:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:152
+#: View/Events/automation.ctp:162
 #: 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:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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:156
+#: View/Events/automation.ctp:166
 #: 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:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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:172
+#: View/Events/automation.ctp:182
 #: 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:173
+#: View/Events/automation.ctp:183
 #: 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:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:187
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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:191
+#: View/Events/automation.ctp:201
 #: 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:192
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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:205
+#: View/Events/automation.ctp:215
 #: 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:206
+#: View/Events/automation.ctp:216
 #: 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:207
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:208
+#: View/Events/automation.ctp:218
 #: 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:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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:214
+#: View/Events/automation.ctp:224
 #: 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:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: 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:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr "HTTP"
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:68
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -8632,208 +11247,200 @@ msgstr "HTTP"
 msgid "URL"
 msgstr "URL"
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
-#: View/Servers/rest.ctp:160
+#: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr "Odpowiedź"
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:269;276
-#: 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:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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:291
+#: View/Events/automation.ctp:301
 #: 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:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:309
+#: View/Events/automation.ctp:319
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:310
+#: View/Events/automation.ctp:320
 #: 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:311
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:324
 #: 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:315
+#: View/Events/automation.ctp:325
 #: 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:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 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:322
+#: View/Events/automation.ctp:332
 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:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -8874,7 +11481,7 @@ msgstr ""
 
 #: View/Events/export.ctp:26
 msgid "Filesize"
-msgstr ""
+msgstr "Rozmiar pliku"
 
 #: View/Events/export.ctp:26
 #: View/Pages/doc/administration.ctp:230
@@ -8908,7 +11515,7 @@ msgstr ""
 
 #: View/Events/export.ctp:115;144
 msgid "Download"
-msgstr ""
+msgstr "Pobierz"
 
 #: View/Events/export.ctp:125
 msgid "Generate"
@@ -8924,7 +11531,7 @@ msgstr ""
 
 #: View/Events/export_alternate.ctp:10
 msgid "Download all as XML"
-msgstr ""
+msgstr "Pobierz wszystkie jako XML"
 
 #: View/Events/export_alternate.ctp:12
 msgid "Click this to download all events and attributes that you have access to (except file attachments) in a custom XML format."
@@ -8972,11 +11579,11 @@ msgstr ""
 
 #: View/Events/export_alternate.ctp:61
 msgid "Download all MD5 hashes"
-msgstr ""
+msgstr "Pobierz wszystkie hashe MD5"
 
 #: View/Events/export_alternate.ctp:62
 msgid "Download all SHA1 hashes"
-msgstr ""
+msgstr "Pobierz wszystkie hashe SHA1"
 
 #: View/Events/export_alternate.ctp:64
 msgid "Click on one of these two buttons to download all MD5 or SHA1\n"
@@ -9029,7 +11636,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr "Cel"
@@ -9075,24 +11682,24 @@ msgstr ""
 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
+#: View/Events/import_module.ctp:99
 msgid "Input File"
 msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 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
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr ""
 
@@ -9126,6 +11733,11 @@ msgstr ""
 msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
+#: View/Events/legacy_automation.ctp:7
+msgid "Your current key is: <code>%s</code>.\n"
+"    You can %s this key."
+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 ""
@@ -9275,7 +11887,7 @@ msgstr ""
 
 #: View/Events/legacy_automation.ctp:111
 msgid "The export format, can be \"md5\" or \"sha1\""
-msgstr ""
+msgstr "Format eksportu, może być \"md5\" lub \"sha1\""
 
 #: View/Events/legacy_automation.ctp:123
 msgid "For example, to only show sha1 values from events tagged tag1, use"
@@ -9283,7 +11895,7 @@ msgstr ""
 
 #: View/Events/legacy_automation.ctp:126
 msgid "STIX export"
-msgstr ""
+msgstr "Eksport 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"
@@ -9443,7 +12055,7 @@ msgid "You can also use search for IP addresses using CIDR. Make sure that you u
 msgstr ""
 
 #: View/Events/merge.ctp:4
-msgid "Merge events"
+msgid "Merge events - WARNING: this feature is very outdated and should not be used anymore."
 msgstr ""
 
 #: View/Events/merge.ctp:9
@@ -9508,22 +12120,11 @@ msgid "Similar Attributes"
 msgstr ""
 
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/resolved_misp_format.ctp:95;265
-#: View/Objects/add.ctp:104
+#: View/Events/resolved_misp_format.ctp:96;291
+#: View/Objects/add.ctp:117
 msgid "Disable Correlation"
 msgstr ""
 
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/resolved_misp_format.ctp:96;266
-#: View/ObjectReferences/ajax/add.ctp:30
-#: View/Objects/add.ctp:67;106
-#: View/Objects/group_attributes_into_object.ctp:30
-#: View/Objects/revise_object.ctp:49;60
-#: 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:195
 msgid "Remove resolved attribute"
 msgstr ""
@@ -9538,7 +12139,7 @@ msgstr ""
 
 #: View/Events/resolved_attributes.ctp:237;240
 msgid "Change all"
-msgstr ""
+msgstr "Zmień wszystko"
 
 #: View/Events/resolved_attributes.ctp:239
 msgid "Update all comment fields"
@@ -9559,15 +12160,19 @@ msgstr ""
 msgid "#Resolved Attributes"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:107
+#: View/Events/resolved_misp_format.ctp:89;284
+msgid "Import"
+msgstr ""
+
+#: View/Events/resolved_misp_format.ctp:111
 msgid "ID: "
 msgstr "ID: "
 
-#: View/Events/resolved_misp_format.ctp:112
+#: View/Events/resolved_misp_format.ctp:127
 msgid "UUID: "
 msgstr "UUID: "
 
-#: View/Events/resolved_misp_format.ctp:113
+#: View/Events/resolved_misp_format.ctp:128
 msgid "Meta Category: "
 msgstr ""
 
@@ -9585,7 +12190,6 @@ msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -9605,7 +12209,7 @@ msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:45
 msgid "Visualisation"
-msgstr ""
+msgstr "Wizualizacja"
 
 #: View/Events/upload_analysis_file.ctp:6
 msgid "Import analysis file"
@@ -9640,35 +12244,24 @@ msgstr ""
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:86
-msgid "Creator org"
-msgstr ""
-
-#: View/Events/view.ctp:147
-#: 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:153
+#: View/Events/view.ctp:154
 #: 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:177
+#: View/Events/view.ctp:178
 msgid "Toggle advanced sharing network viewer"
 msgstr ""
 
-#: View/Events/view.ctp:183
+#: View/Events/view.ctp:184
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr ""
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:188
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
@@ -9676,156 +12269,161 @@ msgstr ""
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:193
+#: View/Events/view.ctp:194
 msgid " (%s Objects)"
 msgstr ""
 
-#: View/Events/view.ctp:193
+#: View/Events/view.ctp:194
 msgid " (%s Object)"
 msgstr ""
 
-#: View/Events/view.ctp:195
+#: View/Events/view.ctp:196
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:199
+#: View/Events/view.ctp:200
 msgid "First recorded change"
 msgstr ""
 
-#: View/Events/view.ctp:203
+#: View/Events/view.ctp:204
 msgid "Last change"
-msgstr ""
+msgstr "Ostatnia zmiana"
 
-#: View/Events/view.ctp:207
+#: View/Events/view.ctp:208
 msgid "Modification map"
 msgstr ""
 
-#: View/Events/view.ctp:213
+#: View/Events/view.ctp:214
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:232
+#: View/Events/view.ctp:233
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:239
+#: View/Events/view.ctp:240
 msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:239
+#: View/Events/view.ctp:240
 msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:270
+#: View/Events/view.ctp:271
 msgid "%s has requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:276
+#: View/Events/view.ctp:277
 msgid "%s has requested that you take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:282
+#: View/Events/view.ctp:283
 msgid "You have requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:287
+#: View/Events/view.ctp:288
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:299
+#: View/Events/view.ctp:300
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:309
-#: View/Users/admin_view.ctp:86
+#: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
+#: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:309
-#: View/Feeds/view.ctp:62
-#: View/Noticelists/index.ctp:63
-#: View/ObjectTemplates/index.ctp:35
-#: View/Taxonomies/view.ctp:24
-msgid "Enabled"
-msgstr ""
-
-#: View/Events/view.ctp:318
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "enable"
 msgstr ""
 
-#: View/Events/view.ctp:318
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:329
+#: View/Events/view.ctp:330
 msgid "Extended view"
 msgstr ""
 
-#: View/Events/view.ctp:346
+#: View/Events/view.ctp:337
+msgid "Warning: Taxonomy inconsistencies"
+msgstr ""
+
+#: View/Events/view.ctp:382
 #: View/Feeds/preview_event.ctp:84
 #: View/Servers/preview_event.ctp:112
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:406;441
+#: View/Events/view.ctp:443;478
 msgid "This event has "
 msgstr ""
 
-#: View/Events/view.ctp:407;442
+#: View/Events/view.ctp:444;479
 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:450
+#: View/Events/view.ctp:487
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:466
+#: View/Events/view.ctp:503
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:466
+#: View/Events/view.ctp:503
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:469
+#: View/Events/view.ctp:506
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:469
+#: View/Events/view.ctp:506
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:472
+#: View/Events/view.ctp:509
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:475
+#: View/Events/view.ctp:512
+msgid "Toggle Event timeline"
+msgstr ""
+
+#: View/Events/view.ctp:512
+msgid "Event timeline"
+msgstr ""
+
+#: View/Events/view.ctp:515
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:475
+#: View/Events/view.ctp:515
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:478
+#: View/Events/view.ctp:518
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:478
+#: View/Events/view.ctp:518
 msgid "ATT&CK matrix"
 msgstr "ATT&CK matrix"
 
-#: View/Events/view.ctp:481
+#: View/Events/view.ctp:521
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:484
+#: View/Events/view.ctp:524
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:484
+#: View/Events/view.ctp:524
 msgid "Discussion"
 msgstr ""
 
@@ -9839,7 +12437,7 @@ msgstr ""
 
 #: View/Events/view_graph.ctp:30
 msgid "Expand"
-msgstr ""
+msgstr "Rozwiń"
 
 #: View/Events/view_graph.ctp:33
 msgid "Toggle the physics engine on/off."
@@ -9886,15 +12484,19 @@ msgid "Are you sure you wish to unpublish the event?"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:20
+msgid "Are you sure you wish publish and synchronise all sightings attached to this event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:22
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
-#: View/Feeds/index.ctp:105
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
-msgstr ""
+msgstr "Opublikuj"
 
 #: View/Events/ajax/exportChoice.ctp:2
 msgid "Choose the format that you wish to download the event in"
@@ -9924,78 +12526,81 @@ msgstr ""
 msgid "Add MISP Feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:5
-msgid "Add a new MISP feed source."
-msgstr ""
-
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
-#: View/Feeds/view.ctp:63
-msgid "Caching enabled"
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
 msgstr ""
 
 #: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+msgid "Add a new MISP feed source."
+msgstr ""
+
+#: View/Feeds/add.ctp:14
+#: View/Feeds/view.ctp:64
+msgid "Caching enabled"
+msgstr ""
+
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr ""
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:15
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr ""
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
-#: View/Feeds/view.ctp:30
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
+#: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:20
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr ""
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:60
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr ""
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:69
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:73
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr ""
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:32
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr ""
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:36
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr ""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:40
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr ""
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:44
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:48
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -10004,129 +12609,128 @@ msgstr "Nazwa użytkownika"
 msgid "Password"
 msgstr "Hasło"
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:52
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr ""
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:82
-msgid "Target Event"
-msgstr ""
-
 #: View/Feeds/add.ctp:94
-#: View/Feeds/edit.ctp:92
-msgid "Target Event ID"
-msgstr ""
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:94
-msgid "Leave blank unless you want to reuse an existing event."
+#: View/Feeds/edit.ctp:98
+msgid "Creator organisation"
 msgstr ""
 
 #: View/Feeds/add.ctp:104
-#: View/Feeds/edit.ctp:102
-msgid "Value field(s) in the CSV"
+#: View/Feeds/edit.ctp:108
+msgid "Target Event"
 msgstr ""
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:103
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr ""
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:105
-msgid "2,3,4 (column position separated by commas)"
-msgstr ""
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:113
-msgid "Delimiter"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
 msgstr ""
 
 #: View/Feeds/add.ctp:116
-#: View/Feeds/edit.ctp:114
-msgid "Set the default CSV delimiter (default = \",\")"
+#: View/Feeds/edit.ctp:120
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr ""
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr ""
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
 msgstr ""
 
 #: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:124
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr ""
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr ""
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
+msgid "Set the default CSV delimiter (default = \",\")"
+msgstr ""
+
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr ""
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:125
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr ""
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:135
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr ""
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 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:148
-#: View/Feeds/edit.ctp:144
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr ""
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:145
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:154
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr ""
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:155
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr ""
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:182
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr ""
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:187
-msgid "Filter rules"
-msgstr ""
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:189
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:190
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:191
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:192
-#: View/Servers/add.ctp:106
-#: View/Servers/edit.ctp:149;155
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
+#: View/Servers/add.ctp:116
+#: View/Servers/edit.ctp:155;162
 msgid "Modify"
 msgstr ""
 
@@ -10142,66 +12746,66 @@ msgstr ""
 msgid "Edit MISP Feed"
 msgstr ""
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr ""
 
-#: View/Feeds/edit.ctp:127
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr ""
 
-#: View/Feeds/edit.ctp:207
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr ""
 
-#: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:136
-#: View/Servers/edit.ctp:183
+#: View/Feeds/edit.ctp:234
+#: View/Servers/add.ctp:146
+#: View/Servers/edit.ctp:190
 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:209
-#: View/Servers/add.ctp:137
-#: View/Servers/edit.ctp:182
+#: View/Feeds/edit.ctp:235
+#: View/Servers/add.ctp:147
+#: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
-#: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:138
-#: View/Servers/edit.ctp:184
+#: View/Feeds/edit.ctp:236
+#: View/Servers/add.ctp:148
+#: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:139
-#: View/Servers/edit.ctp:185
+#: View/Feeds/edit.ctp:237
+#: View/Servers/add.ctp:149
+#: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
-#: View/Feeds/edit.ctp:212
-#: View/Servers/add.ctp:140
-#: View/Servers/edit.ctp:186
+#: View/Feeds/edit.ctp:238
+#: View/Servers/add.ctp:150
+#: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:187
+#: View/Feeds/edit.ctp:239
+#: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:188
+#: View/Feeds/edit.ctp:240
+#: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:215
-#: View/Servers/edit.ctp:189
+#: View/Feeds/edit.ctp:241
+#: View/Servers/edit.ctp:196
 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:216
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:191
+#: View/Feeds/edit.ctp:242
+#: View/Servers/add.ctp:154
+#: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -10225,147 +12829,132 @@ msgstr ""
 msgid "Paste a MISP feed metadata JSON below to add feeds."
 msgstr ""
 
-#: View/Feeds/import_feeds.ctp:10
-#: View/Servers/import.ctp:10
-#: View/TagCollections/import.ctp:10
-msgid "JSON"
-msgstr "JSON"
-
 #: View/Feeds/import_feeds.ctp:11
 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:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr ""
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr ""
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr ""
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr ""
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: 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/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr "Nagłówki"
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:54
-#: View/Servers/index.ctp:75;76
-msgid "Rules"
+msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
+#: View/Feeds/index.ctp:196
+msgid "Visible"
 msgstr ""
 
 #: View/Feeds/index.ctp:211
-msgid "New fixed event"
+msgid "Feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:95
-msgid "Age: "
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
 msgstr ""
 
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:103
-msgid "Not cached"
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr ""
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:283
-msgid "Are you sure you want to permanently remove the feed (%s)?"
+#: View/Feeds/index.ctp:294
+msgid "Are you sure you want to permanently remove the feed?"
 msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -10386,20 +12975,6 @@ msgstr ""
 msgid "Fetch the event"
 msgstr ""
 
-#: View/Feeds/search_caches.ctp:35
-#: View/Feeds/view.ctp:3
-#: 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/Feeds/search_caches.ctp:53
 msgid "Feed URL"
 msgstr ""
@@ -10420,44 +12995,51 @@ msgstr ""
 msgid "Source format"
 msgstr ""
 
-#: View/Feeds/view.ctp:57
+#: View/Feeds/view.ctp:58
 msgid "Settings"
 msgstr ""
 
-#: View/Feeds/view.ctp:70
+#: View/Feeds/view.ctp:71
 msgid "Coverage by other feeds"
 msgstr ""
 
-#: View/Feeds/view.ctp:79
+#: View/Feeds/view.ctp:80
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr ""
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
+#: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr ""
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr ""
 
-#: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:7
-#: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:12
-msgid "Version"
-msgstr "Wersja"
-
-#: View/Galaxies/view.ctp:29
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr ""
 
@@ -10465,33 +13047,30 @@ msgstr ""
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:23
-#: 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/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -10500,32 +13079,47 @@ msgstr ""
 msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
 msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
 msgid "Key"
-msgstr ""
+msgstr "Klucz"
 
 #: View/Helper/GenericPickerHelper.php:90
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Inbox/index.ctp:31
+#: 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/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr ""
@@ -10546,12 +13140,6 @@ msgstr ""
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr ""
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr ""
@@ -10589,11 +13177,9 @@ msgstr ""
 msgid "Job type"
 msgstr ""
 
-#: View/Jobs/index.ctp:104
-#: View/OrgBlacklists/add.ctp:17
-#: View/OrgBlacklists/index.ctp:22
-#: View/Organisations/view.ctp:6
-msgid "Organisation name"
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
 msgstr ""
 
 #: View/Jobs/index.ctp:106
@@ -10632,7 +13218,7 @@ msgstr ""
 #: View/Logs/admin_index.ctp:2
 #: View/Logs/event_index.ctp:6
 msgid "Logs"
-msgstr ""
+msgstr "Logi"
 
 #: View/Logs/admin_index.ctp:5
 msgid "Results for all log entries"
@@ -10670,17 +13256,14 @@ msgstr ""
 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:67
 #: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
+#: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -10688,17 +13271,10 @@ msgstr ""
 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 ""
+msgstr "Zmiana"
 
 #: View/Logs/test_for_stolen_attributes.ctp:2
 msgid "Stolen attribute validation"
@@ -10745,10 +13321,6 @@ msgstr ""
 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"
@@ -10904,87 +13476,87 @@ msgstr ""
 msgid "Meta category"
 msgstr ""
 
-#: View/Objects/add.ctp:85
+#: View/Objects/add.ctp:98
 msgid "Warning, issues found with the template"
 msgstr ""
 
-#: View/Objects/add.ctp:98
+#: View/Objects/add.ctp:111
 msgid "Save"
 msgstr ""
 
-#: View/Objects/add.ctp:99
+#: View/Objects/add.ctp:112
 msgid "Name :: type"
 msgstr ""
 
-#: View/Objects/add.ctp:156;167
+#: View/Objects/add.ctp:169;180
 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:171
+#: View/Objects/add.ctp:184
 msgid "Back"
 msgstr ""
 
-#: View/Objects/add.ctp:183
+#: View/Objects/add.ctp:196
 msgid "Pre-update object's template"
 msgstr ""
 
-#: View/Objects/add.ctp:189
+#: View/Objects/add.ctp:202
 #: View/Objects/group_attributes_into_object.ctp:54
 #: View/Organisations/ajax/merge.ctp:56;63
 #: View/Pages/doc/using_the_system.ctp:163;203
 msgid "ID"
 msgstr "ID"
 
-#: View/Objects/add.ctp:205
+#: View/Objects/add.ctp:218
 #: View/Objects/revise_object.ctp:45
 msgid "Template version"
 msgstr ""
 
-#: View/Objects/add.ctp:212;272
+#: View/Objects/add.ctp:225;285
 msgid "Can not be merged automatically"
 msgstr ""
 
-#: View/Objects/add.ctp:217;277
+#: View/Objects/add.ctp:230;290
 msgid "This attribute type is missing from the new template. It will be lost if not taken care of right now."
 msgstr ""
 
-#: View/Objects/add.ctp:239
+#: View/Objects/add.ctp:252
 msgid "Insert"
 msgstr ""
 
-#: View/Objects/add.ctp:242
+#: View/Objects/add.ctp:255
 msgid "No valid type. This attribute will be lost."
 msgstr ""
 
-#: View/Objects/add.ctp:249
+#: View/Objects/add.ctp:262
 msgid "This attribute can be merged automatically. Injection in the template done."
 msgstr ""
 
-#: View/Objects/add.ctp:264
+#: View/Objects/add.ctp:277
 msgid "Attributes to merge"
 msgstr ""
 
-#: View/Objects/add.ctp:265
+#: View/Objects/add.ctp:278
 msgid "Contextual information and actions"
 msgstr ""
 
-#: View/Objects/add.ctp:275
+#: View/Objects/add.ctp:288
 msgid "Overwrite the current attribute value with this one"
 msgstr ""
 
-#: View/Objects/add.ctp:285
+#: View/Objects/add.ctp:298
 msgid "Original value: "
 msgstr ""
 
-#: View/Objects/add.ctp:290
+#: View/Objects/add.ctp:303
 msgid "Can be merged automatically. Injection done."
 msgstr ""
 
-#: View/Objects/add.ctp:293
-msgid "An instance of this attribute already exists. However, as multiple instanciation is allowed by this template, the two attributes will be keept."
+#: View/Objects/add.ctp:306
+msgid "An instance of this attribute already exists. However, as multiple instances are allowed by this template, the two attributes will be kept."
 msgstr ""
 
-#: View/Objects/add.ctp:321;332
+#: View/Objects/add.ctp:335;346
 msgid "Enter value manually"
 msgstr ""
 
@@ -11100,35 +13672,35 @@ msgstr ""
 msgid "Make sure that the below Object reflects your expectation before submiting it."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:59
+#: View/Objects/revise_object.ctp:66
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:103
+#: View/Objects/revise_object.ctp:110
 msgid "Create new object"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:104
+#: View/Objects/revise_object.ctp:111
 msgid "Back to review"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:107
+#: View/Objects/revise_object.ctp:114
 msgid "This event contains similar objects."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:108
+#: View/Objects/revise_object.ctp:115
 msgid "Instead of creating a new object, would you like to merge your new object into one of the following?"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:125
+#: View/Objects/revise_object.ctp:132
 msgid "All similar objects not displayed..."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:126
+#: View/Objects/revise_object.ctp:133
 msgid "%s Similar objects found. %s not displayed"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:163
+#: View/Objects/revise_object.ctp:170
 msgid "This attribute will NOT be merged into the similar object as it is conflicting with another attribute."
 msgstr ""
 
@@ -11144,6 +13716,10 @@ msgstr ""
 msgid "Are you sure you want to %sdelete Object #%s? %s"
 msgstr ""
 
+#: View/Objects/ajax/quickAddAttributeForm.ctp:15
+msgid "Add Object attribute"
+msgstr ""
+
 #: View/OrgBlacklists/add.ctp:4
 msgid "Add Organisation Blacklist Entries"
 msgstr ""
@@ -11192,73 +13768,68 @@ msgstr ""
 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
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
 msgid "Paste UUID or click generate"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:25
-#: View/Organisations/admin_edit.ctp:24
+#: View/Organisations/admin_add.ctp:24
+#: View/Organisations/admin_edit.ctp:23
 msgid "Generate UUID"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:25
-#: View/Organisations/admin_edit.ctp:24
+#: View/Organisations/admin_add.ctp:24
+#: View/Organisations/admin_edit.ctp:23
 msgid "Generate a new UUID for the organisation"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:27
-#: View/Organisations/admin_edit.ctp:38
+#: View/Organisations/admin_add.ctp:26
+#: View/Organisations/admin_edit.ctp:37
 msgid "A brief description of the organisation"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:27
-#: View/Organisations/admin_edit.ctp:38
+#: View/Organisations/admin_add.ctp:26
+#: View/Organisations/admin_edit.ctp:37
 msgid "A description of the organisation that is purely informational."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:30
-#: View/Organisations/admin_edit.ctp:41
+#: View/Organisations/admin_add.ctp:29
+#: View/Organisations/admin_edit.ctp:40
 msgid "Bind user accounts to domains (line separated)"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:30
-#: View/Organisations/admin_edit.ctp:41
+#: View/Organisations/admin_add.ctp:29
+#: View/Organisations/admin_edit.ctp:40
 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
+#: View/Organisations/admin_add.ctp:32
+#: View/Organisations/admin_edit.ctp:43
 msgid "The following fields are all optional."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:38
-#: View/Organisations/admin_edit.ctp:49
+#: View/Organisations/admin_add.ctp:37
+#: View/Organisations/admin_edit.ctp:48
 msgid "Logo (48x48 png)"
 msgstr ""
 
+#: View/Organisations/admin_add.ctp:43
+#: View/Organisations/admin_edit.ctp:54
+msgid "For example \"financial\"."
+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
+#: View/Organisations/admin_add.ctp:44
+#: View/Organisations/admin_edit.ctp:55
 msgid "Freetext description of the org."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:46
-#: View/Organisations/admin_edit.ctp:57
+#: View/Organisations/admin_add.ctp:45
+#: View/Organisations/admin_edit.ctp:56
 msgid "You can add some contact details for the organisation here, if applicable."
 msgstr ""
 
@@ -11266,15 +13837,15 @@ msgstr ""
 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
+#: View/Organisations/admin_edit.ctp:29
 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
+#: View/Organisations/admin_edit.ctp:31
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/admin_edit.ctp:57
+#: View/Organisations/admin_edit.ctp:56
 msgid "Contacts"
 msgstr ""
 
@@ -11317,7 +13888,7 @@ msgstr ""
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr "Logo"
 
@@ -11351,12 +13922,12 @@ msgid "Last modified"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:36
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr ""
 
@@ -11447,7 +14018,7 @@ msgstr ""
 
 #: View/Pages/administration.ctp:17
 msgid "Verify GnuPG keys"
-msgstr ""
+msgstr "Zweryfikuj klucze GnuPG"
 
 #: View/Pages/administration.ctp:17
 msgid "Check whether every user's GnuPG key is usable"
@@ -11551,7 +14122,7 @@ msgstr ""
 
 #: View/Pages/administration.ctp:33
 msgid "Upgrade to 2.4"
-msgstr ""
+msgstr "Uaktualnij do 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."
@@ -11572,7 +14143,7 @@ msgstr ""
 #: View/Pages/doc/user_management.ctp:3
 #: View/Pages/doc/using_the_system.ctp:3
 msgid "Quick Start"
-msgstr ""
+msgstr "Szybki Start"
 
 #: View/Pages/doc/administration.ctp:4
 #: View/Pages/doc/concepts.ctp:4
@@ -11687,7 +14258,7 @@ msgstr "Ustawienia GnuPG"
 
 #: View/Pages/doc/administration.ctp:34
 msgid "GnuPG related settings."
-msgstr ""
+msgstr "Ustawienia związane z GnuPG."
 
 #: View/Pages/doc/administration.ctp:35
 msgid "HTTP proxy related settings."
@@ -11702,7 +14273,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
-#: View/Servers/edit.ctp:84
+#: View/Servers/edit.ctp:90
 msgid "Misc settings"
 msgstr ""
 
@@ -11853,7 +14424,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:83
 msgid "Adding a new user"
-msgstr ""
+msgstr "Dodawanie nowego użytkownika"
 
 #: 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"
@@ -11891,14 +14462,14 @@ msgstr ""
 #: View/Roles/admin_index.ctp:2
 #: View/Roles/index.ctp:2
 msgid "Roles"
-msgstr ""
+msgstr "Role"
 
 #: 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_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -11909,7 +14480,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -11922,7 +14493,7 @@ 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr ""
 
@@ -11932,7 +14503,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."
@@ -11948,7 +14519,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:98
 msgid "Listing all users"
-msgstr ""
+msgstr "Lista wszystkich użytkowników"
 
 #: 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"
@@ -11975,6 +14546,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -12005,7 +14577,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:84
+#: View/Users/admin_view.ctp:95
 msgid "Newsread"
 msgstr ""
 
@@ -12023,7 +14595,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:113
 msgid "Editing a user"
-msgstr ""
+msgstr "Edycja użytkownika"
 
 #: 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."
@@ -12077,10 +14649,6 @@ msgstr ""
 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 "Odbiorca"
-
 #: 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 ""
@@ -12089,7 +14657,7 @@ msgstr ""
 #: View/Users/admin_email.ctp:24
 #: View/Users/admin_quick_email.ctp:15
 msgid "Subject"
-msgstr ""
+msgstr "Temat"
 
 #: View/Pages/doc/administration.ctp:135;136
 msgid "In the case of a custom e-mail, you can enter a subject line here."
@@ -12808,7 +15376,7 @@ msgstr ""
 
 #: View/Pages/doc/general.ctp:57
 msgid "Manage your user account."
-msgstr ""
+msgstr "Zarządzaj swoim kontem użytkownika."
 
 #: View/Pages/doc/general.ctp:58
 msgid "Attribute Histogram"
@@ -12968,7 +15536,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:25;26;41
 msgid "Changing the password"
-msgstr ""
+msgstr "Zmiana hasła"
 
 #: 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."
@@ -12976,7 +15544,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:27;44
 msgid "Setting up the GnuPG Key"
-msgstr ""
+msgstr "Konfigurowanie klucza GnuPG"
 
 #: 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."
@@ -13293,10 +15861,6 @@ msgstr ""
 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 ""
@@ -13427,7 +15991,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:123
 msgid "Add attachment"
-msgstr ""
+msgstr "Dodaj załącznik"
 
 #: 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."
@@ -14346,10 +16910,6 @@ msgstr ""
 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 ""
@@ -14439,7 +16999,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:129
+#: View/Servers/index.ctp:175
 msgid "Push all"
 msgstr ""
 
@@ -14448,7 +17008,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:126
+#: View/Servers/index.ctp:172
 msgid "Pull all"
 msgstr ""
 
@@ -14486,7 +17046,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:444
 msgid "HTTP format"
-msgstr ""
+msgstr "Format HTTP"
 
 #: View/Pages/doc/using_the_system.ctp:446
 msgid "Controller action invoked"
@@ -14566,11 +17126,6 @@ msgstr ""
 msgid "In response to"
 msgstr "W odpowiedzi na"
 
-#: View/Posts/add.ctp:33
-msgid ""
-msgstr ""
-""
-
 #: View/Posts/edit.ctp:12
 msgid "Contents"
 msgstr ""
@@ -14609,6 +17164,16 @@ msgstr ""
 msgid "Maximum execution time"
 msgstr ""
 
+#: View/Roles/admin_add.ctp:26
+#: View/Roles/admin_edit.ctp:26
+msgid "Enforce search rate limit"
+msgstr ""
+
+#: View/Roles/admin_add.ctp:32
+#: View/Roles/admin_edit.ctp:32
+msgid "# of searches / 15 min"
+msgstr ""
+
 #: View/Roles/admin_index.ctp:24
 msgid "Restricted to site admins"
 msgstr ""
@@ -14617,11 +17182,15 @@ msgstr ""
 msgid "Max execution time"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:40
+#: View/Roles/admin_index.ctp:35
+msgid "Searches / 15 mins"
+msgstr ""
+
+#: View/Roles/admin_index.ctp:41
 msgid "Default role"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:52
+#: View/Roles/admin_index.ctp:53
 #: View/Roles/index.ctp:47
 msgid "%s permission %s"
 msgstr ""
@@ -14647,6 +17216,7 @@ msgid "Permission level"
 msgstr ""
 
 #: View/Servers/add.ctp:4
+#: View/Servers/edit.ctp:5
 msgid "Add Server"
 msgstr ""
 
@@ -14665,17 +17235,17 @@ msgid "You can set this instance up as an internal instance by checking the chec
 msgstr ""
 
 #: View/Servers/add.ctp:20
-#: View/Servers/edit.ctp:20
+#: View/Servers/edit.ctp:17
 msgid "Internal instance"
 msgstr ""
 
 #: View/Servers/add.ctp:30
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:25
 msgid "Instance ownership and credentials"
 msgstr ""
 
 #: View/Servers/add.ctp:31
-#: View/Servers/edit.ctp:32
+#: View/Servers/edit.ctp:26
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
@@ -14684,86 +17254,86 @@ msgid "Remote Sync Organisation Type"
 msgstr ""
 
 #: View/Servers/add.ctp:42
-#: View/Servers/edit.ctp:43
+#: View/Servers/edit.ctp:40
 msgid "External Organisation"
 msgstr ""
 
-#: View/Servers/add.ctp:48
+#: View/Servers/add.ctp:57
 msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:54
-#: View/Servers/edit.ctp:65
+#: View/Servers/add.ctp:63
+#: View/Servers/edit.ctp:70
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:58
-#: View/Servers/edit.ctp:69
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:74
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:67
-#: View/Servers/edit.ctp:76
+#: View/Servers/add.ctp:76
+#: View/Servers/edit.ctp:81
 msgid "Ask the owner of the remote instance for a sync account on their instance, log into their MISP using the sync user's credentials and retrieve your API key by navigating to Global actions -> My profile. This key is used to authenticate with the remote instance."
 msgstr ""
 
-#: View/Servers/add.ctp:71
-#: View/Servers/edit.ctp:80
+#: View/Servers/add.ctp:80
+#: View/Servers/edit.ctp:85
 msgid "Enabled synchronisation methods"
 msgstr ""
 
-#: View/Servers/add.ctp:90
+#: View/Servers/add.ctp:100
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:96
+#: View/Servers/add.ctp:106
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:101
-#: View/Servers/edit.ctp:144
+#: View/Servers/add.ctp:111
+#: View/Servers/edit.ctp:150
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:102;108
-#: View/Servers/edit.ctp:145;151
+#: View/Servers/add.ctp:112;118
+#: View/Servers/edit.ctp:151;157
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:103;109
-#: View/Servers/edit.ctp:146;152
+#: View/Servers/add.ctp:113;119
+#: View/Servers/edit.ctp:152;158
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:104;110
-#: View/Servers/edit.ctp:147;153
+#: View/Servers/add.ctp:114;120
+#: View/Servers/edit.ctp:153;159
 msgid "Events with the following organisations allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:105;111
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:115;121
+#: View/Servers/edit.ctp:154;160
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:107
-#: View/Servers/edit.ctp:150
+#: View/Servers/add.ctp:117
+#: View/Servers/edit.ctp:156
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:135
-#: View/Servers/edit.ctp:181
+#: View/Servers/add.ctp:145
+#: View/Servers/edit.ctp:188
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:141
+#: View/Servers/add.ctp:151
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:142
+#: View/Servers/add.ctp:152
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:143
+#: View/Servers/add.ctp:153
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
@@ -14771,43 +17341,47 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: View/Servers/edit.ctp:17
+#: View/Servers/edit.ctp:15
 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
+#: View/Servers/edit.ctp:31
 msgid "Organisation Type"
 msgstr ""
 
-#: View/Servers/edit.ctp:54
+#: View/Servers/edit.ctp:55
 msgid "Local Organisation"
 msgstr ""
 
-#: View/Servers/edit.ctp:77
+#: View/Servers/edit.ctp:82
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:101
+#: View/Servers/edit.ctp:107
 msgid "Server certificate file (*.pem): "
-msgstr ""
+msgstr "Plik certyfikatu serwera (*.pem): "
 
-#: View/Servers/edit.ctp:109;131
+#: View/Servers/edit.ctp:115;137
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:110;132
+#: View/Servers/edit.ctp:116;138
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:123
+#: View/Servers/edit.ctp:129
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:161
+msgid "Additional parameters: "
+msgstr ""
+
+#: View/Servers/edit.ctp:197
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:247;251
+#: View/Servers/edit.ctp:263;267
 msgid "Not set."
 msgstr ""
 
@@ -14840,42 +17414,75 @@ msgid "Servers"
 msgstr ""
 
 #: View/Servers/index.ctp:23
+msgid "Prio"
+msgstr ""
+
+#: View/Servers/index.ctp:24
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:31
+#: View/Servers/index.ctp:25
+msgid "Sync user"
+msgstr ""
+
+#: View/Servers/index.ctp:26
+msgid "Reset API key"
+msgstr ""
+
+#: View/Servers/index.ctp:35
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:70
+msgid "URL params"
+msgstr ""
+
+#: View/Servers/index.ctp:85;86
+msgid "Move server priority up"
+msgstr ""
+
+#: View/Servers/index.ctp:85;86
+msgid "Move server priority down"
+msgstr ""
+
+#: View/Servers/index.ctp:102
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:102
+#: View/Sightingdb/index.ctp:35
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:74
+#: View/Servers/index.ctp:103
+msgid "View the sync user of the remote instance"
+msgstr ""
+
+#: View/Servers/index.ctp:111;112
+msgid "Remotely reset API key"
+msgstr ""
+
+#: View/Servers/index.ctp:119
 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:74
+#: View/Servers/index.ctp:119
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:123
+#: View/Servers/index.ctp:169
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:125
+#: View/Servers/index.ctp:171
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
-#: View/Servers/index.ctp:125
+#: View/Servers/index.ctp:171
 msgid "Pull updates"
 msgstr ""
 
-#: View/Servers/index.ctp:132
+#: View/Servers/index.ctp:178
 msgid "Cache instance"
 msgstr ""
 
@@ -14891,19 +17498,19 @@ msgstr ""
 msgid "Show Update Progress Page"
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:37
+#: View/Servers/ondemand_action.ctp:38
 msgid "Running this script may take a very long time depending of the size of your database. It is adviced that you <b>back your database up</b> before running it."
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:43
+#: View/Servers/ondemand_action.ctp:44
 msgid "Running this script will make this instance unusable for all users (not site-admin) during the time of upgrade."
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:53
+#: View/Servers/ondemand_action.ctp:54
 msgid "Action: "
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:60
+#: View/Servers/ondemand_action.ctp:61
 msgid "This action has been done and cannot be run again."
 msgstr ""
 
@@ -14955,6 +17562,14 @@ msgstr ""
 msgid "No proposals pulled"
 msgstr ""
 
+#: View/Servers/pull.ctp:35
+msgid "Sightings pulled"
+msgstr ""
+
+#: View/Servers/pull.ctp:38
+msgid "No sightings pulled"
+msgstr ""
+
 #: View/Servers/push.ctp:2
 msgid "Failed pushes"
 msgstr ""
@@ -14975,62 +17590,58 @@ msgstr ""
 msgid "HTTP method to use"
 msgstr ""
 
-#: View/Servers/rest.ctp:61
+#: View/Servers/rest.ctp:62
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:68
+#: View/Servers/rest.ctp:69
 msgid "Use full path - disclose my apikey"
 msgstr ""
 
-#: View/Servers/rest.ctp:72
+#: View/Servers/rest.ctp:73
 msgid "Bookmark query"
 msgstr ""
 
-#: View/Servers/rest.ctp:81
+#: View/Servers/rest.ctp:82
 msgid "Bookmark name"
 msgstr ""
 
-#: View/Servers/rest.ctp:89
+#: View/Servers/rest.ctp:90
 msgid "Show result"
 msgstr ""
 
-#: View/Servers/rest.ctp:94
+#: View/Servers/rest.ctp:95
 msgid "Skip SSL validation"
-msgstr ""
+msgstr "Pomiń sprawdzanie poprawności SSL"
 
-#: View/Servers/rest.ctp:101
+#: View/Servers/rest.ctp:102
 msgid "HTTP headers"
 msgstr "Nagłówki HTTP"
 
-#: View/Servers/rest.ctp:114
+#: View/Servers/rest.ctp:115
 msgid " Inject"
 msgstr ""
 
-#: View/Servers/rest.ctp:115
+#: View/Servers/rest.ctp:116
 msgid " Show rules"
 msgstr ""
 
-#: View/Servers/rest.ctp:124
+#: View/Servers/rest.ctp:125
 msgid "HTTP body"
 msgstr "Ciało HTTP"
 
-#: View/Servers/rest.ctp:132
+#: View/Servers/rest.ctp:133
 msgid "Run query"
 msgstr ""
 
-#: View/Servers/rest.ctp:161
+#: View/Servers/rest.ctp:162
 msgid "Response code"
 msgstr "Kod odpowiedzi"
 
-#: View/Servers/rest.ctp:162
+#: View/Servers/rest.ctp:163
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:163
-msgid "Headers"
-msgstr "Nagłówki"
-
 #: 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 ""
@@ -15039,26 +17650,66 @@ msgstr ""
 msgid "To edit a setting, simply double click it."
 msgstr ""
 
-#: View/Servers/update_progress.ctp:18
-msgid "Database Update progress"
+#: View/Servers/update_progress.ctp:34
+msgid "Updates are locked due to an ongoing update process. Release lock only if you know what you are doing."
 msgstr ""
 
-#: View/Servers/update_progress.ctp:85
+#: View/Servers/update_progress.ctp:35
+msgid "automatically unlock in %smin %ssec"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:40
+msgid "Release update lock"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:54
+msgid "Complete update progression"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:55
+msgid "%s remaining"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:62
+msgid "Database Update progress for update %s"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:133
 msgid "Update "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:88
+#: View/Servers/update_progress.ctp:136
 msgid "Started @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:92
+#: View/Servers/update_progress.ctp:140
 msgid "Elapsed Time @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:144
+#: View/Servers/update_progress.ctp:192
 msgid "No update in progress"
 msgstr ""
 
+#: View/Servers/update_progress.ctp:213
+msgid "Follow updates"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:13
+msgid "Total"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:27
+msgid "View details on the usage of %s on the %s controller"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:39
+msgid "View user ID "
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:40
+msgid "User #%s"
+msgstr "Użytkownik #%s"
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:2
 msgid "Select instances to add"
 msgstr ""
@@ -15081,7 +17732,7 @@ msgstr ""
 
 #: View/Servers/ajax/submoduleStatus.ctp:5
 msgid "Current Version"
-msgstr ""
+msgstr "Aktualna wersja"
 
 #: View/Servers/ajax/submoduleStatus.ctp:12
 msgid "Update all submodules"
@@ -15109,7 +17760,7 @@ msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:2
 msgid "ZeroMQ Server Status"
-msgstr ""
+msgstr "Status serwera ZeroMQ"
 
 #: View/Servers/ajax/zeromqstatus.ctp:5
 msgid "Start time"
@@ -15125,7 +17776,7 @@ msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:9
 msgid "The ZeroMQ server is unreachable."
-msgstr ""
+msgstr "Serwer ZeroMQ jest nieosiągalny."
 
 #: View/Servers/ajax/zeromqstatus.ctp:11
 msgid "Cancel prompt"
@@ -15136,9 +17787,9 @@ msgstr ""
 msgid "Add Proposal"
 msgstr ""
 
-#: View/ShadowAttributes/add.ctp:52;65
+#: View/ShadowAttributes/add.ctp:63;76
 #: View/ShadowAttributes/add_attachment.ctp:35
-#: View/ShadowAttributes/edit.ctp:51
+#: View/ShadowAttributes/edit.ctp:62
 msgid "Propose"
 msgstr ""
 
@@ -15154,23 +17805,23 @@ msgstr ""
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:43
+#: View/ShadowAttributes/index.ctp:50
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:49
+#: View/ShadowAttributes/index.ctp:56
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:55
+#: View/ShadowAttributes/index.ctp:62
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:81
+#: View/ShadowAttributes/index.ctp:91
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:83
+#: View/ShadowAttributes/index.ctp:93
 msgid "New Attribute"
 msgstr ""
 
@@ -15240,7 +17891,7 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:53
 #: View/SharingGroups/edit.ctp:53
-#: View/SharingGroups/index.ctp:46
+#: View/SharingGroups/index.ctp:47
 msgid "Releasable to"
 msgstr ""
 
@@ -15315,13 +17966,6 @@ msgstr ""
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:93
-#: View/SharingGroups/edit.ctp:101
-#: View/SharingGroups/view.ctp:69
-#: View/TagCollections/index.ctp:12
-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 ""
@@ -15374,21 +18018,50 @@ msgstr ""
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:80
+#: View/SharingGroups/index.ctp:82
 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 "Url"
+#: View/Sightingdb/index.ctp:41
+msgid "Quick Search"
+msgstr "Szybkie wyszukiwanie"
+
+#: View/Sightingdb/index.ctp:61
+msgid "Host"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:66
+msgid "Port"
+msgstr "Port"
+
+#: View/Sightingdb/index.ctp:76
+msgid "Skip Proxy"
+msgstr "Pomiń proxy"
+
+#: View/Sightingdb/index.ctp:82
+msgid "Skip SSL"
+msgstr "Pomiń SSL"
+
+#: View/Sightingdb/index.ctp:92
+#: View/UserSettings/index.ctp:74
+msgid "Restricted to"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:98
+msgid "SightingDB index"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:99
+msgid "SightingDB is an alternate sighting database that MISP interconnects with. Configure connections to sighting databases below."
+msgstr ""
+
+#: View/Sightingdb/index.ctp:114
+msgid "Are you sure you want to remove the connection to this SightingDB?"
+msgstr ""
 
 #: View/Sightings/ajax/add_sighting.ctp:11
 msgid "honeypot, IDS sensor id, SIEM,…"
@@ -15517,6 +18190,11 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+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 ""
@@ -15541,10 +18219,6 @@ msgstr ""
 msgid "Update all"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:2
-msgid "Taxonomies"
-msgstr ""
-
 #: View/Taxonomies/index.ctp:26
 msgid "Required"
 msgstr ""
@@ -15591,10 +18265,6 @@ msgstr ""
 msgid "Unhide selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:83
-msgid "Tag"
-msgstr ""
-
 #: View/Taxonomies/view.ctp:84
 msgid "Expanded"
 msgstr ""
@@ -15683,7 +18353,7 @@ msgstr ""
 #: View/TemplateElements/ajax/template_element_add_file.ctp:29
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:29
 msgid "Select Category"
-msgstr ""
+msgstr "Wybierz kategorię"
 
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:37
 msgid "Select Type"
@@ -15793,10 +18463,6 @@ msgstr ""
 msgid "A description of the template"
 msgstr ""
 
-#: View/Templates/add.ctp:49
-msgid "Create"
-msgstr ""
-
 #: View/Templates/index.ctp:2
 msgid "Templates"
 msgstr ""
@@ -15819,15 +18485,15 @@ msgstr ""
 
 #: View/Templates/upload_file.ctp:3
 msgid "Upload Files"
-msgstr ""
+msgstr "Prześlij pliki"
 
 #: View/Templates/upload_file.ctp:8
 msgid "Replace File"
-msgstr ""
+msgstr "Zastąp plik"
 
 #: View/Templates/upload_file.ctp:10
 msgid "Upload File"
-msgstr ""
+msgstr "Prześlij plik"
 
 #: View/Templates/view.ctp:38
 msgid "Shareable"
@@ -15851,6 +18517,61 @@ msgstr ""
 
 #: View/Threads/index.ctp:81
 msgid "View Discussion"
+msgstr "Zobacz dyskusję"
+
+#: View/UserSettings/index.ctp:30
+msgid "Me"
+msgstr ""
+
+#: View/UserSettings/index.ctp:79
+msgid "User settings management"
+msgstr ""
+
+#: View/UserSettings/index.ctp:80
+msgid "Manage the individual user settings."
+msgstr ""
+
+#: View/UserSettings/index.ctp:97
+msgid "Are you sure you wish to delete this entry?"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
 msgstr ""
 
 #: View/Users/admin_add.ctp:4
@@ -15886,7 +18607,7 @@ msgstr ""
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
 #: View/Users/edit.ctp:23
-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."
+msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
 msgstr ""
 
 #: View/Users/admin_add.ctp:72
@@ -15910,12 +18631,12 @@ msgstr "Klucz SMIME"
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr ""
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr "Wyłącz to konto użytkownika"
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
@@ -15924,8 +18645,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
-#: View/Users/admin_view.ctp:58
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:69
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr ""
 
@@ -16014,7 +18735,7 @@ msgstr "Rejestracja nowego użytkownika"
 
 #: View/Users/admin_email.ctp:73
 msgid "Password reset"
-msgstr ""
+msgstr "Zmiana hasła"
 
 #: View/Users/admin_filter_user_index.ctp:4
 msgid "Filter User Index"
@@ -16028,13 +18749,67 @@ msgstr ""
 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 "Użytkownicy"
+#: View/Users/admin_index.ctp:3
+msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
+msgstr ""
+
+#: View/Users/admin_index.ctp:6
+msgid "here"
+msgstr ""
+
+#: View/Users/admin_index.ctp:9;10
+msgid "Reset all sync user API keys"
+msgstr ""
+
+#: View/Users/admin_index.ctp:13
+msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
+msgstr ""
+
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr "Klucz PGP"
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr "SMIME"
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr "NIDS SID"
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr "Ostatnie logowanie"
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
 
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
@@ -16048,50 +18823,49 @@ msgstr ""
 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
+#: View/Users/admin_view.ctp:47
+msgid "Customauth header"
+msgstr ""
+
+#: View/Users/admin_view.ctp:55
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:56
+#: View/Users/admin_view.ctp:67
 msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:57
-#: View/Users/view.ctp:28
+#: View/Users/admin_view.ctp:68
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
-msgstr ""
+msgstr "NIDS Start SID"
 
-#: View/Users/admin_view.ctp:59
+#: View/Users/admin_view.ctp:70
 msgid "Password change"
 msgstr "Zmiana hasła"
 
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:37
+#: View/Users/admin_view.ctp:78
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
-msgstr ""
+msgstr "Odcisk palca GnuPG"
 
-#: View/Users/admin_view.ctp:72
-#: View/Users/view.ctp:42
+#: View/Users/admin_view.ctp:83
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
-msgstr ""
+msgstr "Status GnuPG"
 
-#: View/Users/admin_view.ctp:79
-#: View/Users/view.ctp:49
-msgid "SMIME Public certificate"
-msgstr ""
+#: View/Users/admin_view.ctp:90
+#: View/Users/view.ctp:50
+msgid "S/MIME Public certificate"
+msgstr "Publiczny certyfikat S/MIME"
 
-#: View/Users/admin_view.ctp:108
-#: View/Users/view.ctp:64
+#: View/Users/admin_view.ctp:119
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr ""
 
@@ -16105,12 +18879,104 @@ msgstr ""
 
 #: View/Users/edit.ctp:27
 msgid "SMIME Public certificate (PEM format)"
-msgstr ""
+msgstr "Certyfikat publiczny SMIME (format PEM)"
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr "Login"
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr "Twój adres email"
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr "Klucz PGP (opcjonalnie)"
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr "IP"
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr "PGP"
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+msgstr "Odrzuć rejestrację"
+
 #: 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"
@@ -16126,6 +18992,13 @@ msgstr ""
 msgid "Proposals active"
 msgstr ""
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr "Użytkownicy"
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -16144,12 +19017,12 @@ msgstr ""
 #: View/Users/statistics.ctp:60
 #: View/Users/statistics_data.ctp:71
 msgid "Go left"
-msgstr ""
+msgstr "Idź w lewo"
 
 #: View/Users/statistics.ctp:66
 #: View/Users/statistics_data.ctp:77
 msgid "Go right"
-msgstr ""
+msgstr "Idź w prawo"
 
 #: View/Users/statistics.ctp:113
 #: View/Users/statistics_data.ctp:124
@@ -16181,14 +19054,18 @@ msgstr ""
 msgid "A heatmap showing the usage of %s."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr ""
 
+#: View/Users/statistics_orgs.ctp:40
+msgid "Activity (1 year)"
+msgstr "Aktywność (1 rok)"
+
 #: View/Users/statistics_sightings.ctp:6
 msgid "A toplist of the top sources for the sightings of your organisation."
 msgstr ""
@@ -16219,7 +19096,7 @@ msgstr ""
 
 #: View/Users/terms.ctp:2
 msgid "MISP Terms and Conditions"
-msgstr ""
+msgstr "Regulamin MISP"
 
 #: View/Users/terms.ctp:11
 msgid "Terms and Conditions file not found."
@@ -16241,6 +19118,14 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -16253,21 +19138,29 @@ msgstr ""
 msgid "Choose the key that you would like to use"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:6
+#: View/Users/ajax/fetchpgpkey.ctp:4
+msgid "Do not blindly trust fetched keys and check the fingerprint from other source."
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:5
+msgid "And do not check just Key ID, but whole fingerprint."
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:10
 msgid "Key ID"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:7
+#: View/Users/ajax/fetchpgpkey.ctp:11
 msgid "Creation date"
 msgstr "Data utworzenia"
 
-#: View/Users/ajax/fetchpgpkey.ctp:8
+#: View/Users/ajax/fetchpgpkey.ctp:12
 msgid "Associated E-mail addresses"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:12
+#: View/Users/ajax/fetchpgpkey.ctp:16
 msgid "Select GnuPG key"
-msgstr ""
+msgstr "Wybierz klucz 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."
@@ -16317,7 +19210,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:14;16
+#: View/Warninglists/view.ctp:14
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -16384,13 +19277,14 @@ 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/Server.php:validation for field push;validation for field pull;validation for field push_sightings
 #: 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/Dashboard.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
@@ -16410,7 +19304,14 @@ msgstr ""
 msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group, Inherit event"
 msgstr ""
 
+#: Model/Attribute.php:validation for field first_seen;validation for field last_seen
+#: Model/MispObject.php:validation for field first_seen;validation for field last_seen
+#: Model/ShadowAttribute.php:validation for field first_seen;validation for field last_seen
+msgid "Invalid ISO 8601 format"
+msgstr ""
+
 #: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
+#: Model/DecayingModelMapping.php:validation for field attribute_type;validation for field model_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
@@ -16463,7 +19364,7 @@ msgstr ""
 #: 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/Server.php:validation for field authkey;validation for field name
 #: 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
@@ -16509,6 +19410,14 @@ msgstr ""
 msgid "Please enter a valid base-url."
 msgstr ""
 
+#: Model/Server.php:validation for field name
+msgid "allowEmpty"
+msgstr ""
+
+#: Model/Server.php:validation for field name
+msgid "required"
+msgstr ""
+
 #: Model/SharingGroup.php:validation for field name
 msgid "A sharing group with this name already exists."
 msgstr ""
@@ -16517,6 +19426,22 @@ msgstr ""
 msgid "Invalid type. Valid options are: 0 (Sighting), 1 (False-positive), 2 (Expiration)."
 msgstr ""
 
+#: Model/Sightingdb.php:validation for field name
+msgid "Name not set."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field host
+msgid "Host not set."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field port
+msgid "Port needs to be numeric."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field owner
+msgid "Owner not set."
+msgstr ""
+
 #: Model/Tag.php:validation for field name
 msgid "This field is required."
 msgstr ""
@@ -16593,6 +19518,10 @@ msgstr ""
 msgid "A SID should be an integer."
 msgstr ""
 
+#: Model/UserSetting.php:validation for field json
+msgid "isValidJson"
+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 e43df2b20..f14f2a214 100644
--- a/app/Locale/pt_BR/LC_MESSAGES/default.po
+++ b/app/Locale/pt_BR/LC_MESSAGES/default.po
@@ -1,90 +1,124 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-09-30 01:23\n"
-"Last-Translator: Steve Clement (SteveClement)\n"
+"PO-Revision-Date: 2021-03-26 04:20\n"
+"Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese, Brazilian\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-Project-ID: 306440\n"
 "X-Crowdin-Language: pt-BR\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: pt_BR\n"
 
-#: Console/Command/AdminShell.php:59
+#: Console/Command/AdminShell.php:72
 msgid "Database updated: "
 msgstr "Banco de dados atualizado: "
 
-#: Console/Command/AdminShell.php:61
+#: Console/Command/AdminShell.php:74
 msgid "Could not update the database: "
 msgstr "Não foi possível atualizar a base de dados: "
 
-#: Console/Command/AdminShell.php:73
+#: Console/Command/AdminShell.php:87
 msgid "Worker restarted."
-msgstr "Worker reinicializado."
+msgstr "Worker reiniciado."
 
-#: Console/Command/AdminShell.php:75
+#: Console/Command/AdminShell.php:89
 msgid "Could not restart the worker. Reason: %s"
-msgstr "Não foi possível reinicializar o worker. Motivo: %s"
+msgstr "Não foi possível reiniciar o worker. Motivo: %s"
 
-#: Console/Command/AdminShell.php:96
+#: Console/Command/AdminShell.php:111
 msgid "Worker killed."
 msgstr ""
 
-#: Console/Command/AdminShell.php:112
+#: Console/Command/AdminShell.php:128
 msgid "Worker started."
 msgstr ""
 
-#: Console/Command/AdminShell.php:123
+#: Console/Command/AdminShell.php:141
 msgid "%s updated."
 msgstr "%s atualizado."
 
-#: Console/Command/AdminShell.php:128
+#: Console/Command/AdminShell.php:146
 msgid "Could not update %s."
 msgstr "Não foi possível atualizar %s."
 
-#: Console/Command/AdminShell.php:455
+#: Console/Command/AdminShell.php:466
 msgid "Update the JSON definitions of MISP."
 msgstr "Atualize as definições JSON do MISP."
 
-#: Console/Command/AdminShell.php:458
+#: Console/Command/AdminShell.php:469
 msgid "Update the submodules before ingestion."
 msgstr ""
 
-#: Console/Command/AdminShell.php:487
+#: Console/Command/AdminShell.php:499
 msgid "Last DB num which was successfully executed: "
 msgstr ""
 
-#: Console/Command/AdminShell.php:496
+#: Console/Command/AdminShell.php:508
 msgid "Something went wrong. Could not find the existing db version"
 msgstr "Algo deu errado. Não foi possível encontrar a versão de Bd existente"
 
-#: Console/Command/AdminShell.php:499
+#: Console/Command/AdminShell.php:511
 msgid "DB was never successfully updated or we are on a fresh install"
 msgstr ""
 
-#: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:125;129;133
+#: Console/Command/AdminShell.php:528
+msgid "MISP mass sync authkey reset command line tool.\n\n"
+"Usage: %sConsole/cake resetSyncAuthkeys [user_id]"
+msgstr ""
+
+#: Console/Command/AdminShell.php:536
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
+msgid "Invalid user."
+msgstr "Usuário inválido."
+
+#: Console/Command/AdminShell.php:539
+msgid "User has to be a site admin."
+msgstr "O usuário precisa ser um administrador do site."
+
+#: Console/Command/AdminShell.php:563
+msgid "\n"
+"Error: %s\n"
+msgstr "\n"
+"Erro: %s\n"
+
+#: Console/Command/AdminShell.php:565
+msgid "%s events purged.\n"
+msgstr ""
+
+#: Console/Command/AdminShell.php:587
+msgid "> Database schema dumped on disk"
+msgstr ""
+
+#: Console/Command/AdminShell.php:589
+msgid "Something went wrong. Could not find the existing db version or fetch the current database schema."
+msgstr ""
+
+#: Console/Command/EventShell.php:15
+#: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1085;1510;1514;1518;1593;2102;2178;2182;2186;2404;2453;2524;2613;3137;5506;5727;5731;5740
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
-#: Model/Galaxy.php:292
+#: Model/Galaxy.php:293
 msgid "Invalid event"
 msgstr "Evento inválido"
 
-#: Console/Command/PasswordShell.php:43
+#: Console/Command/PasswordShell.php:46
 msgid "override password change"
 msgstr ""
 
-#: Console/Command/ServerShell.php:49
-#: Controller/ServersController.php:636
-msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+#: Console/Command/ServerShell.php:83
+#: Controller/ServersController.php:674
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled, %s sightings pulled."
 msgstr ""
 
-#: Console/Command/ServerShell.php:51
+#: Console/Command/ServerShell.php:85
 msgid "ERROR: %s"
 msgstr "ERRO: %s"
 
@@ -96,704 +130,972 @@ msgstr "modo detalhado"
 msgid "interactive mode"
 msgstr "modo interativo"
 
-#: Controller/AppController.php:385
+#: Controller/AppController.php:382
+msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
+msgstr ""
+
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
+msgid "Update Progress"
+msgstr "Progresso da atualização"
+
+#: Controller/AppController.php:389
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
 msgstr "Algo correu mal. Sua conta esta desactivada."
 
-#: Controller/AppController.php:629
-#: Controller/AttributesController.php:1999;2108;2158;2241;2327
-#: Controller/EventsController.php:2846;2962;3024;3390;4006;4069
+#: Controller/AppController.php:519
+msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
+msgstr ""
+
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr "Esta chave de autenticação não está autorizada a ser usada para exportação. Contate o administrador."
 
-#: Controller/AppController.php:638
-#: Controller/AttributesController.php:2162;2245;2331
-#: Controller/EventsController.php:2850;2967;3029;3394;4010;4073
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr "Você precisa estar logado !"
 
-#: Controller/AppController.php:655
+#: Controller/AppController.php:764
+#: Controller/Component/IndexFilterComponent.php:23
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
-msgstr ""
+msgstr "Especifique os termos da pesquisa na url, ou faça um POST de um json com os parâmetros do filtro."
 
-#: Controller/AppController.php:780
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Pronto. attribute_count gerado a partir do zero para "
 
-#: Controller/AppController.php:903
-#: Controller/AttributesController.php:2385
-#: Controller/ShadowAttributesController.php:1278
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
+#: Controller/ShadowAttributesController.php:1267
 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:116;1389
+#: Controller/AppController.php:1211
+msgid "RestSearch is not implemented (yet) for this scope."
+msgstr ""
+
+#: Controller/AttributesController.php:109;1339
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "Nenhum ID de evento selecionado."
 
-#: 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:112
+msgid "You do not have permissions to create attributes"
+msgstr "Você não tem permissão para criar atributos"
 
-#: Controller/AttributesController.php:139;492;672
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1985;2006;2040
-#: Controller/ObjectsController.php:622
+#: Controller/EventsController.php:2107;2128;2162
+#: Controller/ObjectsController.php:837
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "Você não tem permissão para fazer isso."
 
-#: Controller/AttributesController.php:415;870;875;879;1087;1167;1209;2401;2415;2448;2470;2479;3106;3210;3214
-#: Controller/ShadowAttributesController.php:824;1069;1093;1126;1136
-#: Controller/TagsController.php:492
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
+#: Controller/ObjectsController.php:641
+#: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
+#: Controller/TagsController.php:506
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "Atributo inválido % s"
 
-#: Controller/AttributesController.php:425
-#: Controller/ShadowAttributesController.php:501
+#: Controller/AttributesController.php:355
+#: Controller/ShadowAttributesController.php:483
 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:402
 msgid "Attribute not an attachment or malware-sample"
 msgstr "Atributo não é um arquivo anexo ou exemplo de malware"
 
-#: Controller/AttributesController.php:489;656;947;1398
-#: Controller/EventsController.php:4706;4720;5455;5469
+#: Controller/AttributesController.php:419;586;892;1348
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "Evento inválido."
 
-#: Controller/AttributesController.php:507;683
-#: Controller/ShadowAttributesController.php:548
+#: Controller/AttributesController.php:437;613
+#: Controller/DecayingModelController.php:56
+#: Controller/ShadowAttributesController.php:530
 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:686
-#: Controller/ShadowAttributesController.php:551;561
+#: Controller/AttributesController.php:616
+#: Controller/ShadowAttributesController.php:533;543
 msgid "There was a problem to upload the file."
 msgstr "Houve um problema ao carregar o arquivo."
 
-#: Controller/AttributesController.php:830
+#: Controller/AttributesController.php:760
 msgid "The ThreatConnect data has been imported."
 msgstr "Os dados do ThreatConnect foram importados."
 
-#: Controller/AttributesController.php:833
+#: Controller/AttributesController.php:763
 msgid "%s entries imported."
 msgstr "%s entradas importadas."
 
-#: Controller/AttributesController.php:837
+#: Controller/AttributesController.php:767
 msgid "%s entries could not be imported."
 msgstr "%s entradas não puderam ser importadas."
 
-#: Controller/AttributesController.php:887;935;937
-#: Controller/ShadowAttributesController.php:831
+#: Controller/AttributesController.php:876
+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 na solicitação não mais recente que a cópia local."
+
+#: Controller/AttributesController.php:880;882
+#: Controller/ShadowAttributesController.php:817
 msgid "Invalid attribute."
 msgstr "Atributo inválido."
 
-#: Controller/AttributesController.php:931
-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:964
+#: Controller/AttributesController.php:909
 msgid "The attribute has been saved"
 msgstr "A configuração foi salva"
 
-#: Controller/AttributesController.php:999
+#: Controller/AttributesController.php:944
 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:1091
+#: Controller/AttributesController.php:1036
+#: Controller/ObjectsController.php:515
 msgid "Invalid event id."
 msgstr "ID de evento inválido."
 
-#: Controller/AttributesController.php:1121
-#: Controller/EventsController.php:2326
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1072
+#: Controller/EventsController.php:2466
+#: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "Entrada inválida."
 
-#: Controller/AttributesController.php:1126
+#: Controller/AttributesController.php:1077
 msgid "Invalid field."
 msgstr "Campo inválido."
 
-#: Controller/AttributesController.php:1171;1213
+#: Controller/AttributesController.php:1125;1161
 msgid "Invalid attribute id."
 msgstr "ID de configuração inválido."
 
-#: Controller/AttributesController.php:1299;1309
+#: Controller/AttributesController.php:1242;1319
+msgid "This function is only accessible via POST requests."
+msgstr "Esta função só é acessível através de solicitações POST."
+
+#: Controller/AttributesController.php:1249;1259
 msgid "Attribute deleted"
 msgstr "Atributo excluído"
 
-#: Controller/AttributesController.php:1304;1306
+#: Controller/AttributesController.php:1254;1256
 msgid "Attribute was not deleted"
 msgstr "Atributo não foi excluído"
 
-#: Controller/AttributesController.php:1331;2872
-#: Controller/ShadowAttributesController.php:865
+#: Controller/AttributesController.php:1281;2675
+#: Controller/ShadowAttributesController.php:853
 msgid "Invalid Attribute"
 msgstr "Atributo inválido"
 
-#: Controller/AttributesController.php:1358
+#: Controller/AttributesController.php:1308
 msgid "Could not restore the attribute"
 msgstr "Não foi possível restaurar o atributo"
 
-#: Controller/AttributesController.php:1369
-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:1424
+#: Controller/AttributesController.php:1374
 msgid "No matching attributes found."
 msgstr "Não foram encontradas atividades correspondentes."
 
-#: Controller/AttributesController.php:1458
+#: Controller/AttributesController.php:1408
 msgid "This method can only be accessed via AJAX."
 msgstr "Este método só pode ser acedido via AJAX."
 
-#: Controller/AttributesController.php:1468
+#: Controller/AttributesController.php:1418
 msgid "You are not authorized to edit this event."
 msgstr "Não está autorizado a editar este evento."
 
-#: Controller/AttributesController.php:1566
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "Sem ID de evento."
 
-#: Controller/AttributesController.php:1611
-#: Controller/GalaxiesController.php:235
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "Sinônimos: "
 
-#: Controller/AttributesController.php:1994;2101
+#: Controller/AttributesController.php:1912;2019
 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:2007
+#: Controller/AttributesController.php:1925
 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:2027
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "Você não tem acesso àquele evento."
 
-#: Controller/AttributesController.php:2090
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "Sem correspondências."
 
-#: Controller/AttributesController.php:2112;2121
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr ""
 
-#: Controller/AttributesController.php:2189
-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:2253
-msgid "Invalid event ID format."
-msgstr "Formato de evento ID inválido."
-
-#: Controller/AttributesController.php:2362
-#: Controller/ShadowAttributesController.php:1256
+#: Controller/AttributesController.php:2165
+#: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "Pronto. "
 
-#: Controller/AttributesController.php:2394;2441
-#: Controller/ShadowAttributesController.php:1064
+#: Controller/AttributesController.php:2197;2244
+#: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
-msgstr "Tipo inválido solicitado."
+msgstr "Campo inválido solicitado."
 
-#: Controller/AttributesController.php:2397;2444
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "Esta função só pode ser acessada via AJAX."
 
-#: Controller/AttributesController.php:2509;2517
-#: Controller/EventsController.php:3833;3982;5261
+#: Controller/AttributesController.php:2282
+msgid "You do not have permission to do that"
+msgstr "Você não tem permissão para fazer isso"
+
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "Evento não encontrado ou você não tem permissões para criar atributos"
 
-#: Controller/AttributesController.php:2538
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "Esta ação só pode ser acessada através da AJAX."
 
-#: Controller/AttributesController.php:2547;2798;2812;2823
-#: Controller/OrganisationsController.php:418
-#: Controller/ServersController.php:623;691
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
+#: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "Sem permissão."
 
-#: Controller/AttributesController.php:2652
-#: Controller/EventsController.php:4499
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "Esta funcionalidade requer acesso a chave API."
 
-#: Controller/AttributesController.php:2660
+#: Controller/AttributesController.php:2463
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "Esta ação é somente para a API. Por favor, consulte a página de automação para informações sobre como usá-la."
 
-#: Controller/AttributesController.php:2672
+#: Controller/AttributesController.php:2475
 msgid "No hash or event ID received. You need to set at least one of the two."
-msgstr ""
+msgstr "Nenhum hash ou ID de evento recebido. Você precisa definir pelo menos um dos dois."
 
-#: Controller/AttributesController.php:2833
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "Script inválido."
 
-#: Controller/AttributesController.php:2900
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
-msgstr ""
+msgstr "Não foram encontradas opções válidas de enriquecimento para esse atributo."
 
-#: Controller/AttributesController.php:2998
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "Tipo inválido solicitado."
 
-#: Controller/AttributesController.php:3277
-#: Controller/EventsController.php:5451
+#: Controller/AttributesController.php:2864;3071
+#: Controller/TagCollectionsController.php:254
+msgid "Invalid tag"
+msgstr "Tag inválida"
+
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr ""
 
-#: Controller/AttributesController.php:3281;3296
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3165;3180
+#: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "Atributo inválido."
 
-#: Controller/AttributesController.php:3284;3299
-#: Controller/EventsController.php:5458;5472
-#: Controller/PostsController.php:60;84
-#: Controller/TaxonomiesController.php:100;131;163;245;275;305;335;365;374;383
-msgid "You don't have permission to do that."
-msgstr "Você não tem permissão para fazer isso."
+#: Controller/CommunitiesController.php:150
+msgid "Request sent."
+msgstr "Solicitação enviada."
+
+#: Controller/CommunitiesController.php:150
+msgid "Something went wrong and the request could not be sent."
+msgstr "Algo deu errado e a solicitação não pôde ser enviada."
+
+#: Controller/CommunitiesController.php:166
+msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
+msgstr "A mensagem não pôde ser enviada (ou porque o e-mail está desativado ou porque a criptografia está mal configurada), no entanto, você pode ver abaixo o e-mail que teria sido enviado. Fique à vontade para enviá-lo manualmente."
+
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr "Configurações atualizadas."
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr "Widget inválido."
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr "Você precisa especificar o widget a ser usado junto com a configuração."
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
+#: Controller/DecayingModelController.php:20
+msgid "Default decaying models updated"
+msgstr "Modelos de decaimento padrão atualizados"
+
+#: Controller/DecayingModelController.php:28
+msgid "This method is not allowed"
+msgstr "Este método não é permitido"
+
+#: Controller/DecayingModelController.php:36;105;207;243;264;276;354;387;399;409;430;442;452;544
+#: Controller/DecayingModelMappingController.php:25
+#: Model/DecayingModel.php:483;619
+#: Model/DecayingModelMapping.php:30;59
+msgid "No Decaying Model with the provided ID exists"
+msgstr "Não existe modelo de decaimento com o ID fornecido"
+
+#: Controller/DecayingModelController.php:47
+msgid "Only one import field can be used"
+msgstr "Apenas um campo de importação pode ser usado"
+
+#: Controller/DecayingModelController.php:65
+msgid "Error while decoding JSON"
+msgstr "Erro ao decodificar JSON"
+
+#: Controller/DecayingModelController.php:90
+msgid "The model has been imported."
+msgstr "O modelo foi importado."
+
+#: Controller/DecayingModelController.php:92
+msgid "The model has been imported. However importing mapping failed."
+msgstr "O modelo foi importado. No entanto, a importação do mapeamento falhou."
+
+#: Controller/DecayingModelController.php:95
+msgid "Error while importing model."
+msgstr "Erro ao importar modelo."
+
+#: Controller/DecayingModelController.php:186
+msgid "The model must have a name"
+msgstr "O modelo deve ter um nome"
+
+#: Controller/DecayingModelController.php:198;269
+msgid "The model has been saved."
+msgstr "O modelo foi salvo."
+
+#: Controller/DecayingModelController.php:201
+msgid "The model has been saved. However importing mapping failed."
+msgstr "O modelo foi salvo. No entanto, a importação do mapeamento falhou."
+
+#: Controller/DecayingModelController.php:220;224;281
+msgid "The model could not be saved. Please try again."
+msgstr ""
+
+#: Controller/DecayingModelController.php:308
+msgid "Invalid JSON `Settings`."
+msgstr "'Configurações' JSON inválidas."
+
+#: Controller/DecayingModelController.php:314
+msgid "Invalid parameter `lifetime`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:318
+msgid "Invalid parameter `decay_speed`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:322
+msgid "Invalid parameter `threshold`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:326
+msgid "Invalid parameter `default_base_score`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:333
+msgid "Invalid parameter `base_score_config`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:342
+msgid "Missing JSON key `parameters`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:360
+msgid "You are not authorised to delete this model."
+msgstr "Você não está autorizado a excluir este modelo."
+
+#: Controller/DecayingModelController.php:368
+msgid "Decaying Model deleted."
+msgstr "Modelo de decaimento excluído."
+
+#: Controller/DecayingModelController.php:371
+msgid "The Decaying Model could not be deleted."
+msgstr "O modelo de decaimento não pôde ser excluído."
+
+#: Controller/DecayingModelController.php:391
+msgid "You are not authorised to enable this model."
+msgstr "Você não está autorizado a habilitar este modelo."
+
+#: Controller/DecayingModelController.php:404
+msgid "Decaying Model enabled."
+msgstr "Modelo de decaimento habilitado."
+
+#: Controller/DecayingModelController.php:414;417;457
+msgid "Error while enabling decaying model"
+msgstr ""
+
+#: Controller/DecayingModelController.php:434
+msgid "You are not authorised to disable this model."
+msgstr "Você não está autorizado a desabilitar este modelo."
+
+#: Controller/DecayingModelController.php:447
+msgid "Decaying Model disabled."
+msgstr ""
+
+#: Controller/DecayingModelController.php:460
+msgid "Error while disabling decaying model"
+msgstr ""
+
+#: Controller/DecayingModelController.php:478
+#: View/DecayingModel/add.ctp:37
+msgid "Lifetime"
+msgstr "Tempo de vida"
+
+#: Controller/DecayingModelController.php:479
+#: View/DecayingModel/add.ctp:37
+msgid "Lifetime of the attribute, or time after which the score will be 0"
+msgstr "Tempo de vida do atributo, ou tempo após o qual a pontuação será 0"
+
+#: Controller/DecayingModelController.php:486
+#: View/DecayingModel/add.ctp:46
+msgid "Decay speed"
+msgstr "Velocidade de decaimento"
+
+#: Controller/DecayingModelController.php:487
+#: View/DecayingModel/add.ctp:46
+msgid "Decay speed at which an indicator will loose score"
+msgstr ""
+
+#: Controller/DecayingModelController.php:494
+#: View/DecayingModel/add.ctp:56
+msgid "Cutoff threshold"
+msgstr ""
+
+#: Controller/DecayingModelController.php:495
+#: View/DecayingModel/add.ctp:56
+msgid "Cutoff value at which an indicator will be marked as decayed instead of 0"
+msgstr ""
+
+#: Controller/DecayingModelController.php:563
+msgid "Error Processing Request, can't parse the body"
+msgstr ""
+
+#: Controller/DecayingModelController.php:712
+msgid "This method is only accessible via AJAX."
+msgstr "Este método só é acessível via AJAX."
 
 #: Controller/EventBlacklistsController.php:15
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "Evento Blacklisting não está habilitado nesta instância."
 
-#: Controller/EventBlacklistsController.php:73;95
+#: Controller/EventBlacklistsController.php:76;98
 msgid "Invalid event IDs."
 msgstr "IDs de evento inválidos."
 
-#: Controller/EventBlacklistsController.php:84
+#: Controller/EventBlacklistsController.php:87
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr "Falha ao excluir o evento da EventBlacklist. Erro: "
 
-#: Controller/EventsController.php:855
+#: Controller/EventsController.php:894
 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:857
+#: Controller/EventsController.php:896
 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:863
+#: Controller/EventsController.php:902
 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:865
+#: Controller/EventsController.php:904
 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:1617
-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:1731
+msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
+msgstr "Você atualmente está logado como administrador do site e prestes a editar um evento que não pertence à sua organização. Isso vai contra o modelo de compartilhamento do MISP. Use uma conta de usuário normal para trabalho diário."
 
-#: Controller/EventsController.php:1827
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr "Você não tem permissão para criar eventos"
 
-#: Controller/EventsController.php:1833
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr "Não há dados de evento válidos recebidos."
 
-#: Controller/EventsController.php:1869
+#: Controller/EventsController.php:1984
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
-msgstr ""
+msgstr "Grupo de compartilhamento inválido ou não autorizado (usuário de sincronização não está contido no grupo de compartilhamento)."
 
-#: Controller/EventsController.php:1873;1877
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
-msgstr ""
+msgstr "Grupo de compartilhamento inválido ou não autorizado."
 
-#: Controller/EventsController.php:1901
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr "Evento bloqueado por blacklist local."
 
-#: Controller/EventsController.php:1914;1994;2258
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "O evento foi criado"
 
-#: Controller/EventsController.php:1922
+#: Controller/EventsController.php:2037
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
-msgstr ""
+msgstr "O evento já existe, se você quiser editá-lo, use a url no cabeçalho de local."
 
-#: Controller/EventsController.php:1928
+#: Controller/EventsController.php:2043
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr ""
 
-#: Controller/EventsController.php:1930;2261
+#: Controller/EventsController.php:2045;2395
 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:1970
+#: Controller/EventsController.php:2094
 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 ""
+msgstr "O evento criado ficará visível para as organizações que têm uma conta nesta plataforma, mas não sincronizado com outras instâncias MISP até que seja publicado."
 
-#: Controller/EventsController.php:2020
+#: Controller/EventsController.php:2142
 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:2021
+#: Controller/EventsController.php:2143
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr ""
 
-#: Controller/EventsController.php:2070
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr "Documento STIX importado, eventos criados: "
 
-#: Controller/EventsController.php:2073
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr "Documento STIX importado."
 
-#: Controller/EventsController.php:2076
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr "Não foi possível importar o documento STIX: "
 
-#: Controller/EventsController.php:2083
+#: Controller/EventsController.php:2217
 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:2107;2192
+#: Controller/EventsController.php:2241;2326
 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:2115
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr "ID de evento enviado inválido."
 
-#: Controller/EventsController.php:2120
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr "Você não está autorizado a ler o evento selecionado."
 
-#: Controller/EventsController.php:2410;2460;2530
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr "Você não possui permissão para fazer isso."
 
-#: Controller/EventsController.php:2419
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr "Evento não publicado."
 
-#: Controller/EventsController.php:2472;2541
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr ""
 
-#: Controller/EventsController.php:2624
+#: Controller/EventsController.php:2819
+msgid "You must specify a message."
+msgstr "Você deve especificar uma mensagem."
+
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr "E-mail enviado para o responsável."
 
-#: Controller/EventsController.php:2626
-msgid "Sending of email failed"
-msgstr "Falha ao enviar email"
+#: Controller/EventsController.php:2847
+msgid "Sending of email failed."
+msgstr "O envio do e-mail falhou."
 
-#: Controller/EventsController.php:2671
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
-msgstr ""
+msgstr "Cuidado, você está logado como administrador do site, qualquer exportação que você gerar conterá o conjunto de dados COMPLETO IRRESTRITO. Se você gostaria de gerar uma exportação para a sua própria organização, por favor faça login com um usuário diferente."
 
-#: Controller/EventsController.php:2759
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr "Esta funcionalidade está atualmente desativada"
 
-#: Controller/EventsController.php:2801;4015;4083
-msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
-msgstr ""
-
-#: Controller/EventsController.php:2837
-msgid "Invalid Event ID."
-msgstr "ID de evento inválido."
-
-#: Controller/EventsController.php:2884
-msgid "No events found that match the passed parameters."
-msgstr ""
-
-#: Controller/EventsController.php:2909
-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:2984
-msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
-msgstr ""
-
-#: Controller/EventsController.php:3003
-#: Model/Attribute.php:2069
-msgid "Invalid hash type."
-msgstr "Hash Inválida."
-
-#: Controller/EventsController.php:3106
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr "Nome de arquivo não permitido."
 
-#: Controller/EventsController.php:3126
-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:3134
+msgid "Problem with writing the IoC file. Please report to site admin."
+msgstr "Problema com a escrita do arquivo IoC. Por favor, reporte ao administrador do site."
 
-#: Controller/EventsController.php:3220
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr "Este não é um arquivo XML válido para o MISP."
 
-#: Controller/EventsController.php:3383
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr "Ainda não implementado"
 
-#: Controller/EventsController.php:3401;3405
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr "Evento inválido ou não autorizado."
 
-#: Controller/EventsController.php:3425;3495
-msgid "You don't have the privileges to access this."
-msgstr "Você não possui privilégios para acessar isso."
-
-#: Controller/EventsController.php:3706
-#: Controller/TagCollectionsController.php:311
+#: Controller/EventsController.php:3484
+#: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr "Tag inválida."
 
-#: Controller/EventsController.php:3722
-#: Controller/TagCollectionsController.php:327
+#: Controller/EventsController.php:3500
+#: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr "A tag já está anexada a este evento."
 
-#: Controller/EventsController.php:3733;3739
-#: Controller/TagCollectionsController.php:334
+#: Controller/EventsController.php:3514
+msgid "Tag is not allowed due to taxonomy exclusivity settings"
+msgstr "A tag não é permitida devido a configurações de exclusividade da taxonomia"
+
+#: Controller/EventsController.php:3545;3551
+#: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr "Tag(s) adicionada."
 
-#: Controller/EventsController.php:3735
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr "Tag não pôde ser adicionada."
 
-#: Controller/EventsController.php:3741
-#: Controller/TagCollectionsController.php:342
+#: Controller/EventsController.php:3553
+#: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr "Todas as tags já estão presentes, nada para adicionar."
 
-#: Controller/EventsController.php:3986;5265;5287;5785;5789
-#: Controller/ObjectsController.php:46;190;194;618;1028
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
+#: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "Evento inválido."
 
-#: Controller/EventsController.php:4146;4176;4192
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr "Você não tem permissão para fazer isso."
 
-#: Controller/EventsController.php:4257;4397
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr "ID inválido"
 
-#: Controller/EventsController.php:4261;4401;4948
+#: Controller/EventsController.php:3987;4128;4703
 msgid "Event not found or you are not authorised to view it."
 msgstr "Evento não encontrado ou você não está autorizado a visualizá-lo."
 
-#: Controller/EventsController.php:4502;4509
+#: Controller/EventsController.php:4134
+msgid "Freetext Import"
+msgstr ""
+
+#: Controller/EventsController.php:4140
+msgid "Populate using a Template"
+msgstr ""
+
+#: Controller/EventsController.php:4146
+msgid "OpenIOC Import"
+msgstr "Importação OpenIOC"
+
+#: Controller/EventsController.php:4151
+msgid "ThreatConnect Import"
+msgstr ""
+
+#: Controller/EventsController.php:4156
+msgid "(Experimental) Forensic analysis - Mactime"
+msgstr ""
+
+#: Controller/EventsController.php:4175
+msgid "MISP standard (recommended exchange format - lossless)"
+msgstr ""
+
+#: Controller/EventsController.php:4181
+msgid "STIX 1.1.1 format (lossy)"
+msgstr "Formato STIX 1.1.1 (com perdas)"
+
+#: Controller/EventsController.php:4186
+msgid "STIX 2.0 format (lossy)"
+msgstr "Formato STIX 2.0 (com perdas)"
+
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4538
+#: Controller/EventsController.php:4264
 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:4546
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "Evento não encontrado"
 
-#: Controller/EventsController.php:4569
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "Evento não encontrado."
 
-#: Controller/EventsController.php:4579
+#: Controller/EventsController.php:4305
 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:4604
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
-msgstr ""
+msgstr "A criação de um novo evento com as informações fornecidas falhou."
 
-#: Controller/EventsController.php:4743;4764;4797;4822;4847;4877;4898
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr "Tipo inválido."
 
-#: Controller/EventsController.php:5012
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr "Método inválido."
 
-#: Controller/EventsController.php:5094
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
-msgstr ""
+msgstr "%s serviços não estão habilitados."
 
-#: Controller/EventsController.php:5098
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:5103
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:5158;5204
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5170
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
-msgstr ""
+msgstr ": Enriquecido através de "
 
-#: Controller/EventsController.php:5221
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
-msgstr ""
+msgstr ": Enriquecido através de %s"
 
-#: Controller/EventsController.php:5373
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
-msgstr ""
+msgstr "Serviço de importação inacessível."
 
-#: Controller/EventsController.php:5598
+#: Controller/EventsController.php:5222;5236
+#: Controller/PostsController.php:60;84
+#: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
+msgid "You don't have permission to do that."
+msgstr "Você não tem permissão para fazer isso."
+
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
-msgstr ""
+msgstr "ID inválido."
 
-#: Controller/EventsController.php:5646
-#: Controller/ShadowAttributesController.php:313;318;534
+#: Controller/EventsController.php:5411
+#: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr "Evento inválido"
 
-#: Controller/EventsController.php:5667
+#: Controller/EventsController.php:5432
 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."
+msgstr "Tarefa de enriquecimento está na fila para processamento em segundo plano. Volte mais tarde para ver os resultados."
 
-#: Controller/EventsController.php:5918
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
-msgstr ""
+msgstr "%s evento(s) excluído(s)."
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:238;337
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr "Feed adicionado."
 
-#: Controller/FeedsController.php:246
-msgid "Feed could not be added. Invalid field: %s"
-msgstr "Feed não pode ser adicionado. Campo inválido: %s"
+#: Controller/FeedsController.php:291
+msgid "Feed could not be added. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:271;372;394;516;551;755
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr "Feed inválido."
 
-#: Controller/FeedsController.php:345
-msgid "Feed could not be updated. Invalid fields: %s"
-msgstr "O feed não pode ser atualizado. Campos inválidos: %s"
-
-#: Controller/FeedsController.php:368
-msgid "This action requires a post request."
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:401;520
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
+#: Controller/SharingGroupsController.php:237
+#: Controller/UsersController.php:1044
+msgid "Action not allowed, post or delete request expected."
+msgstr "Ação não permitida, solicitação de postar ou excluir esperada."
+
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:414;480
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:425
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:430;432
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:436;497
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:527
+#: Controller/FeedsController.php:563
+msgid "No feed enabled."
+msgstr ""
+
+#: Controller/FeedsController.php:587;606
+#: Controller/ServersController.php:116;161
+msgid "Download failed."
+msgstr "O download falhou."
+
+#: Controller/FeedsController.php:594
 msgid "Event added."
 msgstr "Evento criado."
 
-#: Controller/FeedsController.php:530
+#: Controller/FeedsController.php:597
 msgid "Event already up to date."
-msgstr ""
+msgstr "Evento já atualizado."
 
-#: Controller/FeedsController.php:532
+#: Controller/FeedsController.php:599
 msgid "Event updated."
 msgstr "Evento atualizado."
 
-#: Controller/FeedsController.php:536
+#: Controller/FeedsController.php:603
 msgid "Could not %s event."
-msgstr ""
+msgstr "Não foi possível %s o evento."
 
-#: Controller/FeedsController.php:539
-msgid "Download failed."
-msgstr ""
-
-#: Controller/FeedsController.php:631
+#: Controller/FeedsController.php:700
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr ""
 
-#: Controller/FeedsController.php:670;721
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
-msgstr ""
+msgstr "Tipo de feed inválido."
 
-#: Controller/FeedsController.php:787
-msgid "This event is blocked by the Feed filters."
-msgstr ""
-
-#: Controller/FeedsController.php:789
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
-msgstr ""
+msgstr "Não foi possível baixar o evento selecionado"
 
-#: Controller/FeedsController.php:825;829
+#: Controller/FeedsController.php:865
+msgid "This event is blocked by the Feed filters."
+msgstr "Este evento está bloqueado pelos filtros de feed."
+
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
-msgstr ""
+msgstr "Feed inválido."
 
-#: Controller/FeedsController.php:850
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
-msgstr ""
+msgstr "Apenas requisições POST são permitidas."
 
-#: Controller/FeedsController.php:854
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
-msgstr ""
+msgstr "Feed não encontrado."
 
-#: Controller/FeedsController.php:863
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr "Dados coletados."
 
-#: Controller/FeedsController.php:865
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
-msgstr ""
+msgstr "Não foi possível puxar os dados selecionados. Motivo: %s"
 
-#: Controller/FeedsController.php:882
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr ""
 
-#: Controller/FeedsController.php:897
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:900
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:934
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr ""
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
-msgstr ""
+msgstr "Todos os clusters"
 
-#: Controller/GalaxiesController.php:167
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr ""
 
-#: Controller/GalaxiesController.php:293
-msgid "Failed to parse request."
+#: Controller/GalaxiesController.php:337
+msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:296
-msgid "No clusters picked."
+#: Controller/GalaxiesController.php:340
+msgid "Failed to parse request."
 msgstr ""
 
 #: Controller/JobsController.php:156
@@ -806,39 +1108,40 @@ msgstr "Todos os jobs foram removidos"
 
 #: Controller/NewsController.php:51
 msgid "News item added."
-msgstr ""
+msgstr "Item de notícia adicionado."
 
 #: Controller/NewsController.php:54
 msgid "The news item could not be added."
-msgstr ""
+msgstr "O item de notícia não pôde ser adicionado."
 
 #: Controller/NewsController.php:68
 msgid "News item updated."
-msgstr ""
+msgstr "Item de notícia atualizado."
 
 #: Controller/NewsController.php:71
 msgid "Could not update news item."
-msgstr ""
+msgstr "Não foi possível atualizar o item de notícia."
 
 #: Controller/NewsController.php:89
 msgid "News item deleted."
-msgstr ""
+msgstr "Item de notícia excluído."
 
 #: Controller/NewsController.php:92
 msgid "News item could not be deleted."
-msgstr ""
+msgstr "O item de notícia não pôde ser excluído."
 
 #: Controller/ObjectReferencesController.php:37
+#: Controller/ObjectsController.php:511;607;650;671;686;757;768;786
 msgid "Invalid object"
 msgstr "Objeto inválido"
 
-#: Controller/ObjectReferencesController.php:161
+#: Controller/ObjectReferencesController.php:163
 msgid "Invalid object reference"
 msgstr "Referência de objeto inválida"
 
 #: Controller/ObjectTemplatesController.php:31
 msgid "All Objects"
-msgstr ""
+msgstr "Todos os objetos"
 
 #: Controller/ObjectTemplatesController.php:99
 msgid "Invalid object template"
@@ -856,51 +1159,75 @@ msgstr "ObjectTemplate apagado"
 msgid "This action can only be reached via POST requests"
 msgstr ""
 
-#: Controller/ObjectsController.php:69;82;1055
+#: Controller/ObjectsController.php:69;82;1272
 msgid "Invalid sharing group."
-msgstr ""
+msgstr "Grupo de compartilhamento inválido."
 
 #: Controller/ObjectsController.php:153
 msgid "You don't have permissions to create objects."
-msgstr ""
+msgstr "Você não tem permissão para criar objetos."
 
-#: Controller/ObjectsController.php:181;1040;1092
+#: Controller/ObjectsController.php:181;1257;1309
 #: Model/Template.php:25
 msgid "Invalid template."
 msgstr "Modelo inválido."
 
-#: Controller/ObjectsController.php:364
-msgid "You don't have permissions to edit objects."
-msgstr ""
+#: Controller/ObjectsController.php:295;424;430
+msgid "Object could not be saved."
+msgstr "O objeto não pôde ser salvo."
 
-#: Controller/ObjectsController.php:378;389;607
-#: Model/Event.php:6207
+#: Controller/ObjectsController.php:373;1006
+#: Model/Event.php:6248
 msgid "Invalid object."
+msgstr "Objeto inválido."
+
+#: Controller/ObjectsController.php:377
+msgid "Insufficient permissions to edit this object."
+msgstr "Permissões insuficientes para editar este objeto."
+
+#: Controller/ObjectsController.php:449
+msgid "Object attributes saved."
+msgstr "Atributos de objeto salvos."
+
+#: Controller/ObjectsController.php:518
+msgid "This function can only be accessed via POST or PUT"
+msgstr "Esta função só pode ser acessada via POST ou PUT"
+
+#: Controller/ObjectsController.php:711
+msgid "Invalid template"
 msgstr ""
 
-#: Controller/ObjectsController.php:601
+#: Controller/ObjectsController.php:789
+msgid "Invalid fields"
+msgstr "Campos inválidos"
+
+#: Controller/ObjectsController.php:796
+msgid "Invalid field"
+msgstr "Campo inválido"
+
+#: Controller/ObjectsController.php:822
 msgid "You don't have permissions to delete objects."
-msgstr ""
+msgstr "Você não tem permissão para excluir objetos."
 
-#: Controller/ObjectsController.php:711;718;722
+#: Controller/ObjectsController.php:926;933;937
 msgid "Object not found or not authorised."
 msgstr ""
 
-#: Controller/ObjectsController.php:986
+#: Controller/ObjectsController.php:1203
 msgid "%s objects successfully reconstructed."
 msgstr "%s objetos reconstruídos com êxito."
 
-#: Controller/ObjectsController.php:996;1032
+#: Controller/ObjectsController.php:1213;1249
 msgid "This action can only be reached via AJAX."
 msgstr ""
 
-#: Controller/ObjectsController.php:1073
+#: Controller/ObjectsController.php:1290
 msgid "Failed to create an Object from Attributes. Error: "
 msgstr ""
 
-#: Controller/ObjectsController.php:1084
+#: Controller/ObjectsController.php:1301
 msgid "No Attribute selected."
-msgstr ""
+msgstr "Nenhum atributo selecionado."
 
 #: Controller/OrgBlacklistsController.php:15
 msgid "Organisation Blacklisting is not currently enabled on this instance."
@@ -912,53 +1239,49 @@ msgstr ""
 
 #: Controller/OrganisationsController.php:133
 msgid "The organisation has been successfully added."
-msgstr ""
+msgstr "A organização foi adicionada com sucesso."
 
 #: Controller/OrganisationsController.php:140
 msgid "The organisation could not be added."
-msgstr ""
+msgstr "A organização não pôde ser adicionada."
 
-#: Controller/OrganisationsController.php:155;234;287;314;347
+#: Controller/OrganisationsController.php:163;296;302
+msgid "Invalid organisation."
+msgstr "Organização inválida."
+
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
 msgid "Invalid organisation"
-msgstr ""
+msgstr "Organização inválida"
 
-#: Controller/OrganisationsController.php:194
+#: Controller/OrganisationsController.php:208
 msgid "Organisation updated."
-msgstr ""
+msgstr "Organização atualizada."
 
-#: Controller/OrganisationsController.php:209
+#: Controller/OrganisationsController.php:223
 msgid "The organisation could not be updated."
-msgstr ""
+msgstr "A organização não pôde ser atualizada."
 
-#: Controller/OrganisationsController.php:230
-msgid "Action not allowed, post request expected."
-msgstr ""
-
-#: Controller/OrganisationsController.php:251
+#: Controller/OrganisationsController.php:272
 msgid "Organisation deleted"
 msgstr "Organização apagada"
 
-#: Controller/OrganisationsController.php:258
+#: Controller/OrganisationsController.php:279
 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 "Organização não pode ser excluída. Geralmente as organizações nunca devem ser excluídas, em vez disso considere movendo-as para a lista remota de organizações conhecidas. Alternativamente, se você tem certeza de que você gostaria de remover uma organização e está consciente do impacto, certifique-se de que não existem usuários ou eventos ainda vinculados a esta organização antes de excluí-lo."
 
-#: Controller/OrganisationsController.php:275;281
-msgid "Invalid organisation."
-msgstr ""
-
-#: Controller/OrganisationsController.php:352
+#: Controller/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:401
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr ""
 
-#: Controller/OrganisationsController.php:423
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr ""
 
-#: Controller/OrganisationsController.php:426
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr ""
 
@@ -1048,7 +1371,7 @@ msgstr "Função inválida"
 
 #: Controller/RolesController.php:59;100
 msgid "The Role has been saved"
-msgstr ""
+msgstr "A função foi salva"
 
 #: Controller/RolesController.php:67;108
 msgid "The Role could not be saved. Please, try again."
@@ -1056,7 +1379,7 @@ msgstr "A função não pode ser salva. Por favor, tente novamente."
 
 #: Controller/RolesController.php:85;151
 msgid "Invalid Role"
-msgstr ""
+msgstr "Função inválida"
 
 #: Controller/RolesController.php:157
 msgid "Role deleted"
@@ -1064,98 +1387,107 @@ msgstr "Função deletada"
 
 #: Controller/RolesController.php:164
 msgid "Role could not be deleted"
-msgstr ""
+msgstr "A função não pôde ser excluída"
 
 #: Controller/RolesController.php:200
 msgid "Default role set."
-msgstr ""
+msgstr "Função padrão definida."
 
 #: Controller/RolesController.php:200
 msgid "Default role unset."
-msgstr ""
+msgstr "Função padrão não definida."
 
-#: Controller/ServersController.php:225;421
+#: Controller/ServersController.php:237;436
 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:235;431
+#: Controller/ServersController.php:247;446
 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:289;461
+#: Controller/ServersController.php:302;476
 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:301
+#: Controller/ServersController.php:314
 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:336;517;1997
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr "O servidor foi salvo"
 
-#: Controller/ServersController.php:343;524
+#: Controller/ServersController.php:357;539
 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:396;593;618;627;687;1403
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "Servidor inválido"
 
-#: Controller/ServersController.php:478
+#: Controller/ServersController.php:493
 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:600
+#: Controller/ServersController.php:604;2183;2225
+msgid "This endpoint expects POST requests."
+msgstr ""
+
+#: Controller/ServersController.php:612
+msgid "You don't have the privileges to do that."
+msgstr ""
+
+#: Controller/ServersController.php:621
 msgid "Server deleted"
 msgstr "Servidor excluído"
 
-#: Controller/ServersController.php:603
+#: Controller/ServersController.php:630
 msgid "Server was not deleted"
 msgstr "Servidor não foi excluído"
 
-#: Controller/ServersController.php:630
+#: Controller/ServersController.php:668
 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:653
+#: Controller/ServersController.php:692
 msgid "Pulling."
 msgstr ""
 
-#: Controller/ServersController.php:663
+#: Controller/ServersController.php:702
 msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:700
+#: Controller/ServersController.php:748
 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:713
+#: Controller/ServersController.php:761
 msgid "Push complete. %s events pushed, %s events could not be pushed."
 msgstr ""
 
-#: Controller/ServersController.php:728
+#: Controller/ServersController.php:776
 msgid "Pushing."
 msgstr ""
 
-#: Controller/ServersController.php:738
+#: Controller/ServersController.php:786
 msgid "Push queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:766
+#: Controller/ServersController.php:814
 msgid "Filename not allowed"
 msgstr ""
 
-#: Controller/ServersController.php:771
+#: Controller/ServersController.php:819
 msgid "Incorrect extension or empty file."
 msgstr ""
 
-#: Controller/ServersController.php:853
+#: Controller/ServersController.php:901
 msgid "No organisation selected."
 msgstr ""
 
-#: Controller/ServersController.php:869;870;871;872;873;874;875;876;877;878;879;880;881;882;883
-#: View/Elements/healthElements/diagnostics.ctp:26;170;184;209;269
+#: Controller/ServersController.php:917;918;919;920;921;922;923;924;925;926;927;928;929;930;931
+#: View/Elements/healthElements/diagnostics.ctp:26;170;184;271;331
 #: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/submoduleStatus.ctp:23
@@ -1163,253 +1495,330 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: Controller/ServersController.php:869
+#: Controller/ServersController.php:917
 msgid "not found"
-msgstr ""
+msgstr "não encontrado"
 
-#: Controller/ServersController.php:869
+#: Controller/ServersController.php:917
 msgid "is not writeable"
-msgstr ""
+msgstr "não é gravável"
 
-#: Controller/ServersController.php:870
+#: Controller/ServersController.php:918
 msgid "not readable"
 msgstr ""
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: settings not set"
-msgstr ""
+msgstr "FALHA: configurações não definidas"
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: Failed to load GnuPG"
-msgstr ""
+msgstr "FALHO: Falha ao carregar GnuPG"
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: Issues with the key/passphrase"
+msgstr "FALHA: Problemas com a chave/frase secreta"
+
+#: Controller/ServersController.php:919
+msgid "FAIL: sign failed"
 msgstr ""
 
-#: Controller/ServersController.php:871
-msgid "FAIL: encrypt failed"
-msgstr ""
-
-#: Controller/ServersController.php:872
+#: Controller/ServersController.php:920
 msgid "not configured (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:872
+#: Controller/ServersController.php:920
 msgid "Getting URL via proxy failed"
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "not enabled (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "Python ZeroMQ library not installed correctly."
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "ZeroMQ script not running."
 msgstr ""
 
-#: Controller/ServersController.php:874
+#: Controller/ServersController.php:922
 msgid "Some of the libraries related to STIX are not installed. Make sure that all libraries listed below are correctly installed."
 msgstr ""
 
-#: Controller/ServersController.php:875
+#: Controller/ServersController.php:923
 msgid "Incorrect STIX version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:876
+#: Controller/ServersController.php:924
 msgid "Incorrect STIX2 version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:877
+#: Controller/ServersController.php:925
 msgid "Incorrect CyBox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:878
+#: Controller/ServersController.php:926
 msgid "Incorrect mixbox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:879
+#: Controller/ServersController.php:927
 msgid "Incorrect maec version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:880
+#: Controller/ServersController.php:928
 msgid "Incorrect PyMISP version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:881
+#: Controller/ServersController.php:929
 msgid "Incorrect plyara version installed, found $current, expecting $expected"
-msgstr ""
+msgstr "Versão incorreta de plyara instalada, encontrada $current, esperada $expected"
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 #: View/Events/filter_event_index.ctp:32;188
 #: View/Pages/doc/using_the_system.ctp:68;173
 msgid "High"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 msgid "Alternative setting used"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 msgid "Test failed"
 msgstr ""
 
-#: Controller/ServersController.php:883
+#: Controller/ServersController.php:931
 msgid "System not enabled"
 msgstr ""
 
-#: Controller/ServersController.php:883
+#: Controller/ServersController.php:931
 msgid "No modules found"
 msgstr ""
 
-#: Controller/ServersController.php:890
+#: Controller/ServersController.php:938
 msgid "MISP will not operate correctly or will be unsecure until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:894
+#: Controller/ServersController.php:942
 msgid "Some of the features of MISP cannot be utilised until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:898
+#: Controller/ServersController.php:946
 msgid "There are some optional tweaks that could be done to improve the looks of your MISP instance."
 msgstr ""
 
-#: Controller/ServersController.php:1106
+#: Controller/ServersController.php:1165
+msgid "Only one `update` worker can run at a time"
+msgstr ""
+
+#: Controller/ServersController.php:1177
 msgid "Worker start signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1121
+#: Controller/ServersController.php:1192
 msgid "Worker stop signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1191
+#: Controller/ServersController.php:1249
+msgid "This setting is redacted."
+msgstr ""
+
+#: Controller/ServersController.php:1274
 msgid "This setting can only be edited via the CLI."
 msgstr ""
 
-#: Controller/ServersController.php:1300
+#: Controller/ServersController.php:1365;1377
+msgid "Restarting workers."
+msgstr ""
+
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "Arquivo não encontrado."
 
-#: Controller/ServersController.php:1306
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "O arquivo não pôde ser excluído."
 
-#: Controller/ServersController.php:1329;1345
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr "Falha no upload."
 
-#: Controller/ServersController.php:1337
+#: Controller/ServersController.php:1438
 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/ServersController.php:1896
+#: Controller/ServersController.php:1505
+msgid "Invalid user or user not found."
+msgstr ""
+
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr ""
 
-#: Controller/ServersController.php:1911
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:1914
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
-#: Controller/ServersController.php:2004
+#: Controller/ServersController.php:2100
+msgid "Cannot create sync config - no host org ID configured for the instance."
+msgstr ""
+
+#: Controller/ServersController.php:2109
+msgid "Configured host org not found. Please make sure that the setting is current on the instance."
+msgstr ""
+
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:212
-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:281
-msgid "Could not discard proposal."
+#: Controller/ServersController.php:2194
+msgid "API key updated."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:342
+#: Controller/ServersController.php:2207
+msgid "ID has to be a valid server connection"
+msgstr ""
+
+#: Controller/ServersController.php:2210
+msgid "Invalid direction. Valid options: "
+msgstr ""
+
+#: Controller/ServersController.php:2214
+msgid "Priority changed."
+msgstr ""
+
+#: Controller/ServersController.php:2217
+msgid "Priority could not be changed."
+msgstr ""
+
+#: Controller/ServersController.php:2228
+msgid "Only site admin accounts can release the update lock."
+msgstr ""
+
+#: Controller/ServersController.php:2238
+msgid "Only site admin accounts get the DB schema diagnostic."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:263
+msgid "Could not discard proposal."
+msgstr "Não foi possível descartar a proposta."
+
+#: Controller/ShadowAttributesController.php:324
 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:390;393;402
+#: Controller/ShadowAttributesController.php:372;375;384
 msgid "The lines"
 msgstr "As linhas"
 
-#: Controller/ShadowAttributesController.php:442
+#: Controller/ShadowAttributesController.php:424
 msgid "The proposal has been saved"
 msgstr "A proposta foi atualizada"
 
-#: Controller/ShadowAttributesController.php:454;763
+#: Controller/ShadowAttributesController.php:436;749
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:456
+#: Controller/ShadowAttributesController.php:438
 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:493
+#: Controller/ShadowAttributesController.php:475
 msgid "Invalid Proposal"
 msgstr "Proposta inválida"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:505
 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:601
 msgid "The attachment has been uploaded"
 msgstr "O anexo foi salvo"
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:603
 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:606
 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:740
 msgid "The proposed Attribute has been saved"
 msgstr "O atributo proposto foi salvo"
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:751
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr "O ShadowAttribute não pôde ser salvo. Por favor, tente novamente."
 
-#: Controller/ShadowAttributesController.php:896;906
+#: Controller/ShadowAttributesController.php:884;894
 msgid "Invalid proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:950
-msgid "No proposals found or invalid event."
-msgstr ""
-
-#: Controller/ShadowAttributesController.php:982;1018
+#: Controller/ShadowAttributesController.php:1010
 msgid "This feature is only available using the API to Sync users"
 msgstr "Esta funcionalidade só está disponível usando a API para usuários de sincronização"
 
-#: Controller/ShadowAttributesController.php:985
+#: Controller/ShadowAttributesController.php:1013
 msgid "Invalid UUID"
 msgstr "UUID inválido"
 
-#: Controller/ShadowAttributesController.php:1021
-msgid "This feature is only available using POST requests"
-msgstr ""
-
-#: Controller/SharingGroupsController.php:237
+#: Controller/SharingGroupsController.php:251
 msgid "Sharing Group deleted"
 msgstr "Grupo de compartilhamento removido"
 
-#: Controller/SharingGroupsController.php:242
+#: Controller/SharingGroupsController.php:256
 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/SightingdbController.php:32
+msgid "SightingDB connection added."
+msgstr ""
+
+#: Controller/SightingdbController.php:32
+msgid "SightingDB connection could not be added."
+msgstr ""
+
+#: Controller/SightingdbController.php:49;99;143
+msgid " Reason: %s"
+msgstr ""
+
+#: Controller/SightingdbController.php:71;123
+#: Model/Sightingdb.php:325
+msgid "Invalid SightingDB entry."
+msgstr ""
+
+#: Controller/SightingdbController.php:87
+msgid "SightingDB connection updated."
+msgstr ""
+
+#: Controller/SightingdbController.php:87
+msgid "SightingDB connection could not be updated."
+msgstr ""
+
+#: Controller/SightingdbController.php:128
+msgid "SightingDB connection removed."
+msgstr ""
+
+#: Controller/SightingdbController.php:130
+msgid "SightingDB connection could not be removed."
+msgstr ""
+
+#: Controller/SightingdbController.php:196
+msgid "Pass a valid SightingDB ID"
+msgstr ""
+
 #: Controller/SightingsController.php:83
 msgid "Could not add the Sighting. Reason: "
 msgstr ""
 
-#: Controller/SightingsController.php:93;96
+#: Controller/SightingsController.php:96
 msgid "Sighting added"
 msgstr ""
 
@@ -1418,6 +1827,7 @@ msgid "You are not authorised to remove sightings data as you don't have permiss
 msgstr ""
 
 #: Controller/SightingsController.php:155
+#: Model/DecayingModel.php:464
 msgid "Attribute not found"
 msgstr ""
 
@@ -1453,7 +1863,7 @@ msgstr ""
 msgid "You don't have editing rights on this Tag Collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:201;385
+#: Controller/TagCollectionsController.php:201;391
 msgid "Invalid tag collection."
 msgstr ""
 
@@ -1469,115 +1879,147 @@ msgstr ""
 msgid "You are not allowed to delete that."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:336
+#: Controller/TagCollectionsController.php:241
+msgid "Invalid tag collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:342
 msgid "Tag(s) could not be added."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:389
+#: Controller/TagCollectionsController.php:395
 msgid "Insufficient privileges to remove the tag from the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:400
+#: Controller/TagCollectionsController.php:406
 msgid "Invalid tag or tag not associated with the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:404
+#: Controller/TagCollectionsController.php:410
 msgid "Failed to remove tag from the collection."
 msgstr ""
 
-#: Controller/TagsController.php:367
+#: Controller/TagsController.php:370
 msgid "Tag deleted"
 msgstr "Tag deletada"
 
-#: Controller/TagsController.php:372
+#: Controller/TagsController.php:375
 msgid "Tag was not deleted"
 msgstr "Tag não foi deletada"
 
-#: Controller/TagsController.php:580
+#: Controller/TagsController.php:599
 msgid "Favourite Tags"
 msgstr ""
 
-#: Controller/TagsController.php:586
+#: Controller/TagsController.php:605
 #: View/TagCollections/index.ctp:4
 msgid "Tag Collections"
 msgstr ""
 
-#: Controller/TagsController.php:591
+#: Controller/TagsController.php:610
 msgid "Custom Tags"
 msgstr ""
 
-#: Controller/TagsController.php:595
+#: Controller/TagsController.php:614
 msgid "All Tags"
 msgstr ""
 
-#: Controller/TagsController.php:603
+#: Controller/TagsController.php:622
 #: View/Taxonomies/view.ctp:2
 msgid "Taxonomy Library"
 msgstr ""
 
-#: Controller/TagsController.php:772
+#: Controller/TagsController.php:790
 msgid "Includes: "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:57
+#: Controller/TagsController.php:867
+msgid "This functionality requires tagging permission."
+msgstr ""
+
+#: Controller/TagsController.php:881;905
+msgid "Cannot alter the tags of this data, only the organisation that has created the data (orgc) can modify global tags."
+msgstr ""
+
+#: Controller/TagsController.php:883;907
+msgid "Please consider using local tags if you are in the host organisation of the instance."
+msgstr "Por favor, considere usar etiquetas locais se você está na organização hospedeira da instância."
+
+#: Controller/TagsController.php:912;1058
+msgid "Invalid Target."
+msgstr ""
+
+#: Controller/TagsController.php:951
+msgid "Local tags can only be added by users of the host organisation."
+msgstr "Etiquetas locais só podem ser adicionadas por usuários da organização hospedeira."
+
+#: Controller/TagsController.php:964
+msgid "Unable to create tag. Reason: "
+msgstr ""
+
+#: Controller/TagsController.php:1075
+msgid "Insufficient privileges to remove local tags from events you do not own."
+msgstr "Privilégios insuficientes para remover etiquetas locais de eventos que você não é dono."
+
+#: Controller/TaxonomiesController.php:68
 msgid "Taxonomy not found."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:123
+#: Controller/TaxonomiesController.php:134
 msgid "Taxonomy enabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:155
+#: Controller/TaxonomiesController.php:166
 msgid "Taxonomy disabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:223
+#: Controller/TaxonomiesController.php:234
 msgid "All taxonomy libraries are up to date already."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:226
+#: Controller/TaxonomiesController.php:237
 msgid "Could not update any of the taxonomy libraries"
 msgstr ""
 
-#: Controller/TaxonomiesController.php:229
+#: Controller/TaxonomiesController.php:240
 #: Controller/WarninglistsController.php:107
 msgid "Successfully updated "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:229;231
+#: Controller/TaxonomiesController.php:240;242
 msgid " taxonomy libraries."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:231
+#: Controller/TaxonomiesController.php:242
 #: Controller/WarninglistsController.php:109
 msgid " However, could not update "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:265;295;325
+#: Controller/TaxonomiesController.php:276;314;344
 msgid "The tag(s) has been saved."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:267;297;327
+#: Controller/TaxonomiesController.php:282;316;346
 msgid "The tag(s) could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:355
+#: Controller/TaxonomiesController.php:374
 msgid "The tag(s) has been hidden."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:357
+#: Controller/TaxonomiesController.php:376
 msgid "The tag(s) could not be hidden. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:394
+#: Controller/TaxonomiesController.php:413
 msgid "Taxonomy successfuly deleted."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:397
+#: Controller/TaxonomiesController.php:416
 msgid "Taxonomy could not be deleted."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:405
+#: Controller/TaxonomiesController.php:424
 #: Controller/WarninglistsController.php:262
 msgid "This function can only be reached via AJAX."
 msgstr ""
@@ -1590,129 +2032,196 @@ msgstr "Evento preenchido, "
 msgid "Event populated, but "
 msgstr "Evento preenchido, mas "
 
-#: Controller/UsersController.php:42;247
+#: Controller/UserSettingsController.php:129;276
+msgid "Invalid ID passed."
+msgstr ""
+
+#: Controller/UserSettingsController.php:139;143;286;290
+msgid "Invalid user setting."
+msgstr ""
+
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
+msgid "Invalid setting."
+msgstr ""
+
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
+msgid "This setting is restricted and requires the following permission(s): %s"
+msgstr ""
+
+#: Controller/UserSettingsController.php:193
+msgid "Setting saved."
+msgstr "Configuração salva."
+
+#: Controller/UserSettingsController.php:206
+msgid "Setting could not be saved."
+msgstr "A configuração não pôde ser salva."
+
+#: Controller/UserSettingsController.php:301
+msgid "Setting deleted."
+msgstr ""
+
+#: Controller/UserSettingsController.php:309
+msgid "Setting could not be deleted."
+msgstr ""
+
+#: Controller/UserSettingsController.php:322
+msgid "Expecting POST or DELETE request."
+msgstr ""
+
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr "Usuário inválido ou não autorizado."
 
-#: Controller/UsersController.php:54;467;706;725;953
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "Usuário inválido"
 
-#: Controller/UsersController.php:119;613;778
+#: Controller/UsersController.php:154;722;887
 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): "
 
-#: Controller/UsersController.php:146
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr "O perfil foi atualizado"
 
-#: Controller/UsersController.php:150
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
-msgstr "O perfil não foi atualizado. Por favor, tente novamente."
+msgstr "O perfil não pôde ser atualizado. Por favor, tente novamente."
 
-#: Controller/UsersController.php:184
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:193
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:213
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "Senha alterada."
 
-#: Controller/UsersController.php:222
+#: Controller/UsersController.php:299
 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."
+msgstr "A senha não pôde ser atualizada. Certifique-se de que esteja cumprindo os requisitos de tamanho mínimo de senha / complexidade."
 
-#: Controller/UsersController.php:359;377;477
-#: Model/Log.php:320
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:624
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr "O usuário não foi salvo. Organização inválida."
 
-#: Controller/UsersController.php:646
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "O usuário foi salvo."
 
-#: Controller/UsersController.php:655;889
+#: Controller/UsersController.php:764;995
 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:881
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "O usuário foi salvo"
 
-#: Controller/UsersController.php:961
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "Usuário deletado"
 
-#: Controller/UsersController.php:965
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "O usuário não foi excluído"
 
-#: Controller/UsersController.php:1043
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "Nome de usuário ou senha inválidos, tente novamente"
 
-#: Controller/UsersController.php:1130
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr "Até mais"
 
-#: Controller/UsersController.php:1171
+#: Controller/UsersController.php:1273;1297
+msgid "This functionality is only accessible via POST requests."
+msgstr ""
+
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
 msgid "New authkey generated."
 msgstr "Nova chave auth gerada."
 
-#: Controller/UsersController.php:1280
+#: Controller/UsersController.php:1301
+msgid "Job initiated."
+msgstr ""
+
+#: Controller/UsersController.php:1303
+msgid "%s authkeys reset, %s could not be reset."
+msgstr ""
+
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr "Você aceitou os termos e condições de serviços."
 
-#: Controller/UsersController.php:1462
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1467
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1504
+#: Controller/UsersController.php:1587
 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:1506
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr "E-mails enviados."
 
-#: Controller/UsersController.php:1580
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr ""
 
-#: Controller/UsersController.php:1581
-#: View/Elements/global_menu.ctp:151
+#: Controller/UsersController.php:1664
+#: View/Elements/global_menu.ctp:163
 #: 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 ""
+msgstr "Organizações"
 
-#: Controller/UsersController.php:1582
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr ""
 
-#: Controller/UsersController.php:1583
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
-#: View/Elements/eventattribute.ctp:150
+#: View/DecayingModel/decaying_tool_rest_search.ctp:28
+#: View/Elements/eventattribute.ctp:151
 #: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Elements/Feeds/eventattribute.ctp:46
+#: View/Elements/Servers/eventattribute.ctp:46
 #: View/Events/resolved_attributes.ctp:53
-#: View/Events/resolved_misp_format.ctp:66;93;263
+#: View/Events/resolved_misp_format.ctp:66;94;289
 #: View/Events/view.ctp:127
 #: View/Feeds/preview_event.ctp:16
 #: View/Feeds/preview_index.ctp:39
@@ -1730,18 +2239,160 @@ msgstr ""
 msgid "Tags"
 msgstr "Tags"
 
-#: Controller/UsersController.php:1584
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr ""
 
-#: Controller/UsersController.php:1585
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1586
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr ""
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "Sim"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "Não"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr "ID da função não fornecido e nenhuma função padrão existe na instância"
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr ""
@@ -1822,6 +2473,14 @@ msgstr ""
 msgid "No valid data received."
 msgstr ""
 
+#: Controller/Component/ACLComponent.php:634
+msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
+msgstr ""
+
+#: Controller/Component/ACLComponent.php:688
+msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
+msgstr ""
+
 #: Controller/Component/AdminCrudComponent.php:20
 msgid "The %s has been saved."
 msgstr "O %s foi salvo."
@@ -1870,2154 +2529,2967 @@ msgstr "Entrada removida da blacklist"
 msgid "Could not remove the blacklist entry"
 msgstr "Não foi possível remover a entrada da blacklist"
 
-#: Model/AppModel.php:1232
+#: Controller/Component/DeprecationComponent.php:18
+msgid "Use /attributes/restSearch to export RPZ rules."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:19
+msgid "Use /attributes/restSearch to export flat indicator lists."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:22
+msgid "Use MISP modules to import in OpenIOC format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:23
+msgid "Use /events/restSearch to export in CSV format."
+msgstr "Use /events/restSearch para exportar no formato CSV."
+
+#: Controller/Component/DeprecationComponent.php:24
+msgid "Use the REST client to refine your search conditions and export in any of the given formats with much more control."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:25
+msgid "Use /events/restSearch to export hashes."
+msgstr "Use /events/restSearch para exportar hashes."
+
+#: Controller/Component/DeprecationComponent.php:26
+msgid "Use /events/restSearch to export in the various NIDS formats."
+msgstr "Use /events/restSearch para exportar nos vários formatos NIDS."
+
+#: Controller/Component/DeprecationComponent.php:27
+msgid "Use /events/restSearch to export in STIX format."
+msgstr "Use /events/restSearch para exportar no formato STIX."
+
+#: Controller/Component/DeprecationComponent.php:28
+msgid "Use /events/restSearch to export in STIX2 format."
+msgstr "Use /events/restSearch para exportar no formato STIX2."
+
+#: Controller/Component/DeprecationComponent.php:29
+msgid "Use /events/restSearch to export in XML format. It is highly recommended to use JSON whenever possible."
+msgstr "Use /events/restSearch para exportar no formato XML. É altamente recomendado usar JSON sempre que possível."
+
+#: Controller/Component/RateLimitComponent.php:29
+msgid "API searches are not allowed for this user role."
+msgstr "Pesquisas por API não são permitidas para esta função de usuário."
+
+#: Controller/Component/RateLimitComponent.php:41
+msgid "Rate limit exceeded."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:603
+msgid "The action that the user performed"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:609
+msgid "Is the sharing group selectable (active) when chosing distribution"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:614;1356
+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 ""
+
+#: Controller/Component/RestResponseComponent.php:620
+msgid "All organisations contained on the instance will be part of the sharing group"
+msgstr "Todas as organizações contidas na instância farão parte do grupo de compartilhamento"
+
+#: Controller/Component/RestResponseComponent.php:626
+msgid "hard-delete already soft-deleted attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:633
+msgid "Maturity of the event"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:640
+msgid "Anonymise the information regarding the server on which the request was issued"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:646
+msgid "Filter on attribute value"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:652
+msgid "The authorisation key found on the external server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:658
+msgid "The user receive alerts when events are published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:664
+msgid "The email's body"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:670
+msgid "The feed is cached"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:682
+msgid "A valid x509 certificate "
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:688
+msgid "The text contained in the change field"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:694
+msgid "The user will be prompted the change the password"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:700
+msgid "A valid hexadecimal colour `#ffffff`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:711
+msgid "Contact details for the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:717
+msgid "The user receive alerts from `contact reporter` requests"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:734
+msgid "Base64 encoded file contents"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:746
+msgid "The user set date field on the event level. If you are using restSearch, you can use any of the valid time related filters (examples: 7d, timestamps, [14d, 7d] for ranges, etc.)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:781
+msgid "The role is a default role (selected by default)"
+msgstr "A função é uma função padrão (selecionada por padrão)"
+
+#: Controller/Component/RestResponseComponent.php:787
+msgid "Remove file after ingestion"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:793
+msgid "Include deleted elements"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:799
+msgid "Merge attributes (only add new attribute, remove revoked attributes)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:810
+msgid "Disable the user account"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:822
+msgid "Filter on user email"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:828
+msgid "Set the password manually"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:839
+msgid "When uploading malicious samples, set this flag to tell MISP to encrpyt the sample and extract the file hashes. This will create a MISP object with the appropriate attributes."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:850
+msgid "Should the warning list be enforced. Adds `blocked` field for matching attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:863
+msgid "The timestamp at which the event was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:870
+msgid "The timestamp at which the attribute was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:882;1021
+msgid "Quick event description"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:888
+msgid "The tag is exported when synchronising with other instances"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:900
+msgid "Exclude local tags from the export"
+msgstr "Excluir etiquetas locais da exportação"
+
+#: Controller/Component/RestResponseComponent.php:906
+msgid "The organisation have write access to this sharing group (they can add/remove other organisation)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:912
+msgid "An external authorisation is required for this user"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:918
+msgid "A valid external auth key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:931
+msgid "target_event option might be considered"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:943
+msgid "The date from which the event was published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:949
+msgid "A valid GPG key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:955
+msgid "The event contains proposals"
+msgstr "O evento contém propostas"
+
+#: Controller/Component/RestResponseComponent.php:961
+msgid "Headers to be passed with the requests. All separated by `\\n`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:967
+msgid "The tag is hidden (not selectable)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:979
+msgid "Include matching attributes in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:991
+msgid "Include matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:997
+msgid "Include matching eventUuids in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1003
+msgid "Include tags of matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1015
+msgid "Include proposals of matching events in the response"
+msgstr "Incluir propostas de eventos correspondentes na resposta"
+
+#: Controller/Component/RestResponseComponent.php:1028
+msgid "Specify whether the source (url field) is a directory (local) or an geniun url (network)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1034
+msgid "The IP of a login attempt"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1040
+msgid "JSON containing ID, UUID and name"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1046
+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)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1059
+msgid "Limit on the pagination"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1065
+msgid "If the organisation should have access to this instance, make sure that the Local organisation setting is checked. If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1071
+msgid "The lookup will not be visible in the feed correlation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1077
+msgid "Message to be included"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1083
+msgid "Will not return Attributes, shadow attribute and objects"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1089
+msgid "Will only return  id, timestamp, published and uuid"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1096
+msgid "Mock the query"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1120
+msgid "The last time the sharing group was modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1138
+msgid "The news are read"
+msgstr "As notícias estão lidas"
+
+#: Controller/Component/RestResponseComponent.php:1145
+msgid "The unique Signature Identification"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1151
+msgid "Can be either the ORG_ID or the ORG_NAME"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1157
+msgid "Describe the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1163
+msgid "Organisation identifier (name)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1175;1181
+msgid "Globally used uuid of an organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1187
+msgid "The IDS flags will be set to off for this feed"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1194
+msgid "Page number for the pagination"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1200
+msgid "The hardcoded password"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1272
+msgid "The name of the feed provider"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1278
+msgid "The event will be published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1301
+msgid "Allow the download of events and their attribute from the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1307
+msgid "Allow the upload of events and their attribute to the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1313
+msgid "Allow the upload of sightings to the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1319
+msgid "Concise summary for who this sharing group is releasable to"
+msgstr "Resumo conciso de para quem este grupo de compartilhamento é liberado"
+
+#: Controller/Component/RestResponseComponent.php:1337
+msgid "Pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1362
+msgid "The sector of the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1374
+msgid "Will only return the sharing group ID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1387
+msgid "Sharing group ID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1393
+msgid "The source of the Sighting (e.g. honeypot_1)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1405
+msgid "The email's subject"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1411;1417
+msgid "Base64 encoded certificate"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1435
+msgid "A tad ID to attach to created events"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1448
+msgid "The provided ID will be reused as an existing event"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1471
+msgid "Time of the sighting with the form `h:i:s`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1483
+msgid "The title of the log"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1495
+msgid "The date to which the event was published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1501
+msgid "The state of the `to_ids` flag"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1507
+msgid "The type of the attribute"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1535
+msgid "Placeholder containing values to sight"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1548
+msgid "Not supported (warninglist->checkvalues) expect an array"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1554
+msgid "Not supported (removeTag)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1560;1566;1572;1579;1585;1591;1597;1603;1614
+msgid "Not supported"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1771
+msgid "Seen within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m)"
+msgstr ""
+
+#: Controller/Component/ToolboxComponent.php:18;26
+#: Model/Galaxy.php:220;277;287;301
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr ""
 
-#: Model/AppModel.php:1246
-msgid "Issues executing the pre-update test `"
+#: Model/AppModel.php:1480
+msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1246
-msgid "`. The returned error is: "
-msgstr ""
-
-#: Model/AppModel.php:1268;1271
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1269;1282
+#: Model/AppModel.php:1503
+msgid "The executed SQL query was: %s"
+msgstr ""
+
+#: Model/AppModel.php:1505
+msgid "Successfuly executed the SQL query for %s"
+msgstr ""
+
+#: Model/AppModel.php:1516;1580
+msgid "Issues executing the SQL query for %s"
+msgstr ""
+
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1281;1284
-msgid "Issues executing the SQL query for "
-msgstr ""
-
-#: Model/AppModel.php:1282
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1284
-msgid ". The returned error is: "
+#: Model/AppModel.php:1519
+msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1306
+#: Model/AppModel.php:1528
+msgid "However, as this error is whitelisted, the update went through."
+msgstr ""
+
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/Attribute.php:59
+#: Model/AppModel.php:1550
+msgid "Failed to add index"
+msgstr ""
+
+#: Model/AppModel.php:1552
+msgid "The returned error is:"
+msgstr ""
+
+#: Model/AppModel.php:1581
+msgid "Database updates stopped as some errors occured and the stop flag is enabled."
+msgstr ""
+
+#: Model/AppModel.php:1740
+msgid "Invalid JSON."
+msgstr "JSON inválido."
+
+#: Model/AppModel.php:1833;1891
+msgid "Issues executing run_updates"
+msgstr ""
+
+#: Model/AppModel.php:1834
+msgid "Database updates are locked. Worker not spawned"
+msgstr ""
+
+#: Model/AppModel.php:1838;1896;1931
+msgid "Update done"
+msgstr ""
+
+#: Model/AppModel.php:1892
+msgid "Updates are locked. Stopping worker gracefully"
+msgstr ""
+
+#: Model/AppModel.php:1911
+msgid "Running update %s"
+msgstr ""
+
+#: Model/AppModel.php:1937
+msgid "Update done in another worker. Gracefuly stopping."
+msgstr ""
+
+#: Model/Attribute.php:63
 #: View/Events/filter_event_index.ctp:46;182
 msgid "Your organisation only"
 msgstr ""
 
-#: Model/Attribute.php:60
+#: Model/Attribute.php:64
 #: View/Events/filter_event_index.ctp:46;183
 msgid "This community only"
 msgstr ""
 
-#: Model/Attribute.php:61
+#: Model/Attribute.php:65
 #: View/Events/filter_event_index.ctp:46;184
 #: View/Pages/doc/using_the_system.ctp:51
 msgid "Connected communities"
 msgstr ""
 
-#: Model/Attribute.php:62
+#: Model/Attribute.php:66
 #: View/Events/filter_event_index.ctp:46;185
 #: View/Pages/doc/using_the_system.ctp:58
 msgid "All communities"
 msgstr ""
 
-#: Model/Attribute.php:63
+#: Model/Attribute.php:67
 #: View/Elements/view_event_distribution_graph.ctp:24
 msgid "Sharing group"
 msgstr ""
 
-#: Model/Attribute.php:64
+#: Model/Attribute.php:68
 msgid "Inherit event"
 msgstr ""
 
-#: Model/Attribute.php:69
+#: Model/Attribute.php:76
 msgid "Reference used by the publishing party (e.g. ticket number)"
 msgstr ""
 
-#: Model/Attribute.php:73
+#: Model/Attribute.php:80
 msgid "Internal Attack Targeting and Compromise Information"
 msgstr ""
 
-#: Model/Attribute.php:74
+#: Model/Attribute.php:81
 msgid "Targeting information to include recipient email, infected machines, department, and or locations."
 msgstr ""
 
-#: Model/Attribute.php:78
+#: Model/Attribute.php:85
 msgid "All the info about how the malware is detected by the antivirus products"
 msgstr ""
 
-#: Model/Attribute.php:79
+#: Model/Attribute.php:86
 msgid "List of anti-virus vendors detecting the malware or information on detection performance (e.g. 13/43 or 67%). Attachment with list of detection or link to VirusTotal could be placed here as well."
 msgstr ""
 
-#: Model/Attribute.php:83
+#: Model/Attribute.php:90
 msgid "Information about how the malware is delivered"
 msgstr ""
 
-#: Model/Attribute.php:84
+#: Model/Attribute.php:91
 msgid "Information about the way the malware payload is initially delivered, for example information about the email or web-site, vulnerability used, originating IP etc. Malware sample itself should be attached here."
 msgstr ""
 
-#: Model/Attribute.php:88
+#: Model/Attribute.php:95
 msgid "Any artifact (files, registry keys etc.) dropped by the malware or other modifications to the system"
 msgstr ""
 
-#: Model/Attribute.php:92
+#: Model/Attribute.php:99
 msgid "Info on where the malware gets installed in the system"
 msgstr ""
 
-#: Model/Attribute.php:93
+#: Model/Attribute.php:100
 msgid "Location where the payload was placed in the system and the way it was installed. For example, a filename|md5 type attribute can be added here like this: c:\\windows\\system32\\malicious.exe|41d8cd98f00b204e9800998ecf8427e."
 msgstr ""
 
-#: Model/Attribute.php:97
+#: Model/Attribute.php:104
 msgid "Mechanisms used by the malware to start at boot"
 msgstr ""
 
-#: Model/Attribute.php:98
+#: Model/Attribute.php:105
 msgid "Mechanisms used by the malware to start at boot. This could be a registry key, legitimate driver modification, LNK file in startup"
 msgstr ""
 
-#: Model/Attribute.php:102
+#: Model/Attribute.php:109
 msgid "Information about network traffic generated by the malware"
 msgstr ""
 
-#: Model/Attribute.php:106
+#: Model/Attribute.php:113
 msgid "Information about the final payload(s)"
 msgstr ""
 
-#: Model/Attribute.php:107
+#: Model/Attribute.php:114
 msgid "Information about the final payload(s). Can contain a function of the payload, e.g. keylogger, RAT, or a name if identified, such as Poison Ivy."
 msgstr ""
 
-#: Model/Attribute.php:111
+#: Model/Attribute.php:118
 msgid "Identification of the group, organisation, or country behind the attack"
 msgstr ""
 
-#: Model/Attribute.php:115
+#: Model/Attribute.php:122
 msgid "Any other result from additional analysis of the malware like tools output"
 msgstr ""
 
-#: Model/Attribute.php:116
+#: Model/Attribute.php:123
 msgid "Any other result from additional analysis of the malware like tools output Examples: pdf-parser output, automated sandbox analysis, reverse engineering report."
 msgstr ""
 
-#: Model/Attribute.php:120
+#: Model/Attribute.php:127
 msgid "Financial Fraud indicators"
 msgstr ""
 
-#: Model/Attribute.php:121
+#: Model/Attribute.php:128
 msgid "Financial Fraud indicators, for example: IBAN Numbers, BIC codes, Credit card numbers, etc."
 msgstr ""
 
-#: Model/Attribute.php:125
+#: Model/Attribute.php:132
 msgid "Tools supporting analysis or detection of the event"
 msgstr ""
 
-#: Model/Attribute.php:129
+#: Model/Attribute.php:136
 msgid "Social networks and platforms"
 msgstr ""
 
-#: Model/Attribute.php:134
+#: Model/Attribute.php:141
 msgid "A human being - natural person"
 msgstr ""
 
-#: Model/Attribute.php:138
+#: Model/Attribute.php:145
 msgid "Attributes that are not part of any other category or are meant to be used as a component in MISP objects in the future"
 msgstr ""
 
-#: Model/Attribute.php:144;228
+#: Model/Attribute.php:154;243
 msgid "A checksum in md5 format"
-msgstr ""
+msgstr "Um checksum no formato md5"
 
-#: Model/Attribute.php:144
+#: Model/Attribute.php:154
 msgid "You are encouraged to use filename|md5 instead. A checksum in md5 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:155
 msgid "A checksum in sha1 format"
-msgstr ""
+msgstr "Um checksum no formato sha1"
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:155
 msgid "You are encouraged to use filename|sha1 instead. A checksum in sha1 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:146
+#: Model/Attribute.php:156
 msgid "A checksum in sha256 format"
-msgstr ""
+msgstr "Um checksum no formato sha256"
 
-#: Model/Attribute.php:146
+#: Model/Attribute.php:156
 msgid "You are encouraged to use filename|sha256 instead. A checksum in sha256 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:147
+#: Model/Attribute.php:157
 #: View/Elements/healthElements/files.ctp:29
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: Model/Attribute.php:148
+#: Model/Attribute.php:158
 msgid "Microsoft Program database (PDB) path information"
 msgstr ""
 
-#: Model/Attribute.php:149
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:149
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:150
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:150
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:151
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:151
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:152
+#: Model/Attribute.php:162
 msgid "A source IP address of the attacker"
-msgstr ""
+msgstr "Um endereço IP de origem do atacante"
 
-#: Model/Attribute.php:153
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server"
-msgstr ""
+msgstr "Um endereço IP de destino do atacante ou servidor C&C"
 
-#: Model/Attribute.php:153
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server. Also set the IDS flag on when this IP is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker. Also set the IDS flag on when this hostname is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware. Use this instead of hostname when the upper domain is important or can be used to create links between events."
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:157
+#: Model/Attribute.php:167
 msgid "The email address used to send the malware."
 msgstr ""
 
-#: Model/Attribute.php:158
-msgid "A recipient email address"
-msgstr ""
-
-#: Model/Attribute.php:158
-msgid "A recipient email address that is not related to your constituency."
-msgstr ""
-
-#: Model/Attribute.php:159
-msgid "The subject of the email"
-msgstr ""
-
-#: Model/Attribute.php:160
-msgid "File name of the email attachment."
-msgstr ""
-
-#: Model/Attribute.php:161
-msgid "Email body"
-msgstr ""
-
-#: Model/Attribute.php:162
-msgid "A floating point value."
-msgstr ""
-
-#: Model/Attribute.php:163
-msgid "url"
-msgstr ""
-
-#: Model/Attribute.php:164
-msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
-msgstr ""
-
-#: Model/Attribute.php:165
-msgid "The user-agent used by the malware in the HTTP request."
-msgstr ""
-
-#: Model/Attribute.php:166
-msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
-msgstr ""
-
-#: Model/Attribute.php:167
-msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
-msgstr ""
-
 #: Model/Attribute.php:168
-msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
+msgid "eduPersonPrincipalName - eppn - the NetId of the person for the purposes of inter-institutional authentication. Should be stored in the form of user@univ.edu, where univ.edu is the name of the local security domain."
 msgstr ""
 
 #: Model/Attribute.php:169
-msgid "Registry key or value"
+msgid "A recipient email address"
+msgstr ""
+
+#: Model/Attribute.php:169
+msgid "A recipient email address that is not related to your constituency."
 msgstr ""
 
 #: Model/Attribute.php:170
-msgid "Registry value + data separated by |"
+msgid "The subject of the email"
 msgstr ""
 
 #: Model/Attribute.php:171
-msgid "Autonomous system"
+msgid "File name of the email attachment."
 msgstr ""
 
 #: Model/Attribute.php:172
-msgid "An IDS rule in Snort rule-format"
-msgstr ""
-
-#: Model/Attribute.php:172
-msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
-msgstr ""
+msgid "Email body"
+msgstr "Corpo do e-mail"
 
 #: Model/Attribute.php:173
-msgid "An NIDS rule in the Bro rule-format"
-msgstr ""
-
-#: Model/Attribute.php:173
-msgid "An NIDS rule in the Bro rule-format."
-msgstr ""
+msgid "A floating point value."
+msgstr "Um valor de ponto flutuante."
 
 #: Model/Attribute.php:174
-msgid "An NIDS rule in the Zeek rule-format"
-msgstr ""
-
-#: Model/Attribute.php:174
-msgid "An NIDS rule in the Zeek rule-format."
-msgstr ""
+msgid "url"
+msgstr "url"
 
 #: Model/Attribute.php:175
-msgid "Pattern in file that identifies the malware"
-msgstr ""
+msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
+msgstr "Método HTTP usado pelo malware (por exemplo, POST, GET, ...)."
 
 #: Model/Attribute.php:176
-msgid "Pattern in network traffic that identifies the malware"
+msgid "The user-agent used by the malware in the HTTP request."
 msgstr ""
 
 #: Model/Attribute.php:177
-msgid "Pattern in memory dump that identifies the malware"
+msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
 msgstr ""
 
 #: Model/Attribute.php:178
-msgid "Yara signature"
+msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
 #: Model/Attribute.php:179
-msgid "STIX 2 pattern"
+msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
 #: Model/Attribute.php:180
-msgid "Sigma - Generic Signature Format for SIEM Systems"
+msgid "Registry key or value"
 msgstr ""
 
 #: Model/Attribute.php:181
-msgid "GENE - Go Evtx sigNature Engine"
+msgid "Registry value + data separated by |"
 msgstr ""
 
 #: Model/Attribute.php:182
-msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
+msgid "Autonomous system"
 msgstr ""
 
 #: Model/Attribute.php:183
-msgid "Identity card number"
+msgid "An IDS rule in Snort rule-format"
+msgstr ""
+
+#: Model/Attribute.php:183
+msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
 msgstr ""
 
 #: Model/Attribute.php:184
-msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
+msgid "An NIDS rule in the Bro rule-format"
+msgstr ""
+
+#: Model/Attribute.php:184
+msgid "An NIDS rule in the Bro rule-format."
 msgstr ""
 
 #: Model/Attribute.php:185
-msgid "A reference to the vulnerability used in the exploit"
+msgid "An NIDS rule in the Zeek rule-format"
+msgstr ""
+
+#: Model/Attribute.php:185
+msgid "An NIDS rule in the Zeek rule-format."
 msgstr ""
 
 #: Model/Attribute.php:186
-msgid "Attachment with external information"
-msgstr ""
-
-#: Model/Attribute.php:186;187
-msgid "Please upload files using the <em>Upload Attachment</em> button."
+msgid "a community ID flow hashing algorithm to map multiple traffic monitors into common flow id"
 msgstr ""
 
 #: Model/Attribute.php:187
-msgid "Attachment containing encrypted malware sample"
+msgid "Pattern in file that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:188
-msgid "Link to an external information"
+msgid "Pattern in network traffic that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:189
-msgid "Comment or description in a human language"
-msgstr ""
-
-#: Model/Attribute.php:189
-msgid "Comment or description in a human language.  This will not be correlated with other attributes"
+msgid "Pattern in memory dump that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:190
-msgid "Name, ID or a reference"
-msgstr ""
+msgid "Yara signature"
+msgstr "Assinatura Yara"
 
 #: Model/Attribute.php:191
-msgid "A value in hexadecimal format"
+msgid "STIX 2 pattern"
 msgstr ""
 
 #: Model/Attribute.php:192
-msgid "Other attribute"
+msgid "Sigma - Generic Signature Format for SIEM Systems"
 msgstr ""
 
 #: Model/Attribute.php:193
-msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
+msgid "GENE - Go Evtx sigNature Engine"
 msgstr ""
 
 #: Model/Attribute.php:194
-msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
+msgid "Kusto query - Kusto from Microsoft Azure is a service for storing and running interactive analytics over Big Data."
 msgstr ""
 
 #: Model/Attribute.php:195
-msgid "Attack Targets Username(s)"
+msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
 msgstr ""
 
 #: Model/Attribute.php:196
-msgid "Attack Targets Email(s)"
+msgid "Identity card number"
 msgstr ""
 
 #: Model/Attribute.php:197
-msgid "Attack Targets Machine Name(s)"
+msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
 msgstr ""
 
 #: Model/Attribute.php:198
-msgid "Attack Targets Department or Organization(s)"
+msgid "A reference to the vulnerability used in the exploit"
 msgstr ""
 
 #: Model/Attribute.php:199
-msgid "Attack Targets Physical Location(s)"
+msgid "A reference to the weakness used in the exploit"
 msgstr ""
 
 #: Model/Attribute.php:200
-msgid "External Target Organizations Affected by this Attack"
+msgid "Attachment with external information"
+msgstr ""
+
+#: Model/Attribute.php:200;201
+msgid "Please upload files using the <em>Upload Attachment</em> button."
 msgstr ""
 
 #: Model/Attribute.php:201
-msgid "Bitcoin Address"
+msgid "Attachment containing encrypted malware sample"
 msgstr ""
 
 #: Model/Attribute.php:202
-msgid "Monero Address"
+msgid "Link to an external information"
 msgstr ""
 
 #: Model/Attribute.php:203
-msgid "International Bank Account Number"
+msgid "Comment or description in a human language"
+msgstr ""
+
+#: Model/Attribute.php:203
+msgid "Comment or description in a human language.  This will not be correlated with other attributes"
 msgstr ""
 
 #: Model/Attribute.php:204
-msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
+msgid "Name, ID or a reference"
 msgstr ""
 
 #: Model/Attribute.php:205
-msgid "Bank account number without any routing number"
+msgid "A value in hexadecimal format"
 msgstr ""
 
 #: Model/Attribute.php:206
-msgid "ABA routing transit number"
+msgid "Other attribute"
 msgstr ""
 
 #: Model/Attribute.php:207
-msgid "Bank Identification Number"
+msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
 msgstr ""
 
 #: Model/Attribute.php:208
-msgid "Credit-Card Number"
+msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
 msgstr ""
 
 #: Model/Attribute.php:209
-msgid "Premium-Rate Telephone Number"
+msgid "Attack Targets Username(s)"
 msgstr ""
 
 #: Model/Attribute.php:210
-msgid "Telephone Number"
+msgid "Attack Targets Email(s)"
 msgstr ""
 
 #: Model/Attribute.php:211
-msgid "A string identifying the threat actor"
+msgid "Attack Targets Machine Name(s)"
 msgstr ""
 
 #: Model/Attribute.php:212
-msgid "Associated campaign name"
+msgid "Attack Targets Department or Organization(s)"
 msgstr ""
 
 #: Model/Attribute.php:213
-msgid "Associated campaign ID"
+msgid "Attack Targets Physical Location(s)"
+msgstr ""
+
+#: Model/Attribute.php:214
+msgid "External Target Organizations Affected by this Attack"
 msgstr ""
 
 #: Model/Attribute.php:215
-msgid "Uniform Resource Identifier"
+msgid "Bitcoin Address"
 msgstr ""
 
 #: Model/Attribute.php:216
-msgid "Authenticode executable signature hash"
-msgstr ""
-
-#: Model/Attribute.php:216
-msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:217;229
-msgid "A checksum in ssdeep format"
+msgid "Dash Address"
 msgstr ""
 
 #: Model/Attribute.php:217
-msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:218;230
-msgid "Import hash - a hash created based on the imports in the sample."
+msgid "Monero Address"
 msgstr ""
 
 #: Model/Attribute.php:218
-msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
+msgid "International Bank Account Number"
 msgstr ""
 
 #: Model/Attribute.php:219
-msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
+msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
 msgstr ""
 
 #: Model/Attribute.php:220
-msgid "A fuzzy hash of import table of Portable Executable format"
-msgstr ""
-
-#: Model/Attribute.php:220
-msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
+msgid "Bank account number without any routing number"
 msgstr ""
 
 #: Model/Attribute.php:221
-msgid "A checksum in sha-224 format"
-msgstr ""
-
-#: Model/Attribute.php:221
-msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
+msgid "ABA routing transit number"
 msgstr ""
 
 #: Model/Attribute.php:222
-msgid "A checksum in sha-384 format"
-msgstr ""
-
-#: Model/Attribute.php:222
-msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
+msgid "Bank Identification Number"
 msgstr ""
 
 #: Model/Attribute.php:223
-msgid "A checksum in sha-512 format"
-msgstr ""
-
-#: Model/Attribute.php:223
-msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
+msgid "Credit-Card Number"
 msgstr ""
 
 #: Model/Attribute.php:224
-msgid "A checksum in the sha-512/224 format"
-msgstr ""
-
-#: Model/Attribute.php:224
-msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
+msgid "Premium-Rate Telephone Number"
 msgstr ""
 
 #: Model/Attribute.php:225
-msgid "A checksum in the sha-512/256 format"
-msgstr ""
-
-#: Model/Attribute.php:225
-msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
+msgid "Telephone Number"
 msgstr ""
 
 #: Model/Attribute.php:226
-msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
-msgstr ""
-
-#: Model/Attribute.php:226
-msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
+msgid "A string identifying the threat actor"
 msgstr ""
 
 #: Model/Attribute.php:227
-msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
+msgid "Associated campaign name"
+msgstr ""
+
+#: Model/Attribute.php:228
+msgid "Associated campaign ID"
+msgstr ""
+
+#: Model/Attribute.php:230
+msgid "Uniform Resource Identifier"
 msgstr ""
 
 #: Model/Attribute.php:231
-msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
+msgid "Authenticode executable signature hash"
+msgstr ""
+
+#: Model/Attribute.php:231
+msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:232;244
+msgid "A checksum in ssdeep format"
 msgstr ""
 
 #: Model/Attribute.php:232
-msgid "A filename and a PEhash separated by a |"
+msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:233;245
+msgid "Import hash - a hash created based on the imports in the sample."
 msgstr ""
 
 #: Model/Attribute.php:233
-msgid "A filename and a sha-224 hash separated by a |"
+msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:234
-msgid "A filename and a sha-384 hash separated by a |"
+msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
 msgstr ""
 
 #: Model/Attribute.php:235
-msgid "A filename and a sha-512 hash separated by a |"
+msgid "A fuzzy hash of import table of Portable Executable format"
+msgstr ""
+
+#: Model/Attribute.php:235
+msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:236
-msgid "A filename and a sha-512/224 hash separated by a |"
+msgid "A checksum in sha-224 format"
+msgstr ""
+
+#: Model/Attribute.php:236
+msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:237
-msgid "A filename and a sha-512/256 hash separated by a |"
+msgid "A checksum in sha-384 format"
+msgstr ""
+
+#: Model/Attribute.php:237
+msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:238
-msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
+msgid "A checksum in sha-512 format"
+msgstr ""
+
+#: Model/Attribute.php:238
+msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:239
-msgid "A scheduled task in windows"
+msgid "A checksum in the sha-512/224 format"
+msgstr ""
+
+#: Model/Attribute.php:239
+msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:240
-msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
+msgid "A checksum in the sha-512/256 format"
+msgstr ""
+
+#: Model/Attribute.php:240
+msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:241
-msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
+msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
+msgstr ""
+
+#: Model/Attribute.php:241
+msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:242
-msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:243
-msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:244
-msgid "The name of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:245
-msgid "The org of a domain's registrant, obtained from the WHOIS information."
+msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
 msgstr ""
 
 #: Model/Attribute.php:246
-msgid "The registrar of the domain, obtained from the WHOIS information."
+msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
 msgstr ""
 
 #: Model/Attribute.php:247
-msgid "The date of domain's creation, obtained from the WHOIS information."
+msgid "A filename and a PEhash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:248
+msgid "A filename and a sha-224 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:249
+msgid "A filename and a sha-384 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:250
+msgid "A filename and a sha-512 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:251
+msgid "A filename and a sha-512/224 hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:252
-msgid "X509 fingerprint in SHA-1 format"
+msgid "A filename and a sha-512/256 hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:253
-msgid "X509 fingerprint in MD5 format"
+msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:254
-msgid "X509 fingerprint in SHA-256 format"
+msgid "A scheduled task in windows"
 msgstr ""
 
 #: Model/Attribute.php:255
-msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
+msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
 msgstr ""
 
 #: Model/Attribute.php:256
-msgid "Size expressed in bytes"
+msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
 msgstr ""
 
 #: Model/Attribute.php:257
-msgid "An integer counter, generally to be used in objects"
+msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:258
-msgid "Datetime in the ISO 8601 format"
+msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:259
-msgid "Common platform enumeration"
+msgid "The name of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:260
-msgid "Port number"
+msgid "The org of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:261
-msgid "IP destination and port number seperated by a |"
+msgid "The registrar of the domain, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:262
-msgid "IP source and port number seperated by a |"
-msgstr ""
-
-#: Model/Attribute.php:263
-msgid "Hostname and port number seperated by a |"
-msgstr ""
-
-#: Model/Attribute.php:264
-msgid "Mac address"
-msgstr ""
-
-#: Model/Attribute.php:265
-msgid "Mac EUI-64 address"
+msgid "The date of domain's creation, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:267
-msgid "Email destination display name"
+msgid "X509 fingerprint in SHA-1 format"
 msgstr ""
 
 #: Model/Attribute.php:268
-msgid "Email source display name"
+msgid "X509 fingerprint in MD5 format"
 msgstr ""
 
 #: Model/Attribute.php:269
-msgid "Email header"
+msgid "X509 fingerprint in SHA-256 format"
 msgstr ""
 
 #: Model/Attribute.php:270
-msgid "Email reply to header"
+msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
 msgstr ""
 
 #: Model/Attribute.php:271
-msgid "Email x-mailer header"
+msgid "Size expressed in bytes"
 msgstr ""
 
 #: Model/Attribute.php:272
-msgid "The email mime boundary separating parts in a multipart email"
+msgid "An integer counter, generally to be used in objects"
 msgstr ""
 
 #: Model/Attribute.php:273
-msgid "The email thread index header"
+msgid "Datetime in the ISO 8601 format"
 msgstr ""
 
 #: Model/Attribute.php:274
-msgid "The email message ID"
+msgid "Common platform enumeration"
 msgstr ""
 
 #: Model/Attribute.php:275
-msgid "A github user name"
+msgid "Port number"
 msgstr ""
 
 #: Model/Attribute.php:276
-msgid "A github repository"
+msgid "IP destination and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:277
-msgid "A github organisation"
+msgid "IP source and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:278
-msgid "Jabber ID"
+msgid "Hostname and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:279
-msgid "Twitter ID"
+msgid "Mac address"
 msgstr ""
 
 #: Model/Attribute.php:280
-msgid "First name of a natural person"
-msgstr ""
-
-#: Model/Attribute.php:281
-msgid "Middle name of a natural person"
+msgid "Mac EUI-64 address"
 msgstr ""
 
 #: Model/Attribute.php:282
-msgid "Last name of a natural person"
+msgid "Email destination display name"
 msgstr ""
 
 #: Model/Attribute.php:283
-msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
+msgid "Email source display name"
 msgstr ""
 
 #: Model/Attribute.php:284
-msgid "Place of birth of a natural person"
+msgid "Email header"
 msgstr ""
 
 #: Model/Attribute.php:285
-msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
+msgid "Email reply to header"
 msgstr ""
 
 #: Model/Attribute.php:286
-msgid "The passport number of a natural person"
+msgid "Email x-mailer header"
 msgstr ""
 
 #: Model/Attribute.php:287
-msgid "The country in which the passport was issued"
+msgid "The email mime boundary separating parts in a multipart email"
 msgstr ""
 
 #: Model/Attribute.php:288
-msgid "The expiration date of a passport"
+msgid "The email thread index header"
 msgstr ""
 
 #: Model/Attribute.php:289
-msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
+msgid "The email message ID"
 msgstr ""
 
 #: Model/Attribute.php:290
-msgid "The nationality of a natural person"
+msgid "A github user name"
 msgstr ""
 
 #: Model/Attribute.php:291
-msgid "Visa number"
+msgid "A github repository"
 msgstr ""
 
 #: Model/Attribute.php:292
-msgid "The date on which the visa was issued"
+msgid "A github organisation"
 msgstr ""
 
 #: Model/Attribute.php:293
-msgid "The primary residence of a natural person"
+msgid "Jabber ID"
 msgstr ""
 
 #: Model/Attribute.php:294
-msgid "The country of residence of a natural person"
+msgid "Twitter ID"
 msgstr ""
 
 #: Model/Attribute.php:295
-msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
+msgid "First name of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:296
-msgid "The frequent flyer number of a passenger"
+msgid "Middle name of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:297
+msgid "Last name of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:298
+msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
 msgstr ""
 
 #: Model/Attribute.php:299
-msgid "Travel details"
+msgid "Place of birth of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:300
-msgid "Payment details"
+msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
 msgstr ""
 
 #: Model/Attribute.php:301
-msgid "The orignal port of embarkation"
+msgid "The passport number of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:302
-msgid "The port of clearance"
+msgid "The country in which the passport was issued"
 msgstr ""
 
 #: Model/Attribute.php:303
-msgid "A Port where the passenger is transiting to"
+msgid "The expiration date of a passport"
 msgstr ""
 
 #: Model/Attribute.php:304
-msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
+msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
 msgstr ""
 
 #: Model/Attribute.php:305
-msgid "The application id of a mobile application"
+msgid "The nationality of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:306
-msgid "Cortex analysis result"
+msgid "Visa number"
 msgstr ""
 
 #: Model/Attribute.php:307
+msgid "The date on which the visa was issued"
+msgstr ""
+
+#: Model/Attribute.php:308
+msgid "The primary residence of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:309
+msgid "The country of residence of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:310
+msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
+msgstr ""
+
+#: Model/Attribute.php:311
+msgid "The frequent flyer number of a passenger"
+msgstr ""
+
+#: Model/Attribute.php:314
+msgid "Travel details"
+msgstr ""
+
+#: Model/Attribute.php:315
+msgid "Payment details"
+msgstr ""
+
+#: Model/Attribute.php:316
+msgid "The orignal port of embarkation"
+msgstr ""
+
+#: Model/Attribute.php:317
+msgid "The port of clearance"
+msgstr ""
+
+#: Model/Attribute.php:318
+msgid "A Port where the passenger is transiting to"
+msgstr ""
+
+#: Model/Attribute.php:319
+msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
+msgstr ""
+
+#: Model/Attribute.php:320
+msgid "The application id of a mobile application"
+msgstr ""
+
+#: Model/Attribute.php:321
+msgid "Chrome extension id"
+msgstr ""
+
+#: Model/Attribute.php:322
+msgid "Cortex analysis result"
+msgstr ""
+
+#: Model/Attribute.php:323
 msgid "Boolean value - to be used in objects"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship."
 msgstr ""
 
-#: Model/Attribute.php:603
+#: Model/Attribute.php:644
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:728
+#: Model/Attribute.php:791
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:862
+#: Model/Attribute.php:935
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:987
+#: Model/Attribute.php:1074
 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:994
+#: Model/Attribute.php:1081
 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:1001
+#: Model/Attribute.php:1088
 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:1012
+#: Model/Attribute.php:1099
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:1023
+#: Model/Attribute.php:1110
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:1030
+#: Model/Attribute.php:1117
 msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
 msgstr ""
 
-#: Model/Attribute.php:1045
+#: Model/Attribute.php:1132
 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:1063
+#: Model/Attribute.php:1150
 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:1068
+#: Model/Attribute.php:1155
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1079
+#: Model/Attribute.php:1166
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr ""
 
-#: Model/Attribute.php:1087
+#: Model/Attribute.php:1174
 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:1098
+#: Model/Attribute.php:1185
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1105;1156
+#: Model/Attribute.php:1192;1243
 msgid "IP address has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1110
+#: Model/Attribute.php:1197
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr ""
 
-#: Model/Attribute.php:1139
+#: Model/Attribute.php:1226
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1159
+#: Model/Attribute.php:1246
 msgid "Domain name has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1172
+#: Model/Attribute.php:1260
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1180
+#: Model/Attribute.php:1268
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr ""
 
-#: Model/Attribute.php:1191
+#: Model/Attribute.php:1276
+msgid "Invalid format. Expected: CWE-x..."
+msgstr ""
+
+#: Model/Attribute.php:1287
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1306
+#: Model/Attribute.php:1405
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr ""
 
-#: Model/Attribute.php:1312
+#: Model/Attribute.php:1411
 msgid "The value has to be a number greater or equal 0."
 msgstr ""
 
-#: Model/Attribute.php:1319
+#: Model/Attribute.php:1418
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:2065;2133
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2757
+#: Model/Attribute.php:2301
+msgid "Invalid hash type."
+msgstr "Hash Inválida."
+
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr ""
 
-#: Model/Attribute.php:3233
+#: Model/Attribute.php:3559
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/Attribute.php:3921;3928;3932
-msgid "Attribute not found or not authorised."
-msgstr "Atributo não encontrado ou não autorizado."
-
-#: Model/Event.php:378
-msgid "Click this to download all events and attributes that you have access to in MISP JSON format."
+#: Model/Community.php:26;67
+msgid "Default community list not found."
 msgstr ""
 
-#: Model/Event.php:386
+#: Model/Community.php:30;71
+msgid "Default community list empty."
+msgstr ""
+
+#: Model/Community.php:35;76
+msgid "Default community list not in the expected format."
+msgstr ""
+
+#: Model/Community.php:93
+msgid "Community not found."
+msgstr ""
+
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
+#: Model/DecayingModel.php:162
+msgid "Models could not be loaded or default decaying models folder is empty"
+msgstr ""
+
+#: Model/DecayingModel.php:351
+msgid "No tags nor predicates with `numerical_value`"
+msgstr ""
+
+#: Model/DecayingModel.php:358
+msgid "No predicate"
+msgstr ""
+
+#: Model/DecayingModel.php:437
+msgid "The class for `%s` was not found or not loaded correctly"
+msgstr ""
+
+#: Model/Event.php:390
+msgid "Click this to download all events and attributes that you have access to in MISP JSON format."
+msgstr "Clique aqui para baixar todos os eventos e atributos que você tem acesso no formato JSON do MISP."
+
+#: Model/Event.php:398
 msgid "Click this to download all events and attributes that you have access to in MISP XML format."
 msgstr ""
 
-#: Model/Event.php:394
+#: Model/Event.php:406
 #: View/Events/export_alternate.ctp:19
 msgid "Click this to download all attributes that are indicators and that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:402
+#: Model/Event.php:414
 #: View/Events/export_alternate.ctp:26
 msgid "Click this to download all attributes that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:410
+#: Model/Event.php:422
 msgid "Click this to download all network related attributes that you have access to under the Suricata rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:418
+#: Model/Event.php:430
 msgid "Click this to download all network related attributes that you have access to under the Snort rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:426
+#: Model/Event.php:438
 msgid "Click this to download all network related attributes that you have access to under the Bro rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:434
+#: Model/Event.php:446
 msgid "Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to."
-msgstr ""
+msgstr "Clique aqui para baixar um documento STIX contendo a versão STIX de todos os eventos e atributos que você tem acesso."
 
-#: Model/Event.php:442
+#: Model/Event.php:454
 msgid "Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
-msgstr ""
+msgstr "Clique aqui para baixar um documento STIX2 contendo a versão STIX2 de todos os eventos e atributos que você tem acesso."
 
-#: Model/Event.php:450
+#: Model/Event.php:462
 #: 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 ""
 
-#: Model/Event.php:458
+#: Model/Event.php:470
 msgid "Click on one of the buttons below to download all the attributes with the matching type. This list can be used to feed forensic software when searching for susipicious files. Only published events and attributes marked as IDS Signature are exported."
 msgstr ""
 
-#: Model/Event.php:466
+#: Model/Event.php:478
 msgid "Click this to download Yara rules generated from all relevant attributes."
-msgstr ""
+msgstr "Clique aqui para baixar regras Yara geradas a partir de todos os atributos relevantes."
 
-#: Model/Event.php:474
+#: Model/Event.php:486
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
-msgstr ""
+msgstr "Clique aqui para baixar regras Yara geradas a partir de todos os atributos relevantes. As regras são retornadas em um formato JSON com informações sobre a origem (gerada ou analisada) e validade."
 
-#: Model/Event.php:5774
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr "Problemas ao carregar o arquivo stix. "
 
-#: Model/Event.php:5776
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr "Problemas com a biblioteca maec. "
 
-#: Model/Event.php:5778
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "Problemas ao executar o script ou entrada inválida. "
 
-#: Model/Event.php:5781
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr "Por favor, contate o administrador para "
 
-#: Model/Event.php:5783
+#: Model/Event.php:5808
 msgid "Please "
 msgstr "Por favor "
 
-#: Model/Event.php:5785
+#: Model/Event.php:5810
 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:5817
+#: Model/Event.php:5842
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:5826
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr "%s não definido"
 
-#: Model/Event.php:6068
+#: Model/Event.php:6100
 msgid "Could not add tags."
-msgstr ""
+msgstr "Não foi possível adicionar etiquetas."
 
-#: Model/Event.php:6538
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:1545;1589
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1559
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Galaxy.php:219;276;286;300
-msgid "Invalid %s."
+#: Model/Feed.php:1687
+msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Galaxy.php:416
+#: Model/Feed.php:1690
+msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
+msgstr ""
+
+#: Model/Feed.php:1695
+msgid "Invalid user id."
+msgstr ""
+
+#: Model/Feed.php:1715
+msgid "Events related to feed %s purged."
+msgstr ""
+
+#: Model/Galaxy.php:421
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:808
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
 #: Model/Server.php:123
-msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
+msgid "Server unreachable"
 msgstr ""
 
 #: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
+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:151
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:134
+#: Model/Server.php:163
 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:135
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:144
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:145
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:154
+#: Model/Server.php:183
 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:156
+#: Model/Server.php:185
 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:162
+#: Model/Server.php:191
 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:170
+#: Model/Server.php:199
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:178
+#: Model/Server.php:207
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:188
-msgid "Enable some performance heavy correlations (currently CIDR correlation)"
-msgstr ""
-
-#: Model/Server.php:197
-msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
-msgstr ""
-
-#: Model/Server.php:206
-msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
-msgstr ""
-
 #: Model/Server.php:217
-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."
+msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
 #: Model/Server.php:226
+msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
+msgstr ""
+
+#: Model/Server.php:235
+msgid "Enable some performance heavy correlations (currently CIDR correlation)"
+msgstr ""
+
+#: Model/Server.php:244
+msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
+msgstr ""
+
+#: Model/Server.php:253
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:264
+msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:274
+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:283
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:234
+#: Model/Server.php:291
 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:243
+#: Model/Server.php:300
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:245
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:251;259;286;310;318;326;334;391;439;447;514
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:267
+#: Model/Server.php:324
 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:277
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr ""
 
-#: Model/Server.php:294
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:302
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:342
+#: Model/Server.php:399
 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:350
+#: Model/Server.php:407
 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:358
+#: Model/Server.php:415
 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:366
+#: Model/Server.php:423
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:374
+#: Model/Server.php:431
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:383
+#: Model/Server.php:440
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:385
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:399
+#: Model/Server.php:456
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:407
+#: Model/Server.php:464
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:415
+#: Model/Server.php:472
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:423
+#: Model/Server.php:480
 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:431
+#: Model/Server.php:488
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:455
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:463
+#: Model/Server.php:520
 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:473
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:481
+#: Model/Server.php:538
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:489
+#: Model/Server.php:546
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:497
+#: Model/Server.php:554
 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:506
+#: Model/Server.php:563
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:522
+#: Model/Server.php:579
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:530
+#: Model/Server.php:587
+msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
+msgstr ""
+
+#: Model/Server.php:595
 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:538
+#: Model/Server.php:603
 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:546
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:555
+#: Model/Server.php:620
 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:564
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:582
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:590
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:599
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:607
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:615
+#: Model/Server.php:689
 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:623
+#: Model/Server.php:697
 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:631
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:639
+#: Model/Server.php:713
 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:647
+#: Model/Server.php:721
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:655
+#: Model/Server.php:729
 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:663
+#: Model/Server.php:737
 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:671
+#: Model/Server.php:745
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:680
+#: Model/Server.php:754
 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:689
+#: Model/Server.php:763
 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:697
+#: Model/Server.php:771
 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:704
+#: Model/Server.php:778
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:711
+#: Model/Server.php:785
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:720
+#: Model/Server.php:794
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
+msgstr "Se habilitado, o MISP irá registrar todas as autenticações bem-sucedidas usando chaves de API. As URLs requisitadas também são registradas."
+
+#: Model/Server.php:802
+msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
 msgstr ""
 
-#: Model/Server.php:728
+#: Model/Server.php:804
+msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
+msgstr ""
+
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:737
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:746
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:755
+#: Model/Server.php:838
+msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
+msgstr ""
+
+#: Model/Server.php:847
 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:764
+#: Model/Server.php:856
 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:773
+#: Model/Server.php:865
 msgid "When enabled, the number of proposals for the events are shown on the index."
-msgstr ""
+msgstr "Quando habilitado, o número de propostas para os eventos são mostradas no índice."
 
-#: Model/Server.php:782
+#: Model/Server.php:874
 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:791
+#: Model/Server.php:883
 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:800
+#: Model/Server.php:892
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:810
+#: Model/Server.php:902
 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:819
+#: Model/Server.php:911
 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:828
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:837
+#: Model/Server.php:929
 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:846
-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"
+#: Model/Server.php:938
+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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:855
+#: Model/Server.php:947
+msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:956
 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:865
+#: Model/Server.php:966
 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:874
+#: Model/Server.php:975
 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:883
+#: Model/Server.php:984
 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:892
+#: Model/Server.php:993
 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:902
+#: Model/Server.php:1003
 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:911
+#: Model/Server.php:1012
 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:919
+#: Model/Server.php:1020
 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:927
+#: Model/Server.php:1028
 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:935
+#: Model/Server.php:1036
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:944
+#: Model/Server.php:1045
 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:952
+#: Model/Server.php:1053
 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:960
+#: Model/Server.php:1061
 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:969
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:980
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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:989
+#: Model/Server.php:1099
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1107
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:1005
+#: Model/Server.php:1115
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:1013
+#: Model/Server.php:1123
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:1021
+#: Model/Server.php:1131
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:1030
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:1041
+#: Model/Server.php:1151
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
-msgstr ""
+msgstr "Habilitar criptografia SMIME. A postura de criptografia das configurações do GnuPG.onlyencrypted e do GnuPG.bodyonlyencrypted são herdadas se o SMIME estiver habilitado."
 
-#: Model/Server.php:1049
+#: Model/Server.php:1159
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:1057
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1065
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1073
+#: Model/Server.php:1183
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:1085
+#: Model/Server.php:1195
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:1093
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1101
+#: Model/Server.php:1211
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:1109
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1117
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1128
+#: Model/Server.php:1238
+msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
+msgstr ""
+
+#: Model/Server.php:1247
 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:1137
+#: Model/Server.php:1257
 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:1146
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1154
+#: Model/Server.php:1292
 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:1162
+#: Model/Server.php:1300
 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:1171
+#: Model/Server.php:1309
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1180
+#: Model/Server.php:1318
 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 "Habilitar esta configuração irá bloquear o índice da organização de ser visível para qualquer pessoa além dos administradores do site na instância atual. Tenha em mente que os usuários ainda podem ver organizações que produzem dados através de eventos, propostas, entradas no histórico de eventos, etc."
+
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
 msgstr ""
 
-#: Model/Server.php:1189
+#: Model/Server.php:1337
 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:1191
+#: Model/Server.php:1339
 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:1198
+#: Model/Server.php:1346
 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:1207
+#: Model/Server.php:1355
 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:1219
+#: Model/Server.php:1364
+msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
+msgstr ""
+
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1227
+#: Model/Server.php:1393
 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:1238
+#: Model/Server.php:1404
 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:1246
+#: Model/Server.php:1412
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
-msgstr ""
+msgstr "Defina como verdadeiro para verificar a string de agente de usuário em cada solicitação. Isso pode levar a logouts ocasionais (não recomendado)."
 
-#: Model/Server.php:1254
+#: Model/Server.php:1420
 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:1263
+#: Model/Server.php:1429
 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:1271
+#: Model/Server.php:1437
 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:1282
+#: Model/Server.php:1448
 msgid "The default policy action for the values added to the RPZ."
 msgstr ""
 
-#: Model/Server.php:1291
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1299
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:1307
+#: Model/Server.php:1473
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1315
+#: Model/Server.php:1481
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1323
+#: Model/Server.php:1489
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1331
+#: Model/Server.php:1497
 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:1339
+#: Model/Server.php:1505
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1347
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr ""
 
-#: Model/Server.php:1355
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1363
+#: Model/Server.php:1529
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1371
+#: Model/Server.php:1537
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1379
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr ""
 
-#: Model/Server.php:1387
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr ""
 
-#: Model/Server.php:1395;1642
+#: Model/Server.php:1561;1808
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1403;1650
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1411
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1419
+#: Model/Server.php:1585
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1427
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr ""
 
-#: Model/Server.php:1435;1658
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1443
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1451;1666
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1459
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1467;1674
+#: Model/Server.php:1633;1840
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1475
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1483
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1491
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1499;1682
+#: Model/Server.php:1665;1848
 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:1507
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1515
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr ""
 
-#: Model/Server.php:1523
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr ""
 
-#: Model/Server.php:1531
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr ""
 
-#: Model/Server.php:1539
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr ""
 
-#: Model/Server.php:1547
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1555
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1563
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1571
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr ""
 
-#: Model/Server.php:1579
+#: Model/Server.php:1745
 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:1588
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1597
+#: Model/Server.php:1763
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1606
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1615
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1624
+#: Model/Server.php:1790
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1799
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1690
+#: Model/Server.php:1856
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1698
+#: Model/Server.php:1864
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1706
+#: Model/Server.php:1872
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1714
+#: Model/Server.php:1880
 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:1722
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1730
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1738
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1746
+#: Model/Server.php:1912
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1754
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1762
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1770
+#: Model/Server.php:1936
 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:1778
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1786
+#: Model/Server.php:1952
 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:1795
+#: Model/Server.php:1961
 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:1803
+#: Model/Server.php:1969
 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:1811
+#: Model/Server.php:1977
+msgid "Enable SightingDB integration."
+msgstr ""
+
+#: Model/Server.php:1985
 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:1821
+#: Model/Server.php:1995
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1830
+#: Model/Server.php:2004
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1839
+#: Model/Server.php:2013
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1848
+#: Model/Server.php:2022
 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:1857
+#: Model/Server.php:2031
 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:1866
+#: Model/Server.php:2040
 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:1875
+#: Model/Server.php:2049
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1883
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1891
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1899
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1907
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1915
+#: Model/Server.php:2089
 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:1923
+#: Model/Server.php:2097
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1931
+#: Model/Server.php:2105
 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:1939
+#: Model/Server.php:2113
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1947
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1955
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1963
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1971
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1979
+#: Model/Server.php:2153
 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:1987
+#: Model/Server.php:2161
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1995
+#: Model/Server.php:2169
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:2003
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:2011
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2019
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:2028
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2036
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:2045
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:2054
+#: Model/Server.php:2228
 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:2063
+#: Model/Server.php:2237
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:2072
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:2081
+#: Model/Server.php:2255
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:2091
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:2100
+#: Model/Server.php:2274
 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:2254
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2258
+#: Model/Server.php:2445
 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:2285
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr ""
 
-#: Model/Server.php:2291
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr ""
 
-#: Model/Server.php:2369
+#: Model/Server.php:2557
 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:2371
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr ""
 
-#: Model/Server.php:2372
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2384;2386
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr ""
 
-#: Model/Server.php:2850
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2853
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2861
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2976
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3676
+#: Model/Server.php:3281
+msgid "Invalid language."
+msgstr ""
+
+#: Model/Server.php:3302
+msgid "Invalid tag_collection."
+msgstr ""
+
+#: Model/Server.php:3310
+msgid "This setting has to be a number."
+msgstr ""
+
+#: Model/Server.php:3322
+msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
+msgstr ""
+
+#: Model/Server.php:3619
+msgid "Invalid file path or file not accessible."
+msgstr ""
+
+#: Model/Server.php:3622
+msgid "File has to be in .pem format."
+msgstr ""
+
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr ""
 
-#: Model/Server.php:3808
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr "Logotipos da organização"
 
-#: Model/Server.php:3809
+#: Model/Server.php:4121
 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:3811
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr "arquivos .png de 48 x 48 pixels"
 
-#: Model/Server.php:3814;3829
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
 msgstr "Nome do arquivo deve estar no seguinte formato: *. png"
 
-#: Model/Server.php:3818
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr "Arquivos de imagem adicionais"
 
-#: Model/Server.php:3819
+#: Model/Server.php:4131
 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:3826
+#: Model/Server.php:4138
 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:4014
+#: Model/Server.php:4228
+msgid "Invalid server."
+msgstr ""
+
+#: Model/Server.php:4259
+msgid "Response was empty."
+msgstr ""
+
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:4471
+#: Model/Server.php:4604
+msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
+msgstr ""
+
+#: Model/Server.php:4675
+msgid "Can't check database schema for Postgres database type"
+msgstr ""
+
+#: Model/Server.php:4692
+msgid "Table `%s` does not exist"
+msgstr ""
+
+#: Model/Server.php:4719
+msgid "Column `%s` exists but should not"
+msgstr ""
+
+#: Model/Server.php:4752
+msgid "Column `%s` is different"
+msgstr ""
+
+#: Model/Server.php:4762
+msgid "Column `%s` does not exist but should"
+msgstr ""
+
+#: Model/Server.php:4775
+msgid "Table `%s` is an additional table"
+msgstr ""
+
+#: Model/Server.php:4799
+msgid "Column `%s` should be indexed"
+msgstr ""
+
+#: Model/Server.php:4822
+msgid "Column `%s` is indexed but should not"
+msgstr ""
+
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:4472
+#: Model/Server.php:5253
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:4476
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:4477
+#: Model/Server.php:5258
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:4805
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:4805;4834
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:4817
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:4818
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:4931
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:4938
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:4945
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr ""
 
+#: Model/Server.php:5911
+msgid "Could not reset the remote authentication key."
+msgstr ""
+
+#: Model/Server.php:5988
+msgid "Could not parse JSON: "
+msgstr "Não foi possível analisar o JSON: "
+
+#: Model/Server.php:6008
+msgid "Could not reset fetch remote user account."
+msgstr ""
+
+#: Model/Server.php:6030
+msgid "No user object received in response."
+msgstr ""
+
+#: Model/Sightingdb.php:346
+msgid "Could not resolve Sightingdb address."
+msgstr ""
+
+#: Model/Sightingdb.php:348
+msgid "Something went wrong. Could not contact the SightingDB server."
+msgstr ""
+
+#: Model/Sightingdb.php:363
+msgid "The SightingDB returned an invalid response."
+msgstr ""
+
+#: Model/Sightingdb.php:366
+msgid "No response from the SightingDB server."
+msgstr ""
+
+#: Model/Taxonomy.php:619
+msgid "Taxonomy `%s` is an exclusive Taxonomy"
+msgstr ""
+
+#: Model/Taxonomy.php:626
+msgid "Predicate `%s` is exclusive"
+msgstr ""
+
+#: Model/User.php:1254
+msgid "reset_all_sync_api_keys"
+msgstr ""
+
+#: Model/User.php:1255
+msgid "Reseting all API keys"
+msgstr ""
+
+#: Model/User.php:1317
+msgid "Reset in progress - %s/%s."
+msgstr ""
+
+#: Model/User.php:1322
+msgid "%s authkeys reset, %s could not be reset"
+msgstr ""
+
+#: Model/User.php:1347
+msgid "Authentication key for user %s (%s) updated."
+msgstr ""
+
+#: Model/User.php:1359
+msgid "Dear user,\n\n"
+"an API key reset has been triggered by an administrator for your user account on %s.\n\n"
+"Your new API key is: %s\n\n"
+"Please update your server's sync setup to reflect this change.\n\n"
+"We apologise for the inconvenience."
+msgstr ""
+
+#: Model/User.php:1364
+msgid "Dear user,\n\n"
+"an API key reset has been triggered by an administrator for your user account on %s.\n\n"
+"Your new API key can be retrieved by logging in using this sync user's account.\n\n"
+"Please update your server's sync setup to reflect this change.\n\n"
+"We apologise for the inconvenience."
+msgstr ""
+
+#: Model/User.php:1373
+msgid "API key reset by administrator"
+msgstr ""
+
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/Polynomial.php:7
+msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/PolynomialExtended.php:7
+msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms` with support of the `Retention` taxonomy which overrides the final score."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/PolynomialExtended.php:17
+msgid "`Retention` taxonomy not available"
+msgstr ""
+
 #: Plugin/Assets/models/behaviors/LogableBehavior.php:361
 msgid "deleted"
 msgstr "deletado"
@@ -4036,19 +5508,19 @@ msgstr "atualizado"
 msgid "it has the following dependent items"
 msgstr "depende dos seguintes itens"
 
-#: View/Attributes/add.ctp:7
+#: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Adicionar atributo"
 
-#: View/Attributes/add.ctp:7
+#: View/Attributes/add.ctp:6
 #: View/Attributes/edit.ctp:4
 msgid "Edit Attribute"
 msgstr "Editar atributos"
 
-#: View/Attributes/add.ctp:14
+#: View/Attributes/add.ctp:18
 #: View/Attributes/attribute_replace.ctp:12
 #: View/Attributes/edit.ctp:8
 #: View/ShadowAttributes/add.ctp:10
@@ -4056,53 +5528,26 @@ msgstr "Editar atributos"
 msgid "(choose one)"
 msgstr "(escolha um)"
 
-#: 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 "Categoria "
+#: View/Attributes/add.ctp:25
+msgid "(choose category first)"
+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 "(primeiro escolha a categoria)"
-
-#: View/Attributes/add.ctp:19
-#: View/Attributes/edit.ctp:13
-#: View/ShadowAttributes/add.ctp:16
-#: View/ShadowAttributes/edit.ctp:14
-msgid "Type "
-msgstr "Tipo "
-
-#: View/Attributes/add.ctp:36
-#: View/Attributes/add_attachment.ctp:24
-#: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:20
-msgid "Distribution "
-msgstr "Distribuição "
-
-#: View/Attributes/add.ctp:50
+#: View/Attributes/add.ctp:39
 #: 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:178
-#: View/Feeds/edit.ctp:173
+#: View/Events/add.ctp:33
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
+#: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
 msgstr "Grupo de compartilhamento"
 
-#: View/Attributes/add.ctp:67
+#: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -4111,133 +5556,52 @@ msgstr "Grupo de compartilhamento"
 msgid "Contextual Comment"
 msgstr "Comentário contextual"
 
-#: View/Attributes/add.ctp:76
+#: View/Attributes/add.ctp:57
 #: View/Attributes/edit.ctp:55
 #: View/Elements/eventattributecreation.ctp:53
 #: View/ShadowAttributes/add.ctp:38
 msgid "for Intrusion Detection System"
 msgstr "para o sistema de deteção de intrusão"
 
-#: 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;202
-#: View/Events/contact.ctp:29
-#: View/Events/edit.ctp:61
-#: View/Events/free_text_import.ctp:27
-#: View/Events/resolved_misp_format.ctp:350
-#: View/News/add.ctp:33
-#: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:131
-#: View/Objects/add.ctp:153
-#: View/Organisations/admin_add.ctp:49
-#: View/Organisations/admin_edit.ctp:60
-#: View/Posts/add.ctp:66
-#: View/Posts/edit.ctp:20
-#: View/Servers/add.ctp:119
-#: View/Servers/edit.ctp:164
-#: View/Servers/ondemand_action.ctp:53
-#: 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/Users/statistics_galaxymatrix.ctp:31
-#: View/Whitelists/admin_edit.ctp:13
-msgid "Submit"
-msgstr "Enviar"
+#: View/Attributes/add.ctp:155
+msgid "Timezone missing, auto-detected as: "
+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:203
-#: 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/resolved_misp_format.ctp:351
-#: View/Events/ajax/enrich_event.ctp:22
-#: View/Events/ajax/enrichmentChoice.ctp:35
-#: 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:135
-#: View/ObjectReferences/ajax/delete.ctp:37
-#: View/Objects/add.ctp:159
-#: View/Objects/revise_object.ctp:105
-#: 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 "Cancelar"
+#: View/Attributes/add.ctp:156
+msgid "The following value will be submited instead: "
+msgstr ""
+
+#: View/Attributes/add.ctp:164
+msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
+msgstr ""
 
 #: View/Attributes/add_attachment.ctp:4
 msgid "Add Attachment(s)"
 msgstr "Adicionar Anexo(s)"
 
-#: View/Attributes/add_attachment.ctp:64
+#: 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 "Categoria "
+
+#: View/Attributes/add_attachment.ctp:24
+#: View/Attributes/edit.ctp:24
+#: View/Objects/ajax/quickAddAttributeForm.ctp:59
+msgid "Distribution "
+msgstr "Distribuição "
+
+#: View/Attributes/add_attachment.ctp:63
 msgid "Is a malware sample (encrypt and hash)"
 msgstr "É uma amostra de malware (criptografar e hash)"
 
-#: View/Attributes/add_attachment.ctp:73
+#: View/Attributes/add_attachment.ctp:72
 msgid "Advanced extraction (if installed)"
 msgstr "Extração avançada (se instalado)"
 
-#: View/Attributes/add_attachment.ctp:78
+#: View/Attributes/add_attachment.ctp:77
 #: View/Elements/healthElements/files.ctp:92
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
@@ -4252,31 +5616,37 @@ msgstr "Importar o arquivo ThreatConnect CSV"
 
 #: View/Attributes/alternate_search_result.ctp:2
 msgid "Alternate Search Results"
-msgstr "Resultados de busca alternativo"
+msgstr "Resultados de busca alternativos"
 
 #: 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 "Esta é uma lista dos eventos que correspondem aos critérios de pesquisa, classificados de acordo com a porcentagem de atributos correspondentes que estão marcados como assinaturas de IDS (azul = partidas de IDS, vermelhas = partidas não IDS)."
 
 #: View/Attributes/alternate_search_result.ctp:6
+#: View/EventDelegations/index.ctp:70
 msgid "Event id"
 msgstr "Id de Evento"
 
 #: View/Attributes/alternate_search_result.ctp:7
 #: View/Attributes/index.ctp:49
-#: View/Elements/eventattribute.ctp:146
+#: View/DecayingModel/decaying_tool_rest_search.ctp:24
+#: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr "Org"
 
 #: View/Attributes/alternate_search_result.ctp:8
-#: View/Elements/Events/View/row_attribute.ctp:68
+#: View/Elements/Events/View/row_attribute.ctp:71
 #: View/EventBlacklists/add.ctp:24
 #: View/EventBlacklists/edit.ctp:25
+#: View/EventDelegations/index.ctp:78
 #: View/Events/add_misp_export_result.ctp:5
 #: View/Events/resolved_misp_format.ctp:51
 msgid "Event info"
@@ -4287,7 +5657,7 @@ msgid "Event date"
 msgstr "Data do Evento"
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:472
+#: View/Events/view.ctp:509
 msgid "Event graph"
 msgstr "Gráfico do evento"
 
@@ -4309,6 +5679,13 @@ msgstr "Ferramenta de substituição de atributo"
 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 "Escolha uma categoria e um tipo e, em seguida, cole uma lista de CPIs que coincidem com a seleção no campo abaixo. Isto irá apagar todos os atributos não encontrados na nova lista inserida, enquanto criando os atributos que estão na lista nova, mas não existem como atributos. Correspondências encontradas serão deixadas intocadas."
 
+#: 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 "(primeiro escolha a categoria)"
+
 #: View/Attributes/attribute_replace.ctp:19
 msgid "Mark all new attributes as to IDS"
 msgstr "Marcar todos os novos atributos de IDS"
@@ -4320,10 +5697,10 @@ msgid "Values"
 msgstr "Valores"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
-#: View/ShadowAttributes/add.ctp:46
+#: View/ShadowAttributes/add.ctp:57
 #: 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
@@ -4341,6 +5718,115 @@ msgstr "Substituir os atributos"
 msgid "Replaceattributes"
 msgstr "Substituir os atributos"
 
+#: View/Attributes/attribute_replace.ctp:38
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Elements/view_galaxy_matrix.ctp:76;211
+#: View/Elements/genericElements/Form/submitButton.ctp:8;25
+#: View/Events/contact.ctp:29
+#: View/Events/free_text_import.ctp:27
+#: View/Events/resolved_misp_format.ctp:386
+#: View/News/add.ctp:33
+#: View/News/edit.ctp:34
+#: View/ObjectReferences/ajax/add.ctp:131
+#: View/Objects/add.ctp:166
+#: View/Objects/ajax/quickAddAttributeForm.ctp:119
+#: View/Organisations/admin_add.ctp:48
+#: View/Organisations/admin_edit.ctp:59
+#: View/Posts/add.ctp:66
+#: View/Posts/edit.ctp:20
+#: View/Servers/add.ctp:129
+#: View/Servers/edit.ctp:171
+#: View/Servers/ondemand_action.ctp:54
+#: 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/UserSettings/set_setting.ctp:36
+#: View/Users/admin_add.ctp:98
+#: 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/Users/statistics_galaxymatrix.ctp:31
+#: View/Whitelists/admin_edit.ctp:13
+msgid "Submit"
+msgstr "Enviar"
+
+#: View/Attributes/attribute_replace.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
+#: 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:212
+#: View/Elements/genericElements/infoModal.ctp:40
+#: View/Elements/genericElements/Form/submitButton.ctp:13
+#: View/Elements/serverRuleElements/pull.ctp:73
+#: 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/resolved_misp_format.ctp:387
+#: View/Events/ajax/enrich_event.ctp:22
+#: View/Events/ajax/enrichmentChoice.ctp:35
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:135
+#: View/ObjectReferences/ajax/delete.ctp:37
+#: View/Objects/add.ctp:172
+#: View/Objects/revise_object.ctp:112
+#: 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:69
+#: View/ShadowAttributes/edit.ctp:68
+#: 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:26
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:32
+#: View/Warninglists/ajax/delete_confirmation.ctp:25
+msgid "Cancel"
+msgstr "Cancelar"
+
 #: View/Attributes/check_composites.ctp:2
 msgid "Failed Composites"
 msgstr "Falha dos compostos"
@@ -4349,24 +5835,31 @@ msgstr "Falha dos compostos"
 msgid "No Failed Composites"
 msgstr "Nenhuma falha nos compostos"
 
+#: View/Attributes/edit.ctp:13
+#: View/ShadowAttributes/add.ctp:16
+#: View/ShadowAttributes/edit.ctp:14
+msgid "Type "
+msgstr "Tipo "
+
 #: View/Attributes/edit.ctp:16
 #: View/Pages/doc/using_the_system.ctp:368
 msgid "disabled"
 msgstr "desabilitado"
 
 #: View/Attributes/edit.ctp:68
-#: View/ShadowAttributes/add.ctp:55
-#: View/ShadowAttributes/edit.ctp:45;54
+#: View/ShadowAttributes/add.ctp:66
+#: View/ShadowAttributes/edit.ctp:56;65
 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 "Aviso: Você está prestes a compartilhar dados de natureza confidencial (Atributos / dados direcionados). Certifique-se de que está autorizado a compartilhar isto."
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:481
+#: View/Events/view.ctp:521
 #: 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
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -4403,22 +5896,21 @@ msgid "Results for all attributes"
 msgstr "Resultados para todos os atributos"
 
 #: View/Attributes/index.ctp:39;128
-#: View/Elements/eventattribute.ctp:60;227
+#: View/DecayingModel/decaying_tool_rest_search.ctp:12;64
+#: View/DecayingModel/index.ctp:13;169
+#: View/Elements/eventattribute.ctp:60;247
 #: 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/Elements/genericElements/IndexTable/pagination.ctp:10
+#: View/Elements/Feeds/eventattribute.ctp:20;87
+#: View/Elements/Servers/eventattribute.ctp:20;87
+#: View/Elements/genericElements/IndexTable/pagination.ctp:14
 #: View/EventBlacklists/index.ctp:13;85
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -4431,43 +5923,41 @@ msgstr "Resultados para todos os atributos"
 #: 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;95
+#: View/Roles/admin_index.ctp:13;105
 #: View/Roles/index.ctp:13;68
-#: View/Servers/index.ctp:13;156
+#: View/Servers/index.ctp:13;202
 #: View/Servers/preview_index.ctp:15;190
-#: View/ShadowAttributes/index.ctp:12;118
-#: View/SharingGroups/index.ctp:13;105
+#: View/ShadowAttributes/index.ctp:12;128
+#: View/SharingGroups/index.ctp:13;107
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;65
 #: 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 "voltar"
+msgstr "anterior"
 
 #: View/Attributes/index.ctp:41;130
-#: View/Elements/eventattribute.ctp:62;229
+#: View/DecayingModel/decaying_tool_rest_search.ctp:14;66
+#: View/DecayingModel/index.ctp:15;171
+#: View/Elements/eventattribute.ctp:62;249
 #: 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/Elements/genericElements/IndexTable/pagination.ctp:12
+#: View/Elements/Feeds/eventattribute.ctp:22;89
+#: View/Elements/Servers/eventattribute.ctp:22;89
+#: View/Elements/genericElements/IndexTable/pagination.ctp:16
 #: View/EventBlacklists/index.ctp:15;87
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -4480,19 +5970,18 @@ msgstr "voltar"
 #: 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;97
+#: View/Roles/admin_index.ctp:15;107
 #: View/Roles/index.ctp:15;70
-#: View/Servers/index.ctp:15;158
+#: View/Servers/index.ctp:15;204
 #: View/Servers/preview_index.ctp:17;192
-#: View/ShadowAttributes/index.ctp:14;120
-#: View/SharingGroups/index.ctp:15;107
+#: View/ShadowAttributes/index.ctp:14;130
+#: View/SharingGroups/index.ctp:15;109
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;67
 #: 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
@@ -4500,57 +5989,75 @@ msgstr "voltar"
 msgid "next"
 msgstr "próximo"
 
-#: View/Attributes/index.ctp:54
-#: View/Elements/eventattribute.ctp:157
-#: View/Elements/global_menu.ctp:90
-#: View/Events/view.ctp:493
-#: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
-#: View/TagCollections/index.ctp:11
-msgid "Galaxies"
+#: View/Attributes/index.ctp:47
+#: View/DecayingModel/decaying_tool_rest_search.ctp:23
+#: View/Elements/eventattribute.ctp:139
+#: View/Elements/Feeds/eventattribute.ctp:41
+#: View/Elements/Servers/eventattribute.ctp:41
+#: View/Events/proposal_event_index.ctp:30
+#: View/Events/view.ctp:143
+#: View/Feeds/preview_event.ctp:25
+#: View/Objects/group_attributes_into_object.ctp:56
+#: 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/Attributes/index.ctp:54
+#: View/DecayingModel/decaying_tool_rest_search.ctp:30
+#: View/Elements/eventattribute.ctp:158
+#: View/Elements/global_menu.ctp:94
+#: View/Events/view.ctp:533
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/TagCollections/index.ctp:11
+msgid "Galaxies"
+msgstr "Galáxias"
+
 #: View/Attributes/index.ctp:56
-#: View/Elements/eventattribute.ctp:159
+#: View/Elements/eventattribute.ctp:160
 msgid "Correlate"
 msgstr ""
 
 #: View/Attributes/index.ctp:57
-#: View/Elements/eventattribute.ctp:160
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:336
+#: View/Elements/eventattribute.ctp:161
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+#: View/Events/view.ctp:372
 #: View/Feeds/preview_event.ctp:73
 #: View/Pages/doc/using_the_system.ctp:235
 #: View/Servers/preview_event.ctp:95
 msgid "Related Events"
-msgstr ""
+msgstr "Eventos relacionados"
 
 #: View/Attributes/index.ctp:58
-#: View/Elements/eventattribute.ctp:161
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:49
 msgid "Feed hits"
 msgstr ""
 
 #: View/Attributes/index.ctp:61
-#: View/Elements/eventattribute.ctp:164
-#: View/Events/view.ctp:251
+#: View/DecayingModel/decaying_tool_rest_search.ctp:33
+#: View/Elements/eventattribute.ctp:165
+#: View/Events/view.ctp:252
 msgid "Sightings"
 msgstr ""
 
 #: View/Attributes/index.ctp:62
-#: View/Elements/eventattribute.ctp:165
-#: View/Events/view.ctp:261
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:262
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr ""
 
 #: View/Attributes/index.ctp:63
-#: View/Elements/eventattribute.ctp:166
+#: View/DecayingModel/index.ctp:99
+#: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -4559,10 +6066,7 @@ msgstr ""
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -4570,12 +6074,12 @@ msgstr ""
 #: 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/Roles/admin_index.ctp:36
+#: View/Servers/index.ctp:41
 #: View/Servers/preview_index.ctp:106
 #: View/SharingGroups/add.ctp:74;94
 #: View/SharingGroups/edit.ctp:74;102
-#: View/SharingGroups/index.ctp:47
+#: View/SharingGroups/index.ctp:48
 #: View/Sightings/ajax/list_sightings.ctp:11
 #: View/TagCollections/index.ctp:16
 #: View/Tags/index.ctp:76
@@ -4585,9 +6089,11 @@ msgstr ""
 #: View/Warninglists/index.ctp:38
 #: View/Whitelists/admin_index.ctp:24
 msgid "Actions"
-msgstr ""
+msgstr "Ações"
 
 #: View/Attributes/index.ctp:121
+#: View/DecayingModel/decaying_tool_rest_search.ctp:57
+#: View/DecayingModel/index.ctp:162
 #: View/Elements/eventdiscussion.ctp:119
 #: View/Elements/generic_table.ctp:53
 #: View/Elements/generic_table_row.ctp:45
@@ -4596,10 +6102,7 @@ msgstr ""
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -4612,19 +6115,18 @@ msgstr ""
 #: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
-#: View/Roles/admin_index.ctp:88
+#: View/Roles/admin_index.ctp:98
 #: View/Roles/index.ctp:61
-#: View/Servers/index.ctp:149
+#: View/Servers/index.ctp:195
 #: View/Servers/preview_index.ctp:182
-#: View/ShadowAttributes/index.ctp:111
-#: View/SharingGroups/index.ctp:98
+#: View/ShadowAttributes/index.ctp:121
+#: View/SharingGroups/index.ctp:100
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:58
 #: 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
@@ -4690,11 +6192,12 @@ msgstr ""
 msgid "Alternate Search Result (Events)"
 msgstr "Resultado de pesquisa alternativos (Eventos)"
 
-#: View/Attributes/search.ctp:38
-#: View/Events/automation.ctp:14
-#: View/Logs/admin_index.ctp:20;21
-#: View/Logs/admin_search.ctp:25
-msgid "Search"
+#: View/Attributes/search.ctp:47
+msgid "First seen and Last seen."
+msgstr ""
+
+#: View/Attributes/search.ctp:48
+msgid "Attributes not having first seen or last seen set might not appear in the search"
 msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:6
@@ -4711,16 +6214,15 @@ 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;98
-#: View/Elements/Events/eventIndexTable.ctp:245
-#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -4729,117 +6231,21 @@ msgstr "Tem certeza que quer apagar o atributo #%s? O atributo só será apagado
 #: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:80
-#: View/Servers/index.ctp:137
-#: View/SharingGroups/index.ctp:87
+#: View/Roles/admin_index.ctp:90
+#: View/Servers/index.ctp:183
+#: View/SharingGroups/index.ctp:89
 #: View/Tags/index.ctp:125
 #: View/Whitelists/admin_index.ctp:32
 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
-#: View/Elements/Feeds/View/row_attribute.ctp:87
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:190
-#: 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:85
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:42;50
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:74;75;76;112;113;118;119
-#: 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 "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
-#: View/Elements/Feeds/View/row_attribute.ctp:87
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:190
-#: 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:85
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:42;50
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:74;75;76;108;112;113;118;119
-#: 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 "Não"
+msgstr "Excluir"
 
 #: 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
+#: View/Objects/ajax/objectEditCommentForm.ctp:5
+#: View/Objects/ajax/objectEditDistributionForm.ctp:5
 msgid "Accept change"
 msgstr "Aceitar modificação"
 
@@ -4848,6 +6254,8 @@ msgstr "Aceitar modificação"
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
+#: View/Objects/ajax/objectEditCommentForm.ctp:6
+#: View/Objects/ajax/objectEditDistributionForm.ctp:6
 msgid "Discard change"
 msgstr "Descartar alteração"
 
@@ -4862,14 +6270,15 @@ msgstr "Não altere as configurações atuais"
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:51
-#: View/Events/resolved_misp_format.ctp:97;267
-#: View/Events/view.ctp:158
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:165
+#: View/Events/resolved_misp_format.ctp:98;293
+#: View/Events/view.ctp:159
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
-#: View/Objects/add.ctp:47;105;201
+#: View/Feeds/index.ctp:184
+#: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
-#: View/Objects/revise_object.ctp:35;62
+#: View/Objects/revise_object.ctp:35;69
 #: 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
@@ -4882,23 +6291,27 @@ msgstr "Distribuição"
 msgid "For Intrusion Detection System"
 msgstr "Para o sistema de deteção de intrusão"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr "Criar propostas"
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 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
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
@@ -4979,83 +6392,1005 @@ 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:28
+#: View/Communities/index.ctp:14
+msgid "Vetted by the MISP-project team"
+msgstr ""
+
+#: View/Communities/index.ctp:19
+msgid "Unvetted"
+msgstr ""
+
+#: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
+#: View/EventBlacklists/index.ctp:35
+#: View/EventDelegations/index.ctp:41
+#: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
+#: View/Feeds/preview_index.ctp:25
+#: View/Feeds/search_caches.ctp:26
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
+#: View/ObjectTemplates/index.ctp:47
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
+#: View/ShadowAttributes/index.ctp:37
+#: View/Sightingdb/index.ctp:10
+#: View/Tags/index.ctp:56
+#: View/Taxonomies/view.ctp:65
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
+msgid "Filter"
+msgstr "Filtrar"
+
+#: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
+#: View/Elements/eventattributetoolbar.ctp:231
+#: View/EventBlacklists/index.ctp:36
+#: View/EventDelegations/index.ctp:42
+#: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
+#: View/Feeds/preview_index.ctp:26
+#: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
+#: View/ObjectTemplates/index.ctp:48
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+#: View/ShadowAttributes/index.ctp:38
+#: View/Sightingdb/index.ctp:11
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
+msgid "Enter value to search"
+msgstr "Digite valor para buscar"
+
+#: View/Communities/index.ctp:34
+#: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
+#: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
+#: View/Feeds/search_caches.ctp:35
+#: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Sightingdb/index.ctp:26
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
+#: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr "Id"
+
+#: View/Communities/index.ctp:40
+msgid "Vetted"
+msgstr ""
+
+#: View/Communities/index.ctp:46
+msgid "Host org"
+msgstr ""
+
+#: View/Communities/index.ctp:53
+msgid "Community name"
+msgstr ""
+
+#: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
+#: View/DecayingModel/index.ctp:89
+#: View/DecayingModel/view.ctp:21
+#: View/Elements/Servers/View/row_object.ctp:24
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: 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:26
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
+#: View/ObjectTemplates/view.ctp:9
+#: View/Objects/add.ctp:22;113;210
+#: View/Objects/group_attributes_into_object.ctp:8
+#: View/Objects/propose_objects_from_attributes.ctp:17
+#: 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:46
+#: View/Sightingdb/index.ctp:88
+#: View/TagCollections/index.ctp:15
+#: View/Taxonomies/view.ctp:14
+#: View/Templates/view.ctp:14
+#: View/Warninglists/view.ctp:11
+msgid "Description"
+msgstr "Descrição"
+
+#: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
+msgid "Communities index"
+msgstr ""
+
+#: View/Communities/index.ctp:72
+msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
+msgstr ""
+
+#: View/Communities/request_access.ctp:7
+msgid "Describe both yourself and your organisation as best as you can - keep in mind this information is to be used by the hosts of the community you are requesting access to in order to determine whether you're a good fit for their community. The sending server's basic metadata is included by default, you can opt out using the \"anonymise\" checkbox (server url, uuid, version are shared otherwise - though this can be a useful step in establishing trust.)."
+msgstr ""
+
+#: View/Communities/request_access.ctp:10
+msgid "Requestor E-mail address"
+msgstr ""
+
+#: View/Communities/request_access.ctp:15
+#: View/Jobs/index.ctp:104
+#: View/OrgBlacklists/add.ctp:17
+#: View/OrgBlacklists/index.ctp:22
+#: View/Organisations/view.ctp:6
+msgid "Organisation name"
+msgstr ""
+
+#: View/Communities/request_access.ctp:20
+msgid "Organisation uuid"
+msgstr ""
+
+#: View/Communities/request_access.ctp:25
+msgid "Description of the requestor organisation"
+msgstr ""
+
+#: View/Communities/request_access.ctp:31
+msgid "Message to the community host organisation"
+msgstr ""
+
+#: View/Communities/request_access.ctp:37
+msgid "PGP public key"
+msgstr ""
+
+#: View/Communities/request_access.ctp:44
+msgid "Request sync access"
+msgstr ""
+
+#: View/Communities/request_access.ctp:49
+msgid "Anonymise information on the server used to issue the request"
+msgstr ""
+
+#: View/Communities/request_access.ctp:54
+msgid "Generate e-mail for later use, but do not send it"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:5
+msgid "Email to send in order to request access"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:6
+msgid "Emailing is currently disabled on the instance, but we have generated the e-mail that would normally be sent out below."
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:7
+msgid "Please find a generated e-mail below that you can use to contact the community in question"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:8
+msgid "Headers:"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:10
+msgid "Message:"
+msgstr ""
+
+#: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
+#: View/Elements/Events/View/row_object.ctp:72
+#: View/Events/resolved_misp_format.ctp:93;288
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
+#: View/ObjectTemplates/index.ctp:66
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:68
+#: View/OrgBlacklists/index.ctp:23
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:58;65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+#: View/SharingGroups/index.ctp:43
+#: View/TagCollections/index.ctp:8
+msgid "UUID"
+msgstr "UUID"
+
+#: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
+#: View/DecayingModel/index.ctp:88
+#: View/DecayingModel/view.ctp:14
+#: View/Elements/Servers/View/row_object.ctp:19
+#: View/Elements/templateElements/templateRowAttribute.ctp:12
+#: View/Elements/templateElements/templateRowFile.ctp:12
+#: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
+#: View/Feeds/search_caches.ctp:47
+#: View/Feeds/view.ctp:4
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
+#: View/ObjectTemplates/view.ctp:4
+#: View/Objects/add.ctp:206
+#: View/Objects/revise_object.ctp:27
+#: 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/Sightingdb/index.ctp:51
+#: View/Templates/view.ctp:9
+#: View/Users/statistics_orgs.ctp:33
+#: View/Warninglists/view.ctp:10
+msgid "Name"
+msgstr "Nome"
+
+#: View/Communities/view.ctp:7
+#: View/SharingGroups/view.ctp:68
+msgid "Url"
+msgstr "URL"
+
+#: View/Communities/view.ctp:8
+msgid "Host organisation"
+msgstr "Organização hospedeira"
+
+#: View/Communities/view.ctp:10
+msgid "Vetted by MISP-project"
+msgstr ""
+
+#: View/Communities/view.ctp:27
+#: View/Elements/footer.ctp:15
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:64
+#: View/Users/admin_view.ctp:72
+#: View/Users/edit.ctp:23
+#: View/Users/view.ctp:32
+msgid "GnuPG key"
+msgstr ""
+
+#: View/Communities/view.ctp:42
+msgid "Community "
+msgstr ""
+
+#: View/Communities/view.ctp:51
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
+msgid "Request Access"
+msgstr "Solicitar acesso"
+
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr "Adicionar widget"
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr "Restringir à função"
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
+#: View/DecayingModel/add.ctp:4
+msgid " Decaying Model"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:7
+msgid "You are editing a Default Model, only restricted edition is allowed."
+msgstr ""
+
+#: View/DecayingModel/add.ctp:9;28
+msgid "Can other organization use this model"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:37
+msgid "days"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:46;56;65
+msgid "float"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:65
+msgid "Default base_score"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:65
+msgid "Default base_score value if no tags are attached to the indicator"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:75
+msgid "Base Score configuration"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:84
+msgid "Model Settings"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:9
+msgid "Show All Types"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:13
+msgid "Show MISP Objects"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:15
+msgid "Search Attribute Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:22
+msgid "Check all"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:23
+msgid "Attribute Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:24
+#: View/DecayingModel/decaying_tool_rest_search.ctp:25
+#: View/Elements/templateElements/templateRowAttribute.ctp:30
+#: View/Elements/templateElements/templateRowFile.ctp:30
+#: View/Events/resolved_attributes.ctp:47
+#: View/Events/resolved_misp_format.ctp:90;285
+#: View/Events/show_i_o_c_results.ctp:11
+#: View/Feeds/freetext_index.ctp:31
+#: View/Objects/add.ctp:114
+#: View/Objects/group_attributes_into_object.ctp:57
+#: View/Objects/propose_objects_from_attributes.ctp:16
+#: View/Objects/revise_object.ctp:63
+#: 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:65
+#: 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/DecayingModel/decaying_tool.ctp:25
+#: View/DecayingModel/view.ctp:3
+#: View/Logs/admin_index.ctp:75
+#: View/Logs/admin_search.ctp:14
+msgid "Model ID"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:47
+msgid "Belong to a MISP Object"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:51
+msgid "To IDS flag set"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:100
+msgid "Adjust base  score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:108
+msgid "Simulate this model"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:129
+msgid "Model's Settings"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Elements/eventdiscussion.ctp:89;97
+#: View/Elements/Events/eventIndexTable.ctp:231
+#: View/Elements/Events/View/row_attribute.ctp:413
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Users/userIndexTable.ctp:90
+#: View/EventBlacklists/edit.ctp:37
+#: View/EventBlacklists/index.ctp:69
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
+#: View/News/index.ctp:22
+#: View/OrgBlacklists/edit.ctp:30
+#: View/OrgBlacklists/index.ctp:36
+#: View/Organisations/index.ctp:138
+#: View/Pages/doc/using_the_system.ctp:191
+#: View/Regexp/admin_index.ctp:34
+#: View/Roles/admin_edit.ctp:56
+#: View/Roles/admin_index.ctp:89
+#: View/Servers/index.ctp:182
+#: View/SharingGroups/index.ctp:88
+#: View/Tags/edit.ctp:36
+#: View/Tags/index.ctp:124
+#: View/Templates/edit.ctp:49
+#: View/Whitelists/admin_index.ctp:31
+msgid "Edit"
+msgstr "Editar"
+
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Templates/add.ctp:49
+msgid "Create"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:146
+msgid "All available models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:149
+msgid "My models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:152
+msgid "Default models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:3
+msgid "Search Taxonomy"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:4
+msgid "Clear search field"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:5
+msgid " not having numerical value"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:7
+msgid "Default basescore"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:13
+#: View/Taxonomies/index.ctp:2
+msgid "Taxonomies"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:14
+msgid "Weight"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:91
+msgid "Excluded"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:112
+msgid "Placeholder for `Organisation source confidence`"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:115
+msgid "Example"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:141;146;151
+msgid "Pick a Taxonomy"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:157
+msgid "Computation steps"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:160
+msgid "Apply base score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:26
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
+#: View/Events/export.ctp:26
+#: View/Events/resolved_attributes.ctp:48
+#: View/Events/resolved_misp_format.ctp:91;286
+#: View/Events/show_i_o_c_results.ctp:12
+#: View/Feeds/freetext_index.ctp:32
+#: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
+#: View/Objects/revise_object.ctp:64
+#: 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:53;68
+#: 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:38
+#: View/Warninglists/view.ctp:13
+msgid "Type"
+msgstr "Tipo"
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:27
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+#: 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/resolved_misp_format.ctp:92;287
+#: View/Events/show_i_o_c_results.ctp:13
+#: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
+#: View/Noticelists/view.ctp:42
+#: View/Objects/add.ctp:115
+#: View/Objects/group_attributes_into_object.ctp:58
+#: View/Objects/revise_object.ctp:65
+#: View/Objects/ajax/quickAddAttributeForm.ctp:78
+#: 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/UserSettings/index.ctp:68
+#: View/Users/admin_filter_user_index.ctp:71
+msgid "Value"
+msgstr "Valor"
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:29
+msgid "Event Tags"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:31
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
+#: View/ObjectReferences/ajax/add.ctp:30
+#: View/Objects/add.ctp:67;119
+#: View/Objects/group_attributes_into_object.ctp:30
+#: View/Objects/revise_object.ctp:49;67
+#: View/Pages/doc/using_the_system.ctp:234;284
+#: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
+msgid "Comment"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:35
+#: View/Elements/eventattribute.ctp:179
+msgid "Score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:84
+#: View/DecayingModel/decaying_tool_simulation.ctp:184
+msgid "Failed to perform RestSearch"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search_form.ctp:3
+msgid "Decaying Model RestSearch"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:45
+#: View/Events/automation.ctp:24
+#: View/Logs/admin_index.ctp:20;21
+#: View/Logs/admin_search.ctp:25
+msgid "Search"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:49
+msgid "Specific Attribute"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:53
+msgid "Attribute ID or UUID"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:55
+msgid "Simulate"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:66
+msgid "Base score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:68;71
+msgid "Base score configuration"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:68
+msgid "not set. But default value sets."
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:71
+msgid "not set"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:79
+msgid "Sighting"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:83
+msgid "Current score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:132
+msgid "Basescore computation steps"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:266
+msgid "Failed to perform the simulation"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:4
+msgid "Import model data"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:5
+msgid "Paste a MISP model JSON or provide a JSON file below to add models."
+msgstr ""
+
+#: View/DecayingModel/import.ctp:10
+#: View/Feeds/import_feeds.ctp:10
+#: View/Servers/import.ctp:10
+#: View/TagCollections/import.ctp:10
+msgid "JSON"
+msgstr "JSON"
+
+#: View/DecayingModel/import.ctp:11
+msgid "Model JSON"
+msgstr "JSON do modelo"
+
+#: View/DecayingModel/import.ctp:18
+msgid "JSON file"
+msgstr "Arquivo JSON"
+
+#: View/DecayingModel/import.ctp:25
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:15
+#: View/Elements/genericElements/org_picker.ctp:17
+#: View/EventBlacklists/add.ctp:36
+#: View/Events/filter_event_index.ctp:125
+#: View/Feeds/add.ctp:220
+#: View/Feeds/import_feeds.ctp:20
+#: View/OrgBlacklists/add.ctp:29
+#: View/Regexp/admin_add.ctp:32
+#: View/Regexp/admin_edit.ctp:42
+#: View/Roles/admin_add.ctp:57
+#: View/Servers/import.ctp:20
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:20
+#: View/Tags/add.ctp:35
+#: View/Users/admin_filter_user_index.ctp:62
+#: View/Whitelists/admin_add.ctp:13
+msgid "Add"
+msgstr "Adicionar"
+
+#: View/DecayingModel/index.ctp:2
+msgid "Decaying Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:30;31
+msgid "All Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:41
+msgid "My models only"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:42
+msgid "My Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:53
+msgid "Models available to everyone"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:54
+msgid "Shared Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:65
+msgid "Default models only"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:66
+msgid "Default Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:86
+#: View/Pages/doc/using_the_system.ctp:398
+msgid "Organization"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:87
+msgid "Usable to everyone"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:91
+#: View/DecayingModel/view.ctp:40
+msgid "Parameters"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:92
+msgid "Pretty print"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:95
+#: View/DecayingModel/view.ctp:35
+msgid "Formula"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:96
+msgid "# Assigned Types"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:97
+#: View/DecayingModel/view.ctp:25
+#: View/Galaxies/view.ctp:10
+#: View/ObjectTemplates/view.ctp:7
+#: View/Taxonomies/view.ctp:19
+#: View/Warninglists/view.ctp:12
+msgid "Version"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:98
+#: View/DecayingModel/view.ctp:31
+#: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
+#: View/Feeds/view.ctp:63
+#: View/Noticelists/index.ctp:63
+#: View/ObjectTemplates/index.ctp:35
+#: View/Sightingdb/index.ctp:19
+#: View/Taxonomies/view.ctp:24
+#: View/Warninglists/view.ctp:16
+msgid "Enabled"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:114
+#: View/DecayingModel/view.ctp:18
+msgid "Default Model from MISP Project"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:137
+msgid "Download model"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:142
+msgid "Are you sure you want to delete DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:148
+msgid "Are you sure you want to disable DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:150
+msgid "Are you sure you want to enable DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:5
+#: View/Events/view.ctp:86
+msgid "Creator org"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:27
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
+#: View/SharingGroups/view.ctp:69
+#: View/TagCollections/index.ctp:12
+msgid "All orgs"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:41
+msgid "Reference(s)"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:42
+msgid "Associated types"
+msgstr ""
+
+#: View/DecayingModel/ajax/disable_form.ctp:3
+msgid "Disable model"
+msgstr ""
+
+#: View/DecayingModel/ajax/enable_form.ctp:3
+msgid "Enable model"
+msgstr ""
+
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:4
+msgid "Add DecayingModelMapping"
+msgstr ""
+
+#: View/Elements/ajaxAttributeTags.ctp:29
 #: View/Elements/ajaxTagCollectionTags.ctp:16
-#: View/Elements/ajaxTags.ctp:45
+#: View/Elements/ajaxTags.ctp:104
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr "Remover marca"
 
-#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Elements/ajaxAttributeTags.ctp:43
 #: 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:48
+#: View/Elements/ajaxTags.ctp:73;74
+msgid "Local tag"
+msgstr "Etiqueta local"
+
+#: View/Elements/ajaxTags.ctp:73;74
+msgid "Global tag"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:107
 msgid "Remove tag %s"
 msgstr "Remover marca %s"
 
-#: View/Elements/ajaxTags.ctp:58;61
+#: View/Elements/ajaxTags.ctp:123;124
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 #: View/Templates/add.ctp:28
 #: View/Templates/edit.ctp:28
 msgid "Add a tag"
 msgstr "Adicione uma marca"
 
-#: View/Elements/eventattribute.ctp:67;69;234;236
-#: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
-#: View/Elements/Servers/eventattribute.ctp:28;31;94;97
+#: View/Elements/ajaxTags.ctp:141;142
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
+msgid "Add a local tag"
+msgstr "Adicionar uma etiqueta local"
+
+#: View/Elements/eventattribute.ctp:67;69;254;256
+#: View/Elements/Feeds/eventattribute.ctp:28;31;95;98
+#: View/Elements/Servers/eventattribute.ctp:28;31;95;98
 msgid "view all"
 msgstr "ver todos"
 
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr "Selecionar todos"
 
 #: View/Elements/eventattribute.ctp:132
 msgid "Select all attributes/proposals on current page"
+msgstr "Selecionar todos os atributos/propostas na página atual"
+
+#: View/Elements/eventattribute.ctp:138
+#: View/Elements/Feeds/eventattribute.ctp:42
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:52
+msgid "First seen"
 msgstr ""
 
 #: View/Elements/eventattribute.ctp:138
-#: View/Elements/Feeds/eventattribute.ctp:41
-#: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/proposal_event_index.ctp:30
-#: View/Events/view.ctp:142
-#: View/Feeds/preview_event.ctp:25
-#: View/Objects/group_attributes_into_object.ctp:56
-#: 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"
+#: View/Elements/Feeds/eventattribute.ctp:42
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:56
+msgid "Last seen"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:142
-#: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:218;229
+#: View/Elements/eventattribute.ctp:143
+#: View/Elements/eventdiscussion.ctp:143
+#: View/Events/view.ctp:219;230
 #: 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
+#: View/ShadowAttributes/index.ctp:48
 msgid "Event"
-msgstr ""
+msgstr "Evento"
 
-#: View/Elements/eventattribute.ctp:153
+#: View/Elements/eventattribute.ctp:154
+#: View/Elements/eventattributetoolbar.ctp:201
 msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:207
+#: View/Elements/eventattribute.ctp:171
+#: View/Elements/eventattributetoolbar.ctp:185
+msgid "SightingDB"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:178
+msgid "Decaying Score"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:227
 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:211
+#: View/Elements/eventattribute.ctp:231
 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 ""
 
@@ -5068,12 +7403,15 @@ msgid "Show all attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:6
-#: View/Elements/Events/eventIndexTable.ctp:216
+#: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
 #: View/Regexp/admin_edit.ctp:18
 #: View/Sightings/ajax/advanced.ctp:5
+#: View/UserSettings/index.ctp:41
 msgid "All"
 msgstr "Todos(as)"
 
@@ -5083,7 +7421,7 @@ msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:24
 msgid "Only show proposals"
-msgstr ""
+msgstr "Somente mostrar propostas"
 
 #: View/Elements/eventattributetoolbar.ctp:25
 #: View/Logs/event_index.ctp:44
@@ -5095,7 +7433,7 @@ msgid "Only show correlating attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:33
-#: View/Events/view.ctp:305
+#: View/Events/view.ctp:306
 msgid "Correlation"
 msgstr ""
 
@@ -5104,6 +7442,8 @@ msgid "Only show potentially false positive attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr "Aviso"
@@ -5111,107 +7451,113 @@ msgstr "Aviso"
 #: View/Elements/eventattributetoolbar.ctp:52
 #: View/Pages/doc/using_the_system.ctp:86
 msgid "Add attribute"
-msgstr ""
+msgstr "Adicionar atributo"
 
-#: View/Elements/eventattributetoolbar.ctp:59
+#: View/Elements/eventattributetoolbar.ctp:52
+msgid "Add proposal"
+msgstr "Adicionar proposta"
+
+#: View/Elements/eventattributetoolbar.ctp:60
 msgid "Edit selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:67
+#: View/Elements/eventattributetoolbar.ctp:68
 msgid "Tag selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:75
+#: View/Elements/eventattributetoolbar.ctp:76
 msgid "Add new cluster to selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:84
+#: View/Elements/eventattributetoolbar.ctp:85
 msgid "Group selected Attributes into an Object"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:93
+#: View/Elements/eventattributetoolbar.ctp:94
 msgid "Delete selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:101
+#: View/Elements/eventattributetoolbar.ctp:102
 msgid "Accept selected Proposals"
-msgstr ""
+msgstr "Aceitar propostas selecionadas"
 
-#: View/Elements/eventattributetoolbar.ctp:109
+#: View/Elements/eventattributetoolbar.ctp:110
 msgid "Discard selected Proposals"
-msgstr ""
+msgstr "Descartar propostas selecionadas"
 
-#: View/Elements/eventattributetoolbar.ctp:117
+#: View/Elements/eventattributetoolbar.ctp:118
 msgid "Sightings display for selected attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:128
+#: View/Elements/eventattributetoolbar.ctp:129
 msgid "Populate using a template"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:136
+#: View/Elements/eventattributetoolbar.ctp:137
 msgid "Populate using the freetext import tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:143
+#: View/Elements/eventattributetoolbar.ctp:144
 msgid "Replace all attributes of a category/type combination within the event"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:157
+#: View/Elements/eventattributetoolbar.ctp:158
 msgid "Use a list of simple scopes to filter the data"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:158
+#: View/Elements/eventattributetoolbar.ctp:159
 msgid "Scope toggle"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:163
+#: View/Elements/eventattributetoolbar.ctp:164
 msgid "Include deleted attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:165
+#: View/Elements/eventattributetoolbar.ctp:166
 msgid "Deleted"
+msgstr "Excluído"
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Show attribute decaying score"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:173
+#: View/Elements/eventattributetoolbar.ctp:176
+msgid "Decay score"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:183
+msgid "Show SightingDB lookup results"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:192
 msgid "Show attribute context fields"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:175
+#: View/Elements/eventattributetoolbar.ctp:194
 msgid "Context"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:180
+#: View/Elements/eventattributetoolbar.ctp:199
+msgid "Show related tags"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:208
 msgid "Advanced filtering tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:184
+#: View/Elements/eventattributetoolbar.ctp:212
 msgid "Filtering tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:188
+#: View/Elements/eventattributetoolbar.ctp:216
 msgid "%s active rule(s)"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:203
-#: View/EventBlacklists/index.ctp:36
-#: View/Events/index.ctp:95
-#: View/Feeds/preview_index.ctp:26
-#: View/Feeds/search_caches.ctp:27
-#: View/ObjectTemplates/index.ctp:48
-#: View/Organisations/index.ctp:76
-#: View/Servers/preview_index.ctp:65
-#: View/Users/admin_index.ctp:62
-msgid "Enter value to search"
-msgstr ""
-
-#: View/Elements/eventattributetoolbar.ctp:207
+#: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: 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 ""
 
@@ -5231,32 +7577,6 @@ msgstr ""
 msgid "User "
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:242
-#: View/Elements/Events/View/row_attribute.ctp:393
-#: View/Elements/TagCollections/index_row.ctp:43
-#: View/Elements/Users/userIndexTable.ctp:90
-#: View/EventBlacklists/edit.ctp:37
-#: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:194
-#: View/Feeds/index.ctp:282
-#: View/News/index.ctp:22
-#: View/OrgBlacklists/edit.ctp:30
-#: View/OrgBlacklists/index.ctp:36
-#: View/Organisations/index.ctp:138
-#: View/Pages/doc/using_the_system.ctp:191
-#: View/Regexp/admin_index.ctp:34
-#: View/Roles/admin_edit.ctp:42
-#: View/Roles/admin_index.ctp:79
-#: View/Servers/index.ctp:136
-#: View/SharingGroups/index.ctp:86
-#: View/Tags/edit.ctp:36
-#: View/Tags/index.ctp:124
-#: View/Templates/edit.ctp:49
-#: View/Whitelists/admin_index.ctp:31
-msgid "Edit"
-msgstr "Editar"
-
 #: View/Elements/eventdiscussion.ctp:90;98
 msgid "Are you sure you want to delete this post?"
 msgstr "Tem certeza que deseja excluir este post?"
@@ -5265,51 +7585,51 @@ msgstr "Tem certeza que deseja excluir este post?"
 msgid "Reply"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:141
+#: View/Elements/eventdiscussion.ctp:142
 #: 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/Elements/eventdiscussion.ctp:142
 #: View/Posts/add.ctp:32
 msgid "Quote"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:142
+#: View/Elements/eventdiscussion.ctp:143
 msgid "Insert a link to an event - just enter the event ID between the [event][/event] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:143
+#: View/Elements/eventdiscussion.ctp:144
 #: 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/Elements/eventdiscussion.ctp:144
 #: View/Posts/add.ctp:34
 msgid "Thread"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Insert a link [link][/link] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Link"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Insert a code [code][/code] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Code"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:156
+#: View/Elements/eventdiscussion.ctp:157
 #: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr ""
@@ -5331,15 +7651,6 @@ msgstr "Atalhos de teclado para esta página"
 msgid "none"
 msgstr "nenhum"
 
-#: 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/edit.ctp:23
-#: View/Users/view.ctp:31
-msgid "GnuPG key"
-msgstr ""
-
 #: View/Elements/footer.ctp:17
 msgid "Could not locate the GnuPG public key."
 msgstr ""
@@ -5348,205 +7659,218 @@ msgstr ""
 msgid "Could not locate SMIME certificate."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:8
-msgid "View details about this galaxy"
+#: View/Elements/form_seen_input.ctp:53
+msgid "First seen date"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:8
-msgid "View galaxy"
+#: View/Elements/form_seen_input.ctp:57
+msgid "Last seen date"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:19
-#: View/Elements/galaxyQuickViewMini.ctp:69
+#: View/Elements/form_seen_input.ctp:63
+msgid "First seen time"
+msgstr ""
+
+#: View/Elements/form_seen_input.ctp:64;69
+msgid "Expected format: HH:MM:SS.ssssss+TT:TT"
+msgstr ""
+
+#: View/Elements/form_seen_input.ctp:68
+msgid "Last seen time"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:79
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:19
-#: View/Elements/galaxyQuickViewMini.ctp:69
-#: View/Elements/Events/eventIndexTable.ctp:138
+#: View/Elements/galaxyQuickView.ctp:77
+#: View/Elements/galaxyQuickViewMini.ctp:80
 msgid "View cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:20
-#: View/Elements/galaxyQuickViewMini.ctp:70
+#: View/Elements/galaxyQuickView.ctp:83;84
+#: View/Elements/galaxyQuickViewMini.ctp:86;87
 msgid "View all events containing this cluster."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:24
+#: View/Elements/galaxyQuickView.ctp:97
 msgid "detach"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:24
+#: View/Elements/galaxyQuickView.ctp:98
 msgid "Are you sure you want to detach %s from this event?"
 msgstr "Tem certeza que deseja desvincular %s deste evento?"
 
-#: View/Elements/galaxyQuickView.ctp:96
-#: View/Elements/galaxyQuickViewMini.ctp:89
-#: View/EventBlacklists/add.ctp:36
-#: View/Events/add.ctp:71
-#: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
-#: View/Feeds/import_feeds.ctp:20
-#: View/OrgBlacklists/add.ctp:29
-#: View/Regexp/admin_add.ctp:32
-#: View/Regexp/admin_edit.ctp:42
-#: View/Roles/admin_add.ctp:44
-#: View/Servers/import.ctp:20
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
-#: View/Sightings/ajax/add_sighting.ctp:33
-#: View/TagCollections/import.ctp:20
-#: View/Tags/add.ctp:35
-#: View/Users/admin_filter_user_index.ctp:62
-#: View/Whitelists/admin_add.ctp:13
-msgid "Add"
+#: View/Elements/galaxyQuickView.ctp:114
+msgid "View details about this galaxy"
 msgstr ""
 
-#: 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/galaxyQuickView.ctp:115
+msgid "View galaxy"
+msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:89
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:205
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
+msgid "Add new local cluster"
+msgstr ""
+
+#: View/Elements/galaxyQuickViewMini.ctp:100
+msgid "Are you sure you want to detach %s from this %s?"
+msgstr "Tem certeza que deseja desvincular %s deste %s?"
+
+#: View/Elements/generic_picker.ctp:187
+msgid "No item picked"
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:209
 msgid "Due to the large number of options, no contextual information is provided."
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:273
+#: View/Elements/generic_picker.ctp:277
 msgid "Nothing to pick"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:7
 msgid "Home"
-msgstr ""
+msgstr "Início"
 
 #: View/Elements/global_menu.ctp:11
 #: View/Pages/doc/general.ctp:20
 msgid "Event Actions"
-msgstr ""
+msgstr "Ações de evento"
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;252
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
-msgstr ""
+msgstr "Listar eventos"
 
 #: View/Elements/global_menu.ctp:18
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:214;258
-#: View/Events/add.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
+#: View/Events/add.ctp:7
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
-msgstr ""
+msgstr "Adicionar evento"
 
 #: View/Elements/global_menu.ctp:23
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr "Listar atributos"
 
 #: View/Elements/global_menu.ctp:27
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr "Atributos de Pesquisa"
 
 #: View/Elements/global_menu.ctp:31
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
-msgstr ""
+msgstr "Cliente REST"
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:298
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "Visualizar propostas"
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
-msgstr ""
+msgstr "Eventos com propostas"
 
-#: View/Elements/global_menu.ctp:49
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:47
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "View delegation requests"
+msgstr "Ver solicitações de delegação"
+
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "Listar Tags"
 
-#: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
-msgid "List Tag Collections"
-msgstr ""
-
 #: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:803
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
+msgid "List Tag Collections"
+msgstr "Listar coleções de tags"
+
+#: View/Elements/global_menu.ctp:61
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr "Adicionar Tag"
 
-#: View/Elements/global_menu.ctp:62
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:832
-msgid "List Taxonomies"
-msgstr ""
-
 #: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:860
-#: View/Pages/doc/general.ctp:42
-msgid "List Templates"
-msgstr ""
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
+msgid "List Taxonomies"
+msgstr "Listar taxonomias"
 
 #: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:865
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
+#: View/Pages/doc/general.ctp:42
+msgid "List Templates"
+msgstr "Listar templates"
+
+#: View/Elements/global_menu.ctp:74
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
-msgstr ""
+msgstr "Adicionar template"
 
-#: View/Elements/global_menu.ctp:78
+#: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:308
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
-msgstr ""
+msgstr "Exportar"
 
-#: View/Elements/global_menu.ctp:82
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:314
+#: View/Elements/global_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: 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 "Automação"
 
-#: View/Elements/global_menu.ctp:94
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:966
+#: View/Elements/global_menu.ctp:98
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
-msgstr ""
+msgstr "Listar galáxias"
 
-#: View/Elements/global_menu.ctp:101
+#: View/Elements/global_menu.ctp:105
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
-msgstr ""
+msgstr "Filtros de entrada"
 
-#: View/Elements/global_menu.ctp:104;109
+#: View/Elements/global_menu.ctp:108;113
 #: 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 ""
+msgstr "Regexp de importação"
 
-#: View/Elements/global_menu.ctp:114;119
+#: View/Elements/global_menu.ctp:118;123
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -5555,79 +7879,98 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:124
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:361
+#: View/Elements/global_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr "Listar a lista de avisos"
 
-#: View/Elements/global_menu.ctp:128
+#: View/Elements/global_menu.ctp:132
 msgid "List Noticelists"
 msgstr "Listar a lista de notificações"
 
-#: View/Elements/global_menu.ctp:135
+#: View/Elements/global_menu.ctp:139
 #: View/Pages/doc/general.ctp:22;54
 msgid "Global Actions"
-msgstr ""
+msgstr "Ações globais"
 
-#: View/Elements/global_menu.ctp:139
+#: View/Elements/global_menu.ctp:143
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
-msgstr ""
+msgstr "Novidades"
 
-#: View/Elements/global_menu.ctp:143
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:440
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Meu Perfil"
 
-#: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/global_menu.ctp:151
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
+msgid "My Settings"
+msgstr "Minhas configurações"
+
+#: View/Elements/global_menu.ctp:155
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
+msgid "Set Setting"
+msgstr "Definir configuração"
+
+#: View/Elements/global_menu.ctp:159
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: View/Elements/global_menu.ctp:156
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:463
+#: View/Elements/global_menu.ctp:168
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "Permissões específicas para funções"
 
-#: View/Elements/global_menu.ctp:163
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1010
+#: View/Elements/global_menu.ctp:175
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
-msgstr ""
+msgstr "Listar modelos de objetos"
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:480
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
-msgstr "Lista Grupos de Compartilhamento"
+msgstr "Listar grupos de compartilhamento"
 
-#: View/Elements/global_menu.ctp:174
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:486
+#: View/Elements/global_menu.ctp:186
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr "Adicionar Grupo de Compartilhamento"
 
-#: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:493
+#: View/Elements/global_menu.ctp:194
+msgid "Decaying Models Tool"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:199
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
+msgid "List Decaying Models"
+msgstr "Listar modelos de decaimento"
+
+#: View/Elements/global_menu.ctp:206
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: 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:186
+#: View/Elements/global_menu.ctp:210
 msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:190
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:497
+#: View/Elements/global_menu.ctp:214
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
-msgstr ""
+msgstr "Termos e Condições"
 
-#: View/Elements/global_menu.ctp:194
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:218
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -5641,48 +7984,61 @@ msgstr ""
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: View/Elements/global_menu.ctp:201
+#: View/Elements/global_menu.ctp:225
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:205
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:212
+#: View/Elements/global_menu.ctp:236
 #: View/Pages/doc/general.ctp:23;66
 msgid "Sync Actions"
-msgstr ""
+msgstr "Ações de sincronização"
 
-#: View/Elements/global_menu.ctp:216
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:509
+#: View/Elements/global_menu.ctp:240
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
-msgstr ""
+msgstr "Criar configuração de Sincronização"
 
-#: View/Elements/global_menu.ctp:221
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:515
+#: View/Elements/global_menu.ctp:245
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
-msgstr ""
+msgstr "Importar configurações de servidor"
 
-#: View/Elements/global_menu.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
+#: View/Elements/global_menu.ctp:250
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "Listar Servidores"
 
-#: View/Elements/global_menu.ctp:231
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:887
+#: View/Elements/global_menu.ctp:255
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr "Listar Feeds"
 
-#: View/Elements/global_menu.ctp:236
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:891
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
+msgstr "Pesquisar caches de feeds"
+
+#: View/Elements/global_menu.ctp:265
+msgid "List SightingDB Connections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:244
+#: View/Elements/global_menu.ctp:270
+msgid "Add SightingDB Connection"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:275
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+msgid "List Communities"
+msgstr "Listar comunidades"
+
+#: View/Elements/global_menu.ctp:283
 #: View/Pages/doc/administration.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
@@ -5690,102 +8046,115 @@ msgstr ""
 #: View/Pages/doc/user_management.ctp:14
 #: View/Pages/doc/using_the_system.ctp:21
 msgid "Administration"
-msgstr ""
+msgstr "Administração"
 
-#: View/Elements/global_menu.ctp:249
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:638
+#: View/Elements/global_menu.ctp:288
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Listar Usuários"
 
-#: View/Elements/global_menu.ctp:253
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:633
+#: View/Elements/global_menu.ctp:292
+msgid "List User Settings"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:296
+#: View/UserSettings/set_setting.ctp:5
+msgid "Set User Setting"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:300
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr "Adicionar Usuário"
 
-#: View/Elements/global_menu.ctp:257
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
+#: View/Elements/global_menu.ctp:304
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
+msgstr "Contatar usuários"
+
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:264
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:450;680
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr "Listar Organizações"
 
-#: View/Elements/global_menu.ctp:268
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
-msgstr ""
+msgstr "Adicionar organizações"
 
-#: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:692
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
-msgstr ""
+msgstr "Listar funções"
 
-#: View/Elements/global_menu.ctp:279
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
-msgstr ""
+msgstr "Adicionar funções"
 
-#: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr "Configuração de Servidores & Manutenção"
 
-#: View/Elements/global_menu.ctp:297
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "Jobs"
 
-#: View/Elements/global_menu.ctp:306
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:711
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:315
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:320
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
-msgstr ""
+msgstr "Gerenciar listas de bloqueio de eventos"
 
-#: View/Elements/global_menu.ctp:329
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
-msgstr ""
+msgstr "Gerenciar listas de bloqueio de organizações"
 
-#: View/Elements/global_menu.ctp:342
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
-msgstr ""
+msgstr "Auditoria"
 
-#: View/Elements/global_menu.ctp:346
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:744
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
-msgstr ""
+msgstr "Listar logs"
 
-#: View/Elements/global_menu.ctp:350
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:748
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
-msgstr "Pesquisar Logs"
+msgstr "Pesquisar logs"
 
-#: View/Elements/global_menu.ctp:377;382
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -5807,7 +8176,9 @@ msgid "Attributes per organization"
 msgstr "Atributos por organização"
 
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:91
+#: View/Elements/view_timeline.ctp:23
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -5834,6 +8205,7 @@ msgid "Physics"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:13
+#: View/Elements/view_timeline.ctp:12
 msgid "Display"
 msgstr ""
 
@@ -5841,7 +8213,6 @@ msgstr ""
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr ""
 
@@ -5849,11 +8220,8 @@ msgstr ""
 msgid "History"
 msgstr ""
 
-#: View/Elements/view_event_graph.ctp:18
-msgid "Search for an item"
-msgstr ""
-
 #: View/Elements/view_event_graph.ctp:22
+#: View/Elements/view_timeline.ctp:26
 #: View/Events/view_graph.ctp:17
 msgid "Toggle fullscreen"
 msgstr ""
@@ -5862,13 +8230,47 @@ msgstr ""
 msgid "Show all"
 msgstr ""
 
-#: View/Elements/view_galaxy_matrix.ctp:121
+#: View/Elements/view_galaxy_matrix.ctp:129
 msgid "(%s items)"
 msgstr ""
 
+#: View/Elements/view_timeline.ctp:9
+msgid "Time scope"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
+#: View/Taxonomies/view.ctp:83
+msgid "Tag"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:6
+msgid "Computation"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:7
+#: View/Events/add_misp_export_result.ctp:6
+msgid "Result"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:10
+msgid "Taxonomy effective ratio"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:10
+msgid "Eff. Ratio"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+msgid "Tag numerical value"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:19
+msgid "Pick an Attribute"
+msgstr ""
+
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr ""
 
@@ -5925,72 +8327,73 @@ msgstr "#Postagens"
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
-#: View/Elements/Events/eventIndexTable.ctp:82;86;248
+#: View/Elements/Events/eventIndexTable.ctp:82;86;237
 #: 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/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
 #: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/index.ctp:103
 #: View/Servers/preview_index.ctp:174
-#: View/SharingGroups/index.ctp:89
+#: View/SharingGroups/index.ctp:91
 #: View/Taxonomies/index.ctp:49
 #: View/Warninglists/index.ctp:60
 msgid "View"
 msgstr "Visualizar"
 
-#: View/Elements/Events/eventIndexTable.ctp:168
+#: View/Elements/Events/eventIndexTable.ctp:157
 msgid " correlation(s). Show filtered event with correlation only."
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:186;191
+#: View/Elements/Events/eventIndexTable.ctp:175;180
 msgid " proposal(s)"
 msgstr " proposta(s)"
 
-#: View/Elements/Events/eventIndexTable.ctp:196
+#: View/Elements/Events/eventIndexTable.ctp:185
 msgid "NEW"
 msgstr "NOVO"
 
-#: View/Elements/Events/eventIndexTable.ctp:237
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr "Publicar evento"
 
-#: View/Elements/Events/eventIndexTable.ctp:237
+#: View/Elements/Events/eventIndexTable.ctp:226
 #: 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:238
+#: View/Elements/Events/eventIndexTable.ctp:227
 msgid "Not published"
 msgstr "Não publicado"
 
-#: View/Elements/Events/eventIndexTable.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;347;414;571;625
-#: View/Servers/index.ctp:137
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
+#: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr "Tem certeza que deseja excluir # %s?"
 
-#: View/Elements/Events/View/attribute_correlations.ctp:7
+#: View/Elements/Events/View/attribute_correlations.ctp:17
 msgid "Show "
 msgstr "Exibir "
 
-#: View/Elements/Events/View/attribute_correlations.ctp:7
+#: View/Elements/Events/View/attribute_correlations.ctp:17
 msgid " more..."
 msgstr " mais..."
 
-#: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:362
+#: View/Elements/Events/View/attribute_correlations.ctp:53
+#: View/Events/view.ctp:399
 #: View/Feeds/preview_event.ctp:88
 #: View/Servers/preview_event.ctp:116
 msgid "Collapse…"
@@ -6004,131 +8407,122 @@ msgstr ""
 msgid "Advanced Sightings"
 msgstr ""
 
+#: View/Elements/Events/View/related_event.ctp:26
+msgid "This related event contains %s unique correlation(s)"
+msgstr ""
+
 #: View/Elements/Events/View/row_attribute.ctp:43
 msgid "Select attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:152
-#: View/Elements/Events/View/row_proposal.ctp:110
-#: View/Elements/Feeds/View/row_attribute.ctp:61
-#: View/Elements/Servers/View/row_attribute.ctp:68
+#: View/Elements/Events/View/row_attribute.ctp:155
+#: View/Elements/Events/View/row_proposal.ctp:113
+#: View/Elements/Feeds/View/row_attribute.ctp:63
+#: View/Elements/Servers/View/row_attribute.ctp:70
 msgid "warning"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:196;197
+#: View/Elements/Events/View/row_attribute.ctp:199;200
 #: View/Events/ajax/toggle_correlation.ctp:20
 msgid "Toggle correlation"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:323
+#: View/Elements/Events/View/row_attribute.ctp:326
 msgid "Toggle IDS flag"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:356
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Restore attribute"
 msgstr "Restaurar atributo"
 
-#: View/Elements/Events/View/row_attribute.ctp:357;397
+#: View/Elements/Events/View/row_attribute.ctp:377;417
 msgid "Permanently delete attribute"
 msgstr "Excluir permanentemente o atributo"
 
-#: View/Elements/Events/View/row_attribute.ctp:364
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:364
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Propose enrichment"
-msgstr ""
+msgstr "Propor enriquecimento"
 
-#: View/Elements/Events/View/row_attribute.ctp:369
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:369
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Propose enrichment through Cortex"
-msgstr ""
+msgstr "Propor enriquecimento através do Cortex"
 
-#: View/Elements/Events/View/row_attribute.ctp:373
+#: View/Elements/Events/View/row_attribute.ctp:393
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:374
+#: View/Elements/Events/View/row_attribute.ctp:394
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:384;389
+#: View/Elements/Events/View/row_attribute.ctp:404;409
 msgid "Add enrichment"
-msgstr ""
+msgstr "Adicionar enriquecimento"
 
-#: View/Elements/Events/View/row_attribute.ctp:389
+#: View/Elements/Events/View/row_attribute.ctp:409
 msgid "Add enrichment via Cortex"
-msgstr ""
+msgstr "Adicionar enriquecimento via Cortex"
 
-#: View/Elements/Events/View/row_attribute.ctp:401
+#: View/Elements/Events/View/row_attribute.ctp:421
 msgid "Soft-delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:65
-#: View/Elements/Feeds/View/row_object.ctp:16
-#: View/Events/resolved_misp_format.ctp:109
+#: View/Elements/Events/View/row_object.ctp:68
+#: View/Elements/Feeds/View/row_object.ctp:19
+#: View/Events/resolved_misp_format.ctp:113
 msgid "Name: "
 msgstr "Nome: "
 
-#: View/Elements/Events/View/row_object.ctp:66
+#: View/Elements/Events/View/row_object.ctp:69
 #: 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.ctp:20
 #: 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.ctp:20
 #: View/Elements/Servers/View/row_object_reference.ctp:7
 #: View/Elements/Servers/View/row_object_referenced_by.ctp:7
-#: View/Events/resolved_misp_format.ctp:110;120
+#: View/Events/resolved_misp_format.ctp:114;135
 msgid "Expand or Collapse"
 msgstr "Expandir ou Recolher"
 
-#: View/Elements/Events/View/row_object.ctp:69
-#: View/Events/resolved_misp_format.ctp:92;262
-#: View/GalaxyClusters/view.ctp:19
-#: View/ObjectTemplates/index.ctp:66
-#: View/ObjectTemplates/view.ctp:6
-#: View/Objects/revise_object.ctp:61
-#: View/OrgBlacklists/index.ctp:23
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/view.ctp:24
-#: View/Organisations/ajax/merge.ctp:58;65
-#: View/SharingGroups/add.ctp:72
-#: View/SharingGroups/edit.ctp:72
-#: View/TagCollections/index.ctp:8
-msgid "UUID"
-msgstr ""
-
-#: View/Elements/Events/View/row_object.ctp:70
+#: View/Elements/Events/View/row_object.ctp:73
 msgid "Meta-category: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:71
-#: View/Elements/Feeds/View/row_object.ctp:21
+#: View/Elements/Events/View/row_object.ctp:74
+#: View/Elements/Feeds/View/row_object.ctp:24
 msgid "Description: "
 msgstr "Descrição: "
 
-#: View/Elements/Events/View/row_object.ctp:72
-#: View/Elements/Feeds/View/row_object.ctp:22
+#: View/Elements/Events/View/row_object.ctp:75
+#: View/Elements/Feeds/View/row_object.ctp:25
 msgid "Template: "
 msgstr "Template: "
 
-#: View/Elements/Events/View/row_object.ctp:125
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Permanently delete object"
 msgstr "Excluir permanentemente o objeto"
 
-#: View/Elements/Events/View/row_object.ctp:125
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Soft delete object"
 msgstr ""
 
+#: View/Elements/Events/View/row_object.ctp:164
+msgid "Add an Object Attribute"
+msgstr "Adicionar um atributo de objeto"
+
 #: View/Elements/Events/View/row_object_reference.ctp:1
 #: View/Elements/Feeds/View/row_object_reference.ctp:1
-#: View/Events/resolved_misp_format.ctp:115
+#: View/Events/resolved_misp_format.ctp:130
 msgid "References: "
 msgstr "Referências: "
 
@@ -6150,20 +8544,20 @@ msgstr ""
 msgid "Select proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:183
-#: View/Elements/Events/View/row_proposal_delete.ctp:77
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept Proposal"
-msgstr ""
+msgstr "Aceitar proposta"
 
-#: View/Elements/Events/View/row_proposal.ctp:183
-#: View/Elements/Events/View/row_proposal_delete.ctp:77
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept proposal"
-msgstr ""
+msgstr "Aceitar proposta"
 
-#: View/Elements/Events/View/row_proposal.ctp:188
-#: View/Elements/Events/View/row_proposal_delete.ctp:82
+#: View/Elements/Events/View/row_proposal.ctp:199
+#: View/Elements/Events/View/row_proposal_delete.ctp:85
 msgid "Discard proposal"
-msgstr ""
+msgstr "Descartar proposta"
 
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
@@ -6181,24 +8575,22 @@ msgid "Advanced sightings"
 msgstr ""
 
 #: View/Elements/Events/View/value_field.ctp:52
-#: View/Elements/Servers/View/value_field.ctp:43
+msgid "Cortex object"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:68
 msgid "Hexadecimal representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:52
-#: View/Elements/Feeds/View/value_field.ctp:43
-#: View/Elements/Servers/View/value_field.ctp:43
+#: View/Elements/Events/View/value_field.ctp:69
 msgid "Switch to binary representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:58
-#: View/Elements/Feeds/View/value_field.ctp:48
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:58
-#: View/Elements/Feeds/View/value_field.ctp:48
-#: View/Elements/Servers/View/value_field.ctp:48
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr ""
 
@@ -6222,19 +8614,14 @@ msgstr ""
 msgid "Check coverage"
 msgstr ""
 
-#: View/Elements/Feeds/View/row_object.ctp:20
-#: View/Elements/Servers/View/row_object.ctp:20
+#: View/Elements/Feeds/View/row_object.ctp:23
+#: View/Elements/Servers/View/row_object.ctp:23
 #: View/ObjectTemplates/index.ctp:69
 #: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:31
 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/Objects/object_similarities.ctp:76
 msgid "Update template and merge"
 msgstr ""
@@ -6279,98 +8666,44 @@ msgstr ""
 msgid "-- Select an option --"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:31;97
+#: View/Elements/Servers/eventattribute.ctp:31;98
 msgid "all"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:50
 #: View/Elements/templateElements/templateRowAttribute.ctp:82
 #: View/Events/resolved_attributes.ctp:49
-#: View/Events/resolved_misp_format.ctp:94;264
+#: View/Events/resolved_misp_format.ctp:95;290
 #: View/Feeds/freetext_index.ctp:34
-#: View/Objects/add.ctp:103
+#: View/Objects/add.ctp:116
 #: 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:305
+#: View/Elements/healthElements/diagnostics.ctp:367
 #: View/Pages/doc/administration.ctp:56;228
 #: View/Servers/ajax/submoduleStatus.ctp:6
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
-#: View/Elements/Servers/View/row_attribute.ctp:93
+#: View/Elements/Servers/View/row_attribute.ctp:95
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
+#: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
-#: View/Events/view.ctp:190
-#: View/GalaxyClusters/view.ctp:32
+#: View/Events/view.ctp:191
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
-#: View/Users/admin_view.ctp:63;84
-#: View/Users/view.ctp:33
+#: View/Users/admin_view.ctp:95
 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/Feeds/search_caches.ctp:47
-#: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
-#: View/ObjectTemplates/view.ctp:4
-#: View/Objects/add.ctp:193
-#: View/Objects/revise_object.ctp:27
-#: 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:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
-#: View/ObjectTemplates/view.ctp:9
-#: View/Objects/add.ctp:22;100;197
-#: View/Objects/group_attributes_into_object.ctp:8
-#: View/Objects/propose_objects_from_attributes.ctp:17
-#: 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/TagCollections/index.ctp:15
-#: 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/Elements/Servers/View/row_object.ctp:25
 #: View/Objects/propose_objects_from_attributes.ctp:14
 #: View/Templates/view.ctp:2
 msgid "Template"
@@ -6379,31 +8712,33 @@ msgstr ""
 #: View/Elements/Servers/View/row_object_reference.ctp:1
 #: View/Objects/orphaned_object_diagnostics.ctp:53
 msgid "References"
-msgstr ""
+msgstr "Referências"
 
 #: View/Elements/Servers/View/row_object_referenced_by.ctp:1
 #: View/Objects/orphaned_object_diagnostics.ctp:62
 msgid "Referenced by"
-msgstr ""
+msgstr "Referenciado por"
 
-#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/TagCollections/index_row.ctp:45
 #: View/Tags/index.ctp:125
 #: View/Whitelists/admin_index.ctp:32
 msgid "Are you sure you want to delete \"%s\"?"
-msgstr ""
+msgstr "Tem certeza que deseja excluir \"%s\"?"
 
-#: View/Elements/TagCollections/index_row.ctp:50
+#: View/Elements/TagCollections/index_row.ctp:51;52
 msgid "Download configuration"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
-msgstr ""
+msgstr "Função"
 
 #: View/Elements/Users/userIndexTable.ctp:16
 msgid "Last login"
@@ -6412,20 +8747,18 @@ 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
+#: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:88
-msgid "Initiate password refresh"
-msgstr ""
-
-#: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 msgid "Create new credentials and inform user"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:611
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 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."
 
@@ -6435,13 +8768,14 @@ msgstr ""
 
 #: View/Elements/dashboard/dashboard_events.ctp:4
 msgid "Events updated: "
-msgstr ""
+msgstr "Eventos atualizados: "
 
 #: View/Elements/dashboard/dashboard_events.ctp:5
 msgid "Events published: "
-msgstr ""
+msgstr "Eventos publicados: "
 
 #: View/Elements/dashboard/dashboard_events.ctp:7
+#: View/Servers/index.ctp:107
 msgid "Reset"
 msgstr ""
 
@@ -6451,464 +8785,738 @@ msgstr ""
 
 #: View/Elements/dashboard/dashboard_notifications.ctp:4
 msgid "Proposals: "
-msgstr ""
+msgstr "Propostas: "
 
 #: View/Elements/dashboard/dashboard_notifications.ctp:5
 msgid "Events with proposals: "
-msgstr ""
+msgstr "Eventos com propostas: "
 
 #: View/Elements/dashboard/dashboard_notifications.ctp:9
 msgid "Delegation requests: "
+msgstr "Solicitações de delegação: "
+
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
-msgid "Populate From Template"
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
-msgid "Enrichment Module Result"
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
 msgstr ""
 
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr "Ver painel"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
+msgstr "Importar JSON de configuração"
+
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr "Exportar JSON de configuração"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr "Salvar configuração do painel"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr "Listar modelos de painel"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+msgid "Populate From Template"
+msgstr "Povoar a partir do modelo"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+msgid "Enrichment Module Result"
+msgstr "Resultado do módulo de enriquecimento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
-msgstr ""
+msgstr "Resultado da importação Freetext"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
-msgstr ""
+msgstr "Ver evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;824;996
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr "Exibir Gráfico de Correlação"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
-msgstr ""
+msgstr "Ver histórico do evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
-#: View/Events/edit.ctp:8
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr "Editar evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
-msgstr "Apagar Evento"
+msgstr "Excluir evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
-msgstr ""
+msgstr "Adicionar objeto"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
-msgstr ""
+msgstr "Adicionar anexo"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
-msgstr ""
+msgstr "Povoar a partir de..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
-msgstr ""
+msgstr "Enriquecer evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
-msgstr ""
+msgstr "Mesclar atributos de..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
-msgid "Publish (no email)"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
-msgid "Unpublish"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
-msgid "Delegate Publishing"
-msgstr ""
+msgstr "Propor atributo"
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr "Propor anexo"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
+msgid "Publish (no email)"
+msgstr "Publicar (sem e-mail)"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
+msgid "Unpublish"
+msgstr "Despublicar"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+msgid "Publish Sightings"
+msgstr "Publicar avistamentos"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
+msgid "Delegate Publishing"
+msgstr "Delegar publicação"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
-msgstr ""
+msgstr "Aceitar solicitação de delegação"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
-msgstr ""
+msgstr "Descartar solicitação de delegação"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:180
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr "Publicar o evento para ZMQ"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:181
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
-msgstr ""
+msgstr "Publicar evento para Kafka"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:197
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:204;291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
-msgstr ""
+msgstr "Baixar como..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:227;232
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
-msgstr ""
+msgstr "Adicionar coleção de tags"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
-msgstr ""
+msgstr "Exportar coleções de tags"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:265
-msgid "Import from…"
-msgstr ""
+msgstr "Importar coleções de tags"
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+msgid "Import from…"
+msgstr "Importar de…"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
-msgstr ""
+msgstr "Listar Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
-msgstr ""
+msgstr "Nova Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:334
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr "Executar em existentes"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
-msgstr ""
+msgstr "Editar Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:346
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr "Excluir o Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr "Visualizar a lista de avisos"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:367
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
-msgstr "Atualizar a lista de avisos"
+msgstr "Atualizar as listas de avisos"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:376
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr "Visualizar a lista de notificações"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:386
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
-msgstr "Atualizar a lista de notificações"
+msgstr "Atualizar as listas de notificações"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:387
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:397
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr "Listar a lista de permissões"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:402
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr "Nova Whitelist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
-msgstr "Editar Whitelist"
+msgstr "Editar whitelist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:413
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
-msgstr "Deletar Whitelist"
+msgstr "Excluir whitelist"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:423
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
-msgstr "Editar Meu Perfil"
+msgstr "Editar meu perfil"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:427
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:434;600
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr "Alterar Senha"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr "Ver Organizações"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:469
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr "Editar Grupo de Compartilhamento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr "Visualizar Grupos de Compartilhamento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524;554
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr "Explorar o Servidor Remoto"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr "Explorar o evento remoto"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:543
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr "Buscar este evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:562
-#: View/Servers/edit.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr "Editar servidor"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
+msgstr "Novos servidores"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
+msgid "View community"
+msgstr "Ver comunidade"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
+msgid "Request E-mail"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:593
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr "Ver Usuários"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:605
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr "Editar Usuário"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:610
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
-msgstr "Excluir Usuário"
+msgstr "Excluir usuário"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:619
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr "Editar Função"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:624
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr "Remover Função"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:653
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr "Inscrições pendentes"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
+msgid "User settings"
+msgstr "Configurações do usuário"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr "Adicionar Organização"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr "Editar Organização"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
-msgstr ""
+msgstr "Mesclar organização"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr "Excluir organização"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
+msgstr "Adicionar função"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757;771
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:762
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
-msgstr ""
+msgstr "Adicionar postagem"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:776
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
-msgstr ""
+msgstr "Editar postagem"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:782
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
-msgstr ""
+msgstr "Listar tópicos"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
-msgstr ""
+msgstr "Novo tópico"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:794
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr "Listar Tags Favoritas"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:810
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr "Editar Tag"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:818;837
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
-msgstr ""
+msgstr "Ver taxonomia"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
-msgstr ""
+msgstr "Excluir taxonomia"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:852
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
-msgstr ""
+msgstr "Atualizar taxonomias"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
-msgstr ""
+msgstr "Ver modelo"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
-msgstr ""
+msgstr "Editar modelo"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+msgid "Update Default Models"
+msgstr "Atualizar modelos padrão"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
+msgid "Force Update Default Models"
+msgstr "Forçar a atualização de modelos padrão"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
+msgid "Import Decaying Model"
+msgstr "Importar modelo de decaimento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
+msgid "Add Decaying Model"
+msgstr "Adicionar modelo de decaimento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+msgid "Decaying Tool"
+msgstr "Ferramenta de decaimento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
+msgid "View Decaying Model"
+msgstr "Ver modelo de decaimento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
+msgid "Edit Decaying Model"
+msgstr "Editar modelo de decaimento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr "Adicionar Feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:901
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr "Importar Feeds do formato JSON"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:907
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
-msgstr ""
+msgstr "Matriz de análise de sobreposição de feeds"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:912
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr "Exportar configurações de Feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:920
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr "Editar Feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:925
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
-msgstr ""
+msgstr "Ver feed"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr "PreviewIndex"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr "PreviewEvent"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:946
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr "Ver Novidades"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:951
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
-msgstr ""
+msgstr "Adicionar item de notícia"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
-msgstr ""
+msgstr "Editar item de notícia"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:972
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
-msgstr ""
+msgstr "Atualizar galáxias"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:973
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr ""
+msgstr "Tem certeza de que deseja reimportar todas as galáxias do submódulo?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:978
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
-msgstr ""
+msgstr "Forçar atualização das galáxias"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:979
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr ""
+msgstr "Tem certeza de que deseja remover e reimportar todas as galáxias do submódulo?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:986;1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
-msgstr ""
+msgstr "Ver galáxia"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:991
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
-msgstr ""
+msgstr "Ver cluster"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1015
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
-msgstr ""
+msgstr "Atualizar objetos"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1021
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
-msgstr ""
+msgstr "Ver modelo do objeto"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
+#: View/Sightingdb/add.ctp:6
+msgid "Add SightingDB connection"
+msgstr "Adicionar conexão ao SightingDB"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
+msgid "Edit SightingDB connection"
+msgstr "Editar conexão ao SightingDB"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
+msgid "List SightingDB connections"
+msgstr "Listar conexões ao SightingDB"
 
 #: View/Elements/genericElements/SideMenu/side_menu_post_link.ctp:26
 #: View/Errors/error403.ctp:4
 msgid "%s"
+msgstr "%s"
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:4
+msgid "Show database indexes"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:9
+msgid "Index diagnostic:"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:12
+msgid "Notice"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:13
+msgid "The highlighted issues may be benign. if you are unsure, please open an issue and ask for clarification."
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:47
+msgid "Fix Database Index Schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
+msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:62
+msgid "The current database schema does not match the expected format."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
+msgid "Database schema diagnostic: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:68;74
+msgid "The MISP database state does not match the expected schema. Resolving these issues is recommended."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:69;75
+msgid "⚠ This diagnostic tool is in experimental state - the highlighted issues may be benign. If you are unsure, please open an issue on with the issues identified over at https://github.com/MISP/MISP for clarification."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:79
+msgid "Reveal benign deltas"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Table name"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Expected schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Actual schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
+msgid "Fix Database schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
+msgid "The current database is correct"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
+msgid "Expected DB_version: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
+msgid "The current database version matches the expected one"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
+msgid "Actual DB_version: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
+msgid "The current database version does not match the expected one"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
+msgid "Updates are locked"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
+msgid "Updates are not locked"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+#: View/Servers/update_progress.ctp:32
+msgid "Updates are locked due to to many update fails"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+msgid "Updates unlocked in %s"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
+msgid "DataSource: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
+msgid "Column diagnostic"
 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 ""
+msgstr "Configuração incorreta de codificação da base de dados: sua conexão de base de dados NÃO está definida como UTF-8. Por favor certifique-se de descomentar a linha 'encoding' => 'utf8' em "
 
 #: View/Elements/healthElements/diagnostics.ctp:9
 msgid "MISP version"
-msgstr ""
+msgstr "Versão do MISP"
 
 #: 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 ""
+msgstr "Toda versão do MISP inclui um arquivo json com a versão atual. Este é verificado com a tag mais recente no github, se houver uma diferença de versão, a ferramenta avisará você sobre isso. Certifique-se de atualizar o MISP regularmente."
 
 #: View/Elements/healthElements/diagnostics.ctp:12
 msgid "Currently installed version…"
-msgstr ""
+msgstr "Versão instalada atualmente…"
 
 #: View/Elements/healthElements/diagnostics.ctp:18
 msgid "Upcoming development version"
@@ -6937,11 +9545,11 @@ msgstr "Status…"
 
 #: View/Elements/healthElements/diagnostics.ctp:59
 msgid "Current branch…"
-msgstr ""
+msgstr "Branch atual…"
 
 #: View/Elements/healthElements/diagnostics.ctp:64
 msgid "You are not on a branch, Update MISP will fail"
-msgstr ""
+msgstr "Você não está em um branch, Atualizar MISP irá falhar"
 
 #: View/Elements/healthElements/diagnostics.ctp:68
 msgid "Pull the latest MISP version from github"
@@ -6956,7 +9564,7 @@ msgid "Click the following button to go to the update progress page. This page l
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:69
-msgid "Update Progress"
+msgid "View Update Progress"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:71
@@ -6969,11 +9577,11 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:75
 msgid "Load all JSON into the database."
-msgstr ""
+msgstr "Carregar todo o JSON para a base de dados."
 
 #: View/Elements/healthElements/diagnostics.ctp:76
 msgid "Load JSON into database"
-msgstr ""
+msgstr "Carregar JSON para a base de dados"
 
 #: View/Elements/healthElements/diagnostics.ctp:79
 msgid "Writeable Directories and files"
@@ -7046,7 +9654,7 @@ msgid "PHP CLI Version"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:162
-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: "
+msgid "Please note that the support for Python versions below 3.6 and below PHP 7.2 has been dropped as of 2020-01-01 and are henceforth considered unsupported. More info: "
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:163
@@ -7071,237 +9679,293 @@ msgstr "Não carregado"
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:197
-msgid "Advanced attachment handler"
+#: View/Elements/healthElements/diagnostics.ctp:206
+msgid "Table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:198
-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:203
-msgid "PyMISP"
-msgstr "PyMISP"
-
-#: View/Elements/healthElements/diagnostics.ctp:203
-msgid "Not installed or version outdated."
-msgstr "Não instalado ou versão desatualizada."
-
-#: View/Elements/healthElements/diagnostics.ctp:215
-msgid "STIX and Cybox libraries"
-msgstr "Bibliotecas STIX e Cybox"
-
-#: View/Elements/healthElements/diagnostics.ctp:216
-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."
+#: View/Elements/healthElements/diagnostics.ctp:211
+msgid "Used"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:217
-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"
+msgid "Reclaimable"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:223
+msgid "SQL database status"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:224
-msgid "Other versions might work but are not tested / recommended."
+msgid "Size of each individual table on disk, along with the size that can be freed via SQL optimize. Make sure that you always have at least 3x the size of the largest table in free space in order for the update scripts to work as expected."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:233
-msgid "STIX and CyBox"
-msgstr "STIX e CyBox"
+#: View/Elements/healthElements/diagnostics.ctp:229
+msgid "Schema status"
+msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:233
-msgid "Could not read test script (stixtest.py)."
-msgstr "Não foi possível ler o script de teste (stixtest.py)."
+#: View/Elements/healthElements/diagnostics.ctp:246
+msgid "Redis info"
+msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:247
-msgid " library version"
-msgstr " versão da biblioteca"
+#: View/Elements/healthElements/diagnostics.ctp:248
+msgid "PHP extension version"
+msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:264
-msgid "Yara"
+#: View/Elements/healthElements/diagnostics.ctp:248
+msgid "Not installed."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:250
+msgid "Redis version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:251
+msgid "Memory allocator"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:252
+msgid "Memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:253
+msgid "Peak memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:254
+msgid "Total system memory"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:259
+msgid "Advanced attachment handler"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:260
+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:265
-msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
-msgstr ""
+msgid "PyMISP"
+msgstr "PyMISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:272
-msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
-msgstr ""
+#: View/Elements/healthElements/diagnostics.ctp:265
+msgid "Not installed or version outdated."
+msgstr "Não instalado ou versão desatualizada."
 
-#: View/Elements/healthElements/diagnostics.ctp:274
-msgid "plyara library installed"
-msgstr ""
+#: View/Elements/healthElements/diagnostics.ctp:277
+msgid "STIX and Cybox libraries"
+msgstr "Bibliotecas STIX e Cybox"
 
 #: View/Elements/healthElements/diagnostics.ctp:278
+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:279
+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:286
+msgid "Other versions might work but are not tested / recommended."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:295
+msgid "STIX and CyBox"
+msgstr "STIX e CyBox"
+
+#: View/Elements/healthElements/diagnostics.ctp:295
+msgid "Could not read test script (stixtest.py)."
+msgstr "Não foi possível ler o script de teste (stixtest.py)."
+
+#: View/Elements/healthElements/diagnostics.ctp:309
+msgid " library version"
+msgstr " versão da biblioteca"
+
+#: View/Elements/healthElements/diagnostics.ctp:326
+msgid "Yara"
+msgstr "Yara"
+
+#: View/Elements/healthElements/diagnostics.ctp:327
+msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
+msgstr "Esta ferramenta testa se plyara, a biblioteca utilizada pela ferramenta de exportação yara está instalada ou não."
+
+#: View/Elements/healthElements/diagnostics.ctp:334
+msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
+msgstr "Versão inválida de plyara / plyara não instalada. Por favor, execute pip3 install plyara"
+
+#: View/Elements/healthElements/diagnostics.ctp:336
+msgid "plyara library installed"
+msgstr "Biblioteca plyara instalada"
+
+#: View/Elements/healthElements/diagnostics.ctp:340
 msgid "GnuPG"
 msgstr "GnuPG"
 
-#: View/Elements/healthElements/diagnostics.ctp:279
+#: View/Elements/healthElements/diagnostics.ctp:341
 msgid "This tool tests whether your GnuPG is set up correctly or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:287
+#: View/Elements/healthElements/diagnostics.ctp:349
 msgid "GnuPG installation and settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:290
+#: View/Elements/healthElements/diagnostics.ctp:352
 msgid "ZeroMQ"
 msgstr "ZeroMQ"
 
-#: View/Elements/healthElements/diagnostics.ctp:291
+#: View/Elements/healthElements/diagnostics.ctp:353
 msgid "This tool tests whether the ZeroMQ extension is installed and functional."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:299
+#: View/Elements/healthElements/diagnostics.ctp:361
 msgid "ZeroMQ settings"
-msgstr ""
+msgstr "Configurações ZeroMQ"
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:305
+#: View/Elements/healthElements/diagnostics.ctp:367
 msgid "Check ZeroMQ service status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:307
+#: View/Elements/healthElements/diagnostics.ctp:369
 msgid "Proxy"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:308
+#: View/Elements/healthElements/diagnostics.ctp:370
 msgid "This tool tests whether your HTTP proxy settings are correct."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:316
+#: View/Elements/healthElements/diagnostics.ctp:378
 #: View/Pages/doc/administration.ctp:35
 msgid "Proxy settings"
-msgstr ""
+msgstr "Configurações de proxy"
 
-#: View/Elements/healthElements/diagnostics.ctp:319
+#: View/Elements/healthElements/diagnostics.ctp:381
 msgid "Module System"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:320
+#: View/Elements/healthElements/diagnostics.ctp:382
 msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:335
+#: View/Elements/healthElements/diagnostics.ctp:397
 msgid " module system"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:341
+#: View/Elements/healthElements/diagnostics.ctp:403
 msgid "Session table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:342
+#: View/Elements/healthElements/diagnostics.ctp:404
 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:349
+#: View/Elements/healthElements/diagnostics.ctp:411
 msgid "Expired sessions"
-msgstr ""
+msgstr "Sessões expiradas"
 
-#: View/Elements/healthElements/diagnostics.ctp:355
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Purge sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:359
+#: View/Elements/healthElements/diagnostics.ctp:421
 msgid "Clean model cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:360
+#: View/Elements/healthElements/diagnostics.ctp:422
 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:361
+#: View/Elements/healthElements/diagnostics.ctp:423
 msgid "Clean cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:362
-msgid "Overwritten objects"
+#: View/Elements/healthElements/diagnostics.ctp:427
+msgid "Check for deprecated function usage"
+msgstr "Verificar o uso de função obsoleta"
+
+#: View/Elements/healthElements/diagnostics.ctp:428
+msgid "In an effort to identify the usage of deprecated functionalities, MISP has started aggregating the count of access requests to these endpoints. Check the frequency of their use below along with the users to potentially warn about better ways of achieving their goals."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:363
-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."
+#: View/Elements/healthElements/diagnostics.ctp:431;432;434
+msgid "View deprecated endpoint usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:364
-msgid "Reconstruct overwritten objects"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:365;368
+#: View/Elements/healthElements/diagnostics.ctp:438;441
 msgid "Orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:366
+#: View/Elements/healthElements/diagnostics.ctp:439
 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:368;382
+#: View/Elements/healthElements/diagnostics.ctp:441;455
 msgid "Run the test below"
-msgstr ""
+msgstr "Executar o teste abaixo"
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attribute"
-msgstr ""
+msgstr "Verificar se há atributo órfão"
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attributes"
-msgstr ""
+msgstr "Verificar se há atributos órfãos"
 
-#: View/Elements/healthElements/diagnostics.ctp:371
+#: View/Elements/healthElements/diagnostics.ctp:444
 msgid "Remove orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:372
+#: View/Elements/healthElements/diagnostics.ctp:445
 msgid "Remove published empty events"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:373;375
+#: View/Elements/healthElements/diagnostics.ctp:446;448
 #: View/Servers/ondemand_action.ctp:7
 msgid "Administrator On-demand Action"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:374
+#: View/Elements/healthElements/diagnostics.ctp:447
 msgid "Click the following button to go to the Administrator On-demand Action page."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:376;378
+#: View/Elements/healthElements/diagnostics.ctp:449;451
 msgid "Legacy Administrative Tools"
 msgstr "Ferramentas Administrativas Legadas"
 
-#: View/Elements/healthElements/diagnostics.ctp:377
+#: View/Elements/healthElements/diagnostics.ctp:450
 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:379
+#: View/Elements/healthElements/diagnostics.ctp:452
 msgid "Verify bad link on attachments"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:380
+#: View/Elements/healthElements/diagnostics.ctp:453
 msgid "Verify each attachment referenced in database is accessible on filesystem."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:382
+#: View/Elements/healthElements/diagnostics.ctp:455
 msgid "Non existing attachments referenced in Database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:384
+#: View/Elements/healthElements/diagnostics.ctp:457
 msgid "Check bad link on attachments"
 msgstr ""
 
@@ -7340,14 +10004,14 @@ msgstr "Permissões"
 #: View/Elements/healthElements/files.ctp:73
 #: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:80
-#: View/SharingGroups/index.ctp:87
+#: View/Roles/admin_index.ctp:90
+#: View/SharingGroups/index.ctp:89
 msgid "Are you sure you want to delete %s?"
 msgstr "Tem certeza que deseja excluir %s?"
 
 #: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
-msgstr ""
+msgstr "Crítica, sua instância MISP requer atenção imediata."
 
 #: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
@@ -7362,34 +10026,17 @@ msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
+#: View/Sightingdb/index.ctp:32
 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/resolved_misp_format.ctp:91;261
-#: View/Events/show_i_o_c_results.ctp:13
-#: View/Feeds/freetext_index.ctp:33
-#: View/Noticelists/view.ctp:42
-#: View/Objects/add.ctp:102
-#: View/Objects/group_attributes_into_object.ctp:58
-#: View/Objects/revise_object.ctp:58
-#: 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 ""
+msgstr "Saúde geral"
 
 #: View/Elements/healthElements/overview.ctp:24
 msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr ""
+msgstr "A saúde geral da sua instância depende dos problemas mais graves não resolvidos."
 
 #: View/Elements/healthElements/overview.ctp:31
 msgid " settings incorrectly or not set"
@@ -7401,7 +10048,7 @@ msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:39
 msgid "Critical issues revealed by the diagnostics"
-msgstr ""
+msgstr "Questões críticas reveladas pelo diagnóstico"
 
 #: View/Elements/healthElements/overview.ctp:40
 msgid "%s issues detected."
@@ -7418,22 +10065,23 @@ msgstr ""
 #: View/Elements/healthElements/settings_table.ctp:3
 #: View/Pages/doc/administration.ctp:45
 msgid "Priority"
-msgstr ""
+msgstr "Prioridade"
 
 #: View/Elements/healthElements/settings_table.ctp:4
 #: View/Pages/doc/administration.ctp:46
+#: View/UserSettings/index.ctp:62
 msgid "Setting"
-msgstr ""
+msgstr "Configuração"
 
 #: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
-msgstr ""
+msgstr "Mensagem de erro"
 
 #: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
-msgstr ""
+msgstr "Visão geral"
 
 #: View/Elements/healthElements/tabs.ctp:18
 msgid "%s settings%s"
@@ -7441,12 +10089,12 @@ msgstr ""
 
 #: View/Elements/healthElements/tabs.ctp:23
 msgid "This tab reports some potential critical misconfigurations."
-msgstr ""
+msgstr "Esta aba informa algumas possíveis configurações incorretas críticas."
 
 #: View/Elements/healthElements/tabs.ctp:34
 #: View/Pages/doc/administration.ctp:38
 msgid "Diagnostics"
-msgstr ""
+msgstr "Diagnóstico"
 
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
@@ -7460,7 +10108,7 @@ msgstr ""
 #: View/Elements/healthElements/tabs.ctp:65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
-msgstr ""
+msgstr "Baixar relatório"
 
 #: View/Elements/healthElements/tabs.ctp:71
 msgid "Filter the table(s) below"
@@ -7488,7 +10136,7 @@ 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 ""
+msgstr "Existem problemas com o(s) worker(s), mas pelo menos um worker saudável está monitorando a fila."
 
 #: View/Elements/healthElements/workers.ctp:35
 msgid "Worker type: "
@@ -7500,18 +10148,19 @@ msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:45
 msgid "Queue status: "
-msgstr ""
+msgstr "Status da fila: "
 
 #: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
-msgstr "Worker PID"
+msgstr "PID do worker"
 
 #: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
 #: View/TagCollections/index.ctp:14
-#: View/Users/admin_view.ctp:98
-#: View/Users/view.ctp:58
+#: View/UserSettings/index.ctp:56
+#: View/Users/admin_view.ctp:109
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr "Usuário"
 
@@ -7529,7 +10178,7 @@ msgstr "Worker não está funcionando!"
 
 #: View/Elements/healthElements/workers.ctp:77
 msgid "The worker appears to be healthy."
-msgstr ""
+msgstr "O worker parece estar saudável."
 
 #: 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."
@@ -7549,14 +10198,14 @@ 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 ""
+msgstr "Parar (se ainda estiver em execução) e remover este worker. Isto encerrará imediatamente todos os jobs que estão sendo executados por ele."
 
 #: View/Elements/healthElements/workers.ctp:119
 msgid "Start a worker"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
+msgid "Restart dead workers"
 msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
@@ -7648,11 +10297,15 @@ msgstr ""
 msgid "Blocked Orgs (AND NOT)"
 msgstr ""
 
-#: View/Elements/serverRuleElements/pull.ctp:65
+#: View/Elements/serverRuleElements/pull.ctp:60
+msgid "Additional sync parameters (based on the event index filters)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:68
 msgid "Accept changes"
 msgstr "Aceitar modificações"
 
-#: View/Elements/serverRuleElements/pull.ctp:65
+#: View/Elements/serverRuleElements/pull.ctp:68
 #: View/Elements/serverRuleElements/push.ctp:67
 msgid "Update"
 msgstr "Atualizar"
@@ -7671,7 +10324,7 @@ msgstr ""
 
 #: View/Elements/serverRuleElements/push.ctp:49
 msgid "Available  Organisations"
-msgstr ""
+msgstr "Organizações disponíveis"
 
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:3
 #: View/Noticelists/view.ctp:41
@@ -7679,29 +10332,6 @@ msgstr ""
 msgid "Field"
 msgstr ""
 
-#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
-#: View/Events/export.ctp:26
-#: View/Events/resolved_attributes.ctp:48
-#: View/Events/resolved_misp_format.ctp:90;260
-#: View/Events/show_i_o_c_results.ctp:12
-#: View/Feeds/freetext_index.ctp:32
-#: View/Feeds/search_caches.ctp:41
-#: View/Objects/revise_object.ctp:57
-#: 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 ""
@@ -7732,10 +10362,6 @@ msgstr ""
 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
@@ -7758,32 +10384,11 @@ msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
 #: View/ObjectReferences/ajax/add.ctp:86
-#: View/Objects/revise_object.ctp:55
+#: View/Objects/revise_object.ctp:62
 #: 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/resolved_misp_format.ctp:89;259
-#: View/Events/show_i_o_c_results.ctp:11
-#: View/Feeds/freetext_index.ctp:31
-#: View/Objects/add.ctp:101
-#: View/Objects/group_attributes_into_object.ctp:57
-#: View/Objects/propose_objects_from_attributes.ctp:16
-#: View/Objects/revise_object.ctp:56
-#: 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 ""
+msgstr "Atributo"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
 #: View/Pages/doc/categories_and_types.ctp:57
@@ -7907,20 +10512,6 @@ msgstr ""
 msgid "Event Blacklists"
 msgstr ""
 
-#: View/EventBlacklists/index.ctp:35
-#: View/Events/index.ctp:94
-#: View/Feeds/preview_index.ctp:25
-#: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
-#: View/ObjectTemplates/index.ctp:47
-#: View/Organisations/index.ctp:75
-#: View/Servers/preview_index.ctp:64
-#: View/Tags/index.ctp:56
-#: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:61
-msgid "Filter"
-msgstr ""
-
 #: View/EventBlacklists/index.ctp:51
 #: View/Events/resolved_misp_format.ctp:39
 msgid "Event UUID"
@@ -7938,77 +10529,113 @@ msgstr ""
 msgid "Are you sure you want to delete from the blacklist the selected events?"
 msgstr ""
 
+#: View/EventDelegations/index.ctp:30
+msgid "Pending"
+msgstr "Pendentes"
+
+#: View/EventDelegations/index.ctp:35
+msgid "Issued"
+msgstr "Emitidas"
+
+#: View/EventDelegations/index.ctp:56
+msgid "Requester"
+msgstr "Solicitante"
+
+#: View/EventDelegations/index.ctp:63
+#: View/Pages/doc/administration.ctp:134
+msgid "Recipient"
+msgstr "Destinatário"
+
+#: View/EventDelegations/index.ctp:82
+#: View/Events/automation.ctp:279;286
+#: 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 "Mensagem"
+
+#: View/EventDelegations/index.ctp:86
+msgid "Delegation index"
+msgstr "Índice de delegação"
+
+#: View/EventDelegations/index.ctp:87
+#: View/Posts/add.ctp:33
+msgid ""
+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 ""
+msgstr "Tem certeza que deseja aceitar a solicitação de %s para apropriar-se do evento #%s"
 
 #: View/EventDelegations/ajax/delegate_event.ctp:2
 msgid "Delegate the publishing of the Event to another organisation"
-msgstr ""
+msgstr "Delegar a publicação do evento para outra organização"
 
 #: View/EventDelegations/ajax/delegate_event.ctp:3
 msgid "Warning: You are about to request another organisation to take ownership of this event."
-msgstr ""
+msgstr "Aviso: Você está prestes a solicitar a uma outra organização que aproprie-se deste evento."
 
 #: View/EventDelegations/ajax/delegate_event.ctp:8
 msgid "Target Organisation"
-msgstr ""
+msgstr "Organização alvo"
 
 #: View/EventDelegations/ajax/delegate_event.ctp:10
 msgid "Select organisation"
-msgstr ""
+msgstr "Selecionar organização"
 
 #: View/EventDelegations/ajax/delegate_event.ctp:15
 msgid "Desired Distribution"
-msgstr ""
+msgstr "Distribuição desejada"
 
 #: View/EventDelegations/ajax/delegate_event.ctp:22
 msgid "Desired Sharing Group"
-msgstr ""
+msgstr "Grupo de compartilhamento desejado"
 
 #: View/EventDelegations/ajax/delegate_event.ctp:33
 msgid "Message to the recipient organisation"
-msgstr ""
+msgstr "Mensagem para a organização do destinatário"
 
 #: View/EventDelegations/ajax/delete_delegation.ctp:2
 msgid "Delete Delegation Request"
-msgstr ""
+msgstr "Excluir solicitação de delegação"
 
 #: 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 ""
+msgstr "Tem certeza que deseja descartar a solicitação de %s para apropriar-se do evento #%s"
 
 #: View/EventDelegations/ajax/view.ctp:2
 msgid "Event Delegation"
-msgstr ""
+msgstr "Delegação de evento"
 
 #: View/EventDelegations/ajax/view.ctp:5
 msgid "your organisation"
-msgstr ""
+msgstr "sua organização"
 
 #: View/EventDelegations/ajax/view.ctp:6
 msgid "Your organisation"
-msgstr ""
+msgstr "Sua organização"
 
 #: 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 ""
+msgstr "Detalhes da solicitação</b><br /><span class=\"red bold\">%s</span> está solicitando que <span class=\"red bold\">%s</span> tome conta deste evento."
 
 #: View/EventDelegations/ajax/view.ctp:12
 msgid "The desired distribution level is"
-msgstr ""
+msgstr "O nível de distribuição desejado é"
 
 #: View/EventDelegations/ajax/view.ctp:14
 msgid "The desired sharing group to distribute the event to is"
-msgstr ""
+msgstr "O grupo de compartilhamento desejado para distribuir o evento é"
 
 #: View/EventDelegations/ajax/view.ctp:18
 msgid "Message from requester"
-msgstr ""
+msgstr "Mensagem do solicitante"
 
 #: View/EventDelegations/ajax/view.ctp:21
 msgid "Accept delegation request"
-msgstr ""
+msgstr "Aceitar solicitação de delegação"
 
 #: View/EventDelegations/ajax/view.ctp:21
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
@@ -8020,11 +10647,11 @@ msgstr ""
 #: View/ShadowAttributes/ajax/attributeEditTypeForm.ctp:5
 #: View/ShadowAttributes/ajax/attributeEditValueForm.ctp:5
 msgid "Accept"
-msgstr ""
+msgstr "Aceitar"
 
 #: View/EventDelegations/ajax/view.ctp:23
 msgid "Decline and remove delegation request"
-msgstr ""
+msgstr "Recusar e remover solicitação de delegação"
 
 #: View/EventDelegations/ajax/view.ctp:23
 #: View/ShadowAttributes/ajax/attributeEditCategoryForm.ctp:6
@@ -8033,7 +10660,7 @@ msgstr ""
 #: View/ShadowAttributes/ajax/attributeEditTypeForm.ctp:6
 #: View/ShadowAttributes/ajax/attributeEditValueForm.ctp:6
 msgid "Discard"
-msgstr ""
+msgstr "Descartar"
 
 #: View/EventGraph/ajax/eventGraph_add_form.ctp:6
 msgid "Add EventGraph"
@@ -8051,35 +10678,29 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/Events/add.ctp:45
-#: View/Events/edit.ctp:36
-msgid "Threat Level "
+#: View/Events/add.ctp:39
+#: View/Events/view.ctp:148
+#: 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/add.ctp:50
-#: View/Events/edit.ctp:40
-msgid "Analysis "
-msgstr ""
-
-#: View/Events/add.ctp:54
-#: View/Events/edit.ctp:45
-#: View/ShadowAttributes/index.ctp:52
+#: View/Events/add.ctp:49
+#: View/ShadowAttributes/index.ctp:59
 msgid "Event Info"
 msgstr ""
 
-#: View/Events/add.ctp:58
-#: View/Events/edit.ctp:49
+#: View/Events/add.ctp:52
 msgid "Quick Event Description or Tracking Info"
 msgstr ""
 
-#: View/Events/add.ctp:61
-#: View/Events/edit.ctp:52
-msgid "Extends event"
+#: View/Events/add.ctp:57
+msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr ""
 
-#: View/Events/add.ctp:65
-#: View/Events/edit.ctp:55
-msgid "Event UUID or ID. Leave blank if not applicable."
+#: View/Events/add.ctp:58
+msgid "Extends Event"
 msgstr ""
 
 #: View/Events/add_i_o_c.ctp:4
@@ -8092,7 +10713,7 @@ msgstr ""
 
 #: View/Events/add_misp_export.ctp:7
 msgid "MISP XML or JSON file"
-msgstr ""
+msgstr "Arquivo XML ou JSON do MISP"
 
 #: View/Events/add_misp_export.ctp:16
 msgid "Take ownership of the event"
@@ -8105,16 +10726,12 @@ msgstr ""
 #: View/Events/add_misp_export.ctp:22
 #: View/Events/upload_stix.ctp:17
 msgid "Publish imported events"
-msgstr ""
+msgstr "Publicar eventos importados"
 
 #: 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 ""
@@ -8126,7 +10743,7 @@ msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:24
 msgid "Event created."
-msgstr ""
+msgstr "Evento criado."
 
 #: View/Events/add_misp_export_result.ctp:26
 msgid "Event with this UUID already exists."
@@ -8135,7 +10752,7 @@ msgstr ""
 #: View/Events/add_misp_export_result.ctp:38
 #: View/Servers/preview_index.ctp:112
 msgid "Event "
-msgstr ""
+msgstr "Evento "
 
 #: 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"
@@ -8143,7 +10760,7 @@ msgid "Automation functionality is designed to automatically feed other tools an
 msgstr ""
 
 #: View/Events/automation.ctp:5
-msgid "You can use the <a href=\"servers/rest\">ReST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
+msgid "You can use the <a href=\"/servers/rest\">REST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
 msgstr ""
 
 #: View/Events/automation.ctp:6
@@ -8154,477 +10771,475 @@ msgstr ""
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 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."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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/automation.ctp:27
 #: 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
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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
+#: View/Events/automation.ctp:32
 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
+#: View/Events/automation.ctp:33
 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/automation.ctp:34
 #: 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/automation.ctp:35
 #: 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/automation.ctp:36
 #: 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/automation.ctp:37
 #: 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/automation.ctp:38
 #: 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/automation.ctp:39
 #: 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;150
+#: View/Events/automation.ctp:40;160
 #: 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;151
+#: View/Events/automation.ctp:41;161
 #: 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/automation.ctp:42
 #: 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/automation.ctp:43
 #: 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/automation.ctp:44
 #: View/Events/legacy_automation.ctp:284
 msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
-msgstr ""
+msgstr "Apenas os metadados (evento, etiquetas, relações) são retornados, atributos e propostas são omitidos."
 
-#: View/Events/automation.ctp:35
+#: View/Events/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:46
 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/automation.ctp:47
 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/automation.ctp:48
 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/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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/automation.ctp:52
 #: 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/automation.ctp:53
 #: 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
+#: View/Events/automation.ctp:54
 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
+#: View/Events/automation.ctp:55
 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
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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:81
+#: View/Events/automation.ctp:91
 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 ""
+msgstr "Apenas para CSV, adicione dados do nível de evento para a exportação. Os campos adicionais podem ser adicionados também através de requested_attributes com mais granularidade."
 
-#: View/Events/automation.ctp:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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:97
+#: View/Events/automation.ctp:107
 #: 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:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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:118
+#: View/Events/automation.ctp:128
 #: 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:136
+#: View/Events/automation.ctp:146
 #: 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:138
+#: View/Events/automation.ctp:148
 #: 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:145
+#: View/Events/automation.ctp:155
 #: 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:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:152
+#: View/Events/automation.ctp:162
 #: 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:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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:156
+#: View/Events/automation.ctp:166
 #: 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:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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:172
+#: View/Events/automation.ctp:182
 #: 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:173
+#: View/Events/automation.ctp:183
 #: 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:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:187
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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:191
+#: View/Events/automation.ctp:201
 #: 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:192
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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:205
+#: View/Events/automation.ctp:215
 #: 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:206
+#: View/Events/automation.ctp:216
 #: 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:207
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:208
+#: View/Events/automation.ctp:218
 #: 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:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
-msgstr ""
+msgstr "Adicionar ou remover etiquetas dos eventos"
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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:214
+#: View/Events/automation.ctp:224
 #: 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:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
-msgstr ""
+msgstr "Propostas e a API"
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
-msgstr ""
+msgstr "Você pode interagir com as propostas diretamente através da API desde a versão 2.3.148"
 
-#: View/Events/automation.ctp:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:68
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -8632,208 +11247,200 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
-#: View/Servers/rest.ctp:160
+#: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
-msgstr ""
+msgstr "Ver todas as propostas de um evento"
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:269;276
-#: 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:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
-msgstr ""
+msgstr "Descartar uma proposta"
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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:291
+#: View/Events/automation.ctp:301
 #: 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:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:309
+#: View/Events/automation.ctp:319
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:310
+#: View/Events/automation.ctp:320
 #: 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:311
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:324
 #: 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:315
+#: View/Events/automation.ctp:325
 #: 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:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 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:322
+#: View/Events/automation.ctp:332
 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:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
-msgstr ""
+msgstr "Adicionar worker"
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -8880,7 +11487,7 @@ msgstr ""
 #: View/Pages/doc/administration.ctp:230
 #: View/Pages/doc/using_the_system.ctp:381
 msgid "Progress"
-msgstr ""
+msgstr "Progresso"
 
 #: View/Events/export.ctp:63
 msgid "Attachments are enabled on this instance"
@@ -8908,7 +11515,7 @@ msgstr ""
 
 #: View/Events/export.ctp:115;144
 msgid "Download"
-msgstr ""
+msgstr "Baixar"
 
 #: View/Events/export.ctp:125
 msgid "Generate"
@@ -8924,27 +11531,27 @@ msgstr ""
 
 #: View/Events/export_alternate.ctp:10
 msgid "Download all as XML"
-msgstr ""
+msgstr "Baixar todos como XML"
 
 #: View/Events/export_alternate.ctp:12
 msgid "Click this to download all events and attributes that you have access to (except file attachments) in a custom XML format."
-msgstr ""
+msgstr "Clique aqui para baixar todos os eventos e atributos que você tem acesso (exceto anexos de arquivos) em um formato XML personalizado."
 
 #: View/Events/export_alternate.ctp:17
 msgid "Download all signatures as CSV"
-msgstr ""
+msgstr "Baixar todas as assinaturas como CSV"
 
 #: View/Events/export_alternate.ctp:24
 msgid "Download all as CSV"
-msgstr ""
+msgstr "Baixar todos como CSV"
 
 #: View/Events/export_alternate.ctp:31
 msgid "Download Suricata signatures"
-msgstr ""
+msgstr "Baixar assinaturas Suricata"
 
 #: View/Events/export_alternate.ctp:32
 msgid "Download Snort signatures"
-msgstr ""
+msgstr "Baixar assinaturas Snort"
 
 #: View/Events/export_alternate.ctp:34
 msgid "Click these to download all network related attributes that you\n"
@@ -8952,11 +11559,15 @@ msgid "Click these to download all network related attributes that you\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 ""
+msgstr "Clique aqui para baixar todos os atributos relacionados à rede que você\n"
+"                        tem acesso no formato de regra Suricata ou Snort. Apenas eventos e atributos <em>publicados</em>\n"
+"                        marcados como <em>Assinatura IDS</em> são exportados.\n"
+"                        A administração é capaz de manter uma lista branca contendo host,\n"
+"                        nome de domínio e números de IP para excluir da exportação NIDS."
 
 #: View/Events/export_alternate.ctp:43
 msgid "Download Bro signatures"
-msgstr ""
+msgstr "Baixar assinaturas Bro"
 
 #: View/Events/export_alternate.ctp:45
 msgid "Click these to download all network related attributes that you\n"
@@ -8968,15 +11579,15 @@ msgstr ""
 
 #: View/Events/export_alternate.ctp:54
 msgid "Download RPZ Zone File"
-msgstr ""
+msgstr "Baixar arquivo de zona RPZ"
 
 #: View/Events/export_alternate.ctp:61
 msgid "Download all MD5 hashes"
-msgstr ""
+msgstr "Baixar todos os hashes MD5"
 
 #: View/Events/export_alternate.ctp:62
 msgid "Download all SHA1 hashes"
-msgstr ""
+msgstr "Baixar todos os hashes SHA1"
 
 #: View/Events/export_alternate.ctp:64
 msgid "Click on one of these two buttons to download all MD5 or SHA1\n"
@@ -9029,14 +11640,14 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:145
 msgid "Delete filter"
-msgstr ""
+msgstr "Excluir filtro"
 
 #: View/Events/filter_event_index.ctp:153
 #: View/Users/admin_filter_user_index.ctp:89
@@ -9075,46 +11686,46 @@ msgstr ""
 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
+#: View/Events/import_module.ctp:99
 msgid "Input File"
 msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 msgid "Events"
-msgstr ""
+msgstr "Eventos"
 
 #: View/Events/index.ctp:34
 #: View/Logs/admin_index.ctp:54
 #: View/Servers/preview_index.ctp:37
-#: View/Users/admin_index.ctp:34
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr ""
 
 #: View/Events/index.ctp:45
 msgid "Delete selected Events"
-msgstr ""
+msgstr "Excluir eventos selecionados"
 
 #: View/Events/index.ctp:73
 msgid "My events only"
-msgstr ""
+msgstr "Meus eventos apenas"
 
 #: View/Events/index.ctp:74
 msgid "My Events"
-msgstr ""
+msgstr "Meus eventos"
 
 #: View/Events/index.ctp:82
 msgid "My organisation's events only"
-msgstr ""
+msgstr "Eventos da minha organização apenas"
 
 #: View/Events/index.ctp:83
 msgid "Org Events"
-msgstr ""
+msgstr "Eventos da organização"
 
 #: 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"
@@ -9126,6 +11737,11 @@ msgstr ""
 msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
+#: View/Events/legacy_automation.ctp:7
+msgid "Your current key is: <code>%s</code>.\n"
+"    You can %s this key."
+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 ""
@@ -9315,7 +11931,7 @@ msgstr ""
 
 #: View/Events/legacy_automation.ctp:156
 msgid "Together with this JSON object in the POST message"
-msgstr ""
+msgstr "Junto com este objeto JSON na mensagem POST"
 
 #: View/Events/legacy_automation.ctp:158
 msgid "XML is automagically assumed when using the stix export"
@@ -9386,11 +12002,11 @@ msgstr ""
 
 #: View/Events/legacy_automation.ctp:263
 msgid "Searches with JSON/XML/OpenIOC results"
-msgstr ""
+msgstr "Pesquisas com resultados 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 ""
+msgstr "Defina o formato de retorno da pesquisa (atualmente suportado: json, xml, openioc - mais formatos em breve)."
 
 #: 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"
@@ -9443,7 +12059,7 @@ msgid "You can also use search for IP addresses using CIDR. Make sure that you u
 msgstr ""
 
 #: View/Events/merge.ctp:4
-msgid "Merge events"
+msgid "Merge events - WARNING: this feature is very outdated and should not be used anymore."
 msgstr ""
 
 #: View/Events/merge.ctp:9
@@ -9461,13 +12077,13 @@ msgstr ""
 
 #: View/Events/proposal_event_index.ctp:2
 msgid "Event with proposals"
-msgstr ""
+msgstr "Evento com propostas"
 
 #: View/Events/proposal_event_index.ctp:24
 #: View/Pages/doc/concepts.ctp:28
 #: View/ShadowAttributes/index.ctp:2
 msgid "Proposals"
-msgstr ""
+msgstr "Propostas"
 
 #: View/Events/proposal_event_index.ctp:25
 #: View/Events/view.ctp:116
@@ -9501,29 +12117,18 @@ msgstr ""
 
 #: View/Events/resolved_attributes.ctp:26
 msgid "Proposals instead of attributes"
-msgstr ""
+msgstr "Propostas em vez de atributos"
 
 #: View/Events/resolved_attributes.ctp:46
 msgid "Similar Attributes"
 msgstr ""
 
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/resolved_misp_format.ctp:95;265
-#: View/Objects/add.ctp:104
+#: View/Events/resolved_misp_format.ctp:96;291
+#: View/Objects/add.ctp:117
 msgid "Disable Correlation"
 msgstr ""
 
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/resolved_misp_format.ctp:96;266
-#: View/ObjectReferences/ajax/add.ctp:30
-#: View/Objects/add.ctp:67;106
-#: View/Objects/group_attributes_into_object.ctp:30
-#: View/Objects/revise_object.ctp:49;60
-#: 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:195
 msgid "Remove resolved attribute"
 msgstr ""
@@ -9559,15 +12164,19 @@ msgstr ""
 msgid "#Resolved Attributes"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:107
+#: View/Events/resolved_misp_format.ctp:89;284
+msgid "Import"
+msgstr "Importar"
+
+#: View/Events/resolved_misp_format.ctp:111
 msgid "ID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:112
+#: View/Events/resolved_misp_format.ctp:127
 msgid "UUID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:113
+#: View/Events/resolved_misp_format.ctp:128
 msgid "Meta Category: "
 msgstr ""
 
@@ -9585,7 +12194,6 @@ msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -9609,7 +12217,7 @@ msgstr ""
 
 #: View/Events/upload_analysis_file.ctp:6
 msgid "Import analysis file"
-msgstr ""
+msgstr "Importar arquivo de análise"
 
 #: View/Events/upload_analysis_file.ctp:61
 msgid "Create Objects"
@@ -9640,192 +12248,186 @@ msgstr ""
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:86
-msgid "Creator org"
-msgstr ""
-
-#: View/Events/view.ctp:147
-#: 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:153
+#: View/Events/view.ctp:154
 #: 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:177
+#: View/Events/view.ctp:178
 msgid "Toggle advanced sharing network viewer"
 msgstr ""
 
-#: View/Events/view.ctp:183
+#: View/Events/view.ctp:184
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr ""
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:188
 #: 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 ""
+msgstr "Publicado"
 
-#: View/Events/view.ctp:193
+#: View/Events/view.ctp:194
 msgid " (%s Objects)"
 msgstr ""
 
-#: View/Events/view.ctp:193
+#: View/Events/view.ctp:194
 msgid " (%s Object)"
 msgstr ""
 
-#: View/Events/view.ctp:195
+#: View/Events/view.ctp:196
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:199
+#: View/Events/view.ctp:200
 msgid "First recorded change"
 msgstr ""
 
-#: View/Events/view.ctp:203
+#: View/Events/view.ctp:204
 msgid "Last change"
 msgstr ""
 
-#: View/Events/view.ctp:207
+#: View/Events/view.ctp:208
 msgid "Modification map"
 msgstr ""
 
-#: View/Events/view.ctp:213
+#: View/Events/view.ctp:214
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:232
+#: View/Events/view.ctp:233
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:239
+#: View/Events/view.ctp:240
 msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:239
+#: View/Events/view.ctp:240
 msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:270
+#: View/Events/view.ctp:271
 msgid "%s has requested that %s take over this event."
-msgstr ""
+msgstr "%s solicitou que %s tome conta deste evento."
 
-#: View/Events/view.ctp:276
+#: View/Events/view.ctp:277
 msgid "%s has requested that you take over this event."
-msgstr ""
+msgstr "%s solicitou que você tome conta deste evento."
 
-#: View/Events/view.ctp:282
+#: View/Events/view.ctp:283
 msgid "You have requested that %s take over this event."
-msgstr ""
+msgstr "Você solicitou que %s tome conta deste evento."
 
-#: View/Events/view.ctp:287
+#: View/Events/view.ctp:288
 msgid "Delegation request"
-msgstr ""
+msgstr "Solicitação de delegação"
 
-#: View/Events/view.ctp:299
+#: View/Events/view.ctp:300
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:309
-#: View/Users/admin_view.ctp:86
+#: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
+#: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:309
-#: View/Feeds/view.ctp:62
-#: View/Noticelists/index.ctp:63
-#: View/ObjectTemplates/index.ctp:35
-#: View/Taxonomies/view.ctp:24
-msgid "Enabled"
-msgstr ""
-
-#: View/Events/view.ctp:318
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "enable"
 msgstr ""
 
-#: View/Events/view.ctp:318
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:329
+#: View/Events/view.ctp:330
 msgid "Extended view"
 msgstr ""
 
-#: View/Events/view.ctp:346
+#: View/Events/view.ctp:337
+msgid "Warning: Taxonomy inconsistencies"
+msgstr ""
+
+#: View/Events/view.ctp:382
 #: View/Feeds/preview_event.ctp:84
 #: View/Servers/preview_event.ctp:112
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:406;441
+#: View/Events/view.ctp:443;478
 msgid "This event has "
 msgstr ""
 
-#: View/Events/view.ctp:407;442
+#: View/Events/view.ctp:444;479
 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:450
+#: View/Events/view.ctp:487
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:466
+#: View/Events/view.ctp:503
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:466
+#: View/Events/view.ctp:503
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:469
+#: View/Events/view.ctp:506
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:469
+#: View/Events/view.ctp:506
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:472
+#: View/Events/view.ctp:509
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:475
+#: View/Events/view.ctp:512
+msgid "Toggle Event timeline"
+msgstr ""
+
+#: View/Events/view.ctp:512
+msgid "Event timeline"
+msgstr ""
+
+#: View/Events/view.ctp:515
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:475
+#: View/Events/view.ctp:515
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:478
+#: View/Events/view.ctp:518
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:478
+#: View/Events/view.ctp:518
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:481
+#: View/Events/view.ctp:521
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:484
+#: View/Events/view.ctp:524
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:484
+#: View/Events/view.ctp:524
 msgid "Discussion"
 msgstr ""
 
@@ -9847,19 +12449,19 @@ msgstr ""
 
 #: View/Events/ajax/enrich_event.ctp:4
 msgid "Select the enrichments you wish to run"
-msgstr ""
+msgstr "Selecione os enriquecimentos que você deseja executar"
 
 #: View/Events/ajax/enrich_event.ctp:17
 msgid "Enrich"
-msgstr ""
+msgstr "Enriquecer"
 
 #: View/Events/ajax/enrichmentChoice.ctp:7
 msgid "Choose the enrichment module that you wish to use for the expansion"
-msgstr ""
+msgstr "Escolha o módulo de enriquecimento que você deseja usar para a expansão"
 
 #: View/Events/ajax/enrichmentChoice.ctp:24
 msgid "Enrich using the %s module"
-msgstr ""
+msgstr "Enriquecer usando o módulo %s"
 
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:6
 msgid "Event Deletion"
@@ -9875,22 +12477,26 @@ msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:6
 msgid "Publish Event%s"
-msgstr ""
+msgstr "Publicar evento%s"
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:8
 msgid "Unpublish Event%s"
-msgstr ""
+msgstr "Despublicar evento%s"
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:18
 msgid "Are you sure you wish to unpublish the event?"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:20
+msgid "Are you sure you wish publish and synchronise all sightings attached to this event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:22
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
-#: View/Feeds/index.ctp:105
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -9906,7 +12512,7 @@ msgstr ""
 
 #: View/Events/ajax/importChoice.ctp:7
 msgid "Import %s"
-msgstr ""
+msgstr "Importar %s"
 
 #: View/Events/ajax/toggle_correlation.ctp:6
 msgid "Toggle Correlation %s"
@@ -9924,209 +12530,211 @@ msgstr ""
 msgid "Add MISP Feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:5
-msgid "Add a new MISP feed source."
-msgstr ""
-
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
-#: View/Feeds/view.ctp:63
-msgid "Caching enabled"
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
 msgstr ""
 
 #: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+msgid "Add a new MISP feed source."
+msgstr ""
+
+#: View/Feeds/add.ctp:14
+#: View/Feeds/view.ctp:64
+msgid "Caching enabled"
+msgstr ""
+
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr ""
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:15
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr ""
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
-#: View/Feeds/view.ctp:30
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
+#: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:20
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr ""
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:60
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr ""
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:69
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:73
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr ""
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:32
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr ""
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:36
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr ""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:40
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr ""
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:44
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr ""
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:48
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: 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
 #: View/Users/edit.ctp:13
 msgid "Password"
-msgstr ""
+msgstr "Senha"
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:52
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr ""
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:82
-msgid "Target Event"
-msgstr ""
-
 #: View/Feeds/add.ctp:94
-#: View/Feeds/edit.ctp:92
-msgid "Target Event ID"
-msgstr ""
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:94
-msgid "Leave blank unless you want to reuse an existing event."
+#: View/Feeds/edit.ctp:98
+msgid "Creator organisation"
 msgstr ""
 
 #: View/Feeds/add.ctp:104
-#: View/Feeds/edit.ctp:102
-msgid "Value field(s) in the CSV"
+#: View/Feeds/edit.ctp:108
+msgid "Target Event"
 msgstr ""
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:103
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr ""
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:105
-msgid "2,3,4 (column position separated by commas)"
-msgstr ""
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:113
-msgid "Delimiter"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
 msgstr ""
 
 #: View/Feeds/add.ctp:116
-#: View/Feeds/edit.ctp:114
-msgid "Set the default CSV delimiter (default = \",\")"
+#: View/Feeds/edit.ctp:120
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr ""
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr ""
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
 msgstr ""
 
 #: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:124
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr ""
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr ""
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
+msgid "Set the default CSV delimiter (default = \",\")"
+msgstr ""
+
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr ""
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:125
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr ""
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:135
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr ""
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 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:148
-#: View/Feeds/edit.ctp:144
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr ""
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:145
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:154
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr ""
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:155
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr ""
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:182
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr ""
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:187
-msgid "Filter rules"
-msgstr ""
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:189
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:190
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
-msgstr ""
+msgstr "Eventos com as seguintes organizações permitidas"
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:191
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
-msgstr ""
+msgstr "Eventos com as seguintes organizações bloqueadas"
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:192
-#: View/Servers/add.ctp:106
-#: View/Servers/edit.ctp:149;155
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
+#: View/Servers/add.ctp:116
+#: View/Servers/edit.ctp:155;162
 msgid "Modify"
 msgstr ""
 
@@ -10142,66 +12750,66 @@ msgstr ""
 msgid "Edit MISP Feed"
 msgstr ""
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr ""
 
-#: View/Feeds/edit.ctp:127
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr ""
 
-#: View/Feeds/edit.ctp:207
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr ""
 
-#: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:136
-#: View/Servers/edit.ctp:183
+#: View/Feeds/edit.ctp:234
+#: View/Servers/add.ctp:146
+#: View/Servers/edit.ctp:190
 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:209
-#: View/Servers/add.ctp:137
-#: View/Servers/edit.ctp:182
+#: View/Feeds/edit.ctp:235
+#: View/Servers/add.ctp:147
+#: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
-#: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:138
-#: View/Servers/edit.ctp:184
+#: View/Feeds/edit.ctp:236
+#: View/Servers/add.ctp:148
+#: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:139
-#: View/Servers/edit.ctp:185
+#: View/Feeds/edit.ctp:237
+#: View/Servers/add.ctp:149
+#: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
-#: View/Feeds/edit.ctp:212
-#: View/Servers/add.ctp:140
-#: View/Servers/edit.ctp:186
+#: View/Feeds/edit.ctp:238
+#: View/Servers/add.ctp:150
+#: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:187
+#: View/Feeds/edit.ctp:239
+#: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:188
+#: View/Feeds/edit.ctp:240
+#: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:215
-#: View/Servers/edit.ctp:189
+#: View/Feeds/edit.ctp:241
+#: View/Servers/edit.ctp:196
 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:216
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:191
+#: View/Feeds/edit.ctp:242
+#: View/Servers/add.ctp:154
+#: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -10223,151 +12831,136 @@ 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
-#: View/Servers/import.ctp:10
-#: View/TagCollections/import.ctp:10
-msgid "JSON"
-msgstr ""
+msgstr "Cole abaixo um JSON de metadados de feed MISP para adicionar feeds."
 
 #: View/Feeds/import_feeds.ctp:11
 msgid "Feed metadata JSON"
-msgstr ""
+msgstr "JSON de metadados de feed"
 
-#: 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:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr ""
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr ""
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr ""
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr ""
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: 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/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr ""
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:54
-#: View/Servers/index.ctp:75;76
-msgid "Rules"
+msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
+#: View/Feeds/index.ctp:196
+msgid "Visible"
 msgstr ""
 
 #: View/Feeds/index.ctp:211
-msgid "New fixed event"
+msgid "Feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:95
-msgid "Age: "
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
 msgstr ""
 
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:103
-msgid "Not cached"
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr ""
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:283
-msgid "Are you sure you want to permanently remove the feed (%s)?"
+#: View/Feeds/index.ctp:294
+msgid "Are you sure you want to permanently remove the feed?"
 msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
-msgstr ""
+msgstr "Baixar metadados do feed como JSON"
 
 #: View/Feeds/preview_event.ctp:6
 msgid "You are currently viewing an event from a feed (%s by %s)"
@@ -10386,20 +12979,6 @@ msgstr ""
 msgid "Fetch the event"
 msgstr ""
 
-#: View/Feeds/search_caches.ctp:35
-#: View/Feeds/view.ctp:3
-#: 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/Feeds/search_caches.ctp:53
 msgid "Feed URL"
 msgstr ""
@@ -10420,44 +12999,51 @@ msgstr ""
 msgid "Source format"
 msgstr ""
 
-#: View/Feeds/view.ctp:57
+#: View/Feeds/view.ctp:58
 msgid "Settings"
 msgstr ""
 
-#: View/Feeds/view.ctp:70
+#: View/Feeds/view.ctp:71
 msgid "Coverage by other feeds"
 msgstr ""
 
-#: View/Feeds/view.ctp:79
+#: View/Feeds/view.ctp:80
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr ""
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
+#: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr ""
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 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
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr ""
 
@@ -10465,33 +13051,30 @@ msgstr ""
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:23
-#: 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/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -10500,22 +13083,16 @@ msgstr ""
 msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
 msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
@@ -10526,6 +13103,27 @@ msgstr ""
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Inbox/index.ctp:31
+#: 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 "Título"
+
+#: View/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr ""
@@ -10546,12 +13144,6 @@ msgstr ""
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr ""
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr ""
@@ -10589,11 +13181,9 @@ msgstr ""
 msgid "Job type"
 msgstr ""
 
-#: View/Jobs/index.ctp:104
-#: View/OrgBlacklists/add.ctp:17
-#: View/OrgBlacklists/index.ctp:22
-#: View/Organisations/view.ctp:6
-msgid "Organisation name"
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
 msgstr ""
 
 #: View/Jobs/index.ctp:106
@@ -10670,30 +13260,20 @@ msgstr ""
 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:67
 #: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
+#: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: 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 ""
+msgstr "Organização"
 
 #: View/Logs/admin_search.ctp:21
 #: View/Pages/doc/administration.ctp:186;199
@@ -10715,19 +13295,19 @@ msgstr ""
 #: View/News/add.ctp:28
 #: View/News/edit.ctp:29
 msgid "Create anonymously"
-msgstr ""
+msgstr "Criar anonimamente"
 
 #: View/News/index.ctp:22
 msgid "Edit news message"
-msgstr ""
+msgstr "Editar mensagem de notícia"
 
 #: View/News/index.ctp:24
 msgid "Are you sure you want to delete news item # %s?"
-msgstr ""
+msgstr "Tem certeza de que deseja excluir o item de notícia # %s?"
 
 #: View/News/index.ctp:47
 msgid "There are currently no news messages."
-msgstr ""
+msgstr "Atualmente não há mensagens de notícias."
 
 #: View/Noticelists/index.ctp:2
 msgid "Noticelists"
@@ -10745,10 +13325,6 @@ msgstr ""
 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"
@@ -10904,87 +13480,87 @@ msgstr ""
 msgid "Meta category"
 msgstr ""
 
-#: View/Objects/add.ctp:85
+#: View/Objects/add.ctp:98
 msgid "Warning, issues found with the template"
 msgstr ""
 
-#: View/Objects/add.ctp:98
+#: View/Objects/add.ctp:111
 msgid "Save"
 msgstr ""
 
-#: View/Objects/add.ctp:99
+#: View/Objects/add.ctp:112
 msgid "Name :: type"
 msgstr ""
 
-#: View/Objects/add.ctp:156;167
+#: View/Objects/add.ctp:169;180
 msgid "Warning: You are about to share data that is of a classified nature. Make sure that you are authorised to share this."
 msgstr "Aviso: Você está prestes a compartilhar os dados de natureza confidencial. Certifique-se de que está autorizado a compartilhar isto."
 
-#: View/Objects/add.ctp:171
+#: View/Objects/add.ctp:184
 msgid "Back"
 msgstr ""
 
-#: View/Objects/add.ctp:183
+#: View/Objects/add.ctp:196
 msgid "Pre-update object's template"
 msgstr ""
 
-#: View/Objects/add.ctp:189
+#: View/Objects/add.ctp:202
 #: View/Objects/group_attributes_into_object.ctp:54
 #: View/Organisations/ajax/merge.ctp:56;63
 #: View/Pages/doc/using_the_system.ctp:163;203
 msgid "ID"
 msgstr ""
 
-#: View/Objects/add.ctp:205
+#: View/Objects/add.ctp:218
 #: View/Objects/revise_object.ctp:45
 msgid "Template version"
 msgstr ""
 
-#: View/Objects/add.ctp:212;272
+#: View/Objects/add.ctp:225;285
 msgid "Can not be merged automatically"
 msgstr ""
 
-#: View/Objects/add.ctp:217;277
+#: View/Objects/add.ctp:230;290
 msgid "This attribute type is missing from the new template. It will be lost if not taken care of right now."
 msgstr ""
 
-#: View/Objects/add.ctp:239
+#: View/Objects/add.ctp:252
 msgid "Insert"
 msgstr ""
 
-#: View/Objects/add.ctp:242
+#: View/Objects/add.ctp:255
 msgid "No valid type. This attribute will be lost."
 msgstr ""
 
-#: View/Objects/add.ctp:249
+#: View/Objects/add.ctp:262
 msgid "This attribute can be merged automatically. Injection in the template done."
 msgstr ""
 
-#: View/Objects/add.ctp:264
+#: View/Objects/add.ctp:277
 msgid "Attributes to merge"
 msgstr ""
 
-#: View/Objects/add.ctp:265
+#: View/Objects/add.ctp:278
 msgid "Contextual information and actions"
 msgstr ""
 
-#: View/Objects/add.ctp:275
+#: View/Objects/add.ctp:288
 msgid "Overwrite the current attribute value with this one"
 msgstr ""
 
-#: View/Objects/add.ctp:285
+#: View/Objects/add.ctp:298
 msgid "Original value: "
 msgstr ""
 
-#: View/Objects/add.ctp:290
+#: View/Objects/add.ctp:303
 msgid "Can be merged automatically. Injection done."
 msgstr ""
 
-#: View/Objects/add.ctp:293
-msgid "An instance of this attribute already exists. However, as multiple instanciation is allowed by this template, the two attributes will be keept."
+#: View/Objects/add.ctp:306
+msgid "An instance of this attribute already exists. However, as multiple instances are allowed by this template, the two attributes will be kept."
 msgstr ""
 
-#: View/Objects/add.ctp:321;332
+#: View/Objects/add.ctp:335;346
 msgid "Enter value manually"
 msgstr ""
 
@@ -11100,35 +13676,35 @@ msgstr ""
 msgid "Make sure that the below Object reflects your expectation before submiting it."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:59
+#: View/Objects/revise_object.ctp:66
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:103
+#: View/Objects/revise_object.ctp:110
 msgid "Create new object"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:104
+#: View/Objects/revise_object.ctp:111
 msgid "Back to review"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:107
+#: View/Objects/revise_object.ctp:114
 msgid "This event contains similar objects."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:108
+#: View/Objects/revise_object.ctp:115
 msgid "Instead of creating a new object, would you like to merge your new object into one of the following?"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:125
+#: View/Objects/revise_object.ctp:132
 msgid "All similar objects not displayed..."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:126
+#: View/Objects/revise_object.ctp:133
 msgid "%s Similar objects found. %s not displayed"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:163
+#: View/Objects/revise_object.ctp:170
 msgid "This attribute will NOT be merged into the similar object as it is conflicting with another attribute."
 msgstr ""
 
@@ -11144,6 +13720,10 @@ msgstr ""
 msgid "Are you sure you want to %sdelete Object #%s? %s"
 msgstr ""
 
+#: View/Objects/ajax/quickAddAttributeForm.ctp:15
+msgid "Add Object attribute"
+msgstr ""
+
 #: View/OrgBlacklists/add.ctp:4
 msgid "Add Organisation Blacklist Entries"
 msgstr ""
@@ -11192,73 +13772,68 @@ msgstr ""
 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
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
 msgid "Paste UUID or click generate"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:25
-#: View/Organisations/admin_edit.ctp:24
+#: View/Organisations/admin_add.ctp:24
+#: View/Organisations/admin_edit.ctp:23
 msgid "Generate UUID"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:25
-#: View/Organisations/admin_edit.ctp:24
+#: View/Organisations/admin_add.ctp:24
+#: View/Organisations/admin_edit.ctp:23
 msgid "Generate a new UUID for the organisation"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:27
-#: View/Organisations/admin_edit.ctp:38
+#: View/Organisations/admin_add.ctp:26
+#: View/Organisations/admin_edit.ctp:37
 msgid "A brief description of the organisation"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:27
-#: View/Organisations/admin_edit.ctp:38
+#: View/Organisations/admin_add.ctp:26
+#: View/Organisations/admin_edit.ctp:37
 msgid "A description of the organisation that is purely informational."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:30
-#: View/Organisations/admin_edit.ctp:41
+#: View/Organisations/admin_add.ctp:29
+#: View/Organisations/admin_edit.ctp:40
 msgid "Bind user accounts to domains (line separated)"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:30
-#: View/Organisations/admin_edit.ctp:41
+#: View/Organisations/admin_add.ctp:29
+#: View/Organisations/admin_edit.ctp:40
 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
+#: View/Organisations/admin_add.ctp:32
+#: View/Organisations/admin_edit.ctp:43
 msgid "The following fields are all optional."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:38
-#: View/Organisations/admin_edit.ctp:49
+#: View/Organisations/admin_add.ctp:37
+#: View/Organisations/admin_edit.ctp:48
 msgid "Logo (48x48 png)"
 msgstr ""
 
+#: View/Organisations/admin_add.ctp:43
+#: View/Organisations/admin_edit.ctp:54
+msgid "For example \"financial\"."
+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
+#: View/Organisations/admin_add.ctp:44
+#: View/Organisations/admin_edit.ctp:55
 msgid "Freetext description of the org."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:46
-#: View/Organisations/admin_edit.ctp:57
+#: View/Organisations/admin_add.ctp:45
+#: View/Organisations/admin_edit.ctp:56
 msgid "You can add some contact details for the organisation here, if applicable."
 msgstr ""
 
@@ -11266,15 +13841,15 @@ msgstr ""
 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
+#: View/Organisations/admin_edit.ctp:29
 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
+#: View/Organisations/admin_edit.ctp:31
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/admin_edit.ctp:57
+#: View/Organisations/admin_edit.ctp:56
 msgid "Contacts"
 msgstr ""
 
@@ -11283,7 +13858,7 @@ msgstr ""
 #: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
-msgstr ""
+msgstr "Todas as organizações"
 
 #: View/Organisations/index.ctp:6
 msgid ", both local and remote"
@@ -11292,7 +13867,7 @@ msgstr ""
 #: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
-msgstr ""
+msgstr "Organizações remotas conhecidas"
 
 #: View/Organisations/index.ctp:10
 msgid " on other instances"
@@ -11301,11 +13876,11 @@ msgstr ""
 #: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
-msgstr ""
+msgstr "Organizações locais"
 
 #: View/Organisations/index.ctp:14
 msgid " having a presence on this instance"
-msgstr ""
+msgstr " com presença nesta instância"
 
 #: View/Organisations/index.ctp:25
 msgid "Paginate"
@@ -11317,7 +13892,7 @@ msgstr ""
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr ""
 
@@ -11351,12 +13926,12 @@ msgid "Last modified"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:36
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr ""
 
@@ -11379,19 +13954,19 @@ msgstr ""
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:2
 msgid "Select organisations to add"
-msgstr ""
+msgstr "Selecione organizações para adicionar"
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:7
 msgid "Available Organisations"
-msgstr ""
+msgstr "Organizações disponíveis"
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
 msgid "Added Organisations"
-msgstr ""
+msgstr "Organizações adicionadas"
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:26
 msgid "Submit organisations"
-msgstr ""
+msgstr "Enviar organizações"
 
 #: View/Organisations/ajax/landingpage.ctp:2
 msgid "Landing page for %s"
@@ -11427,7 +14002,7 @@ msgstr ""
 
 #: View/Pages/administration.ctp:10
 msgid "Administrative actions"
-msgstr ""
+msgstr "Ações administrativas"
 
 #: View/Pages/administration.ctp:14
 msgid "Reset the attribute counts"
@@ -11439,11 +14014,11 @@ msgstr ""
 
 #: View/Pages/administration.ctp:15
 msgid "Recorrelate attributes"
-msgstr ""
+msgstr "Recorrelacionar atributos"
 
 #: View/Pages/administration.ctp:16
 msgid "Recorrelate proposals"
-msgstr ""
+msgstr "Correlacionar propostas novamente"
 
 #: View/Pages/administration.ctp:17
 msgid "Verify GnuPG keys"
@@ -11455,7 +14030,7 @@ msgstr ""
 
 #: View/Pages/administration.ctp:18
 msgid "Verify Certificates"
-msgstr ""
+msgstr "Verificar certificados"
 
 #: View/Pages/administration.ctp:18
 msgid "Check whether every user's certificate is usable"
@@ -11612,7 +14187,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:10
 msgid "Settings and Diagnostics"
-msgstr ""
+msgstr "Configurações e diagnóstico"
 
 #: View/Pages/doc/administration.ctp:11;171
 msgid "Blacklist"
@@ -11655,11 +14230,11 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:27
 msgid "Server settings and diagnostics"
-msgstr ""
+msgstr "Configurações e diagnóstico do servidor"
 
 #: 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 ""
+msgstr "Desde a versão 2.3, o MISP tem uma ferramenta de diagnóstico e configurações que permite aos administradores do site gerenciar e diagnosticar sua instalação MISP. Você pode acessar isso navegando para Administração - Configurações do servidor"
 
 #: View/Pages/doc/administration.ctp:29
 msgid "Server settings overview with all of the tabs explained."
@@ -11667,7 +14242,7 @@ 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 ""
+msgstr "A ferramenta de configuração e diagnóstico é dividida em vários aspectos, todos acessíveis através de abas no topo da ferramenta. Para qualquer configuração não definida ou definida incorretamente, ou falha no diagnóstico, um número ao lado do nome da aba indicará o número e a gravidade dos problemas. Se o número estiver escrito com uma fonte vermelha, isso significa que o problema é crítico. Primeiramente, vamos olhar as várias abas"
 
 #: View/Pages/doc/administration.ctp:32
 msgid "General overview of the current state of your MISP installation"
@@ -11702,7 +14277,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
-#: View/Servers/edit.ctp:84
+#: View/Servers/edit.ctp:90
 msgid "Misc settings"
 msgstr ""
 
@@ -11720,7 +14295,7 @@ 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 ""
+msgstr "Baixe um relatório no formato JSON, compilado de todas as configurações visíveis na ferramenta."
 
 #: View/Pages/doc/administration.ctp:42
 msgid "The settings tabs explained."
@@ -11728,7 +14303,7 @@ 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 ""
+msgstr "Cada uma das páginas de configuração é uma tabela com cada linha representando uma configuração. Linhas coloridas indicam que a configuração está incorreta / não definida e a cor determina a gravidade (vermelho = crítico, amarelo = recomendado, verde = opcional). As colunas são as seguintes"
 
 #: View/Pages/doc/administration.ctp:45
 msgid "The severity of the setting."
@@ -11865,7 +14440,7 @@ 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 ""
+msgstr "Preencha este formulário para adicionar um novo usuário. Tenha em mente que o menu suspenso intitulado Função controla os privilégios que o usuário terá."
 
 #: 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."
@@ -11891,14 +14466,14 @@ msgstr ""
 #: View/Roles/admin_index.ctp:2
 #: View/Roles/index.ctp:2
 msgid "Roles"
-msgstr ""
+msgstr "Funções"
 
 #: 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_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -11909,7 +14484,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -11922,7 +14497,7 @@ 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr ""
 
@@ -11975,6 +14550,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -12005,7 +14581,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:84
+#: View/Users/admin_view.ctp:95
 msgid "Newsread"
 msgstr ""
 
@@ -12077,10 +14653,6 @@ msgstr ""
 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 ""
@@ -12217,11 +14789,11 @@ 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 ""
+msgstr "Ao clicar no botão Listar funções, você pode ver uma lista de todos as funções atualmente registradas e uma lista das marcações de permissão ativadas para cada um. Além disso, você pode encontrar botões que permitem editar e excluir as funções. Tenha em mente que primeiro você precisará remover todos os membros de uma função antes de excluí-la."
 
 #: View/Pages/doc/administration.ctp:160
 msgid "List roles"
-msgstr ""
+msgstr "Listar funções"
 
 #: 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."
@@ -12275,7 +14847,7 @@ 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 ""
+msgstr "Listar todas as entradas de log exibirá as seguintes colunas geradas pelos usuários da sua organização (ou todas as organizações no caso de administradores do site)"
 
 #: View/Pages/doc/administration.ctp:178
 msgid "List logs"
@@ -12327,7 +14899,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:192
 msgid "Searching the Logs"
-msgstr ""
+msgstr "Pesquisando nos logs"
 
 #: 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)"
@@ -12355,7 +14927,7 @@ 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 ""
+msgstr "O MISP tem algumas ferramentas administrativas que ajudam os administradores a manter suas instâncias atualizadas e saudáveis. A lista dessas pequenas ferramentas pode mudar rapidamente a cada nova versão, mas elas devem ser autoexplicativas. Certifique-se de verificar esta seção após atualizar para uma nova versão, no caso de haver um novo script de atualização lá - embora se esse for o caso, ele será mencionado nas instruções de atualização."
 
 #: 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."
@@ -12385,7 +14957,7 @@ 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 ""
+msgstr "encerrar o job no qual um worker está trabalhando imediatamente. Você receberá uma escolha de workers para escolher ao executar este comando."
 
 #: View/Pages/doc/administration.ctp:214
 msgid "clear"
@@ -12760,7 +15332,7 @@ msgstr ""
 
 #: View/Pages/doc/general.ctp:38
 msgid "Shows a list of all proposals that you are eligible to see."
-msgstr ""
+msgstr "Mostra uma lista de todas as propostas que você é elegível para ver."
 
 #: View/Pages/doc/general.ctp:39
 msgid "Shows all of the events created by your organsiation that has pending proposals."
@@ -13263,7 +15835,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:79
 msgid "Add attributes to the event"
-msgstr ""
+msgstr "Adicionar atributos ao evento"
 
 #: 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."
@@ -13293,10 +15865,6 @@ msgstr ""
 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 ""
@@ -13419,7 +15987,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:121
 msgid "Add attachments to the event"
-msgstr ""
+msgstr "Adicionar anexos ao evento"
 
 #: 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"
@@ -13517,7 +16085,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:147
 msgid "Publish an event"
-msgstr ""
+msgstr "Publicar um evento"
 
 #: 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.)."
@@ -13729,7 +16297,7 @@ 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 ""
+msgstr "O evento atualmente selecionado está em cor azul no gráfico. Se você quiser excluir um elemento do gráfico (incluindo os elementos que se ramificam dele) basta clicar no pequeno x dentro de uma bolha dinâmica. Para que a exclusão seja possível, as seguintes condições devem ser cumpridas"
 
 #: 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"
@@ -13793,7 +16361,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:243
 msgid "Proposals to an Event"
-msgstr ""
+msgstr "Propostas para um evento"
 
 #: 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."
@@ -13801,7 +16369,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:244
 msgid "Proposals to an Attribute"
-msgstr ""
+msgstr "Propostas para um atributo"
 
 #: 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."
@@ -14346,10 +16914,6 @@ msgstr ""
 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 ""
@@ -14439,7 +17003,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:129
+#: View/Servers/index.ctp:175
 msgid "Push all"
 msgstr ""
 
@@ -14448,7 +17012,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:126
+#: View/Servers/index.ctp:172
 msgid "Pull all"
 msgstr ""
 
@@ -14458,7 +17022,7 @@ 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 ""
+msgstr "A plataforma também é <a href=\"http://en.wikipedia.org/wiki/Representational_state_transfer\">RESTfull</a>, então isso significa que você pode usar formato estruturado (XML ou JSON) para acessar os dados de eventos."
 
 #: View/Pages/doc/using_the_system.ctp:424
 msgid "Requests"
@@ -14478,7 +17042,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:431
 msgid "The following headers are required if you wish to receive / push JSON data"
-msgstr ""
+msgstr "Os seguintes cabeçalhos são obrigatórios se você deseja receber / enviar dados JSON"
 
 #: View/Pages/doc/using_the_system.ctp:435
 msgid "The following table shows the relation of the request type and the resulting action"
@@ -14538,12 +17102,13 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:525
 msgid "Example - Add new Event"
-msgstr ""
+msgstr "Exemplo - Adicionar novo evento"
 
 #: 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 ""
+msgstr "Neste exemplo queremos adicionar um único evento.<br/>\n"
+"A solicitação deve ser"
 
 #: View/Pages/doc/using_the_system.ctp:531
 msgid "And the request body"
@@ -14566,11 +17131,6 @@ msgstr ""
 msgid "In response to"
 msgstr ""
 
-#: View/Posts/add.ctp:33
-msgid ""
-msgstr ""
-""
-
 #: View/Posts/edit.ctp:12
 msgid "Contents"
 msgstr ""
@@ -14596,18 +17156,28 @@ msgstr ""
 #: View/Roles/admin_add.ctp:9
 #: View/Roles/admin_edit.ctp:9
 msgid "Restrict to site admins"
-msgstr ""
+msgstr "Restringir aos administradores do site"
 
 #: View/Roles/admin_add.ctp:19
 #: View/Roles/admin_edit.ctp:18
 #: View/Roles/admin_index.ctp:33
 msgid "Memory limit"
-msgstr ""
+msgstr "Limite de memória"
 
 #: View/Roles/admin_add.ctp:20
 #: View/Roles/admin_edit.ctp:19
 msgid "Maximum execution time"
-msgstr ""
+msgstr "Tempo máximo de execução"
+
+#: View/Roles/admin_add.ctp:26
+#: View/Roles/admin_edit.ctp:26
+msgid "Enforce search rate limit"
+msgstr "Forçar limite de taxa de pesquisa"
+
+#: View/Roles/admin_add.ctp:32
+#: View/Roles/admin_edit.ctp:32
+msgid "# of searches / 15 min"
+msgstr "# de pesquisas / 15 min"
 
 #: View/Roles/admin_index.ctp:24
 msgid "Restricted to site admins"
@@ -14617,11 +17187,15 @@ msgstr ""
 msgid "Max execution time"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:40
-msgid "Default role"
+#: View/Roles/admin_index.ctp:35
+msgid "Searches / 15 mins"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:52
+#: View/Roles/admin_index.ctp:41
+msgid "Default role"
+msgstr "Função padrão"
+
+#: View/Roles/admin_index.ctp:53
 #: View/Roles/index.ctp:47
 msgid "%s permission %s"
 msgstr ""
@@ -14647,6 +17221,7 @@ msgid "Permission level"
 msgstr ""
 
 #: View/Servers/add.ctp:4
+#: View/Servers/edit.ctp:5
 msgid "Add Server"
 msgstr ""
 
@@ -14665,17 +17240,17 @@ msgid "You can set this instance up as an internal instance by checking the chec
 msgstr ""
 
 #: View/Servers/add.ctp:20
-#: View/Servers/edit.ctp:20
+#: View/Servers/edit.ctp:17
 msgid "Internal instance"
 msgstr ""
 
 #: View/Servers/add.ctp:30
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:25
 msgid "Instance ownership and credentials"
 msgstr ""
 
 #: View/Servers/add.ctp:31
-#: View/Servers/edit.ctp:32
+#: View/Servers/edit.ctp:26
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
@@ -14684,86 +17259,86 @@ msgid "Remote Sync Organisation Type"
 msgstr ""
 
 #: View/Servers/add.ctp:42
-#: View/Servers/edit.ctp:43
+#: View/Servers/edit.ctp:40
 msgid "External Organisation"
 msgstr ""
 
-#: View/Servers/add.ctp:48
+#: View/Servers/add.ctp:57
 msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:54
-#: View/Servers/edit.ctp:65
+#: View/Servers/add.ctp:63
+#: View/Servers/edit.ctp:70
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:58
-#: View/Servers/edit.ctp:69
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:74
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:67
-#: View/Servers/edit.ctp:76
+#: View/Servers/add.ctp:76
+#: View/Servers/edit.ctp:81
 msgid "Ask the owner of the remote instance for a sync account on their instance, log into their MISP using the sync user's credentials and retrieve your API key by navigating to Global actions -> My profile. This key is used to authenticate with the remote instance."
 msgstr ""
 
-#: View/Servers/add.ctp:71
-#: View/Servers/edit.ctp:80
+#: View/Servers/add.ctp:80
+#: View/Servers/edit.ctp:85
 msgid "Enabled synchronisation methods"
 msgstr ""
 
-#: View/Servers/add.ctp:90
+#: View/Servers/add.ctp:100
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:96
+#: View/Servers/add.ctp:106
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:101
-#: View/Servers/edit.ctp:144
+#: View/Servers/add.ctp:111
+#: View/Servers/edit.ctp:150
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:102;108
-#: View/Servers/edit.ctp:145;151
+#: View/Servers/add.ctp:112;118
+#: View/Servers/edit.ctp:151;157
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:103;109
-#: View/Servers/edit.ctp:146;152
+#: View/Servers/add.ctp:113;119
+#: View/Servers/edit.ctp:152;158
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:104;110
-#: View/Servers/edit.ctp:147;153
+#: View/Servers/add.ctp:114;120
+#: View/Servers/edit.ctp:153;159
 msgid "Events with the following organisations allowed: "
-msgstr ""
+msgstr "Eventos com as seguintes organizações permitidas: "
 
-#: View/Servers/add.ctp:105;111
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:115;121
+#: View/Servers/edit.ctp:154;160
 msgid "Events with the following organisations blocked: "
-msgstr ""
+msgstr "Eventos com as seguintes organizações bloqueadas: "
 
-#: View/Servers/add.ctp:107
-#: View/Servers/edit.ctp:150
+#: View/Servers/add.ctp:117
+#: View/Servers/edit.ctp:156
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:135
-#: View/Servers/edit.ctp:181
+#: View/Servers/add.ctp:145
+#: View/Servers/edit.ctp:188
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:141
+#: View/Servers/add.ctp:151
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:142
+#: View/Servers/add.ctp:152
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:143
+#: View/Servers/add.ctp:153
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
@@ -14771,43 +17346,47 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: View/Servers/edit.ctp:17
+#: View/Servers/edit.ctp:15
 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
+#: View/Servers/edit.ctp:31
 msgid "Organisation Type"
 msgstr ""
 
-#: View/Servers/edit.ctp:54
+#: View/Servers/edit.ctp:55
 msgid "Local Organisation"
 msgstr ""
 
-#: View/Servers/edit.ctp:77
+#: View/Servers/edit.ctp:82
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:101
+#: View/Servers/edit.ctp:107
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:109;131
+#: View/Servers/edit.ctp:115;137
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:110;132
+#: View/Servers/edit.ctp:116;138
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:123
+#: View/Servers/edit.ctp:129
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:161
+msgid "Additional parameters: "
+msgstr ""
+
+#: View/Servers/edit.ctp:197
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:247;251
+#: View/Servers/edit.ctp:263;267
 msgid "Not set."
 msgstr ""
 
@@ -14829,53 +17408,86 @@ msgstr ""
 
 #: View/Servers/import.ctp:5
 msgid "Paste a MISP server metadata JSON below to add sync connections."
-msgstr ""
+msgstr "Cole abaixo um JSON de metadados do servidor MISP para adicionar conexões de sincronização."
 
 #: View/Servers/import.ctp:11
 msgid "Server metadata JSON"
-msgstr ""
+msgstr "JSON de metadados do servidor"
 
 #: View/Servers/index.ctp:2
 msgid "Servers"
 msgstr ""
 
 #: View/Servers/index.ctp:23
+msgid "Prio"
+msgstr ""
+
+#: View/Servers/index.ctp:24
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:31
+#: View/Servers/index.ctp:25
+msgid "Sync user"
+msgstr ""
+
+#: View/Servers/index.ctp:26
+msgid "Reset API key"
+msgstr ""
+
+#: View/Servers/index.ctp:35
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:70
+msgid "URL params"
+msgstr ""
+
+#: View/Servers/index.ctp:85;86
+msgid "Move server priority up"
+msgstr ""
+
+#: View/Servers/index.ctp:85;86
+msgid "Move server priority down"
+msgstr ""
+
+#: View/Servers/index.ctp:102
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:102
+#: View/Sightingdb/index.ctp:35
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:74
+#: View/Servers/index.ctp:103
+msgid "View the sync user of the remote instance"
+msgstr ""
+
+#: View/Servers/index.ctp:111;112
+msgid "Remotely reset API key"
+msgstr ""
+
+#: View/Servers/index.ctp:119
 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:74
+#: View/Servers/index.ctp:119
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:123
+#: View/Servers/index.ctp:169
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:125
+#: View/Servers/index.ctp:171
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
-#: View/Servers/index.ctp:125
+#: View/Servers/index.ctp:171
 msgid "Pull updates"
 msgstr ""
 
-#: View/Servers/index.ctp:132
+#: View/Servers/index.ctp:178
 msgid "Cache instance"
 msgstr ""
 
@@ -14891,19 +17503,19 @@ msgstr ""
 msgid "Show Update Progress Page"
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:37
+#: View/Servers/ondemand_action.ctp:38
 msgid "Running this script may take a very long time depending of the size of your database. It is adviced that you <b>back your database up</b> before running it."
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:43
+#: View/Servers/ondemand_action.ctp:44
 msgid "Running this script will make this instance unusable for all users (not site-admin) during the time of upgrade."
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:53
+#: View/Servers/ondemand_action.ctp:54
 msgid "Action: "
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:60
+#: View/Servers/ondemand_action.ctp:61
 msgid "This action has been done and cannot be run again."
 msgstr ""
 
@@ -14929,7 +17541,7 @@ msgstr ""
 
 #: View/Servers/preview_index.ctp:112
 msgid "published"
-msgstr ""
+msgstr "publicado"
 
 #: View/Servers/pull.ctp:2
 msgid "Failed pulls"
@@ -14955,6 +17567,14 @@ msgstr ""
 msgid "No proposals pulled"
 msgstr ""
 
+#: View/Servers/pull.ctp:35
+msgid "Sightings pulled"
+msgstr ""
+
+#: View/Servers/pull.ctp:38
+msgid "No sightings pulled"
+msgstr ""
+
 #: View/Servers/push.ctp:2
 msgid "Failed pushes"
 msgstr ""
@@ -14975,60 +17595,56 @@ msgstr ""
 msgid "HTTP method to use"
 msgstr ""
 
-#: View/Servers/rest.ctp:61
+#: View/Servers/rest.ctp:62
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:68
+#: View/Servers/rest.ctp:69
 msgid "Use full path - disclose my apikey"
 msgstr ""
 
-#: View/Servers/rest.ctp:72
+#: View/Servers/rest.ctp:73
 msgid "Bookmark query"
 msgstr ""
 
-#: View/Servers/rest.ctp:81
+#: View/Servers/rest.ctp:82
 msgid "Bookmark name"
 msgstr ""
 
-#: View/Servers/rest.ctp:89
+#: View/Servers/rest.ctp:90
 msgid "Show result"
 msgstr ""
 
-#: View/Servers/rest.ctp:94
+#: View/Servers/rest.ctp:95
 msgid "Skip SSL validation"
 msgstr ""
 
-#: View/Servers/rest.ctp:101
+#: View/Servers/rest.ctp:102
 msgid "HTTP headers"
 msgstr ""
 
-#: View/Servers/rest.ctp:114
+#: View/Servers/rest.ctp:115
 msgid " Inject"
 msgstr ""
 
-#: View/Servers/rest.ctp:115
+#: View/Servers/rest.ctp:116
 msgid " Show rules"
 msgstr ""
 
-#: View/Servers/rest.ctp:124
+#: View/Servers/rest.ctp:125
 msgid "HTTP body"
 msgstr ""
 
-#: View/Servers/rest.ctp:132
+#: View/Servers/rest.ctp:133
 msgid "Run query"
 msgstr ""
 
-#: View/Servers/rest.ctp:161
+#: View/Servers/rest.ctp:162
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:162
-msgid "Request duration"
-msgstr ""
-
 #: View/Servers/rest.ctp:163
-msgid "Headers"
+msgid "Request duration"
 msgstr ""
 
 #: View/Servers/server_settings.ctp:3
@@ -15039,26 +17655,66 @@ msgstr ""
 msgid "To edit a setting, simply double click it."
 msgstr ""
 
-#: View/Servers/update_progress.ctp:18
-msgid "Database Update progress"
+#: View/Servers/update_progress.ctp:34
+msgid "Updates are locked due to an ongoing update process. Release lock only if you know what you are doing."
 msgstr ""
 
-#: View/Servers/update_progress.ctp:85
+#: View/Servers/update_progress.ctp:35
+msgid "automatically unlock in %smin %ssec"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:40
+msgid "Release update lock"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:54
+msgid "Complete update progression"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:55
+msgid "%s remaining"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:62
+msgid "Database Update progress for update %s"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:133
 msgid "Update "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:88
+#: View/Servers/update_progress.ctp:136
 msgid "Started @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:92
+#: View/Servers/update_progress.ctp:140
 msgid "Elapsed Time @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:144
+#: View/Servers/update_progress.ctp:192
 msgid "No update in progress"
 msgstr ""
 
+#: View/Servers/update_progress.ctp:213
+msgid "Follow updates"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:13
+msgid "Total"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:27
+msgid "View details on the usage of %s on the %s controller"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:39
+msgid "View user ID "
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:40
+msgid "User #%s"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:2
 msgid "Select instances to add"
 msgstr ""
@@ -15136,9 +17792,9 @@ msgstr ""
 msgid "Add Proposal"
 msgstr ""
 
-#: View/ShadowAttributes/add.ctp:52;65
+#: View/ShadowAttributes/add.ctp:63;76
 #: View/ShadowAttributes/add_attachment.ctp:35
-#: View/ShadowAttributes/edit.ctp:51
+#: View/ShadowAttributes/edit.ctp:62
 msgid "Propose"
 msgstr ""
 
@@ -15154,23 +17810,23 @@ msgstr ""
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:43
+#: View/ShadowAttributes/index.ctp:50
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:49
+#: View/ShadowAttributes/index.ctp:56
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:55
+#: View/ShadowAttributes/index.ctp:62
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:81
+#: View/ShadowAttributes/index.ctp:91
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:83
+#: View/ShadowAttributes/index.ctp:93
 msgid "New Attribute"
 msgstr ""
 
@@ -15196,7 +17852,7 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:3
 msgid "New Sharing Group"
-msgstr ""
+msgstr "Novo grupo de compartilhamento"
 
 #: View/SharingGroups/add.ctp:10
 #: View/SharingGroups/edit.ctp:10
@@ -15226,12 +17882,12 @@ msgstr ""
 #: View/SharingGroups/add.ctp:35
 #: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
-msgstr ""
+msgstr "Resumo e salvar"
 
 #: View/SharingGroups/add.ctp:36
 #: View/SharingGroups/edit.ctp:36
 msgid "Sharing group summary"
-msgstr ""
+msgstr "Resumo do grupo de compartilhamento"
 
 #: View/SharingGroups/add.ctp:52
 #: View/SharingGroups/edit.ctp:52
@@ -15240,7 +17896,7 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:53
 #: View/SharingGroups/edit.ctp:53
-#: View/SharingGroups/index.ctp:46
+#: View/SharingGroups/index.ctp:47
 msgid "Releasable to"
 msgstr ""
 
@@ -15282,7 +17938,7 @@ msgstr ""
 #: View/SharingGroups/add.ctp:66
 #: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
-msgstr ""
+msgstr "Adicionar organizações remotas ao grupo de compartilhamento"
 
 #: View/SharingGroups/add.ctp:66
 #: View/SharingGroups/edit.ctp:66
@@ -15315,28 +17971,21 @@ msgstr ""
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:93
-#: View/SharingGroups/edit.ctp:101
-#: View/SharingGroups/view.ctp:69
-#: View/TagCollections/index.ctp:12
-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 ""
+msgstr "<span class=\"bold\">Geral: </span>Você está prestes a criar o grupo de compartilhamento <span id=\"summarytitle\" class=\"red bold\"></span>, que se destina a ser liberável para <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 ""
+msgstr "Organizações locais: </span>Será visível para <span id=\"summarylocal\" class=\"red bold\"></span>, a partir do qual <span id=\"summarylocalextend\" class=\"red bold\"></span> pode estender o grupo de compartilhamento."
 
 #: 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 ""
+msgstr "Organizações externas: </span>Também será visível para <span id=\"summaryexternal\" class=\"red bold\"></span>, das quais <span id=\"summaryexternalextend\" class=\"red bold\"></span> pode estender o grupo de compartilhamento."
 
 #: 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\">Sincronização: </span>Além disso, eventos são automaticamente enviados para: <span id=\"summaryservers\" class=\"red bold\"></span>"
 
 #: View/SharingGroups/add.ctp:107
 #: View/SharingGroups/edit.ctp:115
@@ -15356,11 +18005,13 @@ msgstr ""
 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 ""
+msgstr "<span class=\"bold\">Geral: </span>Você está prestes a criar o grupo de compartilhamento <span id=\"summarytitle\" class=\"red bold\"></span>, que se destina a ser liberável para <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
+"                <p id=\"localText\"><span class=\"bold\">Organizações locais: </span>Ele será visível para <span id=\"summarylocal\" class=\"red bold\"></span>, a partir do qual <span id=\"summarylocalextend\" class=\"red bold\"></span> pode estender o grupo de compartilhamento. </p>\n"
+"                <p id=\"externalText\"><span class=\"bold\">Organizações externas: </span>Ele também será visível para <span id=\"summaryexternal\" class=\"red bold\"></span>, da qual <span id=\"summaryexternalextend\" class=\"red bold\"></span> pode estender o grupo de compartilhamento."
 
 #: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
-msgstr ""
+msgstr "Sincronização: </span>Além disso, eventos são automaticamente enviados para: <span id=\"summaryservers\" class=\"red bold\"></span>"
 
 #: View/SharingGroups/index.ctp:2
 msgid "Sharing Groups"
@@ -15374,21 +18025,50 @@ msgstr ""
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:80
+#: View/SharingGroups/index.ctp:82
 msgid "Distribution List"
-msgstr ""
-
-#: View/SharingGroups/view.ctp:12
-msgid "Selectable"
-msgstr ""
+msgstr "Lista de distribuição"
 
 #: View/SharingGroups/view.ctp:28
 msgid "Synced by"
 msgstr "Sincronizada por"
 
-#: View/SharingGroups/view.ctp:68
-msgid "Url"
-msgstr "URL"
+#: View/Sightingdb/index.ctp:41
+msgid "Quick Search"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:61
+msgid "Host"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:66
+msgid "Port"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:76
+msgid "Skip Proxy"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:82
+msgid "Skip SSL"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:92
+#: View/UserSettings/index.ctp:74
+msgid "Restricted to"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:98
+msgid "SightingDB index"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:99
+msgid "SightingDB is an alternate sighting database that MISP interconnects with. Configure connections to sighting databases below."
+msgstr ""
+
+#: View/Sightingdb/index.ctp:114
+msgid "Are you sure you want to remove the connection to this SightingDB?"
+msgstr ""
 
 #: View/Sightings/ajax/add_sighting.ctp:11
 msgid "honeypot, IDS sensor id, SIEM,…"
@@ -15456,11 +18136,11 @@ msgstr ""
 
 #: View/TagCollections/import.ctp:5
 msgid "Paste a MISP tag collection JSON below to add tag collections."
-msgstr ""
+msgstr "Cole abaixo um JSON de coleção de etiquetas MISP para adicionar coleções de etiquetas."
 
 #: View/TagCollections/import.ctp:11
 msgid "Tag collection JSON"
-msgstr ""
+msgstr "JSON de coleção de etiquetas"
 
 #: View/Tags/add.ctp:12
 #: View/Tags/edit.ctp:12
@@ -15517,6 +18197,11 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+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 ""
@@ -15541,10 +18226,6 @@ msgstr ""
 msgid "Update all"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:2
-msgid "Taxonomies"
-msgstr ""
-
 #: View/Taxonomies/index.ctp:26
 msgid "Required"
 msgstr ""
@@ -15591,10 +18272,6 @@ msgstr ""
 msgid "Unhide selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:83
-msgid "Tag"
-msgstr ""
-
 #: View/Taxonomies/view.ctp:84
 msgid "Expanded"
 msgstr ""
@@ -15625,7 +18302,7 @@ msgstr "Criar tags"
 
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:15
 msgid "Are you sure you want to create / update all selected tags?"
-msgstr "Você tem certeza que quer criar / atualizar as tags selecionadas?"
+msgstr "Você tem certeza que quer criar / atualizar todas as tags selecionadas?"
 
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
 msgid "Create / update all selected taxonomy entries as tags"
@@ -15793,10 +18470,6 @@ msgstr ""
 msgid "A description of the template"
 msgstr ""
 
-#: View/Templates/add.ctp:49
-msgid "Create"
-msgstr ""
-
 #: View/Templates/index.ctp:2
 msgid "Templates"
 msgstr "Templates"
@@ -15853,6 +18526,61 @@ msgstr ""
 msgid "View Discussion"
 msgstr "Ver discussões"
 
+#: View/UserSettings/index.ctp:30
+msgid "Me"
+msgstr ""
+
+#: View/UserSettings/index.ctp:79
+msgid "User settings management"
+msgstr ""
+
+#: View/UserSettings/index.ctp:80
+msgid "Manage the individual user settings."
+msgstr ""
+
+#: View/UserSettings/index.ctp:97
+msgid "Are you sure you wish to delete this entry?"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr ""
@@ -15886,7 +18614,7 @@ msgstr ""
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
 #: View/Users/edit.ctp:23
-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."
+msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
 msgstr ""
 
 #: View/Users/admin_add.ctp:72
@@ -15910,12 +18638,12 @@ msgstr ""
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr ""
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr ""
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
@@ -15924,8 +18652,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
-#: View/Users/admin_view.ctp:58
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:69
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr "Termos aceitos"
 
@@ -15978,7 +18706,7 @@ msgstr ""
 
 #: View/Users/admin_email.ctp:18
 msgid "Welcome message"
-msgstr ""
+msgstr "Mensagem de boas-vindas"
 
 #: View/Users/admin_email.ctp:18
 msgid "Reset password"
@@ -16028,13 +18756,67 @@ msgstr "Remover filtro"
 msgid "Apply filters"
 msgstr "Aplicar filtros"
 
-#: 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 "Usuários"
+#: View/Users/admin_index.ctp:3
+msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
+msgstr ""
+
+#: View/Users/admin_index.ctp:6
+msgid "here"
+msgstr ""
+
+#: View/Users/admin_index.ctp:9;10
+msgid "Reset all sync user API keys"
+msgstr ""
+
+#: View/Users/admin_index.ctp:13
+msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
+msgstr ""
+
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
 
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
@@ -16042,58 +18824,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 "AVISO: Esse usuário não possui um conjunto de chaves criptográficas. A postura de segurança desta instância permite o envio de e-mails em texto claro, portanto é isso que acontecerá se você prosseguir."
 
 #: 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
+#: View/Users/admin_view.ctp:47
+msgid "Customauth header"
+msgstr ""
+
+#: View/Users/admin_view.ctp:55
 msgid "Invited By"
 msgstr "Convidado Por"
 
-#: View/Users/admin_view.ctp:56
+#: View/Users/admin_view.ctp:67
 msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:57
-#: View/Users/view.ctp:28
+#: View/Users/admin_view.ctp:68
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr ""
 
-#: View/Users/admin_view.ctp:59
+#: View/Users/admin_view.ctp:70
 msgid "Password change"
 msgstr ""
 
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:37
+#: View/Users/admin_view.ctp:78
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:72
-#: View/Users/view.ctp:42
+#: View/Users/admin_view.ctp:83
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:79
-#: View/Users/view.ctp:49
-msgid "SMIME Public certificate"
+#: View/Users/admin_view.ctp:90
+#: View/Users/view.ctp:50
+msgid "S/MIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:108
-#: View/Users/view.ctp:64
+#: View/Users/admin_view.ctp:119
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
-msgstr ""
+msgstr "Baixar perfil de usuário para portabilidade de dados"
 
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
@@ -16107,10 +18888,102 @@ msgstr ""
 msgid "SMIME Public certificate (PEM format)"
 msgstr ""
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr "Login"
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr "Permissão de publicação"
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr "Descartar os registros selecionados"
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr "PGP"
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+msgstr "Descartar registro"
+
 #: 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"
@@ -16126,6 +18999,13 @@ msgstr ""
 msgid "Proposals active"
 msgstr ""
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr "Usuários"
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -16159,7 +19039,7 @@ 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 ""
+msgstr "O gráfico acima não funcionará corretamente no Internet Explorer 9.0 e versões anteriores. Por favor baixe o Chrome, Firefox ou atualize para uma versão mais recente do Internet Explorer."
 
 #: View/Users/statistics_data.ctp:24
 msgid "Attributes / event"
@@ -16171,7 +19051,7 @@ msgstr ""
 
 #: View/Users/statistics_data.ctp:36
 msgid "Local Organisations"
-msgstr ""
+msgstr "Organizações locais"
 
 #: View/Users/statistics_data.ctp:38
 msgid "Average Users / Org"
@@ -16181,12 +19061,16 @@ msgstr ""
 msgid "A heatmap showing the usage of %s."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
+msgstr "Visão geral das organizações que residem ou são conhecidas por esta instância."
+
+#: View/Users/statistics_orgs.ctp:40
+msgid "Activity (1 year)"
 msgstr ""
 
 #: View/Users/statistics_sightings.ctp:6
@@ -16223,11 +19107,11 @@ msgstr "MISP Termos e Condições"
 
 #: View/Users/terms.ctp:11
 msgid "Terms and Conditions file not found."
-msgstr "Arquivo de Termos e Condições não foi encontrado."
+msgstr "Arquivo de Termos e Condições não encontrado."
 
 #: View/Users/terms.ctp:19
 msgid "Download Terms and Conditions"
-msgstr ""
+msgstr "Baixar Termos e Condições"
 
 #: View/Users/terms.ctp:27
 msgid "Accept Terms"
@@ -16241,6 +19125,14 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr "Descartar registros de usuários"
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr "Tem certeza de que deseja remover o(s) pedido(s) de registro selecionado(s)?"
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -16253,29 +19145,37 @@ msgstr ""
 msgid "Choose the key that you would like to use"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:6
+#: View/Users/ajax/fetchpgpkey.ctp:4
+msgid "Do not blindly trust fetched keys and check the fingerprint from other source."
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:5
+msgid "And do not check just Key ID, but whole fingerprint."
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:10
 msgid "Key ID"
 msgstr "Key ID"
 
-#: View/Users/ajax/fetchpgpkey.ctp:7
+#: View/Users/ajax/fetchpgpkey.ctp:11
 msgid "Creation date"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:8
+#: View/Users/ajax/fetchpgpkey.ctp:12
 msgid "Associated E-mail addresses"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:12
+#: View/Users/ajax/fetchpgpkey.ctp:16
 msgid "Select GnuPG key"
 msgstr "Selecione uma chave 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."
-msgstr ""
+msgstr "AVISO: Esse usuário não possui um conjunto de chaves criptográficas. A posição de segurança desta instância permite o envio de e-mails em texto claro, portanto é isso que acontecerá se você prosseguir."
 
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:8
 msgid "Send welcome message to user"
-msgstr ""
+msgstr "Enviar mensagem de boas-vindas ao usuário"
 
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:8
 msgid "Initiate password reset for user"
@@ -16283,7 +19183,7 @@ 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 ""
+msgstr "Tem certeza que deseja redefinir a senha de %s e enviar uma mensagem de boas-vindas com as credenciais?"
 
 #: 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? "
@@ -16317,7 +19217,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:14;16
+#: View/Warninglists/view.ctp:14
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -16340,7 +19240,7 @@ 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 ""
+msgstr "Entradas de Regex (no formato regex padrão php /{regex}/{modifier}) digitadas abaixo irão restringir os atributos correspondentes de serem incluídos nas exportações sensíveis de sinalização IDS (como exportações NIDS)."
 
 #: 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
@@ -16384,13 +19284,14 @@ 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/Server.php:validation for field push;validation for field pull;validation for field push_sightings
 #: 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 "booleano"
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/Dashboard.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
@@ -16404,13 +19305,20 @@ msgstr ""
 #: Model/Attribute.php:validation for field uuid
 #: Model/MispObject.php:validation for field uuid
 msgid "The UUID provided is not unique"
-msgstr ""
+msgstr "O UUID fornecido não é único"
 
 #: Model/Attribute.php:validation for field distribution
 msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group, Inherit event"
-msgstr ""
+msgstr "Opções: Apenas sua organização, Apenas esta comunidade, Comunidades conectadas, Todas as comunidades, Grupo de compartilhamento, Herdar evento"
+
+#: Model/Attribute.php:validation for field first_seen;validation for field last_seen
+#: Model/MispObject.php:validation for field first_seen;validation for field last_seen
+#: Model/ShadowAttribute.php:validation for field first_seen;validation for field last_seen
+msgid "Invalid ISO 8601 format"
+msgstr "Formato ISO 8601 inválido"
 
 #: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
+#: Model/DecayingModelMapping.php:validation for field attribute_type;validation for field model_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
@@ -16428,27 +19336,27 @@ msgstr ""
 #: Model/User.php:validation for field org_id;validation for field authkey
 #: Model/Whitelist.php:validation for field name
 msgid "valueNotEmpty"
-msgstr ""
+msgstr "valueNotEmpty"
 
 #: Model/Event.php:validation for field date
 msgid "Expected date format: YYYY-MM-DD"
-msgstr ""
+msgstr "Formato de data esperado: AAAA-MM-DD"
 
 #: Model/Event.php:validation for field threat_level_id
 msgid "Options : 1, 2, 3, 4 (for High, Medium, Low, Undefined)"
-msgstr ""
+msgstr "Opções: 1, 2, 3, 4 (para Alta, Média, Baixa, Indefinida)"
 
 #: Model/Event.php:validation for field distribution
 msgid "Options : Your organisation only, This community only, Connected communities, All communities"
-msgstr ""
+msgstr "Opções: Apenas sua organização, Apenas esta comunidade, Comunidades conectadas, Todas as comunidades"
 
 #: 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 ""
+msgstr "Se a distribuição estiver definida como \"Grupo de compartilhamento\", um grupo de compartilhamento terá de ser selecionado."
 
 #: Model/Event.php:validation for field analysis
 msgid "Options : 0, 1, 2 (for Initial, Ongoing, Completed)"
-msgstr ""
+msgstr "Opções : 0, 1, 2 (para Inicial, Em andamento, Concluída)"
 
 #: Model/EventBlacklist.php:validation for field event_uuid
 msgid "Event already blacklisted."
@@ -16463,7 +19371,7 @@ msgstr ""
 #: 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/Server.php:validation for field authkey;validation for field name
 #: 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
@@ -16503,12 +19411,20 @@ msgstr ""
 
 #: Model/Role.php:validation for field name
 msgid "A role with this name already exists."
-msgstr ""
+msgstr "Uma função com este nome já existe."
 
 #: Model/Server.php:validation for field url
 msgid "Please enter a valid base-url."
 msgstr ""
 
+#: Model/Server.php:validation for field name
+msgid "allowEmpty"
+msgstr "allowEmpty"
+
+#: Model/Server.php:validation for field name
+msgid "required"
+msgstr "obrigatório"
+
 #: Model/SharingGroup.php:validation for field name
 msgid "A sharing group with this name already exists."
 msgstr ""
@@ -16517,6 +19433,22 @@ msgstr ""
 msgid "Invalid type. Valid options are: 0 (Sighting), 1 (False-positive), 2 (Expiration)."
 msgstr ""
 
+#: Model/Sightingdb.php:validation for field name
+msgid "Name not set."
+msgstr "Nome não definido."
+
+#: Model/Sightingdb.php:validation for field host
+msgid "Host not set."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field port
+msgid "Port needs to be numeric."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field owner
+msgid "Owner not set."
+msgstr ""
+
 #: Model/Tag.php:validation for field name
 msgid "This field is required."
 msgstr "Este campo é obrigatório."
@@ -16593,6 +19525,10 @@ msgstr ""
 msgid "A SID should be an integer."
 msgstr ""
 
+#: Model/UserSetting.php:validation for field json
+msgid "isValidJson"
+msgstr "isValidJson"
+
 #: 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/rus/LC_MESSAGES/default.po b/app/Locale/rus/LC_MESSAGES/default.po
index e83c69dc9..0486789c2 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: 2020-04-24 01:12\n"
+"PO-Revision-Date: 2021-03-26 04:20\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -9,8 +9,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=((n%10==1 && n%100!=11) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 11 && n%100 <= 14)) ? 2 : 3));\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: ru\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: ru_RU\n"
 
 #: Console/Command/AdminShell.php:72
@@ -71,7 +73,8 @@ msgid "MISP mass sync authkey reset command line tool.\n\n"
 msgstr ""
 
 #: Console/Command/AdminShell.php:536
-#: Controller/UsersController.php:1234
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
 msgid "Invalid user."
 msgstr ""
 
@@ -99,7 +102,7 @@ msgstr ""
 #: Console/Command/EventShell.php:15
 #: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1122;1606;1691;2221;2297;2301;2305;2433;2530;2585;2633;2705;2795;3128;5252;5474;5478;5487
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
 #: Model/Galaxy.php:293
 msgid "Invalid event"
@@ -126,51 +129,51 @@ msgstr ""
 msgid "interactive mode"
 msgstr ""
 
-#: Controller/AppController.php:377
+#: Controller/AppController.php:382
 msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
 msgstr ""
 
-#: Controller/AppController.php:377
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
 msgid "Update Progress"
 msgstr ""
 
-#: Controller/AppController.php:384
+#: Controller/AppController.php:389
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
 msgstr "Что-то пошло не так. Ваш аккаунт больше не существует."
 
-#: Controller/AppController.php:502
+#: Controller/AppController.php:519
 msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
 msgstr ""
 
-#: Controller/AppController.php:710
-#: Controller/AttributesController.php:1876;1985;2089
-#: Controller/EventsController.php:3260
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr ""
 
-#: Controller/AppController.php:719
-#: Controller/AttributesController.php:2093
-#: Controller/EventsController.php:3264
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr "Для выполнения этого действия вы должны быть аутентифицированы"
 
-#: Controller/AppController.php:735
+#: Controller/AppController.php:764
 #: Controller/Component/IndexFilterComponent.php:23
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr ""
 
-#: Controller/AppController.php:873
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr ""
 
-#: Controller/AppController.php:996
-#: Controller/AttributesController.php:2147
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
 #: Controller/ShadowAttributesController.php:1267
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "Задача помещена в очередь. Вы можете просмотреть прогресс, перейдя к форме просмотра текущих задач (администрирование -> задачи)."
 
-#: Controller/AppController.php:1178
+#: Controller/AppController.php:1211
 msgid "RestSearch is not implemented (yet) for this scope."
 msgstr ""
 
@@ -183,19 +186,19 @@ msgstr "Не указан ID события."
 msgid "You do not have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:132;422;602;832;3127;3142
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:2092;2113;2147
+#: Controller/EventsController.php:2107;2128;2162
 #: Controller/ObjectsController.php:837
-#: Model/Attribute.php:4304;4308
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "У вас недостаточно прав для этого."
 
-#: Controller/AttributesController.php:345;800;805;824;1032;1121;2163;2177;2210;2232;2800;2811;2817;2886;3024;3036;3040
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
 #: Controller/ObjectsController.php:641
 #: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
 #: Controller/TagsController.php:506
-#: Model/Attribute.php:4296
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "Некорректный атрибут"
 
@@ -209,7 +212,7 @@ msgid "Attribute not an attachment or malware-sample"
 msgstr "Атрибут не является вложением или вредоносным образцом"
 
 #: Controller/AttributesController.php:419;586;892;1348
-#: Controller/EventsController.php:4414;4428;5201;5215
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "Некорректное событие."
 
@@ -259,7 +262,7 @@ msgid "Invalid event id."
 msgstr "Некорректный Id события."
 
 #: Controller/AttributesController.php:1072
-#: Controller/EventsController.php:2451
+#: Controller/EventsController.php:2466
 #: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "Некорректный ввод."
@@ -284,7 +287,7 @@ msgstr "Атрибут удален"
 msgid "Attribute was not deleted"
 msgstr "Атрибут не был удален"
 
-#: Controller/AttributesController.php:1281;2634
+#: Controller/AttributesController.php:1281;2675
 #: Controller/ShadowAttributesController.php:853
 msgid "Invalid Attribute"
 msgstr "Некорректный атрибут"
@@ -305,104 +308,104 @@ msgstr "Этот метод доступен только через AJAX."
 msgid "You are not authorized to edit this event."
 msgstr "Вы не авторизованы для редактирования этого события."
 
-#: Controller/AttributesController.php:1516
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "Не указан ID события."
 
-#: Controller/AttributesController.php:1561
-#: Controller/GalaxiesController.php:243
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "Синонимы: "
 
-#: Controller/AttributesController.php:1871;1978
+#: Controller/AttributesController.php:1912;2019
 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:1884
+#: Controller/AttributesController.php:1925
 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-type)."
 
-#: Controller/AttributesController.php:1904
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "У вас нет доступа к данному событию."
 
-#: Controller/AttributesController.php:1967
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "Нет совпадений."
 
-#: Controller/AttributesController.php:1989;1998
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Недопустимый атрибут или недостаточно прав для его просмотра."
 
-#: Controller/AttributesController.php:2124
+#: Controller/AttributesController.php:2165
 #: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "Всё готово. "
 
-#: Controller/AttributesController.php:2156;2203
+#: Controller/AttributesController.php:2197;2244
 #: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "Недопустимое поле запроса."
 
-#: Controller/AttributesController.php:2159;2206
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "Эта функция доступна только через AJAX."
 
-#: Controller/AttributesController.php:2241
+#: Controller/AttributesController.php:2282
 msgid "You do not have permission to do that"
 msgstr ""
 
-#: Controller/AttributesController.php:2271;2279
-#: Controller/EventsController.php:3643;3796;4999
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "Событие не найдено или у вас недостаточно прав для создания атрибутов"
 
-#: Controller/AttributesController.php:2300
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "Это действие доступно только через AJAX."
 
-#: Controller/AttributesController.php:2309;2560;2574;2585
-#: Controller/OrganisationsController.php:432
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
 #: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "У вас недостаточно прав на это действие."
 
-#: Controller/AttributesController.php:2414
-#: Controller/EventsController.php:4207
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "Эта функция требует ключ доступа к API."
 
-#: Controller/AttributesController.php:2422
+#: Controller/AttributesController.php:2463
 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:2434
+#: Controller/AttributesController.php:2475
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "Не получен хеш или идентификатор события. Необходимо установить хотя бы один из двух параметров."
 
-#: Controller/AttributesController.php:2595
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "Некорректный сценарий."
 
-#: Controller/AttributesController.php:2662
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr "Для этого атрибута не найдено допустимых параметров обогащения."
 
-#: Controller/AttributesController.php:2760
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "Недопустимый тип запроса."
 
-#: Controller/AttributesController.php:2823;3030
+#: Controller/AttributesController.php:2864;3071
 #: Controller/TagCollectionsController.php:254
 msgid "Invalid tag"
 msgstr ""
 
-#: Controller/AttributesController.php:3120
-#: Controller/EventsController.php:5197
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Отключение корреляции не допускается на данном сервере."
 
-#: Controller/AttributesController.php:3124;3139
+#: Controller/AttributesController.php:3165;3180
 #: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "Некорректный атрибут."
@@ -419,6 +422,63 @@ msgstr ""
 msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
 msgstr ""
 
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
 #: Controller/DecayingModelController.php:20
 msgid "Default decaying models updated"
 msgstr ""
@@ -584,452 +644,456 @@ msgstr ""
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr ""
 
-#: Controller/EventsController.php:879
+#: Controller/EventsController.php:894
 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:881
+#: Controller/EventsController.php:896
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:887
+#: Controller/EventsController.php:902
 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:889
+#: Controller/EventsController.php:904
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:1716
+#: Controller/EventsController.php:1731
 msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1927
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr ""
 
-#: Controller/EventsController.php:1933
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr ""
 
-#: Controller/EventsController.php:1969
+#: Controller/EventsController.php:1984
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr ""
 
-#: Controller/EventsController.php:1973;1977
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:2001
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr "Событие заблокировано локальным черным списком."
 
-#: Controller/EventsController.php:2014;2101;2377
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "Событие сохранено"
 
-#: Controller/EventsController.php:2022
+#: Controller/EventsController.php:2037
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr ""
 
-#: Controller/EventsController.php:2028
+#: Controller/EventsController.php:2043
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "Вы не можете создать события из-за ограничений списка заблокированных событий. Пожалуйста свяжитесь с командой администраторов сервера"
 
-#: Controller/EventsController.php:2030;2380
+#: Controller/EventsController.php:2045;2395
 msgid "The event could not be saved. Please, try again."
 msgstr "Произошла ошибка при сохранении события. Пожалуйста, попробуйте еще раз."
 
-#: Controller/EventsController.php:2079
+#: Controller/EventsController.php:2094
 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:2127
+#: Controller/EventsController.php:2142
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "Вы можете загружать только файлы MISP XML или MISP JSON."
 
-#: Controller/EventsController.php:2128
+#: Controller/EventsController.php:2143
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "Произошла ошибка при загрузке файла или у файла указано неправильное расширение (.xml / .json)"
 
-#: Controller/EventsController.php:2189
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr "Документ STIX импортирован, созданы события: "
 
-#: Controller/EventsController.php:2192
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr "Документ STIX импортирован."
 
-#: Controller/EventsController.php:2195
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr "Не удалось импортировать документ STIX: "
 
-#: Controller/EventsController.php:2202
+#: Controller/EventsController.php:2217
 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:2226;2311
+#: Controller/EventsController.php:2241;2326
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr ""
 
-#: Controller/EventsController.php:2234
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr "Введен неверный идентификатор события."
 
-#: Controller/EventsController.php:2239
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr "Вы не авторизованы для чтения выбранного события."
 
-#: Controller/EventsController.php:2536;2640;2711
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr "У вас недостаточно прав для этого."
 
-#: Controller/EventsController.php:2545
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr "Событие не опубликовано."
 
-#: Controller/EventsController.php:2652;2722
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr "Не удалось опубликовать событие - нет тега для требуемых таксономий: %s"
 
-#: Controller/EventsController.php:2804
+#: Controller/EventsController.php:2819
 msgid "You must specify a message."
 msgstr ""
 
-#: Controller/EventsController.php:2823
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr "Письмо отправлено адресату."
 
-#: Controller/EventsController.php:2832
+#: Controller/EventsController.php:2847
 msgid "Sending of email failed."
 msgstr ""
 
-#: Controller/EventsController.php:2883
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr ""
 
-#: Controller/EventsController.php:2971
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr "Эта функция в настоящее время отключена"
 
-#: Controller/EventsController.php:3097
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr "Имя файла не разрешен."
 
-#: Controller/EventsController.php:3117
+#: Controller/EventsController.php:3134
 msgid "Problem with writing the IoC file. Please report to site admin."
 msgstr ""
 
-#: Controller/EventsController.php:3211
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr "Этот файл не является корректным MISP XML файлом."
 
-#: Controller/EventsController.php:3253
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr "Пока не реализовано"
 
-#: Controller/EventsController.php:3271;3275
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr "Неверное событие или вы не авторизованы."
 
-#: Controller/EventsController.php:3467
+#: Controller/EventsController.php:3484
 #: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr "Некорректный тег."
 
-#: Controller/EventsController.php:3483
+#: Controller/EventsController.php:3500
 #: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr "Тег уже прикреплен к этому событию."
 
-#: Controller/EventsController.php:3497
+#: Controller/EventsController.php:3514
 msgid "Tag is not allowed due to taxonomy exclusivity settings"
 msgstr ""
 
-#: Controller/EventsController.php:3528;3534
+#: Controller/EventsController.php:3545;3551
 #: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr "Тег(и) добавлены."
 
-#: Controller/EventsController.php:3530
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr "Тег не может быть добавлен."
 
-#: Controller/EventsController.php:3536
+#: Controller/EventsController.php:3553
 #: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr ""
 
-#: Controller/EventsController.php:3800;5003;5025;5532;5536
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
 #: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "Некорректное событие."
 
-#: Controller/EventsController.php:3855;3885;3901
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr "У вас недостаточно прав для этого."
 
-#: Controller/EventsController.php:3966;4106
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr "Неверный ID"
 
-#: Controller/EventsController.php:3970;4110;4685
+#: Controller/EventsController.php:3987;4128;4703
 msgid "Event not found or you are not authorised to view it."
 msgstr "Событие не найдено или вы не авторизованы для его просмотра."
 
-#: Controller/EventsController.php:4116
+#: Controller/EventsController.php:4134
 msgid "Freetext Import"
 msgstr ""
 
-#: Controller/EventsController.php:4122
+#: Controller/EventsController.php:4140
 msgid "Populate using a Template"
 msgstr ""
 
-#: Controller/EventsController.php:4128
+#: Controller/EventsController.php:4146
 msgid "OpenIOC Import"
 msgstr ""
 
-#: Controller/EventsController.php:4133
+#: Controller/EventsController.php:4151
 msgid "ThreatConnect Import"
 msgstr ""
 
-#: Controller/EventsController.php:4138
+#: Controller/EventsController.php:4156
 msgid "(Experimental) Forensic analysis - Mactime"
 msgstr ""
 
-#: Controller/EventsController.php:4157
+#: Controller/EventsController.php:4175
 msgid "MISP standard (recommended exchange format - lossless)"
 msgstr ""
 
-#: Controller/EventsController.php:4163
+#: Controller/EventsController.php:4181
 msgid "STIX 1.1.1 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4168
+#: Controller/EventsController.php:4186
 msgid "STIX 2.0 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4210;4217
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4246
+#: Controller/EventsController.php:4264
 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:4254
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "Событий не найдено"
 
-#: Controller/EventsController.php:4277
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "Событий не найдено."
 
-#: Controller/EventsController.php:4287
+#: Controller/EventsController.php:4305
 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:4312
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4451;4472;4531;4556;4581;4611;4632
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr "Недопустимый тип."
 
-#: Controller/EventsController.php:4750
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr "Некорректный метод."
 
-#: Controller/EventsController.php:4832
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr ""
 
-#: Controller/EventsController.php:4836
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:4841
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4896;4942
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:4908
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr ""
 
-#: Controller/EventsController.php:4959
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ": Обогащено с помощью %s"
 
-#: Controller/EventsController.php:5114
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr "Служба импорта недоступна."
 
-#: Controller/EventsController.php:5204;5218
+#: Controller/EventsController.php:5222;5236
 #: Controller/PostsController.php:60;84
 #: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
 msgid "You don't have permission to do that."
 msgstr "У вас недостаточно прав для этого."
 
-#: Controller/EventsController.php:5345
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr "Неверный ID."
 
-#: Controller/EventsController.php:5393
+#: Controller/EventsController.php:5411
 #: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr "Некорректное событие"
 
-#: Controller/EventsController.php:5414
+#: Controller/EventsController.php:5432
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "Задача по обогащению добавлено в очередь. Проверьте позже, чтобы увидеть результаты."
 
-#: Controller/EventsController.php:5665
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr ""
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:241;340
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr "Фид добавлен."
 
-#: Controller/FeedsController.php:249
-msgid "Feed could not be added. Invalid field: %s"
-msgstr "Произошла ошибка при добавлении фида. Неверное поле: %s"
+#: Controller/FeedsController.php:291
+msgid "Feed could not be added. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:274;375;397;526;567;778
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr "Некорректный фид."
 
-#: Controller/FeedsController.php:348
-msgid "Feed could not be updated. Invalid fields: %s"
-msgstr "Произошла ошибка при обновлении фида. Неверные поля: %s"
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:371
-#: Controller/OrganisationsController.php:237
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
 #: Controller/SharingGroupsController.php:237
-#: Controller/UsersController.php:1015
+#: Controller/UsersController.php:1044
 msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:404;530
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "Фид выключен в настоящее время. Убедитесь в том, что включили его."
 
-#: Controller/FeedsController.php:417;483
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr "Начинается загрузка из фида."
 
-#: Controller/FeedsController.php:428
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr "Загрузка помещена в очередь задач."
 
-#: Controller/FeedsController.php:433;435
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr "Произошла ошибка при получении информации из фида."
 
-#: Controller/FeedsController.php:439;500
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr "Получение информации из фида успешно завершено."
 
-#: Controller/FeedsController.php:512
+#: Controller/FeedsController.php:563
 msgid "No feed enabled."
 msgstr ""
 
-#: Controller/FeedsController.php:536;555
+#: Controller/FeedsController.php:587;606
 #: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr "Ошибка загрузки."
 
-#: Controller/FeedsController.php:543
+#: Controller/FeedsController.php:594
 msgid "Event added."
 msgstr "Событие добавлено."
 
-#: Controller/FeedsController.php:546
+#: Controller/FeedsController.php:597
 msgid "Event already up to date."
 msgstr "Событие уже обновлено."
 
-#: Controller/FeedsController.php:548
+#: Controller/FeedsController.php:599
 msgid "Event updated."
 msgstr "Событие обновлено."
 
-#: Controller/FeedsController.php:552
+#: Controller/FeedsController.php:603
 msgid "Could not %s event."
 msgstr ""
 
-#: Controller/FeedsController.php:649
+#: Controller/FeedsController.php:700
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "Не удалось получить информацию из фида. Возвращен код ошибки HTTP: "
 
-#: Controller/FeedsController.php:688;739
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr "Некорректный тип фида."
 
-#: Controller/FeedsController.php:784;816
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr "Не удалось загрузить выбранное событие"
 
-#: Controller/FeedsController.php:814
+#: Controller/FeedsController.php:865
 msgid "This event is blocked by the Feed filters."
 msgstr "Это событие заблокировано фильтрами фида."
 
-#: Controller/FeedsController.php:852;856
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr "Недопустимый фид."
 
-#: Controller/FeedsController.php:877
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr "Разрешены только POST-запросы."
 
-#: Controller/FeedsController.php:881
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr "Фид не найден."
 
-#: Controller/FeedsController.php:890
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr "Данные получены."
 
-#: Controller/FeedsController.php:892
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "Не удалось загрузить выбранные данные. Причина: %s"
 
-#: Controller/FeedsController.php:909
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr "Запуск кэширования фидов."
 
-#: Controller/FeedsController.php:924
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr "Произошла ошибка при кешировании фидов."
 
-#: Controller/FeedsController.php:927
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr "Кэширование фидов успешно завершено."
 
-#: Controller/FeedsController.php:961
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr "Получен неверный список фидов."
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr "Все Кластеры"
 
-#: Controller/GalaxiesController.php:174
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr ""
 
-#: Controller/GalaxiesController.php:304
+#: Controller/GalaxiesController.php:337
 msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:307
+#: Controller/GalaxiesController.php:340
 msgid "Failed to parse request."
 msgstr "Не удалось разобрать запрос."
 
@@ -1112,7 +1176,7 @@ msgid "Object could not be saved."
 msgstr ""
 
 #: Controller/ObjectsController.php:373;1006
-#: Model/Event.php:6171
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr "Недопустимый объект."
 
@@ -1180,43 +1244,43 @@ msgstr ""
 msgid "The organisation could not be added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:156;289;295
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:162;242;248;301;328;361
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
 msgid "Invalid organisation"
 msgstr ""
 
-#: Controller/OrganisationsController.php:201
+#: Controller/OrganisationsController.php:208
 msgid "Organisation updated."
 msgstr ""
 
-#: Controller/OrganisationsController.php:216
+#: Controller/OrganisationsController.php:223
 msgid "The organisation could not be updated."
 msgstr ""
 
-#: Controller/OrganisationsController.php:265
+#: Controller/OrganisationsController.php:272
 msgid "Organisation deleted"
 msgstr "Организация удалена"
 
-#: Controller/OrganisationsController.php:272
+#: Controller/OrganisationsController.php:279
 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/OrganisationsController.php:366
+#: Controller/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:415
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr ""
 
-#: Controller/OrganisationsController.php:437
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr ""
 
-#: Controller/OrganisationsController.php:440
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr ""
 
@@ -1348,7 +1412,7 @@ msgstr ""
 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:350;532;2154
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr ""
 
@@ -1356,8 +1420,8 @@ msgstr ""
 msgid "The server could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ServersController.php:411;608;653;656;665;729;735;1489;1506
-#: Model/Server.php:5737
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "Неверный сервер"
 
@@ -1365,7 +1429,7 @@ msgstr "Неверный сервер"
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr ""
 
-#: Controller/ServersController.php:604;2171;2213
+#: Controller/ServersController.php:604;2183;2225
 msgid "This endpoint expects POST requests."
 msgstr ""
 
@@ -1564,79 +1628,79 @@ msgstr ""
 msgid "This setting can only be edited via the CLI."
 msgstr ""
 
-#: Controller/ServersController.php:1365
+#: Controller/ServersController.php:1365;1377
 msgid "Restarting workers."
 msgstr ""
 
-#: Controller/ServersController.php:1389
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "Файл не найден."
 
-#: Controller/ServersController.php:1395
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "Файл не может быть удален."
 
-#: Controller/ServersController.php:1418;1434
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr "Загрузка не удалась."
 
-#: Controller/ServersController.php:1426
+#: Controller/ServersController.php:1438
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr ""
 
-#: Controller/ServersController.php:1493
+#: Controller/ServersController.php:1505
 msgid "Invalid user or user not found."
 msgstr ""
 
-#: Controller/ServersController.php:2040
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr ""
 
-#: Controller/ServersController.php:2055
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:2058
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
-#: Controller/ServersController.php:2088
+#: Controller/ServersController.php:2100
 msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2097
+#: Controller/ServersController.php:2109
 msgid "Configured host org not found. Please make sure that the setting is current on the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2161
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ServersController.php:2182
+#: Controller/ServersController.php:2194
 msgid "API key updated."
 msgstr ""
 
-#: Controller/ServersController.php:2195
+#: Controller/ServersController.php:2207
 msgid "ID has to be a valid server connection"
 msgstr ""
 
-#: Controller/ServersController.php:2198
+#: Controller/ServersController.php:2210
 msgid "Invalid direction. Valid options: "
 msgstr ""
 
-#: Controller/ServersController.php:2202
+#: Controller/ServersController.php:2214
 msgid "Priority changed."
 msgstr ""
 
-#: Controller/ServersController.php:2205
+#: Controller/ServersController.php:2217
 msgid "Priority could not be changed."
 msgstr ""
 
-#: Controller/ServersController.php:2216
+#: Controller/ServersController.php:2228
 msgid "Only site admin accounts can release the update lock."
 msgstr ""
 
-#: Controller/ServersController.php:2226
+#: Controller/ServersController.php:2238
 msgid "Only site admin accounts get the DB schema diagnostic."
 msgstr ""
 
@@ -1967,164 +2031,174 @@ msgstr ""
 msgid "Event populated, but "
 msgstr ""
 
-#: Controller/UserSettingsController.php:123;312
+#: Controller/UserSettingsController.php:129;276
 msgid "Invalid ID passed."
 msgstr ""
 
-#: Controller/UserSettingsController.php:133;137;322;326
+#: Controller/UserSettingsController.php:139;143;286;290
 msgid "Invalid user setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:151;192;278;290
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
 msgid "Invalid setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:155;196;330
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
 msgid "This setting is restricted and requires the following permission(s): %s"
 msgstr ""
 
-#: Controller/UserSettingsController.php:189
-msgid "This endpoint expects both a setting and a value to be set."
-msgstr ""
-
-#: Controller/UserSettingsController.php:229
+#: Controller/UserSettingsController.php:193
 msgid "Setting saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:242
+#: Controller/UserSettingsController.php:206
 msgid "Setting could not be saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:337
+#: Controller/UserSettingsController.php:301
 msgid "Setting deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:345
+#: Controller/UserSettingsController.php:309
 msgid "Setting could not be deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:358
+#: Controller/UserSettingsController.php:322
 msgid "Expecting POST or DELETE request."
 msgstr ""
 
-#: Controller/UsersController.php:42;310
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr ""
 
-#: Controller/UsersController.php:62;538;786;805;1030
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "Неверный пользователь"
 
-#: Controller/UsersController.php:150;693;858
+#: Controller/UsersController.php:154;722;887
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
-#: Controller/UsersController.php:202
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr ""
 
-#: Controller/UsersController.php:207
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr "Профиль не может быть изменен. Пожалуйста, попробуйте еще раз."
 
-#: Controller/UsersController.php:247
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:256
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:276
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "Пароль изменен."
 
-#: Controller/UsersController.php:285
+#: Controller/UsersController.php:299
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr ""
 
-#: Controller/UsersController.php:422;440;547
-#: Model/Log.php:370
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:704
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr ""
 
-#: Controller/UsersController.php:726
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "Пользователь сохранен."
 
-#: Controller/UsersController.php:735;966
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:958
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "Пользователь сохранен"
 
-#: Controller/UsersController.php:1038
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "Пользователь удален"
 
-#: Controller/UsersController.php:1042
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "Пользователь не удален"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "Неверное имя пользователя или пароль, попробуйте еще раз"
 
-#: Controller/UsersController.php:1208
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr "До свидания"
 
-#: Controller/UsersController.php:1230
-msgid "Invalid action."
-msgstr ""
-
-#: Controller/UsersController.php:1237
-msgid "New authkey generated."
-msgstr ""
-
-#: Controller/UsersController.php:1248
+#: Controller/UsersController.php:1273;1297
 msgid "This functionality is only accessible via POST requests."
 msgstr ""
 
-#: Controller/UsersController.php:1252
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
+msgid "New authkey generated."
+msgstr ""
+
+#: Controller/UsersController.php:1301
 msgid "Job initiated."
 msgstr ""
 
-#: Controller/UsersController.php:1254
+#: Controller/UsersController.php:1303
 msgid "%s authkeys reset, %s could not be reset."
 msgstr ""
 
-#: Controller/UsersController.php:1368
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1496
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1501
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1538
+#: Controller/UsersController.php:1587
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1540
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr ""
 
-#: Controller/UsersController.php:1614
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr "Данные об использовании"
 
-#: Controller/UsersController.php:1615
+#: Controller/UsersController.php:1664
 #: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
@@ -2134,11 +2208,11 @@ msgstr "Данные об использовании"
 msgid "Organisations"
 msgstr "Организации"
 
-#: Controller/UsersController.php:1616
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr "Статистика пользователей и организаций"
 
-#: Controller/UsersController.php:1617
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
 #: View/DecayingModel/decaying_tool_rest_search.ctp:28
 #: View/Elements/eventattribute.ctp:151
@@ -2164,18 +2238,160 @@ msgstr "Статистика пользователей и организаци
 msgid "Tags"
 msgstr "Теги"
 
-#: Controller/UsersController.php:1618
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr "Гистограмма атрибутов"
 
-#: Controller/UsersController.php:1619
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr "Источники голосов"
 
-#: Controller/UsersController.php:1620
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr ""
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "Да"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "Нет"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr ""
@@ -2256,11 +2472,11 @@ msgstr ""
 msgid "No valid data received."
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:614
+#: Controller/Component/ACLComponent.php:634
 msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:668
+#: Controller/Component/ACLComponent.php:688
 msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
 msgstr ""
 
@@ -2741,87 +2957,87 @@ msgstr ""
 msgid "Invalid %s."
 msgstr "Неверный %s."
 
-#: Model/AppModel.php:1416
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr ""
 
-#: Model/AppModel.php:1430
+#: Model/AppModel.php:1480
 msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1452
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1453
+#: Model/AppModel.php:1503
 msgid "The executed SQL query was: %s"
 msgstr ""
 
-#: Model/AppModel.php:1455
+#: Model/AppModel.php:1505
 msgid "Successfuly executed the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1466;1530
+#: Model/AppModel.php:1516;1580
 msgid "Issues executing the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1469
+#: Model/AppModel.php:1519
 msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1478
+#: Model/AppModel.php:1528
 msgid "However, as this error is whitelisted, the update went through."
 msgstr ""
 
-#: Model/AppModel.php:1497
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/AppModel.php:1500
+#: Model/AppModel.php:1550
 msgid "Failed to add index"
 msgstr ""
 
-#: Model/AppModel.php:1502
+#: Model/AppModel.php:1552
 msgid "The returned error is:"
 msgstr ""
 
-#: Model/AppModel.php:1531
+#: Model/AppModel.php:1581
 msgid "Database updates stopped as some errors occured and the stop flag is enabled."
 msgstr ""
 
-#: Model/AppModel.php:1690
+#: Model/AppModel.php:1740
 msgid "Invalid JSON."
 msgstr ""
 
-#: Model/AppModel.php:1783;1841
+#: Model/AppModel.php:1833;1891
 msgid "Issues executing run_updates"
 msgstr ""
 
-#: Model/AppModel.php:1784
+#: Model/AppModel.php:1834
 msgid "Database updates are locked. Worker not spawned"
 msgstr ""
 
-#: Model/AppModel.php:1788;1846;1881
+#: Model/AppModel.php:1838;1896;1931
 msgid "Update done"
 msgstr ""
 
-#: Model/AppModel.php:1842
+#: Model/AppModel.php:1892
 msgid "Updates are locked. Stopping worker gracefully"
 msgstr ""
 
-#: Model/AppModel.php:1861
+#: Model/AppModel.php:1911
 msgid "Running update %s"
 msgstr ""
 
-#: Model/AppModel.php:1887
+#: Model/AppModel.php:1937
 msgid "Update done in another worker. Gracefuly stopping."
 msgstr ""
 
@@ -3805,19 +4021,19 @@ msgstr ""
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:2278;2346
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2282
+#: Model/Attribute.php:2301
 msgid "Invalid hash type."
 msgstr "Некорректный тип хэша."
 
-#: Model/Attribute.php:2973
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr "Это поле является обязательным."
 
-#: Model/Attribute.php:3540
+#: Model/Attribute.php:3559
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
@@ -3837,6 +4053,10 @@ msgstr ""
 msgid "Community not found."
 msgstr ""
 
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
 #: Model/DecayingModel.php:162
 msgid "Models could not be loaded or default decaying models folder is empty"
 msgstr ""
@@ -3908,67 +4128,75 @@ msgstr ""
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5722
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:5724
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:5726
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:5729
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:5731
+#: Model/Event.php:5808
 msgid "Please "
 msgstr "Пожалуйста "
 
-#: Model/Event.php:5733
+#: Model/Event.php:5810
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:5765
+#: Model/Event.php:5842
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:5774
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr ""
 
-#: Model/Event.php:6023
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr "Не удалось добавить теги."
 
-#: Model/Event.php:6505
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:1444;1488
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1458
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Feed.php:1635
+#: Model/Feed.php:1687
 msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Feed.php:1638
+#: Model/Feed.php:1690
 msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
 msgstr ""
 
-#: Model/Feed.php:1643
+#: Model/Feed.php:1695
 msgid "Invalid user id."
 msgstr ""
 
-#: Model/Feed.php:1663
+#: Model/Feed.php:1715
 msgid "Events related to feed %s purged."
 msgstr ""
 
@@ -3976,1164 +4204,1208 @@ msgstr ""
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:1057
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
-#: Model/Server.php:140
+#: Model/Server.php:123
+msgid "Server unreachable"
+msgstr ""
+
+#: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
 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:141
+#: Model/Server.php:151
 msgid "Administering MISP via the CLI"
 msgstr "Администрирование MISP с помощью консоли"
 
-#: Model/Server.php:153
+#: Model/Server.php:163
 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:154
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "Автоматизация консольных задач"
 
-#: Model/Server.php:163
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:164
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:173
+#: Model/Server.php:183
 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:175
+#: Model/Server.php:185
 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 "Установленный в настоящее время основной URL не соответствует URL в адресной строке. Игнорируйте данное сообщение, если вы используете альтернативное имя (например IP-адрес)."
 
-#: Model/Server.php:181
+#: Model/Server.php:191
 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 "Основной URL приложения (в формате https://www.mymispinstance.com) в том виде, в котором он будет виден сторонним организациям. Если значение не установлено, будет использоваться параметр MISP.baseurl."
 
-#: Model/Server.php:189
+#: Model/Server.php:199
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr "Если параметр равен false, то инстанс будет доступен только для администраторов."
 
-#: Model/Server.php:197
+#: Model/Server.php:207
 msgid "Select the language MISP should use. The default is english."
 msgstr "Язык интерфейса (по-умолчанию английский)."
 
-#: Model/Server.php:207
+#: Model/Server.php:217
 msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
-#: Model/Server.php:216
+#: Model/Server.php:226
 msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
 msgstr ""
 
-#: Model/Server.php:225
+#: Model/Server.php:235
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "Включение затратных корреляций (к примеру корреляции CIDR)."
 
-#: Model/Server.php:234
+#: Model/Server.php:244
 msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
 msgstr ""
 
-#: Model/Server.php:243
+#: Model/Server.php:253
 msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
 msgstr "Настоятельно рекомендуется устаналивать все зависимости модулей Python в виртуальном окружении (virtualenv). Рекомендуемое расположение: %s/venv"
 
-#: Model/Server.php:254
+#: Model/Server.php:264
 msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
 msgstr ""
 
-#: Model/Server.php:264
+#: Model/Server.php:274
 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:273
+#: Model/Server.php:283
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr "Порог ssdeep при котором два ssdeep хеша будут считаться коррелированными [1-100]"
 
-#: Model/Server.php:281
+#: Model/Server.php:291
 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 "Максимальное кол-во числа корреляций, которые будут вычисляться для одного события. Установка данного параметра может решить проблемы с памятью (по-умолчанию выставлено значение 5000)."
 
-#: Model/Server.php:290
+#: Model/Server.php:300
 msgid "The message that users will see if the instance is not live."
 msgstr "Сообщение, которое увидят пользователи, если инстанс не в рабочем режиме."
 
-#: Model/Server.php:292
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr "Если параметр не установлен, то будет использоваться значение по-умолчанию."
 
-#: Model/Server.php:298;306;333;357;365;373;381;438;486;494;561
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr "Данный параметр является устаревшим и может быть удален."
 
-#: Model/Server.php:314
+#: Model/Server.php:324
 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:324
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr ""
 
-#: Model/Server.php:341
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "Текст, предшествующий тексту \"Powered by MISP\" в нижней части страниц."
 
-#: Model/Server.php:349
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "Текст, идущий после текста \"Powered by MISP\" в нижней части страницы."
 
-#: Model/Server.php:389
+#: Model/Server.php:399
 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:397
+#: Model/Server.php:407
 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:405
+#: Model/Server.php:415
 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:413
+#: Model/Server.php:423
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr "Тег организации, используется в темах электронных писем."
 
-#: Model/Server.php:421
+#: Model/Server.php:431
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr "Организация-владелец данного инстанса. Если параметр не установлен, то отсутствует возможность добавить экземпляры для репликации."
 
-#: Model/Server.php:430
+#: Model/Server.php:440
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr "UUID инстанса, используется для идентификации данного экземпляра MISP."
 
-#: Model/Server.php:432
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr "Установлен некорректный UUID"
 
-#: Model/Server.php:446
+#: Model/Server.php:456
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr "Если параметр равен false, то будут убраны все появления наименования и логотипа организации."
 
-#: Model/Server.php:454
+#: Model/Server.php:464
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr "Установка в теме письма-уведомления уровня угрозы события."
 
-#: Model/Server.php:462
+#: Model/Server.php:472
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr "Строка TLP для писем в том случае, если параметр email_subject_tag не найден."
 
-#: Model/Server.php:470
+#: Model/Server.php:480
 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 "Значение данного параметра у события будет использоваться в качестве темы письма. Если не установлен параметр, то используется email_subject_TLP_string."
 
-#: Model/Server.php:478
+#: Model/Server.php:488
 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:502
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr "Включать использование рабочих процессов."
 
-#: Model/Server.php:510
+#: Model/Server.php:520
 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:520
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "Разрешить XML-кешам включать вложения."
 
-#: Model/Server.php:528
+#: Model/Server.php:538
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr "Всегда загружать вложения в браузере."
 
-#: Model/Server.php:536
+#: Model/Server.php:546
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr "Адрес электронной почты, используемый для уведомлений."
 
-#: Model/Server.php:544
+#: Model/Server.php:554
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr "Отключение отправки электронной почты, если параметр равен true, никакая почта не отправляется."
 
-#: Model/Server.php:553
+#: Model/Server.php:563
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr "Адрес электронной почты, используемый для связи с службой поддержки."
 
-#: Model/Server.php:569
+#: Model/Server.php:579
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr "Конвертация типа уязвимости в ссылки с помощью установленного провайдера информации о CVE."
 
-#: Model/Server.php:577
+#: Model/Server.php:587
 msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
 msgstr ""
 
-#: Model/Server.php:585
+#: Model/Server.php:595
 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 интерфейсу. При настройке связи с сторонним инстансом хорошая идея - отключать посылку уведомлений. Если параметр равен true, то электронные письма не посылаются."
 
-#: Model/Server.php:593
+#: Model/Server.php:603
 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 "Включить описание события в тему писем. Будьте аккуратны, тема письма не шифруются GnuP, и описание событий будет отправляться в незашифрованном виде."
 
-#: Model/Server.php:601
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr "Распределение событий, установленное по-умолчанию (0-3)."
 
-#: Model/Server.php:610
+#: Model/Server.php:620
 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 "Распределение атрибутов, установленное по-умолчанию (0-3, 'event'). Если установлено 'event', то значение распределение будет браться у события."
 
-#: Model/Server.php:619
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr "Уровень угрозы для создаваемых событий по-умолчанию."
 
-#: Model/Server.php:628
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr "Коллекция тегов, применяемая ко всем событиям, создаваемых вручную."
 
-#: Model/Server.php:637
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr "Включение функционала тегирования (строго рекомендуется)."
 
-#: Model/Server.php:645
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr "Показывать полные наименование тегов."
 
-#: Model/Server.php:654
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr "Текст, предшествующий логотипу MISP на стартовой странице."
 
-#: Model/Server.php:662
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr "Текст, идущий после логотипа MISP на стартовой странице."
 
-#: Model/Server.php:670
+#: Model/Server.php:689
 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:678
+#: Model/Server.php:697
 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:686
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr "Текст, идущий после имени страницы."
 
-#: Model/Server.php:694
+#: Model/Server.php:713
 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 "Разрешить пользователям становиться владельцами событий, импортированными из XML файлов. Данная опция потенциально может сломать систему синхронизации, при слиянии двух одинаковых событий с разными создателями могут пройзойти нежелательные последствия."
 
-#: Model/Server.php:702
+#: Model/Server.php:721
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr "Если параметр равен false, то условия и положения показываются на сайте, иначе скачиваются в виде файла."
 
-#: Model/Server.php:710
+#: Model/Server.php:729
 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:718
+#: Model/Server.php:737
 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, то в списке событий показываются расширенные поля организации (организация-источник и организация-член). Данный функционал позволяет пользователям видеть кем было загружено событие."
 
-#: Model/Server.php:726
+#: Model/Server.php:745
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr "Если параметр равен true, то доступ к к неопубликованным событиям закрыт для всех пользователей из сторонних организаций кроме администраторов сайта."
 
-#: Model/Server.php:735
+#: Model/Server.php:754
 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 - новый временный пароль, $username = адрес электронной почты пользователя, $misp = URL инстанса MISP, $org = организация-владелец инстанса MISP, $contact = адрес электронной почты службы поддержки. Например \"Пароль для $username - $password\" будет отображен для пользователя с адресом user@misp.org как \"Пароль для user@misp.org - hNamJae81\"."
 
-#: Model/Server.php:744
+#: Model/Server.php:763
 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 - новый временный пароль, $username = адрес электронной почты пользователя, $misp = URL инстанса MISP, $org = организация-владелец инстанса MISP, $contact = адрес электронной почты службы поддержки. Например \"Пароль для $username - $password\" будет отображен для пользователя с адресом user@misp.org как \"Пароль для user@misp.org - hNamJae81\"."
 
-#: Model/Server.php:752
+#: Model/Server.php:771
 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 "Если параметр равен true, то включена фильтрация событий по UUID, события, подвергающиеся фильтрации, не могут быть получены на указанный инстанс."
 
-#: Model/Server.php:759
+#: Model/Server.php:778
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr "Если параметр равен true, то включена фильтрация организаций по UUID, организации, подвергающиеся фильтрации, не могут создавать события на указанном инстансе."
 
-#: Model/Server.php:766
+#: Model/Server.php:785
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr "Если параметр равен true, то включено логирование IP-адреса пользователя."
 
-#: Model/Server.php:775
+#: Model/Server.php:794
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr "Если параметр равен true, то включено логирование (с URL) всех аутентификаций по API."
 
-#: Model/Server.php:783
+#: Model/Server.php:802
 msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
 msgstr ""
 
-#: Model/Server.php:785
+#: Model/Server.php:804
 msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
 msgstr ""
 
-#: Model/Server.php:792
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:801
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:810
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:819
+#: Model/Server.php:838
 msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
 msgstr ""
 
-#: Model/Server.php:828
+#: Model/Server.php:847
 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:837
+#: Model/Server.php:856
 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 "Если параметр равен true, то в списке событий показывается количество корреляций. Это влияет на скорость работы инстанса, но может быть полезно сразу видеть корреляцию событий."
 
-#: Model/Server.php:846
+#: Model/Server.php:865
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr "Если параметр равен true, то в списке событий показывается количество предложений."
 
-#: Model/Server.php:855
+#: Model/Server.php:874
 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 "Если параметр равен true, то в списке событий показывается агрегированная оценка голосования по атрибутам события."
 
-#: Model/Server.php:864
+#: Model/Server.php:883
 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 "Если параметр равен true, то в списке событий показывается количество комментариев по каждому событию."
 
-#: Model/Server.php:873
+#: Model/Server.php:892
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr "Если параметр равен true, то только администратор сайта или организации имеет право изменять учетную запись пользователя."
 
-#: Model/Server.php:883
+#: Model/Server.php:902
 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 "Если параметр равен true, то письма с уведомлениями не отправляются для событий с определенным тегом (параметр MISP.block_event_alert_tag)."
 
-#: Model/Server.php:892
+#: Model/Server.php:911
 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 равен true, то письма с уведомлениями не отправляются для событий с указанным тегом."
 
-#: Model/Server.php:901
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:910
+#: Model/Server.php:929
 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 "Если параметр равен true, то письма с уведомлениями не отправляются для событий с истекшим сроком давности (параметр MISP.block_old_event_alert_age)."
 
-#: Model/Server.php:919
+#: Model/Server.php:938
 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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:928
+#: Model/Server.php:947
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:937
+#: Model/Server.php:956
 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 "Временная директория. По-умолчанию - /tmp, используется для для хранения временных файлов, получаемых при импорте информации."
 
-#: Model/Server.php:947
+#: Model/Server.php:966
 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 "Имя пользовательского файла стилей (директория для размещения файла - /var/www/MISP/app/webroot/css)."
 
-#: Model/Server.php:956
+#: Model/Server.php:975
 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 "Если параметр равен true, то включается механизм блокирования атрибутов (если есть предложение по изменению флага to_ids или удаления атрибута целиком). Данный параметр повышает эффективность работы с ложно-положительными результатами."
 
-#: Model/Server.php:965
+#: Model/Server.php:984
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr "Если параметр равен true, то новые теги, появившиеся в результате синхронизации из сторонних источников, будут недоступны для пользователей по-умолчанию."
 
-#: Model/Server.php:974
+#: Model/Server.php:993
 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:984
+#: Model/Server.php:1003
 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:993
+#: Model/Server.php:1012
 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 "Имя хоста, на котором запущен сервис Redis."
 
-#: Model/Server.php:1001
+#: Model/Server.php:1020
 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."
 
-#: Model/Server.php:1009
+#: Model/Server.php:1028
 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 "Имя базы данных на сервере Redis. Если вы используете более одного инстанса MISP, вы должны использовать разные базы данных для разных инстансов."
 
-#: Model/Server.php:1017
+#: Model/Server.php:1036
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr "Пароль сервиса Redis."
 
-#: Model/Server.php:1026
+#: Model/Server.php:1045
 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:1034
+#: Model/Server.php:1053
 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 "Если параметр равен false, то инстанс MISP не управляет своими рабочими процессами (например для управления с помощью сторонних решений, systemd init)."
 
-#: Model/Server.php:1042
+#: Model/Server.php:1061
 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:1051
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:1062
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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. Если стандартный вариант вам подходит, просто установите параметр по-умолчанию."
 
-#: Model/Server.php:1071
+#: Model/Server.php:1099
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr "Если параметр равен false, то позволить отправлять незашифрованные письма пользователям, у которых нет GnuPG ключа."
 
-#: Model/Server.php:1079
+#: Model/Server.php:1107
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr "Если параметр равен false, то тело незашифрованного письма может содержать детали события."
 
-#: Model/Server.php:1087
+#: Model/Server.php:1115
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr "Включение механизма подписи GnuPG, по-умолчанию письма подписываются."
 
-#: Model/Server.php:1095
+#: Model/Server.php:1123
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr "Адрес электронной почты на сервере, используемый для отправления зашифрованных писем."
 
-#: Model/Server.php:1103
+#: Model/Server.php:1131
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr "Пароль (если установлен) GnuPG ключа."
 
-#: Model/Server.php:1112
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr "Месторасположение домашней директории GnuPG."
 
-#: Model/Server.php:1123
+#: Model/Server.php:1151
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr "Включить шифрование SMIME. Параметры GnuPG.onlyencrypted и GnuPG.bodyonlyencrypted наследуют значения от текущего параметра."
 
-#: Model/Server.php:1131
+#: Model/Server.php:1159
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr "Адрес электронной почты на сервере, используемый для зашифрования SMIME."
 
-#: Model/Server.php:1139
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr "Местоположение открытой части подписывающего сертификата."
 
-#: Model/Server.php:1147
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr "Местоположение закрытой части подписывающего сертфиката."
 
-#: Model/Server.php:1155
+#: Model/Server.php:1183
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr "Пароль (если установлен) SMIME ключа."
 
-#: Model/Server.php:1167
+#: Model/Server.php:1195
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr "Имя сервера HTTP-прокси для исходящих запросов. Оставьте пустым если нет прокси."
 
-#: Model/Server.php:1175
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr "TCP-порт сервера HTTP-прокси."
 
-#: Model/Server.php:1183
+#: Model/Server.php:1211
 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:1191
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr "Имя пользователя"
 
-#: Model/Server.php:1199
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr "Пароль"
 
-#: Model/Server.php:1210
+#: Model/Server.php:1238
 msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
 msgstr ""
 
-#: Model/Server.php:1219
+#: Model/Server.php:1247
 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 "Соль для хеширования паролей. Изменяется вручную в файле settings.php. При изменении все действующие пароли станут недействительными."
 
-#: Model/Server.php:1229
+#: Model/Server.php:1257
 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:1238
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1246
+#: Model/Server.php:1292
 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 "Сложность пароля. Оставьте пустым для значения по-умолчанию или установите свое регулярное выражение (минимальная длина пароля устанавливается в параметре Security.password_policy_length)."
 
-#: Model/Server.php:1254
+#: Model/Server.php:1300
 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 "Если параметра равен true, то пользователь должен вводить свой текущий каждый раз при изменении данных профиля (в том числе при смене текущего пароля). Администратор должен будет вводить пароль каждый раз при изменении профиля любого пользователя. Теоретически данный функционал может помешать злоумышленнику сменить пароль от скомпрометированной учетной записи, но в то же время очень надоедлив для пользователей."
 
-#: Model/Server.php:1263
+#: Model/Server.php:1309
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr "Включение параметра приведет к санитизации содержимого атрибута при удалении."
 
-#: Model/Server.php:1272
+#: Model/Server.php:1318
 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 "Если параметр равен true, то индекс организации виден только администратору сайта данного инстанса MISP (пользователи могут видеть организацию, которая создаем события, предложения и т.д.)"
 
-#: Model/Server.php:1281
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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 "Включение возможности передачи токена API с помощью URL параметра \"apikey\" - не рекомендуется включать данный функционал, только если у вас крайне нужное устаревшее средство, которое не умеет использовать заголовки."
 
-#: Model/Server.php:1283
+#: Model/Server.php:1339
 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 "Вы разрешили передачу API ключей через параметры URL. Это крайне не рекомендуется, вы действительно хотите сохранять свой ключ в логах?..."
 
-#: Model/Server.php:1290
+#: Model/Server.php:1346
 msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
 msgstr "Включение возможности выполнять кросс-доменные запросы, валидируя список доменов по параметру Security.cors_origins."
 
-#: Model/Server.php:1299
+#: Model/Server.php:1355
 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 "Список доменов, с которыми инстанс MISP может выполнять кросс-доменные запросы. Полезный функционал для внешней интеграции. Значения разделяются запятыми."
 
-#: Model/Server.php:1308
+#: Model/Server.php:1364
 msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr "Максимальное количество попыток ввода пароля."
 
-#: Model/Server.php:1328
+#: Model/Server.php:1393
 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:1339
+#: Model/Server.php:1404
 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 "Если параметр равен true, то сессия работы пользователя прерывается после x запросов (не рекомендуется, пользователи недовольны частыми прерываниями в работе с системой, используйте только в крайнем случае, если вам действительно необходимо завершать сессии)."
 
-#: Model/Server.php:1347
+#: Model/Server.php:1412
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr "Если параметр равен true, то строка user agent проверяется в каждом запросе (не рекомендуется, данный функционал может привести в случайным завершениям сессии)."
 
-#: Model/Server.php:1355
+#: Model/Server.php:1420
 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 "Тип сессии (по-умолчанию php, использует настройки в файле php.ini). Поддерживаемые типы сессий - php, database. Рекомендуемый тип сессии - php."
 
-#: Model/Server.php:1364
+#: Model/Server.php:1429
 msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
 msgstr "Длительность сессии (в минутах). 0 не означает бесконечную сессию, вместо этого сессии будут завершаться немедленно."
 
-#: Model/Server.php:1372
+#: Model/Server.php:1437
 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:1383
+#: Model/Server.php:1448
 msgid "The default policy action for the values added to the RPZ."
 msgstr "Действие по-умолчанию для значений, которые добавлены в RPZ."
 
-#: Model/Server.php:1392
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1473
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Параметр refresh в SOA-части файла зоны (в секундах, или в сокращенном виде - 15m)."
 
-#: Model/Server.php:1416
+#: Model/Server.php:1481
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Параметр retry в SOA-части файла зоны (в секундах, или в сокращенном виде - 15m)."
 
-#: Model/Server.php:1424
+#: Model/Server.php:1489
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Параметр expire в SOA-части файла зоны (в секундах, или в сокращенном виде - 15m)."
 
-#: Model/Server.php:1432
+#: Model/Server.php:1497
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Параметр minimum TTL в SOA-части файла зоны (в секундах, или в сокращенном виде - 15m)."
 
-#: Model/Server.php:1440
+#: Model/Server.php:1505
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "TTL файла зоны (в секундах, или в сокращенном виде - 15m)."
 
-#: Model/Server.php:1448
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr ""
 
-#: Model/Server.php:1456
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr "Альтернативный DNS-сервер"
 
-#: Model/Server.php:1464
+#: Model/Server.php:1529
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr "Параметр адрес электронной почты в SOA-части файла зоны (вместо символа \"@\" используется символ \".\")."
 
-#: Model/Server.php:1472
+#: Model/Server.php:1537
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1480
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr ""
 
-#: Model/Server.php:1488
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr ""
 
-#: Model/Server.php:1496;1743
+#: Model/Server.php:1561;1808
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr "Если параметр равен true, то сообщения дополняются base64-закодированными образцами вирусов или вложений."
 
-#: Model/Server.php:1504;1751
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr "Включает/отключает публикацию при действии с событием (создание, редактирование, удаление)."
 
-#: Model/Server.php:1512
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1520
+#: Model/Server.php:1585
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1528
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr ""
 
-#: Model/Server.php:1536;1759
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr "Включает/отключает публикацию при действии с объектов (создание, редактирование, удаление)."
 
-#: Model/Server.php:1544
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1552;1767
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr "Включает/отключает публикацию при действии с ссылкой на объект (создание, удаление)."
 
-#: Model/Server.php:1560
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1568;1775
+#: Model/Server.php:1633;1840
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr "Включает/отключает публикацию при действии с атрибутом (создание, редактирование, удаление)."
 
-#: Model/Server.php:1576
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1584
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1592
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1600;1783
+#: Model/Server.php:1665;1848
 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:1608
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1616
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr ""
 
-#: Model/Server.php:1624
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr ""
 
-#: Model/Server.php:1632
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr ""
 
-#: Model/Server.php:1640
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr ""
 
-#: Model/Server.php:1648
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1656
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1664
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1672
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr ""
 
-#: Model/Server.php:1680
+#: Model/Server.php:1745
 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 "Включает/отключает функционал обмена сообщения ZeroMQ. Убедитесь, что у вас установлены все зависимости для корректной работы плагина."
 
-#: Model/Server.php:1689
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr "Порт сервиса обмена сообщениями."
 
-#: Model/Server.php:1698
+#: Model/Server.php:1763
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr "Местонахождение базы данных Redis."
 
-#: Model/Server.php:1707
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr "Порт сервиса Redis."
 
-#: Model/Server.php:1716
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr "Пароль сервиса Redis."
 
-#: Model/Server.php:1725
+#: Model/Server.php:1790
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr "Наименование базы данных, используемой для обмена сообщениями."
 
-#: Model/Server.php:1734
+#: Model/Server.php:1799
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr "Пространство имен, используемое для обмена сообщениями."
 
-#: Model/Server.php:1791
+#: Model/Server.php:1856
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr "Включает/отключает публикацию при действии с голосованием."
 
-#: Model/Server.php:1799
+#: Model/Server.php:1864
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr "Включает/отключает публикацию при действии с профилями пользователей (создание, редактирование)."
 
-#: Model/Server.php:1807
+#: Model/Server.php:1872
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr "Включает/отключает публикацию при действии с профилями организации (создание, редактирование)."
 
-#: Model/Server.php:1815
+#: Model/Server.php:1880
 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:1823
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "Включает/отключает функционал логирования в сервис ElasticSearch."
 
-#: Model/Server.php:1831
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr "URL для доступа к ElasticSearch (если несколько, то перечисление через запятую)."
 
-#: Model/Server.php:1839
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr "Индекс ElasticSearch, куда необходимо складывать логи."
 
-#: Model/Server.php:1847
+#: Model/Server.php:1912
 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:1855
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr "Наименование корзины для загрузки."
 
-#: Model/Server.php:1863
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr "Регион расположения корзины."
 
-#: Model/Server.php:1871
+#: Model/Server.php:1936
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr "AWS-ключ для загрузки (ВНИМАНИЕ: настоятельно рекомендуется использовать IAM-роли)."
 
-#: Model/Server.php:1879
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr "Секретный AWS-ключ для загрузки."
 
-#: Model/Server.php:1887
+#: Model/Server.php:1952
 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:1896
+#: Model/Server.php:1961
 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:1904
+#: Model/Server.php:1969
 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 "Период учета голосов для использования при построении графов. Период указывается в днях (по-умолчанию 365 дней)."
 
-#: Model/Server.php:1912
+#: Model/Server.php:1977
 msgid "Enable SightingDB integration."
 msgstr ""
 
-#: Model/Server.php:1920
+#: Model/Server.php:1985
 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 "Включение/отключение поддержки стороннего механизма аутентификации с пробросом HTTP-заголовка."
 
-#: Model/Server.php:1930
+#: Model/Server.php:1995
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr "HTTP-заголовок для аутентификации и авторизации. Если параметр не заполнен, по-умолчанию ожидается заголовок Authorization."
 
-#: Model/Server.php:1939
+#: Model/Server.php:2004
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr "Использовать пространство имен заголовка авторизации (по-умолчанию включен)."
 
-#: Model/Server.php:1948
+#: Model/Server.php:2013
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr "Пространство имен заголовка авторизации (по-умолчанию HTTP_)."
 
-#: Model/Server.php:1957
+#: Model/Server.php:2022
 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 "Если параметр равен true, то для аутентификации используется только сторонний механизм. В противном случае используется смешанный режим, при котором в случае отсутствия заголовка в запросе, пользователь перенаправляется на страницу аутентификации."
 
-#: Model/Server.php:1966
+#: Model/Server.php:2031
 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 "URL стороннего механизма аутентификации."
 
-#: Model/Server.php:1975
+#: Model/Server.php:2040
 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:1984
+#: Model/Server.php:2049
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr "Отключить кнопку выхода из текущей сессии для пользователей, которые вошли с помощью стороннего механизма аутентификации."
 
-#: Model/Server.php:1992
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr "Включает/отключает сервисы обогащения."
 
-#: Model/Server.php:2000
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr "Таймаут для сервисов обогащения."
 
-#: Model/Server.php:2008
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr "Включает/отключает сервисы импорта."
 
-#: Model/Server.php:2016
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr "Таймаут для сервисов импорта."
 
-#: Model/Server.php:2024
+#: Model/Server.php:2089
 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:2032
+#: Model/Server.php:2097
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Порт сервисов импорта (по-умолчанию доступен на http://127.0.0.1:6666)."
 
-#: Model/Server.php:2040
+#: Model/Server.php:2105
 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:2048
+#: Model/Server.php:2113
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Порт сервисов экспорта (по-умолчанию доступен на http://127.0.0.1:6666)."
 
-#: Model/Server.php:2056
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr "Включает/отключает сервисы экспорта."
 
-#: Model/Server.php:2064
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr "Таймаут для сервисов экспорта."
 
-#: Model/Server.php:2072
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr "Включает/отключает наведение на информацию, получаемую от модулей обогащения."
 
-#: Model/Server.php:2080
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr "Таймаут для сервисов наведения."
 
-#: Model/Server.php:2088
+#: Model/Server.php:2153
 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:2096
+#: Model/Server.php:2161
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Порт сервисов обогащения (по-умолчанию доступен на http://127.0.0.1:6666)."
 
-#: Model/Server.php:2104
+#: Model/Server.php:2169
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr "URL Cortex (по-умолчанию доступен на http://cortex-url)."
 
-#: Model/Server.php:2112
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr "Порт Cortex (по-умолчанию используется порт 9000)."
 
-#: Model/Server.php:2120
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2128
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "Ключ аутентификации для сервиса Cortex."
 
-#: Model/Server.php:2137
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2145
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr "Если параметр равен false, отключение SSL-проверок (не рекомендуется)."
 
-#: Model/Server.php:2154
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr "Если параметр равен false, отключение проверки имени хоста при валидации сертификата."
 
-#: Model/Server.php:2163
+#: Model/Server.php:2228
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr "Если параметр равен true, то принимаются самоподписанные сертификаты (данный параметр требует, чтобы параметр Plugin.Cortex_ssl_verify_peer был равен true)."
 
-#: Model/Server.php:2172
+#: Model/Server.php:2237
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr "Путь до файла Certificate Authority, которым проверяется SSL-сертификаты."
 
-#: Model/Server.php:2181
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr "URL для сброса пароля для сторонней аутентификации."
 
-#: Model/Server.php:2190
+#: Model/Server.php:2255
 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:2200
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr "Уровень отладки приложения, всегда отключайте отладку в инстансах, работающих в боевых сетях."
 
-#: Model/Server.php:2209
+#: Model/Server.php:2274
 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:2376
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2380
+#: Model/Server.php:2445
 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:2407
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr ""
 
-#: Model/Server.php:2413
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr ""
 
-#: Model/Server.php:2492
+#: Model/Server.php:2557
 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:2494
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr "Данный функционал еще не реализован"
 
-#: Model/Server.php:2495
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2507;2509
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr "Неизвестная проблема."
 
-#: Model/Server.php:3049
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:3052
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:3060
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:3175
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr "Значение не установлено."
 
-#: Model/Server.php:3196
+#: Model/Server.php:3281
 msgid "Invalid language."
 msgstr ""
 
-#: Model/Server.php:3217
+#: Model/Server.php:3302
 msgid "Invalid tag_collection."
 msgstr ""
 
-#: Model/Server.php:3225
+#: Model/Server.php:3310
 msgid "This setting has to be a number."
 msgstr ""
 
-#: Model/Server.php:3237
+#: Model/Server.php:3322
 msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
 msgstr ""
 
-#: Model/Server.php:3519
+#: Model/Server.php:3619
 msgid "Invalid file path or file not accessible."
 msgstr ""
 
-#: Model/Server.php:3522
+#: Model/Server.php:3622
 msgid "File has to be in .pem format."
 msgstr ""
 
-#: Model/Server.php:3888
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr ""
 
-#: Model/Server.php:4020
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr "Логотипы организаций"
 
-#: Model/Server.php:4021
+#: Model/Server.php:4121
 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:4023
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr "48х48 PNG файл"
 
-#: Model/Server.php:4026;4041
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
 msgstr "Имя файла должно быть в формате *.png"
 
-#: Model/Server.php:4030
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr "Дополнительные файлы картинок"
 
-#: Model/Server.php:4031
+#: Model/Server.php:4131
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr "Файлы картинок, используемые для различных целей (например логотип страницы входа в приложение)"
 
-#: Model/Server.php:4038
+#: Model/Server.php:4138
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr "text/html если передается встроенный файл, и какой угодно формат, если передается просто файл"
 
-#: Model/Server.php:4128
+#: Model/Server.php:4228
 msgid "Invalid server."
 msgstr ""
 
-#: Model/Server.php:4159
+#: Model/Server.php:4259
 msgid "Response was empty."
 msgstr ""
 
-#: Model/Server.php:4235
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr "Ошибка: сервер не послал ожидаемый ответ. Возможная причина данного поведения - устаревшая версия удаленного сервера."
 
-#: Model/Server.php:4501
+#: Model/Server.php:4604
 msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
 msgstr ""
 
-#: Model/Server.php:4571
+#: Model/Server.php:4675
 msgid "Can't check database schema for Postgres database type"
 msgstr ""
 
-#: Model/Server.php:4588
+#: Model/Server.php:4692
 msgid "Table `%s` does not exist"
 msgstr ""
 
-#: Model/Server.php:4615
+#: Model/Server.php:4719
 msgid "Column `%s` exists but should not"
 msgstr ""
 
-#: Model/Server.php:4648
+#: Model/Server.php:4752
 msgid "Column `%s` is different"
 msgstr ""
 
-#: Model/Server.php:4658
+#: Model/Server.php:4762
 msgid "Column `%s` does not exist but should"
 msgstr ""
 
-#: Model/Server.php:4671
+#: Model/Server.php:4775
 msgid "Table `%s` is an additional table"
 msgstr ""
 
-#: Model/Server.php:4695
+#: Model/Server.php:4799
 msgid "Column `%s` should be indexed"
 msgstr ""
 
-#: Model/Server.php:4718
+#: Model/Server.php:4822
 msgid "Column `%s` is indexed but should not"
 msgstr ""
 
-#: Model/Server.php:5141
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr "Удаление мертвого процесса."
 
-#: Model/Server.php:5142
+#: Model/Server.php:5253
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr "Удаление данных мертвого процесса. Тип процесса - %s, PID - %s"
 
-#: Model/Server.php:5146
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr "Остановка процесса."
 
-#: Model/Server.php:5147
+#: Model/Server.php:5258
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr "Остановка процесса. Тип процесса - %s, PID - %s"
 
-#: Model/Server.php:5449
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:5449;5478
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:5461
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:5462
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:5593
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:5600
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:5607
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr ""
 
-#: Model/Server.php:5787
+#: Model/Server.php:5911
 msgid "Could not reset the remote authentication key."
 msgstr ""
 
-#: Model/Server.php:5864
+#: Model/Server.php:5988
 msgid "Could not parse JSON: "
 msgstr ""
 
-#: Model/Server.php:5884
+#: Model/Server.php:6008
 msgid "Could not reset fetch remote user account."
 msgstr ""
 
-#: Model/Server.php:5906
+#: Model/Server.php:6030
 msgid "No user object received in response."
 msgstr ""
 
@@ -5201,6 +5473,10 @@ msgstr ""
 msgid "API key reset by administrator"
 msgstr ""
 
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
 #: Model/DecayingModelsFormulas/Polynomial.php:7
 msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
 msgstr ""
@@ -5233,7 +5509,7 @@ msgstr ""
 
 #: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Добавить атрибут"
@@ -5260,8 +5536,8 @@ msgstr ""
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
 #: View/Events/add.ctp:33
-#: View/Feeds/add.ctp:178
-#: View/Feeds/edit.ctp:179
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
 #: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
@@ -5270,7 +5546,7 @@ msgstr "Группа распространения"
 #: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -5286,15 +5562,15 @@ msgstr "Контекстный комментарий"
 msgid "for Intrusion Detection System"
 msgstr "для системы обнаружения вторжений"
 
-#: View/Attributes/add.ctp:154
+#: View/Attributes/add.ctp:155
 msgid "Timezone missing, auto-detected as: "
 msgstr ""
 
-#: View/Attributes/add.ctp:155
+#: View/Attributes/add.ctp:156
 msgid "The following value will be submited instead: "
 msgstr ""
 
-#: View/Attributes/add.ctp:163
+#: View/Attributes/add.ctp:164
 msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr ""
 
@@ -5355,10 +5631,13 @@ msgstr "ID события"
 #: View/DecayingModel/decaying_tool_rest_search.ctp:24
 #: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr "Организация"
 
@@ -5417,7 +5696,7 @@ msgid "Values"
 msgstr "Значения"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:57
@@ -5439,7 +5718,7 @@ msgid "Replaceattributes"
 msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:80
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Elements/view_galaxy_matrix.ctp:76;211
 #: View/Elements/genericElements/Form/submitButton.ctp:8;25
@@ -5467,7 +5746,7 @@ msgstr ""
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:67
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/UserSettings/set_setting.ctp:36
-#: View/Users/admin_add.ctp:97
+#: View/Users/admin_add.ctp:98
 #: View/Users/admin_edit.ctp:91
 #: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
@@ -5479,7 +5758,7 @@ msgid "Submit"
 msgstr "Подтвердить"
 
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
 #: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/exportSearch.ctp:32
@@ -5488,6 +5767,7 @@ msgstr "Подтвердить"
 #: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
 #: View/Elements/view_galaxy_matrix.ctp:212
+#: View/Elements/genericElements/infoModal.ctp:40
 #: View/Elements/genericElements/Form/submitButton.ctp:13
 #: View/Elements/serverRuleElements/pull.ctp:73
 #: View/Elements/serverRuleElements/push.ctp:72
@@ -5578,7 +5858,7 @@ msgstr ""
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
 #: View/Users/statistics_data.ctp:19
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr "Атрибуты"
 
@@ -5629,10 +5909,7 @@ msgstr ""
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -5657,7 +5934,6 @@ msgstr ""
 #: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:32;106
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -5680,10 +5956,7 @@ msgstr "пред"
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -5708,7 +5981,6 @@ msgstr "пред"
 #: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:34;108
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -5737,7 +6009,6 @@ msgstr "Дата"
 #: View/Elements/global_menu.ctp:94
 #: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr "Галактики"
@@ -5775,7 +6046,7 @@ msgstr "Голосование"
 #: View/Attributes/index.ctp:62
 #: View/Elements/eventattribute.ctp:166
 #: View/Events/view.ctp:262
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr "Активность"
@@ -5785,7 +6056,7 @@ msgstr "Активность"
 #: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/genericElements/IndexTable/headers.ctp:31
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -5794,10 +6065,7 @@ msgstr "Активность"
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -5833,10 +6101,7 @@ msgstr "Действия"
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -5861,7 +6126,6 @@ msgstr "Действия"
 #: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:99
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -5952,13 +6216,12 @@ msgstr ""
 #: View/Elements/Events/eventIndexTable.ctp:234
 #: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:597
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -5975,106 +6238,6 @@ msgstr ""
 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/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: 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:92
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
-#: 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/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
-#: 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:92
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
-#: 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
@@ -6108,9 +6271,10 @@ msgstr ""
 #: View/Events/resolved_attributes.ctp:51
 #: View/Events/resolved_misp_format.ctp:98;293
 #: View/Events/view.ctp:159
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:171
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
+#: View/Feeds/index.ctp:184
 #: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
 #: View/Objects/revise_object.ctp:35;69
@@ -6126,23 +6290,27 @@ msgstr "Распределение"
 msgid "For Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
@@ -6232,12 +6400,16 @@ msgid "Unvetted"
 msgstr ""
 
 #: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
 #: View/EventBlacklists/index.ctp:35
 #: View/EventDelegations/index.ctp:41
 #: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
 #: View/Feeds/preview_index.ctp:25
 #: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
 #: View/ObjectTemplates/index.ctp:47
 #: View/Organisations/index.ctp:75
 #: View/Servers/preview_index.ctp:64
@@ -6245,31 +6417,41 @@ msgstr ""
 #: View/Sightingdb/index.ctp:10
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:81
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
 msgid "Filter"
 msgstr "Фильтр"
 
 #: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
 #: View/Elements/eventattributetoolbar.ctp:231
 #: View/EventBlacklists/index.ctp:36
 #: View/EventDelegations/index.ctp:42
 #: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
 #: View/Feeds/preview_index.ctp:26
 #: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
 #: View/ObjectTemplates/index.ctp:48
 #: View/Organisations/index.ctp:76
 #: View/Servers/preview_index.ctp:65
 #: View/ShadowAttributes/index.ctp:38
 #: View/Sightingdb/index.ctp:11
-#: View/Users/admin_index.ctp:82
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
 msgid "Enter value to search"
 msgstr "Введите текст для поиска"
 
 #: View/Communities/index.ctp:34
 #: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
 #: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
 #: View/Feeds/search_caches.ctp:35
 #: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
 #: View/ObjectTemplates/view.ctp:3
 #: View/Organisations/view.ctp:5
 #: View/Pages/doc/administration.ctp:180;221;236
@@ -6278,7 +6460,9 @@ msgstr "Введите текст для поиска"
 #: View/Taxonomies/view.ctp:4
 #: View/Templates/view.ctp:4
 #: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
 #: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
 #: View/Users/view.ctp:3
 #: View/Warninglists/view.ctp:9
 msgid "Id"
@@ -6297,6 +6481,8 @@ msgid "Community name"
 msgstr ""
 
 #: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
 #: View/DecayingModel/index.ctp:89
 #: View/DecayingModel/view.ctp:21
 #: View/Elements/Servers/View/row_object.ctp:24
@@ -6310,8 +6496,10 @@ msgstr ""
 #: View/Elements/templateElements/templateRowAttribute.ctp:21
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
 #: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:22;113;210
 #: View/Objects/group_attributes_into_object.ctp:8
@@ -6333,10 +6521,18 @@ msgid "Description"
 msgstr "Описание"
 
 #: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
 msgid "Communities index"
 msgstr ""
 
-#: View/Communities/index.ctp:64
+#: View/Communities/index.ctp:72
 msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
 msgstr ""
 
@@ -6405,9 +6601,11 @@ msgid "Message:"
 msgstr ""
 
 #: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
 #: View/Elements/Events/View/row_object.ctp:72
 #: View/Events/resolved_misp_format.ctp:93;288
-#: View/GalaxyClusters/view.ctp:19
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
 #: View/ObjectTemplates/index.ctp:66
 #: View/ObjectTemplates/view.ctp:6
 #: View/Objects/revise_object.ctp:68
@@ -6424,16 +6622,19 @@ msgid "UUID"
 msgstr "UUID"
 
 #: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
 #: View/DecayingModel/index.ctp:88
 #: View/DecayingModel/view.ctp:14
 #: View/Elements/Servers/View/row_object.ctp:19
 #: View/Elements/templateElements/templateRowAttribute.ctp:12
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
 #: View/Feeds/search_caches.ctp:47
 #: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
 #: View/ObjectTemplates/view.ctp:4
 #: View/Objects/add.ctp:206
 #: View/Objects/revise_object.ctp:27
@@ -6445,7 +6646,7 @@ msgstr "UUID"
 #: View/SharingGroups/view.ctp:42;67
 #: View/Sightingdb/index.ctp:51
 #: View/Templates/view.ctp:9
-#: View/Users/statistics_orgs.ctp:31
+#: View/Users/statistics_orgs.ctp:33
 #: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "Имя"
@@ -6469,7 +6670,7 @@ msgstr ""
 #: View/Users/admin_edit.ctp:64
 #: View/Users/admin_view.ctp:72
 #: View/Users/edit.ctp:23
-#: View/Users/view.ctp:31
+#: View/Users/view.ctp:32
 msgid "GnuPG key"
 msgstr "Ключ GnuPG"
 
@@ -6478,10 +6679,105 @@ msgid "Community "
 msgstr ""
 
 #: View/Communities/view.ctp:51
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:617
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
 msgid "Request Access"
 msgstr ""
 
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr "По умолчанию"
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
 #: View/DecayingModel/add.ctp:4
 msgid " Decaying Model"
 msgstr ""
@@ -6596,8 +6892,8 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/EventBlacklists/edit.ctp:37
 #: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:200
-#: View/Feeds/index.ctp:282
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
 #: View/News/index.ctp:22
 #: View/OrgBlacklists/edit.ctp:30
 #: View/OrgBlacklists/index.ctp:36
@@ -6689,6 +6985,7 @@ msgstr ""
 #: View/Events/show_i_o_c_results.ctp:12
 #: View/Feeds/freetext_index.ctp:32
 #: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
 #: View/Objects/revise_object.ctp:64
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
@@ -6700,7 +6997,7 @@ msgstr ""
 #: 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:36
+#: View/Users/statistics_orgs.ctp:38
 #: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr "Тип"
@@ -6714,6 +7011,7 @@ msgstr "Тип"
 #: View/Events/resolved_misp_format.ctp:92;287
 #: View/Events/show_i_o_c_results.ctp:13
 #: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
 #: View/Noticelists/view.ctp:42
 #: View/Objects/add.ctp:115
 #: View/Objects/group_attributes_into_object.ctp:58
@@ -6734,12 +7032,14 @@ msgstr ""
 #: View/DecayingModel/decaying_tool_rest_search.ctp:31
 #: View/Events/resolved_attributes.ctp:52
 #: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
 #: View/ObjectReferences/ajax/add.ctp:30
 #: View/Objects/add.ctp:67;119
 #: View/Objects/group_attributes_into_object.ctp:30
 #: View/Objects/revise_object.ctp:49;67
 #: View/Pages/doc/using_the_system.ctp:234;284
 #: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
 msgid "Comment"
 msgstr "Комментарий"
 
@@ -6758,7 +7058,7 @@ msgid "Decaying Model RestSearch"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_simulation.ctp:45
-#: View/Events/automation.ctp:14
+#: View/Events/automation.ctp:24
 #: View/Logs/admin_index.ctp:20;21
 #: View/Logs/admin_search.ctp:25
 msgid "Search"
@@ -6836,7 +7136,7 @@ msgstr ""
 #: View/Elements/genericElements/org_picker.ctp:17
 #: View/EventBlacklists/add.ctp:36
 #: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
+#: View/Feeds/add.ctp:220
 #: View/Feeds/import_feeds.ctp:20
 #: View/OrgBlacklists/add.ctp:29
 #: View/Regexp/admin_add.ctp:32
@@ -6913,7 +7213,7 @@ msgstr ""
 
 #: View/DecayingModel/index.ctp:97
 #: View/DecayingModel/view.ctp:25
-#: View/Galaxies/view.ctp:22
+#: View/Galaxies/view.ctp:10
 #: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
 #: View/Warninglists/view.ctp:12
@@ -6923,6 +7223,7 @@ msgstr "Версия"
 #: View/DecayingModel/index.ctp:98
 #: View/DecayingModel/view.ctp:31
 #: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
 #: View/Feeds/view.ctp:63
 #: View/Noticelists/index.ctp:63
 #: View/ObjectTemplates/index.ctp:35
@@ -7036,7 +7337,6 @@ msgstr "см. все"
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr ""
 
@@ -7103,6 +7403,8 @@ msgstr "Показать все атрибуты"
 
 #: View/Elements/eventattributetoolbar.ctp:6
 #: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
@@ -7140,7 +7442,7 @@ msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:41
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr "Внимание"
@@ -7252,11 +7554,9 @@ msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: View/Logs/admin_index.ctp:62
 #: View/Servers/preview_index.ctp:57
 #: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:74
 msgid "Remove filters"
 msgstr "Очистить фильтры"
 
@@ -7445,14 +7745,14 @@ msgid "Event Actions"
 msgstr "Действия с событиями"
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:221;264
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: 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:226;270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
 #: View/Events/add.ctp:7
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
@@ -7460,80 +7760,80 @@ msgid "Add Event"
 msgstr "Добавить событие"
 
 #: View/Elements/global_menu.ctp:23
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:289
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: 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:294
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: 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:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr "REST клиент"
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:310
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "Показать предложения"
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr "События с предложениями"
 
 #: View/Elements/global_menu.ctp:47
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:320
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
 msgid "View delegation requests"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:861
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "Список тегов"
 
 #: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr "Список коллекций тегов"
 
 #: View/Elements/global_menu.ctp:61
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:866
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr "Добавить тег"
 
 #: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:895
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr "Таксономии"
 
 #: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:923
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "Шаблоны"
 
 #: View/Elements/global_menu.ctp:74
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:928
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "Добавить шаблон"
 
 #: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
@@ -7541,7 +7841,7 @@ msgid "Export"
 msgstr "Экспорт"
 
 #: View/Elements/global_menu.ctp:86
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -7551,7 +7851,7 @@ msgid "Automation"
 msgstr "Автоматизация"
 
 #: View/Elements/global_menu.ctp:98
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1086
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr "Список галактик"
 
@@ -7579,7 +7879,7 @@ msgid "Signature Whitelist"
 msgstr "Белый список сигнатур"
 
 #: View/Elements/global_menu.ctp:128
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:378
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr "Список предупреждений"
 
@@ -7600,45 +7900,45 @@ msgid "News"
 msgstr "Новости"
 
 #: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Мой профиль"
 
 #: View/Elements/global_menu.ctp:151
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
 msgid "My Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:155
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:467;699
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
 msgid "Set Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:159
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:471
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "Дашборд"
 
 #: View/Elements/global_menu.ctp:168
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:490
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "Настройка ролей"
 
 #: View/Elements/global_menu.ctp:175
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1130
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr "Список шаблонов объектов"
 
 #: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:507
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr "Группы распространения"
 
 #: View/Elements/global_menu.ctp:186
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr "Добавить группу распространения"
 
@@ -7647,12 +7947,12 @@ msgid "Decaying Models Tool"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:199
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:977
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
 msgid "List Decaying Models"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:206
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:520
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
@@ -7664,12 +7964,12 @@ msgid "Categories & Types"
 msgstr "Категории и типы"
 
 #: View/Elements/global_menu.ctp:214
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr "Условия и положения"
 
 #: View/Elements/global_menu.ctp:218
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:528
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -7699,28 +7999,28 @@ msgid "Sync Actions"
 msgstr "Синхронизация"
 
 #: View/Elements/global_menu.ctp:240
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:536
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:542
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:250
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "Серверы"
 
 #: View/Elements/global_menu.ctp:255
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:998
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr "Фиды"
 
 #: View/Elements/global_menu.ctp:260
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr "Поиск в кеше фидов"
 
@@ -7733,7 +8033,7 @@ msgid "Add SightingDB Connection"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:612
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
 msgid "List Communities"
 msgstr ""
 
@@ -7748,7 +8048,7 @@ msgid "Administration"
 msgstr "Администрирование"
 
 #: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:687
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Список пользователей"
@@ -7763,93 +8063,97 @@ msgid "Set User Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:300
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:682
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr "Добавить пользователя"
 
 #: View/Elements/global_menu.ctp:304
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:704
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "Связаться с пользователями"
 
-#: View/Elements/global_menu.ctp:311
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:477;739
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr "Список организаций"
 
-#: View/Elements/global_menu.ctp:315
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr "Добавить организацию"
 
-#: View/Elements/global_menu.ctp:322
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "Список ролей"
 
-#: View/Elements/global_menu.ctp:326
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr "Добавить роли"
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr "Настройки и техническое обслуживание"
 
-#: View/Elements/global_menu.ctp:343
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:768
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "Задачи"
 
-#: View/Elements/global_menu.ctp:352
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:774
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:361
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr "Заблокированные события"
 
-#: View/Elements/global_menu.ctp:366
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr "Управление списками заблокированных событий"
 
-#: View/Elements/global_menu.ctp:375
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr "Заблокированные организации"
 
-#: View/Elements/global_menu.ctp:380
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr "Управление списками заблокированных организаций"
 
-#: View/Elements/global_menu.ctp:388
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "Аудит"
 
-#: View/Elements/global_menu.ctp:392
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "Показать журналы"
 
-#: View/Elements/global_menu.ctp:396
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:811
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "Поиск в журналах"
 
-#: View/Elements/global_menu.ctp:424
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "Выход"
@@ -7872,7 +8176,8 @@ msgstr ""
 
 #: View/Elements/view_event_distribution_graph.ctp:9
 #: View/Elements/view_timeline.ctp:23
-#: View/Layouts/default.ctp:92
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "Загрузка"
@@ -7907,7 +8212,6 @@ msgstr "Показать"
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:67
 msgid "Filters"
 msgstr "Фильтры"
 
@@ -7934,6 +8238,7 @@ msgid "Time scope"
 msgstr ""
 
 #: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
 #: View/Taxonomies/view.ctp:83
 msgid "Tag"
 msgstr "Тег"
@@ -7965,7 +8270,6 @@ msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr "Выбрать все события на данной странице"
 
@@ -8022,7 +8326,9 @@ msgstr "Кол-во сообщений"
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr "Е-мейл"
@@ -8033,8 +8339,6 @@ msgstr "Е-мейл"
 #: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
 #: View/Events/proposal_event_index.ctp:45;49
 #: View/Feeds/preview_index.ctp:73
-#: View/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
@@ -8060,7 +8364,7 @@ msgid "NEW"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr "Опубликовать событие"
 
@@ -8074,7 +8378,7 @@ msgid "Not published"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;364;431;598;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
 #: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr "Вы уверены что хотите удалить # %s?"
@@ -8281,11 +8585,11 @@ msgstr ""
 msgid "Switch to binary representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr ""
 
@@ -8388,11 +8692,11 @@ msgstr "Статус"
 #: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
 #: View/Events/view.ctp:191
-#: View/GalaxyClusters/view.ctp:32
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
 #: View/Users/admin_view.ctp:95
 msgid "N/A"
@@ -8426,8 +8730,10 @@ msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
@@ -8441,15 +8747,17 @@ msgstr "Последний вход"
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
 #: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr "Время создания"
 
 #: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 msgid "Create new credentials and inform user"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -8486,488 +8794,599 @@ msgstr "Событий с предложениями: "
 msgid "Delegation requests: "
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
-msgid "Populate From Template"
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
-msgid "Enrichment Module Result"
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr "Правила фильтрации"
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr "Правила"
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr "Возраст: "
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr "Не закеширован"
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr "Закешировать фид"
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+msgid "Enrichment Module Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr "Показать событие"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;887;1116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr "Просмотреть граф корреляции"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr "Просмотреть историю событий"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
 #: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr "Изменить событие"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr "Удалить событие"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr "Добавить объект"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr "Добавить вложение"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr "Обогатить событие"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr "Предложить атрибут"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr "Предложить вложение"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr "Снять с публикации"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
 msgid "Publish Sightings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr "Опубликовать событие в ZMQ"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr "Вы уверены что хотите опубликовать данное событие в ZMQ?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:200
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:208
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr "Связь с автором"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:216;303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
 msgstr "Сохранить как..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239;244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr "Добавить коллекцию тегов"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:251
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr "Экспорт коллекции тегов"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr "Импорт коллекции тегов"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr "Импорт"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr "Список регулярных выражений"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr "Добавить регулярное выражение"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:351
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr "Протестировать на БД"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:352
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:359
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr "Редактировать регулярное выражение"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr "Удалить регулярное выражение"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr "Просмотр предупреждения"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr "Обновить список предупреждений"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:385
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr "Вы уверены что хотите обновить список предупреждений?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:393
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr "Просмотр извещения"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr "Список измещений"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:403
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr "Обновить список извещений"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:404
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr "Вы уверены что хотите обновить список извещений?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:414
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr "Белые списки сигнатур"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:419
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr "Новый список сигнатур"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr "Редактировать список сигнатур"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:430
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr "Удалить список сигнатур"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:440
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr "Редактировать профиль"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:451;649
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr "Сбросить пароль"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:484;733
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr "Просмотр организации"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:496
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr "Редактировать группу распространения"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:551;581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:559
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570;1056
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:571;1057
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:589
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
 #: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr "Редактировать сервер"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr "Добавить сервер"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:622
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
 msgid "View community"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:630
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
 msgid "Request E-mail"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:642
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr "Просмотреть пользователя"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:654
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr "Редактировать пользователя"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr "Удалить пользователя"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:668
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr "Изменить роль"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr "Удалить роль"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:694
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
 msgid "User settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:712
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr "Добавить организацию"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr "Редактировать организацию"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:726
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr "Объединить организацию"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:745
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr "Добавить роль"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:781
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr "Заблокированные события"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:793
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr "Заблокированные организации"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:820;834
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr "Просмотр обсуждения"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:825
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr "Добавить запись"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:839
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr "Редактировать запись"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr "Список обсуждений"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:849
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr "Новое обсуждение"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:857
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr "Избранные теги"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:873
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr "Изменить тег"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:881;900
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr "Просмотр таксономии"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:908
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr "Удаление таксономии"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:915
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr "Обновить таксономии"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:935
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr "Показать шаблон"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:941
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr "Изменить шаблон"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:952
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
 msgid "Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
 msgid "Force Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:962
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
 msgid "Import Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:967
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
 msgid "Add Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:971
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
 msgid "Decaying Tool"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
 msgid "View Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:989
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
 msgid "Edit Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1007
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr "Добавить фид"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr "Импорт фидов из JSON"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1018
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr "Анализ пересечения фидов"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1023
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr "Экспорт настроек фидов"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr "Редактировать фид"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1036
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1042
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr "Предпросмотр событий фида"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1048
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr "Предпросмотр события фида"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1066
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr "Просмотр новостей"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1071
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr "Добавить новость"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1077
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr "Редактировать новость"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1092
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr "Обновить галактики"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1093
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr "Вы уверены что хотите заново импортировать галактики из подмодулей?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1098
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr "Принудительно обновить галактики"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1099
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr "Вы уверены что хотите удалить и заново импортировать галактики из подмодулей?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1106;1122
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr "Просмотр галактики"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr "Просмотр кластера"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1135
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr "Обновить объекты"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1141
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr "Просмотр шаблона объекта"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1149
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
 #: View/Sightingdb/add.ctp:6
 msgid "Add SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1157
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
 msgid "Edit SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1162
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
 msgid "List SightingDB connections"
 msgstr ""
 
@@ -8997,7 +9416,7 @@ msgid "Fix Database Index Schema"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
 msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
 msgstr ""
 
@@ -9005,7 +9424,7 @@ msgstr ""
 msgid "The current database schema does not match the expected format."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;131
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
 msgid "Database schema diagnostic: "
 msgstr ""
 
@@ -9033,52 +9452,52 @@ msgstr ""
 msgid "Actual schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:118
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
 msgid "Fix Database schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:130
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
 msgid "The current database is correct"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:141
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
 msgid "Expected DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:145
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
 msgid "The current database version matches the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:146;151
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
 msgid "Actual DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:150
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
 msgid "The current database version does not match the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
 msgid "Updates are locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158;162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
 msgid "Updates are not locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 #: View/Servers/update_progress.ctp:32
 msgid "Updates are locked due to to many update fails"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 msgid "Updates unlocked in %s"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:167;168
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
 msgid "DataSource: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:203
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
 msgid "Column diagnostic"
 msgstr ""
 
@@ -9740,7 +10159,7 @@ msgstr ""
 #: View/TagCollections/index.ctp:14
 #: View/UserSettings/index.ctp:56
 #: View/Users/admin_view.ctp:109
-#: View/Users/view.ctp:58
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr "Пользователь"
 
@@ -9785,7 +10204,7 @@ msgid "Start a worker"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
+msgid "Restart dead workers"
 msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
@@ -9942,10 +10361,6 @@ msgstr ""
 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
@@ -10131,7 +10546,7 @@ msgid "Recipient"
 msgstr "Получатель"
 
 #: View/EventDelegations/index.ctp:82
-#: View/Events/automation.ctp:269;276
+#: View/Events/automation.ctp:279;286
 #: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
@@ -10355,478 +10770,475 @@ msgstr "Храните этот ключ в строгой тайне, так к
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 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 "Ваш ключ аутентификации: <code>%s</code>.\n"
-"    Вы можете %s этот ключ."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
+msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr "сбросить"
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: View/Events/legacy_automation.ctp:264
 msgid "It is possible to search the database for attributes based on a list of criteria."
 msgstr "MISP позволяет осуществлять поиск атрибутов по базе данных, на основе списка критериев."
 
-#: View/Events/automation.ctp:17
+#: View/Events/automation.ctp:27
 #: 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
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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 "Устанавливает формат поиска (поддерживаются: json, xml, openioc, suricata, snort). Может быть передан первым параметром после restSearch или внутри JSON-содержимого."
 
-#: View/Events/automation.ctp:22
+#: View/Events/automation.ctp:32
 msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr "Ограничивает количество возвращаемых записей (например 10 атрибутов или 10 событий)."
 
-#: View/Events/automation.ctp:23
+#: View/Events/automation.ctp:33
 msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
 msgstr "Устанавливает номер требуемой страницы, если установлен лимит (например страница 3 при лимите 100 возвратит записи с 201 по 300)."
 
-#: View/Events/automation.ctp:24
+#: View/Events/automation.ctp:34
 #: 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/automation.ctp:35
 #: 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/automation.ctp:36
 #: 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/automation.ctp:37
 #: 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/automation.ctp:38
 #: 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/automation.ctp:39
 #: 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 и authkey. MISP возвращает xml/json (в зависимости от того, что установлено в заголовках запроса) всех событий, у которых значения полей с информацией, организацией-автором, или атрибутов, у которых значения полей value1, value2, комментариев, содержат в себе искомую строку."
 
-#: View/Events/automation.ctp:30;150
+#: View/Events/automation.ctp:40;160
 #: 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 "Фильтрация событий после указанной даты (формат: 2015-02-15)."
 
-#: View/Events/automation.ctp:31;151
+#: View/Events/automation.ctp:41;161
 #: 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 "Фильтрация событий до указанной даты (формат: 2015-02-15)."
 
-#: View/Events/automation.ctp:32
+#: View/Events/automation.ctp:42
 #: 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/automation.ctp:43
 #: 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 "Устанавливает включение в ответ вложений/образцов ВПО, относящихся к атрибутам, закодированных в base64."
 
-#: View/Events/automation.ctp:34
+#: View/Events/automation.ctp:44
 #: 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/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr "Ограничивает результаты по представленным UUID."
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:46
 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 "Ограничивает результаты поиска по времени публикации событий. Значение может быть в кратком формате (7d, 24h) или в формате временной метки. Вы также можете в качестве параметра предоставлять временной отрезок, заданный двумя значениями (например [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:37
+#: View/Events/automation.ctp:47
 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 "(Устаревший синоним для параметра publish_timestamp) Ограничивает результаты поиска по времени публикации событий. Значение может быть в кратком формате (7d, 24h) или в формате временной метки. Вы также можете в качестве параметра предоставлять временной отрезок, заданный двумя значениями (например [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:38
+#: View/Events/automation.ctp:48
 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 "Ограничивает результаты поиска по времени последнего редактирования события. В результаты поиска попадут только те события, которые будут новее установленной временной метки. В случае поиска по атрибутам будет использоваться время редактирования атрибута. Значение может быть в кратком формате (7d, 24h) или в формате временной метки. Вы также можете в качестве параметра предоставлять временной отрезок, заданный двумя значениями (например [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:39
+#: View/Events/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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) в поиск попадают все атрибуты. Если параметр равен 1, то в поиск попадут только те атрибуты, у которых выставлен флаг to_ids. Если используется ключевое слово \"exclude\", то в результат поиска попадут атрибуты, у которых флаг to_ids не выставлен."
 
-#: View/Events/automation.ctp:42
+#: View/Events/automation.ctp:52
 #: 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 "По-умолчанию (а также при значении 0) в поиск попадают только активные атрибуты. Если параметр равен 1, то в поиск попадут дополнительно удаленные атрибуты. Если используется ключевое слово \"only\", то в результаты поиска попадут только удаленные атрибуты. "
 
-#: View/Events/automation.ctp:43
+#: View/Events/automation.ctp:53
 #: 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 "В результаты поиска дополнительно включается поле UUID события."
 
-#: View/Events/automation.ctp:44
+#: View/Events/automation.ctp:54
 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 "Ограничивает результаты поиска атрибутов временем последнего редактирования события. Значение может быть в кратком формате (7d, 24h) или в формате временной метки. Вы также можете в качестве параметра предоставлять временной отрезок, заданный двумя значениями (например [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:45
+#: View/Events/automation.ctp:55
 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
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr "Задает строку для поиска по полю информации событий."
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr "CSV-специфичные параметры для API поиска"
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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. Устаналивает набор полей, которые будут включены в результаты поиска. При выборе поля уровня события, использование параметра \"includeContext\" не обязательно."
 
-#: View/Events/automation.ctp:81
+#: View/Events/automation.ctp:91
 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. Добавляет в результаты поиска информацию об уровне события. Дополнительные поля также могут быть установлены с помощью параметра \"requested_attributes\" более точно."
 
-#: View/Events/automation.ctp:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr "Только для CSV. В выходном CSV будет отсутствовать заголовок."
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr "URL параметры"
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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 "Все вышеприведенные параметры можно представить в виде URL-параметров, однако это СТРОГО НЕ РЕКОМЕНДУЕТСЯ. Если у вас нет другого выхода, то просто представьте параметры в следующем формате:"
 
-#: View/Events/automation.ctp:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr "RPZ-специфичные параметры для API поиска"
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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 ">Вы можете экспортировать файлы зоны RPZ для экранирования DNS используя встронный функционал MISP по экспорту. Сгенерированный файл будет содержать все атрибуты с доменами, именами хостов, IP-адресами, помеченные флагом to_ids, доступные вашей учетной записи."
 
-#: View/Events/automation.ctp:97
+#: View/Events/automation.ctp:107
 #: 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:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr "или отправьте POST-запрос с XML или JSON объектов с указанными параметрами"
 
-#: View/Events/automation.ctp:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr "Экспорт СОВ BRO"
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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 в виде текстового файла. По-уолмчанию экспортируются только опубликованные и помеченные флагом to_ids атрибуты."
 
-#: View/Events/automation.ctp:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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 "Для фильтрации результатов экспорта по тегам можно использовать стандартный синтаксис. Символ двоеточия (:) не может быть использован при поиске по тегам, вместо этого используйте символ точка с запятой (;), поиск будет производиться по двоеточию. Для получения IP-адресов из событий с тегом tag1, но без тега tag2 используйте следующий запрос:"
 
-#: View/Events/automation.ctp:118
+#: View/Events/automation.ctp:128
 #: 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 "Также для фильтрации можно использовать JSON или XML, передавая их с помощью POST-запроса в API поиска."
 
-#: View/Events/automation.ctp:136
+#: View/Events/automation.ctp:146
 #: 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 "В качестве альтернативы вы можете передавать параметры фильтрации в строке запроса, хотя рекомендованный вариант - передача JSON или XML объекта в POST-запросе. Формат запроса:"
 
-#: View/Events/automation.ctp:138
+#: View/Events/automation.ctp:148
 #: 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, используется следующий маппинг между типами MISP и Bro"
 
-#: View/Events/automation.ctp:145
+#: View/Events/automation.ctp:155
 #: 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:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr "Указывает ID события(событий), у которых производить поиск атрибутов."
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: 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:152
+#: View/Events/automation.ctp:162
 #: 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:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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 "Ключевые слова false или null могут быть использованы в строке запроса для указания пустых параметров."
 
-#: View/Events/automation.ctp:156
+#: View/Events/automation.ctp:166
 #: 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 "Например для получения всех атрибутов для события #5, включая те, которые не помечены флагом \"to_ids\", можете использовать следующий запрос"
 
-#: View/Events/automation.ctp:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr "Экспорт атрибутов события в виде XML"
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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 - это опциональный флаг, который запрещает экспорт атрибутов, у которых отсутствует флаг \"to_ids\". Для фильтрации по типу атрибута можно использовать операторы '&&' для объединения и '!' для исключения. Например для экспорта атрибутов, помеченных флагом \"to_ids\", типа md5 и sha256, но не filename|md5 или filename|sha256 события с id 25, можно использовать следующий запрос"
 
-#: View/Events/automation.ctp:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr "Скачивание вложений или образцов вирусов"
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr "Скачивание образцов вирусов по хешу"
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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 хешу. Передав MD5 хем в виде JSON/XML объекта или в строке запроса, вы получите JSON/XML объект с архивированным образцом, закодированным в base64, дополненный контекстной информацией."
 
-#: View/Events/automation.ctp:172
+#: View/Events/automation.ctp:182
 #: 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\", для поиска используются все типы хешей - MD5, SHA1, SHA256."
 
-#: View/Events/automation.ctp:173
+#: View/Events/automation.ctp:183
 #: 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, передав параметр eventID. В запросе должны присутствовать либо eventID, либо hash параметры, иначе вы увидите ошибку. Если параметр hash не выставлен, то флаг \"allSamples\" устаналивается автоматически."
 
-#: View/Events/automation.ctp:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr "POST-запрос (XML)"
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr "POST-запрос (JSON)"
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr "Описание параметров передаваемого объекта"
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr "Если установлен, то результат будет содержать в себе образцы в рамках указанного события."
 
-#: View/Events/automation.ctp:187
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr "Загрузка образцов вирусов"
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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 "Передача файлов должна осуществляться с помощью POST-запросов, в base64 кодировке. Все образцы буду помещены в ZIP-архив и защищены паролем (пароль \"infected\"). Хеши оригинального файла будут выступать в качестве дополнительных атрибутов."
 
-#: View/Events/automation.ctp:191
+#: View/Events/automation.ctp:201
 #: 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 принимает JSON или XML объекты."
 
-#: View/Events/automation.ctp:192
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr "Структура передаваемого объекта"
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr "Параметры объекта"
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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 события необязателен. Он может быть передан в строке URL или объекте POST-запроса, причем строка URL является более приоритетной. Если в запросе отсутствует ID события, то MISP создаст новое событие, наполненное переданными образцами. Вы можете определить настройки для событий, если настройки по-умолчанию вас не устраивают."
 
-#: View/Events/automation.ctp:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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 "Если параметр равен true, то все создаваемые атрибуты помечаются флагом \"to_ids\"."
 
-#: View/Events/automation.ctp:205
+#: View/Events/automation.ctp:215
 #: 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:206
+#: View/Events/automation.ctp:216
 #: 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 "Параметр используется для заполнения поля \"Информация\" создаваемого события. Если данный параметр не представлен в запросе, то MISP сгенерирует сообщение, показывающее что оно относится к данному образцу вредоносного программного обеспечения."
 
-#: View/Events/automation.ctp:207
+#: View/Events/automation.ctp:217
 #: 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:208
+#: View/Events/automation.ctp:218
 #: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr "Уровень угрозы создаваемого события (если применимо). [0-3]"
 
-#: View/Events/automation.ctp:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr "Добавление/удаление тегов событий"
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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:214
+#: View/Events/automation.ctp:224
 #: 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 "Необходимо выполнить POST запрос с JSON-объектом следующего формата (к соответствующему API, добавления или удаления)"
 
-#: View/Events/automation.ctp:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr "Предложения"
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr "Вы можете взаимодействовать с предложения через API напрямую, начиная с версии 2.3.148"
 
-#: View/Events/automation.ctp:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr "HTTP"
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:74
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -10834,201 +11246,201 @@ msgstr "HTTP"
 msgid "URL"
 msgstr "URL"
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr "Пояснение"
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr "Ожидаемая полезная нагрузка"
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
 #: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr "Ответ"
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr "Просмотр предложения"
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr "ShadowAttribute объект"
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr "Просмотр всех предложений к событиям моей организации"
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr "ShadowAttribute объекты"
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr "Просмотр всех предложений к событию"
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr "Предложение нового атрибута к событию"
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr "Предложение редактирования атрибута"
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr "Принятие предложения"
 
-#: View/Events/automation.ctp:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr "Отказ предложения"
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr "Формат ShadowAttribute объекта"
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr "Фильтрация метаданных события"
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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, существует механизм получения списка событий с их метаданными, используя GET-запросы к /events API. Однако этот API немного более универсален. Вы можете передать параметры поиска для поиска в различных полях и получать список интересующих событий вместе с их метаданными, используя следующий URL"
 
-#: View/Events/automation.ctp:291
+#: View/Events/automation.ctp:301
 #: 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-объект в POST-запросе с интересуемыми значениями. Ответ также представлен в виде JSON.<br />\n"
 "    Пример корректного запроса"
 
-#: View/Events/automation.ctp:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr "Список параметров"
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr "Фильтрация опубликованных или неопубликованных событий [0,1] (можно использовать отрицание)"
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr "Фильтрация по строке в поле информации (можно использовать отрицание)"
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr "Фильтрация по именам тегов (можно использовать отрицание)"
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr "Фильтрация по ID событий (можно использовать отрицание)"
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: 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:309
+#: View/Events/automation.ctp:319
 #: 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:310
+#: View/Events/automation.ctp:320
 #: 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:311
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr "Фильтрация по значениям атрибутов (можно использовать отрицание)"
 
-#: View/Events/automation.ctp:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr "Фильтрация по наименованию организации - создателя (можно использовать отрицание)"
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr "Фильтрация по email-адресу автора события (можно использовать отрицание)"
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:324
 #: 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:315
+#: View/Events/automation.ctp:325
 #: 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:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr "Импорт в текстовом формате"
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr "Механизм импорта в текстовом формате также доступен через API."
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
 msgstr "Просто сформируйте POST-запрос, после чего можете напрямую создавать атрибуты или возвращать результаты поиска."
 
-#: View/Events/automation.ctp:322
+#: View/Events/automation.ctp:332
 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 "Значениями 0/1 для параметров adhere_to_warninglists и return_meta_attributes можно фильтровать события, которые запрещены в соответствии с предупреждениями, и устанавливать способ получения атрибутов - в распарсенном виде или в виде метаатрибутов."
 
-#: View/Events/automation.ctp:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr "Содержимое тела POST-запроса - текст для поиска."
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -11238,7 +11650,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -11290,18 +11702,18 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 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:54
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr ""
 
@@ -11335,6 +11747,12 @@ msgstr ""
 msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
+#: 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/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 ""
@@ -11787,7 +12205,6 @@ msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -11928,6 +12345,7 @@ msgid "View request details"
 msgstr ""
 
 #: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
 #: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr "Отключено"
@@ -12089,7 +12507,7 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr "Опубликовать, но НЕ ОТПРАВЛЯТЬ уведомления по электронной почте? Только для незначительных изменений!"
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: View/Feeds/index.ctp:105
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -12123,78 +12541,81 @@ msgstr "Данное действие удалит все корреляции,
 msgid "Add MISP Feed"
 msgstr "Добавить фид"
 
-#: View/Feeds/add.ctp:5
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
+msgstr ""
+
+#: View/Feeds/add.ctp:12
 msgid "Add a new MISP feed source."
 msgstr "Добавление нового фида MISP."
 
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
+#: View/Feeds/add.ctp:14
 #: View/Feeds/view.ctp:64
 msgid "Caching enabled"
 msgstr "Кэширование включено"
 
-#: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr "Просмотр включен"
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:21
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr "Имя фида"
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
 #: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr "Провайдер"
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:26
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr "Наименование провайдера"
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr "Источник"
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:66
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr "Удалить источник после загрузки"
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:75
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr "URL фида"
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:79
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr "Формат источника"
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:38
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr "Заголовки в запросах (к примеру: Authorization)"
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:42
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr "Список заголовков, по одному на каждой строке в формате \"headername: value\""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:46
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr "Добавить basic аутентификацию"
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:50
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:54
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -12203,127 +12624,126 @@ msgstr "Имя пользователя"
 msgid "Password"
 msgstr "Пароль"
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:58
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr "Добавить заголок аутентификации"
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:88
-msgid "Target Event"
-msgstr "Событие"
-
 #: View/Feeds/add.ctp:94
 #: View/Feeds/edit.ctp:98
-msgid "Target Event ID"
-msgstr "ID события"
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:100
-msgid "Leave blank unless you want to reuse an existing event."
-msgstr "Оставьте пустым если не хотите переиспользовать существующее событие"
+msgid "Creator organisation"
+msgstr ""
 
 #: View/Feeds/add.ctp:104
 #: View/Feeds/edit.ctp:108
-msgid "Value field(s) in the CSV"
-msgstr "Поля со значениями в CSV файле"
+msgid "Target Event"
+msgstr "Событие"
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:109
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr "Выберите одно или несколько полей, которые должны быть распарсены и переведены в атрибуты"
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:111
-msgid "2,3,4 (column position separated by commas)"
-msgstr "2,3,4 (номера колонов, разделенные запятыми)"
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:119
-msgid "Delimiter"
-msgstr "Разделитель"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
+msgstr "ID события"
 
 #: View/Feeds/add.ctp:116
 #: View/Feeds/edit.ctp:120
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr "Оставьте пустым если не хотите переиспользовать существующее событие"
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr "Поля со значениями в CSV файле"
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
+msgstr "Выберите одно или несколько полей, которые должны быть распарсены и переведены в атрибуты"
+
+#: View/Feeds/add.ctp:127
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr "2,3,4 (номера колонов, разделенные запятыми)"
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr "Разделитель"
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
 msgid "Set the default CSV delimiter (default = \",\")"
 msgstr "Укажите CSV разделитель (по-умолчанию \",\")"
 
-#: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:130
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr "Исключающее регулярное выражение"
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:131
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr "Шаблон регулярного выражения, к примеру: \"/^https://myfeedurl/i"
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:141
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr "Авто-публикация"
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 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:148
-#: View/Feeds/edit.ctp:150
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr "Перезапись опции IDS"
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:151
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr "Если включено, то опция IDS всегда будет выключена, если событие или атрибут получает из этого фида"
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:160
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr "Сравнение"
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:161
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr "Если включено, то при получении атрибутов будет проводиться сравнение, будут добавляться только новые атрибуты"
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr "Тег по умолчанию"
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:193
-msgid "Filter rules"
-msgstr "Правила фильтрации"
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:194
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr "События с следующими тегами разрешены"
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:195
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr "События с следующими тегами блокируются"
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:196
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr "События с следующими организациями разрешены"
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:197
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr "События с следующими организациями блокируются"
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:198
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
 #: View/Servers/add.ctp:116
 #: View/Servers/edit.ctp:155;162
 msgid "Modify"
@@ -12341,64 +12761,64 @@ msgstr "%s% данных %s содержится в %s (%s совпадающи
 msgid "Edit MISP Feed"
 msgstr "Редактировать MISP фид"
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr "Редактировать новый источник MISP-фида."
 
-#: View/Feeds/edit.ctp:133
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr "Regex шаблон, например: \"/^https://myfeedurl/i\""
 
-#: View/Feeds/edit.ctp:213
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr "Базовый URL для внешнего сервера, с которым вы хотите синхронизироваться. Пример: https://misppriv.circl.lu"
 
-#: View/Feeds/edit.ctp:214
+#: View/Feeds/edit.ctp:234
 #: View/Servers/add.ctp:146
 #: View/Servers/edit.ctp:190
 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:215
+#: View/Feeds/edit.ctp:235
 #: View/Servers/add.ctp:147
 #: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr "Организация, имеющая внешний сервер, с которым вы хотите синхронизироваться. Пример: BE"
 
-#: View/Feeds/edit.ctp:216
+#: View/Feeds/edit.ctp:236
 #: View/Servers/add.ctp:148
 #: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr "Вы можете узнать ключ аутентификации в вашем профиле на внешнем сервере."
 
-#: View/Feeds/edit.ctp:217
+#: View/Feeds/edit.ctp:237
 #: View/Servers/add.ctp:149
 #: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr "Разрешить загрузку событий и их атрибутов."
 
-#: View/Feeds/edit.ctp:218
+#: View/Feeds/edit.ctp:238
 #: View/Servers/add.ctp:150
 #: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr "Разрешить загрузку событий и их атрибутов с сервера."
 
-#: View/Feeds/edit.ctp:219
+#: View/Feeds/edit.ctp:239
 #: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr "Отменить публикацию нового события (работает с Push-событием)."
 
-#: View/Feeds/edit.ctp:220
+#: View/Feeds/edit.ctp:240
 #: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr "Опубликовать новое событие без email (работает с Pull event)."
 
-#: View/Feeds/edit.ctp:221
+#: View/Feeds/edit.ctp:241
 #: View/Servers/edit.ctp:196
 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:222
+#: View/Feeds/edit.ctp:242
 #: View/Servers/add.ctp:154
 #: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
@@ -12428,137 +12848,128 @@ msgstr "Вставьте настройки фидов в формате JSON."
 msgid "Feed metadata JSON"
 msgstr "JSON метаинформация фида"
 
-#: 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 "Закешировать текстовые/CSV фиды"
-
-#: View/Feeds/index.ctp:7
-msgid "Cache MISP feeds"
-msgstr "Закешировать MISP фиды"
-
-#: View/Feeds/index.ctp:8
-msgid "Fetch and store all feed data"
-msgstr "Скачать и разместить все данные фидов"
-
-#: View/Feeds/index.ctp:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr "Включить выбранные"
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr "Отключить выбранные"
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr "Включить кеширование"
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr "Отключить кеширование"
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr "Фиды по-умолчанию"
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr "Пользовательские фиды"
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr "Все фиды"
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr "Включенные фиды"
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr "Разрешено получение событий/атрибутов из фида"
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr "Разрешено кеширование фида в Redis, что позволяет проводить корреляции"
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr "Формат фида"
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr "Ввод"
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr ""
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr "Кэширование"
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr "Разрешено кеширование фида в Redis, что позволяет проводить корреляции"
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: 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/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr "Заголовки"
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:55
-#: View/Servers/index.ctp:120;121
-msgid "Rules"
-msgstr "Правила"
-
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
+msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
+msgstr ""
+
+#: View/Feeds/index.ctp:196
+msgid "Visible"
 msgstr ""
 
 #: View/Feeds/index.ctp:211
-msgid "New fixed event"
+msgid "Feeds"
+msgstr "Фиды"
+
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
+msgstr "Получить кеши фидов (только для включенных)"
+
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:141
-msgid "Age: "
-msgstr "Возраст: "
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
+msgstr "Закешировать все фиды"
 
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:149
-msgid "Not cached"
-msgstr "Не закеширован"
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr "Закешировать текстовые/CSV фиды"
 
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
-msgstr "Закешировать фид"
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr "Закешировать MISP фиды"
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr "Скачать и разместить все данные фидов"
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr "Просмотреть события удаленно на источнике"
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr "Загрузить все события"
 
-#: View/Feeds/index.ctp:283
-msgid "Are you sure you want to permanently remove the feed (%s)?"
-msgstr "Вы уверены что хотите удалить фид (%s)?"
+#: View/Feeds/index.ctp:294
+msgid "Are you sure you want to permanently remove the feed?"
+msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr "Загрузить настройки фида в виде JSON файла"
 
@@ -12611,26 +13022,39 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr "версия"
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
 #: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr "Пространство имен"
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr "ID галактики"
 
-#: View/Galaxies/view.ctp:29
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr "Порядок реализации атаки"
 
@@ -12638,33 +13062,30 @@ msgstr "Порядок реализации атаки"
 msgid "Toggle ATT&CK Matrix"
 msgstr "Свернуть/развернуть матрицу ATT&CK"
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:23
-#: 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/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr "Удаление кластера"
@@ -12673,23 +13094,17 @@ msgstr "Удаление кластера"
 msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr "Просмотр графа"
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
-msgstr "Удалить кластер"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
+msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
 msgid "Key"
@@ -12699,6 +13114,27 @@ msgstr ""
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Inbox/index.ctp:31
+#: 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/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr ""
@@ -12719,12 +13155,6 @@ msgstr "Завершено."
 msgid "Show all queues"
 msgstr "Показать все запросы"
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr "По умолчанию"
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr "Показать стандартные запросы"
@@ -12762,6 +13192,11 @@ msgstr ""
 msgid "Job type"
 msgstr ""
 
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
+msgstr "Ввод"
+
 #: View/Jobs/index.ctp:106
 #: View/Pages/doc/administration.ctp:229
 msgid "Retries"
@@ -12843,6 +13278,7 @@ msgstr ""
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
 #: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -12850,13 +13286,6 @@ msgstr ""
 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"
@@ -12907,10 +13336,6 @@ msgstr "Ссылка"
 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"
@@ -13478,7 +13903,7 @@ msgstr "Показать все"
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr "Логотип"
 
@@ -13512,12 +13937,12 @@ msgid "Last modified"
 msgstr "Дата последнего изменения"
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:37
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr "Сектор"
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:35
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr "Национальность"
 
@@ -14059,7 +14484,7 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:76
+#: View/Users/admin_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -14070,7 +14495,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -14083,7 +14508,7 @@ 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr "Ключ аутентификации"
 
@@ -14136,6 +14561,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -15450,10 +15876,6 @@ msgstr ""
 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 ""
@@ -17235,10 +17657,6 @@ msgstr "Код ответа"
 msgid "Request duration"
 msgstr "Продолжительность запроса"
 
-#: View/Servers/rest.ctp:164
-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 "Внимание: app/Config/config.php не доступен на запись. Это означает что изменения настроек не сохраняются."
@@ -17619,10 +18037,6 @@ msgstr "Пассивные группы распространения"
 msgid "Distribution List"
 msgstr ""
 
-#: View/SharingGroups/view.ctp:12
-msgid "Selectable"
-msgstr ""
-
 #: View/SharingGroups/view.ctp:28
 msgid "Synced by"
 msgstr ""
@@ -17631,10 +18045,6 @@ msgstr ""
 msgid "Quick Search"
 msgstr ""
 
-#: View/Sightingdb/index.ctp:55
-msgid "Owner"
-msgstr ""
-
 #: View/Sightingdb/index.ctp:61
 msgid "Host"
 msgstr ""
@@ -17795,6 +18205,11 @@ msgstr "Помеченные атрибуты"
 msgid "Favourite"
 msgstr "Избранный"
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+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 "В данном разделе вы можете запланировать выполнение предустановленных заданий. Вы можете изменить дату и время следующего запланированного выполнения и частоту, с которой оно будет выполняться (в часах). Если установить частоту в 0, то задание не будет повторяться. Для изменения указанных настроек просто нажмите на соответствующее поле и затем нажмите кнопку \"Обновить\"."
@@ -18135,6 +18550,45 @@ msgstr ""
 msgid "Are you sure you wish to delete this entry?"
 msgstr ""
 
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr "Добавление пользователя"
@@ -18192,12 +18646,12 @@ msgstr "SMIME ключ"
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr ""
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr "Отключить аккаунт пользователя"
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
@@ -18207,7 +18661,7 @@ msgstr "Редактирование пользователя"
 
 #: View/Users/admin_edit.ctp:69
 #: View/Users/admin_view.ctp:69
-#: View/Users/view.ctp:29
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr "Положения приняты"
 
@@ -18310,30 +18764,68 @@ msgstr "Удалить фильтр"
 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_index.ctp:7
+#: View/Users/admin_index.ctp:3
 msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
 msgstr ""
 
-#: View/Users/admin_index.ctp:10
+#: View/Users/admin_index.ctp:6
 msgid "here"
 msgstr ""
 
-#: View/Users/admin_index.ctp:13;14
+#: View/Users/admin_index.ctp:9;10
 msgid "Reset all sync user API keys"
 msgstr ""
 
-#: View/Users/admin_index.ctp:17
+#: View/Users/admin_index.ctp:13
 msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
 msgstr ""
 
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -18346,11 +18838,6 @@ msgstr "ВНИМАНИЕ: У данного пользователя отсут
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr "Обнаружен %s ключ, письма будут зашифрованы на данном ключе."
 
-#: 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"
@@ -18369,7 +18856,7 @@ msgid "Org_admin"
 msgstr ""
 
 #: View/Users/admin_view.ctp:68
-#: View/Users/view.ctp:28
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr "Стартовый SID для IDS"
 
@@ -18378,22 +18865,22 @@ msgid "Password change"
 msgstr "Смена пароля"
 
 #: View/Users/admin_view.ctp:78
-#: View/Users/view.ctp:37
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr "Отпечаток GnuPG"
 
 #: View/Users/admin_view.ctp:83
-#: View/Users/view.ctp:42
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr "Статус GnuPG"
 
 #: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:49
+#: View/Users/view.ctp:50
 msgid "S/MIME Public certificate"
 msgstr ""
 
 #: View/Users/admin_view.ctp:119
-#: View/Users/view.ctp:64
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr ""
 
@@ -18409,10 +18896,102 @@ msgstr ""
 msgid "SMIME Public certificate (PEM format)"
 msgstr ""
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr "Вход"
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr ""
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+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"
@@ -18428,6 +19007,13 @@ msgstr "Найдено корреляций"
 msgid "Proposals active"
 msgstr "Активных предложений"
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr "Пользователи"
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -18483,15 +19069,15 @@ msgstr "Пользователей на организацию"
 msgid "A heatmap showing the usage of %s."
 msgstr "Карта активности показывает использование %s."
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr "Список организаций"
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr "Краткое описание локальных организаций и организаций, упоминаемых на данном сервере."
 
-#: View/Users/statistics_orgs.ctp:38
+#: View/Users/statistics_orgs.ctp:40
 msgid "Activity (1 year)"
 msgstr ""
 
@@ -18547,6 +19133,14 @@ msgstr "Проверка сертификатов"
 msgid "GnuPG key validation"
 msgstr "Проверка ключа GnuPG"
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr "Подтвердите отправку"
@@ -18705,6 +19299,7 @@ msgid "boolean"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/Dashboard.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
diff --git a/app/Locale/spa/LC_MESSAGES/default.po b/app/Locale/spa/LC_MESSAGES/default.po
index edd85f347..2e887edb8 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: 2020-02-27 02:23\n"
+"PO-Revision-Date: 2021-03-26 04:20\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -9,8 +9,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: es-ES\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: es_ES\n"
 
 #: Console/Command/AdminShell.php:72
@@ -71,7 +73,8 @@ msgid "MISP mass sync authkey reset command line tool.\n\n"
 msgstr ""
 
 #: Console/Command/AdminShell.php:536
-#: Controller/UsersController.php:1234
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
 msgid "Invalid user."
 msgstr ""
 
@@ -99,7 +102,7 @@ msgstr ""
 #: Console/Command/EventShell.php:15
 #: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1122;1606;1691;2221;2297;2301;2305;2433;2530;2585;2633;2705;2795;3128;5252;5474;5478;5487
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
 #: Model/Galaxy.php:293
 msgid "Invalid event"
@@ -126,51 +129,51 @@ msgstr "modo detallado"
 msgid "interactive mode"
 msgstr "modo interactivo"
 
-#: Controller/AppController.php:377
+#: Controller/AppController.php:382
 msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
 msgstr ""
 
-#: Controller/AppController.php:377
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
 msgid "Update Progress"
 msgstr ""
 
-#: Controller/AppController.php:384
+#: Controller/AppController.php:389
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
 msgstr "Algo ha ido mal. La cuenta de usuario con la que te has autenticado ya no existe."
 
-#: Controller/AppController.php:502
+#: Controller/AppController.php:519
 msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
 msgstr ""
 
-#: Controller/AppController.php:710
-#: Controller/AttributesController.php:1876;1985;2089
-#: Controller/EventsController.php:3260
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 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:719
-#: Controller/AttributesController.php:2093
-#: Controller/EventsController.php:3264
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr "Tienes que iniciar sesión para realizar esta acción."
 
-#: Controller/AppController.php:735
+#: Controller/AppController.php:764
 #: Controller/Component/IndexFilterComponent.php:23
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr "Especifique los términos de búsqueda en la url, o POST un json con los parámetros del filtro."
 
-#: Controller/AppController.php:873
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Todo listo. attribute_count generó desde cero para "
 
-#: Controller/AppController.php:996
-#: Controller/AttributesController.php:2147
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
 #: Controller/ShadowAttributesController.php:1267
 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/AppController.php:1178
+#: Controller/AppController.php:1211
 msgid "RestSearch is not implemented (yet) for this scope."
 msgstr ""
 
@@ -183,19 +186,19 @@ msgstr "ID de evento no establecido."
 msgid "You do not have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:132;422;602;832;3127;3142
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:2092;2113;2147
+#: Controller/EventsController.php:2107;2128;2162
 #: Controller/ObjectsController.php:837
-#: Model/Attribute.php:4304;4308
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "No dispones de permisos para realizar esta acción."
 
-#: Controller/AttributesController.php:345;800;805;824;1032;1121;2163;2177;2210;2232;2800;2811;2817;2886;3024;3036;3040
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
 #: Controller/ObjectsController.php:641
 #: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
 #: Controller/TagsController.php:506
-#: Model/Attribute.php:4296
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "Atributo inválido"
 
@@ -209,7 +212,7 @@ msgid "Attribute not an attachment or malware-sample"
 msgstr "Atributo no un accesorio o muestra de malware"
 
 #: Controller/AttributesController.php:419;586;892;1348
-#: Controller/EventsController.php:4414;4428;5201;5215
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "Evento inválido."
 
@@ -259,7 +262,7 @@ msgid "Invalid event id."
 msgstr "El id del evento no es válido."
 
 #: Controller/AttributesController.php:1072
-#: Controller/EventsController.php:2451
+#: Controller/EventsController.php:2466
 #: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "Entrada no válida."
@@ -284,7 +287,7 @@ msgstr "Atributo eliminado"
 msgid "Attribute was not deleted"
 msgstr "El atributo no fue eliminado"
 
-#: Controller/AttributesController.php:1281;2634
+#: Controller/AttributesController.php:1281;2675
 #: Controller/ShadowAttributesController.php:853
 msgid "Invalid Attribute"
 msgstr "Atributo Inválido"
@@ -305,104 +308,104 @@ msgstr "Solo se puede acceder a este método a través de AJAX."
 msgid "You are not authorized to edit this event."
 msgstr "No estás autorizado para editar este evento."
 
-#: Controller/AttributesController.php:1516
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "No se proporcionó el ID del evento."
 
-#: Controller/AttributesController.php:1561
-#: Controller/GalaxiesController.php:243
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "Sinónimos: "
 
-#: Controller/AttributesController.php:1871;1978
+#: Controller/AttributesController.php:1912;2019
 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:1884
+#: Controller/AttributesController.php:1925
 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:1904
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "No tienes acceso a ese evento."
 
-#: Controller/AttributesController.php:1967
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "Ninguna coincidencia."
 
-#: Controller/AttributesController.php:1989;1998
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Atributo inválido o sin autorización para visualizarlo."
 
-#: Controller/AttributesController.php:2124
+#: Controller/AttributesController.php:2165
 #: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "Todo listo. "
 
-#: Controller/AttributesController.php:2156;2203
+#: Controller/AttributesController.php:2197;2244
 #: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "Campo inválido solicitado."
 
-#: Controller/AttributesController.php:2159;2206
+#: Controller/AttributesController.php:2200;2247
 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:2241
+#: Controller/AttributesController.php:2282
 msgid "You do not have permission to do that"
 msgstr ""
 
-#: Controller/AttributesController.php:2271;2279
-#: Controller/EventsController.php:3643;3796;4999
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 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:2300
+#: Controller/AttributesController.php:2341
 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:2309;2560;2574;2585
-#: Controller/OrganisationsController.php:432
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
 #: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "Usted no está autorizado a realizar esta acción."
 
-#: Controller/AttributesController.php:2414
-#: Controller/EventsController.php:4207
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "Esta funcionalidad requiere una clave API válida."
 
-#: Controller/AttributesController.php:2422
+#: Controller/AttributesController.php:2463
 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:2434
+#: Controller/AttributesController.php:2475
 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:2595
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "Script no válido."
 
-#: Controller/AttributesController.php:2662
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr "No se encontraron opciones de enriquecimiento válidas para este atributo."
 
-#: Controller/AttributesController.php:2760
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "Tipo inválido solicitado."
 
-#: Controller/AttributesController.php:2823;3030
+#: Controller/AttributesController.php:2864;3071
 #: Controller/TagCollectionsController.php:254
 msgid "Invalid tag"
 msgstr ""
 
-#: Controller/AttributesController.php:3120
-#: Controller/EventsController.php:5197
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Deshabilitadando la correlación, no está permitida en esta instancia."
 
-#: Controller/AttributesController.php:3124;3139
+#: Controller/AttributesController.php:3165;3180
 #: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "Atributo Inválido."
@@ -419,6 +422,63 @@ msgstr ""
 msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
 msgstr ""
 
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
 #: Controller/DecayingModelController.php:20
 msgid "Default decaying models updated"
 msgstr ""
@@ -584,452 +644,456 @@ msgstr "IDs de evento inválidos."
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr "Error al eliminar Event de EventBlacklist. Error: "
 
-#: Controller/EventsController.php:879
+#: Controller/EventsController.php:894
 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:881
+#: Controller/EventsController.php:896
 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:887
+#: Controller/EventsController.php:902
 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:889
+#: Controller/EventsController.php:904
 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:1716
+#: Controller/EventsController.php:1731
 msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1927
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr "No tienes permisos para crear eventos"
 
-#: Controller/EventsController.php:1933
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr "No se recibieron datos de eventos válidos."
 
-#: Controller/EventsController.php:1969
+#: Controller/EventsController.php:1984
 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:1973;1977
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
 msgstr "Grupo de uso no válido o no autorizado."
 
-#: Controller/EventsController.php:2001
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr "Evento bloqueado por la lista negra local."
 
-#: Controller/EventsController.php:2014;2101;2377
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "El evento se ha guardado"
 
-#: Controller/EventsController.php:2022
+#: Controller/EventsController.php:2037
 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:2028
+#: Controller/EventsController.php:2043
 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:2030;2380
+#: Controller/EventsController.php:2045;2395
 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:2079
+#: Controller/EventsController.php:2094
 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 "El evento creado será visible para las organizaciones que tengan una cuenta en esta plataforma, pero no sincronizado con otras instancias MISP hasta que se publique."
 
-#: Controller/EventsController.php:2127
+#: Controller/EventsController.php:2142
 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:2128
+#: Controller/EventsController.php:2143
 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:2189
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr "Documento STIX importado, evento creado: "
 
-#: Controller/EventsController.php:2192
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr "Documento STIX importado."
 
-#: Controller/EventsController.php:2195
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr "No se pudo importar el documento STIX: "
 
-#: Controller/EventsController.php:2202
+#: Controller/EventsController.php:2217
 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:2226;2311
+#: Controller/EventsController.php:2241;2326
 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:2234
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr "El ID del evento es invalido."
 
-#: Controller/EventsController.php:2239
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr "No está autorizado para leer el evento seleccionado."
 
-#: Controller/EventsController.php:2536;2640;2711
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr "No tienes el permiso para realizar esta acción."
 
-#: Controller/EventsController.php:2545
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr "Evento no publicado."
 
-#: Controller/EventsController.php:2652;2722
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr "El evento no puede ser publicado - no hay etiqueta para las taxonomías faltantes: %s"
 
-#: Controller/EventsController.php:2804
+#: Controller/EventsController.php:2819
 msgid "You must specify a message."
 msgstr ""
 
-#: Controller/EventsController.php:2823
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr "Correo electrónico enviado al informante."
 
-#: Controller/EventsController.php:2832
+#: Controller/EventsController.php:2847
 msgid "Sending of email failed."
 msgstr ""
 
-#: Controller/EventsController.php:2883
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr "Advertencia, está conectado como administrador del sitio, cualquier exportación que genere contendrá el conjunto de datos FULL UNRESTRICTED. Si desea generar una exportación para su propia organización, por favor conéctese con otro usuario."
 
-#: Controller/EventsController.php:2971
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr "Esta característica está actualmente deshabilitada"
 
-#: Controller/EventsController.php:3097
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr "Nombre de fichero no permitido."
 
-#: Controller/EventsController.php:3117
+#: Controller/EventsController.php:3134
 msgid "Problem with writing the IoC file. Please report to site admin."
 msgstr ""
 
-#: Controller/EventsController.php:3211
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr "Este no es un archivo MISP XML válido."
 
-#: Controller/EventsController.php:3253
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr "Aún no implementado"
 
-#: Controller/EventsController.php:3271;3275
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr "El evento es no válido o no autorizado."
 
-#: Controller/EventsController.php:3467
+#: Controller/EventsController.php:3484
 #: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr "Etiqueta inválida."
 
-#: Controller/EventsController.php:3483
+#: Controller/EventsController.php:3500
 #: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr "La etiqueta ya está incluida en este evento."
 
-#: Controller/EventsController.php:3497
+#: Controller/EventsController.php:3514
 msgid "Tag is not allowed due to taxonomy exclusivity settings"
 msgstr ""
 
-#: Controller/EventsController.php:3528;3534
+#: Controller/EventsController.php:3545;3551
 #: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr "Etiqueta(s) añadida(s)."
 
-#: Controller/EventsController.php:3530
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr "La etiqueta no pudo ser añadida."
 
-#: Controller/EventsController.php:3536
+#: Controller/EventsController.php:3553
 #: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr "Todas las etiquetas están presentes ya, nada para añadir."
 
-#: Controller/EventsController.php:3800;5003;5025;5532;5536
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
 #: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "Evento invalido."
 
-#: Controller/EventsController.php:3855;3885;3901
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr "No tienes permisos para realizar esta acción."
 
-#: Controller/EventsController.php:3966;4106
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr "ID inválido"
 
-#: Controller/EventsController.php:3970;4110;4685
+#: Controller/EventsController.php:3987;4128;4703
 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:4116
+#: Controller/EventsController.php:4134
 msgid "Freetext Import"
 msgstr ""
 
-#: Controller/EventsController.php:4122
+#: Controller/EventsController.php:4140
 msgid "Populate using a Template"
 msgstr ""
 
-#: Controller/EventsController.php:4128
+#: Controller/EventsController.php:4146
 msgid "OpenIOC Import"
 msgstr ""
 
-#: Controller/EventsController.php:4133
+#: Controller/EventsController.php:4151
 msgid "ThreatConnect Import"
 msgstr ""
 
-#: Controller/EventsController.php:4138
+#: Controller/EventsController.php:4156
 msgid "(Experimental) Forensic analysis - Mactime"
 msgstr ""
 
-#: Controller/EventsController.php:4157
+#: Controller/EventsController.php:4175
 msgid "MISP standard (recommended exchange format - lossless)"
 msgstr ""
 
-#: Controller/EventsController.php:4163
+#: Controller/EventsController.php:4181
 msgid "STIX 1.1.1 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4168
+#: Controller/EventsController.php:4186
 msgid "STIX 2.0 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4210;4217
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr "Por favor enviar las muestras como se describe en la página de automatización."
 
-#: Controller/EventsController.php:4246
+#: Controller/EventsController.php:4264
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr "No se recibieron muestras, o muestras no en el formato correcto. Por favor, consulte la documentación de la API en la página de automatización."
 
-#: Controller/EventsController.php:4254
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "No se ha encontrado el evento"
 
-#: Controller/EventsController.php:4277
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "No se ha encontrado el evento."
 
-#: Controller/EventsController.php:4287
+#: Controller/EventsController.php:4305
 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:4312
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4451;4472;4531;4556;4581;4611;4632
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr "Tipo inválido."
 
-#: Controller/EventsController.php:4750
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr "Método inválido."
 
-#: Controller/EventsController.php:4832
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr "Los servicios de %s no están habilitados."
 
-#: Controller/EventsController.php:4836
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "Atributo no encontrado o no está autorizado a verlo."
 
-#: Controller/EventsController.php:4841
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4896;4942
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr "Servicio %s no accesible."
 
-#: Controller/EventsController.php:4908
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr ""
 
-#: Controller/EventsController.php:4959
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ": Enriquecido a través de %s"
 
-#: Controller/EventsController.php:5114
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr "Servicio de importación no alcanzable."
 
-#: Controller/EventsController.php:5204;5218
+#: Controller/EventsController.php:5222;5236
 #: Controller/PostsController.php:60;84
 #: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
 msgid "You don't have permission to do that."
 msgstr "No tienes permiso para realizar esta acción."
 
-#: Controller/EventsController.php:5345
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr "ID inválido."
 
-#: Controller/EventsController.php:5393
+#: Controller/EventsController.php:5411
 #: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr "Evento inválido"
 
-#: Controller/EventsController.php:5414
+#: Controller/EventsController.php:5432
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr ""
 
-#: Controller/EventsController.php:5665
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr ""
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:241;340
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr "Feed añadido."
 
-#: Controller/FeedsController.php:249
-msgid "Feed could not be added. Invalid field: %s"
-msgstr "No se pudo agregar el feed. Campo no válido: %s"
+#: Controller/FeedsController.php:291
+msgid "Feed could not be added. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:274;375;397;526;567;778
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr "Fuente no válida."
 
-#: Controller/FeedsController.php:348
-msgid "Feed could not be updated. Invalid fields: %s"
-msgstr "La fuente no puede ser actualizada. Campos inválidos: %s"
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:371
-#: Controller/OrganisationsController.php:237
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
 #: Controller/SharingGroupsController.php:237
-#: Controller/UsersController.php:1015
+#: Controller/UsersController.php:1044
 msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:404;530
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:417;483
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr "Comenzando la obtención de la Fuente."
 
-#: Controller/FeedsController.php:428
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:433;435
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr "La obtención de la fuente ha fallado."
 
-#: Controller/FeedsController.php:439;500
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr "La obtención de la fuente se ha completado con éxito."
 
-#: Controller/FeedsController.php:512
+#: Controller/FeedsController.php:563
 msgid "No feed enabled."
 msgstr ""
 
-#: Controller/FeedsController.php:536;555
+#: Controller/FeedsController.php:587;606
 #: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr "Descarga fallida."
 
-#: Controller/FeedsController.php:543
+#: Controller/FeedsController.php:594
 msgid "Event added."
 msgstr "Evento agregado."
 
-#: Controller/FeedsController.php:546
+#: Controller/FeedsController.php:597
 msgid "Event already up to date."
 msgstr "Evento ya acualizado."
 
-#: Controller/FeedsController.php:548
+#: Controller/FeedsController.php:599
 msgid "Event updated."
 msgstr "Evento Actualizado."
 
-#: Controller/FeedsController.php:552
+#: Controller/FeedsController.php:603
 msgid "Could not %s event."
 msgstr "No se pudo %s el evento."
 
-#: Controller/FeedsController.php:649
+#: Controller/FeedsController.php:700
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "La fuente no se pudo obtener. El código de error HTTP devuelto fue: "
 
-#: Controller/FeedsController.php:688;739
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr "Tipo de fuente no válido."
 
-#: Controller/FeedsController.php:784;816
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr "No se pudo descargar el evento seleccionado"
 
-#: Controller/FeedsController.php:814
+#: Controller/FeedsController.php:865
 msgid "This event is blocked by the Feed filters."
 msgstr "Este evento está bloqueado por los filtros de Fuente."
 
-#: Controller/FeedsController.php:852;856
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr "Feed inválido."
 
-#: Controller/FeedsController.php:877
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr "Sólo se permiten peticiones POST."
 
-#: Controller/FeedsController.php:881
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr "Feed no encontrado."
 
-#: Controller/FeedsController.php:890
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr ""
 
-#: Controller/FeedsController.php:892
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:909
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr "Empezando a cachear las fuentes."
 
-#: Controller/FeedsController.php:924
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr "El cacheo de las fuentes ha fallado."
 
-#: Controller/FeedsController.php:927
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr "El cacheo de las fuentes se completado con éxito."
 
-#: Controller/FeedsController.php:961
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr "Lista de fuentes recibida no válida."
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr "Todos los clusters"
 
-#: Controller/GalaxiesController.php:174
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr "Todos los espacios de nombres"
 
-#: Controller/GalaxiesController.php:304
+#: Controller/GalaxiesController.php:337
 msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:307
+#: Controller/GalaxiesController.php:340
 msgid "Failed to parse request."
 msgstr "Error al analizar la solicitud."
 
@@ -1112,7 +1176,7 @@ msgid "Object could not be saved."
 msgstr ""
 
 #: Controller/ObjectsController.php:373;1006
-#: Model/Event.php:6171
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr "Objeto no válido."
 
@@ -1180,43 +1244,43 @@ msgstr ""
 msgid "The organisation could not be added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:156;289;295
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:162;242;248;301;328;361
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
 msgid "Invalid organisation"
 msgstr ""
 
-#: Controller/OrganisationsController.php:201
+#: Controller/OrganisationsController.php:208
 msgid "Organisation updated."
 msgstr ""
 
-#: Controller/OrganisationsController.php:216
+#: Controller/OrganisationsController.php:223
 msgid "The organisation could not be updated."
 msgstr ""
 
-#: Controller/OrganisationsController.php:265
+#: Controller/OrganisationsController.php:272
 msgid "Organisation deleted"
 msgstr "La organización ha sido eliminada"
 
-#: Controller/OrganisationsController.php:272
+#: Controller/OrganisationsController.php:279
 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 "Organización no pudo ser eliminada. Generalmente las organizaciones nunca deben ser eliminadas, en lugar de eso, considere moverlos a la lista de organizaciones remotas conocidas. Alternativamente, si usted está seguro que desea eliminar una organización y es conscientes del impacto, asegúrese de que no hay usuarios ni eventos todavía ligados a esta organización antes de eliminarlo."
 
-#: Controller/OrganisationsController.php:366
+#: Controller/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:415
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr ""
 
-#: Controller/OrganisationsController.php:437
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr ""
 
-#: Controller/OrganisationsController.php:440
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr ""
 
@@ -1348,7 +1412,7 @@ msgstr ""
 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:350;532;2154
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr "El servidor ha sido guardado"
 
@@ -1356,8 +1420,8 @@ msgstr "El servidor ha sido guardado"
 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:411;608;653;656;665;729;735;1489;1506
-#: Model/Server.php:5737
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "Servidor invalido"
 
@@ -1365,7 +1429,7 @@ msgstr "Servidor invalido"
 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:604;2171;2213
+#: Controller/ServersController.php:604;2183;2225
 msgid "This endpoint expects POST requests."
 msgstr ""
 
@@ -1564,79 +1628,79 @@ msgstr ""
 msgid "This setting can only be edited via the CLI."
 msgstr ""
 
-#: Controller/ServersController.php:1365
+#: Controller/ServersController.php:1365;1377
 msgid "Restarting workers."
 msgstr ""
 
-#: Controller/ServersController.php:1389
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "Archivo no encontrado."
 
-#: Controller/ServersController.php:1395
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "El archivo no pudo ser eliminado."
 
-#: Controller/ServersController.php:1418;1434
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr "Hubo un fallo en la carga."
 
-#: Controller/ServersController.php:1426
+#: Controller/ServersController.php:1438
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr ""
 
-#: Controller/ServersController.php:1493
+#: Controller/ServersController.php:1505
 msgid "Invalid user or user not found."
 msgstr ""
 
-#: Controller/ServersController.php:2040
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr ""
 
-#: Controller/ServersController.php:2055
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:2058
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
-#: Controller/ServersController.php:2088
+#: Controller/ServersController.php:2100
 msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2097
+#: Controller/ServersController.php:2109
 msgid "Configured host org not found. Please make sure that the setting is current on the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2161
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ServersController.php:2182
+#: Controller/ServersController.php:2194
 msgid "API key updated."
 msgstr ""
 
-#: Controller/ServersController.php:2195
+#: Controller/ServersController.php:2207
 msgid "ID has to be a valid server connection"
 msgstr ""
 
-#: Controller/ServersController.php:2198
+#: Controller/ServersController.php:2210
 msgid "Invalid direction. Valid options: "
 msgstr ""
 
-#: Controller/ServersController.php:2202
+#: Controller/ServersController.php:2214
 msgid "Priority changed."
 msgstr ""
 
-#: Controller/ServersController.php:2205
+#: Controller/ServersController.php:2217
 msgid "Priority could not be changed."
 msgstr ""
 
-#: Controller/ServersController.php:2216
+#: Controller/ServersController.php:2228
 msgid "Only site admin accounts can release the update lock."
 msgstr ""
 
-#: Controller/ServersController.php:2226
+#: Controller/ServersController.php:2238
 msgid "Only site admin accounts get the DB schema diagnostic."
 msgstr ""
 
@@ -1967,164 +2031,174 @@ msgstr "El evento fue populado "
 msgid "Event populated, but "
 msgstr "El evento fue populado, pero "
 
-#: Controller/UserSettingsController.php:123;312
+#: Controller/UserSettingsController.php:129;276
 msgid "Invalid ID passed."
 msgstr ""
 
-#: Controller/UserSettingsController.php:133;137;322;326
+#: Controller/UserSettingsController.php:139;143;286;290
 msgid "Invalid user setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:151;192;278;290
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
 msgid "Invalid setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:155;196;330
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
 msgid "This setting is restricted and requires the following permission(s): %s"
 msgstr ""
 
-#: Controller/UserSettingsController.php:189
-msgid "This endpoint expects both a setting and a value to be set."
-msgstr ""
-
-#: Controller/UserSettingsController.php:229
+#: Controller/UserSettingsController.php:193
 msgid "Setting saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:242
+#: Controller/UserSettingsController.php:206
 msgid "Setting could not be saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:337
+#: Controller/UserSettingsController.php:301
 msgid "Setting deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:345
+#: Controller/UserSettingsController.php:309
 msgid "Setting could not be deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:358
+#: Controller/UserSettingsController.php:322
 msgid "Expecting POST or DELETE request."
 msgstr ""
 
-#: Controller/UsersController.php:42;310
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr "Usuario no válido o no autorizado."
 
-#: Controller/UsersController.php:62;538;786;805;1030
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "Usuario inválido"
 
-#: Controller/UsersController.php:150;693;858
+#: Controller/UsersController.php:154;722;887
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
-#: Controller/UsersController.php:202
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr "El perfil ha sido actualizado"
 
-#: Controller/UsersController.php:207
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr "El perfil no pudo ser actualizado. Por favor, inténtalo de nuevo."
 
-#: Controller/UsersController.php:247
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr "Contraseña no válida. Por favor, introduzca su contraseña actual para continuar."
 
-#: Controller/UsersController.php:256
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr "Por favor, introduzca su contraseña actual para continuar."
 
-#: Controller/UsersController.php:276
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "Contraseña cambiada."
 
-#: Controller/UsersController.php:285
+#: Controller/UsersController.php:299
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "La contraseña no se pudo actualizar. Asegúrese de que cumple con los requisitos mínimos de longitud de contraseña / complejidad."
 
-#: Controller/UsersController.php:422;440;547
-#: Model/Log.php:370
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:704
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr "El usuario no pudo ser guardado. Organización no válida."
 
-#: Controller/UsersController.php:726
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "Se ha guardado el usuario."
 
-#: Controller/UsersController.php:735;966
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr "El usuario no pudo ser guardado. Por favor, inténtalo de nuevo."
 
-#: Controller/UsersController.php:958
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "El usuario ha sido guardado"
 
-#: Controller/UsersController.php:1038
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "Usuario borrado"
 
-#: Controller/UsersController.php:1042
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "El usuario no fue borrado"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "Nombre de usuario o contraseña no válidos, inténtelo de nuevo"
 
-#: Controller/UsersController.php:1208
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr "Adiós"
 
-#: Controller/UsersController.php:1230
-msgid "Invalid action."
-msgstr ""
-
-#: Controller/UsersController.php:1237
-msgid "New authkey generated."
-msgstr "Nuevo código de autentificación generado."
-
-#: Controller/UsersController.php:1248
+#: Controller/UsersController.php:1273;1297
 msgid "This functionality is only accessible via POST requests."
 msgstr ""
 
-#: Controller/UsersController.php:1252
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
+msgid "New authkey generated."
+msgstr "Nuevo código de autentificación generado."
+
+#: Controller/UsersController.php:1301
 msgid "Job initiated."
 msgstr ""
 
-#: Controller/UsersController.php:1254
+#: Controller/UsersController.php:1303
 msgid "%s authkeys reset, %s could not be reset."
 msgstr ""
 
-#: Controller/UsersController.php:1368
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr "Usted aceptó los Términos y Condiciones."
 
-#: Controller/UsersController.php:1496
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr "Email del destinatario no proporcionado"
 
-#: Controller/UsersController.php:1501
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr "Organización del destinatario no proporcionada"
 
-#: Controller/UsersController.php:1538
+#: Controller/UsersController.php:1587
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr "Correos electrónicos enviados, pero no se han enviado los mensajes a los siguientes destinatarios: "
 
-#: Controller/UsersController.php:1540
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr "Correo electrónico enviado."
 
-#: Controller/UsersController.php:1614
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr ""
 
-#: Controller/UsersController.php:1615
+#: Controller/UsersController.php:1664
 #: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
@@ -2134,11 +2208,11 @@ msgstr ""
 msgid "Organisations"
 msgstr ""
 
-#: Controller/UsersController.php:1616
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr ""
 
-#: Controller/UsersController.php:1617
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
 #: View/DecayingModel/decaying_tool_rest_search.ctp:28
 #: View/Elements/eventattribute.ctp:151
@@ -2164,18 +2238,160 @@ msgstr ""
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: Controller/UsersController.php:1618
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr ""
 
-#: Controller/UsersController.php:1619
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1620
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr ""
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "Si"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "No"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr ""
@@ -2256,11 +2472,11 @@ msgstr ""
 msgid "No valid data received."
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:614
+#: Controller/Component/ACLComponent.php:634
 msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:668
+#: Controller/Component/ACLComponent.php:688
 msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
 msgstr ""
 
@@ -2741,87 +2957,87 @@ msgstr ""
 msgid "Invalid %s."
 msgstr ""
 
-#: Model/AppModel.php:1416
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr ""
 
-#: Model/AppModel.php:1430
+#: Model/AppModel.php:1480
 msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1452
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1453
+#: Model/AppModel.php:1503
 msgid "The executed SQL query was: %s"
 msgstr ""
 
-#: Model/AppModel.php:1455
+#: Model/AppModel.php:1505
 msgid "Successfuly executed the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1466;1530
+#: Model/AppModel.php:1516;1580
 msgid "Issues executing the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1469
+#: Model/AppModel.php:1519
 msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1478
+#: Model/AppModel.php:1528
 msgid "However, as this error is whitelisted, the update went through."
 msgstr ""
 
-#: Model/AppModel.php:1497
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/AppModel.php:1500
+#: Model/AppModel.php:1550
 msgid "Failed to add index"
 msgstr ""
 
-#: Model/AppModel.php:1502
+#: Model/AppModel.php:1552
 msgid "The returned error is:"
 msgstr ""
 
-#: Model/AppModel.php:1531
+#: Model/AppModel.php:1581
 msgid "Database updates stopped as some errors occured and the stop flag is enabled."
 msgstr ""
 
-#: Model/AppModel.php:1690
+#: Model/AppModel.php:1740
 msgid "Invalid JSON."
 msgstr ""
 
-#: Model/AppModel.php:1783;1841
+#: Model/AppModel.php:1833;1891
 msgid "Issues executing run_updates"
 msgstr ""
 
-#: Model/AppModel.php:1784
+#: Model/AppModel.php:1834
 msgid "Database updates are locked. Worker not spawned"
 msgstr ""
 
-#: Model/AppModel.php:1788;1846;1881
+#: Model/AppModel.php:1838;1896;1931
 msgid "Update done"
 msgstr ""
 
-#: Model/AppModel.php:1842
+#: Model/AppModel.php:1892
 msgid "Updates are locked. Stopping worker gracefully"
 msgstr ""
 
-#: Model/AppModel.php:1861
+#: Model/AppModel.php:1911
 msgid "Running update %s"
 msgstr ""
 
-#: Model/AppModel.php:1887
+#: Model/AppModel.php:1937
 msgid "Update done in another worker. Gracefuly stopping."
 msgstr ""
 
@@ -3805,19 +4021,19 @@ msgstr ""
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:2278;2346
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2282
+#: Model/Attribute.php:2301
 msgid "Invalid hash type."
 msgstr "Hash invalido."
 
-#: Model/Attribute.php:2973
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr ""
 
-#: Model/Attribute.php:3540
+#: Model/Attribute.php:3559
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
@@ -3837,6 +4053,10 @@ msgstr ""
 msgid "Community not found."
 msgstr ""
 
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
 #: Model/DecayingModel.php:162
 msgid "Models could not be loaded or default decaying models folder is empty"
 msgstr ""
@@ -3908,67 +4128,75 @@ msgstr ""
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5722
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:5724
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:5726
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:5729
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:5731
+#: Model/Event.php:5808
 msgid "Please "
 msgstr ""
 
-#: Model/Event.php:5733
+#: Model/Event.php:5810
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:5765
+#: Model/Event.php:5842
 msgid "#"
 msgstr ""
 
-#: Model/Event.php:5774
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr ""
 
-#: Model/Event.php:6023
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr "No es posible agregar etiquetas."
 
-#: Model/Event.php:6505
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:1444;1488
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1458
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Feed.php:1635
+#: Model/Feed.php:1687
 msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Feed.php:1638
+#: Model/Feed.php:1690
 msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
 msgstr ""
 
-#: Model/Feed.php:1643
+#: Model/Feed.php:1695
 msgid "Invalid user id."
 msgstr ""
 
-#: Model/Feed.php:1663
+#: Model/Feed.php:1715
 msgid "Events related to feed %s purged."
 msgstr ""
 
@@ -3976,1164 +4204,1208 @@ msgstr ""
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:1057
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
-#: Model/Server.php:140
+#: Model/Server.php:123
+msgid "Server unreachable"
+msgstr ""
+
+#: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
 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:141
+#: Model/Server.php:151
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:153
+#: Model/Server.php:163
 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:154
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:163
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:164
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:173
+#: Model/Server.php:183
 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:175
+#: Model/Server.php:185
 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:181
+#: Model/Server.php:191
 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:189
+#: Model/Server.php:199
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:197
+#: Model/Server.php:207
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:207
+#: Model/Server.php:217
 msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
-#: Model/Server.php:216
+#: Model/Server.php:226
 msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
 msgstr ""
 
-#: Model/Server.php:225
+#: Model/Server.php:235
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr ""
 
-#: Model/Server.php:234
+#: Model/Server.php:244
 msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
 msgstr ""
 
-#: Model/Server.php:243
+#: Model/Server.php:253
 msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
 msgstr ""
 
-#: Model/Server.php:254
+#: Model/Server.php:264
 msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
 msgstr ""
 
-#: Model/Server.php:264
+#: Model/Server.php:274
 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:273
+#: Model/Server.php:283
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:281
+#: Model/Server.php:291
 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:290
+#: Model/Server.php:300
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:292
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:298;306;333;357;365;373;381;438;486;494;561
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:314
+#: Model/Server.php:324
 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:324
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr ""
 
-#: Model/Server.php:341
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:349
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:389
+#: Model/Server.php:399
 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:397
+#: Model/Server.php:407
 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:405
+#: Model/Server.php:415
 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:413
+#: Model/Server.php:423
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:421
+#: Model/Server.php:431
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:430
+#: Model/Server.php:440
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:432
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:446
+#: Model/Server.php:456
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:454
+#: Model/Server.php:464
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:462
+#: Model/Server.php:472
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:470
+#: Model/Server.php:480
 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:478
+#: Model/Server.php:488
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:502
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:510
+#: Model/Server.php:520
 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:520
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:528
+#: Model/Server.php:538
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:536
+#: Model/Server.php:546
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:544
+#: Model/Server.php:554
 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:553
+#: Model/Server.php:563
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:569
+#: Model/Server.php:579
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:577
+#: Model/Server.php:587
 msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
 msgstr ""
 
-#: Model/Server.php:585
+#: Model/Server.php:595
 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:593
+#: Model/Server.php:603
 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:601
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:610
+#: Model/Server.php:620
 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:619
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:628
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:637
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:645
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:654
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:662
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:670
+#: Model/Server.php:689
 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:678
+#: Model/Server.php:697
 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:686
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:694
+#: Model/Server.php:713
 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:702
+#: Model/Server.php:721
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:710
+#: Model/Server.php:729
 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:718
+#: Model/Server.php:737
 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:726
+#: Model/Server.php:745
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:735
+#: Model/Server.php:754
 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:744
+#: Model/Server.php:763
 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:752
+#: Model/Server.php:771
 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:759
+#: Model/Server.php:778
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:766
+#: Model/Server.php:785
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:775
+#: Model/Server.php:794
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:783
+#: Model/Server.php:802
 msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
 msgstr ""
 
-#: Model/Server.php:785
+#: Model/Server.php:804
 msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
 msgstr ""
 
-#: Model/Server.php:792
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:801
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:810
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:819
+#: Model/Server.php:838
 msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
 msgstr ""
 
-#: Model/Server.php:828
+#: Model/Server.php:847
 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:837
+#: Model/Server.php:856
 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:846
+#: Model/Server.php:865
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:855
+#: Model/Server.php:874
 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:864
+#: Model/Server.php:883
 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:873
+#: Model/Server.php:892
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:883
+#: Model/Server.php:902
 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:892
+#: Model/Server.php:911
 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:901
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:910
+#: Model/Server.php:929
 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:919
+#: Model/Server.php:938
 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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:928
+#: Model/Server.php:947
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:937
+#: Model/Server.php:956
 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:947
+#: Model/Server.php:966
 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:956
+#: Model/Server.php:975
 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:965
+#: Model/Server.php:984
 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:974
+#: Model/Server.php:993
 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:984
+#: Model/Server.php:1003
 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:993
+#: Model/Server.php:1012
 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:1001
+#: Model/Server.php:1020
 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:1009
+#: Model/Server.php:1028
 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:1017
+#: Model/Server.php:1036
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:1026
+#: Model/Server.php:1045
 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:1034
+#: Model/Server.php:1053
 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:1042
+#: Model/Server.php:1061
 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:1051
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:1062
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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:1071
+#: Model/Server.php:1099
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:1079
+#: Model/Server.php:1107
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:1087
+#: Model/Server.php:1115
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:1095
+#: Model/Server.php:1123
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:1103
+#: Model/Server.php:1131
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:1112
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:1123
+#: Model/Server.php:1151
 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:1131
+#: Model/Server.php:1159
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:1139
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1147
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1155
+#: Model/Server.php:1183
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:1167
+#: Model/Server.php:1195
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:1175
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1183
+#: Model/Server.php:1211
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:1191
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1199
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1210
+#: Model/Server.php:1238
 msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
 msgstr ""
 
-#: Model/Server.php:1219
+#: Model/Server.php:1247
 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:1229
+#: Model/Server.php:1257
 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:1238
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1246
+#: Model/Server.php:1292
 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:1254
+#: Model/Server.php:1300
 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:1263
+#: Model/Server.php:1309
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1272
+#: Model/Server.php:1318
 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:1281
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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:1283
+#: Model/Server.php:1339
 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:1290
+#: Model/Server.php:1346
 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:1299
+#: Model/Server.php:1355
 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:1308
+#: Model/Server.php:1364
 msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1328
+#: Model/Server.php:1393
 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:1339
+#: Model/Server.php:1404
 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:1347
+#: Model/Server.php:1412
 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:1355
+#: Model/Server.php:1420
 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:1364
+#: Model/Server.php:1429
 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:1372
+#: Model/Server.php:1437
 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:1383
+#: Model/Server.php:1448
 msgid "The default policy action for the values added to the RPZ."
 msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1473
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1416
+#: Model/Server.php:1481
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1424
+#: Model/Server.php:1489
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1432
+#: Model/Server.php:1497
 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:1440
+#: Model/Server.php:1505
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1448
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr ""
 
-#: Model/Server.php:1456
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1464
+#: Model/Server.php:1529
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1472
+#: Model/Server.php:1537
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1480
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr ""
 
-#: Model/Server.php:1488
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr ""
 
-#: Model/Server.php:1496;1743
+#: Model/Server.php:1561;1808
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1504;1751
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1512
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1520
+#: Model/Server.php:1585
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1528
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr ""
 
-#: Model/Server.php:1536;1759
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1544
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1552;1767
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1560
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1568;1775
+#: Model/Server.php:1633;1840
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1576
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1584
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1592
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1600;1783
+#: Model/Server.php:1665;1848
 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:1608
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1616
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr ""
 
-#: Model/Server.php:1624
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr ""
 
-#: Model/Server.php:1632
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr ""
 
-#: Model/Server.php:1640
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr ""
 
-#: Model/Server.php:1648
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1656
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1664
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1672
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr ""
 
-#: Model/Server.php:1680
+#: Model/Server.php:1745
 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:1689
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1698
+#: Model/Server.php:1763
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1707
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1716
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1725
+#: Model/Server.php:1790
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1734
+#: Model/Server.php:1799
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1791
+#: Model/Server.php:1856
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1799
+#: Model/Server.php:1864
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1807
+#: Model/Server.php:1872
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1815
+#: Model/Server.php:1880
 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:1823
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1831
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1839
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1847
+#: Model/Server.php:1912
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1855
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1863
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1871
+#: Model/Server.php:1936
 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:1879
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr "Clave secreta AWS para usar al subir muestras"
 
-#: Model/Server.php:1887
+#: Model/Server.php:1952
 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:1896
+#: Model/Server.php:1961
 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:1904
+#: Model/Server.php:1969
 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:1912
+#: Model/Server.php:1977
 msgid "Enable SightingDB integration."
 msgstr ""
 
-#: Model/Server.php:1920
+#: Model/Server.php:1985
 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:1930
+#: Model/Server.php:1995
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1939
+#: Model/Server.php:2004
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1948
+#: Model/Server.php:2013
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1957
+#: Model/Server.php:2022
 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:1966
+#: Model/Server.php:2031
 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:1975
+#: Model/Server.php:2040
 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:1984
+#: Model/Server.php:2049
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1992
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:2000
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr "Establecer un tiempo de espera para los servicios de enriquecimiento"
 
-#: Model/Server.php:2008
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr "Habilitar/deshabilitar los servicios de importación"
 
-#: Model/Server.php:2016
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:2024
+#: Model/Server.php:2089
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "La url usada para acceder a los servicios de importación. Por defecto, es accesible en http://127.0.0.1:6666"
 
-#: Model/Server.php:2032
+#: Model/Server.php:2097
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "El puerto utilizado para acceder a los servicios de importación. Por defecto, es accesible en 127.0.0.1:6666"
 
-#: Model/Server.php:2040
+#: Model/Server.php:2105
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "La url usada para acceder a los servicios de exportación Por defecto, es accesible en http://127.0.0.1:6666"
 
-#: Model/Server.php:2048
+#: Model/Server.php:2113
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "El puerto utilizado para acceder a los servicios de exportación. Por defecto, es accesible en 127.0.0.1:6666"
 
-#: Model/Server.php:2056
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr "Habilitar/deshabilitar los servicios de exportación"
 
-#: Model/Server.php:2064
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr "Establecer un tiempo de espera para los servicios de exportación"
 
-#: Model/Server.php:2072
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:2080
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:2088
+#: Model/Server.php:2153
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "La url usada para acceder a los servicios de enriquecimiento. Por defecto, es accesible en http://127.0.0.1:6666"
 
-#: Model/Server.php:2096
+#: Model/Server.php:2161
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "El puerto utilizado para acceder a los servicios de enriquecimiento. Por defecto, es accesible en 127.0.0.1:6666"
 
-#: Model/Server.php:2104
+#: Model/Server.php:2169
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr "La url usada para acceder a Cortex. Por defecto, es accesible en http://cortex-url"
 
-#: Model/Server.php:2112
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr "El puerto utilizado para acceder a Cortex. Por defecto, es el puerto 9000"
 
-#: Model/Server.php:2120
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2128
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "Establecer una clave de autenticación para ser proporcionada a Cortex"
 
-#: Model/Server.php:2137
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2145
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr "Establecer a falso para desactivar la verificación SSL. Esto no es recomendable."
 
-#: Model/Server.php:2154
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr "Establecer a falso si desea ignorar errores de nombre de host cuando valida certificados."
 
-#: Model/Server.php:2163
+#: Model/Server.php:2228
 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:2172
+#: Model/Server.php:2237
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:2181
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:2190
+#: Model/Server.php:2255
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:2200
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:2209
+#: Model/Server.php:2274
 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:2376
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2380
+#: Model/Server.php:2445
 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:2407
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr ""
 
-#: Model/Server.php:2413
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr ""
 
-#: Model/Server.php:2492
+#: Model/Server.php:2557
 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:2494
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr ""
 
-#: Model/Server.php:2495
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2507;2509
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr "Problema desconocido."
 
-#: Model/Server.php:3049
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr "Habilitar o deshabilitar el módulo %s."
 
-#: Model/Server.php:3052
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr "Restringir el módulo %s a la organización dada."
 
-#: Model/Server.php:3060
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:3175
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr "Valor no establecido."
 
-#: Model/Server.php:3196
+#: Model/Server.php:3281
 msgid "Invalid language."
 msgstr ""
 
-#: Model/Server.php:3217
+#: Model/Server.php:3302
 msgid "Invalid tag_collection."
 msgstr ""
 
-#: Model/Server.php:3225
+#: Model/Server.php:3310
 msgid "This setting has to be a number."
 msgstr ""
 
-#: Model/Server.php:3237
+#: Model/Server.php:3322
 msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
 msgstr ""
 
-#: Model/Server.php:3519
+#: Model/Server.php:3619
 msgid "Invalid file path or file not accessible."
 msgstr ""
 
-#: Model/Server.php:3522
+#: Model/Server.php:3622
 msgid "File has to be in .pem format."
 msgstr ""
 
-#: Model/Server.php:3888
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr ""
 
-#: Model/Server.php:4020
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr "Logos de Organización"
 
-#: Model/Server.php:4021
+#: Model/Server.php:4121
 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 "El logotipo utilizado por una organización en el índice de eventos, vista de eventos, discusiones, propuestas, etc. Asegúrese de que el nombre del archivo está en el formato org.png, donde org es el nombre de la organización sensible a capitalización."
 
-#: Model/Server.php:4023
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr "Archivos .png de 48x48 píxeles"
 
-#: Model/Server.php:4026;4041
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
 msgstr ""
 
-#: Model/Server.php:4030
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr ""
 
-#: Model/Server.php:4031
+#: Model/Server.php:4131
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:4038
+#: Model/Server.php:4138
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:4128
+#: Model/Server.php:4228
 msgid "Invalid server."
 msgstr ""
 
-#: Model/Server.php:4159
+#: Model/Server.php:4259
 msgid "Response was empty."
 msgstr ""
 
-#: Model/Server.php:4235
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:4501
+#: Model/Server.php:4604
 msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
 msgstr ""
 
-#: Model/Server.php:4571
+#: Model/Server.php:4675
 msgid "Can't check database schema for Postgres database type"
 msgstr ""
 
-#: Model/Server.php:4588
+#: Model/Server.php:4692
 msgid "Table `%s` does not exist"
 msgstr ""
 
-#: Model/Server.php:4615
+#: Model/Server.php:4719
 msgid "Column `%s` exists but should not"
 msgstr ""
 
-#: Model/Server.php:4648
+#: Model/Server.php:4752
 msgid "Column `%s` is different"
 msgstr ""
 
-#: Model/Server.php:4658
+#: Model/Server.php:4762
 msgid "Column `%s` does not exist but should"
 msgstr ""
 
-#: Model/Server.php:4671
+#: Model/Server.php:4775
 msgid "Table `%s` is an additional table"
 msgstr ""
 
-#: Model/Server.php:4695
+#: Model/Server.php:4799
 msgid "Column `%s` should be indexed"
 msgstr ""
 
-#: Model/Server.php:4718
+#: Model/Server.php:4822
 msgid "Column `%s` is indexed but should not"
 msgstr ""
 
-#: Model/Server.php:5141
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:5142
+#: Model/Server.php:5253
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:5146
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:5147
+#: Model/Server.php:5258
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:5449
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:5449;5478
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:5461
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:5462
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:5593
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:5600
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:5607
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr ""
 
-#: Model/Server.php:5787
+#: Model/Server.php:5911
 msgid "Could not reset the remote authentication key."
 msgstr ""
 
-#: Model/Server.php:5864
+#: Model/Server.php:5988
 msgid "Could not parse JSON: "
 msgstr ""
 
-#: Model/Server.php:5884
+#: Model/Server.php:6008
 msgid "Could not reset fetch remote user account."
 msgstr ""
 
-#: Model/Server.php:5906
+#: Model/Server.php:6030
 msgid "No user object received in response."
 msgstr ""
 
@@ -5201,6 +5473,10 @@ msgstr ""
 msgid "API key reset by administrator"
 msgstr ""
 
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
 #: Model/DecayingModelsFormulas/Polynomial.php:7
 msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
 msgstr ""
@@ -5233,7 +5509,7 @@ msgstr ""
 
 #: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
@@ -5260,8 +5536,8 @@ msgstr ""
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
 #: View/Events/add.ctp:33
-#: View/Feeds/add.ctp:178
-#: View/Feeds/edit.ctp:179
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
 #: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
@@ -5270,7 +5546,7 @@ msgstr ""
 #: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -5286,15 +5562,15 @@ msgstr ""
 msgid "for Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/add.ctp:154
+#: View/Attributes/add.ctp:155
 msgid "Timezone missing, auto-detected as: "
 msgstr ""
 
-#: View/Attributes/add.ctp:155
+#: View/Attributes/add.ctp:156
 msgid "The following value will be submited instead: "
 msgstr ""
 
-#: View/Attributes/add.ctp:163
+#: View/Attributes/add.ctp:164
 msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr ""
 
@@ -5355,10 +5631,13 @@ msgstr "Id del evento"
 #: View/DecayingModel/decaying_tool_rest_search.ctp:24
 #: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr "Org"
 
@@ -5417,7 +5696,7 @@ msgid "Values"
 msgstr "Valores"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:57
@@ -5439,7 +5718,7 @@ msgid "Replaceattributes"
 msgstr "Reemplazaratributos"
 
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:80
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Elements/view_galaxy_matrix.ctp:76;211
 #: View/Elements/genericElements/Form/submitButton.ctp:8;25
@@ -5467,7 +5746,7 @@ msgstr "Reemplazaratributos"
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:67
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/UserSettings/set_setting.ctp:36
-#: View/Users/admin_add.ctp:97
+#: View/Users/admin_add.ctp:98
 #: View/Users/admin_edit.ctp:91
 #: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
@@ -5479,7 +5758,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
 #: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/exportSearch.ctp:32
@@ -5488,6 +5767,7 @@ msgstr "Enviar"
 #: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
 #: View/Elements/view_galaxy_matrix.ctp:212
+#: View/Elements/genericElements/infoModal.ctp:40
 #: View/Elements/genericElements/Form/submitButton.ctp:13
 #: View/Elements/serverRuleElements/pull.ctp:73
 #: View/Elements/serverRuleElements/push.ctp:72
@@ -5578,7 +5858,7 @@ msgstr ""
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
 #: View/Users/statistics_data.ctp:19
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -5629,10 +5909,7 @@ msgstr "Resultados para todos los atributos"
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -5657,7 +5934,6 @@ msgstr "Resultados para todos los atributos"
 #: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:32;106
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -5680,10 +5956,7 @@ msgstr "anterior"
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -5708,7 +5981,6 @@ msgstr "anterior"
 #: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:34;108
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -5737,7 +6009,6 @@ msgstr ""
 #: View/Elements/global_menu.ctp:94
 #: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr "Galaxias"
@@ -5775,7 +6046,7 @@ msgstr ""
 #: View/Attributes/index.ctp:62
 #: View/Elements/eventattribute.ctp:166
 #: View/Events/view.ctp:262
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr "Actividad"
@@ -5785,7 +6056,7 @@ msgstr "Actividad"
 #: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/genericElements/IndexTable/headers.ctp:31
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -5794,10 +6065,7 @@ msgstr "Actividad"
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -5833,10 +6101,7 @@ msgstr "Acciones"
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -5861,7 +6126,6 @@ msgstr "Acciones"
 #: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:99
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -5952,13 +6216,12 @@ msgstr ""
 #: View/Elements/Events/eventIndexTable.ctp:234
 #: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:597
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -5975,106 +6238,6 @@ msgstr ""
 msgid "Delete"
 msgstr "Eliminar"
 
-#: 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/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: 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:92
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
-#: 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 "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
-#: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
-#: 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:92
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
-#: 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 "No"
-
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
@@ -6108,9 +6271,10 @@ msgstr ""
 #: View/Events/resolved_attributes.ctp:51
 #: View/Events/resolved_misp_format.ctp:98;293
 #: View/Events/view.ctp:159
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:171
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
+#: View/Feeds/index.ctp:184
 #: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
 #: View/Objects/revise_object.ctp:35;69
@@ -6126,23 +6290,27 @@ msgstr ""
 msgid "For Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
@@ -6232,12 +6400,16 @@ msgid "Unvetted"
 msgstr ""
 
 #: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
 #: View/EventBlacklists/index.ctp:35
 #: View/EventDelegations/index.ctp:41
 #: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
 #: View/Feeds/preview_index.ctp:25
 #: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
 #: View/ObjectTemplates/index.ctp:47
 #: View/Organisations/index.ctp:75
 #: View/Servers/preview_index.ctp:64
@@ -6245,31 +6417,41 @@ msgstr ""
 #: View/Sightingdb/index.ctp:10
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:81
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
 msgid "Filter"
 msgstr ""
 
 #: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
 #: View/Elements/eventattributetoolbar.ctp:231
 #: View/EventBlacklists/index.ctp:36
 #: View/EventDelegations/index.ctp:42
 #: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
 #: View/Feeds/preview_index.ctp:26
 #: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
 #: View/ObjectTemplates/index.ctp:48
 #: View/Organisations/index.ctp:76
 #: View/Servers/preview_index.ctp:65
 #: View/ShadowAttributes/index.ctp:38
 #: View/Sightingdb/index.ctp:11
-#: View/Users/admin_index.ctp:82
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
 msgid "Enter value to search"
 msgstr ""
 
 #: View/Communities/index.ctp:34
 #: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
 #: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
 #: View/Feeds/search_caches.ctp:35
 #: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
 #: View/ObjectTemplates/view.ctp:3
 #: View/Organisations/view.ctp:5
 #: View/Pages/doc/administration.ctp:180;221;236
@@ -6278,7 +6460,9 @@ msgstr ""
 #: View/Taxonomies/view.ctp:4
 #: View/Templates/view.ctp:4
 #: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
 #: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
 #: View/Users/view.ctp:3
 #: View/Warninglists/view.ctp:9
 msgid "Id"
@@ -6297,6 +6481,8 @@ msgid "Community name"
 msgstr ""
 
 #: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
 #: View/DecayingModel/index.ctp:89
 #: View/DecayingModel/view.ctp:21
 #: View/Elements/Servers/View/row_object.ctp:24
@@ -6310,8 +6496,10 @@ msgstr ""
 #: View/Elements/templateElements/templateRowAttribute.ctp:21
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
 #: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:22;113;210
 #: View/Objects/group_attributes_into_object.ctp:8
@@ -6333,10 +6521,18 @@ msgid "Description"
 msgstr "Descripción"
 
 #: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
 msgid "Communities index"
 msgstr ""
 
-#: View/Communities/index.ctp:64
+#: View/Communities/index.ctp:72
 msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
 msgstr ""
 
@@ -6405,9 +6601,11 @@ msgid "Message:"
 msgstr ""
 
 #: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
 #: View/Elements/Events/View/row_object.ctp:72
 #: View/Events/resolved_misp_format.ctp:93;288
-#: View/GalaxyClusters/view.ctp:19
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
 #: View/ObjectTemplates/index.ctp:66
 #: View/ObjectTemplates/view.ctp:6
 #: View/Objects/revise_object.ctp:68
@@ -6424,16 +6622,19 @@ msgid "UUID"
 msgstr ""
 
 #: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
 #: View/DecayingModel/index.ctp:88
 #: View/DecayingModel/view.ctp:14
 #: View/Elements/Servers/View/row_object.ctp:19
 #: View/Elements/templateElements/templateRowAttribute.ctp:12
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
 #: View/Feeds/search_caches.ctp:47
 #: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
 #: View/ObjectTemplates/view.ctp:4
 #: View/Objects/add.ctp:206
 #: View/Objects/revise_object.ctp:27
@@ -6445,7 +6646,7 @@ msgstr ""
 #: View/SharingGroups/view.ctp:42;67
 #: View/Sightingdb/index.ctp:51
 #: View/Templates/view.ctp:9
-#: View/Users/statistics_orgs.ctp:31
+#: View/Users/statistics_orgs.ctp:33
 #: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "Nombre"
@@ -6469,7 +6670,7 @@ msgstr ""
 #: View/Users/admin_edit.ctp:64
 #: View/Users/admin_view.ctp:72
 #: View/Users/edit.ctp:23
-#: View/Users/view.ctp:31
+#: View/Users/view.ctp:32
 msgid "GnuPG key"
 msgstr ""
 
@@ -6478,10 +6679,105 @@ msgid "Community "
 msgstr ""
 
 #: View/Communities/view.ctp:51
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:617
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
 msgid "Request Access"
 msgstr ""
 
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
 #: View/DecayingModel/add.ctp:4
 msgid " Decaying Model"
 msgstr ""
@@ -6596,8 +6892,8 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/EventBlacklists/edit.ctp:37
 #: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:200
-#: View/Feeds/index.ctp:282
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
 #: View/News/index.ctp:22
 #: View/OrgBlacklists/edit.ctp:30
 #: View/OrgBlacklists/index.ctp:36
@@ -6689,6 +6985,7 @@ msgstr ""
 #: View/Events/show_i_o_c_results.ctp:12
 #: View/Feeds/freetext_index.ctp:32
 #: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
 #: View/Objects/revise_object.ctp:64
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
@@ -6700,7 +6997,7 @@ msgstr ""
 #: 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:36
+#: View/Users/statistics_orgs.ctp:38
 #: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr ""
@@ -6714,6 +7011,7 @@ msgstr ""
 #: View/Events/resolved_misp_format.ctp:92;287
 #: View/Events/show_i_o_c_results.ctp:13
 #: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
 #: View/Noticelists/view.ctp:42
 #: View/Objects/add.ctp:115
 #: View/Objects/group_attributes_into_object.ctp:58
@@ -6734,12 +7032,14 @@ msgstr ""
 #: View/DecayingModel/decaying_tool_rest_search.ctp:31
 #: View/Events/resolved_attributes.ctp:52
 #: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
 #: View/ObjectReferences/ajax/add.ctp:30
 #: View/Objects/add.ctp:67;119
 #: View/Objects/group_attributes_into_object.ctp:30
 #: View/Objects/revise_object.ctp:49;67
 #: View/Pages/doc/using_the_system.ctp:234;284
 #: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
 msgid "Comment"
 msgstr ""
 
@@ -6758,7 +7058,7 @@ msgid "Decaying Model RestSearch"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_simulation.ctp:45
-#: View/Events/automation.ctp:14
+#: View/Events/automation.ctp:24
 #: View/Logs/admin_index.ctp:20;21
 #: View/Logs/admin_search.ctp:25
 msgid "Search"
@@ -6836,7 +7136,7 @@ msgstr ""
 #: View/Elements/genericElements/org_picker.ctp:17
 #: View/EventBlacklists/add.ctp:36
 #: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
+#: View/Feeds/add.ctp:220
 #: View/Feeds/import_feeds.ctp:20
 #: View/OrgBlacklists/add.ctp:29
 #: View/Regexp/admin_add.ctp:32
@@ -6913,7 +7213,7 @@ msgstr ""
 
 #: View/DecayingModel/index.ctp:97
 #: View/DecayingModel/view.ctp:25
-#: View/Galaxies/view.ctp:22
+#: View/Galaxies/view.ctp:10
 #: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
 #: View/Warninglists/view.ctp:12
@@ -6923,6 +7223,7 @@ msgstr ""
 #: View/DecayingModel/index.ctp:98
 #: View/DecayingModel/view.ctp:31
 #: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
 #: View/Feeds/view.ctp:63
 #: View/Noticelists/index.ctp:63
 #: View/ObjectTemplates/index.ctp:35
@@ -7036,7 +7337,6 @@ msgstr "ver todo"
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr "Seleccionar todo"
 
@@ -7103,6 +7403,8 @@ msgstr "Mostrar todos los atributos"
 
 #: View/Elements/eventattributetoolbar.ctp:6
 #: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
@@ -7140,7 +7442,7 @@ msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:41
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr "Advertencia"
@@ -7252,11 +7554,9 @@ msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: View/Logs/admin_index.ctp:62
 #: View/Servers/preview_index.ctp:57
 #: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:74
 msgid "Remove filters"
 msgstr ""
 
@@ -7445,14 +7745,14 @@ msgid "Event Actions"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:221;264
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: 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:226;270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
 #: View/Events/add.ctp:7
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
@@ -7460,80 +7760,80 @@ msgid "Add Event"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:23
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:289
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: 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:294
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: 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:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:310
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:47
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:320
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
 msgid "View delegation requests"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:861
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:61
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:866
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:895
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:923
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:74
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:928
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
@@ -7541,7 +7841,7 @@ msgid "Export"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:86
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -7551,7 +7851,7 @@ msgid "Automation"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:98
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1086
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr ""
 
@@ -7579,7 +7879,7 @@ msgid "Signature Whitelist"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:128
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:378
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr ""
 
@@ -7600,45 +7900,45 @@ msgid "News"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:151
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
 msgid "My Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:155
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:467;699
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
 msgid "Set Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:159
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:471
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:168
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:490
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:175
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1130
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:507
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:186
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr ""
 
@@ -7647,12 +7947,12 @@ msgid "Decaying Models Tool"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:199
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:977
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
 msgid "List Decaying Models"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:206
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:520
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
@@ -7664,12 +7964,12 @@ msgid "Categories & Types"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:214
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:218
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:528
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -7699,28 +7999,28 @@ msgid "Sync Actions"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:240
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:536
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:542
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:250
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:255
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:998
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:260
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr ""
 
@@ -7733,7 +8033,7 @@ msgid "Add SightingDB Connection"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:612
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
 msgid "List Communities"
 msgstr ""
 
@@ -7748,7 +8048,7 @@ msgid "Administration"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:687
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
@@ -7763,93 +8063,97 @@ msgid "Set User Setting"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:300
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:682
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:304
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:704
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:311
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:477;739
-msgid "List Organisations"
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
+msgid "List Organisations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:322
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:326
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:343
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:768
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:352
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:774
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:361
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:366
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:375
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:380
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:388
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:392
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:396
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:811
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:424
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -7872,7 +8176,8 @@ msgstr ""
 
 #: View/Elements/view_event_distribution_graph.ctp:9
 #: View/Elements/view_timeline.ctp:23
-#: View/Layouts/default.ctp:92
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -7907,7 +8212,6 @@ msgstr "Mostrar"
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:67
 msgid "Filters"
 msgstr "Filtros"
 
@@ -7934,6 +8238,7 @@ msgid "Time scope"
 msgstr ""
 
 #: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
 #: View/Taxonomies/view.ctp:83
 msgid "Tag"
 msgstr ""
@@ -7965,7 +8270,6 @@ msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr "Seleccionar todos los eventos de la página actual"
 
@@ -8022,7 +8326,9 @@ msgstr ""
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr ""
@@ -8033,8 +8339,6 @@ msgstr ""
 #: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
 #: View/Events/proposal_event_index.ctp:45;49
 #: View/Feeds/preview_index.ctp:73
-#: View/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
@@ -8060,7 +8364,7 @@ msgid "NEW"
 msgstr "NUEVO"
 
 #: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr "Publicar Evento"
 
@@ -8074,7 +8378,7 @@ msgid "Not published"
 msgstr "No publicado"
 
 #: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;364;431;598;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
 #: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr "¿Está seguro de que desea eliminar # %s?"
@@ -8281,11 +8585,11 @@ msgstr ""
 msgid "Switch to binary representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr ""
 
@@ -8388,11 +8692,11 @@ msgstr "Estado"
 #: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
 #: View/Events/view.ctp:191
-#: View/GalaxyClusters/view.ctp:32
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
 #: View/Users/admin_view.ctp:95
 msgid "N/A"
@@ -8426,8 +8730,10 @@ msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
@@ -8441,15 +8747,17 @@ msgstr "Último inicio de sesión"
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
 #: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr "Creado"
 
 #: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 msgid "Create new credentials and inform user"
 msgstr "Crear nuevas credenciales e informar al usuario"
 
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -8486,488 +8794,599 @@ msgstr "Eventos con propuestas: "
 msgid "Delegation requests: "
 msgstr "Solicitudes de delegación: "
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
-msgid "Populate From Template"
-msgstr "Poblar desde plantilla"
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
+msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
-msgid "Enrichment Module Result"
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+msgid "Populate From Template"
+msgstr "Poblar desde plantilla"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+msgid "Enrichment Module Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr "Ver Evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;887;1116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr "Ver gráfico de correlación"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr "Ver historia del eventos"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
 #: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr "Editar Evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr "Eliminar Evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr "Añadir objeto"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr "Añadir adjunto"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr "Poblar desde..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr "Enriquecer Evento"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr "Combinar atributos desde..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr "Proponer atributo"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr "Proponer adjunto"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr "Publicar (sin email)"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr "Retirar publicación"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
 msgid "Publish Sightings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr "Delegar publicación"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr "Aceptar solicitud de delegación"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr "Descartar la solicitud de delegación"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr "Publicar evento a ZMQ"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr "¿Está seguro de que desea volver a publicar el evento actual al canal ZMQ?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:200
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:208
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr "Contactar con el Informador"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:216;303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
 msgstr "Descargar como..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239;244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr "Añadir colección de etiquetas"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:251
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr "Exportar colecciones de etiquetas"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr "Importar colecciones de etiquetas"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr "Importar desde…"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:351
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:352
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:359
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:385
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:393
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:403
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:404
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:414
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:419
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:430
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:440
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:451;649
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:484;733
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:496
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:551;581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:559
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570;1056
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:571;1057
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:589
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
 #: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:622
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
 msgid "View community"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:630
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
 msgid "Request E-mail"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:642
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:654
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:668
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:694
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
 msgid "User settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:712
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:726
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:745
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:781
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:793
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:820;834
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:825
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:839
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:849
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:857
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:873
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:881;900
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr "Ver taxonomía"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:908
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr "Eliminar taxonomía"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:915
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr "Actualizar taxonomías"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:935
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr "Ver plantilla"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:941
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr "Editar plantilla"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:952
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
 msgid "Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
 msgid "Force Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:962
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
 msgid "Import Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:967
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
 msgid "Add Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:971
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
 msgid "Decaying Tool"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
 msgid "View Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:989
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
 msgid "Edit Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1007
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr "Añadir Fuente"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr "Importar Fuentes desde JSON"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1018
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr "Matriz de análisis de superposición de fuentes"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1023
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr "Exportar ajustes de Fuente"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr "Editar Fuente"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1036
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1042
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1048
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1066
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr "Ver noticias"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1071
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1077
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1092
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1093
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1098
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1099
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1106;1122
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1135
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1141
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1149
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
 #: View/Sightingdb/add.ctp:6
 msgid "Add SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1157
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
 msgid "Edit SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1162
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
 msgid "List SightingDB connections"
 msgstr ""
 
@@ -8997,7 +9416,7 @@ msgid "Fix Database Index Schema"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
 msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
 msgstr ""
 
@@ -9005,7 +9424,7 @@ msgstr ""
 msgid "The current database schema does not match the expected format."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;131
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
 msgid "Database schema diagnostic: "
 msgstr ""
 
@@ -9033,52 +9452,52 @@ msgstr ""
 msgid "Actual schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:118
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
 msgid "Fix Database schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:130
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
 msgid "The current database is correct"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:141
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
 msgid "Expected DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:145
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
 msgid "The current database version matches the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:146;151
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
 msgid "Actual DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:150
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
 msgid "The current database version does not match the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
 msgid "Updates are locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158;162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
 msgid "Updates are not locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 #: View/Servers/update_progress.ctp:32
 msgid "Updates are locked due to to many update fails"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 msgid "Updates unlocked in %s"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:167;168
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
 msgid "DataSource: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:203
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
 msgid "Column diagnostic"
 msgstr ""
 
@@ -9740,7 +10159,7 @@ msgstr ""
 #: View/TagCollections/index.ctp:14
 #: View/UserSettings/index.ctp:56
 #: View/Users/admin_view.ctp:109
-#: View/Users/view.ctp:58
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr ""
 
@@ -9785,7 +10204,7 @@ msgid "Start a worker"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
+msgid "Restart dead workers"
 msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
@@ -9942,10 +10361,6 @@ msgstr ""
 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
@@ -10131,7 +10546,7 @@ msgid "Recipient"
 msgstr ""
 
 #: View/EventDelegations/index.ctp:82
-#: View/Events/automation.ctp:269;276
+#: View/Events/automation.ctp:279;286
 #: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
@@ -10355,477 +10770,475 @@ msgstr ""
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 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."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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/automation.ctp:27
 #: 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
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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
+#: View/Events/automation.ctp:32
 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
+#: View/Events/automation.ctp:33
 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/automation.ctp:34
 #: 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/automation.ctp:35
 #: 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/automation.ctp:36
 #: 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/automation.ctp:37
 #: 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/automation.ctp:38
 #: 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/automation.ctp:39
 #: 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;150
+#: View/Events/automation.ctp:40;160
 #: 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;151
+#: View/Events/automation.ctp:41;161
 #: 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/automation.ctp:42
 #: 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/automation.ctp:43
 #: 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/automation.ctp:44
 #: 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/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:46
 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/automation.ctp:47
 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/automation.ctp:48
 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/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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/automation.ctp:52
 #: 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/automation.ctp:53
 #: 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
+#: View/Events/automation.ctp:54
 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
+#: View/Events/automation.ctp:55
 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
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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:81
+#: View/Events/automation.ctp:91
 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:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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:97
+#: View/Events/automation.ctp:107
 #: 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:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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:118
+#: View/Events/automation.ctp:128
 #: 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:136
+#: View/Events/automation.ctp:146
 #: 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:138
+#: View/Events/automation.ctp:148
 #: 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:145
+#: View/Events/automation.ctp:155
 #: 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:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:152
+#: View/Events/automation.ctp:162
 #: 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:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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:156
+#: View/Events/automation.ctp:166
 #: 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:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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:172
+#: View/Events/automation.ctp:182
 #: 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:173
+#: View/Events/automation.ctp:183
 #: 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:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:187
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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:191
+#: View/Events/automation.ctp:201
 #: 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:192
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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:205
+#: View/Events/automation.ctp:215
 #: 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:206
+#: View/Events/automation.ctp:216
 #: 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:207
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:208
+#: View/Events/automation.ctp:218
 #: 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:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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:214
+#: View/Events/automation.ctp:224
 #: 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:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: 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:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:74
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -10833,200 +11246,200 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
 #: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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:291
+#: View/Events/automation.ctp:301
 #: 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:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:309
+#: View/Events/automation.ctp:319
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:310
+#: View/Events/automation.ctp:320
 #: 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:311
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:324
 #: 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:315
+#: View/Events/automation.ctp:325
 #: 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:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 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:322
+#: View/Events/automation.ctp:332
 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:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -11222,7 +11635,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -11274,18 +11687,18 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 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:54
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr ""
 
@@ -11319,6 +11732,11 @@ msgstr ""
 msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
+#: View/Events/legacy_automation.ctp:7
+msgid "Your current key is: <code>%s</code>.\n"
+"    You can %s this key."
+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 ""
@@ -11771,7 +12189,6 @@ msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -11912,6 +12329,7 @@ msgid "View request details"
 msgstr ""
 
 #: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
 #: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr ""
@@ -12073,7 +12491,7 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: View/Feeds/index.ctp:105
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -12107,78 +12525,81 @@ msgstr ""
 msgid "Add MISP Feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:5
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
+msgstr ""
+
+#: View/Feeds/add.ctp:12
 msgid "Add a new MISP feed source."
 msgstr ""
 
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
+#: View/Feeds/add.ctp:14
 #: View/Feeds/view.ctp:64
 msgid "Caching enabled"
 msgstr ""
 
-#: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr ""
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:21
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr ""
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
 #: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:26
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr ""
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:66
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr ""
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:75
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:79
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr ""
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:38
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr ""
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:42
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr ""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:46
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr ""
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:50
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr ""
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:54
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -12187,127 +12608,126 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:58
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr ""
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:88
-msgid "Target Event"
-msgstr ""
-
 #: View/Feeds/add.ctp:94
 #: View/Feeds/edit.ctp:98
-msgid "Target Event ID"
-msgstr ""
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:100
-msgid "Leave blank unless you want to reuse an existing event."
+msgid "Creator organisation"
 msgstr ""
 
 #: View/Feeds/add.ctp:104
 #: View/Feeds/edit.ctp:108
-msgid "Value field(s) in the CSV"
+msgid "Target Event"
 msgstr ""
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:109
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr ""
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:111
-msgid "2,3,4 (column position separated by commas)"
-msgstr ""
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:119
-msgid "Delimiter"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
 msgstr ""
 
 #: View/Feeds/add.ctp:116
 #: View/Feeds/edit.ctp:120
-msgid "Set the default CSV delimiter (default = \",\")"
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr ""
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr ""
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
 msgstr ""
 
 #: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:130
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr ""
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr ""
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
+msgid "Set the default CSV delimiter (default = \",\")"
+msgstr ""
+
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr ""
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:131
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr ""
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:141
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr ""
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 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:148
-#: View/Feeds/edit.ctp:150
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr ""
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:151
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:160
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr ""
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:161
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr ""
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr ""
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:193
-msgid "Filter rules"
-msgstr ""
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:194
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:195
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:196
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:197
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:198
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
 #: View/Servers/add.ctp:116
 #: View/Servers/edit.ctp:155;162
 msgid "Modify"
@@ -12325,64 +12745,64 @@ msgstr ""
 msgid "Edit MISP Feed"
 msgstr ""
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr ""
 
-#: View/Feeds/edit.ctp:133
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr ""
 
-#: View/Feeds/edit.ctp:213
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr ""
 
-#: View/Feeds/edit.ctp:214
+#: View/Feeds/edit.ctp:234
 #: View/Servers/add.ctp:146
 #: View/Servers/edit.ctp:190
 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:215
+#: View/Feeds/edit.ctp:235
 #: View/Servers/add.ctp:147
 #: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
-#: View/Feeds/edit.ctp:216
+#: View/Feeds/edit.ctp:236
 #: View/Servers/add.ctp:148
 #: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:217
+#: View/Feeds/edit.ctp:237
 #: View/Servers/add.ctp:149
 #: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
-#: View/Feeds/edit.ctp:218
+#: View/Feeds/edit.ctp:238
 #: View/Servers/add.ctp:150
 #: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:219
+#: View/Feeds/edit.ctp:239
 #: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:220
+#: View/Feeds/edit.ctp:240
 #: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:221
+#: View/Feeds/edit.ctp:241
 #: View/Servers/edit.ctp:196
 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:222
+#: View/Feeds/edit.ctp:242
 #: View/Servers/add.ctp:154
 #: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
@@ -12412,137 +12832,128 @@ msgstr ""
 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:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr ""
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr ""
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr ""
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr ""
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: 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/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr ""
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:55
-#: View/Servers/index.ctp:120;121
-msgid "Rules"
+msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
+#: View/Feeds/index.ctp:196
+msgid "Visible"
 msgstr ""
 
 #: View/Feeds/index.ctp:211
-msgid "New fixed event"
+msgid "Feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:141
-msgid "Age: "
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
 msgstr ""
 
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:149
-msgid "Not cached"
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr ""
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:283
-msgid "Are you sure you want to permanently remove the feed (%s)?"
+#: View/Feeds/index.ctp:294
+msgid "Are you sure you want to permanently remove the feed?"
 msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -12595,26 +13006,39 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr ""
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
 #: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr ""
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr ""
 
-#: View/Galaxies/view.ctp:29
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr ""
 
@@ -12622,33 +13046,30 @@ msgstr ""
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:23
-#: 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/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -12657,22 +13078,16 @@ msgstr ""
 msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
 msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
@@ -12683,6 +13098,27 @@ msgstr ""
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Inbox/index.ctp:31
+#: 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/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr ""
@@ -12703,12 +13139,6 @@ msgstr ""
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr ""
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr ""
@@ -12746,6 +13176,11 @@ msgstr ""
 msgid "Job type"
 msgstr ""
 
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
+msgstr ""
+
 #: View/Jobs/index.ctp:106
 #: View/Pages/doc/administration.ctp:229
 msgid "Retries"
@@ -12827,6 +13262,7 @@ msgstr ""
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
 #: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -12834,13 +13270,6 @@ msgstr ""
 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"
@@ -12891,10 +13320,6 @@ msgstr ""
 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"
@@ -13462,7 +13887,7 @@ msgstr ""
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr ""
 
@@ -13496,12 +13921,12 @@ msgid "Last modified"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:37
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:35
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr ""
 
@@ -14043,7 +14468,7 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:76
+#: View/Users/admin_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -14054,7 +14479,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -14067,7 +14492,7 @@ 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr ""
 
@@ -14120,6 +14545,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -15434,10 +15860,6 @@ msgstr ""
 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 ""
@@ -17219,10 +17641,6 @@ msgstr ""
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:164
-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 ""
@@ -17603,10 +18021,6 @@ msgstr ""
 msgid "Distribution List"
 msgstr ""
 
-#: View/SharingGroups/view.ctp:12
-msgid "Selectable"
-msgstr ""
-
 #: View/SharingGroups/view.ctp:28
 msgid "Synced by"
 msgstr ""
@@ -17615,10 +18029,6 @@ msgstr ""
 msgid "Quick Search"
 msgstr ""
 
-#: View/Sightingdb/index.ctp:55
-msgid "Owner"
-msgstr ""
-
 #: View/Sightingdb/index.ctp:61
 msgid "Host"
 msgstr ""
@@ -17779,6 +18189,11 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+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 ""
@@ -18119,6 +18534,45 @@ msgstr ""
 msgid "Are you sure you wish to delete this entry?"
 msgstr ""
 
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr ""
@@ -18176,12 +18630,12 @@ msgstr ""
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr ""
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr ""
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
@@ -18191,7 +18645,7 @@ msgstr ""
 
 #: View/Users/admin_edit.ctp:69
 #: View/Users/admin_view.ctp:69
-#: View/Users/view.ctp:29
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr ""
 
@@ -18294,30 +18748,68 @@ msgstr ""
 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_index.ctp:7
+#: View/Users/admin_index.ctp:3
 msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
 msgstr ""
 
-#: View/Users/admin_index.ctp:10
+#: View/Users/admin_index.ctp:6
 msgid "here"
 msgstr ""
 
-#: View/Users/admin_index.ctp:13;14
+#: View/Users/admin_index.ctp:9;10
 msgid "Reset all sync user API keys"
 msgstr ""
 
-#: View/Users/admin_index.ctp:17
+#: View/Users/admin_index.ctp:13
 msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
 msgstr ""
 
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -18330,11 +18822,6 @@ msgstr ""
 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"
@@ -18353,7 +18840,7 @@ msgid "Org_admin"
 msgstr ""
 
 #: View/Users/admin_view.ctp:68
-#: View/Users/view.ctp:28
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr ""
 
@@ -18362,22 +18849,22 @@ msgid "Password change"
 msgstr ""
 
 #: View/Users/admin_view.ctp:78
-#: View/Users/view.ctp:37
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr ""
 
 #: View/Users/admin_view.ctp:83
-#: View/Users/view.ctp:42
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr ""
 
 #: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:49
+#: View/Users/view.ctp:50
 msgid "S/MIME Public certificate"
 msgstr ""
 
 #: View/Users/admin_view.ctp:119
-#: View/Users/view.ctp:64
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr ""
 
@@ -18393,10 +18880,102 @@ msgstr ""
 msgid "SMIME Public certificate (PEM format)"
 msgstr ""
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr ""
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr ""
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+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"
@@ -18412,6 +18991,13 @@ msgstr ""
 msgid "Proposals active"
 msgstr ""
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr ""
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -18467,15 +19053,15 @@ msgstr ""
 msgid "A heatmap showing the usage of %s."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:38
+#: View/Users/statistics_orgs.ctp:40
 msgid "Activity (1 year)"
 msgstr ""
 
@@ -18531,6 +19117,14 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -18689,6 +19283,7 @@ msgid "boolean"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/Dashboard.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
diff --git a/app/Locale/swe/LC_MESSAGES/default.po b/app/Locale/swe/LC_MESSAGES/default.po
index b0af88cf6..8449cacbe 100644
--- a/app/Locale/swe/LC_MESSAGES/default.po
+++ b/app/Locale/swe/LC_MESSAGES/default.po
@@ -1,90 +1,125 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-09-30 01:23\n"
-"Last-Translator: Steve Clement (SteveClement)\n"
+"PO-Revision-Date: 2021-03-26 04:20\n"
+"Last-Translator: NAME <EMAIL@ADDRESS>\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-Project-ID: 306440\n"
 "X-Crowdin-Language: sv-SE\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: sv_SE\n"
 
-#: Console/Command/AdminShell.php:59
+#: Console/Command/AdminShell.php:72
 msgid "Database updated: "
-msgstr ""
+msgstr "Databasen uppdaterad: "
 
-#: Console/Command/AdminShell.php:61
+#: Console/Command/AdminShell.php:74
 msgid "Could not update the database: "
 msgstr ""
 
-#: Console/Command/AdminShell.php:73
+#: Console/Command/AdminShell.php:87
 msgid "Worker restarted."
-msgstr ""
+msgstr "Arbetsprocessen startades om."
 
-#: Console/Command/AdminShell.php:75
+#: Console/Command/AdminShell.php:89
 msgid "Could not restart the worker. Reason: %s"
-msgstr ""
+msgstr "Kunde inte starta om arbetsprocessen. Anledning: %s"
 
-#: Console/Command/AdminShell.php:96
+#: Console/Command/AdminShell.php:111
 msgid "Worker killed."
-msgstr ""
-
-#: Console/Command/AdminShell.php:112
-msgid "Worker started."
-msgstr ""
-
-#: Console/Command/AdminShell.php:123
-msgid "%s updated."
-msgstr ""
+msgstr "Arbetsprocessen terminerad."
 
 #: Console/Command/AdminShell.php:128
+msgid "Worker started."
+msgstr "Arbetsprocess startad."
+
+#: Console/Command/AdminShell.php:141
+msgid "%s updated."
+msgstr "%s uppdaterad."
+
+#: Console/Command/AdminShell.php:146
 msgid "Could not update %s."
-msgstr ""
+msgstr "Kunde inte uppdatera %s."
 
-#: Console/Command/AdminShell.php:455
+#: Console/Command/AdminShell.php:466
 msgid "Update the JSON definitions of MISP."
-msgstr ""
+msgstr "Uppdatera JSON definitionerna av MISP."
 
-#: Console/Command/AdminShell.php:458
+#: Console/Command/AdminShell.php:469
 msgid "Update the submodules before ingestion."
-msgstr ""
-
-#: Console/Command/AdminShell.php:487
-msgid "Last DB num which was successfully executed: "
-msgstr ""
-
-#: Console/Command/AdminShell.php:496
-msgid "Something went wrong. Could not find the existing db version"
-msgstr ""
+msgstr "Uppdatera submodulerna före intag."
 
 #: Console/Command/AdminShell.php:499
+msgid "Last DB num which was successfully executed: "
+msgstr "Senaste DB num som framgångsrikt exekverats: "
+
+#: Console/Command/AdminShell.php:508
+msgid "Something went wrong. Could not find the existing db version"
+msgstr "Något gick fel. Kunde inte hitta den befintliga db-versionen"
+
+#: Console/Command/AdminShell.php:511
 msgid "DB was never successfully updated or we are on a fresh install"
+msgstr "DB har aldrig uppdaterats eller så är vi på en ny installation"
+
+#: Console/Command/AdminShell.php:528
+msgid "MISP mass sync authkey reset command line tool.\n\n"
+"Usage: %sConsole/cake resetSyncAuthkeys [user_id]"
+msgstr "MISP mass synk authkey reset kommandoradsverktyg.\n\n"
+"Användning: %sConsole/cake resetSyncAuthkeys [user_id]"
+
+#: Console/Command/AdminShell.php:536
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
+msgid "Invalid user."
+msgstr "Ogiltig användare."
+
+#: Console/Command/AdminShell.php:539
+msgid "User has to be a site admin."
+msgstr "Användaren måste vara webbplatsadministratör."
+
+#: Console/Command/AdminShell.php:563
+msgid "\n"
+"Error: %s\n"
+msgstr "\n"
+"Error: %s\n"
+
+#: Console/Command/AdminShell.php:565
+msgid "%s events purged.\n"
 msgstr ""
 
-#: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:125;129;133
+#: Console/Command/AdminShell.php:587
+msgid "> Database schema dumped on disk"
+msgstr ""
+
+#: Console/Command/AdminShell.php:589
+msgid "Something went wrong. Could not find the existing db version or fetch the current database schema."
+msgstr ""
+
+#: Console/Command/EventShell.php:15
+#: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1085;1510;1514;1518;1593;2102;2178;2182;2186;2404;2453;2524;2613;3137;5506;5727;5731;5740
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
-#: Model/Galaxy.php:292
+#: Model/Galaxy.php:293
 msgid "Invalid event"
 msgstr "Ogiltigt event"
 
-#: Console/Command/PasswordShell.php:43
+#: Console/Command/PasswordShell.php:46
 msgid "override password change"
 msgstr ""
 
-#: Console/Command/ServerShell.php:49
-#: Controller/ServersController.php:636
-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:83
+#: Controller/ServersController.php:674
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled, %s sightings pulled."
+msgstr ""
 
-#: Console/Command/ServerShell.php:51
+#: Console/Command/ServerShell.php:85
 msgid "ERROR: %s"
 msgstr "FEL: %s"
 
@@ -96,704 +131,972 @@ msgstr ""
 msgid "interactive mode"
 msgstr ""
 
-#: Controller/AppController.php:385
+#: Controller/AppController.php:382
+msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
+msgstr ""
+
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
+msgid "Update Progress"
+msgstr ""
+
+#: Controller/AppController.php:389
 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:629
-#: Controller/AttributesController.php:1999;2108;2158;2241;2327
-#: Controller/EventsController.php:2846;2962;3024;3390;4006;4069
+#: Controller/AppController.php:519
+msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
+msgstr ""
+
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 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:638
-#: Controller/AttributesController.php:2162;2245;2331
-#: Controller/EventsController.php:2850;2967;3029;3394;4010;4073
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 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:655
+#: Controller/AppController.php:764
+#: Controller/Component/IndexFilterComponent.php:23
 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:780
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr "All klart. attribute_count generarad från början för "
 
-#: Controller/AppController.php:903
-#: Controller/AttributesController.php:2385
-#: Controller/ShadowAttributesController.php:1278
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
+#: Controller/ShadowAttributesController.php:1267
 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;1389
+#: Controller/AppController.php:1211
+msgid "RestSearch is not implemented (yet) for this scope."
+msgstr ""
+
+#: Controller/AttributesController.php:109;1339
 #: 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:112
+msgid "You do not have permissions to create attributes"
+msgstr ""
 
-#: Controller/AttributesController.php:139;492;672
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1985;2006;2040
-#: Controller/ObjectsController.php:622
+#: Controller/EventsController.php:2107;2128;2162
+#: Controller/ObjectsController.php:837
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "Du har inte rättigheter att göra det där."
 
-#: Controller/AttributesController.php:415;870;875;879;1087;1167;1209;2401;2415;2448;2470;2479;3106;3210;3214
-#: Controller/ShadowAttributesController.php:824;1069;1093;1126;1136
-#: Controller/TagsController.php:492
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
+#: Controller/ObjectsController.php:641
+#: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
+#: Controller/TagsController.php:506
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "Ogiltigt attribut"
 
-#: Controller/AttributesController.php:425
-#: Controller/ShadowAttributesController.php:501
+#: Controller/AttributesController.php:355
+#: Controller/ShadowAttributesController.php:483
 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:472
+#: Controller/AttributesController.php:402
 msgid "Attribute not an attachment or malware-sample"
 msgstr "Attributet är inte ett attachment eller malware sampel"
 
-#: Controller/AttributesController.php:489;656;947;1398
-#: Controller/EventsController.php:4706;4720;5455;5469
+#: Controller/AttributesController.php:419;586;892;1348
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "Ogiltigt Event."
 
-#: Controller/AttributesController.php:507;683
-#: Controller/ShadowAttributesController.php:548
+#: Controller/AttributesController.php:437;613
+#: Controller/DecayingModelController.php:56
+#: Controller/ShadowAttributesController.php:530
 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:686
-#: Controller/ShadowAttributesController.php:551;561
+#: Controller/AttributesController.php:616
+#: Controller/ShadowAttributesController.php:533;543
 msgid "There was a problem to upload the file."
 msgstr "Det uppstod ett problem när filen laddades upp."
 
-#: Controller/AttributesController.php:830
+#: Controller/AttributesController.php:760
 msgid "The ThreatConnect data has been imported."
 msgstr "ThreatConnect datat har blivit importerat."
 
-#: Controller/AttributesController.php:833
+#: Controller/AttributesController.php:763
 msgid "%s entries imported."
 msgstr "%s uppslag importerade."
 
-#: Controller/AttributesController.php:837
+#: Controller/AttributesController.php:767
 msgid "%s entries could not be imported."
 msgstr "%s uppslag kunde inte importeras."
 
-#: Controller/AttributesController.php:887;935;937
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "Ogiltigt attribut."
-
-#: Controller/AttributesController.php:931
+#: Controller/AttributesController.php:876
 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:964
+#: Controller/AttributesController.php:880;882
+#: Controller/ShadowAttributesController.php:817
+msgid "Invalid attribute."
+msgstr "Ogiltigt attribut."
+
+#: Controller/AttributesController.php:909
 msgid "The attribute has been saved"
 msgstr "Attributet har blivit sparat"
 
-#: Controller/AttributesController.php:999
+#: Controller/AttributesController.php:944
 msgid "The attribute could not be saved. Please, try again."
 msgstr "Attributet kunde inte sparas. Vänligen försök igen."
 
-#: Controller/AttributesController.php:1091
+#: Controller/AttributesController.php:1036
+#: Controller/ObjectsController.php:515
 msgid "Invalid event id."
 msgstr "Ogiltigt event id."
 
-#: Controller/AttributesController.php:1121
-#: Controller/EventsController.php:2326
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1072
+#: Controller/EventsController.php:2466
+#: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "Ogiltig input."
 
-#: Controller/AttributesController.php:1126
+#: Controller/AttributesController.php:1077
 msgid "Invalid field."
 msgstr "Ogiltigt fält."
 
-#: Controller/AttributesController.php:1171;1213
+#: Controller/AttributesController.php:1125;1161
 msgid "Invalid attribute id."
 msgstr "Ogiltigt attribut id."
 
-#: Controller/AttributesController.php:1299;1309
-msgid "Attribute deleted"
-msgstr "Attributet raderat"
-
-#: Controller/AttributesController.php:1304;1306
-msgid "Attribute was not deleted"
-msgstr "Attributet har inte raderats"
-
-#: Controller/AttributesController.php:1331;2872
-#: Controller/ShadowAttributesController.php:865
-msgid "Invalid Attribute"
-msgstr "Ogiltigt Attribut"
-
-#: Controller/AttributesController.php:1358
-msgid "Could not restore the attribute"
-msgstr "Kunde inte återläsa attributet"
-
-#: Controller/AttributesController.php:1369
+#: Controller/AttributesController.php:1242;1319
 msgid "This function is only accessible via POST requests."
 msgstr "Funktionen finns endast tillgänglig via POST förfrågingar."
 
-#: Controller/AttributesController.php:1424
+#: Controller/AttributesController.php:1249;1259
+msgid "Attribute deleted"
+msgstr "Attributet raderat"
+
+#: Controller/AttributesController.php:1254;1256
+msgid "Attribute was not deleted"
+msgstr "Attributet har inte raderats"
+
+#: Controller/AttributesController.php:1281;2675
+#: Controller/ShadowAttributesController.php:853
+msgid "Invalid Attribute"
+msgstr "Ogiltigt Attribut"
+
+#: Controller/AttributesController.php:1308
+msgid "Could not restore the attribute"
+msgstr "Kunde inte återläsa attributet"
+
+#: Controller/AttributesController.php:1374
 msgid "No matching attributes found."
 msgstr "Inget matchande attribut hittades."
 
-#: Controller/AttributesController.php:1458
+#: Controller/AttributesController.php:1408
 msgid "This method can only be accessed via AJAX."
 msgstr "Den här metoden kan endast accessas via AJAX."
 
-#: Controller/AttributesController.php:1468
+#: Controller/AttributesController.php:1418
 msgid "You are not authorized to edit this event."
 msgstr "Du är inte auktoriserad att editera den här eventen."
 
-#: Controller/AttributesController.php:1566
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "Inget event ID angett."
 
-#: Controller/AttributesController.php:1611
-#: Controller/GalaxiesController.php:235
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "Synonymer: "
 
-#: Controller/AttributesController.php:1994;2101
+#: Controller/AttributesController.php:1912;2019
 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:2007
+#: Controller/AttributesController.php:1925
 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:2027
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "Du har inte access till det eventet."
 
-#: Controller/AttributesController.php:2090
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "Inga träffar."
 
-#: Controller/AttributesController.php:2112;2121
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Ogiltigt attribut eller ingen auktorisation att se det."
 
-#: Controller/AttributesController.php:2189
-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:2253
-msgid "Invalid event ID format."
-msgstr "Ogiltigt event ID format."
-
-#: Controller/AttributesController.php:2362
-#: Controller/ShadowAttributesController.php:1256
+#: Controller/AttributesController.php:2165
+#: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "Allt klart."
 
-#: Controller/AttributesController.php:2394;2441
-#: Controller/ShadowAttributesController.php:1064
+#: Controller/AttributesController.php:2197;2244
+#: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "Ogiltigt fält efterfrågat."
 
-#: Controller/AttributesController.php:2397;2444
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "Funktionen kan endast nås via AJAX."
 
-#: Controller/AttributesController.php:2509;2517
-#: Controller/EventsController.php:3833;3982;5261
+#: Controller/AttributesController.php:2282
+msgid "You do not have permission to do that"
+msgstr ""
+
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 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:2538
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "Den här mekanismen kan endast nås via AJAX."
 
-#: Controller/AttributesController.php:2547;2798;2812;2823
-#: Controller/OrganisationsController.php:418
-#: Controller/ServersController.php:623;691
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
+#: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "Du saknar rättigheter att göra det där."
 
-#: Controller/AttributesController.php:2652
-#: Controller/EventsController.php:4499
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "Den här funktionen kräver API nyckel access."
 
-#: Controller/AttributesController.php:2660
+#: Controller/AttributesController.php:2463
 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:2672
+#: Controller/AttributesController.php:2475
 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:2833
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "Ogiltigt skript."
 
-#: Controller/AttributesController.php:2900
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr "Inget giltiga enrichment optioner hittade för det här attributet."
 
-#: Controller/AttributesController.php:2998
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "Ogiltigt typ efterfrågad."
 
-#: Controller/AttributesController.php:3277
-#: Controller/EventsController.php:5451
+#: Controller/AttributesController.php:2864;3071
+#: Controller/TagCollectionsController.php:254
+msgid "Invalid tag"
+msgstr ""
+
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 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:3281;3296
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3165;3180
+#: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "Ogiltigt Attribut."
 
-#: Controller/AttributesController.php:3284;3299
-#: Controller/EventsController.php:5458;5472
-#: Controller/PostsController.php:60;84
-#: Controller/TaxonomiesController.php:100;131;163;245;275;305;335;365;374;383
-msgid "You don't have permission to do that."
-msgstr "Du saknar rättigheter att göra det där."
+#: Controller/CommunitiesController.php:150
+msgid "Request sent."
+msgstr ""
+
+#: Controller/CommunitiesController.php:150
+msgid "Something went wrong and the request could not be sent."
+msgstr ""
+
+#: Controller/CommunitiesController.php:166
+msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
+msgstr ""
+
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
+#: Controller/DecayingModelController.php:20
+msgid "Default decaying models updated"
+msgstr ""
+
+#: Controller/DecayingModelController.php:28
+msgid "This method is not allowed"
+msgstr ""
+
+#: Controller/DecayingModelController.php:36;105;207;243;264;276;354;387;399;409;430;442;452;544
+#: Controller/DecayingModelMappingController.php:25
+#: Model/DecayingModel.php:483;619
+#: Model/DecayingModelMapping.php:30;59
+msgid "No Decaying Model with the provided ID exists"
+msgstr ""
+
+#: Controller/DecayingModelController.php:47
+msgid "Only one import field can be used"
+msgstr ""
+
+#: Controller/DecayingModelController.php:65
+msgid "Error while decoding JSON"
+msgstr ""
+
+#: Controller/DecayingModelController.php:90
+msgid "The model has been imported."
+msgstr ""
+
+#: Controller/DecayingModelController.php:92
+msgid "The model has been imported. However importing mapping failed."
+msgstr ""
+
+#: Controller/DecayingModelController.php:95
+msgid "Error while importing model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:186
+msgid "The model must have a name"
+msgstr ""
+
+#: Controller/DecayingModelController.php:198;269
+msgid "The model has been saved."
+msgstr ""
+
+#: Controller/DecayingModelController.php:201
+msgid "The model has been saved. However importing mapping failed."
+msgstr ""
+
+#: Controller/DecayingModelController.php:220;224;281
+msgid "The model could not be saved. Please try again."
+msgstr ""
+
+#: Controller/DecayingModelController.php:308
+msgid "Invalid JSON `Settings`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:314
+msgid "Invalid parameter `lifetime`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:318
+msgid "Invalid parameter `decay_speed`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:322
+msgid "Invalid parameter `threshold`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:326
+msgid "Invalid parameter `default_base_score`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:333
+msgid "Invalid parameter `base_score_config`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:342
+msgid "Missing JSON key `parameters`."
+msgstr ""
+
+#: Controller/DecayingModelController.php:360
+msgid "You are not authorised to delete this model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:368
+msgid "Decaying Model deleted."
+msgstr ""
+
+#: Controller/DecayingModelController.php:371
+msgid "The Decaying Model could not be deleted."
+msgstr ""
+
+#: Controller/DecayingModelController.php:391
+msgid "You are not authorised to enable this model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:404
+msgid "Decaying Model enabled."
+msgstr ""
+
+#: Controller/DecayingModelController.php:414;417;457
+msgid "Error while enabling decaying model"
+msgstr ""
+
+#: Controller/DecayingModelController.php:434
+msgid "You are not authorised to disable this model."
+msgstr ""
+
+#: Controller/DecayingModelController.php:447
+msgid "Decaying Model disabled."
+msgstr ""
+
+#: Controller/DecayingModelController.php:460
+msgid "Error while disabling decaying model"
+msgstr ""
+
+#: Controller/DecayingModelController.php:478
+#: View/DecayingModel/add.ctp:37
+msgid "Lifetime"
+msgstr ""
+
+#: Controller/DecayingModelController.php:479
+#: View/DecayingModel/add.ctp:37
+msgid "Lifetime of the attribute, or time after which the score will be 0"
+msgstr ""
+
+#: Controller/DecayingModelController.php:486
+#: View/DecayingModel/add.ctp:46
+msgid "Decay speed"
+msgstr ""
+
+#: Controller/DecayingModelController.php:487
+#: View/DecayingModel/add.ctp:46
+msgid "Decay speed at which an indicator will loose score"
+msgstr ""
+
+#: Controller/DecayingModelController.php:494
+#: View/DecayingModel/add.ctp:56
+msgid "Cutoff threshold"
+msgstr ""
+
+#: Controller/DecayingModelController.php:495
+#: View/DecayingModel/add.ctp:56
+msgid "Cutoff value at which an indicator will be marked as decayed instead of 0"
+msgstr ""
+
+#: Controller/DecayingModelController.php:563
+msgid "Error Processing Request, can't parse the body"
+msgstr ""
+
+#: Controller/DecayingModelController.php:712
+msgid "This method is only accessible via AJAX."
+msgstr ""
 
 #: 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/EventBlacklistsController.php:73;95
+#: Controller/EventBlacklistsController.php:76;98
 msgid "Invalid event IDs."
 msgstr ""
 
-#: Controller/EventBlacklistsController.php:84
+#: Controller/EventBlacklistsController.php:87
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr ""
 
-#: Controller/EventsController.php:855
+#: Controller/EventsController.php:894
 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:857
+#: Controller/EventsController.php:896
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:863
+#: Controller/EventsController.php:902
 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:865
+#: Controller/EventsController.php:904
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:1617
-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."
+#: Controller/EventsController.php:1731
+msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1827
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr ""
 
-#: Controller/EventsController.php:1833
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr ""
 
-#: Controller/EventsController.php:1869
+#: Controller/EventsController.php:1984
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr ""
 
-#: Controller/EventsController.php:1873;1877
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:1901
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr ""
 
-#: Controller/EventsController.php:1914;1994;2258
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr ""
 
-#: Controller/EventsController.php:1922
+#: Controller/EventsController.php:2037
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr ""
 
-#: Controller/EventsController.php:1928
+#: Controller/EventsController.php:2043
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr ""
 
-#: Controller/EventsController.php:1930;2261
+#: Controller/EventsController.php:2045;2395
 msgid "The event could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/EventsController.php:1970
+#: Controller/EventsController.php:2094
 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:2020
+#: Controller/EventsController.php:2142
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr ""
 
-#: Controller/EventsController.php:2021
+#: Controller/EventsController.php:2143
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr ""
 
-#: Controller/EventsController.php:2070
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr ""
 
-#: Controller/EventsController.php:2073
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr ""
 
-#: Controller/EventsController.php:2076
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr ""
 
-#: Controller/EventsController.php:2083
+#: Controller/EventsController.php:2217
 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:2107;2192
+#: Controller/EventsController.php:2241;2326
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr ""
 
-#: Controller/EventsController.php:2115
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr ""
 
-#: Controller/EventsController.php:2120
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr ""
 
-#: Controller/EventsController.php:2410;2460;2530
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:2419
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr ""
 
-#: Controller/EventsController.php:2472;2541
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr ""
 
-#: Controller/EventsController.php:2624
+#: Controller/EventsController.php:2819
+msgid "You must specify a message."
+msgstr ""
+
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr ""
 
-#: Controller/EventsController.php:2626
-msgid "Sending of email failed"
+#: Controller/EventsController.php:2847
+msgid "Sending of email failed."
 msgstr ""
 
-#: Controller/EventsController.php:2671
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr ""
 
-#: Controller/EventsController.php:2759
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr ""
 
-#: Controller/EventsController.php:2801;4015;4083
-msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
-msgstr ""
-
-#: Controller/EventsController.php:2837
-msgid "Invalid Event ID."
-msgstr ""
-
-#: Controller/EventsController.php:2884
-msgid "No events found that match the passed parameters."
-msgstr ""
-
-#: Controller/EventsController.php:2909
-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:2984
-msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
-msgstr ""
-
-#: Controller/EventsController.php:3003
-#: Model/Attribute.php:2069
-msgid "Invalid hash type."
-msgstr ""
-
-#: Controller/EventsController.php:3106
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr ""
 
-#: Controller/EventsController.php:3126
-msgid "Problem with writing the ioc file. Please report to administrator."
+#: Controller/EventsController.php:3134
+msgid "Problem with writing the IoC file. Please report to site admin."
 msgstr ""
 
-#: Controller/EventsController.php:3220
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr ""
 
-#: Controller/EventsController.php:3383
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr ""
 
-#: Controller/EventsController.php:3401;3405
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:3425;3495
-msgid "You don't have the privileges to access this."
-msgstr ""
-
-#: Controller/EventsController.php:3706
-#: Controller/TagCollectionsController.php:311
+#: Controller/EventsController.php:3484
+#: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
 msgstr ""
 
-#: Controller/EventsController.php:3722
-#: Controller/TagCollectionsController.php:327
+#: Controller/EventsController.php:3500
+#: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr ""
 
-#: Controller/EventsController.php:3733;3739
-#: Controller/TagCollectionsController.php:334
+#: Controller/EventsController.php:3514
+msgid "Tag is not allowed due to taxonomy exclusivity settings"
+msgstr ""
+
+#: Controller/EventsController.php:3545;3551
+#: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr ""
 
-#: Controller/EventsController.php:3735
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr ""
 
-#: Controller/EventsController.php:3741
-#: Controller/TagCollectionsController.php:342
+#: Controller/EventsController.php:3553
+#: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr ""
 
-#: Controller/EventsController.php:3986;5265;5287;5785;5789
-#: Controller/ObjectsController.php:46;190;194;618;1028
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
+#: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr ""
 
-#: Controller/EventsController.php:4146;4176;4192
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:4257;4397
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr ""
 
-#: Controller/EventsController.php:4261;4401;4948
+#: Controller/EventsController.php:3987;4128;4703
 msgid "Event not found or you are not authorised to view it."
 msgstr ""
 
-#: Controller/EventsController.php:4502;4509
+#: Controller/EventsController.php:4134
+msgid "Freetext Import"
+msgstr ""
+
+#: Controller/EventsController.php:4140
+msgid "Populate using a Template"
+msgstr ""
+
+#: Controller/EventsController.php:4146
+msgid "OpenIOC Import"
+msgstr ""
+
+#: Controller/EventsController.php:4151
+msgid "ThreatConnect Import"
+msgstr ""
+
+#: Controller/EventsController.php:4156
+msgid "(Experimental) Forensic analysis - Mactime"
+msgstr ""
+
+#: Controller/EventsController.php:4175
+msgid "MISP standard (recommended exchange format - lossless)"
+msgstr ""
+
+#: Controller/EventsController.php:4181
+msgid "STIX 1.1.1 format (lossy)"
+msgstr ""
+
+#: Controller/EventsController.php:4186
+msgid "STIX 2.0 format (lossy)"
+msgstr ""
+
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4538
+#: Controller/EventsController.php:4264
 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:4546
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr ""
 
-#: Controller/EventsController.php:4569
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr ""
 
-#: Controller/EventsController.php:4579
+#: Controller/EventsController.php:4305
 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:4604
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4743;4764;4797;4822;4847;4877;4898
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr ""
 
-#: Controller/EventsController.php:5012
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr ""
 
-#: Controller/EventsController.php:5094
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr ""
 
-#: Controller/EventsController.php:5098
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:5103
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:5158;5204
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5170
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr ""
 
-#: Controller/EventsController.php:5221
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:5373
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5598
+#: Controller/EventsController.php:5222;5236
+#: Controller/PostsController.php:60;84
+#: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
+msgid "You don't have permission to do that."
+msgstr "Du saknar rättigheter att göra det där."
+
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr ""
 
-#: Controller/EventsController.php:5646
-#: Controller/ShadowAttributesController.php:313;318;534
+#: Controller/EventsController.php:5411
+#: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr ""
 
-#: Controller/EventsController.php:5667
+#: Controller/EventsController.php:5432
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr ""
 
-#: Controller/EventsController.php:5918
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr ""
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:238;337
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr ""
 
-#: Controller/FeedsController.php:246
-msgid "Feed could not be added. Invalid field: %s"
+#: Controller/FeedsController.php:291
+msgid "Feed could not be added. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:271;372;394;516;551;755
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr ""
 
-#: Controller/FeedsController.php:345
-msgid "Feed could not be updated. Invalid fields: %s"
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:368
-msgid "This action requires a post request."
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
+#: Controller/SharingGroupsController.php:237
+#: Controller/UsersController.php:1044
+msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:401;520
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:414;480
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:425
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:430;432
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:436;497
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:527
-msgid "Event added."
+#: Controller/FeedsController.php:563
+msgid "No feed enabled."
 msgstr ""
 
-#: Controller/FeedsController.php:530
-msgid "Event already up to date."
-msgstr ""
-
-#: Controller/FeedsController.php:532
-msgid "Event updated."
-msgstr ""
-
-#: Controller/FeedsController.php:536
-msgid "Could not %s event."
-msgstr ""
-
-#: Controller/FeedsController.php:539
+#: Controller/FeedsController.php:587;606
+#: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr ""
 
-#: Controller/FeedsController.php:631
+#: Controller/FeedsController.php:594
+msgid "Event added."
+msgstr ""
+
+#: Controller/FeedsController.php:597
+msgid "Event already up to date."
+msgstr ""
+
+#: Controller/FeedsController.php:599
+msgid "Event updated."
+msgstr ""
+
+#: Controller/FeedsController.php:603
+msgid "Could not %s event."
+msgstr ""
+
+#: Controller/FeedsController.php:700
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr ""
 
-#: Controller/FeedsController.php:670;721
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr ""
 
-#: Controller/FeedsController.php:787
-msgid "This event is blocked by the Feed filters."
-msgstr ""
-
-#: Controller/FeedsController.php:789
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr ""
 
-#: Controller/FeedsController.php:825;829
+#: Controller/FeedsController.php:865
+msgid "This event is blocked by the Feed filters."
+msgstr ""
+
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:850
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: Controller/FeedsController.php:854
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr ""
 
-#: Controller/FeedsController.php:863
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr ""
 
-#: Controller/FeedsController.php:865
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:882
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr ""
 
-#: Controller/FeedsController.php:897
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:900
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:934
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr ""
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr ""
 
-#: Controller/GalaxiesController.php:167
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr ""
 
-#: Controller/GalaxiesController.php:293
-msgid "Failed to parse request."
+#: Controller/GalaxiesController.php:337
+msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:296
-msgid "No clusters picked."
+#: Controller/GalaxiesController.php:340
+msgid "Failed to parse request."
 msgstr ""
 
 #: Controller/JobsController.php:156
@@ -829,10 +1132,11 @@ msgid "News item could not be deleted."
 msgstr ""
 
 #: Controller/ObjectReferencesController.php:37
+#: Controller/ObjectsController.php:511;607;650;671;686;757;768;786
 msgid "Invalid object"
 msgstr ""
 
-#: Controller/ObjectReferencesController.php:161
+#: Controller/ObjectReferencesController.php:163
 msgid "Invalid object reference"
 msgstr ""
 
@@ -856,7 +1160,7 @@ msgstr ""
 msgid "This action can only be reached via POST requests"
 msgstr ""
 
-#: Controller/ObjectsController.php:69;82;1055
+#: Controller/ObjectsController.php:69;82;1272
 msgid "Invalid sharing group."
 msgstr ""
 
@@ -864,41 +1168,65 @@ msgstr ""
 msgid "You don't have permissions to create objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:181;1040;1092
+#: Controller/ObjectsController.php:181;1257;1309
 #: Model/Template.php:25
 msgid "Invalid template."
 msgstr ""
 
-#: Controller/ObjectsController.php:364
-msgid "You don't have permissions to edit objects."
+#: Controller/ObjectsController.php:295;424;430
+msgid "Object could not be saved."
 msgstr ""
 
-#: Controller/ObjectsController.php:378;389;607
-#: Model/Event.php:6207
+#: Controller/ObjectsController.php:373;1006
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr ""
 
-#: Controller/ObjectsController.php:601
+#: Controller/ObjectsController.php:377
+msgid "Insufficient permissions to edit this object."
+msgstr ""
+
+#: Controller/ObjectsController.php:449
+msgid "Object attributes saved."
+msgstr ""
+
+#: Controller/ObjectsController.php:518
+msgid "This function can only be accessed via POST or PUT"
+msgstr ""
+
+#: Controller/ObjectsController.php:711
+msgid "Invalid template"
+msgstr ""
+
+#: Controller/ObjectsController.php:789
+msgid "Invalid fields"
+msgstr ""
+
+#: Controller/ObjectsController.php:796
+msgid "Invalid field"
+msgstr ""
+
+#: Controller/ObjectsController.php:822
 msgid "You don't have permissions to delete objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:711;718;722
+#: Controller/ObjectsController.php:926;933;937
 msgid "Object not found or not authorised."
 msgstr ""
 
-#: Controller/ObjectsController.php:986
+#: Controller/ObjectsController.php:1203
 msgid "%s objects successfully reconstructed."
 msgstr ""
 
-#: Controller/ObjectsController.php:996;1032
+#: Controller/ObjectsController.php:1213;1249
 msgid "This action can only be reached via AJAX."
 msgstr ""
 
-#: Controller/ObjectsController.php:1073
+#: Controller/ObjectsController.php:1290
 msgid "Failed to create an Object from Attributes. Error: "
 msgstr ""
 
-#: Controller/ObjectsController.php:1084
+#: Controller/ObjectsController.php:1301
 msgid "No Attribute selected."
 msgstr ""
 
@@ -918,47 +1246,43 @@ msgstr ""
 msgid "The organisation could not be added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:155;234;287;314;347
-msgid "Invalid organisation"
-msgstr ""
-
-#: Controller/OrganisationsController.php:194
-msgid "Organisation updated."
-msgstr ""
-
-#: Controller/OrganisationsController.php:209
-msgid "The organisation could not be updated."
-msgstr ""
-
-#: Controller/OrganisationsController.php:230
-msgid "Action not allowed, post request expected."
-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/OrganisationsController.php:275;281
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:352
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
+msgid "Invalid organisation"
+msgstr ""
+
+#: Controller/OrganisationsController.php:208
+msgid "Organisation updated."
+msgstr ""
+
+#: Controller/OrganisationsController.php:223
+msgid "The organisation could not be updated."
+msgstr ""
+
+#: Controller/OrganisationsController.php:272
+msgid "Organisation deleted"
+msgstr ""
+
+#: Controller/OrganisationsController.php:279
+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/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:401
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr ""
 
-#: Controller/OrganisationsController.php:423
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr ""
 
-#: Controller/OrganisationsController.php:426
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr ""
 
@@ -1074,88 +1398,97 @@ msgstr ""
 msgid "Default role unset."
 msgstr ""
 
-#: Controller/ServersController.php:225;421
+#: Controller/ServersController.php:237;436
 msgid "The pull filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:235;431
+#: Controller/ServersController.php:247;446
 msgid "The push filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:289;461
+#: Controller/ServersController.php:302;476
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr ""
 
-#: Controller/ServersController.php:301
+#: Controller/ServersController.php:314
 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:336;517;1997
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr ""
 
-#: Controller/ServersController.php:343;524
+#: Controller/ServersController.php:357;539
 msgid "The server could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ServersController.php:396;593;618;627;687;1403
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr ""
 
-#: Controller/ServersController.php:478
+#: Controller/ServersController.php:493
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr ""
 
-#: Controller/ServersController.php:600
+#: Controller/ServersController.php:604;2183;2225
+msgid "This endpoint expects POST requests."
+msgstr ""
+
+#: Controller/ServersController.php:612
+msgid "You don't have the privileges to do that."
+msgstr ""
+
+#: Controller/ServersController.php:621
 msgid "Server deleted"
 msgstr ""
 
-#: Controller/ServersController.php:603
+#: Controller/ServersController.php:630
 msgid "Server was not deleted"
 msgstr ""
 
-#: Controller/ServersController.php:630
+#: Controller/ServersController.php:668
 msgid "Pull setting not enabled for this server."
 msgstr ""
 
-#: Controller/ServersController.php:653
+#: Controller/ServersController.php:692
 msgid "Pulling."
 msgstr ""
 
-#: Controller/ServersController.php:663
+#: Controller/ServersController.php:702
 msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:700
+#: Controller/ServersController.php:748
 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:713
+#: Controller/ServersController.php:761
 msgid "Push complete. %s events pushed, %s events could not be pushed."
 msgstr ""
 
-#: Controller/ServersController.php:728
+#: Controller/ServersController.php:776
 msgid "Pushing."
 msgstr ""
 
-#: Controller/ServersController.php:738
+#: Controller/ServersController.php:786
 msgid "Push queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:766
+#: Controller/ServersController.php:814
 msgid "Filename not allowed"
 msgstr ""
 
-#: Controller/ServersController.php:771
+#: Controller/ServersController.php:819
 msgid "Incorrect extension or empty file."
 msgstr ""
 
-#: Controller/ServersController.php:853
+#: Controller/ServersController.php:901
 msgid "No organisation selected."
 msgstr ""
 
-#: Controller/ServersController.php:869;870;871;872;873;874;875;876;877;878;879;880;881;882;883
-#: View/Elements/healthElements/diagnostics.ctp:26;170;184;209;269
+#: Controller/ServersController.php:917;918;919;920;921;922;923;924;925;926;927;928;929;930;931
+#: View/Elements/healthElements/diagnostics.ctp:26;170;184;271;331
 #: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/submoduleStatus.ctp:23
@@ -1163,253 +1496,330 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: Controller/ServersController.php:869
+#: Controller/ServersController.php:917
 msgid "not found"
 msgstr ""
 
-#: Controller/ServersController.php:869
+#: Controller/ServersController.php:917
 msgid "is not writeable"
 msgstr ""
 
-#: Controller/ServersController.php:870
+#: Controller/ServersController.php:918
 msgid "not readable"
 msgstr ""
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: settings not set"
 msgstr ""
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: Failed to load GnuPG"
 msgstr ""
 
-#: Controller/ServersController.php:871
+#: Controller/ServersController.php:919
 msgid "FAIL: Issues with the key/passphrase"
 msgstr ""
 
-#: Controller/ServersController.php:871
-msgid "FAIL: encrypt failed"
+#: Controller/ServersController.php:919
+msgid "FAIL: sign failed"
 msgstr ""
 
-#: Controller/ServersController.php:872
+#: Controller/ServersController.php:920
 msgid "not configured (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:872
+#: Controller/ServersController.php:920
 msgid "Getting URL via proxy failed"
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "not enabled (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "Python ZeroMQ library not installed correctly."
 msgstr ""
 
-#: Controller/ServersController.php:873
+#: Controller/ServersController.php:921
 msgid "ZeroMQ script not running."
 msgstr ""
 
-#: Controller/ServersController.php:874
+#: Controller/ServersController.php:922
 msgid "Some of the libraries related to STIX are not installed. Make sure that all libraries listed below are correctly installed."
 msgstr ""
 
-#: Controller/ServersController.php:875
+#: Controller/ServersController.php:923
 msgid "Incorrect STIX version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:876
+#: Controller/ServersController.php:924
 msgid "Incorrect STIX2 version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:877
+#: Controller/ServersController.php:925
 msgid "Incorrect CyBox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:878
+#: Controller/ServersController.php:926
 msgid "Incorrect mixbox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:879
+#: Controller/ServersController.php:927
 msgid "Incorrect maec version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:880
+#: Controller/ServersController.php:928
 msgid "Incorrect PyMISP version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:881
+#: Controller/ServersController.php:929
 msgid "Incorrect plyara version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 #: View/Events/filter_event_index.ctp:32;188
 #: View/Pages/doc/using_the_system.ctp:68;173
 msgid "High"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 msgid "Alternative setting used"
 msgstr ""
 
-#: Controller/ServersController.php:882
+#: Controller/ServersController.php:930
 msgid "Test failed"
 msgstr ""
 
-#: Controller/ServersController.php:883
+#: Controller/ServersController.php:931
 msgid "System not enabled"
 msgstr ""
 
-#: Controller/ServersController.php:883
+#: Controller/ServersController.php:931
 msgid "No modules found"
 msgstr ""
 
-#: Controller/ServersController.php:890
+#: Controller/ServersController.php:938
 msgid "MISP will not operate correctly or will be unsecure until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:894
+#: Controller/ServersController.php:942
 msgid "Some of the features of MISP cannot be utilised until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:898
+#: Controller/ServersController.php:946
 msgid "There are some optional tweaks that could be done to improve the looks of your MISP instance."
 msgstr ""
 
-#: Controller/ServersController.php:1106
+#: Controller/ServersController.php:1165
+msgid "Only one `update` worker can run at a time"
+msgstr ""
+
+#: Controller/ServersController.php:1177
 msgid "Worker start signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1121
+#: Controller/ServersController.php:1192
 msgid "Worker stop signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1191
+#: Controller/ServersController.php:1249
+msgid "This setting is redacted."
+msgstr ""
+
+#: Controller/ServersController.php:1274
 msgid "This setting can only be edited via the CLI."
 msgstr ""
 
-#: Controller/ServersController.php:1300
+#: Controller/ServersController.php:1365;1377
+msgid "Restarting workers."
+msgstr ""
+
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr ""
 
-#: Controller/ServersController.php:1306
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr ""
 
-#: Controller/ServersController.php:1329;1345
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr ""
 
-#: Controller/ServersController.php:1337
+#: Controller/ServersController.php:1438
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr ""
 
-#: Controller/ServersController.php:1896
+#: Controller/ServersController.php:1505
+msgid "Invalid user or user not found."
+msgstr ""
+
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr ""
 
-#: Controller/ServersController.php:1911
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:1914
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
-#: Controller/ServersController.php:2004
+#: Controller/ServersController.php:2100
+msgid "Cannot create sync config - no host org ID configured for the instance."
+msgstr ""
+
+#: Controller/ServersController.php:2109
+msgid "Configured host org not found. Please make sure that the setting is current on the instance."
+msgstr ""
+
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:212
-msgid "Moving of the file that this attachment references failed."
+#: Controller/ServersController.php:2194
+msgid "API key updated."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:281
+#: Controller/ServersController.php:2207
+msgid "ID has to be a valid server connection"
+msgstr ""
+
+#: Controller/ServersController.php:2210
+msgid "Invalid direction. Valid options: "
+msgstr ""
+
+#: Controller/ServersController.php:2214
+msgid "Priority changed."
+msgstr ""
+
+#: Controller/ServersController.php:2217
+msgid "Priority could not be changed."
+msgstr ""
+
+#: Controller/ServersController.php:2228
+msgid "Only site admin accounts can release the update lock."
+msgstr ""
+
+#: Controller/ServersController.php:2238
+msgid "Only site admin accounts get the DB schema diagnostic."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:263
 msgid "Could not discard proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:342
+#: Controller/ShadowAttributesController.php:324
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:390;393;402
+#: Controller/ShadowAttributesController.php:372;375;384
 msgid "The lines"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:442
+#: Controller/ShadowAttributesController.php:424
 msgid "The proposal has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:454;763
+#: Controller/ShadowAttributesController.php:436;749
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:456
+#: Controller/ShadowAttributesController.php:438
 msgid "The proposal could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:493
+#: Controller/ShadowAttributesController.php:475
 msgid "Invalid Proposal"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:505
 msgid "Proposal not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:601
 msgid "The attachment has been uploaded"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:603
 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:606
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:740
 msgid "The proposed Attribute has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:751
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:896;906
+#: Controller/ShadowAttributesController.php:884;894
 msgid "Invalid proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:950
-msgid "No proposals found or invalid event."
-msgstr ""
-
-#: Controller/ShadowAttributesController.php:982;1018
+#: Controller/ShadowAttributesController.php:1010
 msgid "This feature is only available using the API to Sync users"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:985
+#: Controller/ShadowAttributesController.php:1013
 msgid "Invalid UUID"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:1021
-msgid "This feature is only available using POST requests"
-msgstr ""
-
-#: Controller/SharingGroupsController.php:237
+#: Controller/SharingGroupsController.php:251
 msgid "Sharing Group deleted"
 msgstr ""
 
-#: Controller/SharingGroupsController.php:242
+#: Controller/SharingGroupsController.php:256
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr ""
 
+#: Controller/SightingdbController.php:32
+msgid "SightingDB connection added."
+msgstr ""
+
+#: Controller/SightingdbController.php:32
+msgid "SightingDB connection could not be added."
+msgstr ""
+
+#: Controller/SightingdbController.php:49;99;143
+msgid " Reason: %s"
+msgstr ""
+
+#: Controller/SightingdbController.php:71;123
+#: Model/Sightingdb.php:325
+msgid "Invalid SightingDB entry."
+msgstr ""
+
+#: Controller/SightingdbController.php:87
+msgid "SightingDB connection updated."
+msgstr ""
+
+#: Controller/SightingdbController.php:87
+msgid "SightingDB connection could not be updated."
+msgstr ""
+
+#: Controller/SightingdbController.php:128
+msgid "SightingDB connection removed."
+msgstr ""
+
+#: Controller/SightingdbController.php:130
+msgid "SightingDB connection could not be removed."
+msgstr ""
+
+#: Controller/SightingdbController.php:196
+msgid "Pass a valid SightingDB ID"
+msgstr ""
+
 #: Controller/SightingsController.php:83
 msgid "Could not add the Sighting. Reason: "
 msgstr ""
 
-#: Controller/SightingsController.php:93;96
+#: Controller/SightingsController.php:96
 msgid "Sighting added"
 msgstr ""
 
@@ -1418,6 +1828,7 @@ msgid "You are not authorised to remove sightings data as you don't have permiss
 msgstr ""
 
 #: Controller/SightingsController.php:155
+#: Model/DecayingModel.php:464
 msgid "Attribute not found"
 msgstr ""
 
@@ -1453,7 +1864,7 @@ msgstr ""
 msgid "You don't have editing rights on this Tag Collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:201;385
+#: Controller/TagCollectionsController.php:201;391
 msgid "Invalid tag collection."
 msgstr ""
 
@@ -1469,115 +1880,147 @@ msgstr ""
 msgid "You are not allowed to delete that."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:336
+#: Controller/TagCollectionsController.php:241
+msgid "Invalid tag collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:342
 msgid "Tag(s) could not be added."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:389
+#: Controller/TagCollectionsController.php:395
 msgid "Insufficient privileges to remove the tag from the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:400
+#: Controller/TagCollectionsController.php:406
 msgid "Invalid tag or tag not associated with the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:404
+#: Controller/TagCollectionsController.php:410
 msgid "Failed to remove tag from the collection."
 msgstr ""
 
-#: Controller/TagsController.php:367
+#: Controller/TagsController.php:370
 msgid "Tag deleted"
 msgstr ""
 
-#: Controller/TagsController.php:372
+#: Controller/TagsController.php:375
 msgid "Tag was not deleted"
 msgstr ""
 
-#: Controller/TagsController.php:580
+#: Controller/TagsController.php:599
 msgid "Favourite Tags"
 msgstr ""
 
-#: Controller/TagsController.php:586
+#: Controller/TagsController.php:605
 #: View/TagCollections/index.ctp:4
 msgid "Tag Collections"
 msgstr ""
 
-#: Controller/TagsController.php:591
+#: Controller/TagsController.php:610
 msgid "Custom Tags"
 msgstr ""
 
-#: Controller/TagsController.php:595
+#: Controller/TagsController.php:614
 msgid "All Tags"
 msgstr ""
 
-#: Controller/TagsController.php:603
+#: Controller/TagsController.php:622
 #: View/Taxonomies/view.ctp:2
 msgid "Taxonomy Library"
 msgstr ""
 
-#: Controller/TagsController.php:772
+#: Controller/TagsController.php:790
 msgid "Includes: "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:57
+#: Controller/TagsController.php:867
+msgid "This functionality requires tagging permission."
+msgstr ""
+
+#: Controller/TagsController.php:881;905
+msgid "Cannot alter the tags of this data, only the organisation that has created the data (orgc) can modify global tags."
+msgstr ""
+
+#: Controller/TagsController.php:883;907
+msgid "Please consider using local tags if you are in the host organisation of the instance."
+msgstr ""
+
+#: Controller/TagsController.php:912;1058
+msgid "Invalid Target."
+msgstr ""
+
+#: Controller/TagsController.php:951
+msgid "Local tags can only be added by users of the host organisation."
+msgstr ""
+
+#: Controller/TagsController.php:964
+msgid "Unable to create tag. Reason: "
+msgstr ""
+
+#: Controller/TagsController.php:1075
+msgid "Insufficient privileges to remove local tags from events you do not own."
+msgstr ""
+
+#: Controller/TaxonomiesController.php:68
 msgid "Taxonomy not found."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:123
+#: Controller/TaxonomiesController.php:134
 msgid "Taxonomy enabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:155
+#: Controller/TaxonomiesController.php:166
 msgid "Taxonomy disabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:223
+#: Controller/TaxonomiesController.php:234
 msgid "All taxonomy libraries are up to date already."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:226
+#: Controller/TaxonomiesController.php:237
 msgid "Could not update any of the taxonomy libraries"
 msgstr ""
 
-#: Controller/TaxonomiesController.php:229
+#: Controller/TaxonomiesController.php:240
 #: Controller/WarninglistsController.php:107
 msgid "Successfully updated "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:229;231
+#: Controller/TaxonomiesController.php:240;242
 msgid " taxonomy libraries."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:231
+#: Controller/TaxonomiesController.php:242
 #: Controller/WarninglistsController.php:109
 msgid " However, could not update "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:265;295;325
+#: Controller/TaxonomiesController.php:276;314;344
 msgid "The tag(s) has been saved."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:267;297;327
+#: Controller/TaxonomiesController.php:282;316;346
 msgid "The tag(s) could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:355
+#: Controller/TaxonomiesController.php:374
 msgid "The tag(s) has been hidden."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:357
+#: Controller/TaxonomiesController.php:376
 msgid "The tag(s) could not be hidden. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:394
+#: Controller/TaxonomiesController.php:413
 msgid "Taxonomy successfuly deleted."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:397
+#: Controller/TaxonomiesController.php:416
 msgid "Taxonomy could not be deleted."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:405
+#: Controller/TaxonomiesController.php:424
 #: Controller/WarninglistsController.php:262
 msgid "This function can only be reached via AJAX."
 msgstr ""
@@ -1590,109 +2033,175 @@ msgstr ""
 msgid "Event populated, but "
 msgstr ""
 
-#: Controller/UsersController.php:42;247
+#: Controller/UserSettingsController.php:129;276
+msgid "Invalid ID passed."
+msgstr ""
+
+#: Controller/UserSettingsController.php:139;143;286;290
+msgid "Invalid user setting."
+msgstr ""
+
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
+msgid "Invalid setting."
+msgstr ""
+
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
+msgid "This setting is restricted and requires the following permission(s): %s"
+msgstr ""
+
+#: Controller/UserSettingsController.php:193
+msgid "Setting saved."
+msgstr ""
+
+#: Controller/UserSettingsController.php:206
+msgid "Setting could not be saved."
+msgstr ""
+
+#: Controller/UserSettingsController.php:301
+msgid "Setting deleted."
+msgstr ""
+
+#: Controller/UserSettingsController.php:309
+msgid "Setting could not be deleted."
+msgstr ""
+
+#: Controller/UserSettingsController.php:322
+msgid "Expecting POST or DELETE request."
+msgstr ""
+
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr ""
 
-#: Controller/UsersController.php:54;467;706;725;953
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr ""
 
-#: Controller/UsersController.php:119;613;778
+#: Controller/UsersController.php:154;722;887
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
-#: Controller/UsersController.php:146
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr ""
 
-#: Controller/UsersController.php:150
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:184
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:193
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:213
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr ""
 
-#: Controller/UsersController.php:222
+#: Controller/UsersController.php:299
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr ""
 
-#: Controller/UsersController.php:359;377;477
-#: Model/Log.php:320
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:624
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr ""
 
-#: Controller/UsersController.php:646
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr ""
 
-#: Controller/UsersController.php:655;889
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:881
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr ""
 
-#: Controller/UsersController.php:961
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr ""
 
-#: Controller/UsersController.php:965
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr ""
 
-#: Controller/UsersController.php:1043
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr ""
 
-#: Controller/UsersController.php:1130
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr ""
 
-#: Controller/UsersController.php:1171
+#: Controller/UsersController.php:1273;1297
+msgid "This functionality is only accessible via POST requests."
+msgstr ""
+
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr ""
+
+#: Controller/UsersController.php:1286
 msgid "New authkey generated."
 msgstr ""
 
-#: Controller/UsersController.php:1280
+#: Controller/UsersController.php:1301
+msgid "Job initiated."
+msgstr ""
+
+#: Controller/UsersController.php:1303
+msgid "%s authkeys reset, %s could not be reset."
+msgstr ""
+
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1462
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1467
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1504
+#: Controller/UsersController.php:1587
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1506
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr ""
 
-#: Controller/UsersController.php:1580
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr ""
 
-#: Controller/UsersController.php:1581
-#: View/Elements/global_menu.ctp:151
+#: Controller/UsersController.php:1664
+#: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
@@ -1701,18 +2210,19 @@ msgstr ""
 msgid "Organisations"
 msgstr ""
 
-#: Controller/UsersController.php:1582
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr ""
 
-#: Controller/UsersController.php:1583
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
-#: View/Elements/eventattribute.ctp:150
+#: View/DecayingModel/decaying_tool_rest_search.ctp:28
+#: View/Elements/eventattribute.ctp:151
 #: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Elements/Feeds/eventattribute.ctp:46
+#: View/Elements/Servers/eventattribute.ctp:46
 #: View/Events/resolved_attributes.ctp:53
-#: View/Events/resolved_misp_format.ctp:66;93;263
+#: View/Events/resolved_misp_format.ctp:66;94;289
 #: View/Events/view.ctp:127
 #: View/Feeds/preview_event.ctp:16
 #: View/Feeds/preview_index.ctp:39
@@ -1730,18 +2240,160 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: Controller/UsersController.php:1584
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr ""
 
-#: Controller/UsersController.php:1585
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1586
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr ""
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 ""
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr ""
@@ -1822,6 +2474,14 @@ msgstr ""
 msgid "No valid data received."
 msgstr ""
 
+#: Controller/Component/ACLComponent.php:634
+msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
+msgstr ""
+
+#: Controller/Component/ACLComponent.php:688
+msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
+msgstr ""
+
 #: Controller/Component/AdminCrudComponent.php:20
 msgid "The %s has been saved."
 msgstr ""
@@ -1870,2154 +2530,2967 @@ msgstr ""
 msgid "Could not remove the blacklist entry"
 msgstr ""
 
-#: Model/AppModel.php:1232
+#: Controller/Component/DeprecationComponent.php:18
+msgid "Use /attributes/restSearch to export RPZ rules."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:19
+msgid "Use /attributes/restSearch to export flat indicator lists."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:22
+msgid "Use MISP modules to import in OpenIOC format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:23
+msgid "Use /events/restSearch to export in CSV format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:24
+msgid "Use the REST client to refine your search conditions and export in any of the given formats with much more control."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:25
+msgid "Use /events/restSearch to export hashes."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:26
+msgid "Use /events/restSearch to export in the various NIDS formats."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:27
+msgid "Use /events/restSearch to export in STIX format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:28
+msgid "Use /events/restSearch to export in STIX2 format."
+msgstr ""
+
+#: Controller/Component/DeprecationComponent.php:29
+msgid "Use /events/restSearch to export in XML format. It is highly recommended to use JSON whenever possible."
+msgstr ""
+
+#: Controller/Component/RateLimitComponent.php:29
+msgid "API searches are not allowed for this user role."
+msgstr ""
+
+#: Controller/Component/RateLimitComponent.php:41
+msgid "Rate limit exceeded."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:603
+msgid "The action that the user performed"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:609
+msgid "Is the sharing group selectable (active) when chosing distribution"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:614;1356
+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 ""
+
+#: Controller/Component/RestResponseComponent.php:620
+msgid "All organisations contained on the instance will be part of the sharing group"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:626
+msgid "hard-delete already soft-deleted attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:633
+msgid "Maturity of the event"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:640
+msgid "Anonymise the information regarding the server on which the request was issued"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:646
+msgid "Filter on attribute value"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:652
+msgid "The authorisation key found on the external server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:658
+msgid "The user receive alerts when events are published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:664
+msgid "The email's body"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:670
+msgid "The feed is cached"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:682
+msgid "A valid x509 certificate "
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:688
+msgid "The text contained in the change field"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:694
+msgid "The user will be prompted the change the password"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:700
+msgid "A valid hexadecimal colour `#ffffff`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:711
+msgid "Contact details for the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:717
+msgid "The user receive alerts from `contact reporter` requests"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:734
+msgid "Base64 encoded file contents"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:746
+msgid "The user set date field on the event level. If you are using restSearch, you can use any of the valid time related filters (examples: 7d, timestamps, [14d, 7d] for ranges, etc.)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:781
+msgid "The role is a default role (selected by default)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:787
+msgid "Remove file after ingestion"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:793
+msgid "Include deleted elements"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:799
+msgid "Merge attributes (only add new attribute, remove revoked attributes)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:810
+msgid "Disable the user account"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:822
+msgid "Filter on user email"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:828
+msgid "Set the password manually"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:839
+msgid "When uploading malicious samples, set this flag to tell MISP to encrpyt the sample and extract the file hashes. This will create a MISP object with the appropriate attributes."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:850
+msgid "Should the warning list be enforced. Adds `blocked` field for matching attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:863
+msgid "The timestamp at which the event was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:870
+msgid "The timestamp at which the attribute was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:882;1021
+msgid "Quick event description"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:888
+msgid "The tag is exported when synchronising with other instances"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:900
+msgid "Exclude local tags from the export"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:906
+msgid "The organisation have write access to this sharing group (they can add/remove other organisation)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:912
+msgid "An external authorisation is required for this user"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:918
+msgid "A valid external auth key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:931
+msgid "target_event option might be considered"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:943
+msgid "The date from which the event was published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:949
+msgid "A valid GPG key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:955
+msgid "The event contains proposals"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:961
+msgid "Headers to be passed with the requests. All separated by `\\n`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:967
+msgid "The tag is hidden (not selectable)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:979
+msgid "Include matching attributes in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:991
+msgid "Include matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:997
+msgid "Include matching eventUuids in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1003
+msgid "Include tags of matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1015
+msgid "Include proposals of matching events in the response"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1028
+msgid "Specify whether the source (url field) is a directory (local) or an geniun url (network)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1034
+msgid "The IP of a login attempt"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1040
+msgid "JSON containing ID, UUID and name"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1046
+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)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1059
+msgid "Limit on the pagination"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1065
+msgid "If the organisation should have access to this instance, make sure that the Local organisation setting is checked. If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1071
+msgid "The lookup will not be visible in the feed correlation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1077
+msgid "Message to be included"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1083
+msgid "Will not return Attributes, shadow attribute and objects"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1089
+msgid "Will only return  id, timestamp, published and uuid"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1096
+msgid "Mock the query"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1120
+msgid "The last time the sharing group was modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1138
+msgid "The news are read"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1145
+msgid "The unique Signature Identification"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1151
+msgid "Can be either the ORG_ID or the ORG_NAME"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1157
+msgid "Describe the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1163
+msgid "Organisation identifier (name)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1175;1181
+msgid "Globally used uuid of an organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1187
+msgid "The IDS flags will be set to off for this feed"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1194
+msgid "Page number for the pagination"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1200
+msgid "The hardcoded password"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1272
+msgid "The name of the feed provider"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1278
+msgid "The event will be published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1301
+msgid "Allow the download of events and their attribute from the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1307
+msgid "Allow the upload of events and their attribute to the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1313
+msgid "Allow the upload of sightings to the server"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1319
+msgid "Concise summary for who this sharing group is releasable to"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1337
+msgid "Pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1362
+msgid "The sector of the organisation"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1374
+msgid "Will only return the sharing group ID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1387
+msgid "Sharing group ID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1393
+msgid "The source of the Sighting (e.g. honeypot_1)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1405
+msgid "The email's subject"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1411;1417
+msgid "Base64 encoded certificate"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1435
+msgid "A tad ID to attach to created events"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1448
+msgid "The provided ID will be reused as an existing event"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1471
+msgid "Time of the sighting with the form `h:i:s`"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1483
+msgid "The title of the log"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1495
+msgid "The date to which the event was published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1501
+msgid "The state of the `to_ids` flag"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1507
+msgid "The type of the attribute"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1535
+msgid "Placeholder containing values to sight"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1548
+msgid "Not supported (warninglist->checkvalues) expect an array"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1554
+msgid "Not supported (removeTag)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1560;1566;1572;1579;1585;1591;1597;1603;1614
+msgid "Not supported"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1771
+msgid "Seen within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m)"
+msgstr ""
+
+#: Controller/Component/ToolboxComponent.php:18;26
+#: Model/Galaxy.php:220;277;287;301
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr ""
 
-#: Model/AppModel.php:1246
-msgid "Issues executing the pre-update test `"
+#: Model/AppModel.php:1480
+msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1246
-msgid "`. The returned error is: "
-msgstr ""
-
-#: Model/AppModel.php:1268;1271
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1269;1282
+#: Model/AppModel.php:1503
+msgid "The executed SQL query was: %s"
+msgstr ""
+
+#: Model/AppModel.php:1505
+msgid "Successfuly executed the SQL query for %s"
+msgstr ""
+
+#: Model/AppModel.php:1516;1580
+msgid "Issues executing the SQL query for %s"
+msgstr ""
+
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1281;1284
-msgid "Issues executing the SQL query for "
-msgstr ""
-
-#: Model/AppModel.php:1282
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1284
-msgid ". The returned error is: "
+#: Model/AppModel.php:1519
+msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1306
+#: Model/AppModel.php:1528
+msgid "However, as this error is whitelisted, the update went through."
+msgstr ""
+
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/Attribute.php:59
+#: Model/AppModel.php:1550
+msgid "Failed to add index"
+msgstr ""
+
+#: Model/AppModel.php:1552
+msgid "The returned error is:"
+msgstr ""
+
+#: Model/AppModel.php:1581
+msgid "Database updates stopped as some errors occured and the stop flag is enabled."
+msgstr ""
+
+#: Model/AppModel.php:1740
+msgid "Invalid JSON."
+msgstr ""
+
+#: Model/AppModel.php:1833;1891
+msgid "Issues executing run_updates"
+msgstr ""
+
+#: Model/AppModel.php:1834
+msgid "Database updates are locked. Worker not spawned"
+msgstr ""
+
+#: Model/AppModel.php:1838;1896;1931
+msgid "Update done"
+msgstr ""
+
+#: Model/AppModel.php:1892
+msgid "Updates are locked. Stopping worker gracefully"
+msgstr ""
+
+#: Model/AppModel.php:1911
+msgid "Running update %s"
+msgstr ""
+
+#: Model/AppModel.php:1937
+msgid "Update done in another worker. Gracefuly stopping."
+msgstr ""
+
+#: Model/Attribute.php:63
 #: View/Events/filter_event_index.ctp:46;182
 msgid "Your organisation only"
 msgstr ""
 
-#: Model/Attribute.php:60
+#: Model/Attribute.php:64
 #: View/Events/filter_event_index.ctp:46;183
 msgid "This community only"
 msgstr ""
 
-#: Model/Attribute.php:61
+#: Model/Attribute.php:65
 #: View/Events/filter_event_index.ctp:46;184
 #: View/Pages/doc/using_the_system.ctp:51
 msgid "Connected communities"
 msgstr ""
 
-#: Model/Attribute.php:62
+#: Model/Attribute.php:66
 #: View/Events/filter_event_index.ctp:46;185
 #: View/Pages/doc/using_the_system.ctp:58
 msgid "All communities"
 msgstr ""
 
-#: Model/Attribute.php:63
+#: Model/Attribute.php:67
 #: View/Elements/view_event_distribution_graph.ctp:24
 msgid "Sharing group"
 msgstr ""
 
-#: Model/Attribute.php:64
+#: Model/Attribute.php:68
 msgid "Inherit event"
 msgstr ""
 
-#: Model/Attribute.php:69
+#: Model/Attribute.php:76
 msgid "Reference used by the publishing party (e.g. ticket number)"
 msgstr ""
 
-#: Model/Attribute.php:73
+#: Model/Attribute.php:80
 msgid "Internal Attack Targeting and Compromise Information"
 msgstr ""
 
-#: Model/Attribute.php:74
+#: Model/Attribute.php:81
 msgid "Targeting information to include recipient email, infected machines, department, and or locations."
 msgstr ""
 
-#: Model/Attribute.php:78
+#: Model/Attribute.php:85
 msgid "All the info about how the malware is detected by the antivirus products"
 msgstr ""
 
-#: Model/Attribute.php:79
+#: Model/Attribute.php:86
 msgid "List of anti-virus vendors detecting the malware or information on detection performance (e.g. 13/43 or 67%). Attachment with list of detection or link to VirusTotal could be placed here as well."
 msgstr ""
 
-#: Model/Attribute.php:83
+#: Model/Attribute.php:90
 msgid "Information about how the malware is delivered"
 msgstr ""
 
-#: Model/Attribute.php:84
+#: Model/Attribute.php:91
 msgid "Information about the way the malware payload is initially delivered, for example information about the email or web-site, vulnerability used, originating IP etc. Malware sample itself should be attached here."
 msgstr ""
 
-#: Model/Attribute.php:88
+#: Model/Attribute.php:95
 msgid "Any artifact (files, registry keys etc.) dropped by the malware or other modifications to the system"
 msgstr ""
 
-#: Model/Attribute.php:92
+#: Model/Attribute.php:99
 msgid "Info on where the malware gets installed in the system"
 msgstr ""
 
-#: Model/Attribute.php:93
+#: Model/Attribute.php:100
 msgid "Location where the payload was placed in the system and the way it was installed. For example, a filename|md5 type attribute can be added here like this: c:\\windows\\system32\\malicious.exe|41d8cd98f00b204e9800998ecf8427e."
 msgstr ""
 
-#: Model/Attribute.php:97
+#: Model/Attribute.php:104
 msgid "Mechanisms used by the malware to start at boot"
 msgstr ""
 
-#: Model/Attribute.php:98
+#: Model/Attribute.php:105
 msgid "Mechanisms used by the malware to start at boot. This could be a registry key, legitimate driver modification, LNK file in startup"
 msgstr ""
 
-#: Model/Attribute.php:102
+#: Model/Attribute.php:109
 msgid "Information about network traffic generated by the malware"
 msgstr ""
 
-#: Model/Attribute.php:106
+#: Model/Attribute.php:113
 msgid "Information about the final payload(s)"
 msgstr ""
 
-#: Model/Attribute.php:107
+#: Model/Attribute.php:114
 msgid "Information about the final payload(s). Can contain a function of the payload, e.g. keylogger, RAT, or a name if identified, such as Poison Ivy."
 msgstr ""
 
-#: Model/Attribute.php:111
+#: Model/Attribute.php:118
 msgid "Identification of the group, organisation, or country behind the attack"
 msgstr ""
 
-#: Model/Attribute.php:115
+#: Model/Attribute.php:122
 msgid "Any other result from additional analysis of the malware like tools output"
 msgstr ""
 
-#: Model/Attribute.php:116
+#: Model/Attribute.php:123
 msgid "Any other result from additional analysis of the malware like tools output Examples: pdf-parser output, automated sandbox analysis, reverse engineering report."
 msgstr ""
 
-#: Model/Attribute.php:120
+#: Model/Attribute.php:127
 msgid "Financial Fraud indicators"
 msgstr ""
 
-#: Model/Attribute.php:121
+#: Model/Attribute.php:128
 msgid "Financial Fraud indicators, for example: IBAN Numbers, BIC codes, Credit card numbers, etc."
 msgstr ""
 
-#: Model/Attribute.php:125
+#: Model/Attribute.php:132
 msgid "Tools supporting analysis or detection of the event"
 msgstr ""
 
-#: Model/Attribute.php:129
+#: Model/Attribute.php:136
 msgid "Social networks and platforms"
 msgstr ""
 
-#: Model/Attribute.php:134
+#: Model/Attribute.php:141
 msgid "A human being - natural person"
 msgstr ""
 
-#: Model/Attribute.php:138
+#: Model/Attribute.php:145
 msgid "Attributes that are not part of any other category or are meant to be used as a component in MISP objects in the future"
 msgstr ""
 
-#: Model/Attribute.php:144;228
+#: Model/Attribute.php:154;243
 msgid "A checksum in md5 format"
 msgstr ""
 
-#: Model/Attribute.php:144
+#: Model/Attribute.php:154
 msgid "You are encouraged to use filename|md5 instead. A checksum in md5 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:155
 msgid "A checksum in sha1 format"
 msgstr ""
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:155
 msgid "You are encouraged to use filename|sha1 instead. A checksum in sha1 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:146
+#: Model/Attribute.php:156
 msgid "A checksum in sha256 format"
 msgstr ""
 
-#: Model/Attribute.php:146
+#: Model/Attribute.php:156
 msgid "You are encouraged to use filename|sha256 instead. A checksum in sha256 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:147
+#: Model/Attribute.php:157
 #: View/Elements/healthElements/files.ctp:29
 msgid "Filename"
 msgstr ""
 
-#: Model/Attribute.php:148
+#: Model/Attribute.php:158
 msgid "Microsoft Program database (PDB) path information"
 msgstr ""
 
-#: Model/Attribute.php:149
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:149
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:150
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:150
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:151
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:151
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:152
+#: Model/Attribute.php:162
 msgid "A source IP address of the attacker"
 msgstr ""
 
-#: Model/Attribute.php:153
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server"
 msgstr ""
 
-#: Model/Attribute.php:153
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server. Also set the IDS flag on when this IP is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker. Also set the IDS flag on when this hostname is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware. Use this instead of hostname when the upper domain is important or can be used to create links between events."
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:157
+#: Model/Attribute.php:167
 msgid "The email address used to send the malware."
 msgstr ""
 
-#: Model/Attribute.php:158
-msgid "A recipient email address"
-msgstr ""
-
-#: Model/Attribute.php:158
-msgid "A recipient email address that is not related to your constituency."
-msgstr ""
-
-#: Model/Attribute.php:159
-msgid "The subject of the email"
-msgstr ""
-
-#: Model/Attribute.php:160
-msgid "File name of the email attachment."
-msgstr ""
-
-#: Model/Attribute.php:161
-msgid "Email body"
-msgstr ""
-
-#: Model/Attribute.php:162
-msgid "A floating point value."
-msgstr ""
-
-#: Model/Attribute.php:163
-msgid "url"
-msgstr ""
-
-#: Model/Attribute.php:164
-msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
-msgstr ""
-
-#: Model/Attribute.php:165
-msgid "The user-agent used by the malware in the HTTP request."
-msgstr ""
-
-#: Model/Attribute.php:166
-msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
-msgstr ""
-
-#: Model/Attribute.php:167
-msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
-msgstr ""
-
 #: Model/Attribute.php:168
-msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
+msgid "eduPersonPrincipalName - eppn - the NetId of the person for the purposes of inter-institutional authentication. Should be stored in the form of user@univ.edu, where univ.edu is the name of the local security domain."
 msgstr ""
 
 #: Model/Attribute.php:169
-msgid "Registry key or value"
+msgid "A recipient email address"
+msgstr ""
+
+#: Model/Attribute.php:169
+msgid "A recipient email address that is not related to your constituency."
 msgstr ""
 
 #: Model/Attribute.php:170
-msgid "Registry value + data separated by |"
+msgid "The subject of the email"
 msgstr ""
 
 #: Model/Attribute.php:171
-msgid "Autonomous system"
+msgid "File name of the email attachment."
 msgstr ""
 
 #: Model/Attribute.php:172
-msgid "An IDS rule in Snort rule-format"
-msgstr ""
-
-#: Model/Attribute.php:172
-msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
+msgid "Email body"
 msgstr ""
 
 #: Model/Attribute.php:173
-msgid "An NIDS rule in the Bro rule-format"
-msgstr ""
-
-#: Model/Attribute.php:173
-msgid "An NIDS rule in the Bro rule-format."
+msgid "A floating point value."
 msgstr ""
 
 #: Model/Attribute.php:174
-msgid "An NIDS rule in the Zeek rule-format"
-msgstr ""
-
-#: Model/Attribute.php:174
-msgid "An NIDS rule in the Zeek rule-format."
+msgid "url"
 msgstr ""
 
 #: Model/Attribute.php:175
-msgid "Pattern in file that identifies the malware"
+msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
 msgstr ""
 
 #: Model/Attribute.php:176
-msgid "Pattern in network traffic that identifies the malware"
+msgid "The user-agent used by the malware in the HTTP request."
 msgstr ""
 
 #: Model/Attribute.php:177
-msgid "Pattern in memory dump that identifies the malware"
+msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
 msgstr ""
 
 #: Model/Attribute.php:178
-msgid "Yara signature"
+msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
 #: Model/Attribute.php:179
-msgid "STIX 2 pattern"
+msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
 #: Model/Attribute.php:180
-msgid "Sigma - Generic Signature Format for SIEM Systems"
+msgid "Registry key or value"
 msgstr ""
 
 #: Model/Attribute.php:181
-msgid "GENE - Go Evtx sigNature Engine"
+msgid "Registry value + data separated by |"
 msgstr ""
 
 #: Model/Attribute.php:182
-msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
+msgid "Autonomous system"
 msgstr ""
 
 #: Model/Attribute.php:183
-msgid "Identity card number"
+msgid "An IDS rule in Snort rule-format"
+msgstr ""
+
+#: Model/Attribute.php:183
+msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
 msgstr ""
 
 #: Model/Attribute.php:184
-msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
+msgid "An NIDS rule in the Bro rule-format"
+msgstr ""
+
+#: Model/Attribute.php:184
+msgid "An NIDS rule in the Bro rule-format."
 msgstr ""
 
 #: Model/Attribute.php:185
-msgid "A reference to the vulnerability used in the exploit"
+msgid "An NIDS rule in the Zeek rule-format"
+msgstr ""
+
+#: Model/Attribute.php:185
+msgid "An NIDS rule in the Zeek rule-format."
 msgstr ""
 
 #: Model/Attribute.php:186
-msgid "Attachment with external information"
-msgstr ""
-
-#: Model/Attribute.php:186;187
-msgid "Please upload files using the <em>Upload Attachment</em> button."
+msgid "a community ID flow hashing algorithm to map multiple traffic monitors into common flow id"
 msgstr ""
 
 #: Model/Attribute.php:187
-msgid "Attachment containing encrypted malware sample"
+msgid "Pattern in file that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:188
-msgid "Link to an external information"
+msgid "Pattern in network traffic that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:189
-msgid "Comment or description in a human language"
-msgstr ""
-
-#: Model/Attribute.php:189
-msgid "Comment or description in a human language.  This will not be correlated with other attributes"
+msgid "Pattern in memory dump that identifies the malware"
 msgstr ""
 
 #: Model/Attribute.php:190
-msgid "Name, ID or a reference"
+msgid "Yara signature"
 msgstr ""
 
 #: Model/Attribute.php:191
-msgid "A value in hexadecimal format"
+msgid "STIX 2 pattern"
 msgstr ""
 
 #: Model/Attribute.php:192
-msgid "Other attribute"
+msgid "Sigma - Generic Signature Format for SIEM Systems"
 msgstr ""
 
 #: Model/Attribute.php:193
-msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
+msgid "GENE - Go Evtx sigNature Engine"
 msgstr ""
 
 #: Model/Attribute.php:194
-msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
+msgid "Kusto query - Kusto from Microsoft Azure is a service for storing and running interactive analytics over Big Data."
 msgstr ""
 
 #: Model/Attribute.php:195
-msgid "Attack Targets Username(s)"
+msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
 msgstr ""
 
 #: Model/Attribute.php:196
-msgid "Attack Targets Email(s)"
+msgid "Identity card number"
 msgstr ""
 
 #: Model/Attribute.php:197
-msgid "Attack Targets Machine Name(s)"
+msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
 msgstr ""
 
 #: Model/Attribute.php:198
-msgid "Attack Targets Department or Organization(s)"
+msgid "A reference to the vulnerability used in the exploit"
 msgstr ""
 
 #: Model/Attribute.php:199
-msgid "Attack Targets Physical Location(s)"
+msgid "A reference to the weakness used in the exploit"
 msgstr ""
 
 #: Model/Attribute.php:200
-msgid "External Target Organizations Affected by this Attack"
+msgid "Attachment with external information"
+msgstr ""
+
+#: Model/Attribute.php:200;201
+msgid "Please upload files using the <em>Upload Attachment</em> button."
 msgstr ""
 
 #: Model/Attribute.php:201
-msgid "Bitcoin Address"
+msgid "Attachment containing encrypted malware sample"
 msgstr ""
 
 #: Model/Attribute.php:202
-msgid "Monero Address"
+msgid "Link to an external information"
 msgstr ""
 
 #: Model/Attribute.php:203
-msgid "International Bank Account Number"
+msgid "Comment or description in a human language"
+msgstr ""
+
+#: Model/Attribute.php:203
+msgid "Comment or description in a human language.  This will not be correlated with other attributes"
 msgstr ""
 
 #: Model/Attribute.php:204
-msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
+msgid "Name, ID or a reference"
 msgstr ""
 
 #: Model/Attribute.php:205
-msgid "Bank account number without any routing number"
+msgid "A value in hexadecimal format"
 msgstr ""
 
 #: Model/Attribute.php:206
-msgid "ABA routing transit number"
+msgid "Other attribute"
 msgstr ""
 
 #: Model/Attribute.php:207
-msgid "Bank Identification Number"
+msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
 msgstr ""
 
 #: Model/Attribute.php:208
-msgid "Credit-Card Number"
+msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
 msgstr ""
 
 #: Model/Attribute.php:209
-msgid "Premium-Rate Telephone Number"
+msgid "Attack Targets Username(s)"
 msgstr ""
 
 #: Model/Attribute.php:210
-msgid "Telephone Number"
+msgid "Attack Targets Email(s)"
 msgstr ""
 
 #: Model/Attribute.php:211
-msgid "A string identifying the threat actor"
+msgid "Attack Targets Machine Name(s)"
 msgstr ""
 
 #: Model/Attribute.php:212
-msgid "Associated campaign name"
+msgid "Attack Targets Department or Organization(s)"
 msgstr ""
 
 #: Model/Attribute.php:213
-msgid "Associated campaign ID"
+msgid "Attack Targets Physical Location(s)"
+msgstr ""
+
+#: Model/Attribute.php:214
+msgid "External Target Organizations Affected by this Attack"
 msgstr ""
 
 #: Model/Attribute.php:215
-msgid "Uniform Resource Identifier"
+msgid "Bitcoin Address"
 msgstr ""
 
 #: Model/Attribute.php:216
-msgid "Authenticode executable signature hash"
-msgstr ""
-
-#: Model/Attribute.php:216
-msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:217;229
-msgid "A checksum in ssdeep format"
+msgid "Dash Address"
 msgstr ""
 
 #: Model/Attribute.php:217
-msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:218;230
-msgid "Import hash - a hash created based on the imports in the sample."
+msgid "Monero Address"
 msgstr ""
 
 #: Model/Attribute.php:218
-msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
+msgid "International Bank Account Number"
 msgstr ""
 
 #: Model/Attribute.php:219
-msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
+msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
 msgstr ""
 
 #: Model/Attribute.php:220
-msgid "A fuzzy hash of import table of Portable Executable format"
-msgstr ""
-
-#: Model/Attribute.php:220
-msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
+msgid "Bank account number without any routing number"
 msgstr ""
 
 #: Model/Attribute.php:221
-msgid "A checksum in sha-224 format"
-msgstr ""
-
-#: Model/Attribute.php:221
-msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
+msgid "ABA routing transit number"
 msgstr ""
 
 #: Model/Attribute.php:222
-msgid "A checksum in sha-384 format"
-msgstr ""
-
-#: Model/Attribute.php:222
-msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
+msgid "Bank Identification Number"
 msgstr ""
 
 #: Model/Attribute.php:223
-msgid "A checksum in sha-512 format"
-msgstr ""
-
-#: Model/Attribute.php:223
-msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
+msgid "Credit-Card Number"
 msgstr ""
 
 #: Model/Attribute.php:224
-msgid "A checksum in the sha-512/224 format"
-msgstr ""
-
-#: Model/Attribute.php:224
-msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
+msgid "Premium-Rate Telephone Number"
 msgstr ""
 
 #: Model/Attribute.php:225
-msgid "A checksum in the sha-512/256 format"
-msgstr ""
-
-#: Model/Attribute.php:225
-msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
+msgid "Telephone Number"
 msgstr ""
 
 #: Model/Attribute.php:226
-msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
-msgstr ""
-
-#: Model/Attribute.php:226
-msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
+msgid "A string identifying the threat actor"
 msgstr ""
 
 #: Model/Attribute.php:227
-msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
+msgid "Associated campaign name"
+msgstr ""
+
+#: Model/Attribute.php:228
+msgid "Associated campaign ID"
+msgstr ""
+
+#: Model/Attribute.php:230
+msgid "Uniform Resource Identifier"
 msgstr ""
 
 #: Model/Attribute.php:231
-msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
+msgid "Authenticode executable signature hash"
+msgstr ""
+
+#: Model/Attribute.php:231
+msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:232;244
+msgid "A checksum in ssdeep format"
 msgstr ""
 
 #: Model/Attribute.php:232
-msgid "A filename and a PEhash separated by a |"
+msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:233;245
+msgid "Import hash - a hash created based on the imports in the sample."
 msgstr ""
 
 #: Model/Attribute.php:233
-msgid "A filename and a sha-224 hash separated by a |"
+msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:234
-msgid "A filename and a sha-384 hash separated by a |"
+msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
 msgstr ""
 
 #: Model/Attribute.php:235
-msgid "A filename and a sha-512 hash separated by a |"
+msgid "A fuzzy hash of import table of Portable Executable format"
+msgstr ""
+
+#: Model/Attribute.php:235
+msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:236
-msgid "A filename and a sha-512/224 hash separated by a |"
+msgid "A checksum in sha-224 format"
+msgstr ""
+
+#: Model/Attribute.php:236
+msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:237
-msgid "A filename and a sha-512/256 hash separated by a |"
+msgid "A checksum in sha-384 format"
+msgstr ""
+
+#: Model/Attribute.php:237
+msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:238
-msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
+msgid "A checksum in sha-512 format"
+msgstr ""
+
+#: Model/Attribute.php:238
+msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:239
-msgid "A scheduled task in windows"
+msgid "A checksum in the sha-512/224 format"
+msgstr ""
+
+#: Model/Attribute.php:239
+msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:240
-msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
+msgid "A checksum in the sha-512/256 format"
+msgstr ""
+
+#: Model/Attribute.php:240
+msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:241
-msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
+msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
+msgstr ""
+
+#: Model/Attribute.php:241
+msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
 msgstr ""
 
 #: Model/Attribute.php:242
-msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:243
-msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:244
-msgid "The name of a domain's registrant, obtained from the WHOIS information."
-msgstr ""
-
-#: Model/Attribute.php:245
-msgid "The org of a domain's registrant, obtained from the WHOIS information."
+msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
 msgstr ""
 
 #: Model/Attribute.php:246
-msgid "The registrar of the domain, obtained from the WHOIS information."
+msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
 msgstr ""
 
 #: Model/Attribute.php:247
-msgid "The date of domain's creation, obtained from the WHOIS information."
+msgid "A filename and a PEhash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:248
+msgid "A filename and a sha-224 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:249
+msgid "A filename and a sha-384 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:250
+msgid "A filename and a sha-512 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:251
+msgid "A filename and a sha-512/224 hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:252
-msgid "X509 fingerprint in SHA-1 format"
+msgid "A filename and a sha-512/256 hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:253
-msgid "X509 fingerprint in MD5 format"
+msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:254
-msgid "X509 fingerprint in SHA-256 format"
+msgid "A scheduled task in windows"
 msgstr ""
 
 #: Model/Attribute.php:255
-msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
+msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
 msgstr ""
 
 #: Model/Attribute.php:256
-msgid "Size expressed in bytes"
+msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
 msgstr ""
 
 #: Model/Attribute.php:257
-msgid "An integer counter, generally to be used in objects"
+msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:258
-msgid "Datetime in the ISO 8601 format"
+msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:259
-msgid "Common platform enumeration"
+msgid "The name of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:260
-msgid "Port number"
+msgid "The org of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:261
-msgid "IP destination and port number seperated by a |"
+msgid "The registrar of the domain, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:262
-msgid "IP source and port number seperated by a |"
-msgstr ""
-
-#: Model/Attribute.php:263
-msgid "Hostname and port number seperated by a |"
-msgstr ""
-
-#: Model/Attribute.php:264
-msgid "Mac address"
-msgstr ""
-
-#: Model/Attribute.php:265
-msgid "Mac EUI-64 address"
+msgid "The date of domain's creation, obtained from the WHOIS information."
 msgstr ""
 
 #: Model/Attribute.php:267
-msgid "Email destination display name"
+msgid "X509 fingerprint in SHA-1 format"
 msgstr ""
 
 #: Model/Attribute.php:268
-msgid "Email source display name"
+msgid "X509 fingerprint in MD5 format"
 msgstr ""
 
 #: Model/Attribute.php:269
-msgid "Email header"
+msgid "X509 fingerprint in SHA-256 format"
 msgstr ""
 
 #: Model/Attribute.php:270
-msgid "Email reply to header"
+msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
 msgstr ""
 
 #: Model/Attribute.php:271
-msgid "Email x-mailer header"
+msgid "Size expressed in bytes"
 msgstr ""
 
 #: Model/Attribute.php:272
-msgid "The email mime boundary separating parts in a multipart email"
+msgid "An integer counter, generally to be used in objects"
 msgstr ""
 
 #: Model/Attribute.php:273
-msgid "The email thread index header"
+msgid "Datetime in the ISO 8601 format"
 msgstr ""
 
 #: Model/Attribute.php:274
-msgid "The email message ID"
+msgid "Common platform enumeration"
 msgstr ""
 
 #: Model/Attribute.php:275
-msgid "A github user name"
+msgid "Port number"
 msgstr ""
 
 #: Model/Attribute.php:276
-msgid "A github repository"
+msgid "IP destination and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:277
-msgid "A github organisation"
+msgid "IP source and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:278
-msgid "Jabber ID"
+msgid "Hostname and port number separated by a |"
 msgstr ""
 
 #: Model/Attribute.php:279
-msgid "Twitter ID"
+msgid "Mac address"
 msgstr ""
 
 #: Model/Attribute.php:280
-msgid "First name of a natural person"
-msgstr ""
-
-#: Model/Attribute.php:281
-msgid "Middle name of a natural person"
+msgid "Mac EUI-64 address"
 msgstr ""
 
 #: Model/Attribute.php:282
-msgid "Last name of a natural person"
+msgid "Email destination display name"
 msgstr ""
 
 #: Model/Attribute.php:283
-msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
+msgid "Email source display name"
 msgstr ""
 
 #: Model/Attribute.php:284
-msgid "Place of birth of a natural person"
+msgid "Email header"
 msgstr ""
 
 #: Model/Attribute.php:285
-msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
+msgid "Email reply to header"
 msgstr ""
 
 #: Model/Attribute.php:286
-msgid "The passport number of a natural person"
+msgid "Email x-mailer header"
 msgstr ""
 
 #: Model/Attribute.php:287
-msgid "The country in which the passport was issued"
+msgid "The email mime boundary separating parts in a multipart email"
 msgstr ""
 
 #: Model/Attribute.php:288
-msgid "The expiration date of a passport"
+msgid "The email thread index header"
 msgstr ""
 
 #: Model/Attribute.php:289
-msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
+msgid "The email message ID"
 msgstr ""
 
 #: Model/Attribute.php:290
-msgid "The nationality of a natural person"
+msgid "A github user name"
 msgstr ""
 
 #: Model/Attribute.php:291
-msgid "Visa number"
+msgid "A github repository"
 msgstr ""
 
 #: Model/Attribute.php:292
-msgid "The date on which the visa was issued"
+msgid "A github organisation"
 msgstr ""
 
 #: Model/Attribute.php:293
-msgid "The primary residence of a natural person"
+msgid "Jabber ID"
 msgstr ""
 
 #: Model/Attribute.php:294
-msgid "The country of residence of a natural person"
+msgid "Twitter ID"
 msgstr ""
 
 #: Model/Attribute.php:295
-msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
+msgid "First name of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:296
-msgid "The frequent flyer number of a passenger"
+msgid "Middle name of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:297
+msgid "Last name of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:298
+msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
 msgstr ""
 
 #: Model/Attribute.php:299
-msgid "Travel details"
+msgid "Place of birth of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:300
-msgid "Payment details"
+msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
 msgstr ""
 
 #: Model/Attribute.php:301
-msgid "The orignal port of embarkation"
+msgid "The passport number of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:302
-msgid "The port of clearance"
+msgid "The country in which the passport was issued"
 msgstr ""
 
 #: Model/Attribute.php:303
-msgid "A Port where the passenger is transiting to"
+msgid "The expiration date of a passport"
 msgstr ""
 
 #: Model/Attribute.php:304
-msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
+msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
 msgstr ""
 
 #: Model/Attribute.php:305
-msgid "The application id of a mobile application"
+msgid "The nationality of a natural person"
 msgstr ""
 
 #: Model/Attribute.php:306
-msgid "Cortex analysis result"
+msgid "Visa number"
 msgstr ""
 
 #: Model/Attribute.php:307
+msgid "The date on which the visa was issued"
+msgstr ""
+
+#: Model/Attribute.php:308
+msgid "The primary residence of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:309
+msgid "The country of residence of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:310
+msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
+msgstr ""
+
+#: Model/Attribute.php:311
+msgid "The frequent flyer number of a passenger"
+msgstr ""
+
+#: Model/Attribute.php:314
+msgid "Travel details"
+msgstr ""
+
+#: Model/Attribute.php:315
+msgid "Payment details"
+msgstr ""
+
+#: Model/Attribute.php:316
+msgid "The orignal port of embarkation"
+msgstr ""
+
+#: Model/Attribute.php:317
+msgid "The port of clearance"
+msgstr ""
+
+#: Model/Attribute.php:318
+msgid "A Port where the passenger is transiting to"
+msgstr ""
+
+#: Model/Attribute.php:319
+msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
+msgstr ""
+
+#: Model/Attribute.php:320
+msgid "The application id of a mobile application"
+msgstr ""
+
+#: Model/Attribute.php:321
+msgid "Chrome extension id"
+msgstr ""
+
+#: Model/Attribute.php:322
+msgid "Cortex analysis result"
+msgstr ""
+
+#: Model/Attribute.php:323
 msgid "Boolean value - to be used in objects"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship."
 msgstr ""
 
-#: Model/Attribute.php:603
+#: Model/Attribute.php:644
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:728
+#: Model/Attribute.php:791
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:862
+#: Model/Attribute.php:935
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:987
+#: Model/Attribute.php:1074
 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:994
+#: Model/Attribute.php:1081
 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:1001
+#: Model/Attribute.php:1088
 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:1012
+#: Model/Attribute.php:1099
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:1023
+#: Model/Attribute.php:1110
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:1030
+#: Model/Attribute.php:1117
 msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
 msgstr ""
 
-#: Model/Attribute.php:1045
+#: Model/Attribute.php:1132
 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:1063
+#: Model/Attribute.php:1150
 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:1068
+#: Model/Attribute.php:1155
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1079
+#: Model/Attribute.php:1166
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr ""
 
-#: Model/Attribute.php:1087
+#: Model/Attribute.php:1174
 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:1098
+#: Model/Attribute.php:1185
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1105;1156
+#: Model/Attribute.php:1192;1243
 msgid "IP address has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1110
+#: Model/Attribute.php:1197
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr ""
 
-#: Model/Attribute.php:1139
+#: Model/Attribute.php:1226
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1159
+#: Model/Attribute.php:1246
 msgid "Domain name has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1172
+#: Model/Attribute.php:1260
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1180
+#: Model/Attribute.php:1268
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr ""
 
-#: Model/Attribute.php:1191
+#: Model/Attribute.php:1276
+msgid "Invalid format. Expected: CWE-x..."
+msgstr ""
+
+#: Model/Attribute.php:1287
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1306
+#: Model/Attribute.php:1405
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr ""
 
-#: Model/Attribute.php:1312
+#: Model/Attribute.php:1411
 msgid "The value has to be a number greater or equal 0."
 msgstr ""
 
-#: Model/Attribute.php:1319
+#: Model/Attribute.php:1418
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:2065;2133
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2757
+#: Model/Attribute.php:2301
+msgid "Invalid hash type."
+msgstr ""
+
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr ""
 
-#: Model/Attribute.php:3233
+#: Model/Attribute.php:3559
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/Attribute.php:3921;3928;3932
-msgid "Attribute not found or not authorised."
-msgstr "Attributet hittades inte eller auktorisation saknas."
+#: Model/Community.php:26;67
+msgid "Default community list not found."
+msgstr ""
 
-#: Model/Event.php:378
+#: Model/Community.php:30;71
+msgid "Default community list empty."
+msgstr ""
+
+#: Model/Community.php:35;76
+msgid "Default community list not in the expected format."
+msgstr ""
+
+#: Model/Community.php:93
+msgid "Community not found."
+msgstr ""
+
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
+#: Model/DecayingModel.php:162
+msgid "Models could not be loaded or default decaying models folder is empty"
+msgstr ""
+
+#: Model/DecayingModel.php:351
+msgid "No tags nor predicates with `numerical_value`"
+msgstr ""
+
+#: Model/DecayingModel.php:358
+msgid "No predicate"
+msgstr ""
+
+#: Model/DecayingModel.php:437
+msgid "The class for `%s` was not found or not loaded correctly"
+msgstr ""
+
+#: Model/Event.php:390
 msgid "Click this to download all events and attributes that you have access to in MISP JSON format."
 msgstr ""
 
-#: Model/Event.php:386
+#: Model/Event.php:398
 msgid "Click this to download all events and attributes that you have access to in MISP XML format."
 msgstr ""
 
-#: Model/Event.php:394
+#: Model/Event.php:406
 #: View/Events/export_alternate.ctp:19
 msgid "Click this to download all attributes that are indicators and that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:402
+#: Model/Event.php:414
 #: View/Events/export_alternate.ctp:26
 msgid "Click this to download all attributes that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:410
+#: Model/Event.php:422
 msgid "Click this to download all network related attributes that you have access to under the Suricata rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:418
+#: Model/Event.php:430
 msgid "Click this to download all network related attributes that you have access to under the Snort rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:426
+#: Model/Event.php:438
 msgid "Click this to download all network related attributes that you have access to under the Bro rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:434
+#: Model/Event.php:446
 msgid "Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:442
+#: Model/Event.php:454
 msgid "Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:450
+#: Model/Event.php:462
 #: 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 ""
 
-#: Model/Event.php:458
+#: Model/Event.php:470
 msgid "Click on one of the buttons below to download all the attributes with the matching type. This list can be used to feed forensic software when searching for susipicious files. Only published events and attributes marked as IDS Signature are exported."
 msgstr ""
 
-#: Model/Event.php:466
+#: Model/Event.php:478
 msgid "Click this to download Yara rules generated from all relevant attributes."
 msgstr ""
 
-#: Model/Event.php:474
+#: Model/Event.php:486
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5774
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:5776
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:5778
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:5781
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:5783
+#: Model/Event.php:5808
 msgid "Please "
 msgstr ""
 
-#: Model/Event.php:5785
+#: Model/Event.php:5810
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:5817
+#: Model/Event.php:5842
 msgid "#"
 msgstr ""
 
-#: Model/Event.php:5826
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr ""
 
-#: Model/Event.php:6068
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr ""
 
-#: Model/Event.php:6538
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:1545;1589
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1559
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Galaxy.php:219;276;286;300
-msgid "Invalid %s."
+#: Model/Feed.php:1687
+msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Galaxy.php:416
+#: Model/Feed.php:1690
+msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
+msgstr ""
+
+#: Model/Feed.php:1695
+msgid "Invalid user id."
+msgstr ""
+
+#: Model/Feed.php:1715
+msgid "Events related to feed %s purged."
+msgstr ""
+
+#: Model/Galaxy.php:421
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:808
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
 #: Model/Server.php:123
-msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
+msgid "Server unreachable"
 msgstr ""
 
 #: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
+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:151
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:134
+#: Model/Server.php:163
 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:135
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:144
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:145
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:154
+#: Model/Server.php:183
 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:156
+#: Model/Server.php:185
 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:162
+#: Model/Server.php:191
 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:170
+#: Model/Server.php:199
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:178
+#: Model/Server.php:207
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:188
-msgid "Enable some performance heavy correlations (currently CIDR correlation)"
-msgstr ""
-
-#: Model/Server.php:197
-msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
-msgstr ""
-
-#: Model/Server.php:206
-msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
-msgstr ""
-
 #: Model/Server.php:217
-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."
+msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
 #: Model/Server.php:226
+msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
+msgstr ""
+
+#: Model/Server.php:235
+msgid "Enable some performance heavy correlations (currently CIDR correlation)"
+msgstr ""
+
+#: Model/Server.php:244
+msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
+msgstr ""
+
+#: Model/Server.php:253
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:264
+msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:274
+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:283
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:234
+#: Model/Server.php:291
 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:243
+#: Model/Server.php:300
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:245
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:251;259;286;310;318;326;334;391;439;447;514
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:267
+#: Model/Server.php:324
 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:277
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr ""
 
-#: Model/Server.php:294
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:302
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:342
+#: Model/Server.php:399
 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:350
+#: Model/Server.php:407
 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:358
+#: Model/Server.php:415
 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:366
+#: Model/Server.php:423
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:374
+#: Model/Server.php:431
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:383
+#: Model/Server.php:440
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:385
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:399
+#: Model/Server.php:456
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:407
+#: Model/Server.php:464
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:415
+#: Model/Server.php:472
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:423
+#: Model/Server.php:480
 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:431
+#: Model/Server.php:488
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:455
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:463
+#: Model/Server.php:520
 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:473
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:481
+#: Model/Server.php:538
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:489
+#: Model/Server.php:546
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:497
+#: Model/Server.php:554
 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:506
+#: Model/Server.php:563
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:522
+#: Model/Server.php:579
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:530
+#: Model/Server.php:587
+msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
+msgstr ""
+
+#: Model/Server.php:595
 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:538
+#: Model/Server.php:603
 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:546
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:555
+#: Model/Server.php:620
 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:564
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:582
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:590
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:599
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:607
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:615
+#: Model/Server.php:689
 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:623
+#: Model/Server.php:697
 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:631
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:639
+#: Model/Server.php:713
 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:647
+#: Model/Server.php:721
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:655
+#: Model/Server.php:729
 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:663
+#: Model/Server.php:737
 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:671
+#: Model/Server.php:745
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:680
+#: Model/Server.php:754
 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:689
+#: Model/Server.php:763
 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:697
+#: Model/Server.php:771
 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:704
+#: Model/Server.php:778
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:711
+#: Model/Server.php:785
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:720
+#: Model/Server.php:794
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:728
+#: Model/Server.php:802
+msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
+msgstr ""
+
+#: Model/Server.php:804
+msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
+msgstr ""
+
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:737
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:746
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:755
+#: Model/Server.php:838
+msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
+msgstr ""
+
+#: Model/Server.php:847
 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:764
+#: Model/Server.php:856
 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:773
+#: Model/Server.php:865
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:782
+#: Model/Server.php:874
 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:791
+#: Model/Server.php:883
 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:800
+#: Model/Server.php:892
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:810
+#: Model/Server.php:902
 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:819
+#: Model/Server.php:911
 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:828
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:837
+#: Model/Server.php:929
 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:846
-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"
+#: Model/Server.php:938
+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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:855
+#: Model/Server.php:947
+msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:956
 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:865
+#: Model/Server.php:966
 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:874
+#: Model/Server.php:975
 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:883
+#: Model/Server.php:984
 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:892
+#: Model/Server.php:993
 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:902
+#: Model/Server.php:1003
 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:911
+#: Model/Server.php:1012
 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:919
+#: Model/Server.php:1020
 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:927
+#: Model/Server.php:1028
 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:935
+#: Model/Server.php:1036
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:944
+#: Model/Server.php:1045
 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:952
+#: Model/Server.php:1053
 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:960
+#: Model/Server.php:1061
 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:969
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:980
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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:989
+#: Model/Server.php:1099
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1107
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:1005
+#: Model/Server.php:1115
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:1013
+#: Model/Server.php:1123
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:1021
+#: Model/Server.php:1131
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:1030
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:1041
+#: Model/Server.php:1151
 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:1049
+#: Model/Server.php:1159
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:1057
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1065
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:1073
+#: Model/Server.php:1183
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:1085
+#: Model/Server.php:1195
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:1093
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1101
+#: Model/Server.php:1211
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:1109
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1117
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1128
+#: Model/Server.php:1238
+msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
+msgstr ""
+
+#: Model/Server.php:1247
 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:1137
+#: Model/Server.php:1257
 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:1146
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1154
+#: Model/Server.php:1292
 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:1162
+#: Model/Server.php:1300
 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:1171
+#: Model/Server.php:1309
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1180
+#: Model/Server.php:1318
 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:1189
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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:1191
+#: Model/Server.php:1339
 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:1198
+#: Model/Server.php:1346
 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:1207
+#: Model/Server.php:1355
 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:1219
+#: Model/Server.php:1364
+msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
+msgstr ""
+
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1227
+#: Model/Server.php:1393
 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:1238
+#: Model/Server.php:1404
 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:1246
+#: Model/Server.php:1412
 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:1254
+#: Model/Server.php:1420
 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:1263
+#: Model/Server.php:1429
 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:1271
+#: Model/Server.php:1437
 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:1282
+#: Model/Server.php:1448
 msgid "The default policy action for the values added to the RPZ."
 msgstr ""
 
-#: Model/Server.php:1291
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1299
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:1307
+#: Model/Server.php:1473
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1315
+#: Model/Server.php:1481
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1323
+#: Model/Server.php:1489
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1331
+#: Model/Server.php:1497
 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:1339
+#: Model/Server.php:1505
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1347
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr ""
 
-#: Model/Server.php:1355
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1363
+#: Model/Server.php:1529
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1371
+#: Model/Server.php:1537
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1379
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr ""
 
-#: Model/Server.php:1387
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr ""
 
-#: Model/Server.php:1395;1642
+#: Model/Server.php:1561;1808
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1403;1650
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1411
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1419
+#: Model/Server.php:1585
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:1427
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr ""
 
-#: Model/Server.php:1435;1658
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1443
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1451;1666
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1459
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1467;1674
+#: Model/Server.php:1633;1840
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1475
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1483
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1491
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1499;1682
+#: Model/Server.php:1665;1848
 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:1507
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1515
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr ""
 
-#: Model/Server.php:1523
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr ""
 
-#: Model/Server.php:1531
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr ""
 
-#: Model/Server.php:1539
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr ""
 
-#: Model/Server.php:1547
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1555
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:1563
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1571
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr ""
 
-#: Model/Server.php:1579
+#: Model/Server.php:1745
 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:1588
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1597
+#: Model/Server.php:1763
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1606
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1615
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1624
+#: Model/Server.php:1790
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1799
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1690
+#: Model/Server.php:1856
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1698
+#: Model/Server.php:1864
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1706
+#: Model/Server.php:1872
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1714
+#: Model/Server.php:1880
 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:1722
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1730
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1738
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1746
+#: Model/Server.php:1912
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1754
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1762
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1770
+#: Model/Server.php:1936
 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:1778
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1786
+#: Model/Server.php:1952
 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:1795
+#: Model/Server.php:1961
 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:1803
+#: Model/Server.php:1969
 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:1811
+#: Model/Server.php:1977
+msgid "Enable SightingDB integration."
+msgstr ""
+
+#: Model/Server.php:1985
 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:1821
+#: Model/Server.php:1995
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1830
+#: Model/Server.php:2004
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1839
+#: Model/Server.php:2013
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1848
+#: Model/Server.php:2022
 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:1857
+#: Model/Server.php:2031
 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:1866
+#: Model/Server.php:2040
 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:1875
+#: Model/Server.php:2049
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1883
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1891
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1899
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1907
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1915
+#: Model/Server.php:2089
 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:1923
+#: Model/Server.php:2097
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1931
+#: Model/Server.php:2105
 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:1939
+#: Model/Server.php:2113
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1947
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1955
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1963
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1971
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1979
+#: Model/Server.php:2153
 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:1987
+#: Model/Server.php:2161
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1995
+#: Model/Server.php:2169
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:2003
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:2011
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2019
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:2028
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr ""
 
-#: Model/Server.php:2036
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:2045
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:2054
+#: Model/Server.php:2228
 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:2063
+#: Model/Server.php:2237
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:2072
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:2081
+#: Model/Server.php:2255
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:2091
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:2100
+#: Model/Server.php:2274
 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:2254
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2258
+#: Model/Server.php:2445
 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:2285
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr ""
 
-#: Model/Server.php:2291
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr ""
 
-#: Model/Server.php:2369
+#: Model/Server.php:2557
 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:2371
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr ""
 
-#: Model/Server.php:2372
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2384;2386
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr ""
 
-#: Model/Server.php:2850
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2853
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2861
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2976
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3676
+#: Model/Server.php:3281
+msgid "Invalid language."
+msgstr ""
+
+#: Model/Server.php:3302
+msgid "Invalid tag_collection."
+msgstr ""
+
+#: Model/Server.php:3310
+msgid "This setting has to be a number."
+msgstr ""
+
+#: Model/Server.php:3322
+msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
+msgstr ""
+
+#: Model/Server.php:3619
+msgid "Invalid file path or file not accessible."
+msgstr ""
+
+#: Model/Server.php:3622
+msgid "File has to be in .pem format."
+msgstr ""
+
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr ""
 
-#: Model/Server.php:3808
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr ""
 
-#: Model/Server.php:3809
+#: Model/Server.php:4121
 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:3811
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr ""
 
-#: Model/Server.php:3814;3829
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
 msgstr ""
 
-#: Model/Server.php:3818
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr ""
 
-#: Model/Server.php:3819
+#: Model/Server.php:4131
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:3826
+#: Model/Server.php:4138
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:4014
+#: Model/Server.php:4228
+msgid "Invalid server."
+msgstr ""
+
+#: Model/Server.php:4259
+msgid "Response was empty."
+msgstr ""
+
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:4471
+#: Model/Server.php:4604
+msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
+msgstr ""
+
+#: Model/Server.php:4675
+msgid "Can't check database schema for Postgres database type"
+msgstr ""
+
+#: Model/Server.php:4692
+msgid "Table `%s` does not exist"
+msgstr ""
+
+#: Model/Server.php:4719
+msgid "Column `%s` exists but should not"
+msgstr ""
+
+#: Model/Server.php:4752
+msgid "Column `%s` is different"
+msgstr ""
+
+#: Model/Server.php:4762
+msgid "Column `%s` does not exist but should"
+msgstr ""
+
+#: Model/Server.php:4775
+msgid "Table `%s` is an additional table"
+msgstr ""
+
+#: Model/Server.php:4799
+msgid "Column `%s` should be indexed"
+msgstr ""
+
+#: Model/Server.php:4822
+msgid "Column `%s` is indexed but should not"
+msgstr ""
+
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:4472
+#: Model/Server.php:5253
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:4476
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:4477
+#: Model/Server.php:5258
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:4805
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:4805;4834
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:4817
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:4818
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:4931
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:4938
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:4945
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr ""
 
+#: Model/Server.php:5911
+msgid "Could not reset the remote authentication key."
+msgstr ""
+
+#: Model/Server.php:5988
+msgid "Could not parse JSON: "
+msgstr ""
+
+#: Model/Server.php:6008
+msgid "Could not reset fetch remote user account."
+msgstr ""
+
+#: Model/Server.php:6030
+msgid "No user object received in response."
+msgstr ""
+
+#: Model/Sightingdb.php:346
+msgid "Could not resolve Sightingdb address."
+msgstr ""
+
+#: Model/Sightingdb.php:348
+msgid "Something went wrong. Could not contact the SightingDB server."
+msgstr ""
+
+#: Model/Sightingdb.php:363
+msgid "The SightingDB returned an invalid response."
+msgstr ""
+
+#: Model/Sightingdb.php:366
+msgid "No response from the SightingDB server."
+msgstr ""
+
+#: Model/Taxonomy.php:619
+msgid "Taxonomy `%s` is an exclusive Taxonomy"
+msgstr ""
+
+#: Model/Taxonomy.php:626
+msgid "Predicate `%s` is exclusive"
+msgstr ""
+
+#: Model/User.php:1254
+msgid "reset_all_sync_api_keys"
+msgstr ""
+
+#: Model/User.php:1255
+msgid "Reseting all API keys"
+msgstr ""
+
+#: Model/User.php:1317
+msgid "Reset in progress - %s/%s."
+msgstr ""
+
+#: Model/User.php:1322
+msgid "%s authkeys reset, %s could not be reset"
+msgstr ""
+
+#: Model/User.php:1347
+msgid "Authentication key for user %s (%s) updated."
+msgstr ""
+
+#: Model/User.php:1359
+msgid "Dear user,\n\n"
+"an API key reset has been triggered by an administrator for your user account on %s.\n\n"
+"Your new API key is: %s\n\n"
+"Please update your server's sync setup to reflect this change.\n\n"
+"We apologise for the inconvenience."
+msgstr ""
+
+#: Model/User.php:1364
+msgid "Dear user,\n\n"
+"an API key reset has been triggered by an administrator for your user account on %s.\n\n"
+"Your new API key can be retrieved by logging in using this sync user's account.\n\n"
+"Please update your server's sync setup to reflect this change.\n\n"
+"We apologise for the inconvenience."
+msgstr ""
+
+#: Model/User.php:1373
+msgid "API key reset by administrator"
+msgstr ""
+
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/Polynomial.php:7
+msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/PolynomialExtended.php:7
+msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms` with support of the `Retention` taxonomy which overrides the final score."
+msgstr ""
+
+#: Model/DecayingModelsFormulas/PolynomialExtended.php:17
+msgid "`Retention` taxonomy not available"
+msgstr ""
+
 #: Plugin/Assets/models/behaviors/LogableBehavior.php:361
 msgid "deleted"
 msgstr ""
@@ -4036,19 +5509,19 @@ msgstr ""
 msgid "it has the following dependent items"
 msgstr ""
 
-#: View/Attributes/add.ctp:7
+#: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
 
-#: View/Attributes/add.ctp:7
+#: View/Attributes/add.ctp:6
 #: View/Attributes/edit.ctp:4
 msgid "Edit Attribute"
 msgstr ""
 
-#: View/Attributes/add.ctp:14
+#: View/Attributes/add.ctp:18
 #: View/Attributes/attribute_replace.ctp:12
 #: View/Attributes/edit.ctp:8
 #: View/ShadowAttributes/add.ctp:10
@@ -4056,53 +5529,26 @@ msgstr ""
 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 "
+#: View/Attributes/add.ctp:25
+msgid "(choose category first)"
 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.ctp:39
 #: 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:178
-#: View/Feeds/edit.ctp:173
+#: View/Events/add.ctp:33
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
+#: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
 msgstr ""
 
-#: View/Attributes/add.ctp:67
+#: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -4111,133 +5557,52 @@ msgstr ""
 msgid "Contextual Comment"
 msgstr ""
 
-#: View/Attributes/add.ctp:76
+#: View/Attributes/add.ctp:57
 #: 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;202
-#: View/Events/contact.ctp:29
-#: View/Events/edit.ctp:61
-#: View/Events/free_text_import.ctp:27
-#: View/Events/resolved_misp_format.ctp:350
-#: View/News/add.ctp:33
-#: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:131
-#: View/Objects/add.ctp:153
-#: View/Organisations/admin_add.ctp:49
-#: View/Organisations/admin_edit.ctp:60
-#: View/Posts/add.ctp:66
-#: View/Posts/edit.ctp:20
-#: View/Servers/add.ctp:119
-#: View/Servers/edit.ctp:164
-#: View/Servers/ondemand_action.ctp:53
-#: 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/Users/statistics_galaxymatrix.ctp:31
-#: View/Whitelists/admin_edit.ctp:13
-msgid "Submit"
+#: View/Attributes/add.ctp:155
+msgid "Timezone missing, auto-detected as: "
 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:203
-#: 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/resolved_misp_format.ctp:351
-#: View/Events/ajax/enrich_event.ctp:22
-#: View/Events/ajax/enrichmentChoice.ctp:35
-#: 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:135
-#: View/ObjectReferences/ajax/delete.ctp:37
-#: View/Objects/add.ctp:159
-#: View/Objects/revise_object.ctp:105
-#: 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"
+#: View/Attributes/add.ctp:156
+msgid "The following value will be submited instead: "
+msgstr ""
+
+#: View/Attributes/add.ctp:164
+msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr ""
 
 #: View/Attributes/add_attachment.ctp:4
 msgid "Add Attachment(s)"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:64
+#: 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_attachment.ctp:24
+#: View/Attributes/edit.ctp:24
+#: View/Objects/ajax/quickAddAttributeForm.ctp:59
+msgid "Distribution "
+msgstr ""
+
+#: View/Attributes/add_attachment.ctp:63
 msgid "Is a malware sample (encrypt and hash)"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:73
+#: View/Attributes/add_attachment.ctp:72
 msgid "Advanced extraction (if installed)"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:78
+#: View/Attributes/add_attachment.ctp:77
 #: View/Elements/healthElements/files.ctp:92
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
@@ -4259,24 +5624,30 @@ msgid "This is a list of events that match the given search criteria sorted acco
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:6
+#: View/EventDelegations/index.ctp:70
 msgid "Event id"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:7
 #: View/Attributes/index.ctp:49
-#: View/Elements/eventattribute.ctp:146
+#: View/DecayingModel/decaying_tool_rest_search.ctp:24
+#: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:8
-#: View/Elements/Events/View/row_attribute.ctp:68
+#: View/Elements/Events/View/row_attribute.ctp:71
 #: View/EventBlacklists/add.ctp:24
 #: View/EventBlacklists/edit.ctp:25
+#: View/EventDelegations/index.ctp:78
 #: View/Events/add_misp_export_result.ctp:5
 #: View/Events/resolved_misp_format.ctp:51
 msgid "Event info"
@@ -4287,7 +5658,7 @@ msgid "Event date"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:472
+#: View/Events/view.ctp:509
 msgid "Event graph"
 msgstr ""
 
@@ -4309,6 +5680,13 @@ msgstr ""
 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:15
+#: View/Attributes/edit.ctp:12
+#: View/ShadowAttributes/add.ctp:15
+#: View/ShadowAttributes/edit.ctp:13
+msgid "(first choose category)"
+msgstr ""
+
 #: View/Attributes/attribute_replace.ctp:19
 msgid "Mark all new attributes as to IDS"
 msgstr ""
@@ -4320,10 +5698,10 @@ msgid "Values"
 msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
-#: View/ShadowAttributes/add.ctp:46
+#: View/ShadowAttributes/add.ctp:57
 #: 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
@@ -4341,6 +5719,115 @@ msgstr ""
 msgid "Replaceattributes"
 msgstr ""
 
+#: View/Attributes/attribute_replace.ctp:38
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Elements/view_galaxy_matrix.ctp:76;211
+#: View/Elements/genericElements/Form/submitButton.ctp:8;25
+#: View/Events/contact.ctp:29
+#: View/Events/free_text_import.ctp:27
+#: View/Events/resolved_misp_format.ctp:386
+#: View/News/add.ctp:33
+#: View/News/edit.ctp:34
+#: View/ObjectReferences/ajax/add.ctp:131
+#: View/Objects/add.ctp:166
+#: View/Objects/ajax/quickAddAttributeForm.ctp:119
+#: View/Organisations/admin_add.ctp:48
+#: View/Organisations/admin_edit.ctp:59
+#: View/Posts/add.ctp:66
+#: View/Posts/edit.ctp:20
+#: View/Servers/add.ctp:129
+#: View/Servers/edit.ctp:171
+#: View/Servers/ondemand_action.ctp:54
+#: 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/UserSettings/set_setting.ctp:36
+#: View/Users/admin_add.ctp:98
+#: 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/Users/statistics_galaxymatrix.ctp:31
+#: View/Whitelists/admin_edit.ctp:13
+msgid "Submit"
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
+#: 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:212
+#: View/Elements/genericElements/infoModal.ctp:40
+#: View/Elements/genericElements/Form/submitButton.ctp:13
+#: View/Elements/serverRuleElements/pull.ctp:73
+#: 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/resolved_misp_format.ctp:387
+#: View/Events/ajax/enrich_event.ctp:22
+#: View/Events/ajax/enrichmentChoice.ctp:35
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:135
+#: View/ObjectReferences/ajax/delete.ctp:37
+#: View/Objects/add.ctp:172
+#: View/Objects/revise_object.ctp:112
+#: 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:69
+#: View/ShadowAttributes/edit.ctp:68
+#: 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:26
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:32
+#: View/Warninglists/ajax/delete_confirmation.ctp:25
+msgid "Cancel"
+msgstr ""
+
 #: View/Attributes/check_composites.ctp:2
 msgid "Failed Composites"
 msgstr ""
@@ -4349,24 +5836,31 @@ msgstr ""
 msgid "No Failed Composites"
 msgstr ""
 
+#: View/Attributes/edit.ctp:13
+#: View/ShadowAttributes/add.ctp:16
+#: View/ShadowAttributes/edit.ctp:14
+msgid "Type "
+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
+#: View/ShadowAttributes/add.ctp:66
+#: View/ShadowAttributes/edit.ctp:56;65
 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:481
+#: View/Events/view.ctp:521
 #: 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
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr ""
 
@@ -4403,22 +5897,21 @@ msgid "Results for all attributes"
 msgstr ""
 
 #: View/Attributes/index.ctp:39;128
-#: View/Elements/eventattribute.ctp:60;227
+#: View/DecayingModel/decaying_tool_rest_search.ctp:12;64
+#: View/DecayingModel/index.ctp:13;169
+#: View/Elements/eventattribute.ctp:60;247
 #: 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/Elements/genericElements/IndexTable/pagination.ctp:10
+#: View/Elements/Feeds/eventattribute.ctp:20;87
+#: View/Elements/Servers/eventattribute.ctp:20;87
+#: View/Elements/genericElements/IndexTable/pagination.ctp:14
 #: View/EventBlacklists/index.ctp:13;85
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -4431,19 +5924,18 @@ msgstr ""
 #: 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;95
+#: View/Roles/admin_index.ctp:13;105
 #: View/Roles/index.ctp:13;68
-#: View/Servers/index.ctp:13;156
+#: View/Servers/index.ctp:13;202
 #: View/Servers/preview_index.ctp:15;190
-#: View/ShadowAttributes/index.ctp:12;118
-#: View/SharingGroups/index.ctp:13;105
+#: View/ShadowAttributes/index.ctp:12;128
+#: View/SharingGroups/index.ctp:13;107
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;65
 #: 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
@@ -4452,22 +5944,21 @@ msgid "previous"
 msgstr ""
 
 #: View/Attributes/index.ctp:41;130
-#: View/Elements/eventattribute.ctp:62;229
+#: View/DecayingModel/decaying_tool_rest_search.ctp:14;66
+#: View/DecayingModel/index.ctp:15;171
+#: View/Elements/eventattribute.ctp:62;249
 #: 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/Elements/genericElements/IndexTable/pagination.ctp:12
+#: View/Elements/Feeds/eventattribute.ctp:22;89
+#: View/Elements/Servers/eventattribute.ctp:22;89
+#: View/Elements/genericElements/IndexTable/pagination.ctp:16
 #: View/EventBlacklists/index.ctp:15;87
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -4480,19 +5971,18 @@ msgstr ""
 #: 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;97
+#: View/Roles/admin_index.ctp:15;107
 #: View/Roles/index.ctp:15;70
-#: View/Servers/index.ctp:15;158
+#: View/Servers/index.ctp:15;204
 #: View/Servers/preview_index.ctp:17;192
-#: View/ShadowAttributes/index.ctp:14;120
-#: View/SharingGroups/index.ctp:15;107
+#: View/ShadowAttributes/index.ctp:14;130
+#: View/SharingGroups/index.ctp:15;109
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;67
 #: 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
@@ -4500,26 +5990,41 @@ msgstr ""
 msgid "next"
 msgstr ""
 
+#: View/Attributes/index.ctp:47
+#: View/DecayingModel/decaying_tool_rest_search.ctp:23
+#: View/Elements/eventattribute.ctp:139
+#: View/Elements/Feeds/eventattribute.ctp:41
+#: View/Elements/Servers/eventattribute.ctp:41
+#: View/Events/proposal_event_index.ctp:30
+#: View/Events/view.ctp:143
+#: View/Feeds/preview_event.ctp:25
+#: View/Objects/group_attributes_into_object.ctp:56
+#: 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/Attributes/index.ctp:54
-#: View/Elements/eventattribute.ctp:157
-#: View/Elements/global_menu.ctp:90
-#: View/Events/view.ctp:493
+#: View/DecayingModel/decaying_tool_rest_search.ctp:30
+#: View/Elements/eventattribute.ctp:158
+#: View/Elements/global_menu.ctp:94
+#: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr ""
 
 #: View/Attributes/index.ctp:56
-#: View/Elements/eventattribute.ctp:159
+#: View/Elements/eventattribute.ctp:160
 msgid "Correlate"
 msgstr ""
 
 #: View/Attributes/index.ctp:57
-#: View/Elements/eventattribute.ctp:160
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:336
+#: View/Elements/eventattribute.ctp:161
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+#: View/Events/view.ctp:372
 #: View/Feeds/preview_event.ctp:73
 #: View/Pages/doc/using_the_system.ctp:235
 #: View/Servers/preview_event.ctp:95
@@ -4527,30 +6032,33 @@ msgid "Related Events"
 msgstr ""
 
 #: View/Attributes/index.ctp:58
-#: View/Elements/eventattribute.ctp:161
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:49
 msgid "Feed hits"
 msgstr ""
 
 #: View/Attributes/index.ctp:61
-#: View/Elements/eventattribute.ctp:164
-#: View/Events/view.ctp:251
+#: View/DecayingModel/decaying_tool_rest_search.ctp:33
+#: View/Elements/eventattribute.ctp:165
+#: View/Events/view.ctp:252
 msgid "Sightings"
 msgstr ""
 
 #: View/Attributes/index.ctp:62
-#: View/Elements/eventattribute.ctp:165
-#: View/Events/view.ctp:261
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:262
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr ""
 
 #: View/Attributes/index.ctp:63
-#: View/Elements/eventattribute.ctp:166
+#: View/DecayingModel/index.ctp:99
+#: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -4559,10 +6067,7 @@ msgstr ""
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -4570,12 +6075,12 @@ msgstr ""
 #: 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/Roles/admin_index.ctp:36
+#: View/Servers/index.ctp:41
 #: View/Servers/preview_index.ctp:106
 #: View/SharingGroups/add.ctp:74;94
 #: View/SharingGroups/edit.ctp:74;102
-#: View/SharingGroups/index.ctp:47
+#: View/SharingGroups/index.ctp:48
 #: View/Sightings/ajax/list_sightings.ctp:11
 #: View/TagCollections/index.ctp:16
 #: View/Tags/index.ctp:76
@@ -4588,6 +6093,8 @@ msgid "Actions"
 msgstr ""
 
 #: View/Attributes/index.ctp:121
+#: View/DecayingModel/decaying_tool_rest_search.ctp:57
+#: View/DecayingModel/index.ctp:162
 #: View/Elements/eventdiscussion.ctp:119
 #: View/Elements/generic_table.ctp:53
 #: View/Elements/generic_table_row.ctp:45
@@ -4596,10 +6103,7 @@ msgstr ""
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -4612,19 +6116,18 @@ msgstr ""
 #: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
-#: View/Roles/admin_index.ctp:88
+#: View/Roles/admin_index.ctp:98
 #: View/Roles/index.ctp:61
-#: View/Servers/index.ctp:149
+#: View/Servers/index.ctp:195
 #: View/Servers/preview_index.ctp:182
-#: View/ShadowAttributes/index.ctp:111
-#: View/SharingGroups/index.ctp:98
+#: View/ShadowAttributes/index.ctp:121
+#: View/SharingGroups/index.ctp:100
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:58
 #: 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
@@ -4690,11 +6193,12 @@ msgstr ""
 msgid "Alternate Search Result (Events)"
 msgstr ""
 
-#: View/Attributes/search.ctp:38
-#: View/Events/automation.ctp:14
-#: View/Logs/admin_index.ctp:20;21
-#: View/Logs/admin_search.ctp:25
-msgid "Search"
+#: View/Attributes/search.ctp:47
+msgid "First seen and Last seen."
+msgstr ""
+
+#: View/Attributes/search.ctp:48
+msgid "Attributes not having first seen or last seen set might not appear in the search"
 msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:6
@@ -4711,16 +6215,15 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90;98
-#: View/Elements/Events/eventIndexTable.ctp:245
-#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -4729,117 +6232,21 @@ msgstr ""
 #: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:80
-#: View/Servers/index.ctp:137
-#: View/SharingGroups/index.ctp:87
+#: View/Roles/admin_index.ctp:90
+#: View/Servers/index.ctp:183
+#: View/SharingGroups/index.ctp:89
 #: View/Tags/index.ctp:125
 #: View/Whitelists/admin_index.ctp:32
 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/Feeds/View/row_attribute.ctp:87
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:190
-#: 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:85
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:42;50
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:74;75;76;112;113;118;119
-#: 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/Feeds/View/row_attribute.ctp:87
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:190
-#: 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:85
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:42;50
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:74;75;76;108;112;113;118;119
-#: 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
+#: View/Objects/ajax/objectEditCommentForm.ctp:5
+#: View/Objects/ajax/objectEditDistributionForm.ctp:5
 msgid "Accept change"
 msgstr ""
 
@@ -4848,6 +6255,8 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
+#: View/Objects/ajax/objectEditCommentForm.ctp:6
+#: View/Objects/ajax/objectEditDistributionForm.ctp:6
 msgid "Discard change"
 msgstr ""
 
@@ -4862,14 +6271,15 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:51
-#: View/Events/resolved_misp_format.ctp:97;267
-#: View/Events/view.ctp:158
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:165
+#: View/Events/resolved_misp_format.ctp:98;293
+#: View/Events/view.ctp:159
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
-#: View/Objects/add.ctp:47;105;201
+#: View/Feeds/index.ctp:184
+#: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
-#: View/Objects/revise_object.ctp:35;62
+#: View/Objects/revise_object.ctp:35;69
 #: 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
@@ -4882,23 +6292,27 @@ msgstr ""
 msgid "For Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr ""
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
@@ -4979,41 +6393,952 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Communities/index.ctp:14
+msgid "Vetted by the MISP-project team"
+msgstr ""
+
+#: View/Communities/index.ctp:19
+msgid "Unvetted"
+msgstr ""
+
+#: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
+#: View/EventBlacklists/index.ctp:35
+#: View/EventDelegations/index.ctp:41
+#: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
+#: View/Feeds/preview_index.ctp:25
+#: View/Feeds/search_caches.ctp:26
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
+#: View/ObjectTemplates/index.ctp:47
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
+#: View/ShadowAttributes/index.ctp:37
+#: View/Sightingdb/index.ctp:10
+#: View/Tags/index.ctp:56
+#: View/Taxonomies/view.ctp:65
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
+msgid "Filter"
+msgstr ""
+
+#: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
+#: View/Elements/eventattributetoolbar.ctp:231
+#: View/EventBlacklists/index.ctp:36
+#: View/EventDelegations/index.ctp:42
+#: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
+#: View/Feeds/preview_index.ctp:26
+#: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
+#: View/ObjectTemplates/index.ctp:48
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+#: View/ShadowAttributes/index.ctp:38
+#: View/Sightingdb/index.ctp:11
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
+msgid "Enter value to search"
+msgstr ""
+
+#: View/Communities/index.ctp:34
+#: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
+#: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
+#: View/Feeds/search_caches.ctp:35
+#: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Sightingdb/index.ctp:26
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
+#: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/Communities/index.ctp:40
+msgid "Vetted"
+msgstr ""
+
+#: View/Communities/index.ctp:46
+msgid "Host org"
+msgstr ""
+
+#: View/Communities/index.ctp:53
+msgid "Community name"
+msgstr ""
+
+#: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
+#: View/DecayingModel/index.ctp:89
+#: View/DecayingModel/view.ctp:21
+#: View/Elements/Servers/View/row_object.ctp:24
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: 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:26
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
+#: View/ObjectTemplates/view.ctp:9
+#: View/Objects/add.ctp:22;113;210
+#: View/Objects/group_attributes_into_object.ctp:8
+#: View/Objects/propose_objects_from_attributes.ctp:17
+#: 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:46
+#: View/Sightingdb/index.ctp:88
+#: View/TagCollections/index.ctp:15
+#: View/Taxonomies/view.ctp:14
+#: View/Templates/view.ctp:14
+#: View/Warninglists/view.ctp:11
+msgid "Description"
+msgstr ""
+
+#: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
+msgid "Communities index"
+msgstr ""
+
+#: View/Communities/index.ctp:72
+msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
+msgstr ""
+
+#: View/Communities/request_access.ctp:7
+msgid "Describe both yourself and your organisation as best as you can - keep in mind this information is to be used by the hosts of the community you are requesting access to in order to determine whether you're a good fit for their community. The sending server's basic metadata is included by default, you can opt out using the \"anonymise\" checkbox (server url, uuid, version are shared otherwise - though this can be a useful step in establishing trust.)."
+msgstr ""
+
+#: View/Communities/request_access.ctp:10
+msgid "Requestor E-mail address"
+msgstr ""
+
+#: View/Communities/request_access.ctp:15
+#: View/Jobs/index.ctp:104
+#: View/OrgBlacklists/add.ctp:17
+#: View/OrgBlacklists/index.ctp:22
+#: View/Organisations/view.ctp:6
+msgid "Organisation name"
+msgstr ""
+
+#: View/Communities/request_access.ctp:20
+msgid "Organisation uuid"
+msgstr ""
+
+#: View/Communities/request_access.ctp:25
+msgid "Description of the requestor organisation"
+msgstr ""
+
+#: View/Communities/request_access.ctp:31
+msgid "Message to the community host organisation"
+msgstr ""
+
+#: View/Communities/request_access.ctp:37
+msgid "PGP public key"
+msgstr ""
+
+#: View/Communities/request_access.ctp:44
+msgid "Request sync access"
+msgstr ""
+
+#: View/Communities/request_access.ctp:49
+msgid "Anonymise information on the server used to issue the request"
+msgstr ""
+
+#: View/Communities/request_access.ctp:54
+msgid "Generate e-mail for later use, but do not send it"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:5
+msgid "Email to send in order to request access"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:6
+msgid "Emailing is currently disabled on the instance, but we have generated the e-mail that would normally be sent out below."
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:7
+msgid "Please find a generated e-mail below that you can use to contact the community in question"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:8
+msgid "Headers:"
+msgstr ""
+
+#: View/Communities/request_access_email.ctp:10
+msgid "Message:"
+msgstr ""
+
+#: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
+#: View/Elements/Events/View/row_object.ctp:72
+#: View/Events/resolved_misp_format.ctp:93;288
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
+#: View/ObjectTemplates/index.ctp:66
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:68
+#: View/OrgBlacklists/index.ctp:23
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:58;65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+#: View/SharingGroups/index.ctp:43
+#: View/TagCollections/index.ctp:8
+msgid "UUID"
+msgstr ""
+
+#: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
+#: View/DecayingModel/index.ctp:88
+#: View/DecayingModel/view.ctp:14
+#: View/Elements/Servers/View/row_object.ctp:19
+#: View/Elements/templateElements/templateRowAttribute.ctp:12
+#: View/Elements/templateElements/templateRowFile.ctp:12
+#: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
+#: View/Feeds/search_caches.ctp:47
+#: View/Feeds/view.ctp:4
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
+#: View/ObjectTemplates/view.ctp:4
+#: View/Objects/add.ctp:206
+#: View/Objects/revise_object.ctp:27
+#: 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/Sightingdb/index.ctp:51
+#: View/Templates/view.ctp:9
+#: View/Users/statistics_orgs.ctp:33
+#: View/Warninglists/view.ctp:10
+msgid "Name"
+msgstr ""
+
+#: View/Communities/view.ctp:7
+#: View/SharingGroups/view.ctp:68
+msgid "Url"
+msgstr ""
+
+#: View/Communities/view.ctp:8
+msgid "Host organisation"
+msgstr ""
+
+#: View/Communities/view.ctp:10
+msgid "Vetted by MISP-project"
+msgstr ""
+
+#: View/Communities/view.ctp:27
+#: View/Elements/footer.ctp:15
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:64
+#: View/Users/admin_view.ctp:72
+#: View/Users/edit.ctp:23
+#: View/Users/view.ctp:32
+msgid "GnuPG key"
+msgstr ""
+
+#: View/Communities/view.ctp:42
+msgid "Community "
+msgstr ""
+
+#: View/Communities/view.ctp:51
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
+msgid "Request Access"
+msgstr ""
+
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
+#: View/DecayingModel/add.ctp:4
+msgid " Decaying Model"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:7
+msgid "You are editing a Default Model, only restricted edition is allowed."
+msgstr ""
+
+#: View/DecayingModel/add.ctp:9;28
+msgid "Can other organization use this model"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:37
+msgid "days"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:46;56;65
+msgid "float"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:65
+msgid "Default base_score"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:65
+msgid "Default base_score value if no tags are attached to the indicator"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:75
+msgid "Base Score configuration"
+msgstr ""
+
+#: View/DecayingModel/add.ctp:84
+msgid "Model Settings"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:9
+msgid "Show All Types"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:13
+msgid "Show MISP Objects"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:15
+msgid "Search Attribute Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:22
+msgid "Check all"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:23
+msgid "Attribute Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:24
+#: View/DecayingModel/decaying_tool_rest_search.ctp:25
+#: View/Elements/templateElements/templateRowAttribute.ctp:30
+#: View/Elements/templateElements/templateRowFile.ctp:30
+#: View/Events/resolved_attributes.ctp:47
+#: View/Events/resolved_misp_format.ctp:90;285
+#: View/Events/show_i_o_c_results.ctp:11
+#: View/Feeds/freetext_index.ctp:31
+#: View/Objects/add.ctp:114
+#: View/Objects/group_attributes_into_object.ctp:57
+#: View/Objects/propose_objects_from_attributes.ctp:16
+#: View/Objects/revise_object.ctp:63
+#: 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:65
+#: 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/DecayingModel/decaying_tool.ctp:25
+#: View/DecayingModel/view.ctp:3
+#: View/Logs/admin_index.ctp:75
+#: View/Logs/admin_search.ctp:14
+msgid "Model ID"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:47
+msgid "Belong to a MISP Object"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:51
+msgid "To IDS flag set"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:100
+msgid "Adjust base  score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:108
+msgid "Simulate this model"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:129
+msgid "Model's Settings"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Elements/eventdiscussion.ctp:89;97
+#: View/Elements/Events/eventIndexTable.ctp:231
+#: View/Elements/Events/View/row_attribute.ctp:413
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Users/userIndexTable.ctp:90
+#: View/EventBlacklists/edit.ctp:37
+#: View/EventBlacklists/index.ctp:69
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
+#: View/News/index.ctp:22
+#: View/OrgBlacklists/edit.ctp:30
+#: View/OrgBlacklists/index.ctp:36
+#: View/Organisations/index.ctp:138
+#: View/Pages/doc/using_the_system.ctp:191
+#: View/Regexp/admin_index.ctp:34
+#: View/Roles/admin_edit.ctp:56
+#: View/Roles/admin_index.ctp:89
+#: View/Servers/index.ctp:182
+#: View/SharingGroups/index.ctp:88
+#: View/Tags/edit.ctp:36
+#: View/Tags/index.ctp:124
+#: View/Templates/edit.ctp:49
+#: View/Whitelists/admin_index.ctp:31
+msgid "Edit"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Templates/add.ctp:49
+msgid "Create"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:146
+msgid "All available models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:149
+msgid "My models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool.ctp:152
+msgid "Default models"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:3
+msgid "Search Taxonomy"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:4
+msgid "Clear search field"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:5
+msgid " not having numerical value"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:7
+msgid "Default basescore"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:13
+#: View/Taxonomies/index.ctp:2
+msgid "Taxonomies"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:14
+msgid "Weight"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:91
+msgid "Excluded"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:112
+msgid "Placeholder for `Organisation source confidence`"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:115
+msgid "Example"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:141;146;151
+msgid "Pick a Taxonomy"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:157
+msgid "Computation steps"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:160
+msgid "Apply base score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:26
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
+#: View/Events/export.ctp:26
+#: View/Events/resolved_attributes.ctp:48
+#: View/Events/resolved_misp_format.ctp:91;286
+#: View/Events/show_i_o_c_results.ctp:12
+#: View/Feeds/freetext_index.ctp:32
+#: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
+#: View/Objects/revise_object.ctp:64
+#: 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:53;68
+#: 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:38
+#: View/Warninglists/view.ctp:13
+msgid "Type"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:27
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+#: 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/resolved_misp_format.ctp:92;287
+#: View/Events/show_i_o_c_results.ctp:13
+#: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
+#: View/Noticelists/view.ctp:42
+#: View/Objects/add.ctp:115
+#: View/Objects/group_attributes_into_object.ctp:58
+#: View/Objects/revise_object.ctp:65
+#: View/Objects/ajax/quickAddAttributeForm.ctp:78
+#: 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/UserSettings/index.ctp:68
+#: View/Users/admin_filter_user_index.ctp:71
+msgid "Value"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:29
+msgid "Event Tags"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:31
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
+#: View/ObjectReferences/ajax/add.ctp:30
+#: View/Objects/add.ctp:67;119
+#: View/Objects/group_attributes_into_object.ctp:30
+#: View/Objects/revise_object.ctp:49;67
+#: View/Pages/doc/using_the_system.ctp:234;284
+#: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
+msgid "Comment"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:35
+#: View/Elements/eventattribute.ctp:179
+msgid "Score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search.ctp:84
+#: View/DecayingModel/decaying_tool_simulation.ctp:184
+msgid "Failed to perform RestSearch"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_rest_search_form.ctp:3
+msgid "Decaying Model RestSearch"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:45
+#: View/Events/automation.ctp:24
+#: View/Logs/admin_index.ctp:20;21
+#: View/Logs/admin_search.ctp:25
+msgid "Search"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:49
+msgid "Specific Attribute"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:53
+msgid "Attribute ID or UUID"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:55
+msgid "Simulate"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:66
+msgid "Base score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:68;71
+msgid "Base score configuration"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:68
+msgid "not set. But default value sets."
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:71
+msgid "not set"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:79
+msgid "Sighting"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:83
+msgid "Current score"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:132
+msgid "Basescore computation steps"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_simulation.ctp:266
+msgid "Failed to perform the simulation"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:4
+msgid "Import model data"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:5
+msgid "Paste a MISP model JSON or provide a JSON file below to add models."
+msgstr ""
+
+#: View/DecayingModel/import.ctp:10
+#: View/Feeds/import_feeds.ctp:10
+#: View/Servers/import.ctp:10
+#: View/TagCollections/import.ctp:10
+msgid "JSON"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:11
+msgid "Model JSON"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:18
+msgid "JSON file"
+msgstr ""
+
+#: View/DecayingModel/import.ctp:25
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:15
+#: View/Elements/genericElements/org_picker.ctp:17
+#: View/EventBlacklists/add.ctp:36
+#: View/Events/filter_event_index.ctp:125
+#: View/Feeds/add.ctp:220
+#: View/Feeds/import_feeds.ctp:20
+#: View/OrgBlacklists/add.ctp:29
+#: View/Regexp/admin_add.ctp:32
+#: View/Regexp/admin_edit.ctp:42
+#: View/Roles/admin_add.ctp:57
+#: View/Servers/import.ctp:20
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:20
+#: View/Tags/add.ctp:35
+#: View/Users/admin_filter_user_index.ctp:62
+#: View/Whitelists/admin_add.ctp:13
+msgid "Add"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:2
+msgid "Decaying Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:30;31
+msgid "All Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:41
+msgid "My models only"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:42
+msgid "My Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:53
+msgid "Models available to everyone"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:54
+msgid "Shared Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:65
+msgid "Default models only"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:66
+msgid "Default Models"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:86
+#: View/Pages/doc/using_the_system.ctp:398
+msgid "Organization"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:87
+msgid "Usable to everyone"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:91
+#: View/DecayingModel/view.ctp:40
+msgid "Parameters"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:92
+msgid "Pretty print"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:95
+#: View/DecayingModel/view.ctp:35
+msgid "Formula"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:96
+msgid "# Assigned Types"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:97
+#: View/DecayingModel/view.ctp:25
+#: View/Galaxies/view.ctp:10
+#: View/ObjectTemplates/view.ctp:7
+#: View/Taxonomies/view.ctp:19
+#: View/Warninglists/view.ctp:12
+msgid "Version"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:98
+#: View/DecayingModel/view.ctp:31
+#: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
+#: View/Feeds/view.ctp:63
+#: View/Noticelists/index.ctp:63
+#: View/ObjectTemplates/index.ctp:35
+#: View/Sightingdb/index.ctp:19
+#: View/Taxonomies/view.ctp:24
+#: View/Warninglists/view.ctp:16
+msgid "Enabled"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:114
+#: View/DecayingModel/view.ctp:18
+msgid "Default Model from MISP Project"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:137
+msgid "Download model"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:142
+msgid "Are you sure you want to delete DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:148
+msgid "Are you sure you want to disable DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/index.ctp:150
+msgid "Are you sure you want to enable DecayingModel #"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:5
+#: View/Events/view.ctp:86
+msgid "Creator org"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:27
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
+#: View/SharingGroups/view.ctp:69
+#: View/TagCollections/index.ctp:12
+msgid "All orgs"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:41
+msgid "Reference(s)"
+msgstr ""
+
+#: View/DecayingModel/view.ctp:42
+msgid "Associated types"
+msgstr ""
+
+#: View/DecayingModel/ajax/disable_form.ctp:3
+msgid "Disable model"
+msgstr ""
+
+#: View/DecayingModel/ajax/enable_form.ctp:3
+msgid "Enable model"
+msgstr ""
+
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:4
+msgid "Add DecayingModelMapping"
+msgstr ""
+
+#: View/Elements/ajaxAttributeTags.ctp:29
 #: View/Elements/ajaxTagCollectionTags.ctp:16
-#: View/Elements/ajaxTags.ctp:45
+#: View/Elements/ajaxTags.ctp:104
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Elements/ajaxAttributeTags.ctp:43
 #: 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:48
+#: View/Elements/ajaxTags.ctp:73;74
+msgid "Local tag"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:73;74
+msgid "Global tag"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:107
 msgid "Remove tag %s"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:58;61
+#: View/Elements/ajaxTags.ctp:123;124
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 #: View/Templates/add.ctp:28
 #: View/Templates/edit.ctp:28
 msgid "Add a tag"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:67;69;234;236
-#: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
-#: View/Elements/Servers/eventattribute.ctp:28;31;94;97
+#: View/Elements/ajaxTags.ctp:141;142
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
+msgid "Add a local tag"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:67;69;254;256
+#: View/Elements/Feeds/eventattribute.ctp:28;31;95;98
+#: View/Elements/Servers/eventattribute.ctp:28;31;95;98
 msgid "view all"
 msgstr ""
 
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr ""
 
@@ -5022,40 +7347,51 @@ msgid "Select all attributes/proposals on current page"
 msgstr ""
 
 #: View/Elements/eventattribute.ctp:138
-#: View/Elements/Feeds/eventattribute.ctp:41
-#: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/proposal_event_index.ctp:30
-#: View/Events/view.ctp:142
-#: View/Feeds/preview_event.ctp:25
-#: View/Objects/group_attributes_into_object.ctp:56
-#: 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"
+#: View/Elements/Feeds/eventattribute.ctp:42
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:52
+msgid "First seen"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:142
-#: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:218;229
+#: View/Elements/eventattribute.ctp:138
+#: View/Elements/Feeds/eventattribute.ctp:42
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:56
+msgid "Last seen"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:143
+#: View/Elements/eventdiscussion.ctp:143
+#: View/Events/view.ctp:219;230
 #: 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
+#: View/ShadowAttributes/index.ctp:48
 msgid "Event"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:153
+#: View/Elements/eventattribute.ctp:154
+#: View/Elements/eventattributetoolbar.ctp:201
 msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:207
+#: View/Elements/eventattribute.ctp:171
+#: View/Elements/eventattributetoolbar.ctp:185
+msgid "SightingDB"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:178
+msgid "Decaying Score"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:227
 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:211
+#: View/Elements/eventattribute.ctp:231
 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 ""
 
@@ -5068,12 +7404,15 @@ msgid "Show all attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:6
-#: View/Elements/Events/eventIndexTable.ctp:216
+#: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
 #: View/Regexp/admin_edit.ctp:18
 #: View/Sightings/ajax/advanced.ctp:5
+#: View/UserSettings/index.ctp:41
 msgid "All"
 msgstr ""
 
@@ -5095,7 +7434,7 @@ msgid "Only show correlating attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:33
-#: View/Events/view.ctp:305
+#: View/Events/view.ctp:306
 msgid "Correlation"
 msgstr ""
 
@@ -5104,6 +7443,8 @@ msgid "Only show potentially false positive attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr ""
@@ -5113,105 +7454,111 @@ msgstr ""
 msgid "Add attribute"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:59
+#: View/Elements/eventattributetoolbar.ctp:52
+msgid "Add proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:60
 msgid "Edit selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:67
+#: View/Elements/eventattributetoolbar.ctp:68
 msgid "Tag selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:75
+#: View/Elements/eventattributetoolbar.ctp:76
 msgid "Add new cluster to selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:84
+#: View/Elements/eventattributetoolbar.ctp:85
 msgid "Group selected Attributes into an Object"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:93
+#: View/Elements/eventattributetoolbar.ctp:94
 msgid "Delete selected Attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:101
+#: View/Elements/eventattributetoolbar.ctp:102
 msgid "Accept selected Proposals"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:109
+#: View/Elements/eventattributetoolbar.ctp:110
 msgid "Discard selected Proposals"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:117
+#: View/Elements/eventattributetoolbar.ctp:118
 msgid "Sightings display for selected attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:128
+#: View/Elements/eventattributetoolbar.ctp:129
 msgid "Populate using a template"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:136
+#: View/Elements/eventattributetoolbar.ctp:137
 msgid "Populate using the freetext import tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:143
+#: View/Elements/eventattributetoolbar.ctp:144
 msgid "Replace all attributes of a category/type combination within the event"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:157
+#: View/Elements/eventattributetoolbar.ctp:158
 msgid "Use a list of simple scopes to filter the data"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:158
+#: View/Elements/eventattributetoolbar.ctp:159
 msgid "Scope toggle"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:163
+#: View/Elements/eventattributetoolbar.ctp:164
 msgid "Include deleted attributes"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:165
+#: View/Elements/eventattributetoolbar.ctp:166
 msgid "Deleted"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:173
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Show attribute decaying score"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:176
+msgid "Decay score"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:183
+msgid "Show SightingDB lookup results"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:192
 msgid "Show attribute context fields"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:175
+#: View/Elements/eventattributetoolbar.ctp:194
 msgid "Context"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:180
+#: View/Elements/eventattributetoolbar.ctp:199
+msgid "Show related tags"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:208
 msgid "Advanced filtering tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:184
+#: View/Elements/eventattributetoolbar.ctp:212
 msgid "Filtering tool"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:188
+#: View/Elements/eventattributetoolbar.ctp:216
 msgid "%s active rule(s)"
 msgstr ""
 
-#: View/Elements/eventattributetoolbar.ctp:203
-#: View/EventBlacklists/index.ctp:36
-#: View/Events/index.ctp:95
-#: View/Feeds/preview_index.ctp:26
-#: View/Feeds/search_caches.ctp:27
-#: View/ObjectTemplates/index.ctp:48
-#: View/Organisations/index.ctp:76
-#: View/Servers/preview_index.ctp:65
-#: View/Users/admin_index.ctp:62
-msgid "Enter value to search"
-msgstr ""
-
-#: View/Elements/eventattributetoolbar.ctp:207
+#: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: 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 ""
 
@@ -5231,32 +7578,6 @@ msgstr ""
 msgid "User "
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:242
-#: View/Elements/Events/View/row_attribute.ctp:393
-#: View/Elements/TagCollections/index_row.ctp:43
-#: View/Elements/Users/userIndexTable.ctp:90
-#: View/EventBlacklists/edit.ctp:37
-#: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:194
-#: View/Feeds/index.ctp:282
-#: View/News/index.ctp:22
-#: View/OrgBlacklists/edit.ctp:30
-#: View/OrgBlacklists/index.ctp:36
-#: View/Organisations/index.ctp:138
-#: View/Pages/doc/using_the_system.ctp:191
-#: View/Regexp/admin_index.ctp:34
-#: View/Roles/admin_edit.ctp:42
-#: View/Roles/admin_index.ctp:79
-#: View/Servers/index.ctp:136
-#: View/SharingGroups/index.ctp:86
-#: View/Tags/edit.ctp:36
-#: View/Tags/index.ctp:124
-#: View/Templates/edit.ctp:49
-#: View/Whitelists/admin_index.ctp:31
-msgid "Edit"
-msgstr ""
-
 #: View/Elements/eventdiscussion.ctp:90;98
 msgid "Are you sure you want to delete this post?"
 msgstr ""
@@ -5265,51 +7586,51 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:141
+#: View/Elements/eventdiscussion.ctp:142
 #: 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/Elements/eventdiscussion.ctp:142
 #: View/Posts/add.ctp:32
 msgid "Quote"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:142
+#: View/Elements/eventdiscussion.ctp:143
 msgid "Insert a link to an event - just enter the event ID between the [event][/event] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:143
+#: View/Elements/eventdiscussion.ctp:144
 #: 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/Elements/eventdiscussion.ctp:144
 #: View/Posts/add.ctp:34
 msgid "Thread"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Insert a link [link][/link] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Link"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Insert a code [code][/code] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Code"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:156
+#: View/Elements/eventdiscussion.ctp:157
 #: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr ""
@@ -5331,15 +7652,6 @@ msgstr ""
 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/edit.ctp:23
-#: View/Users/view.ctp:31
-msgid "GnuPG key"
-msgstr ""
-
 #: View/Elements/footer.ctp:17
 msgid "Could not locate the GnuPG public key."
 msgstr ""
@@ -5348,72 +7660,80 @@ msgstr ""
 msgid "Could not locate SMIME certificate."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:8
-msgid "View details about this galaxy"
+#: View/Elements/form_seen_input.ctp:53
+msgid "First seen date"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:8
-msgid "View galaxy"
+#: View/Elements/form_seen_input.ctp:57
+msgid "Last seen date"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:19
-#: View/Elements/galaxyQuickViewMini.ctp:69
+#: View/Elements/form_seen_input.ctp:63
+msgid "First seen time"
+msgstr ""
+
+#: View/Elements/form_seen_input.ctp:64;69
+msgid "Expected format: HH:MM:SS.ssssss+TT:TT"
+msgstr ""
+
+#: View/Elements/form_seen_input.ctp:68
+msgid "Last seen time"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:79
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:19
-#: View/Elements/galaxyQuickViewMini.ctp:69
-#: View/Elements/Events/eventIndexTable.ctp:138
+#: View/Elements/galaxyQuickView.ctp:77
+#: View/Elements/galaxyQuickViewMini.ctp:80
 msgid "View cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:20
-#: View/Elements/galaxyQuickViewMini.ctp:70
+#: View/Elements/galaxyQuickView.ctp:83;84
+#: View/Elements/galaxyQuickViewMini.ctp:86;87
 msgid "View all events containing this cluster."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:24
+#: View/Elements/galaxyQuickView.ctp:97
 msgid "detach"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:24
+#: View/Elements/galaxyQuickView.ctp:98
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:96
-#: View/Elements/galaxyQuickViewMini.ctp:89
-#: View/EventBlacklists/add.ctp:36
-#: View/Events/add.ctp:71
-#: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
-#: View/Feeds/import_feeds.ctp:20
-#: View/OrgBlacklists/add.ctp:29
-#: View/Regexp/admin_add.ctp:32
-#: View/Regexp/admin_edit.ctp:42
-#: View/Roles/admin_add.ctp:44
-#: View/Servers/import.ctp:20
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
-#: View/Sightings/ajax/add_sighting.ctp:33
-#: View/TagCollections/import.ctp:20
-#: View/Tags/add.ctp:35
-#: View/Users/admin_filter_user_index.ctp:62
-#: View/Whitelists/admin_add.ctp:13
-msgid "Add"
+#: View/Elements/galaxyQuickView.ctp:114
+msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:74
-msgid "Are you sure you want to detach %s from this %s?"
+#: View/Elements/galaxyQuickView.ctp:115
+msgid "View galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:89
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:205
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
+msgid "Add new local cluster"
+msgstr ""
+
+#: View/Elements/galaxyQuickViewMini.ctp:100
+msgid "Are you sure you want to detach %s from this %s?"
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:187
+msgid "No item picked"
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:209
 msgid "Due to the large number of options, no contextual information is provided."
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:273
+#: View/Elements/generic_picker.ctp:277
 msgid "Nothing to pick"
 msgstr ""
 
@@ -5427,98 +7747,103 @@ msgid "Event Actions"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;252
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: 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:214;258
-#: View/Events/add.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
+#: View/Events/add.ctp:7
 #: 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:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: 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:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: 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:270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:298
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:49
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:47
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "View delegation requests"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:803
+#: View/Elements/global_menu.ctp:61
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:62
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:832
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:860
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:865
+#: View/Elements/global_menu.ctp:74
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:78
+#: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:308
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: 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:314
+#: View/Elements/global_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -5527,17 +7852,17 @@ msgstr ""
 msgid "Automation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:94
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:966
+#: View/Elements/global_menu.ctp:98
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:101
+#: View/Elements/global_menu.ctp:105
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:104;109
+#: View/Elements/global_menu.ctp:108;113
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -5546,7 +7871,7 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:114;119
+#: View/Elements/global_menu.ctp:118;123
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -5555,79 +7880,98 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:124
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:361
+#: View/Elements/global_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:128
+#: View/Elements/global_menu.ctp:132
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:135
+#: View/Elements/global_menu.ctp:139
 #: View/Pages/doc/general.ctp:22;54
 msgid "Global Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:139
+#: View/Elements/global_menu.ctp:143
 #: 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:440
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/global_menu.ctp:151
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
+msgid "My Settings"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:155
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
+msgid "Set Setting"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:159
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:156
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:463
+#: View/Elements/global_menu.ctp:168
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:163
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1010
+#: View/Elements/global_menu.ctp:175
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:480
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:174
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:486
+#: View/Elements/global_menu.ctp:186
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:493
+#: View/Elements/global_menu.ctp:194
+msgid "Decaying Models Tool"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:199
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
+msgid "List Decaying Models"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:206
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: 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
+#: View/Elements/global_menu.ctp:210
 msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:190
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:497
+#: View/Elements/global_menu.ctp:214
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:194
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:218
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -5641,48 +7985,61 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:201
+#: View/Elements/global_menu.ctp:225
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:205
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:212
+#: View/Elements/global_menu.ctp:236
 #: View/Pages/doc/general.ctp:23;66
 msgid "Sync Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:216
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:509
+#: View/Elements/global_menu.ctp:240
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:221
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:515
+#: View/Elements/global_menu.ctp:245
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
+#: View/Elements/global_menu.ctp:250
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:231
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:887
+#: View/Elements/global_menu.ctp:255
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:236
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:891
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:244
+#: View/Elements/global_menu.ctp:265
+msgid "List SightingDB Connections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:270
+msgid "Add SightingDB Connection"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:275
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+msgid "List Communities"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:283
 #: View/Pages/doc/administration.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
@@ -5692,100 +8049,113 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:249
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:638
+#: View/Elements/global_menu.ctp:288
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:253
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:633
+#: View/Elements/global_menu.ctp:292
+msgid "List User Settings"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:296
+#: View/UserSettings/set_setting.ctp:5
+msgid "Set User Setting"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:300
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:257
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
+#: View/Elements/global_menu.ctp:304
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:264
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:450;680
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:268
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:692
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:279
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:297
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:306
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:711
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:315
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:320
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:329
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:342
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:346
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:744
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:350
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:748
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:377;382
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -5807,7 +8177,9 @@ msgid "Attributes per organization"
 msgstr ""
 
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:91
+#: View/Elements/view_timeline.ctp:23
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -5834,6 +8206,7 @@ msgid "Physics"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:13
+#: View/Elements/view_timeline.ctp:12
 msgid "Display"
 msgstr ""
 
@@ -5841,7 +8214,6 @@ msgstr ""
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr ""
 
@@ -5849,11 +8221,8 @@ msgstr ""
 msgid "History"
 msgstr ""
 
-#: View/Elements/view_event_graph.ctp:18
-msgid "Search for an item"
-msgstr ""
-
 #: View/Elements/view_event_graph.ctp:22
+#: View/Elements/view_timeline.ctp:26
 #: View/Events/view_graph.ctp:17
 msgid "Toggle fullscreen"
 msgstr ""
@@ -5862,13 +8231,47 @@ msgstr ""
 msgid "Show all"
 msgstr ""
 
-#: View/Elements/view_galaxy_matrix.ctp:121
+#: View/Elements/view_galaxy_matrix.ctp:129
 msgid "(%s items)"
 msgstr ""
 
+#: View/Elements/view_timeline.ctp:9
+msgid "Time scope"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
+#: View/Taxonomies/view.ctp:83
+msgid "Tag"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:6
+msgid "Computation"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:7
+#: View/Events/add_misp_export_result.ctp:6
+msgid "Result"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:10
+msgid "Taxonomy effective ratio"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:10
+msgid "Eff. Ratio"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+msgid "Tag numerical value"
+msgstr ""
+
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:19
+msgid "Pick an Attribute"
+msgstr ""
+
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr ""
 
@@ -5925,72 +8328,73 @@ msgstr ""
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:82;86;248
+#: View/Elements/Events/eventIndexTable.ctp:82;86;237
 #: 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/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
 #: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/index.ctp:103
 #: View/Servers/preview_index.ctp:174
-#: View/SharingGroups/index.ctp:89
+#: View/SharingGroups/index.ctp:91
 #: View/Taxonomies/index.ctp:49
 #: View/Warninglists/index.ctp:60
 msgid "View"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:168
+#: View/Elements/Events/eventIndexTable.ctp:157
 msgid " correlation(s). Show filtered event with correlation only."
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:186;191
+#: View/Elements/Events/eventIndexTable.ctp:175;180
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:196
+#: View/Elements/Events/eventIndexTable.ctp:185
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:237
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:237
+#: View/Elements/Events/eventIndexTable.ctp:226
 #: 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:238
+#: View/Elements/Events/eventIndexTable.ctp:227
 msgid "Not published"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;347;414;571;625
-#: View/Servers/index.ctp:137
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
+#: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr ""
 
-#: View/Elements/Events/View/attribute_correlations.ctp:7
+#: View/Elements/Events/View/attribute_correlations.ctp:17
 msgid "Show "
 msgstr ""
 
-#: View/Elements/Events/View/attribute_correlations.ctp:7
+#: View/Elements/Events/View/attribute_correlations.ctp:17
 msgid " more..."
 msgstr ""
 
-#: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:362
+#: View/Elements/Events/View/attribute_correlations.ctp:53
+#: View/Events/view.ctp:399
 #: View/Feeds/preview_event.ctp:88
 #: View/Servers/preview_event.ctp:116
 msgid "Collapse…"
@@ -6004,131 +8408,122 @@ msgstr ""
 msgid "Advanced Sightings"
 msgstr ""
 
+#: View/Elements/Events/View/related_event.ctp:26
+msgid "This related event contains %s unique correlation(s)"
+msgstr ""
+
 #: View/Elements/Events/View/row_attribute.ctp:43
 msgid "Select attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:152
-#: View/Elements/Events/View/row_proposal.ctp:110
-#: View/Elements/Feeds/View/row_attribute.ctp:61
-#: View/Elements/Servers/View/row_attribute.ctp:68
+#: View/Elements/Events/View/row_attribute.ctp:155
+#: View/Elements/Events/View/row_proposal.ctp:113
+#: View/Elements/Feeds/View/row_attribute.ctp:63
+#: View/Elements/Servers/View/row_attribute.ctp:70
 msgid "warning"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:196;197
+#: View/Elements/Events/View/row_attribute.ctp:199;200
 #: View/Events/ajax/toggle_correlation.ctp:20
 msgid "Toggle correlation"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:323
+#: View/Elements/Events/View/row_attribute.ctp:326
 msgid "Toggle IDS flag"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:356
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Restore attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:357;397
+#: View/Elements/Events/View/row_attribute.ctp:377;417
 msgid "Permanently delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:364
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:364
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:369
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:369
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:373
+#: View/Elements/Events/View/row_attribute.ctp:393
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:374
+#: View/Elements/Events/View/row_attribute.ctp:394
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:384;389
+#: View/Elements/Events/View/row_attribute.ctp:404;409
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:389
+#: View/Elements/Events/View/row_attribute.ctp:409
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:401
+#: View/Elements/Events/View/row_attribute.ctp:421
 msgid "Soft-delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:65
-#: View/Elements/Feeds/View/row_object.ctp:16
-#: View/Events/resolved_misp_format.ctp:109
+#: View/Elements/Events/View/row_object.ctp:68
+#: View/Elements/Feeds/View/row_object.ctp:19
+#: View/Events/resolved_misp_format.ctp:113
 msgid "Name: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:66
+#: View/Elements/Events/View/row_object.ctp:69
 #: 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.ctp:20
 #: 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.ctp:20
 #: View/Elements/Servers/View/row_object_reference.ctp:7
 #: View/Elements/Servers/View/row_object_referenced_by.ctp:7
-#: View/Events/resolved_misp_format.ctp:110;120
+#: View/Events/resolved_misp_format.ctp:114;135
 msgid "Expand or Collapse"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:69
-#: View/Events/resolved_misp_format.ctp:92;262
-#: View/GalaxyClusters/view.ctp:19
-#: View/ObjectTemplates/index.ctp:66
-#: View/ObjectTemplates/view.ctp:6
-#: View/Objects/revise_object.ctp:61
-#: View/OrgBlacklists/index.ctp:23
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/view.ctp:24
-#: View/Organisations/ajax/merge.ctp:58;65
-#: View/SharingGroups/add.ctp:72
-#: View/SharingGroups/edit.ctp:72
-#: View/TagCollections/index.ctp:8
-msgid "UUID"
-msgstr ""
-
-#: View/Elements/Events/View/row_object.ctp:70
+#: View/Elements/Events/View/row_object.ctp:73
 msgid "Meta-category: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:71
-#: View/Elements/Feeds/View/row_object.ctp:21
+#: View/Elements/Events/View/row_object.ctp:74
+#: View/Elements/Feeds/View/row_object.ctp:24
 msgid "Description: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:72
-#: View/Elements/Feeds/View/row_object.ctp:22
+#: View/Elements/Events/View/row_object.ctp:75
+#: View/Elements/Feeds/View/row_object.ctp:25
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:125
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:125
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Soft delete object"
 msgstr ""
 
+#: View/Elements/Events/View/row_object.ctp:164
+msgid "Add an Object Attribute"
+msgstr ""
+
 #: View/Elements/Events/View/row_object_reference.ctp:1
 #: View/Elements/Feeds/View/row_object_reference.ctp:1
-#: View/Events/resolved_misp_format.ctp:115
+#: View/Events/resolved_misp_format.ctp:130
 msgid "References: "
 msgstr ""
 
@@ -6150,18 +8545,18 @@ msgstr ""
 msgid "Select proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:183
-#: View/Elements/Events/View/row_proposal_delete.ctp:77
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept Proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:183
-#: View/Elements/Events/View/row_proposal_delete.ctp:77
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:188
-#: View/Elements/Events/View/row_proposal_delete.ctp:82
+#: View/Elements/Events/View/row_proposal.ctp:199
+#: View/Elements/Events/View/row_proposal_delete.ctp:85
 msgid "Discard proposal"
 msgstr ""
 
@@ -6181,24 +8576,22 @@ msgid "Advanced sightings"
 msgstr ""
 
 #: View/Elements/Events/View/value_field.ctp:52
-#: View/Elements/Servers/View/value_field.ctp:43
+msgid "Cortex object"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:68
 msgid "Hexadecimal representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:52
-#: View/Elements/Feeds/View/value_field.ctp:43
-#: View/Elements/Servers/View/value_field.ctp:43
+#: View/Elements/Events/View/value_field.ctp:69
 msgid "Switch to binary representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:58
-#: View/Elements/Feeds/View/value_field.ctp:48
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:58
-#: View/Elements/Feeds/View/value_field.ctp:48
-#: View/Elements/Servers/View/value_field.ctp:48
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr ""
 
@@ -6222,19 +8615,14 @@ msgstr ""
 msgid "Check coverage"
 msgstr ""
 
-#: View/Elements/Feeds/View/row_object.ctp:20
-#: View/Elements/Servers/View/row_object.ctp:20
+#: View/Elements/Feeds/View/row_object.ctp:23
+#: View/Elements/Servers/View/row_object.ctp:23
 #: View/ObjectTemplates/index.ctp:69
 #: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:31
 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/Objects/object_similarities.ctp:76
 msgid "Update template and merge"
 msgstr ""
@@ -6279,98 +8667,44 @@ msgstr ""
 msgid "-- Select an option --"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:31;97
+#: View/Elements/Servers/eventattribute.ctp:31;98
 msgid "all"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:50
 #: View/Elements/templateElements/templateRowAttribute.ctp:82
 #: View/Events/resolved_attributes.ctp:49
-#: View/Events/resolved_misp_format.ctp:94;264
+#: View/Events/resolved_misp_format.ctp:95;290
 #: View/Feeds/freetext_index.ctp:34
-#: View/Objects/add.ctp:103
+#: View/Objects/add.ctp:116
 #: 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:305
+#: View/Elements/healthElements/diagnostics.ctp:367
 #: View/Pages/doc/administration.ctp:56;228
 #: View/Servers/ajax/submoduleStatus.ctp:6
 msgid "Status"
 msgstr ""
 
-#: View/Elements/Servers/View/row_attribute.ctp:93
+#: View/Elements/Servers/View/row_attribute.ctp:95
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
+#: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
-#: View/Events/view.ctp:190
-#: View/GalaxyClusters/view.ctp:32
+#: View/Events/view.ctp:191
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
-#: View/Users/admin_view.ctp:63;84
-#: View/Users/view.ctp:33
+#: View/Users/admin_view.ctp:95
 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/Feeds/search_caches.ctp:47
-#: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
-#: View/ObjectTemplates/view.ctp:4
-#: View/Objects/add.ctp:193
-#: View/Objects/revise_object.ctp:27
-#: 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:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
-#: View/ObjectTemplates/view.ctp:9
-#: View/Objects/add.ctp:22;100;197
-#: View/Objects/group_attributes_into_object.ctp:8
-#: View/Objects/propose_objects_from_attributes.ctp:17
-#: 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/TagCollections/index.ctp:15
-#: 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/Elements/Servers/View/row_object.ctp:25
 #: View/Objects/propose_objects_from_attributes.ctp:14
 #: View/Templates/view.ctp:2
 msgid "Template"
@@ -6386,20 +8720,22 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
-#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/TagCollections/index_row.ctp:45
 #: View/Tags/index.ctp:125
 #: View/Whitelists/admin_index.ctp:32
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: View/Elements/TagCollections/index_row.ctp:50
+#: View/Elements/TagCollections/index_row.ctp:51;52
 msgid "Download configuration"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
@@ -6412,20 +8748,18 @@ 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
+#: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:88
-msgid "Initiate password refresh"
-msgstr ""
-
-#: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 msgid "Create new credentials and inform user"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:611
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -6442,6 +8776,7 @@ msgid "Events published: "
 msgstr ""
 
 #: View/Elements/dashboard/dashboard_events.ctp:7
+#: View/Servers/index.ctp:107
 msgid "Reset"
 msgstr ""
 
@@ -6461,439 +8796,713 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
-msgid "Populate From Template"
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
-msgid "Enrichment Module Result"
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+msgid "Enrichment Module Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;824;996
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
-#: View/Events/edit.ctp:8
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+msgid "Publish Sightings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:180
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:181
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:197
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:204;291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:227;232
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:265
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:334
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:346
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:367
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:376
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:386
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:387
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:397
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:402
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:413
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:423
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:427
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:434;600
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:469
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524;554
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:543
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:562
-#: View/Servers/edit.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:593
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
+msgid "View community"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
+msgid "Request E-mail"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:605
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:610
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:619
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:624
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:653
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
+msgid "User settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757;771
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:762
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:776
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:782
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:794
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:810
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:818;837
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:852
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+msgid "Update Default Models"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
+msgid "Force Update Default Models"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
+msgid "Import Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
+msgid "Add Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+msgid "Decaying Tool"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
+msgid "View Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
+msgid "Edit Decaying Model"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:901
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:907
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:912
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:920
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:925
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:946
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:951
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:972
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:973
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:978
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:979
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:986;1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:991
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1015
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1021
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
+#: View/Sightingdb/add.ctp:6
+msgid "Add SightingDB connection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
+msgid "Edit SightingDB connection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
+msgid "List SightingDB connections"
+msgstr ""
+
 #: View/Elements/genericElements/SideMenu/side_menu_post_link.ctp:26
 #: View/Errors/error403.ctp:4
 msgid "%s"
 msgstr ""
 
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:4
+msgid "Show database indexes"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:9
+msgid "Index diagnostic:"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:12
+msgid "Notice"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:13
+msgid "The highlighted issues may be benign. if you are unsure, please open an issue and ask for clarification."
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:47
+msgid "Fix Database Index Schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
+msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:62
+msgid "The current database schema does not match the expected format."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
+msgid "Database schema diagnostic: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:68;74
+msgid "The MISP database state does not match the expected schema. Resolving these issues is recommended."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:69;75
+msgid "⚠ This diagnostic tool is in experimental state - the highlighted issues may be benign. If you are unsure, please open an issue on with the issues identified over at https://github.com/MISP/MISP for clarification."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:79
+msgid "Reveal benign deltas"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Table name"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Expected schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+msgid "Actual schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
+msgid "Fix Database schema"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
+msgid "The current database is correct"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
+msgid "Expected DB_version: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
+msgid "The current database version matches the expected one"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
+msgid "Actual DB_version: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
+msgid "The current database version does not match the expected one"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
+msgid "Updates are locked"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
+msgid "Updates are not locked"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+#: View/Servers/update_progress.ctp:32
+msgid "Updates are locked due to to many update fails"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+msgid "Updates unlocked in %s"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
+msgid "DataSource: "
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
+msgid "Column diagnostic"
+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 ""
@@ -6956,7 +9565,7 @@ msgid "Click the following button to go to the update progress page. This page l
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:69
-msgid "Update Progress"
+msgid "View Update Progress"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:71
@@ -7046,7 +9655,7 @@ msgid "PHP CLI Version"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:162
-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: "
+msgid "Please note that the support for Python versions below 3.6 and below PHP 7.2 has been dropped as of 2020-01-01 and are henceforth considered unsupported. More info: "
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:163
@@ -7071,237 +9680,293 @@ msgstr ""
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:197
-msgid "Advanced attachment handler"
+#: View/Elements/healthElements/diagnostics.ctp:206
+msgid "Table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:198
-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:203
-msgid "PyMISP"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:203
-msgid "Not installed or version outdated."
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:215
-msgid "STIX and Cybox libraries"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:216
-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."
+#: View/Elements/healthElements/diagnostics.ctp:211
+msgid "Used"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:217
-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"
+msgid "Reclaimable"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:223
+msgid "SQL database status"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:224
-msgid "Other versions might work but are not tested / recommended."
+msgid "Size of each individual table on disk, along with the size that can be freed via SQL optimize. Make sure that you always have at least 3x the size of the largest table in free space in order for the update scripts to work as expected."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:233
-msgid "STIX and CyBox"
+#: View/Elements/healthElements/diagnostics.ctp:229
+msgid "Schema status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:233
-msgid "Could not read test script (stixtest.py)."
+#: View/Elements/healthElements/diagnostics.ctp:246
+msgid "Redis info"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:247
-msgid " library version"
+#: View/Elements/healthElements/diagnostics.ctp:248
+msgid "PHP extension version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:264
-msgid "Yara"
+#: View/Elements/healthElements/diagnostics.ctp:248
+msgid "Not installed."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:250
+msgid "Redis version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:251
+msgid "Memory allocator"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:252
+msgid "Memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:253
+msgid "Peak memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:254
+msgid "Total system memory"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:259
+msgid "Advanced attachment handler"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:260
+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:265
-msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
+msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:272
-msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
+#: View/Elements/healthElements/diagnostics.ctp:265
+msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:274
-msgid "plyara library installed"
+#: View/Elements/healthElements/diagnostics.ctp:277
+msgid "STIX and Cybox libraries"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:278
-msgid "GnuPG"
+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:279
+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:286
+msgid "Other versions might work but are not tested / recommended."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:295
+msgid "STIX and CyBox"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:295
+msgid "Could not read test script (stixtest.py)."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:309
+msgid " library version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:326
+msgid "Yara"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:327
+msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:334
+msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:336
+msgid "plyara library installed"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:340
+msgid "GnuPG"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:341
 msgid "This tool tests whether your GnuPG is set up correctly or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:287
+#: View/Elements/healthElements/diagnostics.ctp:349
 msgid "GnuPG installation and settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:290
+#: View/Elements/healthElements/diagnostics.ctp:352
 msgid "ZeroMQ"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:291
+#: View/Elements/healthElements/diagnostics.ctp:353
 msgid "This tool tests whether the ZeroMQ extension is installed and functional."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:299
+#: View/Elements/healthElements/diagnostics.ctp:361
 msgid "ZeroMQ settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:303
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:305
+#: View/Elements/healthElements/diagnostics.ctp:367
 msgid "Check ZeroMQ service status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:307
+#: View/Elements/healthElements/diagnostics.ctp:369
 msgid "Proxy"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:308
+#: View/Elements/healthElements/diagnostics.ctp:370
 msgid "This tool tests whether your HTTP proxy settings are correct."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:316
+#: View/Elements/healthElements/diagnostics.ctp:378
 #: View/Pages/doc/administration.ctp:35
 msgid "Proxy settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:319
+#: View/Elements/healthElements/diagnostics.ctp:381
 msgid "Module System"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:320
+#: View/Elements/healthElements/diagnostics.ctp:382
 msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:335
+#: View/Elements/healthElements/diagnostics.ctp:397
 msgid " module system"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:341
+#: View/Elements/healthElements/diagnostics.ctp:403
 msgid "Session table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:342
+#: View/Elements/healthElements/diagnostics.ctp:404
 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:349
+#: View/Elements/healthElements/diagnostics.ctp:411
 msgid "Expired sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:355
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Purge sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:359
+#: View/Elements/healthElements/diagnostics.ctp:421
 msgid "Clean model cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:360
+#: View/Elements/healthElements/diagnostics.ctp:422
 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:361
+#: View/Elements/healthElements/diagnostics.ctp:423
 msgid "Clean cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:362
-msgid "Overwritten objects"
+#: View/Elements/healthElements/diagnostics.ctp:427
+msgid "Check for deprecated function usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:363
-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."
+#: View/Elements/healthElements/diagnostics.ctp:428
+msgid "In an effort to identify the usage of deprecated functionalities, MISP has started aggregating the count of access requests to these endpoints. Check the frequency of their use below along with the users to potentially warn about better ways of achieving their goals."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:364
-msgid "Reconstruct overwritten objects"
+#: View/Elements/healthElements/diagnostics.ctp:431;432;434
+msgid "View deprecated endpoint usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:365;368
+#: View/Elements/healthElements/diagnostics.ctp:438;441
 msgid "Orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:366
+#: View/Elements/healthElements/diagnostics.ctp:439
 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:368;382
+#: View/Elements/healthElements/diagnostics.ctp:441;455
 msgid "Run the test below"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attribute"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:371
+#: View/Elements/healthElements/diagnostics.ctp:444
 msgid "Remove orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:372
+#: View/Elements/healthElements/diagnostics.ctp:445
 msgid "Remove published empty events"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:373;375
+#: View/Elements/healthElements/diagnostics.ctp:446;448
 #: View/Servers/ondemand_action.ctp:7
 msgid "Administrator On-demand Action"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:374
+#: View/Elements/healthElements/diagnostics.ctp:447
 msgid "Click the following button to go to the Administrator On-demand Action page."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:376;378
+#: View/Elements/healthElements/diagnostics.ctp:449;451
 msgid "Legacy Administrative Tools"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:377
+#: View/Elements/healthElements/diagnostics.ctp:450
 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:379
+#: View/Elements/healthElements/diagnostics.ctp:452
 msgid "Verify bad link on attachments"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:380
+#: View/Elements/healthElements/diagnostics.ctp:453
 msgid "Verify each attachment referenced in database is accessible on filesystem."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:382
+#: View/Elements/healthElements/diagnostics.ctp:455
 msgid "Non existing attachments referenced in Database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:384
+#: View/Elements/healthElements/diagnostics.ctp:457
 msgid "Check bad link on attachments"
 msgstr ""
 
@@ -7340,8 +10005,8 @@ msgstr ""
 #: View/Elements/healthElements/files.ctp:73
 #: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:80
-#: View/SharingGroups/index.ctp:87
+#: View/Roles/admin_index.ctp:90
+#: View/SharingGroups/index.ctp:89
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
@@ -7362,27 +10027,10 @@ msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
+#: View/Sightingdb/index.ctp:32
 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/resolved_misp_format.ctp:91;261
-#: View/Events/show_i_o_c_results.ctp:13
-#: View/Feeds/freetext_index.ctp:33
-#: View/Noticelists/view.ctp:42
-#: View/Objects/add.ctp:102
-#: View/Objects/group_attributes_into_object.ctp:58
-#: View/Objects/revise_object.ctp:58
-#: 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 ""
@@ -7422,6 +10070,7 @@ msgstr ""
 
 #: View/Elements/healthElements/settings_table.ctp:4
 #: View/Pages/doc/administration.ctp:46
+#: View/UserSettings/index.ctp:62
 msgid "Setting"
 msgstr ""
 
@@ -7510,8 +10159,9 @@ msgstr ""
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
 #: View/TagCollections/index.ctp:14
-#: View/Users/admin_view.ctp:98
-#: View/Users/view.ctp:58
+#: View/UserSettings/index.ctp:56
+#: View/Users/admin_view.ctp:109
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr ""
 
@@ -7556,7 +10206,7 @@ msgid "Start a worker"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
+msgid "Restart dead workers"
 msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
@@ -7648,11 +10298,15 @@ msgstr ""
 msgid "Blocked Orgs (AND NOT)"
 msgstr ""
 
-#: View/Elements/serverRuleElements/pull.ctp:65
+#: View/Elements/serverRuleElements/pull.ctp:60
+msgid "Additional sync parameters (based on the event index filters)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:68
 msgid "Accept changes"
 msgstr ""
 
-#: View/Elements/serverRuleElements/pull.ctp:65
+#: View/Elements/serverRuleElements/pull.ctp:68
 #: View/Elements/serverRuleElements/push.ctp:67
 msgid "Update"
 msgstr ""
@@ -7679,29 +10333,6 @@ msgstr ""
 msgid "Field"
 msgstr ""
 
-#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
-#: View/Events/export.ctp:26
-#: View/Events/resolved_attributes.ctp:48
-#: View/Events/resolved_misp_format.ctp:90;260
-#: View/Events/show_i_o_c_results.ctp:12
-#: View/Feeds/freetext_index.ctp:32
-#: View/Feeds/search_caches.ctp:41
-#: View/Objects/revise_object.ctp:57
-#: 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 ""
@@ -7732,10 +10363,6 @@ msgstr ""
 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
@@ -7758,33 +10385,12 @@ msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
 #: View/ObjectReferences/ajax/add.ctp:86
-#: View/Objects/revise_object.ctp:55
+#: View/Objects/revise_object.ctp:62
 #: 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/resolved_misp_format.ctp:89;259
-#: View/Events/show_i_o_c_results.ctp:11
-#: View/Feeds/freetext_index.ctp:31
-#: View/Objects/add.ctp:101
-#: View/Objects/group_attributes_into_object.ctp:57
-#: View/Objects/propose_objects_from_attributes.ctp:16
-#: View/Objects/revise_object.ctp:56
-#: 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
@@ -7907,20 +10513,6 @@ msgstr ""
 msgid "Event Blacklists"
 msgstr ""
 
-#: View/EventBlacklists/index.ctp:35
-#: View/Events/index.ctp:94
-#: View/Feeds/preview_index.ctp:25
-#: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
-#: View/ObjectTemplates/index.ctp:47
-#: View/Organisations/index.ctp:75
-#: View/Servers/preview_index.ctp:64
-#: View/Tags/index.ctp:56
-#: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:61
-msgid "Filter"
-msgstr ""
-
 #: View/EventBlacklists/index.ctp:51
 #: View/Events/resolved_misp_format.ctp:39
 msgid "Event UUID"
@@ -7938,6 +10530,42 @@ msgstr ""
 msgid "Are you sure you want to delete from the blacklist the selected events?"
 msgstr ""
 
+#: View/EventDelegations/index.ctp:30
+msgid "Pending"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:35
+msgid "Issued"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:56
+msgid "Requester"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:63
+#: View/Pages/doc/administration.ctp:134
+msgid "Recipient"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:82
+#: View/Events/automation.ctp:279;286
+#: 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/EventDelegations/index.ctp:86
+msgid "Delegation index"
+msgstr ""
+
+#: View/EventDelegations/index.ctp:87
+#: View/Posts/add.ctp:33
+msgid ""
+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 ""
@@ -8051,35 +10679,29 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/Events/add.ctp:45
-#: View/Events/edit.ctp:36
-msgid "Threat Level "
+#: View/Events/add.ctp:39
+#: View/Events/view.ctp:148
+#: 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/add.ctp:50
-#: View/Events/edit.ctp:40
-msgid "Analysis "
-msgstr ""
-
-#: View/Events/add.ctp:54
-#: View/Events/edit.ctp:45
-#: View/ShadowAttributes/index.ctp:52
+#: View/Events/add.ctp:49
+#: View/ShadowAttributes/index.ctp:59
 msgid "Event Info"
 msgstr ""
 
-#: View/Events/add.ctp:58
-#: View/Events/edit.ctp:49
+#: View/Events/add.ctp:52
 msgid "Quick Event Description or Tracking Info"
 msgstr ""
 
-#: View/Events/add.ctp:61
-#: View/Events/edit.ctp:52
-msgid "Extends event"
+#: View/Events/add.ctp:57
+msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr ""
 
-#: View/Events/add.ctp:65
-#: View/Events/edit.ctp:55
-msgid "Event UUID or ID. Leave blank if not applicable."
+#: View/Events/add.ctp:58
+msgid "Extends Event"
 msgstr ""
 
 #: View/Events/add_i_o_c.ctp:4
@@ -8111,10 +10733,6 @@ msgstr ""
 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 ""
@@ -8143,7 +10761,7 @@ msgid "Automation functionality is designed to automatically feed other tools an
 msgstr ""
 
 #: View/Events/automation.ctp:5
-msgid "You can use the <a href=\"servers/rest\">ReST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
+msgid "You can use the <a href=\"/servers/rest\">REST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
 msgstr ""
 
 #: View/Events/automation.ctp:6
@@ -8154,477 +10772,475 @@ msgstr ""
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 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."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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/automation.ctp:27
 #: 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
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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
+#: View/Events/automation.ctp:32
 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
+#: View/Events/automation.ctp:33
 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/automation.ctp:34
 #: 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/automation.ctp:35
 #: 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/automation.ctp:36
 #: 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/automation.ctp:37
 #: 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/automation.ctp:38
 #: 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/automation.ctp:39
 #: 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;150
+#: View/Events/automation.ctp:40;160
 #: 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;151
+#: View/Events/automation.ctp:41;161
 #: 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/automation.ctp:42
 #: 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/automation.ctp:43
 #: 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/automation.ctp:44
 #: 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/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:46
 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/automation.ctp:47
 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/automation.ctp:48
 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/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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/automation.ctp:52
 #: 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/automation.ctp:53
 #: 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
+#: View/Events/automation.ctp:54
 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
+#: View/Events/automation.ctp:55
 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
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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:81
+#: View/Events/automation.ctp:91
 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:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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:97
+#: View/Events/automation.ctp:107
 #: 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:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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:118
+#: View/Events/automation.ctp:128
 #: 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:136
+#: View/Events/automation.ctp:146
 #: 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:138
+#: View/Events/automation.ctp:148
 #: 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:145
+#: View/Events/automation.ctp:155
 #: 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:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:152
+#: View/Events/automation.ctp:162
 #: 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:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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:156
+#: View/Events/automation.ctp:166
 #: 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:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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:172
+#: View/Events/automation.ctp:182
 #: 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:173
+#: View/Events/automation.ctp:183
 #: 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:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:187
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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:191
+#: View/Events/automation.ctp:201
 #: 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:192
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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:205
+#: View/Events/automation.ctp:215
 #: 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:206
+#: View/Events/automation.ctp:216
 #: 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:207
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:208
+#: View/Events/automation.ctp:218
 #: 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:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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:214
+#: View/Events/automation.ctp:224
 #: 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:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: 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:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:68
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -8632,208 +11248,200 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
-#: View/Servers/rest.ctp:160
+#: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:269;276
-#: 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:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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:291
+#: View/Events/automation.ctp:301
 #: 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:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:309
+#: View/Events/automation.ctp:319
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:310
+#: View/Events/automation.ctp:320
 #: 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:311
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:324
 #: 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:315
+#: View/Events/automation.ctp:325
 #: 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:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 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:322
+#: View/Events/automation.ctp:332
 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:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
@@ -9029,7 +11637,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -9075,24 +11683,24 @@ msgstr ""
 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
+#: View/Events/import_module.ctp:99
 msgid "Input File"
 msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 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
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr ""
 
@@ -9126,6 +11734,11 @@ msgstr ""
 msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
+#: View/Events/legacy_automation.ctp:7
+msgid "Your current key is: <code>%s</code>.\n"
+"    You can %s this key."
+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 ""
@@ -9443,7 +12056,7 @@ msgid "You can also use search for IP addresses using CIDR. Make sure that you u
 msgstr ""
 
 #: View/Events/merge.ctp:4
-msgid "Merge events"
+msgid "Merge events - WARNING: this feature is very outdated and should not be used anymore."
 msgstr ""
 
 #: View/Events/merge.ctp:9
@@ -9508,22 +12121,11 @@ msgid "Similar Attributes"
 msgstr ""
 
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/resolved_misp_format.ctp:95;265
-#: View/Objects/add.ctp:104
+#: View/Events/resolved_misp_format.ctp:96;291
+#: View/Objects/add.ctp:117
 msgid "Disable Correlation"
 msgstr ""
 
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/resolved_misp_format.ctp:96;266
-#: View/ObjectReferences/ajax/add.ctp:30
-#: View/Objects/add.ctp:67;106
-#: View/Objects/group_attributes_into_object.ctp:30
-#: View/Objects/revise_object.ctp:49;60
-#: 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:195
 msgid "Remove resolved attribute"
 msgstr ""
@@ -9559,15 +12161,19 @@ msgstr ""
 msgid "#Resolved Attributes"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:107
+#: View/Events/resolved_misp_format.ctp:89;284
+msgid "Import"
+msgstr ""
+
+#: View/Events/resolved_misp_format.ctp:111
 msgid "ID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:112
+#: View/Events/resolved_misp_format.ctp:127
 msgid "UUID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:113
+#: View/Events/resolved_misp_format.ctp:128
 msgid "Meta Category: "
 msgstr ""
 
@@ -9585,7 +12191,6 @@ msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -9640,35 +12245,24 @@ msgstr ""
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:86
-msgid "Creator org"
-msgstr ""
-
-#: View/Events/view.ctp:147
-#: 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:153
+#: View/Events/view.ctp:154
 #: 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:177
+#: View/Events/view.ctp:178
 msgid "Toggle advanced sharing network viewer"
 msgstr ""
 
-#: View/Events/view.ctp:183
+#: View/Events/view.ctp:184
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr ""
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:188
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
@@ -9676,156 +12270,161 @@ msgstr ""
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:193
+#: View/Events/view.ctp:194
 msgid " (%s Objects)"
 msgstr ""
 
-#: View/Events/view.ctp:193
+#: View/Events/view.ctp:194
 msgid " (%s Object)"
 msgstr ""
 
-#: View/Events/view.ctp:195
+#: View/Events/view.ctp:196
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:199
+#: View/Events/view.ctp:200
 msgid "First recorded change"
 msgstr ""
 
-#: View/Events/view.ctp:203
+#: View/Events/view.ctp:204
 msgid "Last change"
 msgstr ""
 
-#: View/Events/view.ctp:207
+#: View/Events/view.ctp:208
 msgid "Modification map"
 msgstr ""
 
-#: View/Events/view.ctp:213
+#: View/Events/view.ctp:214
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:232
+#: View/Events/view.ctp:233
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:239
+#: View/Events/view.ctp:240
 msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:239
+#: View/Events/view.ctp:240
 msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:270
+#: View/Events/view.ctp:271
 msgid "%s has requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:276
+#: View/Events/view.ctp:277
 msgid "%s has requested that you take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:282
+#: View/Events/view.ctp:283
 msgid "You have requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:287
+#: View/Events/view.ctp:288
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:299
+#: View/Events/view.ctp:300
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:309
-#: View/Users/admin_view.ctp:86
+#: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
+#: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:309
-#: View/Feeds/view.ctp:62
-#: View/Noticelists/index.ctp:63
-#: View/ObjectTemplates/index.ctp:35
-#: View/Taxonomies/view.ctp:24
-msgid "Enabled"
-msgstr ""
-
-#: View/Events/view.ctp:318
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "enable"
 msgstr ""
 
-#: View/Events/view.ctp:318
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:329
+#: View/Events/view.ctp:330
 msgid "Extended view"
 msgstr ""
 
-#: View/Events/view.ctp:346
+#: View/Events/view.ctp:337
+msgid "Warning: Taxonomy inconsistencies"
+msgstr ""
+
+#: View/Events/view.ctp:382
 #: View/Feeds/preview_event.ctp:84
 #: View/Servers/preview_event.ctp:112
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:406;441
+#: View/Events/view.ctp:443;478
 msgid "This event has "
 msgstr ""
 
-#: View/Events/view.ctp:407;442
+#: View/Events/view.ctp:444;479
 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:450
+#: View/Events/view.ctp:487
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:466
+#: View/Events/view.ctp:503
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:466
+#: View/Events/view.ctp:503
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:469
+#: View/Events/view.ctp:506
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:469
+#: View/Events/view.ctp:506
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:472
+#: View/Events/view.ctp:509
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:475
+#: View/Events/view.ctp:512
+msgid "Toggle Event timeline"
+msgstr ""
+
+#: View/Events/view.ctp:512
+msgid "Event timeline"
+msgstr ""
+
+#: View/Events/view.ctp:515
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:475
+#: View/Events/view.ctp:515
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:478
+#: View/Events/view.ctp:518
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:478
+#: View/Events/view.ctp:518
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:481
+#: View/Events/view.ctp:521
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:484
+#: View/Events/view.ctp:524
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:484
+#: View/Events/view.ctp:524
 msgid "Discussion"
 msgstr ""
 
@@ -9886,11 +12485,15 @@ msgid "Are you sure you wish to unpublish the event?"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:20
+msgid "Are you sure you wish publish and synchronise all sightings attached to this event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:22
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
-#: View/Feeds/index.ctp:105
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -9924,78 +12527,81 @@ msgstr ""
 msgid "Add MISP Feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:5
-msgid "Add a new MISP feed source."
-msgstr ""
-
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
-#: View/Feeds/view.ctp:63
-msgid "Caching enabled"
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
 msgstr ""
 
 #: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+msgid "Add a new MISP feed source."
+msgstr ""
+
+#: View/Feeds/add.ctp:14
+#: View/Feeds/view.ctp:64
+msgid "Caching enabled"
+msgstr ""
+
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr ""
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:15
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr ""
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
-#: View/Feeds/view.ctp:30
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
+#: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:20
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr ""
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr ""
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:60
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr ""
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:69
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:73
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr ""
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:32
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr ""
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:36
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr ""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:40
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr ""
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:44
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr ""
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:48
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -10004,129 +12610,128 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:52
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr ""
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:82
-msgid "Target Event"
-msgstr ""
-
 #: View/Feeds/add.ctp:94
-#: View/Feeds/edit.ctp:92
-msgid "Target Event ID"
-msgstr ""
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:94
-msgid "Leave blank unless you want to reuse an existing event."
+#: View/Feeds/edit.ctp:98
+msgid "Creator organisation"
 msgstr ""
 
 #: View/Feeds/add.ctp:104
-#: View/Feeds/edit.ctp:102
-msgid "Value field(s) in the CSV"
+#: View/Feeds/edit.ctp:108
+msgid "Target Event"
 msgstr ""
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:103
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr ""
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:105
-msgid "2,3,4 (column position separated by commas)"
-msgstr ""
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:113
-msgid "Delimiter"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
 msgstr ""
 
 #: View/Feeds/add.ctp:116
-#: View/Feeds/edit.ctp:114
-msgid "Set the default CSV delimiter (default = \",\")"
+#: View/Feeds/edit.ctp:120
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr ""
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr ""
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
 msgstr ""
 
 #: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:124
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr ""
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr ""
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
+msgid "Set the default CSV delimiter (default = \",\")"
+msgstr ""
+
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr ""
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:125
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr ""
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:135
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr ""
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 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:148
-#: View/Feeds/edit.ctp:144
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr ""
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:145
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr ""
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:154
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr ""
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:155
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr ""
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:182
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr ""
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:187
-msgid "Filter rules"
-msgstr ""
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:189
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:190
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr ""
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:191
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr ""
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:192
-#: View/Servers/add.ctp:106
-#: View/Servers/edit.ctp:149;155
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
+#: View/Servers/add.ctp:116
+#: View/Servers/edit.ctp:155;162
 msgid "Modify"
 msgstr ""
 
@@ -10142,66 +12747,66 @@ msgstr ""
 msgid "Edit MISP Feed"
 msgstr ""
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr ""
 
-#: View/Feeds/edit.ctp:127
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr ""
 
-#: View/Feeds/edit.ctp:207
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr ""
 
-#: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:136
-#: View/Servers/edit.ctp:183
+#: View/Feeds/edit.ctp:234
+#: View/Servers/add.ctp:146
+#: View/Servers/edit.ctp:190
 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:209
-#: View/Servers/add.ctp:137
-#: View/Servers/edit.ctp:182
+#: View/Feeds/edit.ctp:235
+#: View/Servers/add.ctp:147
+#: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
-#: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:138
-#: View/Servers/edit.ctp:184
+#: View/Feeds/edit.ctp:236
+#: View/Servers/add.ctp:148
+#: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:139
-#: View/Servers/edit.ctp:185
+#: View/Feeds/edit.ctp:237
+#: View/Servers/add.ctp:149
+#: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
-#: View/Feeds/edit.ctp:212
-#: View/Servers/add.ctp:140
-#: View/Servers/edit.ctp:186
+#: View/Feeds/edit.ctp:238
+#: View/Servers/add.ctp:150
+#: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
-#: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:187
+#: View/Feeds/edit.ctp:239
+#: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:188
+#: View/Feeds/edit.ctp:240
+#: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
-#: View/Feeds/edit.ctp:215
-#: View/Servers/edit.ctp:189
+#: View/Feeds/edit.ctp:241
+#: View/Servers/edit.ctp:196
 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:216
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:191
+#: View/Feeds/edit.ctp:242
+#: View/Servers/add.ctp:154
+#: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -10225,147 +12830,132 @@ msgstr ""
 msgid "Paste a MISP feed metadata JSON below to add feeds."
 msgstr ""
 
-#: View/Feeds/import_feeds.ctp:10
-#: View/Servers/import.ctp:10
-#: View/TagCollections/import.ctp:10
-msgid "JSON"
-msgstr ""
-
 #: View/Feeds/import_feeds.ctp:11
 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:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr ""
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr ""
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr ""
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr ""
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: 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/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr ""
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:54
-#: View/Servers/index.ctp:75;76
-msgid "Rules"
+msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
+#: View/Feeds/index.ctp:196
+msgid "Visible"
 msgstr ""
 
 #: View/Feeds/index.ctp:211
-msgid "New fixed event"
+msgid "Feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:95
-msgid "Age: "
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
 msgstr ""
 
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:103
-msgid "Not cached"
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr ""
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:283
-msgid "Are you sure you want to permanently remove the feed (%s)?"
+#: View/Feeds/index.ctp:294
+msgid "Are you sure you want to permanently remove the feed?"
 msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -10386,20 +12976,6 @@ msgstr ""
 msgid "Fetch the event"
 msgstr ""
 
-#: View/Feeds/search_caches.ctp:35
-#: View/Feeds/view.ctp:3
-#: 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/Feeds/search_caches.ctp:53
 msgid "Feed URL"
 msgstr ""
@@ -10420,44 +12996,51 @@ msgstr ""
 msgid "Source format"
 msgstr ""
 
-#: View/Feeds/view.ctp:57
+#: View/Feeds/view.ctp:58
 msgid "Settings"
 msgstr ""
 
-#: View/Feeds/view.ctp:70
+#: View/Feeds/view.ctp:71
 msgid "Coverage by other feeds"
 msgstr ""
 
-#: View/Feeds/view.ctp:79
+#: View/Feeds/view.ctp:80
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr ""
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
+#: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr ""
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 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
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr ""
 
@@ -10465,33 +13048,30 @@ msgstr ""
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:23
-#: 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/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -10500,22 +13080,16 @@ msgstr ""
 msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
 msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
@@ -10526,6 +13100,27 @@ msgstr ""
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Inbox/index.ctp:31
+#: 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/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr ""
@@ -10546,12 +13141,6 @@ msgstr ""
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr ""
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr ""
@@ -10589,11 +13178,9 @@ msgstr ""
 msgid "Job type"
 msgstr ""
 
-#: View/Jobs/index.ctp:104
-#: View/OrgBlacklists/add.ctp:17
-#: View/OrgBlacklists/index.ctp:22
-#: View/Organisations/view.ctp:6
-msgid "Organisation name"
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
 msgstr ""
 
 #: View/Jobs/index.ctp:106
@@ -10670,17 +13257,14 @@ msgstr ""
 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:67
 #: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
+#: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -10688,13 +13272,6 @@ msgstr ""
 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"
@@ -10745,10 +13322,6 @@ msgstr ""
 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"
@@ -10904,87 +13477,87 @@ msgstr ""
 msgid "Meta category"
 msgstr ""
 
-#: View/Objects/add.ctp:85
+#: View/Objects/add.ctp:98
 msgid "Warning, issues found with the template"
 msgstr ""
 
-#: View/Objects/add.ctp:98
+#: View/Objects/add.ctp:111
 msgid "Save"
 msgstr ""
 
-#: View/Objects/add.ctp:99
+#: View/Objects/add.ctp:112
 msgid "Name :: type"
 msgstr ""
 
-#: View/Objects/add.ctp:156;167
+#: View/Objects/add.ctp:169;180
 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:171
+#: View/Objects/add.ctp:184
 msgid "Back"
 msgstr ""
 
-#: View/Objects/add.ctp:183
+#: View/Objects/add.ctp:196
 msgid "Pre-update object's template"
 msgstr ""
 
-#: View/Objects/add.ctp:189
+#: View/Objects/add.ctp:202
 #: View/Objects/group_attributes_into_object.ctp:54
 #: View/Organisations/ajax/merge.ctp:56;63
 #: View/Pages/doc/using_the_system.ctp:163;203
 msgid "ID"
 msgstr ""
 
-#: View/Objects/add.ctp:205
+#: View/Objects/add.ctp:218
 #: View/Objects/revise_object.ctp:45
 msgid "Template version"
 msgstr ""
 
-#: View/Objects/add.ctp:212;272
+#: View/Objects/add.ctp:225;285
 msgid "Can not be merged automatically"
 msgstr ""
 
-#: View/Objects/add.ctp:217;277
+#: View/Objects/add.ctp:230;290
 msgid "This attribute type is missing from the new template. It will be lost if not taken care of right now."
 msgstr ""
 
-#: View/Objects/add.ctp:239
+#: View/Objects/add.ctp:252
 msgid "Insert"
 msgstr ""
 
-#: View/Objects/add.ctp:242
+#: View/Objects/add.ctp:255
 msgid "No valid type. This attribute will be lost."
 msgstr ""
 
-#: View/Objects/add.ctp:249
+#: View/Objects/add.ctp:262
 msgid "This attribute can be merged automatically. Injection in the template done."
 msgstr ""
 
-#: View/Objects/add.ctp:264
+#: View/Objects/add.ctp:277
 msgid "Attributes to merge"
 msgstr ""
 
-#: View/Objects/add.ctp:265
+#: View/Objects/add.ctp:278
 msgid "Contextual information and actions"
 msgstr ""
 
-#: View/Objects/add.ctp:275
+#: View/Objects/add.ctp:288
 msgid "Overwrite the current attribute value with this one"
 msgstr ""
 
-#: View/Objects/add.ctp:285
+#: View/Objects/add.ctp:298
 msgid "Original value: "
 msgstr ""
 
-#: View/Objects/add.ctp:290
+#: View/Objects/add.ctp:303
 msgid "Can be merged automatically. Injection done."
 msgstr ""
 
-#: View/Objects/add.ctp:293
-msgid "An instance of this attribute already exists. However, as multiple instanciation is allowed by this template, the two attributes will be keept."
+#: View/Objects/add.ctp:306
+msgid "An instance of this attribute already exists. However, as multiple instances are allowed by this template, the two attributes will be kept."
 msgstr ""
 
-#: View/Objects/add.ctp:321;332
+#: View/Objects/add.ctp:335;346
 msgid "Enter value manually"
 msgstr ""
 
@@ -11100,35 +13673,35 @@ msgstr ""
 msgid "Make sure that the below Object reflects your expectation before submiting it."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:59
+#: View/Objects/revise_object.ctp:66
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:103
+#: View/Objects/revise_object.ctp:110
 msgid "Create new object"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:104
+#: View/Objects/revise_object.ctp:111
 msgid "Back to review"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:107
+#: View/Objects/revise_object.ctp:114
 msgid "This event contains similar objects."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:108
+#: View/Objects/revise_object.ctp:115
 msgid "Instead of creating a new object, would you like to merge your new object into one of the following?"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:125
+#: View/Objects/revise_object.ctp:132
 msgid "All similar objects not displayed..."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:126
+#: View/Objects/revise_object.ctp:133
 msgid "%s Similar objects found. %s not displayed"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:163
+#: View/Objects/revise_object.ctp:170
 msgid "This attribute will NOT be merged into the similar object as it is conflicting with another attribute."
 msgstr ""
 
@@ -11144,6 +13717,10 @@ msgstr ""
 msgid "Are you sure you want to %sdelete Object #%s? %s"
 msgstr ""
 
+#: View/Objects/ajax/quickAddAttributeForm.ctp:15
+msgid "Add Object attribute"
+msgstr ""
+
 #: View/OrgBlacklists/add.ctp:4
 msgid "Add Organisation Blacklist Entries"
 msgstr ""
@@ -11192,73 +13769,68 @@ msgstr ""
 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
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
 msgid "Paste UUID or click generate"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:25
-#: View/Organisations/admin_edit.ctp:24
+#: View/Organisations/admin_add.ctp:24
+#: View/Organisations/admin_edit.ctp:23
 msgid "Generate UUID"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:25
-#: View/Organisations/admin_edit.ctp:24
+#: View/Organisations/admin_add.ctp:24
+#: View/Organisations/admin_edit.ctp:23
 msgid "Generate a new UUID for the organisation"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:27
-#: View/Organisations/admin_edit.ctp:38
+#: View/Organisations/admin_add.ctp:26
+#: View/Organisations/admin_edit.ctp:37
 msgid "A brief description of the organisation"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:27
-#: View/Organisations/admin_edit.ctp:38
+#: View/Organisations/admin_add.ctp:26
+#: View/Organisations/admin_edit.ctp:37
 msgid "A description of the organisation that is purely informational."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:30
-#: View/Organisations/admin_edit.ctp:41
+#: View/Organisations/admin_add.ctp:29
+#: View/Organisations/admin_edit.ctp:40
 msgid "Bind user accounts to domains (line separated)"
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:30
-#: View/Organisations/admin_edit.ctp:41
+#: View/Organisations/admin_add.ctp:29
+#: View/Organisations/admin_edit.ctp:40
 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
+#: View/Organisations/admin_add.ctp:32
+#: View/Organisations/admin_edit.ctp:43
 msgid "The following fields are all optional."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:38
-#: View/Organisations/admin_edit.ctp:49
+#: View/Organisations/admin_add.ctp:37
+#: View/Organisations/admin_edit.ctp:48
 msgid "Logo (48x48 png)"
 msgstr ""
 
+#: View/Organisations/admin_add.ctp:43
+#: View/Organisations/admin_edit.ctp:54
+msgid "For example \"financial\"."
+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
+#: View/Organisations/admin_add.ctp:44
+#: View/Organisations/admin_edit.ctp:55
 msgid "Freetext description of the org."
 msgstr ""
 
-#: View/Organisations/admin_add.ctp:46
-#: View/Organisations/admin_edit.ctp:57
+#: View/Organisations/admin_add.ctp:45
+#: View/Organisations/admin_edit.ctp:56
 msgid "You can add some contact details for the organisation here, if applicable."
 msgstr ""
 
@@ -11266,15 +13838,15 @@ msgstr ""
 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
+#: View/Organisations/admin_edit.ctp:29
 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
+#: View/Organisations/admin_edit.ctp:31
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/admin_edit.ctp:57
+#: View/Organisations/admin_edit.ctp:56
 msgid "Contacts"
 msgstr ""
 
@@ -11317,7 +13889,7 @@ msgstr ""
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr ""
 
@@ -11351,12 +13923,12 @@ msgid "Last modified"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:36
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr ""
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr ""
 
@@ -11702,7 +14274,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
-#: View/Servers/edit.ctp:84
+#: View/Servers/edit.ctp:90
 msgid "Misc settings"
 msgstr ""
 
@@ -11898,7 +14470,7 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:76
+#: View/Users/admin_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -11909,7 +14481,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -11922,7 +14494,7 @@ 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr ""
 
@@ -11975,6 +14547,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -12005,7 +14578,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:84
+#: View/Users/admin_view.ctp:95
 msgid "Newsread"
 msgstr ""
 
@@ -12077,10 +14650,6 @@ msgstr ""
 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 ""
@@ -13293,10 +15862,6 @@ msgstr ""
 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 ""
@@ -14346,10 +16911,6 @@ msgstr ""
 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 ""
@@ -14439,7 +17000,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:129
+#: View/Servers/index.ctp:175
 msgid "Push all"
 msgstr ""
 
@@ -14448,7 +17009,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:126
+#: View/Servers/index.ctp:172
 msgid "Pull all"
 msgstr ""
 
@@ -14566,11 +17127,6 @@ msgstr ""
 msgid "In response to"
 msgstr ""
 
-#: View/Posts/add.ctp:33
-msgid ""
-msgstr ""
-""
-
 #: View/Posts/edit.ctp:12
 msgid "Contents"
 msgstr ""
@@ -14609,6 +17165,16 @@ msgstr ""
 msgid "Maximum execution time"
 msgstr ""
 
+#: View/Roles/admin_add.ctp:26
+#: View/Roles/admin_edit.ctp:26
+msgid "Enforce search rate limit"
+msgstr ""
+
+#: View/Roles/admin_add.ctp:32
+#: View/Roles/admin_edit.ctp:32
+msgid "# of searches / 15 min"
+msgstr ""
+
 #: View/Roles/admin_index.ctp:24
 msgid "Restricted to site admins"
 msgstr ""
@@ -14617,11 +17183,15 @@ msgstr ""
 msgid "Max execution time"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:40
+#: View/Roles/admin_index.ctp:35
+msgid "Searches / 15 mins"
+msgstr ""
+
+#: View/Roles/admin_index.ctp:41
 msgid "Default role"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:52
+#: View/Roles/admin_index.ctp:53
 #: View/Roles/index.ctp:47
 msgid "%s permission %s"
 msgstr ""
@@ -14647,6 +17217,7 @@ msgid "Permission level"
 msgstr ""
 
 #: View/Servers/add.ctp:4
+#: View/Servers/edit.ctp:5
 msgid "Add Server"
 msgstr ""
 
@@ -14665,17 +17236,17 @@ msgid "You can set this instance up as an internal instance by checking the chec
 msgstr ""
 
 #: View/Servers/add.ctp:20
-#: View/Servers/edit.ctp:20
+#: View/Servers/edit.ctp:17
 msgid "Internal instance"
 msgstr ""
 
 #: View/Servers/add.ctp:30
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:25
 msgid "Instance ownership and credentials"
 msgstr ""
 
 #: View/Servers/add.ctp:31
-#: View/Servers/edit.ctp:32
+#: View/Servers/edit.ctp:26
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
@@ -14684,86 +17255,86 @@ msgid "Remote Sync Organisation Type"
 msgstr ""
 
 #: View/Servers/add.ctp:42
-#: View/Servers/edit.ctp:43
+#: View/Servers/edit.ctp:40
 msgid "External Organisation"
 msgstr ""
 
-#: View/Servers/add.ctp:48
+#: View/Servers/add.ctp:57
 msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:54
-#: View/Servers/edit.ctp:65
+#: View/Servers/add.ctp:63
+#: View/Servers/edit.ctp:70
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:58
-#: View/Servers/edit.ctp:69
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:74
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:67
-#: View/Servers/edit.ctp:76
+#: View/Servers/add.ctp:76
+#: View/Servers/edit.ctp:81
 msgid "Ask the owner of the remote instance for a sync account on their instance, log into their MISP using the sync user's credentials and retrieve your API key by navigating to Global actions -> My profile. This key is used to authenticate with the remote instance."
 msgstr ""
 
-#: View/Servers/add.ctp:71
-#: View/Servers/edit.ctp:80
+#: View/Servers/add.ctp:80
+#: View/Servers/edit.ctp:85
 msgid "Enabled synchronisation methods"
 msgstr ""
 
-#: View/Servers/add.ctp:90
+#: View/Servers/add.ctp:100
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:96
+#: View/Servers/add.ctp:106
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:101
-#: View/Servers/edit.ctp:144
+#: View/Servers/add.ctp:111
+#: View/Servers/edit.ctp:150
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:102;108
-#: View/Servers/edit.ctp:145;151
+#: View/Servers/add.ctp:112;118
+#: View/Servers/edit.ctp:151;157
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:103;109
-#: View/Servers/edit.ctp:146;152
+#: View/Servers/add.ctp:113;119
+#: View/Servers/edit.ctp:152;158
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:104;110
-#: View/Servers/edit.ctp:147;153
+#: View/Servers/add.ctp:114;120
+#: View/Servers/edit.ctp:153;159
 msgid "Events with the following organisations allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:105;111
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:115;121
+#: View/Servers/edit.ctp:154;160
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:107
-#: View/Servers/edit.ctp:150
+#: View/Servers/add.ctp:117
+#: View/Servers/edit.ctp:156
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:135
-#: View/Servers/edit.ctp:181
+#: View/Servers/add.ctp:145
+#: View/Servers/edit.ctp:188
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:141
+#: View/Servers/add.ctp:151
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:142
+#: View/Servers/add.ctp:152
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:143
+#: View/Servers/add.ctp:153
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
@@ -14771,43 +17342,47 @@ msgstr ""
 msgid "Server configuration"
 msgstr ""
 
-#: View/Servers/edit.ctp:17
+#: View/Servers/edit.ctp:15
 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
+#: View/Servers/edit.ctp:31
 msgid "Organisation Type"
 msgstr ""
 
-#: View/Servers/edit.ctp:54
+#: View/Servers/edit.ctp:55
 msgid "Local Organisation"
 msgstr ""
 
-#: View/Servers/edit.ctp:77
+#: View/Servers/edit.ctp:82
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:101
+#: View/Servers/edit.ctp:107
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:109;131
+#: View/Servers/edit.ctp:115;137
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:110;132
+#: View/Servers/edit.ctp:116;138
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:123
+#: View/Servers/edit.ctp:129
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:161
+msgid "Additional parameters: "
+msgstr ""
+
+#: View/Servers/edit.ctp:197
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:247;251
+#: View/Servers/edit.ctp:263;267
 msgid "Not set."
 msgstr ""
 
@@ -14840,42 +17415,75 @@ msgid "Servers"
 msgstr ""
 
 #: View/Servers/index.ctp:23
+msgid "Prio"
+msgstr ""
+
+#: View/Servers/index.ctp:24
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:31
+#: View/Servers/index.ctp:25
+msgid "Sync user"
+msgstr ""
+
+#: View/Servers/index.ctp:26
+msgid "Reset API key"
+msgstr ""
+
+#: View/Servers/index.ctp:35
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:70
+msgid "URL params"
+msgstr ""
+
+#: View/Servers/index.ctp:85;86
+msgid "Move server priority up"
+msgstr ""
+
+#: View/Servers/index.ctp:85;86
+msgid "Move server priority down"
+msgstr ""
+
+#: View/Servers/index.ctp:102
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:102
+#: View/Sightingdb/index.ctp:35
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:74
+#: View/Servers/index.ctp:103
+msgid "View the sync user of the remote instance"
+msgstr ""
+
+#: View/Servers/index.ctp:111;112
+msgid "Remotely reset API key"
+msgstr ""
+
+#: View/Servers/index.ctp:119
 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:74
+#: View/Servers/index.ctp:119
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:123
+#: View/Servers/index.ctp:169
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:125
+#: View/Servers/index.ctp:171
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
-#: View/Servers/index.ctp:125
+#: View/Servers/index.ctp:171
 msgid "Pull updates"
 msgstr ""
 
-#: View/Servers/index.ctp:132
+#: View/Servers/index.ctp:178
 msgid "Cache instance"
 msgstr ""
 
@@ -14891,19 +17499,19 @@ msgstr ""
 msgid "Show Update Progress Page"
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:37
+#: View/Servers/ondemand_action.ctp:38
 msgid "Running this script may take a very long time depending of the size of your database. It is adviced that you <b>back your database up</b> before running it."
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:43
+#: View/Servers/ondemand_action.ctp:44
 msgid "Running this script will make this instance unusable for all users (not site-admin) during the time of upgrade."
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:53
+#: View/Servers/ondemand_action.ctp:54
 msgid "Action: "
 msgstr ""
 
-#: View/Servers/ondemand_action.ctp:60
+#: View/Servers/ondemand_action.ctp:61
 msgid "This action has been done and cannot be run again."
 msgstr ""
 
@@ -14955,6 +17563,14 @@ msgstr ""
 msgid "No proposals pulled"
 msgstr ""
 
+#: View/Servers/pull.ctp:35
+msgid "Sightings pulled"
+msgstr ""
+
+#: View/Servers/pull.ctp:38
+msgid "No sightings pulled"
+msgstr ""
+
 #: View/Servers/push.ctp:2
 msgid "Failed pushes"
 msgstr ""
@@ -14975,60 +17591,56 @@ msgstr ""
 msgid "HTTP method to use"
 msgstr ""
 
-#: View/Servers/rest.ctp:61
+#: View/Servers/rest.ctp:62
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:68
+#: View/Servers/rest.ctp:69
 msgid "Use full path - disclose my apikey"
 msgstr ""
 
-#: View/Servers/rest.ctp:72
+#: View/Servers/rest.ctp:73
 msgid "Bookmark query"
 msgstr ""
 
-#: View/Servers/rest.ctp:81
+#: View/Servers/rest.ctp:82
 msgid "Bookmark name"
 msgstr ""
 
-#: View/Servers/rest.ctp:89
+#: View/Servers/rest.ctp:90
 msgid "Show result"
 msgstr ""
 
-#: View/Servers/rest.ctp:94
+#: View/Servers/rest.ctp:95
 msgid "Skip SSL validation"
 msgstr ""
 
-#: View/Servers/rest.ctp:101
+#: View/Servers/rest.ctp:102
 msgid "HTTP headers"
 msgstr ""
 
-#: View/Servers/rest.ctp:114
+#: View/Servers/rest.ctp:115
 msgid " Inject"
 msgstr ""
 
-#: View/Servers/rest.ctp:115
+#: View/Servers/rest.ctp:116
 msgid " Show rules"
 msgstr ""
 
-#: View/Servers/rest.ctp:124
+#: View/Servers/rest.ctp:125
 msgid "HTTP body"
 msgstr ""
 
-#: View/Servers/rest.ctp:132
+#: View/Servers/rest.ctp:133
 msgid "Run query"
 msgstr ""
 
-#: View/Servers/rest.ctp:161
+#: View/Servers/rest.ctp:162
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:162
-msgid "Request duration"
-msgstr ""
-
 #: View/Servers/rest.ctp:163
-msgid "Headers"
+msgid "Request duration"
 msgstr ""
 
 #: View/Servers/server_settings.ctp:3
@@ -15039,26 +17651,66 @@ msgstr ""
 msgid "To edit a setting, simply double click it."
 msgstr ""
 
-#: View/Servers/update_progress.ctp:18
-msgid "Database Update progress"
+#: View/Servers/update_progress.ctp:34
+msgid "Updates are locked due to an ongoing update process. Release lock only if you know what you are doing."
 msgstr ""
 
-#: View/Servers/update_progress.ctp:85
+#: View/Servers/update_progress.ctp:35
+msgid "automatically unlock in %smin %ssec"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:40
+msgid "Release update lock"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:54
+msgid "Complete update progression"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:55
+msgid "%s remaining"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:62
+msgid "Database Update progress for update %s"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:133
 msgid "Update "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:88
+#: View/Servers/update_progress.ctp:136
 msgid "Started @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:92
+#: View/Servers/update_progress.ctp:140
 msgid "Elapsed Time @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:144
+#: View/Servers/update_progress.ctp:192
 msgid "No update in progress"
 msgstr ""
 
+#: View/Servers/update_progress.ctp:213
+msgid "Follow updates"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:13
+msgid "Total"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:27
+msgid "View details on the usage of %s on the %s controller"
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:39
+msgid "View user ID "
+msgstr ""
+
+#: View/Servers/view_deprecated_function_use.ctp:40
+msgid "User #%s"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:2
 msgid "Select instances to add"
 msgstr ""
@@ -15136,9 +17788,9 @@ msgstr ""
 msgid "Add Proposal"
 msgstr ""
 
-#: View/ShadowAttributes/add.ctp:52;65
+#: View/ShadowAttributes/add.ctp:63;76
 #: View/ShadowAttributes/add_attachment.ctp:35
-#: View/ShadowAttributes/edit.ctp:51
+#: View/ShadowAttributes/edit.ctp:62
 msgid "Propose"
 msgstr ""
 
@@ -15154,23 +17806,23 @@ msgstr ""
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:43
+#: View/ShadowAttributes/index.ctp:50
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:49
+#: View/ShadowAttributes/index.ctp:56
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:55
+#: View/ShadowAttributes/index.ctp:62
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:81
+#: View/ShadowAttributes/index.ctp:91
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:83
+#: View/ShadowAttributes/index.ctp:93
 msgid "New Attribute"
 msgstr ""
 
@@ -15240,7 +17892,7 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:53
 #: View/SharingGroups/edit.ctp:53
-#: View/SharingGroups/index.ctp:46
+#: View/SharingGroups/index.ctp:47
 msgid "Releasable to"
 msgstr ""
 
@@ -15315,13 +17967,6 @@ msgstr ""
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:93
-#: View/SharingGroups/edit.ctp:101
-#: View/SharingGroups/view.ctp:69
-#: View/TagCollections/index.ctp:12
-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 ""
@@ -15374,20 +18019,49 @@ msgstr ""
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:80
+#: View/SharingGroups/index.ctp:82
 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"
+#: View/Sightingdb/index.ctp:41
+msgid "Quick Search"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:61
+msgid "Host"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:66
+msgid "Port"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:76
+msgid "Skip Proxy"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:82
+msgid "Skip SSL"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:92
+#: View/UserSettings/index.ctp:74
+msgid "Restricted to"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:98
+msgid "SightingDB index"
+msgstr ""
+
+#: View/Sightingdb/index.ctp:99
+msgid "SightingDB is an alternate sighting database that MISP interconnects with. Configure connections to sighting databases below."
+msgstr ""
+
+#: View/Sightingdb/index.ctp:114
+msgid "Are you sure you want to remove the connection to this SightingDB?"
 msgstr ""
 
 #: View/Sightings/ajax/add_sighting.ctp:11
@@ -15517,6 +18191,11 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+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 ""
@@ -15541,10 +18220,6 @@ msgstr ""
 msgid "Update all"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:2
-msgid "Taxonomies"
-msgstr ""
-
 #: View/Taxonomies/index.ctp:26
 msgid "Required"
 msgstr ""
@@ -15591,10 +18266,6 @@ msgstr ""
 msgid "Unhide selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:83
-msgid "Tag"
-msgstr ""
-
 #: View/Taxonomies/view.ctp:84
 msgid "Expanded"
 msgstr ""
@@ -15793,10 +18464,6 @@ msgstr ""
 msgid "A description of the template"
 msgstr ""
 
-#: View/Templates/add.ctp:49
-msgid "Create"
-msgstr ""
-
 #: View/Templates/index.ctp:2
 msgid "Templates"
 msgstr ""
@@ -15853,6 +18520,61 @@ msgstr ""
 msgid "View Discussion"
 msgstr ""
 
+#: View/UserSettings/index.ctp:30
+msgid "Me"
+msgstr ""
+
+#: View/UserSettings/index.ctp:79
+msgid "User settings management"
+msgstr ""
+
+#: View/UserSettings/index.ctp:80
+msgid "Manage the individual user settings."
+msgstr ""
+
+#: View/UserSettings/index.ctp:97
+msgid "Are you sure you wish to delete this entry?"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr ""
@@ -15886,7 +18608,7 @@ msgstr ""
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
 #: View/Users/edit.ctp:23
-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."
+msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
 msgstr ""
 
 #: View/Users/admin_add.ctp:72
@@ -15910,12 +18632,12 @@ msgstr ""
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr ""
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr ""
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
@@ -15924,8 +18646,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
-#: View/Users/admin_view.ctp:58
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:69
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr ""
 
@@ -16028,12 +18750,66 @@ msgstr ""
 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"
+#: View/Users/admin_index.ctp:3
+msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
+msgstr ""
+
+#: View/Users/admin_index.ctp:6
+msgid "here"
+msgstr ""
+
+#: View/Users/admin_index.ctp:9;10
+msgid "Reset all sync user API keys"
+msgstr ""
+
+#: View/Users/admin_index.ctp:13
+msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
+msgstr ""
+
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
 #: View/Users/admin_quick_email.ctp:2
@@ -16048,50 +18824,49 @@ msgstr ""
 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
+#: View/Users/admin_view.ctp:47
+msgid "Customauth header"
+msgstr ""
+
+#: View/Users/admin_view.ctp:55
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:56
+#: View/Users/admin_view.ctp:67
 msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:57
-#: View/Users/view.ctp:28
+#: View/Users/admin_view.ctp:68
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr ""
 
-#: View/Users/admin_view.ctp:59
+#: View/Users/admin_view.ctp:70
 msgid "Password change"
 msgstr ""
 
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:37
+#: View/Users/admin_view.ctp:78
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:72
-#: View/Users/view.ctp:42
+#: View/Users/admin_view.ctp:83
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:79
-#: View/Users/view.ctp:49
-msgid "SMIME Public certificate"
+#: View/Users/admin_view.ctp:90
+#: View/Users/view.ctp:50
+msgid "S/MIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:108
-#: View/Users/view.ctp:64
+#: View/Users/admin_view.ctp:119
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr ""
 
@@ -16107,10 +18882,102 @@ msgstr ""
 msgid "SMIME Public certificate (PEM format)"
 msgstr ""
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr ""
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr ""
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+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"
@@ -16126,6 +18993,13 @@ msgstr ""
 msgid "Proposals active"
 msgstr ""
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr ""
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -16181,14 +19055,18 @@ msgstr ""
 msgid "A heatmap showing the usage of %s."
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr ""
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr ""
 
+#: View/Users/statistics_orgs.ctp:40
+msgid "Activity (1 year)"
+msgstr ""
+
 #: View/Users/statistics_sightings.ctp:6
 msgid "A toplist of the top sources for the sightings of your organisation."
 msgstr ""
@@ -16241,6 +19119,14 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -16253,19 +19139,27 @@ msgstr ""
 msgid "Choose the key that you would like to use"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:6
+#: View/Users/ajax/fetchpgpkey.ctp:4
+msgid "Do not blindly trust fetched keys and check the fingerprint from other source."
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:5
+msgid "And do not check just Key ID, but whole fingerprint."
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:10
 msgid "Key ID"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:7
+#: View/Users/ajax/fetchpgpkey.ctp:11
 msgid "Creation date"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:8
+#: View/Users/ajax/fetchpgpkey.ctp:12
 msgid "Associated E-mail addresses"
 msgstr ""
 
-#: View/Users/ajax/fetchpgpkey.ctp:12
+#: View/Users/ajax/fetchpgpkey.ctp:16
 msgid "Select GnuPG key"
 msgstr ""
 
@@ -16317,7 +19211,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:14;16
+#: View/Warninglists/view.ctp:14
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -16384,13 +19278,14 @@ 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/Server.php:validation for field push;validation for field pull;validation for field push_sightings
 #: 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/Dashboard.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
@@ -16410,7 +19305,14 @@ msgstr ""
 msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group, Inherit event"
 msgstr ""
 
+#: Model/Attribute.php:validation for field first_seen;validation for field last_seen
+#: Model/MispObject.php:validation for field first_seen;validation for field last_seen
+#: Model/ShadowAttribute.php:validation for field first_seen;validation for field last_seen
+msgid "Invalid ISO 8601 format"
+msgstr ""
+
 #: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
+#: Model/DecayingModelMapping.php:validation for field attribute_type;validation for field model_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
@@ -16463,7 +19365,7 @@ msgstr ""
 #: 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/Server.php:validation for field authkey;validation for field name
 #: 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
@@ -16509,6 +19411,14 @@ msgstr ""
 msgid "Please enter a valid base-url."
 msgstr ""
 
+#: Model/Server.php:validation for field name
+msgid "allowEmpty"
+msgstr ""
+
+#: Model/Server.php:validation for field name
+msgid "required"
+msgstr ""
+
 #: Model/SharingGroup.php:validation for field name
 msgid "A sharing group with this name already exists."
 msgstr ""
@@ -16517,6 +19427,22 @@ msgstr ""
 msgid "Invalid type. Valid options are: 0 (Sighting), 1 (False-positive), 2 (Expiration)."
 msgstr ""
 
+#: Model/Sightingdb.php:validation for field name
+msgid "Name not set."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field host
+msgid "Host not set."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field port
+msgid "Port needs to be numeric."
+msgstr ""
+
+#: Model/Sightingdb.php:validation for field owner
+msgid "Owner not set."
+msgstr ""
+
 #: Model/Tag.php:validation for field name
 msgid "This field is required."
 msgstr ""
@@ -16593,6 +19519,10 @@ msgstr ""
 msgid "A SID should be an integer."
 msgstr ""
 
+#: Model/UserSetting.php:validation for field json
+msgid "isValidJson"
+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/zh-s/LC_MESSAGES/default.po b/app/Locale/zh-s/LC_MESSAGES/default.po
index df0ca13cd..429e051ea 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: 2020-05-03 22:36\n"
+"PO-Revision-Date: 2021-03-26 04:18\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese Simplified\n"
 "MIME-Version: 1.0\n"
@@ -9,8 +9,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Crowdin-Project: misp\n"
+"X-Crowdin-Project-ID: 306440\n"
 "X-Crowdin-Language: zh-CN\n"
 "X-Crowdin-File: default.pot\n"
+"X-Crowdin-File-ID: 1\n"
 "Language: zh_CN\n"
 
 #: Console/Command/AdminShell.php:72
@@ -71,7 +73,8 @@ msgid "MISP mass sync authkey reset command line tool.\n\n"
 msgstr "MISP批量同步authkey重置命令行工具"
 
 #: Console/Command/AdminShell.php:536
-#: Controller/UsersController.php:1234
+#: Controller/UsersController.php:1283;2221
+#: Model/Dashboard.php:129
 msgid "Invalid user."
 msgstr "无效用户."
 
@@ -99,7 +102,7 @@ msgstr "出了点问题. 无法找到现有的数据库版本, 也无法获取
 #: Console/Command/EventShell.php:15
 #: Controller/AttributesController.php:118;122;126
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1122;1606;1691;2221;2297;2301;2305;2433;2530;2585;2633;2705;2795;3128;5252;5474;5478;5487
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
 #: Controller/PostsController.php:56
 #: Model/Galaxy.php:293
 msgid "Invalid event"
@@ -126,51 +129,51 @@ msgstr "详细模式"
 msgid "interactive mode"
 msgstr "交互模式"
 
-#: Controller/AppController.php:377
+#: Controller/AppController.php:382
 msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
 msgstr "警告：目前MISP目前对所有用户禁用. 可以在服务器设置中启用它 (管理->服务器设置->MISP选项卡->实时). 更新也可能正在进行中, 您可以看到"
 
-#: Controller/AppController.php:377
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
 msgid "Update Progress"
 msgstr "更新进度"
 
-#: Controller/AppController.php:384
+#: Controller/AppController.php:389
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
 msgstr "出了点问题. 通过身份验证的用户帐户不存在."
 
-#: Controller/AppController.php:502
+#: Controller/AppController.php:519
 msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
 msgstr "警告：此功能已被弃用, 不久后将被删除. "
 
-#: Controller/AppController.php:710
-#: Controller/AttributesController.php:1876;1985;2089
-#: Controller/EventsController.php:3260
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr "此身份验证密钥无权用于导出. 请与您的管理员联系."
 
-#: Controller/AppController.php:719
-#: Controller/AttributesController.php:2093
-#: Controller/EventsController.php:3264
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr "您必须先登录才能执行此操作."
 
-#: Controller/AppController.php:735
+#: Controller/AppController.php:764
 #: Controller/Component/IndexFilterComponent.php:23
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr "在url中指定搜索条件, 或者POST一个带有过滤器参数的json."
 
-#: Controller/AppController.php:873
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr "全部完成. attribute_count从零开始生成 "
 
-#: Controller/AppController.php:996
-#: Controller/AttributesController.php:2147
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
 #: Controller/ShadowAttributesController.php:1267
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "作业已排队. 您可以导航至活动作业视图(管理->作业)查看进度."
 
-#: Controller/AppController.php:1178
+#: Controller/AppController.php:1211
 msgid "RestSearch is not implemented (yet) for this scope."
 msgstr "还没有为此范围实现RestSearch."
 
@@ -183,19 +186,19 @@ msgstr "未设置事件ID."
 msgid "You do not have permissions to create attributes"
 msgstr "您没有创建属性的权限"
 
-#: Controller/AttributesController.php:132;422;602;832;3127;3142
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:2092;2113;2147
+#: Controller/EventsController.php:2107;2128;2162
 #: Controller/ObjectsController.php:837
-#: Model/Attribute.php:4304;4308
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr "您无权执行此操作."
 
-#: Controller/AttributesController.php:345;800;805;824;1032;1121;2163;2177;2210;2232;2800;2811;2817;2886;3024;3036;3040
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
 #: Controller/ObjectsController.php:641
 #: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
 #: Controller/TagsController.php:506
-#: Model/Attribute.php:4296
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr "无效属性"
 
@@ -209,7 +212,7 @@ msgid "Attribute not an attachment or malware-sample"
 msgstr "属性不是附件或恶意样本"
 
 #: Controller/AttributesController.php:419;586;892;1348
-#: Controller/EventsController.php:4414;4428;5201;5215
+#: Controller/EventsController.php:4432;4446;5219;5233
 msgid "Invalid Event."
 msgstr "无效事件."
 
@@ -259,7 +262,7 @@ msgid "Invalid event id."
 msgstr "无效事件id."
 
 #: Controller/AttributesController.php:1072
-#: Controller/EventsController.php:2451
+#: Controller/EventsController.php:2466
 #: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr "无效输入."
@@ -284,7 +287,7 @@ msgstr "属性已删除"
 msgid "Attribute was not deleted"
 msgstr "属性未被删除"
 
-#: Controller/AttributesController.php:1281;2634
+#: Controller/AttributesController.php:1281;2675
 #: Controller/ShadowAttributesController.php:853
 msgid "Invalid Attribute"
 msgstr "无效属性"
@@ -305,104 +308,104 @@ msgstr "此方法只能通过AJAX访问."
 msgid "You are not authorized to edit this event."
 msgstr "您无权编辑此事件."
 
-#: Controller/AttributesController.php:1516
+#: Controller/AttributesController.php:1532
 msgid "No event ID provided."
 msgstr "未提供事件id."
 
-#: Controller/AttributesController.php:1561
-#: Controller/GalaxiesController.php:243
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr "别名："
 
-#: Controller/AttributesController.php:1871;1978
+#: Controller/AttributesController.php:1912;2019
 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:1884
+#: Controller/AttributesController.php:1925
 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:1904
+#: Controller/AttributesController.php:1945
 msgid "You don't have access to that event."
 msgstr "您无权访问该事件."
 
-#: Controller/AttributesController.php:1967
+#: Controller/AttributesController.php:2008
 msgid "No matches."
 msgstr "没有匹配."
 
-#: Controller/AttributesController.php:1989;1998
+#: Controller/AttributesController.php:2030;2039
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "无效属性或者无权查看."
 
-#: Controller/AttributesController.php:2124
+#: Controller/AttributesController.php:2165
 #: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr "全部完成!"
 
-#: Controller/AttributesController.php:2156;2203
+#: Controller/AttributesController.php:2197;2244
 #: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr "请求的字段无效."
 
-#: Controller/AttributesController.php:2159;2206
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr "此功能只能通过AJAX访问."
 
-#: Controller/AttributesController.php:2241
+#: Controller/AttributesController.php:2282
 msgid "You do not have permission to do that"
 msgstr "您无权执行此操作"
 
-#: Controller/AttributesController.php:2271;2279
-#: Controller/EventsController.php:3643;3796;4999
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "未找到事件或您没有创建属性的权限"
 
-#: Controller/AttributesController.php:2300
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr "此动作只能通过AJAX访问."
 
-#: Controller/AttributesController.php:2309;2560;2574;2585
-#: Controller/OrganisationsController.php:432
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
 #: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr "您无权执行此操作."
 
-#: Controller/AttributesController.php:2414
-#: Controller/EventsController.php:4207
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr "此功能需要API密钥访问权限."
 
-#: Controller/AttributesController.php:2422
+#: Controller/AttributesController.php:2463
 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:2434
+#: Controller/AttributesController.php:2475
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "未收到任何hash或事件ID. 您需要至少设置其中一个."
 
-#: Controller/AttributesController.php:2595
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr "无效脚本."
 
-#: Controller/AttributesController.php:2662
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr "找不到此属性的有效丰富化选项."
 
-#: Controller/AttributesController.php:2760
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr "无效请求类型."
 
-#: Controller/AttributesController.php:2823;3030
+#: Controller/AttributesController.php:2864;3071
 #: Controller/TagCollectionsController.php:254
 msgid "Invalid tag"
 msgstr "无效标签"
 
-#: Controller/AttributesController.php:3120
-#: Controller/EventsController.php:5197
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "此实例不允许禁用关联."
 
-#: Controller/AttributesController.php:3124;3139
+#: Controller/AttributesController.php:3165;3180
 #: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr "无效属性."
@@ -419,6 +422,63 @@ msgstr "出了点问题, 无法发送请求."
 msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
 msgstr "无法发送该消息(由于禁用了电子邮件或加密配置不正确), 但是, 您可以在下面查看将要发送的电子邮件. 随时通过手动发送."
 
+#: Controller/DashboardsController.php:34;246;415
+#: Model/Dashboard.php:240
+msgid "Invalid dashboard template."
+msgstr ""
+
+#: Controller/DashboardsController.php:89
+msgid "No widget name passed."
+msgstr ""
+
+#: Controller/DashboardsController.php:100
+msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
+msgstr ""
+
+#: Controller/DashboardsController.php:101
+msgid "Alias to use as the title of the widget"
+msgstr ""
+
+#: Controller/DashboardsController.php:114
+msgid "No setting data found."
+msgstr ""
+
+#: Controller/DashboardsController.php:125;205;210
+msgid "Settings updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:135
+msgid "Invalid widget."
+msgstr ""
+
+#: Controller/DashboardsController.php:156
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
+msgid "Settings could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:260;265
+msgid "Dashboard template updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:262;267
+msgid "Dashboard template could not be updated."
+msgstr ""
+
+#: Controller/DashboardsController.php:275;282;293
+msgid "Unrestricted"
+msgstr ""
+
+#: Controller/DashboardsController.php:418
+msgid "Dashboard template removed."
+msgstr ""
+
 #: Controller/DecayingModelController.php:20
 msgid "Default decaying models updated"
 msgstr "默认衰减模型已更新"
@@ -584,452 +644,456 @@ msgstr "无效事件ID."
 msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr "从 EvenBlackList 删除事件失败. 错误："
 
-#: Controller/EventsController.php:879
+#: Controller/EventsController.php:894
 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:881
+#: Controller/EventsController.php:896
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "您的个人资料中没有设置GnuPG密钥.要接收电子邮件, 请在您的个人资料中提交您的公钥."
 
-#: Controller/EventsController.php:887
+#: Controller/EventsController.php:902
 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:889
+#: Controller/EventsController.php:904
 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:1716
+#: Controller/EventsController.php:1731
 msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr "您目前以站点管理员的身份登录, 即将编辑一个不属于您的组织的事件. 这违背了MISP的共享模式, 请使用普通用户账号进行日常工作."
 
-#: Controller/EventsController.php:1927
+#: Controller/EventsController.php:1942
 msgid "You don't have permissions to create events"
 msgstr "您没有权限创建事件"
 
-#: Controller/EventsController.php:1933
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr "未收到有效的事件数据."
 
-#: Controller/EventsController.php:1969
+#: Controller/EventsController.php:1984
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "无效的共享组或未授权(同步用户未包含在共享组中)."
 
-#: Controller/EventsController.php:1973;1977
+#: Controller/EventsController.php:1988;1992
 msgid "Invalid Sharing Group or not authorised."
 msgstr "无效的共享组或未授权."
 
-#: Controller/EventsController.php:2001
+#: Controller/EventsController.php:2016
 msgid "Event blocked by local blacklist."
 msgstr "事件被本地黑名单阻止."
 
-#: Controller/EventsController.php:2014;2101;2377
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr "事件已保存"
 
-#: Controller/EventsController.php:2022
+#: Controller/EventsController.php:2037
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "事件已存在, 如果要对其进行编辑, 请使用位置标头中的url."
 
-#: Controller/EventsController.php:2028
+#: Controller/EventsController.php:2043
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "黑名单条目阻止您创建任何事件, 请联系此实例的管理团队"
 
-#: Controller/EventsController.php:2030;2380
+#: Controller/EventsController.php:2045;2395
 msgid "The event could not be saved. Please, try again."
 msgstr "该事件无法保存, 请重试."
 
-#: Controller/EventsController.php:2079
+#: Controller/EventsController.php:2094
 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:2127
+#: Controller/EventsController.php:2142
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "您只能上传MISP XML或MISP JSON文件."
 
-#: Controller/EventsController.php:2128
+#: Controller/EventsController.php:2143
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "文件上载失败或文件没有预期的扩展名 (.xml / .json)."
 
-#: Controller/EventsController.php:2189
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr "STIX文档已导入, 事件已创建："
 
-#: Controller/EventsController.php:2192
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr "STIX文档已导入."
 
-#: Controller/EventsController.php:2195
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr "无法导入STIX文档: "
 
-#: Controller/EventsController.php:2202
+#: Controller/EventsController.php:2217
 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:2226;2311
+#: Controller/EventsController.php:2241;2326
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "无权执行此操作. 请考虑使用“建议属性”功能."
 
-#: Controller/EventsController.php:2234
+#: Controller/EventsController.php:2249
 msgid "Invalid event ID entered."
 msgstr "输入的事件ID无效."
 
-#: Controller/EventsController.php:2239
+#: Controller/EventsController.php:2254
 msgid "You are not authorised to read the selected event."
 msgstr "无权阅读所选事件."
 
-#: Controller/EventsController.php:2536;2640;2711
+#: Controller/EventsController.php:2551;2655;2726
 msgid "You don't have the permission to do that."
 msgstr "您无权执行此操作."
 
-#: Controller/EventsController.php:2545
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr "事件未发布."
 
-#: Controller/EventsController.php:2652;2722
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr "无法发布事件 - 缺少所需分类标签：%s"
 
-#: Controller/EventsController.php:2804
+#: Controller/EventsController.php:2819
 msgid "You must specify a message."
 msgstr "您必须指定信息"
 
-#: Controller/EventsController.php:2823
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr "邮件发送给reporter."
 
-#: Controller/EventsController.php:2832
+#: Controller/EventsController.php:2847
 msgid "Sending of email failed."
 msgstr "发送邮件失败"
 
-#: Controller/EventsController.php:2883
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr "警告, 您以站点管理员的身份登录, 您生成的任何导出都将包含完整的不受限制的数据集. 如果您想为自己的组织生成一个导出, 请用不同的用户登录. "
 
-#: Controller/EventsController.php:2971
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr "当前功能已禁用"
 
-#: Controller/EventsController.php:3097
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr "文件名称不被允许."
 
-#: Controller/EventsController.php:3117
+#: Controller/EventsController.php:3134
 msgid "Problem with writing the IoC file. Please report to site admin."
 msgstr "编写IoC文件有问题. 请向站点管理员报告."
 
-#: Controller/EventsController.php:3211
+#: Controller/EventsController.php:3228
 msgid "This is not a valid MISP XML file."
 msgstr "这不是一个有效的MISP XML文件."
 
-#: Controller/EventsController.php:3253
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr "尚未实现"
 
-#: Controller/EventsController.php:3271;3275
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr "无效事件或未授权."
 
-#: Controller/EventsController.php:3467
+#: Controller/EventsController.php:3484
 #: Controller/TagCollectionsController.php:317
 msgid "Invalid Tag."
-msgstr "无效标签."
+msgstr "无效标签。"
 
-#: Controller/EventsController.php:3483
+#: Controller/EventsController.php:3500
 #: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr "标签已附加至此事件."
 
-#: Controller/EventsController.php:3497
+#: Controller/EventsController.php:3514
 msgid "Tag is not allowed due to taxonomy exclusivity settings"
 msgstr "由于分类法的排他性设置, 不允许使用标签."
 
-#: Controller/EventsController.php:3528;3534
+#: Controller/EventsController.php:3545;3551
 #: Controller/TagCollectionsController.php:340
 msgid "Tag(s) added."
 msgstr "标签已添加."
 
-#: Controller/EventsController.php:3530
+#: Controller/EventsController.php:3547
 msgid "Tag could not be added."
 msgstr "标签无法添加."
 
-#: Controller/EventsController.php:3536
+#: Controller/EventsController.php:3553
 #: Controller/TagCollectionsController.php:348
 msgid "All tags are already present, nothing to add."
 msgstr "所有标签已经存在, 无须添加."
 
-#: Controller/EventsController.php:3800;5003;5025;5532;5536
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
 #: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr "无效事件."
 
-#: Controller/EventsController.php:3855;3885;3901
+#: Controller/EventsController.php:3872;3902;3918
 msgid "You do not have the permission to do that."
 msgstr "您无权执行此操作."
 
-#: Controller/EventsController.php:3966;4106
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr "无效ID"
 
-#: Controller/EventsController.php:3970;4110;4685
+#: Controller/EventsController.php:3987;4128;4703
 msgid "Event not found or you are not authorised to view it."
 msgstr "事件未找到或您无权查看."
 
-#: Controller/EventsController.php:4116
+#: Controller/EventsController.php:4134
 msgid "Freetext Import"
 msgstr "Freetext导入"
 
-#: Controller/EventsController.php:4122
+#: Controller/EventsController.php:4140
 msgid "Populate using a Template"
 msgstr "使用模板进行填充"
 
-#: Controller/EventsController.php:4128
+#: Controller/EventsController.php:4146
 msgid "OpenIOC Import"
 msgstr "OpenIOC导入"
 
-#: Controller/EventsController.php:4133
+#: Controller/EventsController.php:4151
 msgid "ThreatConnect Import"
 msgstr "ThreatConnect导入"
 
-#: Controller/EventsController.php:4138
+#: Controller/EventsController.php:4156
 msgid "(Experimental) Forensic analysis - Mactime"
 msgstr "(实验性) 取证分析 - Mactime"
 
-#: Controller/EventsController.php:4157
+#: Controller/EventsController.php:4175
 msgid "MISP standard (recommended exchange format - lossless)"
 msgstr "MISP标准(推荐的交换格式-无损)"
 
-#: Controller/EventsController.php:4163
+#: Controller/EventsController.php:4181
 msgid "STIX 1.1.1 format (lossy)"
 msgstr "STIX 1.1.1 格式(无损)"
 
-#: Controller/EventsController.php:4168
+#: Controller/EventsController.php:4186
 msgid "STIX 2.0 format (lossy)"
 msgstr "STIX 2.0 格式(无损)"
 
-#: Controller/EventsController.php:4210;4217
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr "请按照自动化页面上的描述POST样本."
 
-#: Controller/EventsController.php:4246
+#: Controller/EventsController.php:4264
 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:4254
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr "找不到事件."
 
-#: Controller/EventsController.php:4277
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr "找不到事件."
 
-#: Controller/EventsController.php:4287
+#: Controller/EventsController.php:4305
 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:4312
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "使用提供的信息创建新事件失败."
 
-#: Controller/EventsController.php:4451;4472;4531;4556;4581;4611;4632
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr "无效类型."
 
-#: Controller/EventsController.php:4750
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr "无效方法."
 
-#: Controller/EventsController.php:4832
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr "%s 服务未启用."
 
-#: Controller/EventsController.php:4836
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "属性未找到或您无权查看."
 
-#: Controller/EventsController.php:4841
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr "找不到此属性的有效%s选项."
 
-#: Controller/EventsController.php:4896;4942
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr "%s服务无法访问."
 
-#: Controller/EventsController.php:4908
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr "：通过 丰富"
 
-#: Controller/EventsController.php:4959
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ": 通过%s丰富"
 
-#: Controller/EventsController.php:5114
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr "导入服务无法访问"
 
-#: Controller/EventsController.php:5204;5218
+#: Controller/EventsController.php:5222;5236
 #: Controller/PostsController.php:60;84
 #: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
 msgid "You don't have permission to do that."
 msgstr "您无权执行此操作."
 
-#: Controller/EventsController.php:5345
+#: Controller/EventsController.php:5363
 #: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr "无效ID."
 
-#: Controller/EventsController.php:5393
+#: Controller/EventsController.php:5411
 #: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr "无效事件"
 
-#: Controller/EventsController.php:5414
+#: Controller/EventsController.php:5432
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "丰富化任务排队进行后台处理. 请稍后再检查结果."
 
-#: Controller/EventsController.php:5665
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr "%s 事件已删除."
 
-#: Controller/FeedsController.php:28
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr "您没有执行此操作的权限."
 
-#: Controller/FeedsController.php:241;340
+#: Controller/FeedsController.php:47
+msgid "Default feed metadata loaded."
+msgstr ""
+
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr "订阅源已添加."
 
-#: Controller/FeedsController.php:249
-msgid "Feed could not be added. Invalid field: %s"
-msgstr "订阅源无法添加.无效条目：%s"
+#: Controller/FeedsController.php:291
+msgid "Feed could not be added. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:274;375;397;526;567;778
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr "无效订阅源."
 
-#: Controller/FeedsController.php:348
-msgid "Feed could not be updated. Invalid fields: %s"
-msgstr "订阅源无法更新.无效条目：%s"
+#: Controller/FeedsController.php:399
+msgid "Feed could not be updated. Reason: %s"
+msgstr ""
 
-#: Controller/FeedsController.php:371
-#: Controller/OrganisationsController.php:237
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
 #: Controller/SharingGroupsController.php:237
-#: Controller/UsersController.php:1015
+#: Controller/UsersController.php:1044
 msgid "Action not allowed, post or delete request expected."
 msgstr "操作不被允许, 期望发布或删除请求."
 
-#: Controller/FeedsController.php:404;530
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "订阅源目前未启用. 请确认您已启用它."
 
-#: Controller/FeedsController.php:417;483
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr "开始下载订阅源."
 
-#: Controller/FeedsController.php:428
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr "从队列中导入并执行后台操作."
 
-#: Controller/FeedsController.php:433;435
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr "获取更新失败."
 
-#: Controller/FeedsController.php:439;500
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr "订阅源获取完成."
 
-#: Controller/FeedsController.php:512
+#: Controller/FeedsController.php:563
 msgid "No feed enabled."
 msgstr "没有已启用的订阅源"
 
-#: Controller/FeedsController.php:536;555
+#: Controller/FeedsController.php:587;606
 #: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr "下载失败."
 
-#: Controller/FeedsController.php:543
+#: Controller/FeedsController.php:594
 msgid "Event added."
 msgstr "事件已添加."
 
-#: Controller/FeedsController.php:546
+#: Controller/FeedsController.php:597
 msgid "Event already up to date."
 msgstr "该事件已是最新."
 
-#: Controller/FeedsController.php:548
+#: Controller/FeedsController.php:599
 msgid "Event updated."
 msgstr "事件已更新."
 
-#: Controller/FeedsController.php:552
+#: Controller/FeedsController.php:603
 msgid "Could not %s event."
 msgstr "无法%s事件."
 
-#: Controller/FeedsController.php:649
+#: Controller/FeedsController.php:700
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "无法获取订阅源. 返回HTTP错误代码为: "
 
-#: Controller/FeedsController.php:688;739
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr "无效订阅源类型."
 
-#: Controller/FeedsController.php:784;816
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr "无法下载选定事件."
 
-#: Controller/FeedsController.php:814
+#: Controller/FeedsController.php:865
 msgid "This event is blocked by the Feed filters."
 msgstr "此事件被订阅源筛选器阻止."
 
-#: Controller/FeedsController.php:852;856
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr "无效订阅源."
 
-#: Controller/FeedsController.php:877
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr "只允许POST请求."
 
-#: Controller/FeedsController.php:881
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr "无法找到订阅源."
 
-#: Controller/FeedsController.php:890
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr "数据已导入."
 
-#: Controller/FeedsController.php:892
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "无法提取所选数据.原因：%s"
 
-#: Controller/FeedsController.php:909
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr "启动订阅源缓存."
 
-#: Controller/FeedsController.php:924
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr "缓存订阅源失败."
 
-#: Controller/FeedsController.php:927
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr "缓存订阅源成功."
 
-#: Controller/FeedsController.php:961
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr "接收无效订阅源列表."
 
-#: Controller/GalaxiesController.php:124
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr "所有星团"
 
-#: Controller/GalaxiesController.php:174
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr "所有命名空间"
 
-#: Controller/GalaxiesController.php:304
+#: Controller/GalaxiesController.php:337
 msgid "Failed to parse request or no clusters picked."
 msgstr "解析请求失败或没有选择星团."
 
-#: Controller/GalaxiesController.php:307
+#: Controller/GalaxiesController.php:340
 msgid "Failed to parse request."
 msgstr "解析请求失败."
 
@@ -1112,7 +1176,7 @@ msgid "Object could not be saved."
 msgstr "对象无法保存."
 
 #: Controller/ObjectsController.php:373;1006
-#: Model/Event.php:6171
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr "无效对象."
 
@@ -1180,43 +1244,43 @@ msgstr "组织已添加成功."
 msgid "The organisation could not be added."
 msgstr "组织无法添加."
 
-#: Controller/OrganisationsController.php:156;289;295
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr "无效组织."
 
-#: Controller/OrganisationsController.php:162;242;248;301;328;361
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
 msgid "Invalid organisation"
 msgstr "无效组织"
 
-#: Controller/OrganisationsController.php:201
+#: Controller/OrganisationsController.php:208
 msgid "Organisation updated."
 msgstr "组织已更新."
 
-#: Controller/OrganisationsController.php:216
+#: Controller/OrganisationsController.php:223
 msgid "The organisation could not be updated."
 msgstr "该组织无法更新."
 
-#: Controller/OrganisationsController.php:265
+#: Controller/OrganisationsController.php:272
 msgid "Organisation deleted"
 msgstr "组织已删除."
 
-#: Controller/OrganisationsController.php:272
+#: Controller/OrganisationsController.php:279
 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/OrganisationsController.php:366
+#: Controller/OrganisationsController.php:373
 msgid "No landing page has been created for this organisation."
 msgstr "没有为此组织创建登录页面."
 
-#: Controller/OrganisationsController.php:415
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr "此操作仅限于同步用户"
 
-#: Controller/OrganisationsController.php:437
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr "组织已成功合并."
 
-#: Controller/OrganisationsController.php:440
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr "合并组织时出错.要了解有关出错的更多信息, 请参阅审核日志. 如果要撤销修改, 可以查找.sql文件."
 
@@ -1348,7 +1412,7 @@ msgstr "该组织无法创建, 因为 uuid 已经在使用中."
 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:350;532;2154
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr "服务器已保存"
 
@@ -1356,8 +1420,8 @@ msgstr "服务器已保存"
 msgid "The server could not be saved. Please, try again."
 msgstr "服务器无法保存, 请重试."
 
-#: Controller/ServersController.php:411;608;653;656;665;729;735;1489;1506
-#: Model/Server.php:5737
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr "无效的服务器"
 
@@ -1365,7 +1429,7 @@ msgstr "无效的服务器"
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr "无法保存新的组织, 确定 uuid 格式正确？"
 
-#: Controller/ServersController.php:604;2171;2213
+#: Controller/ServersController.php:604;2183;2225
 msgid "This endpoint expects POST requests."
 msgstr "这个端点期望POST请求."
 
@@ -1564,79 +1628,79 @@ msgstr "此设置已编辑."
 msgid "This setting can only be edited via the CLI."
 msgstr "此设置只能通过CLI进行编辑."
 
-#: Controller/ServersController.php:1365
+#: Controller/ServersController.php:1365;1377
 msgid "Restarting workers."
 msgstr "重启workers中"
 
-#: Controller/ServersController.php:1389
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr "文件未找到."
 
-#: Controller/ServersController.php:1395
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr "文件无法删除."
 
-#: Controller/ServersController.php:1418;1434
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr "上传失败."
 
-#: Controller/ServersController.php:1426
+#: Controller/ServersController.php:1438
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "文件已存在. 如果您想要替换它, 请先删除旧的文件."
 
-#: Controller/ServersController.php:1493
+#: Controller/ServersController.php:1505
 msgid "Invalid user or user not found."
 msgstr "无效的用户或找不到用户."
 
-#: Controller/ServersController.php:2040
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr "正在启动服务器缓存."
 
-#: Controller/ServersController.php:2055
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr "缓存服务器失败."
 
-#: Controller/ServersController.php:2058
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr "缓存服务器已成功完成."
 
-#: Controller/ServersController.php:2088
+#: Controller/ServersController.php:2100
 msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr "无法创建同步配置 - 没有为实例配置主机组织ID."
 
-#: Controller/ServersController.php:2097
+#: Controller/ServersController.php:2109
 msgid "Configured host org not found. Please make sure that the setting is current on the instance."
 msgstr "找不到已配置的主机组织, 请确保该设置在实例上是最新的."
 
-#: Controller/ServersController.php:2161
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr "无法保存服务器.错误: %s"
 
-#: Controller/ServersController.php:2182
+#: Controller/ServersController.php:2194
 msgid "API key updated."
 msgstr "API key已更新"
 
-#: Controller/ServersController.php:2195
+#: Controller/ServersController.php:2207
 msgid "ID has to be a valid server connection"
 msgstr "ID必须是一个有效的服务器连接"
 
-#: Controller/ServersController.php:2198
+#: Controller/ServersController.php:2210
 msgid "Invalid direction. Valid options: "
 msgstr "无效方向, 有效选项: "
 
-#: Controller/ServersController.php:2202
+#: Controller/ServersController.php:2214
 msgid "Priority changed."
 msgstr "优先级已更改."
 
-#: Controller/ServersController.php:2205
+#: Controller/ServersController.php:2217
 msgid "Priority could not be changed."
 msgstr "优先级无法更改."
 
-#: Controller/ServersController.php:2216
+#: Controller/ServersController.php:2228
 msgid "Only site admin accounts can release the update lock."
 msgstr "只有网站管理员账号才能释放更新锁."
 
-#: Controller/ServersController.php:2226
+#: Controller/ServersController.php:2238
 msgid "Only site admin accounts get the DB schema diagnostic."
 msgstr "只有网站管理员账户才能获得DB模式诊断."
 
@@ -1967,164 +2031,174 @@ msgstr "事件已填充, "
 msgid "Event populated, but "
 msgstr "事件已填充, 但是 "
 
-#: Controller/UserSettingsController.php:123;312
+#: Controller/UserSettingsController.php:129;276
 msgid "Invalid ID passed."
 msgstr "传递了无效的ID."
 
-#: Controller/UserSettingsController.php:133;137;322;326
+#: Controller/UserSettingsController.php:139;143;286;290
 msgid "Invalid user setting."
 msgstr "无效用户设置."
 
-#: Controller/UserSettingsController.php:151;192;278;290
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
 msgid "Invalid setting."
 msgstr "无效设置."
 
-#: Controller/UserSettingsController.php:155;196;330
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
 msgid "This setting is restricted and requires the following permission(s): %s"
 msgstr "此设置受限制, 需要以下权限：％s"
 
-#: Controller/UserSettingsController.php:189
-msgid "This endpoint expects both a setting and a value to be set."
-msgstr "此端点期望同时设置一个设置和一个值."
-
-#: Controller/UserSettingsController.php:229
+#: Controller/UserSettingsController.php:193
 msgid "Setting saved."
 msgstr "设置已保存"
 
-#: Controller/UserSettingsController.php:242
+#: Controller/UserSettingsController.php:206
 msgid "Setting could not be saved."
 msgstr "设置无法保存"
 
-#: Controller/UserSettingsController.php:337
+#: Controller/UserSettingsController.php:301
 msgid "Setting deleted."
 msgstr "设置已删除"
 
-#: Controller/UserSettingsController.php:345
+#: Controller/UserSettingsController.php:309
 msgid "Setting could not be deleted."
 msgstr "设置无法删除"
 
-#: Controller/UserSettingsController.php:358
+#: Controller/UserSettingsController.php:322
 msgid "Expecting POST or DELETE request."
 msgstr "期待POST或DELETE请求."
 
-#: Controller/UsersController.php:42;310
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
+#: Controller/UserSettingsController.php:335
+msgid "No path POSTed."
+msgstr ""
+
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr "无效的用户或未被授权."
 
-#: Controller/UsersController.php:62;538;786;805;1030
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr "无效用户"
 
-#: Controller/UsersController.php:150;693;858
+#: Controller/UsersController.php:154;722;887
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr "无效的电子邮件域, 您的用户仅限于为以下域创建用户: "
 
-#: Controller/UsersController.php:202
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr "资料已更新"
 
-#: Controller/UsersController.php:207
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr "资料无法更新, 请重试."
 
-#: Controller/UsersController.php:247
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr "密码无效, 请输入当前的密码以继续."
 
-#: Controller/UsersController.php:256
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr "请出入当前的密码以继续."
 
-#: Controller/UsersController.php:276
+#: Controller/UsersController.php:275
+msgid "Submitted new password cannot be the same as the current one"
+msgstr ""
+
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr "密码已更改."
 
-#: Controller/UsersController.php:285
+#: Controller/UsersController.php:299
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "密码无法更新, 确保密码符合最小密码长度或复杂性要求."
 
-#: Controller/UsersController.php:422;440;547
-#: Model/Log.php:370
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr "已编辑"
 
-#: Controller/UsersController.php:704
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr "用户无法被保存.无效的组织."
 
-#: Controller/UsersController.php:726
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr "用户已被保存."
 
-#: Controller/UsersController.php:735;966
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr "用户无法被保存, 请重试."
 
-#: Controller/UsersController.php:958
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr "用户已被保存"
 
-#: Controller/UsersController.php:1038
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr "用户已删除"
 
-#: Controller/UsersController.php:1042
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr "用户未被删除"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr "用户名或密码无效, 请重试."
 
-#: Controller/UsersController.php:1208
+#: Controller/UsersController.php:1254
 msgid "Good-Bye"
 msgstr "再见"
 
-#: Controller/UsersController.php:1230
-msgid "Invalid action."
-msgstr "无效操作."
-
-#: Controller/UsersController.php:1237
-msgid "New authkey generated."
-msgstr "已生成新的认证密钥."
-
-#: Controller/UsersController.php:1248
+#: Controller/UsersController.php:1273;1297
 msgid "This functionality is only accessible via POST requests."
 msgstr "该功能只有通过POST请求才能访问"
 
-#: Controller/UsersController.php:1252
+#: Controller/UsersController.php:1279
+msgid "Invalid action."
+msgstr "无效操作."
+
+#: Controller/UsersController.php:1286
+msgid "New authkey generated."
+msgstr "已生成新的认证密钥."
+
+#: Controller/UsersController.php:1301
 msgid "Job initiated."
 msgstr "Job已启动."
 
-#: Controller/UsersController.php:1254
+#: Controller/UsersController.php:1303
 msgid "%s authkeys reset, %s could not be reset."
 msgstr "%s authkeys重置, %s无法重置"
 
-#: Controller/UsersController.php:1368
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr "您已接受条款和条件."
 
-#: Controller/UsersController.php:1496
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr "未提供收件人的电子邮箱"
 
-#: Controller/UsersController.php:1501
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr "未提供收件人的组织"
 
-#: Controller/UsersController.php:1538
+#: Controller/UsersController.php:1587
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr "电子邮件已发送, 但是无法向下列收件人发送消息: "
 
-#: Controller/UsersController.php:1540
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr "电子邮件已发送."
 
-#: Controller/UsersController.php:1614
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr "数据用途"
 
-#: Controller/UsersController.php:1615
+#: Controller/UsersController.php:1664
 #: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
@@ -2134,11 +2208,11 @@ msgstr "数据用途"
 msgid "Organisations"
 msgstr "组织"
 
-#: Controller/UsersController.php:1616
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr "用户和组织统计"
 
-#: Controller/UsersController.php:1617
+#: Controller/UsersController.php:1666
 #: View/Attributes/index.ctp:53
 #: View/DecayingModel/decaying_tool_rest_search.ctp:28
 #: View/Elements/eventattribute.ctp:151
@@ -2164,18 +2238,160 @@ msgstr "用户和组织统计"
 msgid "Tags"
 msgstr "标签"
 
-#: Controller/UsersController.php:1618
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr "属性直方图"
 
-#: Controller/UsersController.php:1619
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr "显示顶部列表"
 
-#: Controller/UsersController.php:1620
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr "星系矩阵"
 
+#: Controller/UsersController.php:2252
+msgid "Self registration is not enabled on this instance."
+msgstr ""
+
+#: Controller/UsersController.php:2278
+msgid "We require at least the email field to be filled."
+msgstr ""
+
+#: Controller/UsersController.php:2284
+msgid "User registration for %s."
+msgstr ""
+
+#: Controller/UsersController.php:2292
+msgid "Request could not be created. Make sure that the email and org name fields are filled."
+msgstr ""
+
+#: Controller/UsersController.php:2299
+msgid "Request sent. The administrators of this community have been notified."
+msgstr ""
+
+#: Controller/UsersController.php:2353
+msgid "default"
+msgstr ""
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: 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:92
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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 "是"
+
+#: Controller/UsersController.php:2356;2357;2358
+#: 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/Communities/view.ctp:14
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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:70;224
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/view.ctp:191
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
+#: 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:92
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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 "否"
+
+#: Controller/UsersController.php:2495
+msgid "Role ID not provided and no default role exist on the instance"
+msgstr ""
+
+#: Controller/UsersController.php:2509
+msgid "Added %s user(s)."
+msgstr ""
+
+#: Controller/UsersController.php:2512
+msgid "Could not add %s user(s), reasons for the failure have been logged."
+msgstr ""
+
+#: Controller/UsersController.php:2515
+msgid "No new users added - there was nothing to add."
+msgstr ""
+
 #: Controller/WarninglistsController.php:42
 msgid "This action is only accessible via POST requests."
 msgstr "此操作只能通过POST请求实现."
@@ -2256,11 +2472,11 @@ msgstr "警告列表无法删除."
 msgid "No valid data received."
 msgstr "未收到有效数据."
 
-#: Controller/Component/ACLComponent.php:614
+#: Controller/Component/ACLComponent.php:634
 msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
 msgstr "这可能表明尝试在较弱的MISP早期版本(<2.4.115)上尝试特权升级"
 
-#: Controller/Component/ACLComponent.php:668
+#: Controller/Component/ACLComponent.php:688
 msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
 msgstr "用户通过尝试访问/%s/%s/%s触发了安全警报。该端点感兴趣的原因: %s"
 
@@ -2741,87 +2957,87 @@ msgstr "在过去X时间内看到的时间, 其中X可以用天、小时、分
 msgid "Invalid %s."
 msgstr "无效的 %s."
 
-#: Model/AppModel.php:1416
+#: Model/AppModel.php:1466
 msgid "Indexing "
 msgstr "索引中 "
 
-#: Model/AppModel.php:1430
+#: Model/AppModel.php:1480
 msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr "执行预更新测试`%s`出现问题, 返回的错误是: %s"
 
-#: Model/AppModel.php:1452
+#: Model/AppModel.php:1502
 msgid "Successfuly executed the SQL query for "
 msgstr "成功执行 SQL 查询 "
 
-#: Model/AppModel.php:1453
+#: Model/AppModel.php:1503
 msgid "The executed SQL query was: %s"
 msgstr "执行的SQL查询是: %s"
 
-#: Model/AppModel.php:1455
+#: Model/AppModel.php:1505
 msgid "Successfuly executed the SQL query for %s"
 msgstr "成功执行SQL查询: "
 
-#: Model/AppModel.php:1466;1530
+#: Model/AppModel.php:1516;1580
 msgid "Issues executing the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr "执行的 SQL 查询为: "
 
-#: Model/AppModel.php:1467
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr " 返回的错误是: "
 
-#: Model/AppModel.php:1469
+#: Model/AppModel.php:1519
 msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr "执行`%s`的SQL查询时出现问题"
 
-#: Model/AppModel.php:1478
+#: Model/AppModel.php:1528
 msgid "However, as this error is whitelisted, the update went through."
 msgstr "不过, 由于这个错误已列入白名单, 所以更新通过了."
 
-#: Model/AppModel.php:1497
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr "索引成功 "
 
-#: Model/AppModel.php:1500
+#: Model/AppModel.php:1550
 msgid "Failed to add index"
 msgstr "添加索引失败"
 
-#: Model/AppModel.php:1502
+#: Model/AppModel.php:1552
 msgid "The returned error is:"
 msgstr "返回错误是: "
 
-#: Model/AppModel.php:1531
+#: Model/AppModel.php:1581
 msgid "Database updates stopped as some errors occured and the stop flag is enabled."
 msgstr "由于发生了一些错误, 数据库更新停止, 并且启用了停止标志."
 
-#: Model/AppModel.php:1690
+#: Model/AppModel.php:1740
 msgid "Invalid JSON."
 msgstr "无效JSON"
 
-#: Model/AppModel.php:1783;1841
+#: Model/AppModel.php:1833;1891
 msgid "Issues executing run_updates"
 msgstr "执行run_updates出现问题"
 
-#: Model/AppModel.php:1784
+#: Model/AppModel.php:1834
 msgid "Database updates are locked. Worker not spawned"
 msgstr "数据库更新被锁定, 没有生成Worker"
 
-#: Model/AppModel.php:1788;1846;1881
+#: Model/AppModel.php:1838;1896;1931
 msgid "Update done"
 msgstr "更新完毕"
 
-#: Model/AppModel.php:1842
+#: Model/AppModel.php:1892
 msgid "Updates are locked. Stopping worker gracefully"
 msgstr "更新被锁定, 优雅的终止worker"
 
-#: Model/AppModel.php:1861
+#: Model/AppModel.php:1911
 msgid "Running update %s"
 msgstr "运行更新 %s"
 
-#: Model/AppModel.php:1887
+#: Model/AppModel.php:1937
 msgid "Update done in another worker. Gracefuly stopping."
 msgstr "更新在另一个worker中完成, 优雅的终止"
 
@@ -3806,19 +4022,19 @@ msgstr "值必须大于或等于 0."
 msgid "The value has to be a number between 0 and 10."
 msgstr "值必须是 0 到 10 之间的数字."
 
-#: Model/Attribute.php:2278;2346
+#: Model/Attribute.php:2297;2365
 msgid "Could not read user."
 msgstr "无法读取用户."
 
-#: Model/Attribute.php:2282
+#: Model/Attribute.php:2301
 msgid "Invalid hash type."
 msgstr "无效hash类型."
 
-#: Model/Attribute.php:2973
+#: Model/Attribute.php:2992
 msgid "This field is mandatory."
 msgstr "此字段为必填字段."
 
-#: Model/Attribute.php:3540
+#: Model/Attribute.php:3559
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr "出了点问题, 在试图创建一个上载恶意软件样本的压缩存档时, 收到了一个非数字事件ID"
 
@@ -3838,6 +4054,10 @@ msgstr "默认社区列表不符合预期格式"
 msgid "Community not found."
 msgstr "社区未找到"
 
+#: Model/Dashboard.php:55;64
+msgid "Invalid widget or widget not found."
+msgstr ""
+
 #: Model/DecayingModel.php:162
 msgid "Models could not be loaded or default decaying models folder is empty"
 msgstr "无法加载模型, 或默认衰减模型文件夹为空"
@@ -3909,67 +4129,75 @@ msgstr "点击此处可下载由所有相关属性生成的Yara规则"
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr "点击此处可下载由所有相关属性生成的Yara规则, 规则将以JSON格式返回, 并包含有关来源(生成或解析)和有效性的信息"
 
-#: Model/Event.php:5722
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr "加载stix文件时出现问题. "
 
-#: Model/Event.php:5724
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr "Maec库存在问题. "
 
-#: Model/Event.php:5726
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "存在执行提取脚本或输入无效的问题. "
 
-#: Model/Event.php:5729
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr "请咨询您的管理员 "
 
-#: Model/Event.php:5731
+#: Model/Event.php:5808
 msgid "Please "
 msgstr "请 "
 
-#: Model/Event.php:5733
+#: Model/Event.php:5810
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr "检查是否通过诊断工具满足了STIX的依赖性."
 
-#: Model/Event.php:5765
+#: Model/Event.php:5842
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:5774
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr "%s 未设置"
 
-#: Model/Event.php:6023
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr "无法添加标签."
 
-#: Model/Event.php:6505
+#: Model/Event.php:6582
 msgid "process_"
 msgstr "进程_"
 
-#: Model/Feed.php:1444;1488
+#: Model/Feed.php:86
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:90
+msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
+msgstr ""
+
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr "事件 %s"
 
-#: Model/Feed.php:1458
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr "订阅源 %s"
 
-#: Model/Feed.php:1635
+#: Model/Feed.php:1687
 msgid "Invalid feed id."
 msgstr "无效订阅源ID"
 
-#: Model/Feed.php:1638
+#: Model/Feed.php:1690
 msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
 msgstr "订阅源必须是CSV或者是Freetxt的订阅源, 这样才会有效果."
 
-#: Model/Feed.php:1643
+#: Model/Feed.php:1695
 msgid "Invalid user id."
 msgstr "无效用户ID"
 
-#: Model/Feed.php:1663
+#: Model/Feed.php:1715
 msgid "Events related to feed %s purged."
 msgstr "订阅源 %s 的相关事件被清除"
 
@@ -3977,1164 +4205,1208 @@ msgstr "订阅源 %s 的相关事件被清除"
 msgid "Galaxy cannot be represented as a matrix"
 msgstr "Galaxy无法以矩阵显示"
 
-#: Model/MispObject.php:1057
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr "所选属性不存在."
 
-#: Model/Server.php:140
+#: Model/Server.php:123
+msgid "Server unreachable"
+msgstr ""
+
+#: Model/Server.php:124
+msgid "Unexpected error"
+msgstr ""
+
+#: Model/Server.php:125
+msgid "Authentication failed"
+msgstr ""
+
+#: Model/Server.php:126
+msgid "Password change required"
+msgstr ""
+
+#: Model/Server.php:127
+msgid "Terms not accepted"
+msgstr ""
+
+#: Model/Server.php:150
 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:141
+#: Model/Server.php:151
 msgid "Administering MISP via the CLI"
 msgstr "通过 CLI 管理MISP"
 
-#: Model/Server.php:153
+#: Model/Server.php:163
 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:154
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "自动化某些控制台任务"
 
-#: Model/Server.php:163
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr "除了界面/API管理工具外, 后台worker可以通过 CLI 进行管理"
 
-#: Model/Server.php:164
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr "管理后台workers"
 
-#: Model/Server.php:173
+#: Model/Server.php:183
 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:175
+#: Model/Server.php:185
 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:181
+#: Model/Server.php:191
 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 "应用程序的基础url (格式为 https://www.mymispinstance.com) 为外部可见于其他的MISPs, MISP 将在包含自身时在共享组中编码此URL, 如果没有设置此项值, Baseurl 将被用于后退."
 
-#: Model/Server.php:189
+#: Model/Server.php:199
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr "除非设置为 true, 否则实例将只能由站点管理员访问."
 
-#: Model/Server.php:197
+#: Model/Server.php:207
 msgid "Select the language MISP should use. The default is english."
 msgstr "选择MISP的语言.默认是英文."
 
-#: Model/Server.php:207
+#: Model/Server.php:217
 msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr "当涉及属性时, 此值控制internal fetcher's memory envelope, 提供的数量是一次可以为每个MB的PHP内存加载的属性数量, 如果您的实例附加了很多属性标签/属性星系, 请考虑降低此数字."
 
-#: Model/Server.php:216
+#: Model/Server.php:226
 msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
 msgstr "当加载完整事件时, 此值控制属性权重因子, 这意味着它将加载每MB可用内存的属性的系数或因子, 如果您有很多相关性或高度相关的事件(大量事件级别星系/标记), 请考虑提高此数字"
 
-#: Model/Server.php:225
+#: Model/Server.php:235
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "启用某些性能紧密关联(当前的 CIDR 关联)"
 
-#: Model/Server.php:234
+#: Model/Server.php:244
 msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
 msgstr "启用此设置以直接保存 config.php 文件, 而不需要先创建一个临时文件并移动它以避免冲突. 通常不推荐, 但在其他工具修改或维护config.php 文件时是有用的."
 
-#: Model/Server.php:243
+#: Model/Server.php:253
 msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
 msgstr "强烈建议在 virtualenv 中安装所有python依赖项, 推荐位置是 %s/venv"
 
-#: Model/Server.php:254
+#: Model/Server.php:264
 msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
 msgstr "MISP将默认使用框架附带的捆绑的mozilla证书捆绑包, 这个捆绑包相当陈旧, 如果您想使用其他的证书包, 只需使用要使用的证书包的路径来设置这个设置, 这个设置只能通过CLI进行修改。"
 
-#: Model/Server.php:264
+#: Model/Server.php:274
 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 实例可能会因大量请求击中服务器而产生意外的blackhole错误. 禁用自动注销功能以减轻系统的负担."
 
-#: Model/Server.php:273
+#: Model/Server.php:283
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr "设置 ssdeep 分数来考虑两个ssdeehash作为相关的 [1-100]"
 
-#: Model/Server.php:281
+#: Model/Server.php:291
 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 "设置可以通过单个事件获取的最大关联数量, 对于极端情况, 这可以防止内存出现问题, 默认值为5k."
 
-#: Model/Server.php:290
+#: Model/Server.php:300
 msgid "The message that users will see if the instance is not live."
 msgstr "用户将看到的实例是否在线的消息."
 
-#: Model/Server.php:292
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr "如果未设置则将使用默认值."
 
-#: Model/Server.php:298;306;333;357;365;373;381;438;486;494;561
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr "此设置已废弃并可以安全移除."
 
-#: Model/Server.php:314
+#: Model/Server.php:324
 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:324
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr "在实例中完全禁用显示/修改威胁级别 (已废弃的字段)."
 
-#: Model/Server.php:341
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "正在预设“由MIS驱动”文本的页脚文本."
 
-#: Model/Server.php:349
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "遵循“由MIS驱动”文本的页脚文本."
 
-#: Model/Server.php:389
+#: Model/Server.php:399
 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:397
+#: Model/Server.php:407
 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:405
+#: Model/Server.php:415
 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:413
+#: Model/Server.php:423
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr "主机所属组织的组织标签, 用于电子邮件主题."
 
-#: Model/Server.php:421
+#: Model/Server.php:431
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr "此实例的主机所属组织.如果未选中此项, 则无法添加复制实例."
 
-#: Model/Server.php:430
+#: Model/Server.php:440
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr "MISP 实例 UUID, 此UUID 用于识别此实例."
 
-#: Model/Server.php:432
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr "未设置有效的 UUID"
 
-#: Model/Server.php:446
+#: Model/Server.php:456
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr "将此项设置为“false”将隐藏所有组织名称/徽标."
 
-#: Model/Server.php:454
+#: Model/Server.php:464
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr "将事件威胁级别加入通知邮件主题中."
 
-#: Model/Server.php:462
+#: Model/Server.php:472
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr "无法找到 email_subject_tag时, 这是电子邮件的TLP字符串."
 
-#: Model/Server.php:470
+#: Model/Server.php:480
 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 "如果这个标签设置在一个事件上, 它的值将会被发送到邮件主题中. 如果标签未设置email_subject_TLP_string, 则将使用该字符串."
 
-#: Model/Server.php:478
+#: Model/Server.php:488
 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:502
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr "启用 MISP 的背景处理."
 
-#: Model/Server.php:510
+#: Model/Server.php:520
 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:520
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "允许 XML 缓存包含编码附件."
 
-#: Model/Server.php:528
+#: Model/Server.php:538
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr "当用户在浏览器中加载时总是下载附件"
 
-#: Model/Server.php:536
+#: Model/Server.php:546
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr "MISP 应对所有通知使用的电子邮件地址"
 
-#: Model/Server.php:544
+#: Model/Server.php:554
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr "您可以禁用使用此设置的所有电子邮件, 启用后, MISP将不会发送出的电子邮件."
 
-#: Model/Server.php:553
+#: Model/Server.php:563
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr "MISP应将电子邮件地址作为该实例支持小组的联系地址."
 
-#: Model/Server.php:569
+#: Model/Server.php:579
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr "将Vulnerability类型属性转换为链接到提供CVE 查找的链接"
 
-#: Model/Server.php:577
+#: Model/Server.php:587
 msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
 msgstr "将弱点类型属性转化为所提供的CWE查询的链接"
 
-#: Model/Server.php:585
+#: Model/Server.php:595
 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接口创建事件时是否会发送通知邮件, 在首次设置链接到另一个实例时, 最好禁用此设置, 以避免在初始拉动期间向用户发送垃圾邮件. 快速回顾一下, True = 不发送电子邮件, False = 通过同步/REST发布的事件会发送电子邮件."
 
-#: Model/Server.php:593
+#: Model/Server.php:603
 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 "启用此标志将允许在警报邮件的主题中传输事件描述, 请注意, GnuPG并不加密, 所以只有在您接受事件描述的一部分将以清晰文本形式发送的情况下, 才会启用此标志."
 
-#: Model/Server.php:601
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr "默认的事件分布设置 (0-3)."
 
-#: Model/Server.php:610
+#: Model/Server.php:620
 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 "默认的属性分布设置, 将其设置为“事件”, 如果您想要将属性设置为默认的事件分布级别. (0-3或\"事件\")"
 
-#: Model/Server.php:619
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr "创建事件时的默认威胁级别设置."
 
-#: Model/Server.php:628
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr "标记集合将应用于手动创建的所有事件"
 
-#: Model/Server.php:637
+#: Model/Server.php:647
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr "启用MISP的标签功能, 强烈建议这样做."
 
-#: Model/Server.php:645
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr "在事件索引中显示完整的标签名称."
 
-#: Model/Server.php:654
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr "在 MISP 标志前的登录页面使用"
 
-#: Model/Server.php:662
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr "在 MISP 标志之后的登录页面使用"
 
-#: Model/Server.php:670
+#: Model/Server.php:689
 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:678
+#: Model/Server.php:697
 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:686
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr "在页面名称后使用在页面标题"
 
-#: Model/Server.php:694
+#: Model/Server.php:713
 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 "允许用户通过 \"添加MISP XML\"按钮来获取事件的所有权, 这允许欺骗手动导入的事件的创建者, 也可能破坏了原来的可发布性, 与同一个事件的创建者不同的实例同步可能会导致不良后果."
 
-#: Model/Server.php:702
+#: Model/Server.php:721
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr "选择条款和条件是内嵌显示(false)还是以下载形式提供(true)"
 
-#: Model/Server.php:710
+#: Model/Server.php:729
 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:718
+#: Model/Server.php:737
 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可以为事件索引启用备用的 org 字段(源 org 和成员 org, 而不是传统的只显示 org 字段的方式, 这允许用户查看一个事件是否是由成员组织在其MISP实例中上传的, 或者是在互连的实例中上传的"
 
-#: Model/Server.php:726
+#: Model/Server.php:745
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr "设置为True将拒绝提交者组织之外的用户(网站管理员除外)对未发布事件的访问."
 
-#: Model/Server.php:735
+#: Model/Server.php:754
 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 = 这个实例的网址, $org = 该实例所属的组织, 如MISP.org中的设置, $contact = 用于联系支持团队的电子邮件地址, 如MISP.contact中的设置, 例如, \"$username的密码是$password\", 对于电子邮件地址为user@misp.org的用户来说, \"user@misp.org的密码是hNamJae81\"."
 
-#: Model/Server.php:744
+#: Model/Server.php:763
 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 = 这个实例的网址, $org = 该实例所属的组织, 如MISP.org中的设置, $contact = 用于联系支持团队的电子邮件地址, 如MISP.contact中的设置, 例如, \"$username的密码是$password\", 对于电子邮件地址为user@misp.org的用户来说, \"user@misp.org的密码是hNamJae81\"."
 
-#: Model/Server.php:752
+#: Model/Server.php:771
 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:759
+#: Model/Server.php:778
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr "黑名单组织UUID, 阻止黑名单组织创建任何事件"
 
-#: Model/Server.php:766
+#: Model/Server.php:785
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr "如果启用, 所有日志条目都将包含用户的 IP 地址."
 
-#: Model/Server.php:775
+#: Model/Server.php:794
 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:783
+#: Model/Server.php:802
 msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
 msgstr "此功能使您可以完全禁止将任何日志保存在SQL后端中. 这是极不建议使用的, 因为您会失去审计日志子系统提供的所有功能和事件历史记录(因为这些都是基于日志建立的), 只有在您了解并接受相关风险的情况下, 才可以启用此功能."
 
-#: Model/Server.php:785
+#: Model/Server.php:804
 msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
 msgstr "现在已经禁用了日志记录 - 您的审计日志将不会捕获失败的验证尝试, 您的事件历史记录不会被填充, 也不会记录任何系统维护消息"
 
-#: Model/Server.php:792
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr "如果启用了这个功能, 所有的页面请求都会被记录下来, 请记住, 这将会对您的数据库造成很大的负担"
 
-#: Model/Server.php:801
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr "您可以决定跳过Paranoid日志到数据库的记录"
 
-#: Model/Server.php:810
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr "如果启用了Paranoid日志记录, 则在条目中包含POST正文"
 
-#: Model/Server.php:819
+#: Model/Server.php:838
 msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
 msgstr "在每次请求中记录用户的IP. 30天的保留期, 通过IP查询, 可以获得给定IP的最后一个认证用户ID, 而反之, 则可以无限期地存储所有相关的IP"
 
-#: Model/Server.php:828
+#: Model/Server.php:847
 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:837
+#: Model/Server.php:856
 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:846
+#: Model/Server.php:865
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr "启用后, 将在索引中显示事件的建议数量."
 
-#: Model/Server.php:855
+#: Model/Server.php:874
 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:864
+#: Model/Server.php:883
 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:873
+#: Model/Server.php:892
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr "启用时, 只有组织和网站管理员可以编辑用户的资料."
 
-#: Model/Server.php:883
+#: Model/Server.php:902
 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 "启用此设置以开始屏蔽某个标签事件的电子邮件提醒, 在 MISP.block_event_alert_tag中定义标签."
 
-#: Model/Server.php:892
+#: Model/Server.php:911
 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设置, 则用此设置定义的标记的事件的警报邮件将被阻止"
 
-#: Model/Server.php:901
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr "设置一个值来限制每个创建者组织的事件可以产生的电子邮件警报的数量(例如, 如果一个组织一次性推送2000个事件, 只对前20个事件发出警报)"
 
-#: Model/Server.php:910
+#: Model/Server.php:929
 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 "启用此设置可以开始阻止旧事件的警报邮件, 构成旧事件的确切时间由MISP.block_old_event_alert_age定义"
 
-#: Model/Server.php:919
+#: Model/Server.php:938
 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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr "如果设置了MISP.block_old_event_alert设置, 则此设置将控制事件的发生时间, 以便对其进行告警, 使用事件的\"timestamp\"字段. 预期格式: 整数, 以天为单位"
 
-#: Model/Server.php:928
+#: Model/Server.php:947
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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设置, 则此设置将控制event.date字段的阈值, 指示事件可以持续多久才能发出警报, 使用事件的\"date\"字段. 预期格式: 整数, 以天为单位"
 
-#: Model/Server.php:937
+#: Model/Server.php:956
 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:947
+#: Model/Server.php:966
 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 "如果您想自定义css, 只需在/var/www/MISP/app/webroot/css目录下放入一个css文件, 然后在这里输入名称"
 
-#: Model/Server.php:956
+#: Model/Server.php:975
 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:965
+#: Model/Server.php:984
 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:974
+#: Model/Server.php:993
 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:984
+#: Model/Server.php:1003
 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:993
+#: Model/Server.php:1012
 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:1001
+#: Model/Server.php:1020
 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:1009
+#: Model/Server.php:1028
 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 "Redis服务器上的数据库将被用于通用的 MISP 任务, 如果您运行多个MISP实例, 请确保在每个实例上使用不同的数据库"
 
-#: Model/Server.php:1017
+#: Model/Server.php:1036
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr "Redis服务器上的密码(如果有的话), 用于通用MISP任务"
 
-#: Model/Server.php:1026
+#: Model/Server.php:1045
 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:1034
+#: Model/Server.php:1053
 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 "如果您想禁用MISP管理自己的worker进程(例如, 如果您想通过systemd unit管理worker), 请将此设置为false"
 
-#: Model/Server.php:1042
+#: Model/Server.php:1061
 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:1051
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr "如果上一次失败, 在重新触发更新之前设置其最短时间. (安全防卫以避免多次开始相同的更新)"
 
-#: Model/Server.php:1062
+#: Model/Server.php:1078
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:1090
 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:1071
+#: Model/Server.php:1099
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr "允许 (false) 未加密的电子邮件发送给没有GnuPG 密钥的用户."
 
-#: Model/Server.php:1079
+#: Model/Server.php:1107
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr "允许 (false) 一个未加密的电子邮件主体包含有关事件的详细信息."
 
-#: Model/Server.php:1087
+#: Model/Server.php:1115
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr "启用 GnuPG 电子邮件签名.默认情况下, GnuPG 电子邮件将被签名"
 
-#: Model/Server.php:1095
+#: Model/Server.php:1123
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr "此实例GnuPG密钥绑定的电子邮件地址."
 
-#: Model/Server.php:1103
+#: Model/Server.php:1131
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr "实例的 GnuPG 密钥的密码 (如果已被设置)."
 
-#: Model/Server.php:1112
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr "GnuPG homedir的位置."
 
-#: Model/Server.php:1123
+#: Model/Server.php:1151
 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.加密和 GnuPG.bodyonly 加密设置的加密态势将被继承."
 
-#: Model/Server.php:1131
+#: Model/Server.php:1159
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr "此实例的 SMIME 密钥绑定到的电子邮件地址."
 
-#: Model/Server.php:1139
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr "签署证书公共部分的位置."
 
-#: Model/Server.php:1147
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr "签字证书私有部分的位置."
 
-#: Model/Server.php:1155
+#: Model/Server.php:1183
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr "此实例的 SMIME 密钥的密码(如果已被设置)."
 
-#: Model/Server.php:1167
+#: Model/Server.php:1195
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr "传出同步请求的 HTTP 代理主机名.如未使用代理身份验证则不填."
 
-#: Model/Server.php:1175
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr "HTTP 代理的 TCP 端口."
 
-#: Model/Server.php:1183
+#: Model/Server.php:1211
 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:1191
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr "HTTP 代理的身份验证的用户名."
 
-#: Model/Server.php:1199
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr "HTTP 代理的身份验证的密码."
 
-#: Model/Server.php:1210
+#: Model/Server.php:1238
 msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
 msgstr "禁用此设置将移除所有形式篡改保护, 请不要设置此设置, 我已警告过您"
 
-#: Model/Server.php:1219
+#: Model/Server.php:1247
 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 "用于被hash后密码的加盐.您不能从图形界面将其重置, 只能从setting.php文件手动设置.注意, 这将使数据库中的所有密码无效."
 
-#: Model/Server.php:1229
+#: Model/Server.php:1257
 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:1238
+#: Model/Server.php:1266
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:1276
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:1284
 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:1246
+#: Model/Server.php:1292
 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:1254
+#: Model/Server.php:1300
 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:1263
+#: Model/Server.php:1309
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr "启用此设置将清除软删除中属性的内容"
 
-#: Model/Server.php:1272
+#: Model/Server.php:1318
 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:1281
+#: Model/Server.php:1327
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:1337
 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 header, 它可以作为一种变通方法. 还是那句话, 只有在万不得已的情况下才使用这个功能"
 
-#: Model/Server.php:1283
+#: Model/Server.php:1339
 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密钥. 这个是强烈建议反对的, 您真的想在您的日志中显示APIkeys吗?"
 
-#: Model/Server.php:1290
+#: Model/Server.php:1346
 msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
 msgstr "允许在此实例中的跨源请求匹配在 Security.cors_origins.设置为 false 以完全禁用"
 
-#: Model/Server.php:1299
+#: Model/Server.php:1355
 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 "设置MISP 允许交叉来源请求的源.对于外部集成有效.如果需要设置多个时用逗号隔开."
 
-#: Model/Server.php:1308
+#: Model/Server.php:1364
 msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
 msgstr "启用此设置可以创建同步事件数据的详细日志用于调试, 日志会保存在MISP目录下的app/files/scripts/tmp/目录下"
 
-#: Model/Server.php:1320
+#: Model/Server.php:1373
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:1385
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr "用户在bruteforce保护生效之前可以尝试登录的次数"
 
-#: Model/Server.php:1328
+#: Model/Server.php:1393
 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:1339
+#: Model/Server.php:1404
 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 "设置为 true 以在请求数量后自动重新生成会话. 通常这可能会导致用户被取消身份验证, 因此只有当您真的需要重新生成会话时再启用它. (不推荐)"
 
-#: Model/Server.php:1347
+#: Model/Server.php:1412
 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:1355
+#: Model/Server.php:1420
 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中配置的会话设置. 会话数据的ni (支持选项：php, 数据库). 推荐的选项是php并通过您的php.ini设置您的PHP以使用redis会话.只需添加 'session.save_handler = redis' 和 \"session.save_path = 'tcp://localhost:6379'\" (用您的redis connect取代后者) 到 "
 
-#: Model/Server.php:1364
+#: Model/Server.php:1429
 msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
 msgstr "会话超时时间(单位: 分钟). 0 并不意味着PHP 会话处理器的无限时间, 而是会话将立即失效."
 
-#: Model/Server.php:1372
+#: Model/Server.php:1437
 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 "cookie的过期时间(单位: 分钟), 会话超时会经常被刷新, 但是cookie不会. 一般情况下, 建议使用比timeout更高的cookie_timeout"
 
-#: Model/Server.php:1383
+#: Model/Server.php:1448
 msgid "The default policy action for the values added to the RPZ."
 msgstr "添加到 RPZ 值的默认策略行动."
 
-#: Model/Server.php:1392
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr "如果为导出选择本地数据政策设置, RPZ导出时使用默认的walled garden."
 
-#: Model/Server.php:1400
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr "区档的SOA部分中的序列号(数字, 最佳做法是yyymmddrr, rr是档案的两位数字次修订版. $date 将自动转换为当前yyymmdd, 所以 $date00 是一个有效的设置). 设置为 $time 将会给您一个基于 unixtime 的序列(您每天需要超过99 个修订本)."
 
-#: Model/Server.php:1408
+#: Model/Server.php:1473
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "区域文件的SOA部分中指定的刷新时间(以秒为单位或缩短持续时间, 例如15m)"
 
-#: Model/Server.php:1416
+#: Model/Server.php:1481
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "区域文件的SOA部分中指定的重新尝试(以秒为单位或短片持续时间, 例如15m)"
 
-#: Model/Server.php:1424
+#: Model/Server.php:1489
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "区域文件SOA部分中指定的过期时间(以秒为单位或短片持续时间, 例如15m)"
 
-#: Model/Server.php:1432
+#: Model/Server.php:1497
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "区域文件SOA部分中指定的最小TTL(以秒为单位或缩短持续时间, 例如15m)"
 
-#: Model/Server.php:1440
+#: Model/Server.php:1505
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "区域文件的TTL(以秒计, 或短片持续时间, 例如15m)"
 
-#: Model/Server.php:1448
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr "名称服务器"
 
-#: Model/Server.php:1456
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr "备用名称服务器"
 
-#: Model/Server.php:1464
+#: Model/Server.php:1529
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr "区域文件SOA部分中指定的电子邮件地址."
 
-#: Model/Server.php:1472
+#: Model/Server.php:1537
 msgid "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."
 msgstr "启用或禁用 MISP 的 Kafka pub功能. 请确保您安装插件工作的要求. 更多信息请参阅安装说明."
 
-#: Model/Server.php:1480
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr "Kafka bootstrap broker的逗号分隔列表"
 
-#: Model/Server.php:1488
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr "传给rdkafka的ini文件的路径, 其中包含要传递给rdkafka的配置选项. ini文件中的章节标题将被忽略"
 
-#: Model/Server.php:1496;1743
+#: Model/Server.php:1561;1808
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr "启用此设置可将恶意软件样本/附件的base64编码有效载荷包含在输出中"
 
-#: Model/Server.php:1504;1751
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr "启用或禁用任何事件创建/编辑/删除的发布"
 
-#: Model/Server.php:1512
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr "用于发布事件创建/编辑/删除的主题"
 
-#: Model/Server.php:1520
+#: Model/Server.php:1585
 msgid "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."
 msgstr "如果启用, 在MISP中发布事件会将事件发布到Kafka, 事件操作(创建或编辑)不会发布到Kafka"
 
-#: Model/Server.php:1528
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr "发布事件信息的主题."
 
-#: Model/Server.php:1536;1759
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr "启用或禁用任何对象创建/编辑/删除的发布"
 
-#: Model/Server.php:1544
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr "发布对象创建/编辑/删除的主题."
 
-#: Model/Server.php:1552;1767
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr "启用或禁用任何对象引用的创建/删除的发布"
 
-#: Model/Server.php:1560
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr "用于发布对象引用的创建/删除的主题"
 
-#: Model/Server.php:1568;1775
+#: Model/Server.php:1633;1840
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr "启用或禁用任何属性创建/编辑/软删除的发布"
 
-#: Model/Server.php:1576
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr "用于发布属性创建/编辑/软删除的主题"
 
-#: Model/Server.php:1584
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr "启用或禁用任何创建/编辑/删除的提案的发布"
 
-#: Model/Server.php:1592
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr "用于发布提案创作/编辑/删除的主题"
 
-#: Model/Server.php:1600;1783
+#: Model/Server.php:1665;1848
 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元素/从各种MISP元素中分离的发布"
 
-#: Model/Server.php:1608
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr "用于发布标签创建/编辑/删除以及将标签附加到各种MISP元素/从各种MISP元素中分离的主题"
 
-#: Model/Server.php:1616
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr "启用或禁用发布新视图."
 
-#: Model/Server.php:1624
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr "发表视图的主题."
 
-#: Model/Server.php:1632
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr "启用或禁用新/修改用户的发布."
 
-#: Model/Server.php:1640
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr "用于发布新用户/修改过的用户的主题."
 
-#: Model/Server.php:1648
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr "启用或禁用新的/修改过的组织的发布"
 
-#: Model/Server.php:1656
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr "用于发布的新的/修改过的组织的主题."
 
-#: Model/Server.php:1664
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr "启用或禁用日志条目的发布. 请记住, 这可能会非常冗长, 具体取决于您的日志记录设置"
 
-#: Model/Server.php:1672
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr "发布日志条目的主题."
 
-#: Model/Server.php:1680
+#: Model/Server.php:1745
 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的发布/订阅功能, 确保您已安装了要求的插件, 有关更多信息, 请参考安装说明"
 
-#: Model/Server.php:1689
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr "pub/sub将使用的端口."
 
-#: Model/Server.php:1698
+#: Model/Server.php:1763
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr "MISP和Python PUB脚本使用的Redis db的位置, 用于排队发布数据"
 
-#: Model/Server.php:1707
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr "Redis正在监听端口."
 
-#: Model/Server.php:1716
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr "密码, 如果设置为Redis的话."
 
-#: Model/Server.php:1725
+#: Model/Server.php:1790
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr "用于pub/sub功能的消息队列的数据库"
 
-#: Model/Server.php:1734
+#: Model/Server.php:1799
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr "用于pub/sub功能的消息队列的命名空间"
 
-#: Model/Server.php:1791
+#: Model/Server.php:1856
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr "启用或禁用向ZMQ pubsub feed发布新的观察事件"
 
-#: Model/Server.php:1799
+#: Model/Server.php:1864
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr "启用或禁用向ZMQ pubsub feed发布新的/修改过的用户"
 
-#: Model/Server.php:1807
+#: Model/Server.php:1872
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr "启用或禁用向ZMQ pubsub feed发布新的/修改过的组织"
 
-#: Model/Server.php:1815
+#: Model/Server.php:1880
 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 feed日志条目, 请记住, 这可能会根据您的日志设置而变得非常繁琐. "
 
-#: Model/Server.php:1823
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "启用向ElasticSearch实例的日志记录功能"
 
-#: Model/Server.php:1831
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr "访问ElasticSearch的URL - 如果您希望有多个URL, 请用逗号隔开"
 
-#: Model/Server.php:1839
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr "用于放置日志的索引"
 
-#: Model/Server.php:1847
+#: Model/Server.php:1912
 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:1855
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr "要上传到的Bucket名称"
 
-#: Model/Server.php:1863
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr "您的S3 bucket所处的区域"
 
-#: Model/Server.php:1871
+#: Model/Server.php:1936
 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 roles)"
 
-#: Model/Server.php:1879
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr "上传样本时使用的 AWS 密钥"
 
-#: Model/Server.php:1887
+#: Model/Server.php:1952
 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(指事件的拥有者和任何提供该事件的观察数据的人)和每个人(指任何能看到事件/属性的人)"
 
-#: Model/Server.php:1896
+#: Model/Server.php:1961
 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:1904
+#: Model/Server.php:1969
 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年前的观察事件可能已经不重要了, 设置以天数为单位, 默认为365天."
 
-#: Model/Server.php:1912
+#: Model/Server.php:1977
 msgid "Enable SightingDB integration."
 msgstr "启用SightingDB集成"
 
-#: Model/Server.php:1920
+#: Model/Server.php:1985
 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:1930
+#: Model/Server.php:1995
 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:1939
+#: Model/Server.php:2004
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr "使用header namespace作为auth header - 默认设置为启用"
 
-#: Model/Server.php:1948
+#: Model/Server.php:2013
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr "auth header的默认header namespace - 默认设置为HTTP_"
 
-#: Model/Server.php:1957
+#: Model/Server.php:2022
 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:1966
+#: Model/Server.php:2031
 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:1975
+#: Model/Server.php:2040
 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:1984
+#: Model/Server.php:2049
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr "禁用外部认证机制的用户注销按钮"
 
-#: Model/Server.php:1992
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr "启用/禁用丰富化服务"
 
-#: Model/Server.php:2000
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr "设置丰富化服务超时"
 
-#: Model/Server.php:2008
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr "启用/禁用导入服务"
 
-#: Model/Server.php:2016
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr "设置导入服务超时"
 
-#: Model/Server.php:2024
+#: Model/Server.php:2089
 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.1:6666访问"
 
-#: Model/Server.php:2032
+#: Model/Server.php:2097
 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:2040
+#: Model/Server.php:2105
 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.1:6666访问"
 
-#: Model/Server.php:2048
+#: Model/Server.php:2113
 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:2056
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr "启用/禁用导出服务"
 
-#: Model/Server.php:2064
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr "设置导出服务超时"
 
-#: Model/Server.php:2072
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr "启用/禁用悬停从丰富化模块检索到的信息"
 
-#: Model/Server.php:2080
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr "设置悬停服务超时"
 
-#: Model/Server.php:2088
+#: Model/Server.php:2153
 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:2096
+#: Model/Server.php:2161
 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:2104
+#: Model/Server.php:2169
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr "访问Cortex的URL, 默认情况下可通过http://cortex-url访问"
 
-#: Model/Server.php:2112
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr "访问Cortex的端口, 默认情况下是9000端口"
 
-#: Model/Server.php:2120
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr "启用/禁用 Cortex 服务"
 
-#: Model/Server.php:2128
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "设置要传递到 Cortex 的验证密钥"
 
-#: Model/Server.php:2137
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr "设置Cortex服务超时"
 
-#: Model/Server.php:2145
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr "设置为false以禁用SSL验证, 不建议这样做"
 
-#: Model/Server.php:2154
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr "如果您希望在验证证书时忽略主机名匹配错误, 请设置为false"
 
-#: Model/Server.php:2163
+#: Model/Server.php:2228
 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:2172
+#: Model/Server.php:2237
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr "设置为您希望用于验证SSL证书的证书机构文件的绝对路径"
 
-#: Model/Server.php:2181
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr "为您的自定义身份验证用户提供一个外部URL到身份验证系统, 以重置他们的密码"
 
-#: Model/Server.php:2190
+#: Model/Server.php:2255
 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:2200
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr "实例的调试级别, 对于生产实例总是使用0"
 
-#: Model/Server.php:2209
+#: Model/Server.php:2274
 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:2376
+#: Model/Server.php:2441
 msgid "Failed (partially?) because of validation errors: "
 msgstr "失败(部分?) 因为验证错误: "
 
-#: Model/Server.php:2380
+#: Model/Server.php:2445
 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:2407
+#: Model/Server.php:2472
 msgid "Empty event detected."
 msgstr "检测到空事件."
 
-#: Model/Server.php:2413
+#: Model/Server.php:2478
 msgid "failed downloading the event"
 msgstr "下载事件失败"
 
-#: Model/Server.php:2492
+#: Model/Server.php:2557
 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:2494
+#: Model/Server.php:2559
 msgid "Sorry, this is not yet implemented"
 msgstr "抱歉, 此操作尚未实现"
 
-#: Model/Server.php:2495
+#: Model/Server.php:2560
 msgid "Something went wrong while trying to pull"
 msgstr "尝试下载时出了错."
 
-#: Model/Server.php:2507;2509
+#: Model/Server.php:2572;2574
 msgid "Unknown issue."
 msgstr "未知问题."
 
-#: Model/Server.php:3049
+#: Model/Server.php:3134
 msgid "Enable or disable the %s module."
 msgstr "启用或禁用 %s 模块."
 
-#: Model/Server.php:3052
+#: Model/Server.php:3137
 msgid "Restrict the %s module to the given organisation."
 msgstr "将 %s 模块限制在给定的组织."
 
-#: Model/Server.php:3060
+#: Model/Server.php:3145
 msgid "Set this required module specific setting."
 msgstr "设置此模块的特定设置."
 
-#: Model/Server.php:3175
+#: Model/Server.php:3260
 msgid "Value not set."
 msgstr "值未设置."
 
-#: Model/Server.php:3196
+#: Model/Server.php:3281
 msgid "Invalid language."
 msgstr "无效语言"
 
-#: Model/Server.php:3217
+#: Model/Server.php:3302
 msgid "Invalid tag_collection."
 msgstr "无效tag_collection"
 
-#: Model/Server.php:3225
+#: Model/Server.php:3310
 msgid "This setting has to be a number."
 msgstr "这个设置必须是一个数字"
 
-#: Model/Server.php:3237
+#: Model/Server.php:3322
 msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
 msgstr "目前, cookie的超时值低于会话超时值, 这将使cookie在会话过期前失效"
 
-#: Model/Server.php:3519
+#: Model/Server.php:3619
 msgid "Invalid file path or file not accessible."
 msgstr "文件路径无效或文件无法访问"
 
-#: Model/Server.php:3522
+#: Model/Server.php:3622
 msgid "File has to be in .pem format."
 msgstr "文件必须是.pem格式"
 
-#: Model/Server.php:3888
+#: Model/Server.php:3988
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr "出了点问题, MISP尝试保存格式错误的配置文件, 设置更改已还原"
 
-#: Model/Server.php:4020
+#: Model/Server.php:4120
 msgid "Organisation logos"
 msgstr "组织徽标"
 
-#: Model/Server.php:4021
+#: Model/Server.php:4121
 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:4023
+#: Model/Server.php:4123
 msgid "48x48 pixel .png files"
 msgstr "48x48 像素的png 文件"
 
-#: Model/Server.php:4026;4041
+#: Model/Server.php:4126;4141
 msgid "Filename must be in the following format: *.png"
 msgstr "文件名必须使用以下格式：*.png"
 
-#: Model/Server.php:4030
+#: Model/Server.php:4130
 msgid "Additional image files"
 msgstr "附加图像文件"
 
-#: Model/Server.php:4031
+#: Model/Server.php:4131
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr "上传到这个目录中的图片文件可以用于各种用途, 如登录页面的logo"
 
-#: Model/Server.php:4038
+#: Model/Server.php:4138
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr "如果是内嵌式的, 则为text/html, 如果是下载式的, 则为传达使用条款的内容"
 
-#: Model/Server.php:4128
+#: Model/Server.php:4228
 msgid "Invalid server."
 msgstr "无效服务"
 
-#: Model/Server.php:4159
+#: Model/Server.php:4259
 msgid "Response was empty."
 msgstr "响应为空"
 
-#: Model/Server.php:4235
+#: Model/Server.php:4335
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr "错误: 服务器没有发送预期的响应, 这可能是因为远程服务器版本过旧."
 
-#: Model/Server.php:4501
+#: Model/Server.php:4604
 msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
 msgstr "% 下面的命令是一个建议, 可能不正确. 如果您不确定您在做什么, 请询问"
 
-#: Model/Server.php:4571
+#: Model/Server.php:4675
 msgid "Can't check database schema for Postgres database type"
 msgstr "无法检查Postgres数据库类型的数据库模式"
 
-#: Model/Server.php:4588
+#: Model/Server.php:4692
 msgid "Table `%s` does not exist"
 msgstr "表 `%s` 不存在"
 
-#: Model/Server.php:4615
+#: Model/Server.php:4719
 msgid "Column `%s` exists but should not"
 msgstr "列 `%s` 存在, 但不应该存在"
 
-#: Model/Server.php:4648
+#: Model/Server.php:4752
 msgid "Column `%s` is different"
 msgstr "列 `%s` 是不同的"
 
-#: Model/Server.php:4658
+#: Model/Server.php:4762
 msgid "Column `%s` does not exist but should"
 msgstr "列 `%s` 不存在, 但应该存在"
 
-#: Model/Server.php:4671
+#: Model/Server.php:4775
 msgid "Table `%s` is an additional table"
 msgstr "表`%s`是一个附加表"
 
-#: Model/Server.php:4695
+#: Model/Server.php:4799
 msgid "Column `%s` should be indexed"
 msgstr "列 `%s` 应该被索引"
 
-#: Model/Server.php:4718
+#: Model/Server.php:4822
 msgid "Column `%s` is indexed but should not"
 msgstr "列 `%s` 是索引, 但不应该是"
 
-#: Model/Server.php:5141
+#: Model/Server.php:5252
 msgid "Removing a dead worker."
 msgstr "移除已经死掉的worker"
 
-#: Model/Server.php:5142
+#: Model/Server.php:5253
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr "移除已经死掉的worker, worker的类型为%s pid为 %s"
 
-#: Model/Server.php:5146
+#: Model/Server.php:5257
 msgid "Stopping a worker."
 msgstr "停止运行worker"
 
-#: Model/Server.php:5147
+#: Model/Server.php:5258
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr "停止运行worker, worker的类型为%s pid为 %s"
 
-#: Model/Server.php:5449
+#: Model/Server.php:5560
 msgid "Invalid submodule."
 msgstr "无效的子模块."
 
-#: Model/Server.php:5449;5478
+#: Model/Server.php:5560;5589
 msgid "unknown"
 msgstr "未知的"
 
-#: Model/Server.php:5461
+#: Model/Server.php:5572
 msgid "update_after_pull"
 msgstr "update_after_pull"
 
-#: Model/Server.php:5462
+#: Model/Server.php:5573
 msgid "Updating: "
 msgstr "正在更新: "
 
-#: Model/Server.php:5593
+#: Model/Server.php:5717
 msgid "Invalid worker."
 msgstr "无效worker"
 
-#: Model/Server.php:5600
+#: Model/Server.php:5724
 msgid "Background workers not enabled."
 msgstr "后台worker没有启用"
 
-#: Model/Server.php:5607
+#: Model/Server.php:5731
 msgid "Invalid worker type."
 msgstr "无效worker类型"
 
-#: Model/Server.php:5787
+#: Model/Server.php:5911
 msgid "Could not reset the remote authentication key."
 msgstr "无法重置远程认证密钥"
 
-#: Model/Server.php:5864
+#: Model/Server.php:5988
 msgid "Could not parse JSON: "
 msgstr "无法解析JSON: "
 
-#: Model/Server.php:5884
+#: Model/Server.php:6008
 msgid "Could not reset fetch remote user account."
 msgstr "无法重置获取远程用户账户"
 
-#: Model/Server.php:5906
+#: Model/Server.php:6030
 msgid "No user object received in response."
 msgstr "没有收到响应的用户对象"
 
@@ -5164,7 +5436,7 @@ msgstr "谓语`%s`是专属的"
 
 #: Model/User.php:1254
 msgid "reset_all_sync_api_keys"
-msgstr "reset_all_sync_api_keys"
+msgstr ""
 
 #: Model/User.php:1255
 msgid "Reseting all API keys"
@@ -5210,6 +5482,10 @@ msgstr "亲爱的用户,\n\n"
 msgid "API key reset by administrator"
 msgstr "管理员重置API key"
 
+#: Model/UserSetting.php:321
+msgid "This endpoint expects both a setting and a value to be set."
+msgstr "此端点期望同时设置一个设置和一个值."
+
 #: Model/DecayingModelsFormulas/Polynomial.php:7
 msgid "The implementation of the decaying formula from the paper `An indicator scoring method for MISP platforms`."
 msgstr "论文`An indicator scoring method for MISP platforms`中衰减公式的实现"
@@ -5242,7 +5518,7 @@ msgstr "它有以下依赖项"
 
 #: View/Attributes/add.ctp:6
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "添加属性"
@@ -5269,8 +5545,8 @@ msgstr ""
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
 #: View/Events/add.ctp:33
-#: View/Feeds/add.ctp:178
-#: View/Feeds/edit.ctp:179
+#: View/Feeds/add.ctp:198
+#: View/Feeds/edit.ctp:199
 #: View/Objects/ajax/quickAddAttributeForm.ctp:69
 #: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
@@ -5279,7 +5555,7 @@ msgstr "共享组"
 #: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
 #: View/Attributes/edit.ctp:46
-#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:49
 #: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
 #: View/ShadowAttributes/add.ctp:28
@@ -5295,15 +5571,15 @@ msgstr "背景注释"
 msgid "for Intrusion Detection System"
 msgstr "入侵检测系统"
 
-#: View/Attributes/add.ctp:154
+#: View/Attributes/add.ctp:155
 msgid "Timezone missing, auto-detected as: "
 msgstr "时区丢失, 自动检测为: "
 
-#: View/Attributes/add.ctp:155
+#: View/Attributes/add.ctp:156
 msgid "The following value will be submited instead: "
 msgstr "下面的值将被替换为: "
 
-#: View/Attributes/add.ctp:163
+#: View/Attributes/add.ctp:164
 msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr "值不是一个有效的日期时间, 应如: YYY-MMY-MM-DDTHH:mm:ssZ"
 
@@ -5364,10 +5640,13 @@ msgstr "事件id"
 #: View/DecayingModel/decaying_tool_rest_search.ctp:24
 #: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
 #: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
+#: View/Users/admin_index.ctp:50
+#: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr "组织"
 
@@ -5426,7 +5705,7 @@ msgid "Values"
 msgstr "值"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:57
@@ -5445,10 +5724,10 @@ msgstr "替换属性"
 
 #: View/Attributes/attribute_replace.ctp:38
 msgid "Replaceattributes"
-msgstr "Replaceattributes"
+msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:80
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Elements/view_galaxy_matrix.ctp:76;211
 #: View/Elements/genericElements/Form/submitButton.ctp:8;25
@@ -5476,7 +5755,7 @@ msgstr "Replaceattributes"
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:67
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/UserSettings/set_setting.ctp:36
-#: View/Users/admin_add.ctp:97
+#: View/Users/admin_add.ctp:98
 #: View/Users/admin_edit.ctp:91
 #: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
@@ -5488,7 +5767,7 @@ msgid "Submit"
 msgstr "提交"
 
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditMassForm.ctp:89
 #: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/exportSearch.ctp:32
@@ -5497,6 +5776,7 @@ msgstr "提交"
 #: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
 #: View/Elements/view_galaxy_matrix.ctp:212
+#: View/Elements/genericElements/infoModal.ctp:40
 #: View/Elements/genericElements/Form/submitButton.ctp:13
 #: View/Elements/serverRuleElements/pull.ctp:73
 #: View/Elements/serverRuleElements/push.ctp:72
@@ -5587,7 +5867,7 @@ msgstr "警告：您将要分享敏感的数据(属性/目标数据). 请确保
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
 #: View/Users/statistics_data.ctp:19
-#: View/Users/statistics_orgs.ctp:34
+#: View/Users/statistics_orgs.ctp:36
 msgid "Attributes"
 msgstr "属性"
 
@@ -5638,10 +5918,7 @@ msgstr "所有属性的结果"
 #: 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;300
 #: View/Feeds/preview_index.ctp:14;89
-#: View/Galaxies/index.ctp:13;75
-#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
 #: View/Jobs/index.ctp:31;188
 #: View/Logs/admin_index.ctp:37;127
@@ -5666,7 +5943,6 @@ msgstr "所有属性的结果"
 #: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:32;106
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -5689,10 +5965,7 @@ msgstr "上一个"
 #: 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;302
 #: View/Feeds/preview_index.ctp:16;91
-#: View/Galaxies/index.ctp:15;77
-#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
 #: View/Jobs/index.ctp:33;190
 #: View/Logs/admin_index.ctp:39;129
@@ -5717,7 +5990,6 @@ msgstr "上一个"
 #: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:34;108
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -5746,7 +6018,6 @@ msgstr "日期"
 #: View/Elements/global_menu.ctp:94
 #: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
-#: View/Galaxies/index.ctp:2
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr "星系"
@@ -5779,12 +6050,12 @@ msgstr "订阅源命中"
 #: View/Elements/eventattribute.ctp:165
 #: View/Events/view.ctp:252
 msgid "Sightings"
-msgstr "Sightings"
+msgstr ""
 
 #: View/Attributes/index.ctp:62
 #: View/Elements/eventattribute.ctp:166
 #: View/Events/view.ctp:262
-#: View/GalaxyClusters/ajax/index.ctp:48
+#: View/GalaxyClusters/ajax/index.ctp:52
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr "活动"
@@ -5794,7 +6065,7 @@ msgstr "活动"
 #: View/Elements/eventattribute.ctp:184
 #: View/Elements/Events/eventIndexTable.ctp:60
 #: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/genericElements/IndexTable/headers.ctp:31
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
 #: View/Elements/templateElements/templateRowAttribute.ctp:94
@@ -5803,10 +6074,7 @@ msgstr "活动"
 #: View/EventBlacklists/index.ctp:55
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/index.ctp:112
 #: View/Feeds/preview_index.ctp:45
-#: View/Galaxies/index.ctp:27
-#: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
 #: View/ObjectTemplates/index.ctp:72
@@ -5842,10 +6110,7 @@ msgstr "操作"
 #: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:293
 #: View/Feeds/preview_index.ctp:81
-#: View/Galaxies/index.ctp:68
-#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
 #: View/Jobs/index.ctp:181
 #: View/Logs/admin_index.ctp:120
@@ -5870,7 +6135,6 @@ msgstr "操作"
 #: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:99
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -5961,13 +6225,12 @@ msgstr "您确定要软删除属性#%s吗? 该属性只会被软删除, 这意
 #: View/Elements/Events/eventIndexTable.ctp:234
 #: View/Elements/TagCollections/index_row.ctp:45
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:597
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventBlacklists/index.ctp:70
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:283
-#: View/Galaxies/index.ctp:58
+#: View/Feeds/index.ctp:292
 #: View/News/index.ctp:24
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/ObjectTemplates/index.ctp:125
@@ -5984,106 +6247,6 @@ msgstr "您确定要软删除属性#%s吗? 该属性只会被软删除, 这意
 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/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70
-#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: 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:92
-#: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
-#: 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/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: 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:70;224
-#: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:191
-#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:33
-#: 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:92
-#: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
-#: 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
@@ -6117,9 +6280,10 @@ msgstr "请勿更改当前设置"
 #: View/Events/resolved_attributes.ctp:51
 #: View/Events/resolved_misp_format.ctp:98;293
 #: View/Events/view.ctp:159
-#: View/Feeds/add.ctp:169
-#: View/Feeds/edit.ctp:171
+#: View/Feeds/add.ctp:189
+#: View/Feeds/edit.ctp:191
 #: View/Feeds/freetext_index.ctp:36
+#: View/Feeds/index.ctp:184
 #: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
 #: View/Objects/revise_object.ctp:35;69
@@ -6135,23 +6299,27 @@ msgstr "分布"
 msgid "For Intrusion Detection System"
 msgstr "用于入侵检测系统"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+#: View/Attributes/ajax/attributeEditMassForm.ctp:38
+msgid "Create proposals"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:48
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr "将此字段留空, 以保持所选属性的注释字段不被更改"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
 msgid "Tags to <b>remove</b>"
 msgstr "<b>删除</b>标签"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:63
 msgid "Tags to <b>add</b>"
 msgstr "<b>添加</b>标签"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
 msgid "Clusters to <b>remove</b>"
 msgstr "<b>删除</b>星团"
 
-#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+#: View/Attributes/ajax/attributeEditMassForm.ctp:74
 msgid "Clusters to <b>add</b>"
 msgstr "<b>添加</b>星团"
 
@@ -6241,12 +6409,16 @@ msgid "Unvetted"
 msgstr "未经审查"
 
 #: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
 #: View/EventBlacklists/index.ctp:35
 #: View/EventDelegations/index.ctp:41
 #: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
 #: View/Feeds/preview_index.ctp:25
 #: View/Feeds/search_caches.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:40
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
 #: View/ObjectTemplates/index.ctp:47
 #: View/Organisations/index.ctp:75
 #: View/Servers/preview_index.ctp:64
@@ -6254,31 +6426,41 @@ msgstr "未经审查"
 #: View/Sightingdb/index.ctp:10
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:81
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
 msgid "Filter"
 msgstr "筛选器"
 
 #: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
 #: View/Elements/eventattributetoolbar.ctp:231
 #: View/EventBlacklists/index.ctp:36
 #: View/EventDelegations/index.ctp:42
 #: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
 #: View/Feeds/preview_index.ctp:26
 #: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
 #: View/ObjectTemplates/index.ctp:48
 #: View/Organisations/index.ctp:76
 #: View/Servers/preview_index.ctp:65
 #: View/ShadowAttributes/index.ctp:38
 #: View/Sightingdb/index.ctp:11
-#: View/Users/admin_index.ctp:82
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
 msgid "Enter value to search"
 msgstr "输入要搜索的值"
 
 #: View/Communities/index.ctp:34
 #: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
 #: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
 #: View/Feeds/search_caches.ctp:35
 #: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
 #: View/ObjectTemplates/view.ctp:3
 #: View/Organisations/view.ctp:5
 #: View/Pages/doc/administration.ctp:180;221;236
@@ -6287,7 +6469,9 @@ msgstr "输入要搜索的值"
 #: View/Taxonomies/view.ctp:4
 #: View/Templates/view.ctp:4
 #: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
 #: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
 #: View/Users/view.ctp:3
 #: View/Warninglists/view.ctp:9
 msgid "Id"
@@ -6306,6 +6490,8 @@ msgid "Community name"
 msgstr "社区名称"
 
 #: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
 #: View/DecayingModel/index.ctp:89
 #: View/DecayingModel/view.ctp:21
 #: View/Elements/Servers/View/row_object.ctp:24
@@ -6319,8 +6505,10 @@ msgstr "社区名称"
 #: View/Elements/templateElements/templateRowAttribute.ctp:21
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:26
-#: View/Galaxies/view.ctp:20
-#: View/GalaxyClusters/view.ctp:17
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
 #: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:22;113;210
 #: View/Objects/group_attributes_into_object.ctp:8
@@ -6342,10 +6530,18 @@ msgid "Description"
 msgstr "描述"
 
 #: View/Communities/index.ctp:63
+msgid "Self-reg"
+msgstr ""
+
+#: View/Communities/index.ctp:66
+msgid "This community allows for self-registration"
+msgstr ""
+
+#: View/Communities/index.ctp:71
 msgid "Communities index"
 msgstr "社区索引"
 
-#: View/Communities/index.ctp:64
+#: View/Communities/index.ctp:72
 msgid "You can find a list of communities below that chose to advertise their existence to the general MISP user-base. Requesting access to any of those communities is of course no guarantee of being permitted access, it is only meant to simplify the means of finding the various communities that one may be eligible for. Get in touch with the MISP project maintainers if you would like your community to be included in the list."
 msgstr "您可以在下面找到一个社区列表, 这些社区选择向普通MISP用户群宣传它们的存在. 请求访问那些社区中的任何一个不能保证被允许访问, 这仅是为了简化寻找可能符合条件的各个社区的方法. 如果您希望将社区包括在列表中, 请与MISP项目维护者联系."
 
@@ -6379,7 +6575,7 @@ msgstr "给社区主办单位的信息"
 
 #: View/Communities/request_access.ctp:37
 msgid "PGP public key"
-msgstr "PGP public key"
+msgstr ""
 
 #: View/Communities/request_access.ctp:44
 msgid "Request sync access"
@@ -6414,9 +6610,11 @@ msgid "Message:"
 msgstr "信息: "
 
 #: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
 #: View/Elements/Events/View/row_object.ctp:72
 #: View/Events/resolved_misp_format.ctp:93;288
-#: View/GalaxyClusters/view.ctp:19
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
 #: View/ObjectTemplates/index.ctp:66
 #: View/ObjectTemplates/view.ctp:6
 #: View/Objects/revise_object.ctp:68
@@ -6433,16 +6631,19 @@ msgid "UUID"
 msgstr "UUID"
 
 #: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
 #: View/DecayingModel/index.ctp:88
 #: View/DecayingModel/view.ctp:14
 #: View/Elements/Servers/View/row_object.ctp:19
 #: View/Elements/templateElements/templateRowAttribute.ctp:12
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
 #: View/Feeds/search_caches.ctp:47
 #: View/Feeds/view.ctp:4
-#: View/Galaxies/view.ctp:14
-#: View/GalaxyClusters/view.ctp:13
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
 #: View/ObjectTemplates/view.ctp:4
 #: View/Objects/add.ctp:206
 #: View/Objects/revise_object.ctp:27
@@ -6454,7 +6655,7 @@ msgstr "UUID"
 #: View/SharingGroups/view.ctp:42;67
 #: View/Sightingdb/index.ctp:51
 #: View/Templates/view.ctp:9
-#: View/Users/statistics_orgs.ctp:31
+#: View/Users/statistics_orgs.ctp:33
 #: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "名称"
@@ -6478,7 +6679,7 @@ msgstr "经过MISP-project审查"
 #: View/Users/admin_edit.ctp:64
 #: View/Users/admin_view.ctp:72
 #: View/Users/edit.ctp:23
-#: View/Users/view.ctp:31
+#: View/Users/view.ctp:32
 msgid "GnuPG key"
 msgstr "GnuPG 密钥"
 
@@ -6487,10 +6688,105 @@ msgid "Community "
 msgstr "社区"
 
 #: View/Communities/view.ctp:51
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:617
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
 msgid "Request Access"
 msgstr "请求访问"
 
+#: View/Dashboards/add.ctp:17
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+msgid "Add Widget"
+msgstr ""
+
+#: View/Dashboards/add.ctp:43
+#: View/Dashboards/edit.ctp:25
+#: View/Dashboards/import.ctp:14
+msgid "Config"
+msgstr ""
+
+#: View/Dashboards/edit.ctp:17
+msgid "Edit Widget"
+msgstr ""
+
+#: View/Dashboards/export.ctp:3
+msgid "Export Dashboard Settings"
+msgstr ""
+
+#: View/Dashboards/export.ctp:6
+msgid "Simply copy and share your dashboard settings below. Make sure that you sanitise it so that you do not share anything sensitive. Simply click on the JSON below to select it."
+msgstr ""
+
+#: View/Dashboards/export.ctp:9
+msgid "Dashboard settings"
+msgstr ""
+
+#: View/Dashboards/import.ctp:6
+msgid "Import Dashboard Configuration"
+msgstr ""
+
+#: View/Dashboards/import.ctp:22
+msgid "Import a configuration JSON as exported from another MISP instance."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:31
+#: View/Sightingdb/index.ctp:55
+msgid "Owner"
+msgstr "所有者"
+
+#: View/Dashboards/list_templates.ctp:47
+msgid "Widgets Used"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:52
+#: View/Dashboards/save_template.ctp:52
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr "可选的"
+
+#: View/Dashboards/list_templates.ctp:58
+#: View/Dashboards/save_template.ctp:59
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr "默认"
+
+#: View/Dashboards/list_templates.ctp:64
+msgid "Dashboard Templates Index"
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:65
+msgid "Users can create and save dashboard templates. Additionally, administrators can create selectable templates for the community and select a default to be used by new users."
+msgstr ""
+
+#: View/Dashboards/list_templates.ctp:86
+msgid "Are you sure you want to remove this dashboard template?"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:6
+msgid "Save Dashboard Template"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:14
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr "模板名称"
+
+#: View/Dashboards/save_template.ctp:28
+msgid "Restrict to organisation"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:36
+msgid "Restrict to role"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:44
+msgid "Restrict to role permission flag"
+msgstr ""
+
+#: View/Dashboards/save_template.ctp:67
+msgid "Save your current dashboard state as a template for others to reuse."
+msgstr ""
+
 #: View/DecayingModel/add.ctp:4
 msgid " Decaying Model"
 msgstr "衰减模型"
@@ -6509,7 +6805,7 @@ msgstr "天"
 
 #: View/DecayingModel/add.ctp:46;56;65
 msgid "float"
-msgstr "float"
+msgstr ""
 
 #: View/DecayingModel/add.ctp:65
 msgid "Default base_score"
@@ -6605,8 +6901,8 @@ msgstr "模型设置"
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/EventBlacklists/edit.ctp:37
 #: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:200
-#: View/Feeds/index.ctp:282
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
 #: View/News/index.ctp:22
 #: View/OrgBlacklists/edit.ctp:30
 #: View/OrgBlacklists/index.ctp:36
@@ -6698,6 +6994,7 @@ msgstr "应用基础分数"
 #: View/Events/show_i_o_c_results.ctp:12
 #: View/Feeds/freetext_index.ctp:32
 #: View/Feeds/search_caches.ctp:41
+#: View/Inbox/index.ctp:25
 #: View/Objects/revise_object.ctp:64
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
@@ -6709,7 +7006,7 @@ msgstr "应用基础分数"
 #: 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:36
+#: View/Users/statistics_orgs.ctp:38
 #: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr "类型"
@@ -6723,6 +7020,7 @@ msgstr "类型"
 #: View/Events/resolved_misp_format.ctp:92;287
 #: View/Events/show_i_o_c_results.ctp:13
 #: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
 #: View/Noticelists/view.ctp:42
 #: View/Objects/add.ctp:115
 #: View/Objects/group_attributes_into_object.ctp:58
@@ -6743,12 +7041,14 @@ msgstr "时间标签"
 #: View/DecayingModel/decaying_tool_rest_search.ctp:31
 #: View/Events/resolved_attributes.ctp:52
 #: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
 #: View/ObjectReferences/ajax/add.ctp:30
 #: View/Objects/add.ctp:67;119
 #: View/Objects/group_attributes_into_object.ctp:30
 #: View/Objects/revise_object.ctp:49;67
 #: View/Pages/doc/using_the_system.ctp:234;284
 #: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
 msgid "Comment"
 msgstr "评论"
 
@@ -6767,7 +7067,7 @@ msgid "Decaying Model RestSearch"
 msgstr "衰减模型RestSearch"
 
 #: View/DecayingModel/decaying_tool_simulation.ctp:45
-#: View/Events/automation.ctp:14
+#: View/Events/automation.ctp:24
 #: View/Logs/admin_index.ctp:20;21
 #: View/Logs/admin_search.ctp:25
 msgid "Search"
@@ -6845,7 +7145,7 @@ msgstr "JSON文件"
 #: View/Elements/genericElements/org_picker.ctp:17
 #: View/EventBlacklists/add.ctp:36
 #: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:200
+#: View/Feeds/add.ctp:220
 #: View/Feeds/import_feeds.ctp:20
 #: View/OrgBlacklists/add.ctp:29
 #: View/Regexp/admin_add.ctp:32
@@ -6922,7 +7222,7 @@ msgstr "# 分配的类型"
 
 #: View/DecayingModel/index.ctp:97
 #: View/DecayingModel/view.ctp:25
-#: View/Galaxies/view.ctp:22
+#: View/Galaxies/view.ctp:10
 #: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
 #: View/Warninglists/view.ctp:12
@@ -6932,6 +7232,7 @@ msgstr "版本"
 #: View/DecayingModel/index.ctp:98
 #: View/DecayingModel/view.ctp:31
 #: View/Events/view.ctp:310
+#: View/Feeds/index.ctp:91
 #: View/Feeds/view.ctp:63
 #: View/Noticelists/index.ctp:63
 #: View/ObjectTemplates/index.ctp:35
@@ -7045,7 +7346,6 @@ msgstr "查看全部"
 #: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all"
 msgstr "全选"
 
@@ -7086,7 +7386,7 @@ msgstr "相关标签"
 #: View/Elements/eventattribute.ctp:171
 #: View/Elements/eventattributetoolbar.ctp:185
 msgid "SightingDB"
-msgstr "SightingDB"
+msgstr ""
 
 #: View/Elements/eventattribute.ctp:178
 msgid "Decaying Score"
@@ -7097,8 +7397,7 @@ msgid "Attribute warning: This event doesn't have any attributes visible to you.
 "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 "属性警告: 这个事件没有任何属性对您来说是可见的. 要么是事件的所有者决定将该事件\n"
-"的每个属性都有一个特定的分发方案, 并且希望仍然单独分发事件的通知或潜在贡献的属性不受此限制. 或者所有者忘记了添加属性或适当的分配级别."
-"如果您认为有误, 或者您可以根据事件元信息贡献属性, 请随时提出建议."
+"的每个属性都有一个特定的分发方案, 并且希望仍然单独分发事件的通知或潜在贡献的属性不受此限制. 或者所有者忘记了添加属性或适当的分配级别.如果您认为有误, 或者您可以根据事件元信息贡献属性, 请随时提出建议."
 
 #: View/Elements/eventattribute.ctp:231
 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"
@@ -7114,6 +7413,8 @@ msgstr "显示所有属性"
 
 #: View/Elements/eventattributetoolbar.ctp:6
 #: View/Elements/Events/eventIndexTable.ctp:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
 #: View/Jobs/index.ctp:13;65
 #: View/ObjectTemplates/index.ctp:40
 #: View/Regexp/admin_add.ctp:17
@@ -7151,7 +7452,7 @@ msgstr "只显示潜在的误报属性"
 
 #: View/Elements/eventattributetoolbar.ctp:41
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr "警告"
@@ -7239,7 +7540,7 @@ msgstr "显示SightingDB查询结果"
 
 #: View/Elements/eventattributetoolbar.ctp:192
 msgid "Show attribute context fields"
-msgstr "显示属性上下文字段"
+msgstr "显示属性环境字段"
 
 #: View/Elements/eventattributetoolbar.ctp:194
 msgid "Context"
@@ -7263,11 +7564,9 @@ msgstr "%s 有效规则"
 
 #: View/Elements/eventattributetoolbar.ctp:235
 #: View/Events/index.ctp:65
-#: View/GalaxyClusters/ajax/index.ctp:35
 #: View/Logs/admin_index.ctp:62
 #: View/Servers/preview_index.ctp:57
 #: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:74
 msgid "Remove filters"
 msgstr "移除过滤器"
 
@@ -7456,14 +7755,14 @@ msgid "Event Actions"
 msgstr "事件动作"
 
 #: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:221;264
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: 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:226;270
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
 #: View/Events/add.ctp:7
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
@@ -7471,80 +7770,80 @@ msgid "Add Event"
 msgstr "添加事件"
 
 #: View/Elements/global_menu.ctp:23
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:289
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: 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:294
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: 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:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr "REST客户端"
 
 #: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:310
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "查看提案"
 
 #: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr "有提案的事件"
 
 #: View/Elements/global_menu.ctp:47
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:320
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
 msgid "View delegation requests"
 msgstr "查看授权请求"
 
 #: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:861
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "列出标签"
 
 #: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr "列出标签集"
 
 #: View/Elements/global_menu.ctp:61
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:866
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr "添加标签"
 
 #: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:895
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr "列出分类"
 
 #: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:923
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "列出模板"
 
 #: View/Elements/global_menu.ctp:74
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:928
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "添加模板"
 
 #: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
@@ -7552,7 +7851,7 @@ msgid "Export"
 msgstr "导出"
 
 #: View/Elements/global_menu.ctp:86
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -7562,7 +7861,7 @@ msgid "Automation"
 msgstr "自动化"
 
 #: View/Elements/global_menu.ctp:98
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1086
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr "列出星系"
 
@@ -7590,7 +7889,7 @@ msgid "Signature Whitelist"
 msgstr "签名白名单"
 
 #: View/Elements/global_menu.ctp:128
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:378
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr "列表警告列表"
 
@@ -7611,45 +7910,45 @@ msgid "News"
 msgstr "消息"
 
 #: View/Elements/global_menu.ctp:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:457
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "我的个人资料"
 
 #: View/Elements/global_menu.ctp:151
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
 msgid "My Settings"
 msgstr "我的设置"
 
 #: View/Elements/global_menu.ctp:155
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:467;699
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
 msgid "Set Setting"
 msgstr "设定设置"
 
 #: View/Elements/global_menu.ctp:159
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:471
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "仪表板"
 
 #: View/Elements/global_menu.ctp:168
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:490
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "角色权限"
 
 #: View/Elements/global_menu.ctp:175
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1130
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr "列出对象模板"
 
 #: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:507
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr "列表共享组"
 
 #: View/Elements/global_menu.ctp:186
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr "添加共享组"
 
@@ -7658,12 +7957,12 @@ msgid "Decaying Models Tool"
 msgstr "衰减模型工具"
 
 #: View/Elements/global_menu.ctp:199
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:977
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
 msgid "List Decaying Models"
 msgstr "列出衰减模型"
 
 #: View/Elements/global_menu.ctp:206
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:520
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
@@ -7675,12 +7974,12 @@ msgid "Categories & Types"
 msgstr "类别和类型"
 
 #: View/Elements/global_menu.ctp:214
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:524
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr "条款与条件"
 
 #: View/Elements/global_menu.ctp:218
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:528
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -7710,28 +8009,28 @@ msgid "Sync Actions"
 msgstr "同步操作"
 
 #: View/Elements/global_menu.ctp:240
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:536
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr "创建同步配置"
 
 #: View/Elements/global_menu.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:542
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr "导入服务器设置"
 
 #: View/Elements/global_menu.ctp:250
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "列出服务器"
 
 #: View/Elements/global_menu.ctp:255
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:998
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr "列出订阅源"
 
 #: View/Elements/global_menu.ctp:260
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1002
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr "搜索订阅源缓存"
 
@@ -7744,7 +8043,7 @@ msgid "Add SightingDB Connection"
 msgstr "添加SightingDB连接"
 
 #: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:612
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
 msgid "List Communities"
 msgstr "社区列表"
 
@@ -7759,7 +8058,7 @@ msgid "Administration"
 msgstr "管理界面"
 
 #: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:687
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "列出用户"
@@ -7774,93 +8073,97 @@ msgid "Set User Setting"
 msgstr "设定用户设置"
 
 #: View/Elements/global_menu.ctp:300
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:682
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr "添加用户"
 
 #: View/Elements/global_menu.ctp:304
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:704
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "联系用户"
 
-#: View/Elements/global_menu.ctp:311
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:477;739
+#: View/Elements/global_menu.ctp:308
+msgid "User Registrations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr "列出组织"
 
-#: View/Elements/global_menu.ctp:315
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr "添加组织"
 
-#: View/Elements/global_menu.ctp:322
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "列出角色"
 
-#: View/Elements/global_menu.ctp:326
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr "添加角色"
 
-#: View/Elements/global_menu.ctp:334
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr "服务器设置和维护"
 
-#: View/Elements/global_menu.ctp:343
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:768
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "作业"
 
-#: View/Elements/global_menu.ctp:352
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:774
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:361
+#: View/Elements/global_menu.ctp:365
 msgid "Blacklist Event"
 msgstr "黑名单事件"
 
-#: View/Elements/global_menu.ctp:366
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
 msgid "Manage Event Blacklists"
 msgstr "管理事件黑名单"
 
-#: View/Elements/global_menu.ctp:375
+#: View/Elements/global_menu.ctp:379
 msgid "Blacklist Organisation"
 msgstr "黑名单组织"
 
-#: View/Elements/global_menu.ctp:380
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:798
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
 msgid "Manage Org Blacklists"
 msgstr "管理组织黑名单"
 
-#: View/Elements/global_menu.ctp:388
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "审计"
 
-#: View/Elements/global_menu.ctp:392
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "列出日志"
 
-#: View/Elements/global_menu.ctp:396
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:811
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "搜索日志"
 
-#: View/Elements/global_menu.ctp:424
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "注销"
@@ -7883,7 +8186,8 @@ msgstr "每个组织的属性"
 
 #: View/Elements/view_event_distribution_graph.ctp:9
 #: View/Elements/view_timeline.ctp:23
-#: View/Layouts/default.ctp:92
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "载入中"
@@ -7918,7 +8222,6 @@ msgstr "显示"
 #: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
 #: View/Servers/preview_index.ctp:50
-#: View/Users/admin_index.ctp:67
 msgid "Filters"
 msgstr "筛选器"
 
@@ -7945,6 +8248,7 @@ msgid "Time scope"
 msgstr "时间范围"
 
 #: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
+#: View/Feeds/index.ctp:190
 #: View/Taxonomies/view.ctp:83
 msgid "Tag"
 msgstr "标签"
@@ -7976,7 +8280,6 @@ msgstr "选择属性"
 
 #: View/Elements/Events/eventIndexTable.ctp:5
 #: View/EventBlacklists/index.ctp:47
-#: View/Feeds/index.ctp:90
 msgid "Select all events on current page"
 msgstr "选择当前页面上的所有事件"
 
@@ -7992,7 +8295,7 @@ msgstr "星团"
 #: View/Elements/Events/eventIndexTable.ctp:39
 #: View/Pages/doc/using_the_system.ctp:165
 msgid "#Attr."
-msgstr "#Attr."
+msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:41
 msgid "Correlation Count"
@@ -8000,7 +8303,7 @@ msgstr "关联数量"
 
 #: View/Elements/Events/eventIndexTable.ctp:41
 msgid "#Corr."
-msgstr "#Corr."
+msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:44
 msgid "Sigthing Count"
@@ -8008,7 +8311,7 @@ msgstr "观察数量"
 
 #: View/Elements/Events/eventIndexTable.ctp:44
 msgid "#Sightings"
-msgstr "#Sightings"
+msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:47
 msgid "Proposal Count"
@@ -8016,7 +8319,7 @@ msgstr "提案数量"
 
 #: View/Elements/Events/eventIndexTable.ctp:47
 msgid "#Prop"
-msgstr "#Prop"
+msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:50
 msgid "Post Count"
@@ -8024,7 +8327,7 @@ msgstr "帖子数量"
 
 #: View/Elements/Events/eventIndexTable.ctp:50
 msgid "#Posts"
-msgstr "#Posts"
+msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:53
 #: View/Events/proposal_event_index.ctp:27
@@ -8033,7 +8336,9 @@ msgstr "#Posts"
 #: 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_index.ctp:63
 #: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
 #: View/Users/view.ctp:4
 msgid "Email"
 msgstr "电子邮件"
@@ -8044,8 +8349,6 @@ msgstr "电子邮件"
 #: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
 #: View/Events/proposal_event_index.ctp:45;49
 #: View/Feeds/preview_index.ctp:73
-#: View/Galaxies/index.ctp:59
-#: View/GalaxyClusters/ajax/index.ctp:81
 #: View/Noticelists/index.ctp:66
 #: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
@@ -8071,7 +8374,7 @@ msgid "NEW"
 msgstr "新建"
 
 #: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr "发布事件"
 
@@ -8085,7 +8388,7 @@ msgid "Not published"
 msgstr "未发布"
 
 #: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:61;364;431;598;674
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
 #: View/Servers/index.ctp:183
 msgid "Are you sure you want to delete # %s?"
 msgstr "您确定要删除 # %s 吗？"
@@ -8292,11 +8595,11 @@ msgstr "十六进制表示法"
 msgid "Switch to binary representation"
 msgstr "转换为二进制表示法"
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid "Warning, this doesn't seem to be a legitimate "
 msgstr "警告, 这似乎不是一个合法的方法"
 
-#: View/Elements/Events/View/value_field.ctp:87
+#: View/Elements/Events/View/value_field.ctp:96
 msgid " value"
 msgstr " 值"
 
@@ -8399,11 +8702,11 @@ msgstr "状态"
 #: View/Elements/genericElements/key.ctp:2
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:233;240;247;268;275
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
 #: View/Events/view.ctp:191
-#: View/GalaxyClusters/view.ctp:32
+#: View/GalaxyClusters/view.ctp:12
 #: View/Taxonomies/view.ctp:108;119;164
 #: View/Users/admin_view.ctp:95
 msgid "N/A"
@@ -8437,8 +8740,10 @@ msgstr "下载配置"
 
 #: View/Elements/Users/userIndexTable.ctp:5
 #: View/Roles/view.ctp:24
+#: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
 #: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
 #: View/Users/admin_view.ctp:25
 #: View/Users/view.ctp:6
 msgid "Role"
@@ -8452,15 +8757,17 @@ msgstr "上次登录"
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
 #: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
 msgid "Created"
 msgstr "已创建"
 
 #: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 msgid "Create new credentials and inform user"
 msgstr "创建新凭据并通知用户"
 
 #: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr "您确定要删除 # %s吗？强烈建议禁用用户而非删除用户."
 
@@ -8497,488 +8804,599 @@ msgstr "带有建议的活动: "
 msgid "Delegation requests: "
 msgstr "授权请求: "
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;91
+#: View/Elements/dashboard/widget.ctp:17
+msgid "Configure widget"
+msgstr ""
+
+#: View/Elements/dashboard/widget.ctp:21
+msgid "Remove widget"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/BarChart.ctp:38
+msgid "No data."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Feeds/add.ctp:213
+#: View/Feeds/edit.ctp:213
+msgid "Filter rules"
+msgstr "筛选规则"
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Feeds/view.ctp:55
+#: View/Servers/index.ctp:120;121
+msgid "Rules"
+msgstr "规则"
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
+msgid "Age: "
+msgstr "年龄: "
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
+#: View/Servers/index.ctp:149
+msgid "Not cached"
+msgstr "未被缓存"
+
+#: View/Elements/genericElements/IndexTable/Fields/caching.ctp:28;29
+msgid "Cache feed"
+msgstr "缓存订阅源"
+
+#: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr "点击此处"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:9
+msgid "Error: Invalid event!"
+msgstr "错误: 无效事件!"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:17
+msgid "Fixed event %s"
+msgstr "固定事件 %s"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:20
+msgid "New fixed event"
+msgstr "新的固定事件"
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:26
+msgid "New event each pull can lead to potentially endlessly growing correlation tables. Only use this setting if you are sure that the data in the feed will mostly be completely distinct between each individual pull, otherwise use fixed events. Generally this setting is NOT recommended."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:27
+msgid "New event each pull"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/target_event.ctp:32
+msgid "Feed not enabled"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+msgid "View Dashboard"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+msgid "Import Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+msgid "Export Config JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "Save Dashboard Config"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+msgid "List Dashboard Templates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
 msgid "Populate From Template"
 msgstr "从模板中填充"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
 msgid "Enrichment Module Result"
 msgstr "丰富模块结果"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr "Freetext导入结果"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:39
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr "查看事件"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:44;887;1116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr "查看关联图"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr "查看事件历史"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:56
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
 #: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr "编辑事件"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:60
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr "删除事件"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr "添加对象"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:79
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr "添加附件"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
 msgid "Populate from..."
 msgstr "从...填充"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:99
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr "丰富事件"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
 msgid "Merge attributes from..."
 msgstr "从...合并属性"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr "提案属性"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr "提案附件"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr "发布(无电子邮件)"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:144
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr "取消发布"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
 msgid "Publish Sightings"
 msgstr "发布观察"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr "授权观察"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr "接受授权请求"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr "将事件发布到 ZMQ"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:191
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr "您确定要重新发布当前事件到 ZMQ 频道吗？"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:200
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr "将活动发布到 Kafka"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr "您确定要重新发布当前事件到 Kafka 主题吗？"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:208
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr "联系报告者"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:216;303
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
 msgid "Download as..."
 msgstr "下载为..."
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239;244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr "添加标签集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:251
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr "导出标签集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr "导入标签集"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:277
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr "从…导入"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr "列出Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr "新建Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:351
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr "在现有的基础上进行"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:352
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:359
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr "编辑Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr "删除Regexp"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr "查看警告列表"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr "更新警告列表"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:385
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr "您确定要更新所有警告列表吗？"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:393
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr "查看通知列表"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr "列出通知列表"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:403
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr "更新通知列表"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:404
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr "您想要继续并更新所有的通知列表吗？"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:414
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Whitelist"
 msgstr "列出白名单"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:419
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
 msgid "New Whitelist"
 msgstr "新白名单"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
 msgid "Edit Whitelist"
 msgstr "编辑白名单"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:430
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
 msgid "Delete Whitelist"
 msgstr "删除白名单"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:440
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr "编辑我的个人资料"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:444
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:451;649
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
 msgid "Reset Password"
 msgstr "重置密码"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:484;733
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr "查看组织"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:496
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
 msgid "Edit Sharing Group"
 msgstr "编辑共享组"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:501
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr "查看共享组"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:551;581
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr "探索远程服务器"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:559
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr "探索远程事件"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:570;1056
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr "获取此事件"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:571;1057
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
 #: 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:589
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
 #: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr "编辑服务器"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr "新建服务器"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:622
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
 msgid "View community"
 msgstr "查看社区"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:630
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
 msgid "Request E-mail"
 msgstr "请求电子邮件"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:642
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr "查看用户"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:654
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr "编辑用户"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:659
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr "删除用户"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:668
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr "编辑角色"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr "删除角色"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:694
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+msgid "Pending registrations"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
 msgid "User settings"
 msgstr "用户设置"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:712
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr "添加组织"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:718
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr "编辑组织"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:726
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr "合并组织"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:745
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+msgid "Delete Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
 #: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr "添加角色"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:781
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
 msgid "Blacklists Event"
 msgstr "黑名单事件"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:793
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
 msgid "Blacklists Organisation"
 msgstr "黑名单上的组织"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:820;834
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr "查看话题"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:825
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr "添加帖子"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:839
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr "编辑帖子"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:845
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr "列出话题"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:849
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr "新话题"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:857
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr "列出最喜欢的标签"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:873
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr "编辑标签"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:881;900
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr "查看分类"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:908
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr "删除分类"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:915
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr "更新分类"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:935
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr "查看模板"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:941
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr "编辑模板"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:952
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
 msgid "Update Default Models"
 msgstr "更新默认模型"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:957
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
 msgid "Force Update Default Models"
 msgstr "强制更新默认模型"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:962
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
 msgid "Import Decaying Model"
 msgstr "导入衰减模型"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:967
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
 msgid "Add Decaying Model"
 msgstr "添加衰减模型"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:971
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
 msgid "Decaying Tool"
 msgstr "衰减工具"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
 msgid "View Decaying Model"
 msgstr "查看衰减模型"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:989
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
 msgid "Edit Decaying Model"
 msgstr "编辑衰减模型"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1007
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr "添加订阅源"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr "从 JSON 导入订阅源"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1018
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr "订阅源重叠分析矩阵"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1023
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr "导出订阅源设置"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr "编辑订阅源"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1036
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr "查看订阅源"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1042
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr "预览索引"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1048
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr "预览事件"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1066
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr "查看消息"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1071
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr "添加新项"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1077
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr "编辑新建项"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1092
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr "更新星系"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1093
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr "您确定您要从子模块中重新导入所有星系吗?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1098
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr "强制更新星系"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1099
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr "您确定要把所有星系从子模块中删除并重新导入吗?"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1106;1122
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr "查看星系"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1111
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr "查看星团"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1135
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr "更新对象"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1141
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr "查看对象模板"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1149
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
 #: View/Sightingdb/add.ctp:6
 msgid "Add SightingDB connection"
 msgstr "添加SightingDB连接"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1157
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
 msgid "Edit SightingDB connection"
 msgstr "编辑SightingDB连接"
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1162
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
 msgid "List SightingDB connections"
 msgstr "列出SightingDB连接"
 
@@ -9008,7 +9426,7 @@ msgid "Fix Database Index Schema"
 msgstr "修复数据库索引模式"
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:234
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
 msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
 msgstr "执行此查询可能需要一些时间, 并且可能会损害数据库. 请查看以下查询, 或在有疑问时备份数据库。"
 
@@ -9016,7 +9434,7 @@ msgstr "执行此查询可能需要一些时间, 并且可能会损害数据库.
 msgid "The current database schema does not match the expected format."
 msgstr "当前的数据库模式不符合预期的格式"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;131
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
 msgid "Database schema diagnostic: "
 msgstr "数据库模式诊断"
 
@@ -9044,52 +9462,52 @@ msgstr "预期模式"
 msgid "Actual schema"
 msgstr "实际模型"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:118
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
 msgid "Fix Database schema"
 msgstr "修复数据库模式"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:130
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
 msgid "The current database is correct"
 msgstr "目前的数据库是正确的"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:141
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
 msgid "Expected DB_version: "
 msgstr "预期DB_version:"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:145
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
 msgid "The current database version matches the expected one"
 msgstr "当前的数据库版本与预期的版本一致"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:146;151
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
 msgid "Actual DB_version: "
 msgstr "实际DB_version:"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:150
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
 msgid "The current database version does not match the expected one"
 msgstr "当前的数据库版本与预期的版本不一致"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
 msgid "Updates are locked"
 msgstr "更新被锁定"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:158;162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
 msgid "Updates are not locked"
 msgstr "更新未被锁定"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 #: View/Servers/update_progress.ctp:32
 msgid "Updates are locked due to to many update fails"
 msgstr "由于多次更新失败, 更新被锁定"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 msgid "Updates unlocked in %s"
 msgstr "更新解锁 %s"
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:167;168
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
 msgid "DataSource: "
 msgstr "数据源: "
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:203
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
 msgid "Column diagnostic"
 msgstr "列诊断"
 
@@ -9694,7 +10112,7 @@ msgstr "管理文件"
 #: View/Elements/healthElements/tabs.ctp:50;55
 #: View/Pages/doc/administration.ctp:39
 msgid "Workers"
-msgstr "Workers"
+msgstr ""
 
 #: View/Elements/healthElements/tabs.ctp:65
 #: View/Pages/doc/administration.ctp:40
@@ -9743,7 +10161,7 @@ msgstr "队列状态: "
 
 #: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
-msgstr "Worker PID"
+msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
@@ -9751,7 +10169,7 @@ msgstr "Worker PID"
 #: View/TagCollections/index.ctp:14
 #: View/UserSettings/index.ctp:56
 #: View/Users/admin_view.ctp:109
-#: View/Users/view.ctp:58
+#: View/Users/view.ctp:59
 msgid "User"
 msgstr "用户"
 
@@ -9796,8 +10214,8 @@ msgid "Start a worker"
 msgstr "启动一个worker"
 
 #: View/Elements/healthElements/workers.ctp:130
-msgid "Restart all workers"
-msgstr "重启所有workers"
+msgid "Restart dead workers"
+msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:3
 msgid "Set pull rules"
@@ -9953,10 +10371,6 @@ msgstr "模板描述"
 msgid "Template ID"
 msgstr "模板ID"
 
-#: 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
@@ -9975,7 +10389,7 @@ msgstr "文件"
 
 #: View/Elements/templateElements/populateTemplateFile.ctp:13
 msgid "s"
-msgstr "s"
+msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
 #: View/ObjectReferences/ajax/add.ctp:86
@@ -10142,7 +10556,7 @@ msgid "Recipient"
 msgstr "接收方"
 
 #: View/EventDelegations/index.ctp:82
-#: View/Events/automation.ctp:269;276
+#: View/Events/automation.ctp:279;286
 #: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
@@ -10367,479 +10781,475 @@ msgstr "确保您对您的API密钥保密, 因为它能让您访问MISP中的所
 msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 msgstr "要查看旧的MISP自动化页面, 请点击click <a href=\"automation/1\">here</a>."
 
-#: 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 "您当前的key: <code>%s</code>.\n"
-"您可以 %s 这个key."
+#: View/Events/automation.ctp:11
+msgid "Your current key is: <code>%s</code>. You can %s this key."
+msgstr ""
 
-#: View/Events/automation.ctp:10
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
 #: View/Users/admin_view.ctp:37
 #: View/Users/view.ctp:20
 msgid "reset"
 msgstr "重置"
 
-#: View/Events/automation.ctp:16
+#: View/Events/automation.ctp:26
 #: 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/automation.ctp:27
 #: 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
+#: View/Events/automation.ctp:28
 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
+#: View/Events/automation.ctp:31
 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 "设置搜索的返回格式(目前支持: json、xml、openioc、suricata、snort - 更多的格式正在被转移到restSearch中, 目标是让所有的搜索都通过这个API进行), 可以作为 restSearch 之后的第一个参数或通过 JSON 有效载荷传递"
 
-#: View/Events/automation.ctp:22
+#: View/Events/automation.ctp:32
 msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr "根据范围限制返回的结果数(例如10个属性或10个完整事件)."
 
-#: View/Events/automation.ctp:23
+#: View/Events/automation.ctp:33
 msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
 msgstr "如果设置了限制, 则设置要返回的页面, 在第3页上, 限制100将返回记录201-> 300)."
 
-#: View/Events/automation.ctp:24
+#: View/Events/automation.ctp:34
 #: 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/automation.ctp:35
 #: 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:26
+#: View/Events/automation.ctp:36
 #: 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:27
+#: View/Events/automation.ctp:37
 #: 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/automation.ctp:38
 #: 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/automation.ctp:39
 #: 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\"作为参数)会使搜索忽略所有其他参数, 除了Auth key和value之外. MISP将返回一个xml/json(取决于发送的头), 所有在事件信息, 事件orgc, 或任何一个属性value1/value2字段, 或属性注释中的value1/value2字段中的子字符串匹配的事件."
 
-#: View/Events/automation.ctp:30;150
+#: View/Events/automation.ctp:40;160
 #: 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:31;151
+#: View/Events/automation.ctp:41;161
 #: 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:32
+#: View/Events/automation.ctp:42
 #: 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/automation.ctp:43
 #: 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 "如果设置, 则在每个属性内的数据字段中将附件/压缩的恶意软件样本编码为base64"
 
-#: View/Events/automation.ctp:34
+#: View/Events/automation.ctp:44
 #: 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/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr "根据 uuid 限制结果."
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:46
 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 "根据事件最后一次发布的时间戳来限制结果, 输入的时间戳可以是一个时间戳或一个简短的时间描述(例如7d或24h), 您也可以传递一个带有两个值的列表来设置时间范围(例如 [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:37
+#: View/Events/automation.ctp:47
 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 "(publish_timestamp的同义词) 通过事件最后一次发布的时间戳来限制结果, 输入可以是一个时间戳或一个简短的时间描述(例如7d或24h), 您也可以传递一个带有两个值的列表来设置时间范围(例如 [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:38
+#: View/Events/automation.ctp:48
 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 "根据时间戳(最后一次编辑)来限制结果, 任何时间戳比给定时间戳更早的事件都将被返回. 如果您将/attributes作为范围, 那么属性的时间戳将被用于查找. 输入的时间戳可以是一个时间戳, 也可以是一个简短的时间描述(例如7d或24h), 您也可以传递一个带有两个值的列表来设置时间范围(例如 [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:39
+#: View/Events/automation.ctp:49
 #: 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/automation.ctp:50
 #: 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/automation.ctp:51
 #: 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/automation.ctp:52
 #: 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/automation.ctp:53
 #: 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 "在每个属性中还包括事件UUID, 而不只是包括事件ID."
 
-#: View/Events/automation.ctp:44
+#: View/Events/automation.ctp:54
 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 "只返回在给定时间戳之后收到修改的事件的属性, 输入可以是一个时间戳或一个简短的时间描述(例如7d或24h), 您也可以传递一个带有两个值的列表来设置时间范围(例如 [\"14d\", \"7d\"])."
 
-#: View/Events/automation.ctp:45
+#: View/Events/automation.ctp:55
 msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
 msgstr "如果设置了这个标志, 共享组对象将不被包含, 而只设置共享组ID."
 
-#: View/Events/automation.ctp:46
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr "过滤事件的信息字段."
 
-#: View/Events/automation.ctp:47
+#: View/Events/automation.ctp:57
 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
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr "当使用returnFormat = attack时, 选择像星系一样的ATT&CK矩阵, 通过mitri-attack-pattern默认为Mitre ATT&CK库."
 
-#: View/Events/automation.ctp:61
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr "要导出具有TLP标记但未标记为TLP:red的ip-src和ip-dst类型的所有属性, 请使用以下语法. 默认情况下, 字符串搜索是精确查找, 但是您可以使用mysql样式\"%\"通配符进行子字符串搜索."
 
-#: View/Events/automation.ctp:78
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr "restSearch APIs的CSV特定参数"
 
-#: View/Events/automation.ctp:80
+#: View/Events/automation.ctp:90
 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, 选择您希望在CSV导出中包含的字段. 通过额外设置事件级字段, 不需要 includeContext 来获取事件元数据."
 
-#: View/Events/automation.ctp:81
+#: View/Events/automation.ctp:91
 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, 在导出中添加额外的事件级别数据, 也可以通过 request_attributes 更加详细地添加其他字段"
 
-#: View/Events/automation.ctp:82
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr "当此设置为 true 时, 创建的CSV将不包含标题行."
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr "URL 参数"
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:98
 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 "也可以通过URL参数传递上述所有参数, 但是不建议这样做, 但如果没有其他选择, 只需按以下方式传递参数:"
 
-#: View/Events/automation.ctp:90
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr "如上图所示, \"||\"可以用来添加更多的值到 \"list\" 中, 所有的参数都会作为key:value组成部分传递给URL. 请记住, URL中的某些特殊字符可能会引起问题, 您的搜索可能会在传输过程中被泄露到日志中, 并且要考虑长度限制. 请将此作为最后的手段来使用."
 
-#: View/Events/automation.ctp:93
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr "restSearch APIs的RPZ特定参数"
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:104
 #: 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 zone文件, 生成的文件将包括您可以访问的所有 IDS 标记的域、主机名和 IP-src/IP-dst 属性值."
 
-#: View/Events/automation.ctp:97
+#: View/Events/automation.ctp:107
 #: 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将标头值注入到zone文件中, 并定义每个值的操作, 这些值都可以被覆盖. 默认情况下, 这些值要么是应用程序附带的默认值, 要么是站点管理员覆盖的值. 这些值如下"
 
-#: View/Events/automation.ctp:101
+#: View/Events/automation.ctp:111
 #: 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:103
+#: View/Events/automation.ctp:113
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr "或使用上面列出的选项发送XML或JSON对象"
 
-#: View/Events/automation.ctp:107
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr "Bro IDS导出"
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:118
 #: 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:109
+#: View/Events/automation.ctp:119
 #: 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:115
+#: View/Events/automation.ctp:125
 #: 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 "要按标签限制搜索结果, 请使用通常的语法. 请注意, 在标签搜索中不能使用冒号(:), 请使用分号来代替(搜索会自动搜索冒号), 要从标签1而不是标签2的事件中获取IP值, 请使用"
 
-#: View/Events/automation.ctp:118
+#: View/Events/automation.ctp:128
 #: 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来过滤结果"
 
-#: View/Events/automation.ctp:136
+#: View/Events/automation.ctp:146
 #: 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中的参数来传递过滤器, 不过建议对JSON对象使用POST请求, 格式如下图所示"
 
-#: View/Events/automation.ctp:138
+#: View/Events/automation.ctp:148
 #: 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:145
+#: View/Events/automation.ctp:155
 #: 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:148
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr "将结果限制在指定的事件ID中"
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:159
 #: 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:152
+#: View/Events/automation.ctp:162
 #: 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 "在最近的x个时间段内发布的事件, 其中x可以以天, 小时, 分钟来定义(例如5d或12h或30m), 该过滤器将使用事件的已发布时间戳."
 
-#: View/Events/automation.ctp:153
+#: View/Events/automation.ctp:163
 #: 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:155
+#: View/Events/automation.ctp:165
 #: 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:156
+#: View/Events/automation.ctp:166
 #: 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 "例如, 要检索事件#5的所有属性, 包括非IDS标记的属性, 请使用以下一行"
 
-#: View/Events/automation.ctp:159
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr "将指定类型的事件属性导出为XML"
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:170
 #: 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:162
+#: View/Events/automation.ctp:172
 #: 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:167
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr "下载附件或恶意软件样本"
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:178
 #: 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:170
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr "通过hash下载恶意软件样本"
 
-#: View/Events/automation.ctp:171
+#: View/Events/automation.ctp:181
 #: 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有覆盖所传递的对象)传递, 就可以收到一个JSON/XML对象, 并带有压缩后的样本base64编码的JSON/XML对象与一些上下文信息."
 
-#: View/Events/automation.ctp:172
+#: View/Events/automation.ctp:182
 #: 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)进行查找."
 
-#: View/Events/automation.ctp:173
+#: View/Events/automation.ctp:183
 #: 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 "您也可以通过传递eventID参数来获取一个事件的所有样本, 确保传递的是事件ID或哈希参数, 否则会返回错误消息. 另外, 如果没有设置哈希, allSamples标志将被自动设置."
 
-#: View/Events/automation.ctp:175
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr "POST消息有效载荷(XML)"
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr "POST消息有效载荷(json)"
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr "对传递对象中所有参数的简要描述"
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:194
 #: 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:185
+#: View/Events/automation.ctp:195
 #: 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:186
+#: View/Events/automation.ctp:196
 #: 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:187
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr "使用 \"Upload Sample\" API上传恶意软件样本"
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:199
 #: 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:190
+#: View/Events/automation.ctp:200
 #: 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编码, 并按以下说明上传. 所有的样本都将被压缩, 并受到密码保护(密码为\"infected\"). 原始文件的哈希值将作为附加属性被捕获."
 
-#: View/Events/automation.ctp:191
+#: View/Events/automation.ctp:201
 #: 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将接受一个JSON或XML对象发送到上述URL."
 
-#: View/Events/automation.ctp:192
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr "预期对象的一般结构如下"
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr "以下是预期的可选参数"
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:212
 #: 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是可选的, 它可以通过URL或POSTed对象提供, 但如果两者都提供了, 则URL具有优先权. 不提供事件ID将导致MISP为所有POSTed恶意软件样本创建一个新事件. 您可以定义事件的默认设置, 否则将使用一组默认设置."
 
-#: View/Events/automation.ctp:203
+#: View/Events/automation.ctp:213
 #: 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:204
+#: View/Events/automation.ctp:214
 #: 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\"或不标记为\"to_ids\"."
 
-#: View/Events/automation.ctp:205
+#: View/Events/automation.ctp:215
 #: 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 "将被分配给上传样本的类别, 有效选项有: 有效载荷传递、Artefacts dropped、有效载荷安装、外部分析."
 
-#: View/Events/automation.ctp:206
+#: View/Events/automation.ctp:216
 #: 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:207
+#: View/Events/automation.ctp:217
 #: 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:208
+#: View/Events/automation.ctp:218
 #: 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:209
+#: View/Events/automation.ctp:219
 #: 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:210
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr "从事件中添加或删除标签"
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:221
 #: 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:214
+#: View/Events/automation.ctp:224
 #: 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 "只需按以下格式POST一个json对象(根据您想从一个事件中添加或删除一个标签, 发送到相应的API)"
 
-#: View/Events/automation.ctp:216
+#: View/Events/automation.ctp:226
 #: 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:218
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr "提案和 API"
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:229
 #: 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:223
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr "HTTP"
 
-#: View/Events/automation.ctp:224
+#: View/Events/automation.ctp:234
 #: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:43
-#: View/Feeds/edit.ctp:74
-#: View/Feeds/index.ctp:102
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
 #: View/Feeds/view.ctp:5
 #: View/Pages/doc/using_the_system.ctp:445
 #: View/SharingGroups/add.ctp:92
@@ -10847,201 +11257,201 @@ msgstr "HTTP"
 msgid "URL"
 msgstr "URL"
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr "注解"
 
-#: View/Events/automation.ctp:226
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr "预期的有效载荷"
 
-#: View/Events/automation.ctp:227
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
 #: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr "响应"
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr "查看提案"
 
-#: View/Events/automation.ctp:234;254;255;261;262
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr "ShadowAttribute对象"
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr "查看我的组织事件的所有提案"
 
-#: View/Events/automation.ctp:241;248
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr "ShadowAttribute对象"
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr "查看事件的所有提案"
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr "对事件提出一个新的属性"
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr "对一个属性提出编辑建议"
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr "接受提案"
 
-#: View/Events/automation.ctp:274
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr "放弃提案"
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr "发布shadow attribute对象时, 请使用以下格式"
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:294
 #: 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:286
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr "过滤事件的元数据"
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:297
 #: 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:291
+#: View/Events/automation.ctp:301
 #: 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 "POST一个带有所需的查询字段和值的JSON对象来接收JSON回传.<br />\n"
 "    有效查询的一个例子"
 
-#: View/Events/automation.ctp:302
+#: View/Events/automation.ctp:312
 #: 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:303
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr "有效参数列表"
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr "过滤已发布或未发布的事件[0,1] - 可忽略"
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr "对事件信息中发现的字符串进行筛选 - 可忽略"
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr "对附加标签名称进行筛选 - 可忽略"
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr "对特定事件ID进行筛选 - 可忽略"
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:318
 #: 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:309
+#: View/Events/automation.ctp:319
 #: 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:310
+#: View/Events/automation.ctp:320
 #: 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:311
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr "对包含的属性值进行筛选 - 可忽略"
 
-#: View/Events/automation.ctp:312
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr "对创建者组织进行筛选 - 可忽略"
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr "对创建者用户邮件地址(仅管理员)进行过滤 - 可忽略"
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:324
 #: 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 "对日期进行筛选, 任何比给定日期更新的YYY-MM-DD格式的日期都会被提取 - 不可忽略"
 
-#: View/Events/automation.ctp:315
+#: View/Events/automation.ctp:325
 #: 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 "对日期进行筛选, 任何比给定日期更早的YYY-MM-DD格式的日期都会被提取 - 不可忽略"
 
-#: View/Events/automation.ctp:318
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr "从 Freetext 导入 API"
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr "freetext导入工具也暴露在API中."
 
-#: View/Events/automation.ctp:321
+#: View/Events/automation.ctp:331
 msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
 msgstr "只需POST要解析的内容, 然后直接从其中创建属性, 或者简单地返回解析结果."
 
-#: View/Events/automation.ctp:322
+#: View/Events/automation.ctp:332
 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 "使用boolean (0/1) adhere_to_warninglists和return_meta_attributes的url参数来过滤掉警告列表阻止的值, 并决定是保存属性解析的属性还是简单地返回为元属性。"
 
-#: View/Events/automation.ctp:323
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr "POST正文的内容应为要解析的文本"
 
-#: View/Events/automation.ctp:333
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr "通过API管理后台workers"
 
-#: View/Events/automation.ctp:335
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr "您可以通过API启动/停止并查看后台workers"
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr "添加worker"
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr "停止worker"
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr "获得worker信息"
 
@@ -11065,8 +11475,7 @@ msgstr "只提交给创建该事件的人"
 #: 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 "导出功能旨在自动为入侵检测系统生成签名, 要为给定属性启用签名生成, 必须将此属性的Signature字段设置为Yes."
-"        注意, 不是所有的属性类型都适用于签名生成, 目前我们只支持IP、域、主机名、用户代理等的NIDS签名生成, 以及文件工件的MD5/SHA1值的哈希列表生成, 计划中会支持更多的属性类型"
+msgstr "导出功能旨在自动为入侵检测系统生成签名, 要为给定属性启用签名生成, 必须将此属性的Signature字段设置为Yes.        注意, 不是所有的属性类型都适用于签名生成, 目前我们只支持IP、域、主机名、用户代理等的NIDS签名生成, 以及文件工件的MD5/SHA1值的哈希列表生成, 计划中会支持更多的属性类型"
 
 #: View/Events/export.ctp:6
 #: View/Events/export_alternate.ctp:6
@@ -11240,7 +11649,7 @@ msgid "Ongoing"
 msgstr "进行中的"
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:104
+#: View/Feeds/index.ctp:149
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr "目标"
@@ -11292,18 +11701,18 @@ msgstr "输入文件"
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:38
+#: View/GalaxyClusters/view.ctp:14
 #: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
-#: View/Users/statistics_orgs.ctp:33
+#: View/Users/statistics_orgs.ctp:35
 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:54
+#: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr "自定义过滤器"
 
@@ -11337,6 +11746,12 @@ msgstr ""
 msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr "确保您保护好密钥, 因为它可以访问整个数据库!"
 
+#: View/Events/legacy_automation.ctp:7
+msgid "Your current key is: <code>%s</code>.\n"
+"    You can %s this key."
+msgstr "您当前的key: <code>%s</code>.\n"
+"您可以 %s 这个key."
+
 #: 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中的验证密钥的使用已经被取消了. 取而代之, 在请求中的授权头中传递认证密钥. 暂时仍支持在URL中使用认证密钥的传统选项, 但不建议使用."
@@ -11765,11 +12180,11 @@ msgstr "导入"
 
 #: View/Events/resolved_misp_format.ctp:111
 msgid "ID: "
-msgstr "ID: "
+msgstr "ID： "
 
 #: View/Events/resolved_misp_format.ctp:127
 msgid "UUID: "
-msgstr "UUID: "
+msgstr "UUID： "
 
 #: View/Events/resolved_misp_format.ctp:128
 msgid "Meta Category: "
@@ -11789,7 +12204,6 @@ msgstr "成功添加属性"
 
 #: View/Events/show_i_o_c_results.ctp:10;32
 #: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:18
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
@@ -11930,6 +12344,7 @@ msgid "View request details"
 msgstr "查看请求详情"
 
 #: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
 #: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr "已禁用"
@@ -12091,7 +12506,7 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr "发布但不发送警报电子邮件?仅适用于微小改动!"
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: View/Feeds/index.ctp:105
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -12125,78 +12540,81 @@ msgstr "这将删除所有已经存在的事件的关联, 并防止任何事件
 msgid "Add MISP Feed"
 msgstr "添加 MISP 订阅源"
 
-#: View/Feeds/add.ctp:5
+#: View/Feeds/add.ctp:9
+#: View/Feeds/edit.ctp:9
+msgid "Warning: local feeds are currently disabled by policy, to re-enable the feature, set the Security.allow_local_feed_access flag in the server settings. This setting can only be set via the CLI."
+msgstr ""
+
+#: View/Feeds/add.ctp:12
 msgid "Add a new MISP feed source."
 msgstr "添加一个新的 MISP 订阅源."
 
-#: View/Feeds/add.ctp:8
-#: View/Feeds/index.ctp:97
+#: View/Feeds/add.ctp:14
 #: View/Feeds/view.ctp:64
 msgid "Caching enabled"
 msgstr "缓存已启用"
 
-#: View/Feeds/add.ctp:12
-#: View/Feeds/index.ctp:110
+#: View/Feeds/add.ctp:18
 msgid "Lookup visible"
 msgstr "可视化查询"
 
-#: View/Feeds/add.ctp:15
-#: View/Feeds/edit.ctp:21
+#: View/Feeds/add.ctp:21
+#: View/Feeds/edit.ctp:27
 msgid "Feed name"
 msgstr "订阅源名称"
 
-#: View/Feeds/add.ctp:20
-#: View/Feeds/index.ctp:100
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
 #: View/Feeds/view.ctp:31
 msgid "Provider"
 msgstr "供应商"
 
-#: View/Feeds/add.ctp:21
-#: View/Feeds/edit.ctp:26
+#: View/Feeds/add.ctp:27
+#: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
 msgstr "内容提供者的名称"
 
-#: View/Feeds/add.ctp:25
+#: View/Feeds/add.ctp:35
 msgid "Input Source"
 msgstr "输入源"
 
-#: View/Feeds/add.ctp:35
-#: View/Feeds/edit.ctp:66
+#: View/Feeds/add.ctp:45
+#: View/Feeds/edit.ctp:76
 msgid "Remove input after ingestion"
 msgstr "提取后删除输入"
 
-#: View/Feeds/add.ctp:44
-#: View/Feeds/edit.ctp:75
+#: View/Feeds/add.ctp:54
+#: View/Feeds/edit.ctp:85
 msgid "URL of the feed"
 msgstr "订阅源的URL"
 
-#: View/Feeds/add.ctp:48
-#: View/Feeds/edit.ctp:79
+#: View/Feeds/add.ctp:58
+#: View/Feeds/edit.ctp:89
 msgid "Source Format"
 msgstr "源格式"
 
-#: View/Feeds/add.ctp:57
-#: View/Feeds/edit.ctp:38
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:48
 msgid "Any headers to be passed with requests (for example: Authorization)"
 msgstr "与请求一起传递的任意标头(例如: Authorization)"
 
-#: View/Feeds/add.ctp:61
-#: View/Feeds/edit.ctp:42
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:52
 msgid "Line break separated list of headers in the \"headername: value\" format"
 msgstr "换行符分隔的标题列表, 格式为\"headername: value\""
 
-#: View/Feeds/add.ctp:65
-#: View/Feeds/edit.ctp:46
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:56
 msgid "Add Basic Auth"
 msgstr "添加基本认证"
 
-#: View/Feeds/add.ctp:69
-#: View/Feeds/edit.ctp:50
+#: View/Feeds/add.ctp:79
+#: View/Feeds/edit.ctp:60
 msgid "Username"
 msgstr "用户名"
 
-#: View/Feeds/add.ctp:73
-#: View/Feeds/edit.ctp:54
+#: View/Feeds/add.ctp:83
+#: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
 #: View/Users/admin_edit.ctp:40
@@ -12205,127 +12623,126 @@ msgstr "用户名"
 msgid "Password"
 msgstr "密码"
 
-#: View/Feeds/add.ctp:77
-#: View/Feeds/edit.ctp:58
+#: View/Feeds/add.ctp:87
+#: View/Feeds/edit.ctp:68
 msgid "Add basic auth header"
 msgstr "添加基本认证标头"
 
-#: View/Feeds/add.ctp:84
-#: View/Feeds/edit.ctp:88
-msgid "Target Event"
-msgstr "目标事件"
-
 #: View/Feeds/add.ctp:94
 #: View/Feeds/edit.ctp:98
-msgid "Target Event ID"
-msgstr "目标事件ID"
-
-#: View/Feeds/add.ctp:96
-#: View/Feeds/edit.ctp:100
-msgid "Leave blank unless you want to reuse an existing event."
-msgstr "除非您想重复使用现有事件, 否则请留空."
+msgid "Creator organisation"
+msgstr ""
 
 #: View/Feeds/add.ctp:104
 #: View/Feeds/edit.ctp:108
-msgid "Value field(s) in the CSV"
-msgstr "CSV 中的值字段"
+msgid "Target Event"
+msgstr "目标事件"
 
-#: View/Feeds/add.ctp:105
-#: View/Feeds/edit.ctp:109
-msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
-msgstr "选择一个或多个应被CSV解析器解析并转换为MISP属性的字段."
-
-#: View/Feeds/add.ctp:107
-#: View/Feeds/edit.ctp:111
-msgid "2,3,4 (column position separated by commas)"
-msgstr "2,3,4 (列位置, 以逗号分隔)"
-
-#: View/Feeds/add.ctp:115
-#: View/Feeds/edit.ctp:119
-msgid "Delimiter"
-msgstr "分隔符"
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:118
+msgid "Target Event ID"
+msgstr "目标事件ID"
 
 #: View/Feeds/add.ctp:116
 #: View/Feeds/edit.ctp:120
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr "除非您想重复使用现有事件, 否则请留空."
+
+#: View/Feeds/add.ctp:124
+#: View/Feeds/edit.ctp:128
+msgid "Value field(s) in the CSV"
+msgstr "CSV 中的值字段"
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:129
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
+msgstr "选择一个或多个应被CSV解析器解析并转换为MISP属性的字段."
+
+#: View/Feeds/add.ctp:127
+#: View/Feeds/edit.ctp:131
+msgid "2,3,4 (column position separated by commas)"
+msgstr "2,3,4 (列位置, 以逗号分隔)"
+
+#: View/Feeds/add.ctp:135
+#: View/Feeds/edit.ctp:139
+msgid "Delimiter"
+msgstr "分隔符"
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:140
 msgid "Set the default CSV delimiter (default = \",\")"
 msgstr "设置默认CSV分隔符(default = \",\")"
 
-#: View/Feeds/add.ctp:127
-#: View/Feeds/edit.ctp:130
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:150
 msgid "Exclusion Regex"
 msgstr "排除正则表达式"
 
-#: View/Feeds/add.ctp:128
-#: View/Feeds/edit.ctp:131
+#: View/Feeds/add.ctp:148
+#: View/Feeds/edit.ctp:151
 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 "添加一个正则表达式模式以检测应跳过的IOC(例如, 这对于排除对实际报告/订阅源的任何引用很有用)"
 
-#: View/Feeds/add.ctp:130
+#: View/Feeds/add.ctp:150
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
 msgstr "正则表达式, 例如: \"/^https://myfeedurl/i"
 
-#: View/Feeds/add.ctp:138
-#: View/Feeds/edit.ctp:141
+#: View/Feeds/add.ctp:158
+#: View/Feeds/edit.ctp:161
 msgid "Auto Publish"
 msgstr "自动发布"
 
-#: View/Feeds/add.ctp:139
+#: View/Feeds/add.ctp:159
 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:148
-#: View/Feeds/edit.ctp:150
+#: View/Feeds/add.ctp:168
+#: View/Feeds/edit.ctp:170
 msgid "Override IDS Flag"
 msgstr "覆盖IDS标志"
 
-#: View/Feeds/add.ctp:149
-#: View/Feeds/edit.ctp:151
+#: View/Feeds/add.ctp:169
+#: View/Feeds/edit.ctp:171
 msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
 msgstr "如果选中此项, 则当从此订阅源获取时, IDS标志将总是被设置为关闭"
 
-#: View/Feeds/add.ctp:158
-#: View/Feeds/edit.ctp:160
-#: View/Feeds/index.ctp:106
+#: View/Feeds/add.ctp:178
+#: View/Feeds/edit.ctp:180
 msgid "Delta Merge"
 msgstr "Delta 合并"
 
-#: View/Feeds/add.ctp:159
-#: View/Feeds/edit.ctp:161
+#: View/Feeds/add.ctp:179
+#: View/Feeds/edit.ctp:181
 msgid "Merge attributes (only add new attributes, remove revoked attributes)"
 msgstr "合并属性(仅添加新属性, 移除吊销的属性)"
 
-#: View/Feeds/add.ctp:187
-#: View/Feeds/edit.ctp:188
+#: View/Feeds/add.ctp:207
+#: View/Feeds/edit.ctp:208
 msgid "Default Tag"
 msgstr "默认标签"
 
-#: View/Feeds/add.ctp:193
-#: View/Feeds/edit.ctp:193
-msgid "Filter rules"
-msgstr "筛选规则"
-
-#: View/Feeds/add.ctp:194
-#: View/Feeds/edit.ctp:194
+#: View/Feeds/add.ctp:214
+#: View/Feeds/edit.ctp:214
 msgid "Events with the following tags allowed"
 msgstr "允许使用以下标签的事件"
 
-#: View/Feeds/add.ctp:195
-#: View/Feeds/edit.ctp:195
+#: View/Feeds/add.ctp:215
+#: View/Feeds/edit.ctp:215
 msgid "Events with the following tags blocked"
 msgstr "不允许使用以下标签的事件"
 
-#: View/Feeds/add.ctp:196
-#: View/Feeds/edit.ctp:196
+#: View/Feeds/add.ctp:216
+#: View/Feeds/edit.ctp:216
 msgid "Events with the following organisations allowed"
 msgstr "允许的以下组织的事件"
 
-#: View/Feeds/add.ctp:197
-#: View/Feeds/edit.ctp:197
+#: View/Feeds/add.ctp:217
+#: View/Feeds/edit.ctp:217
 msgid "Events with the following organisations blocked"
 msgstr "不允许的以下组织的事件"
 
-#: View/Feeds/add.ctp:198
-#: View/Feeds/edit.ctp:198
+#: View/Feeds/add.ctp:218
+#: View/Feeds/edit.ctp:218
 #: View/Servers/add.ctp:116
 #: View/Servers/edit.ctp:155;162
 msgid "Modify"
@@ -12343,64 +12760,64 @@ msgstr "%s%的数据包含在%s中(%s匹配值)"
 msgid "Edit MISP Feed"
 msgstr "编辑 MISP 的订阅源"
 
-#: View/Feeds/edit.ctp:5
+#: View/Feeds/edit.ctp:12
 msgid "Edit a new MISP feed source."
 msgstr "编辑新的 MISP 订阅源."
 
-#: View/Feeds/edit.ctp:133
+#: View/Feeds/edit.ctp:153
 msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
 msgstr "正则表达式, 例如: \"/^https://myfeedurl/i"
 
-#: View/Feeds/edit.ctp:213
+#: View/Feeds/edit.ctp:233
 msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
 msgstr "您要同步的外部服务器的基本URL, 例如: https://misppriv.circl.lu"
 
-#: View/Feeds/edit.ctp:214
+#: View/Feeds/edit.ctp:234
 #: View/Servers/add.ctp:146
 #: View/Servers/edit.ctp:190
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr "一个能让用户清楚地知道这个实例是什么的名字, 比如说: Organisation A's instance"
 
-#: View/Feeds/edit.ctp:215
+#: View/Feeds/edit.ctp:235
 #: View/Servers/add.ctp:147
 #: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr "您要同步的外部服务器的组织, 例如: BE"
 
-#: View/Feeds/edit.ctp:216
+#: View/Feeds/edit.ctp:236
 #: View/Servers/add.ctp:148
 #: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr "您可以在外部服务器上找到您的个人资料中的认证密钥."
 
-#: View/Feeds/edit.ctp:217
+#: View/Feeds/edit.ctp:237
 #: View/Servers/add.ctp:149
 #: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr "允许上传事件及其属性."
 
-#: View/Feeds/edit.ctp:218
+#: View/Feeds/edit.ctp:238
 #: View/Servers/add.ctp:150
 #: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr "允许从服务器上下载事件及其属性"
 
-#: View/Feeds/edit.ctp:219
+#: View/Feeds/edit.ctp:239
 #: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr "未发布新事件(与Push事件一起工作)"
 
-#: View/Feeds/edit.ctp:220
+#: View/Feeds/edit.ctp:240
 #: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr "发布新事件而无需电子邮件(与Pull事件一起工作)"
 
-#: View/Feeds/edit.ctp:221
+#: View/Feeds/edit.ctp:241
 #: View/Servers/edit.ctp:196
 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:222
+#: View/Feeds/edit.ctp:242
 #: View/Servers/add.ctp:154
 #: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
@@ -12430,137 +12847,128 @@ msgstr "粘贴下面 MISP 源元数据 JSON 以添加订阅源."
 msgid "Feed metadata JSON"
 msgstr "订阅源元数据JSON"
 
-#: 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 "缓存 freetext/CSV 订阅源"
-
-#: View/Feeds/index.ctp:7
-msgid "Cache MISP feeds"
-msgstr "缓存 MISP 订阅源"
-
-#: View/Feeds/index.ctp:8
-msgid "Fetch and store all feed data"
-msgstr "获取并存储所有订阅源数据"
-
-#: View/Feeds/index.ctp:34
+#: View/Feeds/index.ctp:13
 msgid "Enable selected"
 msgstr "启用所选定"
 
-#: View/Feeds/index.ctp:40
+#: View/Feeds/index.ctp:19
 msgid "Disable selected"
 msgstr "禁用所选定"
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:25
 msgid "Enable caching for selected"
 msgstr "启用选中的缓存"
 
-#: View/Feeds/index.ctp:52
+#: View/Feeds/index.ctp:31
 msgid "Disable caching for selected"
 msgstr "禁用选中的缓存"
 
-#: View/Feeds/index.ctp:62
+#: View/Feeds/index.ctp:41
 msgid "Default feeds"
 msgstr "默认订阅源"
 
-#: View/Feeds/index.ctp:67
+#: View/Feeds/index.ctp:47
 msgid "Custom feeds"
 msgstr "自定义订阅源"
 
-#: View/Feeds/index.ctp:72
+#: View/Feeds/index.ctp:53
 msgid "All feeds"
 msgstr "所有订阅源"
 
-#: View/Feeds/index.ctp:77
+#: View/Feeds/index.ctp:59
 msgid "Enabled feeds"
 msgstr "已启用的订阅源"
 
-#: View/Feeds/index.ctp:96
+#: View/Feeds/index.ctp:93
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr "启用将订阅源作为事件/属性拉入MISP"
 
-#: View/Feeds/index.ctp:97
-msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
-msgstr "启用缓存到Redis中的订阅源 - 允许显示与订阅源的相关性."
-
-#: View/Feeds/index.ctp:99
-msgid "Feed Format"
-msgstr "订阅源格式"
-
-#: View/Feeds/index.ctp:101
-#: View/Jobs/index.ctp:102
-#: View/Pages/doc/administration.ctp:225
-msgid "Input"
-msgstr "输入"
-
-#: View/Feeds/index.ctp:107
-msgid "Override IDS"
-msgstr "覆盖IDS"
-
-#: View/Feeds/index.ctp:111
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr "正在缓存..."
 
-#: View/Feeds/index.ctp:158
-msgid "View feed #%s"
-msgstr "查看订阅源 #%s"
+#: View/Feeds/index.ctp:102
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr "启用缓存到Redis中的订阅源 - 允许显示与订阅源的相关性."
+
+#: View/Feeds/index.ctp:113
+msgid "Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: 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/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
+msgid "Headers"
+msgstr "标头"
+
+#: View/Feeds/index.ctp:168
+msgid "Delta"
+msgstr ""
+
+#: View/Feeds/index.ctp:169
+msgid "Delta Merge strategy - align the local feed with the remote state"
+msgstr ""
 
 #: View/Feeds/index.ctp:176
-#: View/Feeds/view.ctp:55
-#: View/Servers/index.ctp:120;121
-msgid "Rules"
-msgstr "规则"
+msgid "Override"
+msgstr ""
 
-#: View/Feeds/index.ctp:203
-msgid "Error: Invalid event!"
-msgstr "错误: 无效事件!"
+#: View/Feeds/index.ctp:177
+msgid "Override the IDS flags and set all derived attribute to IDS off"
+msgstr ""
 
-#: View/Feeds/index.ctp:208
-msgid "Fixed event %s"
-msgstr "固定事件 %s"
+#: View/Feeds/index.ctp:196
+msgid "Visible"
+msgstr ""
 
 #: View/Feeds/index.ctp:211
-msgid "New fixed event"
-msgstr "新的固定事件"
+msgid "Feeds"
+msgstr "订阅源"
 
-#: View/Feeds/index.ctp:263
-#: View/Servers/index.ctp:141
-msgid "Age: "
-msgstr "年龄: "
+#: View/Feeds/index.ctp:212
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
+msgstr "生成订阅源查询缓存或获取订阅源数据(仅启用了订阅源)"
 
-#: View/Feeds/index.ctp:265
-#: View/Servers/index.ctp:149
-msgid "Not cached"
-msgstr "未被缓存"
+#: View/Feeds/index.ctp:216
+msgid "Load default feed metadata"
+msgstr ""
 
-#: View/Feeds/index.ctp:269
-msgid "Cache feed"
-msgstr "缓存订阅源"
+#: View/Feeds/index.ctp:228
+msgid "Cache all feeds"
+msgstr "缓存所有订阅源"
 
-#: View/Feeds/index.ctp:276
+#: View/Feeds/index.ctp:234
+msgid "Cache freetext/CSV feeds"
+msgstr "缓存 freetext/CSV 订阅源"
+
+#: View/Feeds/index.ctp:240
+msgid "Cache MISP feeds"
+msgstr "缓存 MISP 订阅源"
+
+#: View/Feeds/index.ctp:247
+msgid "Fetch and store all feed data"
+msgstr "获取并存储所有订阅源数据"
+
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr "远程探索事件"
 
-#: View/Feeds/index.ctp:278
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr "获取所有事件"
 
-#: View/Feeds/index.ctp:283
-msgid "Are you sure you want to permanently remove the feed (%s)?"
-msgstr "您确定您想要永久移除订阅源(%s)吗?"
+#: View/Feeds/index.ctp:294
+msgid "Are you sure you want to permanently remove the feed?"
+msgstr ""
 
-#: View/Feeds/index.ctp:285
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr "下载JSON格式的订阅源元数据"
 
@@ -12613,26 +13021,39 @@ msgstr "其他订阅源的覆盖率"
 msgid "Feed"
 msgstr "订阅源"
 
-#: View/Galaxies/index.ctp:22
+#: View/Galaxies/index.ctp:35
+msgid "Galaxy Id"
+msgstr ""
+
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr "图标"
 
-#: View/Galaxies/index.ctp:25
-#: View/Galaxies/view.ctp:16
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr "版本"
+
+#: View/Galaxies/index.ctp:60
+#: View/Galaxies/view.ctp:7
 #: View/Sightingdb/index.ctp:71
 #: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr "命名空间"
 
-#: View/Galaxies/index.ctp:58
-msgid "Are you sure you want to delete the Galaxy (%s)?"
-msgstr "您确定要删除星系 (%s)？"
+#: View/Galaxies/index.ctp:69
+msgid "Galaxy index"
+msgstr ""
 
-#: View/Galaxies/view.ctp:12
+#: View/Galaxies/index.ctp:85
+msgid "Are you sure you want to delete the Galaxy?"
+msgstr ""
+
+#: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr "星系ID"
 
-#: View/Galaxies/view.ctp:29
+#: View/Galaxies/view.ctp:13
 msgid "Kill chain order"
 msgstr ""
 
@@ -12640,33 +13061,30 @@ msgstr ""
 msgid "Toggle ATT&CK Matrix"
 msgstr "切换ATT&CK Matrix"
 
-#: View/GalaxyClusters/view.ctp:11
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr "星团ID"
 
-#: View/GalaxyClusters/view.ctp:15
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr "父星系"
 
-#: View/GalaxyClusters/view.ctp:21
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr "集合UUID"
 
-#: View/GalaxyClusters/view.ctp:23
-#: 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/GalaxyClusters/view.ctp:25
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr "作者"
 
-#: View/GalaxyClusters/view.ctp:36
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr "连接器标签"
 
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr "删除星系星团"
@@ -12675,23 +13093,17 @@ msgstr "删除星系星团"
 msgid "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."
 msgstr "您确定要删除星系星团%s吗?<br />相关的标签不会被删除, 您可以在任何时候通过强制更新您的星系, 重新加载星系星团"
 
-#: View/GalaxyClusters/ajax/index.ctp:47
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr "同义"
 
-#: View/GalaxyClusters/ajax/index.ctp:49
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr "#事件"
 
-#: View/GalaxyClusters/ajax/index.ctp:80
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
-msgid "View graph"
-msgstr "查看图"
-
-#: View/GalaxyClusters/ajax/index.ctp:82
-msgid "Delete galaxy cluster"
-msgstr "删除星系星团"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
+msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
 msgid "Key"
@@ -12701,6 +13113,27 @@ msgstr "密钥"
 msgid "Start the galaxy matrix picker"
 msgstr "启动星系矩阵选择器"
 
+#: View/Inbox/index.ctp:31
+#: 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/Inbox/index.ctp:40
+msgid "Instance inbox"
+msgstr ""
+
+#: View/Inbox/index.ctp:41
+#: View/Users/registrations.ctp:93
+msgid "You can find messages sent to this instance in the following list. Type denotes the type of request (such as registration). View each entry to see more details about the request's contents."
+msgstr ""
+
+#: View/Inbox/index.ctp:56
+msgid "Are you sure you want to delete the message from the inbox?"
+msgstr ""
+
 #: View/Jobs/index.ctp:3
 msgid "Purge job entries:"
 msgstr "清理作业:"
@@ -12721,12 +13154,6 @@ msgstr "已完成."
 msgid "Show all queues"
 msgstr "显示所有队列"
 
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr "默认"
-
 #: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr "显示默认队列"
@@ -12758,12 +13185,17 @@ msgstr "进程 ID"
 #: View/Jobs/index.ctp:100
 #: View/Pages/doc/administration.ctp:223
 msgid "Worker"
-msgstr "Worker"
+msgstr ""
 
 #: View/Jobs/index.ctp:101
 msgid "Job type"
 msgstr "作业类型"
 
+#: View/Jobs/index.ctp:102
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
+msgstr "输入"
+
 #: View/Jobs/index.ctp:106
 #: View/Pages/doc/administration.ctp:229
 msgid "Retries"
@@ -12845,6 +13277,7 @@ msgstr "从IP"
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
 #: View/UserSettings/index.ctp:35
+#: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
 #: View/Users/admin_view.ctp:17
@@ -12852,13 +13285,6 @@ msgstr "从IP"
 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"
@@ -12909,10 +13335,6 @@ msgstr "参考"
 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"
@@ -13480,7 +13902,7 @@ msgstr "查看全部"
 
 #: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
-#: View/Users/statistics_orgs.ctp:30
+#: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr "Logo"
 
@@ -13514,12 +13936,12 @@ msgid "Last modified"
 msgstr "最后一次修改"
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:37
+#: View/Users/statistics_orgs.ctp:39
 msgid "Sector"
 msgstr "部门"
 
 #: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:35
+#: View/Users/statistics_orgs.ctp:37
 msgid "Nationality"
 msgstr "国籍"
 
@@ -14061,7 +14483,7 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:76
+#: View/Users/admin_add.ctp:77
 #: View/Users/admin_edit.ctp:71
 #: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
@@ -14072,7 +14494,7 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:81
+#: View/Users/admin_add.ctp:82
 #: View/Users/admin_edit.ctp:72
 #: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
@@ -14085,7 +14507,7 @@ 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
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr "验证密钥"
 
@@ -14138,6 +14560,7 @@ msgid "The e-mail address (and login name) of the user."
 msgstr "用户的电子邮件地址(和登录名)."
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
 #: View/Users/admin_view.ctp:26
 #: View/Users/view.ctp:7
 msgid "Autoalert"
@@ -15452,10 +15875,6 @@ msgstr ""
 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 ""
@@ -16979,7 +17398,7 @@ msgstr "如果您尝试连接的实例需要的话, 您也可以上传客户端
 
 #: View/Servers/edit.ctp:263;267
 msgid "Not set."
-msgstr "未设置."
+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: "
@@ -17011,7 +17430,7 @@ msgstr "服务器"
 
 #: View/Servers/index.ctp:23
 msgid "Prio"
-msgstr "Prio"
+msgstr ""
 
 #: View/Servers/index.ctp:24
 msgid "Connection test"
@@ -17238,10 +17657,6 @@ msgstr "响应代码"
 msgid "Request duration"
 msgstr "请求持续时间"
 
-#: View/Servers/rest.ctp:164
-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 "警告: app/Config/config.php无法写入, 这意味着在这里进行的任何设置更改都不会被保存"
@@ -17622,10 +18037,6 @@ msgstr "被动共享组"
 msgid "Distribution List"
 msgstr "分发清单"
 
-#: View/SharingGroups/view.ctp:12
-msgid "Selectable"
-msgstr "可选的"
-
 #: View/SharingGroups/view.ctp:28
 msgid "Synced by"
 msgstr "同步于"
@@ -17634,10 +18045,6 @@ msgstr "同步于"
 msgid "Quick Search"
 msgstr "快读查询"
 
-#: View/Sightingdb/index.ctp:55
-msgid "Owner"
-msgstr "所有者"
-
 #: View/Sightingdb/index.ctp:61
 msgid "Host"
 msgstr "主机"
@@ -17798,6 +18205,11 @@ msgstr "已标记的属性"
 msgid "Favourite"
 msgstr "最喜爱的"
 
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+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小时执行一次. 您可以改变下一次计划执行的日期和时间, 以及重复执行的频率(以小时为单位), 如果您将频率设置为0, 则任务不会重复执行. 要更改上述设置, 只需点击相应的字段, 并在编辑完成后点击更新所有预定任务"
@@ -18138,6 +18550,45 @@ msgstr "管理个人用户设置"
 msgid "Are you sure you wish to delete this entry?"
 msgstr "您确定您要删除这个条目吗?"
 
+#: View/Users/accept_registrations.ctp:2;48
+msgid "No preference"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:7;33
+msgid "Conflicting requirements"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:14
+msgid "Requested organisation not found."
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:19
+msgid "Create a new organisation"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:27
+msgid "known remote organisation, will be converted to local"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:50
+msgid "The requested details were as follows\n\n"
+"Organisation:\n"
+"&nbsp;&nbsp;%s\n"
+"Role: %s\n\n"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:58
+msgid "Accept registrations"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:98
+msgid "The selected Role does not satisfy the user request"
+msgstr ""
+
+#: View/Users/accept_registrations.ctp:102
+msgid "The selected Role satisfies the user request"
+msgstr ""
+
 #: View/Users/admin_add.ctp:4
 msgid "Admin Add User"
 msgstr "管理员添加用户"
@@ -18195,12 +18646,12 @@ msgstr "SMIME 密钥"
 msgid "Paste the user's SMIME public key in PEM format here."
 msgstr "将用户的SMIME公钥以PEM格式粘贴到这里"
 
-#: View/Users/admin_add.ctp:88
+#: View/Users/admin_add.ctp:89
 #: View/Users/admin_edit.ctp:78
 msgid "Disable this user account"
 msgstr "禁用此用户帐户"
 
-#: View/Users/admin_add.ctp:90
+#: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr "自动发送凭证"
 
@@ -18210,7 +18661,7 @@ msgstr "管理员编辑用户"
 
 #: View/Users/admin_edit.ctp:69
 #: View/Users/admin_view.ctp:69
-#: View/Users/view.ctp:29
+#: View/Users/view.ctp:30
 msgid "Terms accepted"
 msgstr "已接受条款"
 
@@ -18314,30 +18765,68 @@ msgstr "删除筛选器"
 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_index.ctp:7
+#: View/Users/admin_index.ctp:3
 msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
 msgstr "点击%s可以一次性重置所有同步和org管理员用户的API密钥, 这也会自动通知他们新的API密钥"
 
-#: View/Users/admin_index.ctp:10
+#: View/Users/admin_index.ctp:6
 msgid "here"
 msgstr "这里"
 
-#: View/Users/admin_index.ctp:13;14
+#: View/Users/admin_index.ctp:9;10
 msgid "Reset all sync user API keys"
 msgstr "重置所有同步用户的API密钥"
 
-#: View/Users/admin_index.ctp:17
+#: View/Users/admin_index.ctp:13
 msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
 msgstr "您是否确定要重置所有具有同步权限的用户的API密钥?"
 
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
+msgstr ""
+
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
+msgid "Terms Accepted"
+msgstr ""
+
+#: View/Users/admin_index.ctp:118
+msgid "Last Login"
+msgstr ""
+
+#: View/Users/admin_index.ctp:132
+msgid "External Auth"
+msgstr ""
+
+#: View/Users/admin_index.ctp:140
+msgid "Monitored"
+msgstr ""
+
+#: View/Users/admin_index.ctp:162
+msgid "Users index"
+msgstr ""
+
+#: View/Users/admin_index.ctp:201
+msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr "联系%s"
@@ -18350,11 +18839,6 @@ msgstr "警告: 此用户没有设置加密密钥, 此实例的安全状态允
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr "找到用户的 %s 密钥, 将使用该密钥加密发送电子邮件"
 
-#: View/Users/admin_view.ctp:27
-#: View/Users/view.ctp:8
-msgid "Contactalert"
-msgstr "Contactalert"
-
 #: View/Users/admin_view.ctp:30
 #: View/Users/view.ctp:11
 msgid "Request API access"
@@ -18362,7 +18846,7 @@ msgstr "请求API访问"
 
 #: View/Users/admin_view.ctp:47
 msgid "Customauth header"
-msgstr "Customauth header"
+msgstr ""
 
 #: View/Users/admin_view.ctp:55
 msgid "Invited By"
@@ -18370,10 +18854,10 @@ msgstr "邀请者"
 
 #: View/Users/admin_view.ctp:67
 msgid "Org_admin"
-msgstr "Org_admin"
+msgstr ""
 
 #: View/Users/admin_view.ctp:68
-#: View/Users/view.ctp:28
+#: View/Users/view.ctp:29
 msgid "NIDS Start SID"
 msgstr "NIDS 启动 SID"
 
@@ -18382,22 +18866,22 @@ msgid "Password change"
 msgstr "修改密码"
 
 #: View/Users/admin_view.ctp:78
-#: View/Users/view.ctp:37
+#: View/Users/view.ctp:38
 msgid "GnuPG fingerprint"
 msgstr "GnuPG指纹"
 
 #: View/Users/admin_view.ctp:83
-#: View/Users/view.ctp:42
+#: View/Users/view.ctp:43
 msgid "GnuPG status"
 msgstr "GnuPG状态"
 
 #: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:49
+#: View/Users/view.ctp:50
 msgid "S/MIME Public certificate"
 msgstr "S/MIME公共证书"
 
 #: View/Users/admin_view.ctp:119
-#: View/Users/view.ctp:64
+#: View/Users/view.ctp:65
 msgid "Download user profile for data portability"
 msgstr "下载用户资料, 实现数据的可移植性"
 
@@ -18413,10 +18897,102 @@ msgstr "没有失败的复合材料"
 msgid "SMIME Public certificate (PEM format)"
 msgstr "SMIME公共证书(PEM格式)"
 
-#: View/Users/login.ctp:37;44
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr "登入"
 
+#: View/Users/login.ctp:47
+msgid "Registration will be sent to the administrators of the instance for consideration."
+msgstr ""
+
+#: View/Users/login.ctp:48
+msgid "No account yet? Register now!"
+msgstr ""
+
+#: View/Users/register.ctp:6
+msgid "Register for a new user account"
+msgstr ""
+
+#: View/Users/register.ctp:12
+msgid "Your email address"
+msgstr ""
+
+#: View/Users/register.ctp:18
+msgid "Your organisation's name (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:23
+msgid "Your MISP org uuid (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:29
+msgid "Request custom role"
+msgstr ""
+
+#: View/Users/register.ctp:34
+msgid "Publish permission"
+msgstr ""
+
+#: View/Users/register.ctp:41
+msgid "Org admin permission"
+msgstr ""
+
+#: View/Users/register.ctp:49
+msgid "Sync permission"
+msgstr ""
+
+#: View/Users/register.ctp:54
+msgid "PGP key (optional)"
+msgstr ""
+
+#: View/Users/register.ctp:60
+msgid "Message to the admins"
+msgstr ""
+
+#: View/Users/registrations.ctp:12
+msgid "Process the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:18
+msgid "Discard the selected registrations"
+msgstr ""
+
+#: View/Users/registrations.ctp:44
+msgid "Time"
+msgstr ""
+
+#: View/Users/registrations.ctp:51
+msgid "IP"
+msgstr ""
+
+#: View/Users/registrations.ctp:56
+msgid "User Agent"
+msgstr ""
+
+#: View/Users/registrations.ctp:71
+msgid "Org uuid"
+msgstr ""
+
+#: View/Users/registrations.ctp:76
+msgid "Requested role"
+msgstr ""
+
+#: View/Users/registrations.ctp:82
+msgid "PGP"
+msgstr ""
+
+#: View/Users/registrations.ctp:92
+msgid "Registrations index"
+msgstr ""
+
+#: View/Users/registrations.ctp:102
+msgid "Process registration"
+msgstr ""
+
+#: View/Users/registrations.ctp:111
+msgid "Discard registration"
+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"
@@ -18432,6 +19008,13 @@ msgstr "发现相关性"
 msgid "Proposals active"
 msgstr "活跃提案"
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr "用户"
+
 #: View/Users/statistics.ctp:29
 #: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
@@ -18487,15 +19070,15 @@ msgstr "平均用户/组织"
 msgid "A heatmap showing the usage of %s."
 msgstr "显示 %s 的使用情况的热图."
 
-#: View/Users/statistics_orgs.ctp:17
+#: View/Users/statistics_orgs.ctp:19
 msgid "Organisation list"
 msgstr "组织列表"
 
-#: View/Users/statistics_orgs.ctp:18
+#: View/Users/statistics_orgs.ctp:20
 msgid "Quick overview over the organisations residing on or known by this instance."
 msgstr "简要概述此实例所驻留或已知的组织."
 
-#: View/Users/statistics_orgs.ctp:38
+#: View/Users/statistics_orgs.ctp:40
 msgid "Activity (1 year)"
 msgstr "活跃(1年)"
 
@@ -18551,6 +19134,14 @@ msgstr "证书验证"
 msgid "GnuPG key validation"
 msgstr "GnuPG 密钥验证"
 
+#: View/Users/ajax/discardRegistrations.ctp:5
+msgid "Discard User Registrations"
+msgstr ""
+
+#: View/Users/ajax/discardRegistrations.ctp:9
+msgid "Are you sure you wish to remove the registration request(s) selected?"
+msgstr ""
+
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr "确认发送"
@@ -18681,7 +19272,7 @@ msgstr "选项 : 有效载荷传递, 反病毒检测, 有效载荷安装, 丢失
 #: Model/Attribute.php:validation for field value
 #: Model/ShadowAttribute.php:validation for field value
 msgid "stringNotEmpty"
-msgstr "stringNotEmpty"
+msgstr ""
 
 #: Model/Attribute.php:validation for field value
 #: Model/ShadowAttribute.php:validation for field value
@@ -18709,6 +19300,7 @@ msgid "boolean"
 msgstr "布尔值"
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/Dashboard.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
@@ -18753,7 +19345,7 @@ msgstr "无效的 ISO 8601 格式"
 #: Model/User.php:validation for field org_id;validation for field authkey
 #: Model/Whitelist.php:validation for field name
 msgid "valueNotEmpty"
-msgstr "valueNotEmpty"
+msgstr ""
 
 #: Model/Event.php:validation for field date
 msgid "Expected date format: YYYY-MM-DD"
@@ -18836,7 +19428,7 @@ msgstr "请输入一个有效的base-url."
 
 #: Model/Server.php:validation for field name
 msgid "allowEmpty"
-msgstr "allowEmpty"
+msgstr ""
 
 #: Model/Server.php:validation for field name
 msgid "required"
@@ -18944,7 +19536,7 @@ msgstr "SID 应为整数."
 
 #: Model/UserSetting.php:validation for field json
 msgid "isValidJson"
-msgstr "isValidJson"
+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."

From ebb1b8c415fd37cc67423ea071ea8f8bd3eb3aeb Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Fri, 26 Mar 2021 13:45:35 +0900
Subject: [PATCH 411/437] chg: [i18n] Updated base strings.

---
 app/Locale/cake.pot    |    19 +-
 app/Locale/default.pot | 13185 +++++++++++++++++++++++++--------------
 2 files changed, 8346 insertions(+), 4858 deletions(-)

diff --git a/app/Locale/cake.pot b/app/Locale/cake.pot
index c4149d105..b3c88f263 100644
--- a/app/Locale/cake.pot
+++ b/app/Locale/cake.pot
@@ -13,20 +13,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: View/Errors/error400.ctp:20
-#: View/Errors/error500.ctp:19
-#: View/Errors/missing_connection.ctp:4
+#: View/Errors/error400.ctp:7
+#: View/Errors/error500.ctp:4
+#: View/Errors/missing_connection.ctp:5
 #: View/Errors/missing_datasource_config.ctp:4
 #: View/Errors/pdo_error.ctp:4
 msgid "Error"
 msgstr ""
 
-#: View/Errors/error400.ctp:22
+#: View/Errors/error400.ctp:11
 msgid "The requested address %s was not found on this server."
 msgstr ""
 
-#: View/Errors/error500.ctp:20
-#: View/Errors/missing_connection.ctp:5
+#: View/Errors/error400.ctp:14
+msgid "You don't have permission to access %s."
+msgstr ""
+
+#: View/Errors/error500.ctp:5
+msgid "An Internal Error Has Occurred. Please try your action again. If the problem persists, please contact administrator."
+msgstr ""
+
+#: View/Errors/missing_connection.ctp:6
 #: View/Errors/missing_datasource_config.ctp:5
 #: View/Errors/pdo_error.ctp:5
 msgid "An Internal Error Has Occurred."
diff --git a/app/Locale/default.pot b/app/Locale/default.pot
index eee01068f..b977369d4 100755
--- a/app/Locale/default.pot
+++ b/app/Locale/default.pot
@@ -38,6 +38,7 @@ msgid "Worker started."
 msgstr ""
 
 #: Console/Command/AdminShell.php:141
+#: Controller/Component/CRUDComponent.php:175
 msgid "%s updated."
 msgstr ""
 
@@ -45,78 +46,171 @@ msgstr ""
 msgid "Could not update %s."
 msgstr ""
 
-#: Console/Command/AdminShell.php:466
+#: Console/Command/AdminShell.php:225
+msgid "All object templates are up to date already."
+msgstr ""
+
+#: Console/Command/AdminShell.php:227
+msgid "Could not update any of the object templates."
+msgstr ""
+
+#: Console/Command/AdminShell.php:229
+msgid "Successfully updated %s object templates."
+msgstr ""
+
+#: Console/Command/AdminShell.php:231
+msgid " However, could not update %s object templates."
+msgstr ""
+
+#: Console/Command/AdminShell.php:472
 msgid "Update the JSON definitions of MISP."
 msgstr ""
 
-#: Console/Command/AdminShell.php:469
+#: Console/Command/AdminShell.php:475
 msgid "Update the submodules before ingestion."
 msgstr ""
 
-#: Console/Command/AdminShell.php:499
+#: Console/Command/AdminShell.php:505
 msgid "Last DB num which was successfully executed: "
 msgstr ""
 
-#: Console/Command/AdminShell.php:508
+#: Console/Command/AdminShell.php:514
 msgid "Something went wrong. Could not find the existing db version"
 msgstr ""
 
-#: Console/Command/AdminShell.php:511
+#: Console/Command/AdminShell.php:517
 msgid "DB was never successfully updated or we are on a fresh install"
 msgstr ""
 
-#: Console/Command/AdminShell.php:528
+#: Console/Command/AdminShell.php:534
 msgid "MISP mass sync authkey reset command line tool.\n\nUsage: %sConsole/cake resetSyncAuthkeys [user_id]"
 msgstr ""
 
-#: Console/Command/AdminShell.php:536
-#: Controller/UsersController.php:1283;2221
+#: Console/Command/AdminShell.php:542
+#: Controller/UsersController.php:1311;2341
 #: Model/Dashboard.php:129
 msgid "Invalid user."
 msgstr ""
 
-#: Console/Command/AdminShell.php:539
+#: Console/Command/AdminShell.php:545
 msgid "User has to be a site admin."
 msgstr ""
 
-#: Console/Command/AdminShell.php:563
+#: Console/Command/AdminShell.php:569
 msgid "\nError: %s\n"
 msgstr ""
 
-#: Console/Command/AdminShell.php:565
+#: Console/Command/AdminShell.php:571
 msgid "%s events purged.\n"
 msgstr ""
 
-#: Console/Command/AdminShell.php:587
+#: Console/Command/AdminShell.php:593
 msgid "> Database schema dumped on disk"
 msgstr ""
 
-#: Console/Command/AdminShell.php:589
+#: Console/Command/AdminShell.php:595
 msgid "Something went wrong. Could not find the existing db version or fetch the current database schema."
 msgstr ""
 
-#: Console/Command/EventShell.php:15
-#: Controller/AttributesController.php:118;122;126
-#: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
-#: Controller/PostsController.php:56
-#: Model/Galaxy.php:293
+#: Console/Command/DevShell.php:7
+msgid "Massaging the feed metadata file."
+msgstr ""
+
+#: Console/Command/DevShell.php:11
+msgid "Could not read the defaults.json file at %s. Exiting"
+msgstr ""
+
+#: Console/Command/DevShell.php:38
+msgid "Done. The feed definitions contain %s feeds and can be found at %s."
+msgstr ""
+
+#: Console/Command/DevShell.php:45
+msgid "Something went wrong."
+msgstr ""
+
+#: Console/Command/EventShell.php:20
+msgid "Import event from file into MISP."
+msgstr ""
+
+#: Console/Command/EventShell.php:23
+msgid "User ID that will owner of uploaded event."
+msgstr ""
+
+#: Console/Command/EventShell.php:24
+msgid "Path to JSON MISP file, can be gzipped or bz2 compressed."
+msgstr ""
+
+#: Console/Command/EventShell.php:83
+#: Controller/AttributesController.php:120;1170;1242;1372
+#: Controller/EventGraphController.php:62
+#: Controller/EventReportsController.php:512
+#: Controller/EventsController.php:1081;1506;1580;2272;2392;2530;2647;2734;3054;5130;5161;5400;5404;5413;5711;5717
+#: Controller/ObjectReferencesController.php:241
+#: Controller/PostsController.php:54
+#: Model/Galaxy.php:443
 msgid "Invalid event"
 msgstr ""
 
+#: Console/Command/EventShell.php:463
+msgid "Recovering event %s"
+msgstr ""
+
+#: Console/Command/EventShell.php:468
+#: Controller/EventsController.php:5633
+msgid "Recovery complete. Event #%s recovered, using %s log entries."
+msgstr ""
+
 #: Console/Command/PasswordShell.php:46
 msgid "override password change"
 msgstr ""
 
-#: Console/Command/ServerShell.php:83
-#: Controller/ServersController.php:674
-msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled, %s sightings pulled."
+#: Console/Command/ServerShell.php:149
+#: Controller/ServersController.php:734
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled, %s sightings pulled, %s clusters pulled."
 msgstr ""
 
-#: Console/Command/ServerShell.php:85
+#: Console/Command/ServerShell.php:152;156
 msgid "ERROR: %s"
 msgstr ""
 
+#: Console/Command/ServerShell.php:358;514
+msgid "Job failed. See error logs for more details."
+msgstr ""
+
+#: Console/Command/ServerShell.php:369;525
+msgid "See error logs for more details."
+msgstr ""
+
+#: Console/Command/ServerShell.php:363;519
+msgid "%s feed from %s cached. Failed: %s"
+msgid_plural "%s feeds from %s cached. Failed: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: Console/Command/StatisticsShell.php:162
+msgid "Processing organisation %s / %s.%s"
+msgstr ""
+
+#: Console/Command/StatisticsShell.php:202
+msgid "Total local orgs: %s%s"
+msgstr ""
+
+#: Console/Command/StatisticsShell.php:203
+msgid "Local orgs with event creations: %s%s"
+msgstr ""
+
+#: Console/Command/StatisticsShell.php:204
+msgid "Average days until first event: %s"
+msgstr ""
+
+#: Console/Command/StatisticsShell.php:241
+msgid "Year over year growth of organisation count."
+msgstr ""
+
+#: Console/Command/StatisticsShell.php:250
+msgid "%s: %s %s%s"
+msgstr ""
+
 #: Console/Command/TrainingShell.php:682
 msgid "verbose mode"
 msgstr ""
@@ -125,287 +219,382 @@ msgstr ""
 msgid "interactive mode"
 msgstr ""
 
-#: Controller/AppController.php:382
-msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
-msgstr ""
-
-#: Controller/AppController.php:382
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
-msgid "Update Progress"
-msgstr ""
-
-#: Controller/AppController.php:389
-msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
-msgstr ""
-
-#: Controller/AppController.php:519
+#: Controller/AppController.php:355
 msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
 msgstr ""
 
-#: Controller/AppController.php:739
-#: Controller/AttributesController.php:1917;2026;2130
-#: Controller/EventsController.php:3277
+#: Controller/AppController.php:379
+msgid "WARNING: MISP is currently running under PHP 8.0, which is unsupported. Background jobs will fail, so please contact your administrator to run a supported PHP version (such as 7.4)"
+msgstr ""
+
+#: Controller/AppController.php:502
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr ""
+
+#: Controller/AppController.php:537
+msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
+msgstr ""
+
+#: Controller/AppController.php:537
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:969
+msgid "Update Progress"
+msgstr ""
+
+#: Controller/AppController.php:558
+msgid "Your user account has been disabled."
+msgstr ""
+
+#: Controller/AppController.php:894
+#: Controller/AttributesController.php:1784;1919
+#: Controller/EventsController.php:3126
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr ""
 
-#: Controller/AppController.php:748
-#: Controller/AttributesController.php:2134
-#: Controller/EventsController.php:3281
+#: Controller/AppController.php:903
+#: Controller/AttributesController.php:1923
+#: Controller/EventsController.php:3130
 msgid "You have to be logged in to do that."
 msgstr ""
 
-#: Controller/AppController.php:764
-#: Controller/Component/IndexFilterComponent.php:23
+#: Controller/AppController.php:919
+#: Controller/Component/IndexFilterComponent.php:25
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr ""
 
-#: Controller/AppController.php:902
+#: Controller/AppController.php:1035
 msgid "All done. attribute_count generated from scratch for "
 msgstr ""
 
-#: Controller/AppController.php:1025
-#: Controller/AttributesController.php:2188
-#: Controller/ShadowAttributesController.php:1267
+#: Controller/AppController.php:1158
+#: Controller/AttributesController.php:1977
+#: Controller/ShadowAttributesController.php:1101
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr ""
 
-#: Controller/AppController.php:1211
+#: Controller/AppController.php:1357
 msgid "RestSearch is not implemented (yet) for this scope."
 msgstr ""
 
-#: Controller/AttributesController.php:109;1339
-#: Controller/EventGraphController.php:19;77
+#: Controller/AppController.php:1371
+msgid "Restsearch queries using GET and no parameters are not allowed. If you have passed parameters via a JSON body, make sure you use POST requests."
+msgstr ""
+
+#: Controller/AttributesController.php:113;1161
+#: Controller/EventGraphController.php:22;70
+#: Controller/EventReportsController.php:38
 msgid "No event ID set."
 msgstr ""
 
-#: Controller/AttributesController.php:112
+#: Controller/AttributesController.php:116
 msgid "You do not have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:132;422;602;832;3168;3183
-#: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:2107;2128;2162
-#: Controller/ObjectsController.php:837
-#: Model/Attribute.php:4323;4327
+#: Controller/AttributesController.php:123;363;523;719;1173;2957
+#: Controller/EventGraphController.php:81
+#: Controller/EventReportsController.php:515
+#: Controller/EventsController.php:2002;2023;2065;2158;5280;5326
+#: Controller/ObjectsController.php:47;177;740;805;1160
+#: Model/Attribute.php:4169;4173
 msgid "You do not have permission to do that."
 msgstr ""
 
-#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
-#: Controller/ObjectsController.php:641
-#: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
-#: Controller/TagsController.php:506
-#: Model/Attribute.php:4315
-msgid "Invalid attribute"
+#: Controller/AttributesController.php:143;369;744;1414
+#: Controller/EventsController.php:1884;1888
+msgid "Invalid Sharing Group or not authorised."
 msgstr ""
 
-#: Controller/AttributesController.php:355
-#: Controller/ShadowAttributesController.php:483
-msgid "You do not have the permission to view this event."
+#: Controller/AttributesController.php:330;1790
+msgid "Attribute does not exists or you do not have the permission to download this attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:402
+#: Controller/AttributesController.php:348
 msgid "Attribute not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/AttributesController.php:419;586;892;1348
-#: Controller/EventsController.php:4432;4446;5219;5233
+#: Controller/AttributesController.php:360
+#: Controller/EventsController.php:4284;4654
 msgid "Invalid Event."
 msgstr ""
 
-#: Controller/AttributesController.php:437;613
+#: Controller/AttributesController.php:385;534
 #: Controller/DecayingModelController.php:56
-#: Controller/ShadowAttributesController.php:530
+#: Controller/GalaxiesController.php:162
+#: Controller/ShadowAttributesController.php:489
 msgid "PHP says file was not uploaded. Are you attacking me?"
 msgstr ""
 
-#: Controller/AttributesController.php:616
-#: Controller/ShadowAttributesController.php:533;543
+#: Controller/AttributesController.php:457
+msgid "Some of the attachments failed to upload. The failed files were: %s - This can be caused by the attachments already existing in the event."
+msgstr ""
+
+#: Controller/AttributesController.php:461
+msgid "The attachment(s) could not be saved. Please contact your administrator."
+msgstr ""
+
+#: Controller/AttributesController.php:537
+#: Controller/ShadowAttributesController.php:492;502
 msgid "There was a problem to upload the file."
 msgstr ""
 
-#: Controller/AttributesController.php:760
+#: Controller/AttributesController.php:681
 msgid "The ThreatConnect data has been imported."
 msgstr ""
 
-#: Controller/AttributesController.php:763
+#: Controller/AttributesController.php:684
 msgid "%s entries imported."
 msgstr ""
 
-#: Controller/AttributesController.php:767
+#: Controller/AttributesController.php:688
 msgid "%s entries could not be imported."
 msgstr ""
 
-#: Controller/AttributesController.php:876
+#: Controller/AttributesController.php:715;975;2007;2061;2621;2632;2638;2713;2829;2862;2874;2878
+#: Controller/ObjectsController.php:621
+#: Controller/ShadowAttributesController.php:801
+#: Controller/TagsController.php:390
+#: Model/Attribute.php:4161
+msgid "Invalid attribute"
+msgstr ""
+
+#: Controller/AttributesController.php:768
 msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
 msgstr ""
 
-#: Controller/AttributesController.php:880;882
-#: Controller/ShadowAttributesController.php:817
+#: Controller/AttributesController.php:772;774
 msgid "Invalid attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:909
+#: Controller/AttributesController.php:799
 msgid "The attribute has been saved"
 msgstr ""
 
-#: Controller/AttributesController.php:944
+#: Controller/AttributesController.php:836
 msgid "The attribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/AttributesController.php:1036
-#: Controller/ObjectsController.php:515
-msgid "Invalid event id."
-msgstr ""
-
-#: Controller/AttributesController.php:1072
-#: Controller/EventsController.php:2466
-#: Controller/ShadowAttributesController.php:717
+#: Controller/AttributesController.php:930
+#: Controller/EventsController.php:2410
+#: Controller/ShadowAttributesController.php:675
 msgid "Invalid input."
 msgstr ""
 
-#: Controller/AttributesController.php:1077
+#: Controller/AttributesController.php:935
 msgid "Invalid field."
 msgstr ""
 
-#: Controller/AttributesController.php:1125;1161
-msgid "Invalid attribute id."
-msgstr ""
-
-#: Controller/AttributesController.php:1242;1319
+#: Controller/AttributesController.php:1065;1141
 msgid "This function is only accessible via POST requests."
 msgstr ""
 
-#: Controller/AttributesController.php:1249;1259
+#: Controller/AttributesController.php:1072;1082
 msgid "Attribute deleted"
 msgstr ""
 
-#: Controller/AttributesController.php:1254;1256
+#: Controller/AttributesController.php:1077;1079
 msgid "Attribute was not deleted"
 msgstr ""
 
-#: Controller/AttributesController.php:1281;2675
-#: Controller/ShadowAttributesController.php:853
+#: Controller/AttributesController.php:1103;2455
 msgid "Invalid Attribute"
 msgstr ""
 
-#: Controller/AttributesController.php:1308
+#: Controller/AttributesController.php:1130
 msgid "Could not restore the attribute"
 msgstr ""
 
-#: Controller/AttributesController.php:1374
+#: Controller/AttributesController.php:1199
 msgid "No matching attributes found."
 msgstr ""
 
-#: Controller/AttributesController.php:1408
-msgid "This method can only be accessed via AJAX."
+#: Controller/AttributesController.php:1233
+msgid "This method can only be accessed via AJAX and POST."
 msgstr ""
 
-#: Controller/AttributesController.php:1418
-msgid "You are not authorized to edit this event."
-msgstr ""
-
-#: Controller/AttributesController.php:1532
+#: Controller/AttributesController.php:1236
 msgid "No event ID provided."
 msgstr ""
 
-#: Controller/AttributesController.php:1577
-#: Controller/GalaxiesController.php:276
+#: Controller/AttributesController.php:1245;1375
+msgid "You are not authorized to edit this event."
+msgstr ""
+
+#: Controller/AttributesController.php:1249
+msgid "No attributes selected"
+msgstr ""
+
+#: Controller/AttributesController.php:1295
+#: Controller/GalaxiesController.php:415
 msgid "Synonyms: "
 msgstr ""
 
-#: Controller/AttributesController.php:1912;2019
+#: Controller/AttributesController.php:1363
+msgid "This method can only be accessed via POST."
+msgstr ""
+
+#: Controller/AttributesController.php:1777
 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:1925
-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:1945
-msgid "You don't have access to that event."
-msgstr ""
-
-#: Controller/AttributesController.php:2008
-msgid "No matches."
-msgstr ""
-
-#: Controller/AttributesController.php:2030;2039
-msgid "Invalid attribute or no authorisation to view it."
-msgstr ""
-
-#: Controller/AttributesController.php:2165
-#: Controller/ShadowAttributesController.php:1245
+#: Controller/AttributesController.php:1954
+#: Controller/ShadowAttributesController.php:1079
 msgid "All done. "
 msgstr ""
 
-#: Controller/AttributesController.php:2197;2244
-#: Controller/ShadowAttributesController.php:1053
+#: Controller/AttributesController.php:1986;2037
 msgid "Invalid field requested."
 msgstr ""
 
-#: Controller/AttributesController.php:2200;2247
+#: Controller/AttributesController.php:1989;2040
 msgid "This function can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:2282
+#: Controller/AttributesController.php:2065
 msgid "You do not have permission to do that"
 msgstr ""
 
-#: Controller/AttributesController.php:2312;2320
-#: Controller/EventsController.php:3660;3813;5017
+#: Controller/AttributesController.php:2092;2100
+#: Controller/EventsController.php:3518;3663
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:2341
+#: Controller/AttributesController.php:2121
 msgid "This action can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:2350;2601;2615;2626
-#: Controller/OrganisationsController.php:439
-#: Controller/ServersController.php:661;739
+#: Controller/AttributesController.php:2130;2381;2395;2406
+#: Controller/EventsController.php:2277
+#: Controller/OrganisationsController.php:420
+#: Controller/ServersController.php:718;799
 msgid "You are not authorised to do that."
 msgstr ""
 
-#: Controller/AttributesController.php:2455
-#: Controller/EventsController.php:4225
+#: Controller/AttributesController.php:2235
+#: Controller/EventsController.php:4076
 msgid "This functionality requires API key access."
 msgstr ""
 
-#: Controller/AttributesController.php:2463
+#: Controller/AttributesController.php:2243
 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:2475
+#: Controller/AttributesController.php:2255
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr ""
 
-#: Controller/AttributesController.php:2636
+#: Controller/AttributesController.php:2416
 msgid "Invalid script."
 msgstr ""
 
-#: Controller/AttributesController.php:2703
+#: Controller/AttributesController.php:2480
 msgid "No valid enrichment options found for this attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:2801
+#: Controller/AttributesController.php:2581
 msgid "Invalid type requested."
 msgstr ""
 
-#: Controller/AttributesController.php:2864;3071
-#: Controller/TagCollectionsController.php:254
+#: Controller/AttributesController.php:2644;2868
+#: Controller/TagCollectionsController.php:258
 msgid "Invalid tag"
 msgstr ""
 
-#: Controller/AttributesController.php:3161
-#: Controller/EventsController.php:5215
+#: Controller/AttributesController.php:2840
+#: Controller/EventsController.php:3429
+msgid "Invalid tag."
+msgstr ""
+
+#: Controller/AttributesController.php:2946
+#: Controller/EventsController.php:5126
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr ""
 
-#: Controller/AttributesController.php:3165;3180
-#: Controller/ShadowAttributesController.php:662
+#: Controller/AttributesController.php:2954
+#: Controller/ShadowAttributesController.php:620
 msgid "Invalid Attribute."
 msgstr ""
 
+#: Controller/AttributesController.php:3104
+#: Controller/ShadowAttributesController.php:1113
+msgid "Invalid attribute ID."
+msgstr ""
+
+#: Controller/AttributesController.php:455
+msgid "The attachment have been uploaded."
+msgid_plural "The attachments have been uploaded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: Controller/AttributesController.php:2812
+#: Controller/EventsController.php:3401
+msgid "Tag added."
+msgid_plural "Tags added."
+msgstr[0] ""
+msgstr[1] ""
+
+#: Controller/AttributesController.php:2815
+#: Controller/EventsController.php:3396
+msgid "Tag could not be added."
+msgid_plural "%s tags could not be added."
+msgstr[0] ""
+msgstr[1] ""
+
+#: Controller/AttributesController.php:2817
+msgid " However, %s tag was added."
+msgid_plural " However, %s tags were added."
+msgstr[0] ""
+msgstr[1] ""
+
+#: Controller/AuthKeysController.php:53
+msgid "Auth Keys"
+msgstr ""
+
+#: Controller/AuthKeysController.php:137
+#: View/AuthKeys/index.ctp:50
+#: View/AuthKeys/view.ctp:33
+msgid "Auth Key"
+msgstr ""
+
+#: Controller/CerebratesController.php:101;145;177
+msgid "Invalid Cerebrate instance ID provided."
+msgstr ""
+
+#: Controller/CerebratesController.php:116
+msgid "Added %s new organisations, updated %s existing organisations, %s failures."
+msgstr ""
+
+#: Controller/CerebratesController.php:125
+msgid "Sync organisation information"
+msgstr ""
+
+#: Controller/CerebratesController.php:126
+msgid "Are you sure you want to download and add / update the remote organisations from the Cerebrate node?"
+msgstr ""
+
+#: Controller/CerebratesController.php:127
+#: View/Pages/doc/using_the_system.ctp:419
+#: View/Servers/index.ctp:165
+msgid "Pull all"
+msgstr ""
+
+#: Controller/CerebratesController.php:193
+msgid "Organisation downloaded."
+msgstr ""
+
+#: Controller/CerebratesController.php:201
+msgid "Download organisation information"
+msgstr ""
+
+#: Controller/CerebratesController.php:202
+msgid "Are you sure you want to download and add / update the remote organisation?"
+msgstr ""
+
+#: Controller/CerebratesController.php:203
+#: View/Elements/markdownEditor/markdownEditor.ctp:62
+#: View/Events/export.ctp:115;144
+#: View/Galaxies/export.ctp:44
+msgid "Download"
+msgstr ""
+
 #: Controller/CommunitiesController.php:150
 msgid "Request sent."
 msgstr ""
@@ -418,60 +607,81 @@ msgstr ""
 msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
 msgstr ""
 
-#: Controller/DashboardsController.php:34;246;415
+#: Controller/CorrelationExclusionsController.php:31
+msgid "Correlation Exclusions index"
+msgstr ""
+
+#: Controller/CorrelationExclusionsController.php:68
+msgid "Correlation Exclusion"
+msgstr ""
+
+#: Controller/CorrelationExclusionsController.php:79
+msgid "Correlations cleanup initiated, based on the exclusion rules."
+msgstr ""
+
+#: Controller/CorrelationExclusionsController.php:87
+#: View/CorrelationExclusions/index.ctp:31
+msgid "Clean up correlations"
+msgstr ""
+
+#: Controller/CorrelationExclusionsController.php:88
+msgid "Execute the cleaning of all correlations that are at odds with the exclusion rules? This will delete all matching correlations."
+msgstr ""
+
+#: Controller/DashboardsController.php:37;253;422
 #: Model/Dashboard.php:240
 msgid "Invalid dashboard template."
 msgstr ""
 
-#: Controller/DashboardsController.php:89
+#: Controller/DashboardsController.php:92
 msgid "No widget name passed."
 msgstr ""
 
-#: Controller/DashboardsController.php:100
+#: Controller/DashboardsController.php:103
 msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
 msgstr ""
 
-#: Controller/DashboardsController.php:101
+#: Controller/DashboardsController.php:104
 msgid "Alias to use as the title of the widget"
 msgstr ""
 
-#: Controller/DashboardsController.php:114
+#: Controller/DashboardsController.php:117
 msgid "No setting data found."
 msgstr ""
 
-#: Controller/DashboardsController.php:125;205;210
+#: Controller/DashboardsController.php:128;211;216
 msgid "Settings updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:135
+#: Controller/DashboardsController.php:138
 msgid "Invalid widget."
 msgstr ""
 
-#: Controller/DashboardsController.php:156
-msgid "You need to specify the widget to use along with the configuration."
-msgstr ""
-
-#: Controller/DashboardsController.php:189
+#: Controller/DashboardsController.php:154
 msgid "This endpoint can only be reached via POST requests."
 msgstr ""
 
-#: Controller/DashboardsController.php:207;212
+#: Controller/DashboardsController.php:163
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:213;218
 msgid "Settings could not be updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:260;265
+#: Controller/DashboardsController.php:267;272
 msgid "Dashboard template updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:262;267
+#: Controller/DashboardsController.php:269;274
 msgid "Dashboard template could not be updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:275;282;293
+#: Controller/DashboardsController.php:282;289;300
 msgid "Unrestricted"
 msgstr ""
 
-#: Controller/DashboardsController.php:418
+#: Controller/DashboardsController.php:425
 msgid "Dashboard template removed."
 msgstr ""
 
@@ -485,7 +695,7 @@ msgstr ""
 
 #: Controller/DecayingModelController.php:36;105;207;243;264;276;354;387;399;409;430;442;452;544
 #: Controller/DecayingModelMappingController.php:25
-#: Model/DecayingModel.php:483;619
+#: Model/DecayingModel.php:499;653
 #: Model/DecayingModelMapping.php:30;59
 msgid "No Decaying Model with the provided ID exists"
 msgstr ""
@@ -495,6 +705,7 @@ msgid "Only one import field can be used"
 msgstr ""
 
 #: Controller/DecayingModelController.php:65
+#: Controller/GalaxiesController.php:171
 msgid "Error while decoding JSON"
 msgstr ""
 
@@ -624,475 +835,797 @@ msgstr ""
 msgid "Error Processing Request, can't parse the body"
 msgstr ""
 
-#: Controller/DecayingModelController.php:712
+#: Controller/DecayingModelController.php:705
 msgid "This method is only accessible via AJAX."
 msgstr ""
 
-#: Controller/EventBlacklistsController.php:15
-msgid "Event Blacklisting is not currently enabled on this instance."
+#: Controller/EventBlocklistsController.php:12
+msgid "Event Blocklisting is not currently enabled on this instance."
 msgstr ""
 
-#: Controller/EventBlacklistsController.php:76;98
+#: Controller/EventBlocklistsController.php:73
 msgid "Invalid event IDs."
 msgstr ""
 
-#: Controller/EventBlacklistsController.php:87
-msgid "Failed to delete Event from EventBlacklist. Error: "
+#: Controller/EventBlocklistsController.php:84
+msgid "Failed to delete Event from EventBlocklist. Error: "
 msgstr ""
 
-#: Controller/EventsController.php:894
-msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
+#: Controller/EventBlocklistsController.php:95
+msgid "Invalid event blocklist IDs."
 msgstr ""
 
-#: Controller/EventsController.php:896
+#: Controller/EventReportsController.php:51;107;362
+msgid "Report saved."
+msgstr ""
+
+#: Controller/EventReportsController.php:72
+msgid "Event report %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:80
+msgid "This function can only be reached via the API."
+msgstr ""
+
+#: Controller/EventReportsController.php:133
+msgid "Event Report %s %s deleted"
+msgstr ""
+
+#: Controller/EventReportsController.php:133;136
+#: Controller/GalaxyClustersController.php:716;726
+#: View/Objects/group_attributes_into_object.ctp:129
+msgid "hard"
+msgstr ""
+
+#: Controller/EventReportsController.php:133;136
+#: Controller/GalaxyClustersController.php:716;726
+#: View/Objects/group_attributes_into_object.ctp:129
+msgid "soft"
+msgstr ""
+
+#: Controller/EventReportsController.php:136
+msgid "Event Report %s could not be %s deleted.%sReasons: %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:141;165;212;242;262;298
+#: Controller/GalaxyClustersController.php:740
+#: Controller/GalaxyElementsController.php:83
+#: Controller/TaxonomiesController.php:432
+#: Controller/WarninglistsController.php:274
+msgid "This function can only be reached via AJAX."
+msgstr ""
+
+#: Controller/EventReportsController.php:157
+msgid "Event Report %s restored"
+msgstr ""
+
+#: Controller/EventReportsController.php:160
+msgid "Event Report %s could not be %s restored.%sReasons: %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:227
+msgid "Automatic extraction applied to Event Report %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:230
+msgid "Automatic extraction could not be applied to Event Report %s.%sReasons: %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:271
+msgid "`content` and `mapping` key cannot be empty"
+msgstr ""
+
+#: Controller/EventReportsController.php:283
+msgid "Suggestions applied to Event Report %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:286
+msgid "Suggestions could not be applied to Event Report %s.%sReasons: %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:303
+msgid "An URL must be provided"
+msgstr ""
+
+#: Controller/EventReportsController.php:310
+msgid "Report from - %s (%s)"
+msgstr ""
+
+#: Controller/EventReportsController.php:316
+msgid "Could not fetch report from URL. Fetcher module not enabled or could not download the page"
+msgstr ""
+
+#: Controller/EventReportsController.php:322
+msgid "Report downloaded and created"
+msgstr ""
+
+#: Controller/EventReportsController.php:350
+msgid "Event report (%s)"
+msgstr ""
+
+#: Controller/EventReportsController.php:356
+msgid "Could not generate markdown from the event"
+msgstr ""
+
+#: Controller/EventsController.php:848
+msgid "No X.509 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:902
-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."
+#: Controller/EventsController.php:856
+msgid "No X.509 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:904
+#: 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:1731
+#: Controller/EventsController.php:1491
+msgid "Event #%s"
+msgstr ""
+
+#: Controller/EventsController.php:1624
 msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1942
-msgid "You don't have permissions to create events"
+#: Controller/EventsController.php:1838
+msgid "You do not have permissions to create events."
 msgstr ""
 
-#: Controller/EventsController.php:1948
+#: Controller/EventsController.php:1844
 msgid "No valid event data received."
 msgstr ""
 
-#: Controller/EventsController.php:1984
+#: Controller/EventsController.php:1880
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr ""
 
-#: Controller/EventsController.php:1988;1992
-msgid "Invalid Sharing Group or not authorised."
+#: Controller/EventsController.php:1912
+msgid "Event blocked by local blocklist."
 msgstr ""
 
-#: Controller/EventsController.php:2016
-msgid "Event blocked by local blacklist."
-msgstr ""
-
-#: Controller/EventsController.php:2029;2116;2392
+#: Controller/EventsController.php:1924;2011;2339
 msgid "The event has been saved"
 msgstr ""
 
-#: Controller/EventsController.php:2037
+#: Controller/EventsController.php:1932
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr ""
 
-#: Controller/EventsController.php:2043
-msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
+#: Controller/EventsController.php:1938
+msgid "A blocklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr ""
 
-#: Controller/EventsController.php:2045;2395
+#: Controller/EventsController.php:1940;2342
 msgid "The event could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/EventsController.php:2094
+#: Controller/EventsController.php:1989
 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:2142
+#: Controller/EventsController.php:2037
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr ""
 
-#: Controller/EventsController.php:2143
+#: Controller/EventsController.php:2038
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr ""
 
-#: Controller/EventsController.php:2204
+#: Controller/EventsController.php:2052
+msgid "Could not process MISP export file. Probably file content is invalid."
+msgstr ""
+
+#: Controller/EventsController.php:2108
 msgid "STIX document imported, event's created: "
 msgstr ""
 
-#: Controller/EventsController.php:2207
+#: Controller/EventsController.php:2111
 msgid "STIX document imported."
 msgstr ""
 
-#: Controller/EventsController.php:2210
+#: Controller/EventsController.php:2114
 msgid "Could not import STIX document: "
 msgstr ""
 
-#: Controller/EventsController.php:2217
-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 "
+#: Controller/EventsController.php:2121
+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 %s MB."
 msgstr ""
 
-#: Controller/EventsController.php:2241;2326
-msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
+#: Controller/EventsController.php:2148
+msgid "This action requires a target_id for GET requests and both a target_id and a source_id for POST requests."
 msgstr ""
 
-#: Controller/EventsController.php:2249
-msgid "Invalid event ID entered."
+#: Controller/EventsController.php:2155
+msgid "Invalid target event."
 msgstr ""
 
-#: Controller/EventsController.php:2254
-msgid "You are not authorised to read the selected event."
+#: Controller/EventsController.php:2171
+msgid "Invalid source event."
 msgstr ""
 
-#: Controller/EventsController.php:2551;2655;2726
-msgid "You don't have the permission to do that."
+#: Controller/EventsController.php:2257
+msgid "Event merge results"
 msgstr ""
 
-#: Controller/EventsController.php:2560
-msgid "Event unpublished."
-msgstr ""
-
-#: Controller/EventsController.php:2667;2737
-msgid "Could not publish event - no tag for required taxonomies missing: %s"
-msgstr ""
-
-#: Controller/EventsController.php:2819
-msgid "You must specify a message."
-msgstr ""
-
-#: Controller/EventsController.php:2838
-msgid "Email sent to the reporter."
-msgstr ""
-
-#: Controller/EventsController.php:2847
-msgid "Sending of email failed."
-msgstr ""
-
-#: Controller/EventsController.php:2898
-msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
-msgstr ""
-
-#: Controller/EventsController.php:2986
-msgid "This feature is currently disabled"
-msgstr ""
-
-#: Controller/EventsController.php:3114
-msgid "Filename not allowed."
-msgstr ""
-
-#: Controller/EventsController.php:3134
-msgid "Problem with writing the IoC file. Please report to site admin."
-msgstr ""
-
-#: Controller/EventsController.php:3228
-msgid "This is not a valid MISP XML file."
-msgstr ""
-
-#: Controller/EventsController.php:3270
-msgid "Not yet implemented"
-msgstr ""
-
-#: Controller/EventsController.php:3288;3292
-msgid "Invalid event or not authorised."
-msgstr ""
-
-#: Controller/EventsController.php:3484
-#: Controller/TagCollectionsController.php:317
-msgid "Invalid Tag."
-msgstr ""
-
-#: Controller/EventsController.php:3500
-#: Controller/TagCollectionsController.php:333
-msgid "Tag is already attached to this event."
-msgstr ""
-
-#: Controller/EventsController.php:3514
-msgid "Tag is not allowed due to taxonomy exclusivity settings"
-msgstr ""
-
-#: Controller/EventsController.php:3545;3551
-#: Controller/TagCollectionsController.php:340
-msgid "Tag(s) added."
-msgstr ""
-
-#: Controller/EventsController.php:3547
-msgid "Tag could not be added."
-msgstr ""
-
-#: Controller/EventsController.php:3553
-#: Controller/TagCollectionsController.php:348
-msgid "All tags are already present, nothing to add."
-msgstr ""
-
-#: Controller/EventsController.php:3817;5021;5043;5550;5554
-#: Controller/ObjectsController.php:46;190;194;833;1245
-msgid "Invalid event."
-msgstr ""
-
-#: Controller/EventsController.php:3872;3902;3918
+#: Controller/EventsController.php:2489;2582;2653;3755;3771
+#: Controller/GalaxiesController.php:199
 msgid "You do not have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:3983;4124
+#: Controller/EventsController.php:2497
+msgid "Event unpublished."
+msgstr ""
+
+#: Controller/EventsController.php:2594;2662
+msgid "Could not publish event - no tag for required taxonomies missing: %s"
+msgstr ""
+
+#: Controller/EventsController.php:2743
+msgid "You must specify a message."
+msgstr ""
+
+#: Controller/EventsController.php:2761
+msgid "Email sent to the reporter."
+msgstr ""
+
+#: Controller/EventsController.php:2770
+msgid "Sending of email failed."
+msgstr ""
+
+#: Controller/EventsController.php:2819
+msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
+msgstr ""
+
+#: Controller/EventsController.php:2907
+msgid "This feature is currently disabled"
+msgstr ""
+
+#: Controller/EventsController.php:3023
+msgid "Filename not allowed."
+msgstr ""
+
+#: Controller/EventsController.php:3043
+msgid "Problem with writing the IoC file. Please report to site admin."
+msgstr ""
+
+#: Controller/EventsController.php:3119
+msgid "Not yet implemented"
+msgstr ""
+
+#: Controller/EventsController.php:3137;3141
+msgid "Invalid event or not authorised."
+msgstr ""
+
+#: Controller/EventsController.php:3322
+msgid "Nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3338
+msgid "Tag not found."
+msgstr ""
+
+#: Controller/EventsController.php:3349
+msgid "Tag is already attached to this event."
+msgstr ""
+
+#: Controller/EventsController.php:3363
+msgid "Tag is not allowed due to taxonomy exclusivity settings"
+msgstr ""
+
+#: Controller/EventsController.php:3404
+msgid ", but %s could not be added: %s"
+msgstr ""
+
+#: Controller/EventsController.php:3418;3522;3670;4912;4939;5458;5462
+#: Controller/ObjectsController.php:44;174;1157
+#: Controller/TagsController.php:361
+msgid "Invalid event."
+msgstr ""
+
+#: Controller/EventsController.php:3835;3976
 msgid "Invalid ID"
 msgstr ""
 
-#: Controller/EventsController.php:3987;4128;4703
+#: Controller/EventsController.php:3839;3980;4557
 msgid "Event not found or you are not authorised to view it."
 msgstr ""
 
-#: Controller/EventsController.php:4134
+#: Controller/EventsController.php:3985
 msgid "Freetext Import"
 msgstr ""
 
-#: Controller/EventsController.php:4140
+#: Controller/EventsController.php:3991
 msgid "Populate using a Template"
 msgstr ""
 
-#: Controller/EventsController.php:4146
+#: Controller/EventsController.php:3997
 msgid "OpenIOC Import"
 msgstr ""
 
-#: Controller/EventsController.php:4151
+#: Controller/EventsController.php:4002
 msgid "ThreatConnect Import"
 msgstr ""
 
-#: Controller/EventsController.php:4156
+#: Controller/EventsController.php:4007
 msgid "(Experimental) Forensic analysis - Mactime"
 msgstr ""
 
-#: Controller/EventsController.php:4175
+#: Controller/EventsController.php:4026
 msgid "MISP standard (recommended exchange format - lossless)"
 msgstr ""
 
-#: Controller/EventsController.php:4181
+#: Controller/EventsController.php:4032
 msgid "STIX 1.1.1 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4186
+#: Controller/EventsController.php:4037
 msgid "STIX 2.0 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4228;4235
+#: Controller/EventsController.php:4079;4086
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4264
+#: Controller/EventsController.php:4115
 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:4272
+#: Controller/EventsController.php:4123
 msgid "Event not found"
 msgstr ""
 
-#: Controller/EventsController.php:4295
+#: Controller/EventsController.php:4146
 msgid "Event not found."
 msgstr ""
 
-#: Controller/EventsController.php:4305
+#: Controller/EventsController.php:4156
 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:4330
+#: Controller/EventsController.php:4181
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
+#: Controller/EventsController.php:4306;4328;4391;4416;4441;4471;4492
 msgid "Invalid type."
 msgstr ""
 
-#: Controller/EventsController.php:4768
+#: Controller/EventsController.php:4622
 msgid "Invalid method."
 msgstr ""
 
-#: Controller/EventsController.php:4850
+#: Controller/EventsController.php:4737
 msgid "%s services are not enabled."
 msgstr ""
 
-#: Controller/EventsController.php:4854
+#: Controller/EventsController.php:4741
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:4859
+#: Controller/EventsController.php:4746
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4914;4960
+#: Controller/EventsController.php:4800;4845
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:4926
+#: Controller/EventsController.php:4812
 msgid ": Enriched via the "
 msgstr ""
 
-#: Controller/EventsController.php:4977
+#: Controller/EventsController.php:4862
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:5132
-msgid "Import service not reachable."
-msgstr ""
-
-#: Controller/EventsController.php:5222;5236
-#: Controller/PostsController.php:60;84
-#: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
+#: Controller/EventsController.php:4915;5133
+#: Controller/PostsController.php:77
+#: Controller/TaxonomiesController.php:118;149;273;311;341;371
 msgid "You don't have permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:5363
-#: Controller/WarninglistsController.php:229
+#: Controller/EventsController.php:5034
+msgid "Import service not reachable."
+msgstr ""
+
+#: Controller/EventsController.php:5254
+#: Controller/WarninglistsController.php:241
 msgid "Invalid ID."
 msgstr ""
 
-#: Controller/EventsController.php:5411
-#: Controller/ShadowAttributesController.php:295;300;516
+#: Controller/EventsController.php:5277;5323;5342
+#: Controller/ShadowAttributesController.php:266;477
+#: Model/EventReport.php:431
 msgid "Invalid Event"
 msgstr ""
 
-#: Controller/EventsController.php:5432
+#: Controller/EventsController.php:5301
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr ""
 
-#: Controller/EventsController.php:5683
+#: Controller/EventsController.php:5368
+msgid "another user"
+msgstr ""
+
+#: Controller/EventsController.php:5373
+msgid "background job"
+msgstr ""
+
+#: Controller/EventsController.php:5375
+msgid "external tool"
+msgstr ""
+
+#: Controller/EventsController.php:5383
+msgid "Warning: Your view on this event might not be up to date as it is currently being edited by: %s"
+msgstr ""
+
+#: Controller/EventsController.php:5591
 msgid "%s event(s) deleted."
 msgstr ""
 
-#: Controller/FeedsController.php:39
+#: Controller/EventsController.php:5631
+msgid "Recovery simulation complete. Event #%s can be recovered using %s log entries."
+msgstr ""
+
+#: Controller/EventsController.php:5649;5692
+#: Controller/WarninglistsController.php:55
+msgid "This action is only accessible via POST requests."
+msgstr ""
+
+#: Controller/EventsController.php:5662
+msgid "Bootstraping recovering of event %s"
+msgstr ""
+
+#: Controller/EventsController.php:5685
+msgid "Recover event job queued. Job ID: %s"
+msgstr ""
+
+#: Controller/EventsController.php:3403
+msgid "Tag added"
+msgid_plural "%s tags added"
+msgstr[0] ""
+msgstr[1] ""
+
+#: Controller/FeedsController.php:41
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:47
+#: Controller/FeedsController.php:49
 msgid "Default feed metadata loaded."
 msgstr ""
 
-#: Controller/FeedsController.php:283;391
+#: Controller/FeedsController.php:275;387
 msgid "Feed added."
 msgstr ""
 
-#: Controller/FeedsController.php:291
+#: Controller/FeedsController.php:283
 msgid "Feed could not be added. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:316;426;448;577;618;829
+#: Controller/FeedsController.php:308;422;444;573;611;764
 msgid "Invalid feed."
 msgstr ""
 
-#: Controller/FeedsController.php:399
+#: Controller/FeedsController.php:395
 msgid "Feed could not be updated. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:422
-#: Controller/OrganisationsController.php:244
-#: Controller/SharingGroupsController.php:237
-#: Controller/UsersController.php:1044
+#: Controller/FeedsController.php:418
+#: Controller/OrganisationsController.php:253
+#: Controller/SharingGroupsController.php:233
+#: Controller/UsersController.php:1067
 msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:455;581
+#: Controller/FeedsController.php:451;577
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:468;534
+#: Controller/FeedsController.php:464;530
 msgid "Starting fetch from Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:479
+#: Controller/FeedsController.php:475
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:484;486
+#: Controller/FeedsController.php:480;482
 msgid "Fetching the feed has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:490;551
+#: Controller/FeedsController.php:486;547
 msgid "Fetching the feed has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:563
+#: Controller/FeedsController.php:559
 msgid "No feed enabled."
 msgstr ""
 
-#: Controller/FeedsController.php:587;606
-#: Controller/ServersController.php:116;161
+#: Controller/FeedsController.php:583;602
+#: Controller/ServersController.php:122
 msgid "Download failed."
 msgstr ""
 
-#: Controller/FeedsController.php:594
+#: Controller/FeedsController.php:590
 msgid "Event added."
 msgstr ""
 
-#: Controller/FeedsController.php:597
+#: Controller/FeedsController.php:593
 msgid "Event already up to date."
 msgstr ""
 
-#: Controller/FeedsController.php:599
+#: Controller/FeedsController.php:595
 msgid "Event updated."
 msgstr ""
 
-#: Controller/FeedsController.php:603
+#: Controller/FeedsController.php:599
 msgid "Could not %s event."
 msgstr ""
 
-#: Controller/FeedsController.php:700
-msgid "Feed could not be fetched. The HTTP error code returned was: "
-msgstr ""
-
-#: Controller/FeedsController.php:739;790
+#: Controller/FeedsController.php:720
 msgid "Invalid feed type."
 msgstr ""
 
-#: Controller/FeedsController.php:835;867
+#: Controller/FeedsController.php:770;807
 msgid "Could not download the selected Event"
 msgstr ""
 
-#: Controller/FeedsController.php:865
+#: Controller/FeedsController.php:805
 msgid "This event is blocked by the Feed filters."
 msgstr ""
 
-#: Controller/FeedsController.php:903;907
+#: Controller/FeedsController.php:843;847
 msgid "Invalid Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:928
+#: Controller/FeedsController.php:868
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: Controller/FeedsController.php:932
+#: Controller/FeedsController.php:872
 msgid "Feed not found."
 msgstr ""
 
-#: Controller/FeedsController.php:941
+#: Controller/FeedsController.php:881
 msgid "Data pulled."
 msgstr ""
 
-#: Controller/FeedsController.php:943
+#: Controller/FeedsController.php:883
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:960
+#: Controller/FeedsController.php:900
 msgid "Starting feed caching."
 msgstr ""
 
-#: Controller/FeedsController.php:975
+#: Controller/FeedsController.php:915
 msgid "Caching the feeds has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:978
+#: Controller/FeedsController.php:918
 msgid "Caching the feeds has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:1012
+#: Controller/FeedsController.php:949
 msgid "Invalid feed list received."
 msgstr ""
 
-#: Controller/GalaxiesController.php:157
-msgid "All clusters"
+#: Controller/GalaxiesController.php:153
+msgid "Only one import field can be used at a time"
+msgstr ""
+
+#: Controller/GalaxiesController.php:176
+msgid "Galaxy clusters imported. %s imported, %s ignored, %s failed. %s"
+msgstr ""
+
+#: Controller/GalaxiesController.php:184
+msgid "Could not import galaxy clusters. %s imported, %s ignored, %s failed. %s"
+msgstr ""
+
+#: Controller/GalaxiesController.php:202
+msgid "This action is only accessible via a REST request."
 msgstr ""
 
 #: Controller/GalaxiesController.php:207
+msgid "%s imported, %s ignored, %s failed. %s"
+msgstr ""
+
+#: Controller/GalaxiesController.php:209
+msgid "Galaxy clusters imported. "
+msgstr ""
+
+#: Controller/GalaxiesController.php:212
+msgid "Could not import galaxy clusters. "
+msgstr ""
+
+#: Controller/GalaxiesController.php:260
+msgid "All sharing groups"
+msgstr ""
+
+#: Controller/GalaxiesController.php:281
+msgid "All clusters"
+msgstr ""
+
+#: Controller/GalaxiesController.php:335
 msgid "All namespaces"
 msgstr ""
 
-#: Controller/GalaxiesController.php:337
+#: Controller/GalaxiesController.php:479
 msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:340
+#: Controller/GalaxiesController.php:482
 msgid "Failed to parse request."
 msgstr ""
 
+#: Controller/GalaxyClusterBlocklistsController.php:59
+#: Controller/Component/BlockListComponent.php:179
+msgid "Invalid blocklist entry"
+msgstr ""
+
+#: Controller/GalaxyClusterBlocklistsController.php:75;97
+msgid "Invalid cluster IDs."
+msgstr ""
+
+#: Controller/GalaxyClusterBlocklistsController.php:86
+msgid "Failed to delete GalaxyCluster from GalaxyClusterBlocklist. Error: "
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:94;193
+msgid "Invalid cluster relation"
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:105
+msgid "This method can only be accessed via RestSearch."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:150;245
+msgid "Relationship added."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:154;249
+msgid "Relationship could not be added."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:176;265
+#: Controller/SightingdbController.php:49;99;143
+msgid " Reason: %s"
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:198
+msgid "Default cluster relation cannot be edited"
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:258
+#: Model/GalaxyClusterRelation.php:315
+msgid "Galaxy Cluster Relation could not be saved: The user has to have access to the sharing group in order to be able to edit it."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:284
+msgid "Relation not found."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:292
+msgid "Galaxy cluster relationship successfuly deleted."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:300
+msgid "Galaxy cluster relationship could not be deleted."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:199
+msgid "This cluster is not published. Users will not be able to use it"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:216;220
+msgid "Invalid galaxy"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:279;280;386;387
+msgid "Invalid JSON"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:310;422
+msgid "Galaxy cluster saved"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:441
+#: View/GalaxyClusters/add.ctp:69
+msgid "Valid JSON array or comma separated"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:442
+msgid "Valid JSON array composed from Object of the form {key: keyname, value: actualValue}"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:465
+msgid "You can't publish a galaxy cluster that is already published"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:468
+msgid "Default galaxy cluster cannot be published"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:474
+msgid "Publish job queued. Job ID: %s"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:481
+msgid "Could not publish galaxy cluster"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:488
+msgid "Galaxy cluster published"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:511
+msgid "You can't unpublish a galaxy cluster that is not published"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:514
+msgid "Default galaxy cluster cannot be unpublished"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:520
+msgid "Could not unpublish galaxy cluster"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:527
+msgid "Galaxy cluster unpublished"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:714
+msgid "Galaxy cluster successfuly %s deleted%s."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:717
+msgid " and added to the block list"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:726
+msgid "Galaxy cluster could not be %s deleted."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:752
+msgid "Galaxy cluster successfuly restored."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:760
+msgid "Galaxy cluster could not be %s restored."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:769
+msgid "This function can only be reached via POST."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:903
+msgid "Default galaxy cluster cannot be updated"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:906
+msgid "Galaxy cluster is not a fork"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:937
+msgid "Cluster updated to the newer version"
+msgstr ""
+
+#: Controller/GalaxyElementsController.php:65
+msgid "Element not found"
+msgstr ""
+
+#: Controller/GalaxyElementsController.php:74
+msgid "Galaxy element %s deleted"
+msgstr ""
+
+#: Controller/GalaxyElementsController.php:77
+msgid "Could not delete galaxy element"
+msgstr ""
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr ""
@@ -1101,230 +1634,259 @@ msgstr ""
 msgid "All jobs have been purged"
 msgstr ""
 
-#: Controller/NewsController.php:51
+#: Controller/NewsController.php:46
 msgid "News item added."
 msgstr ""
 
-#: Controller/NewsController.php:54
+#: Controller/NewsController.php:49
 msgid "The news item could not be added."
 msgstr ""
 
-#: Controller/NewsController.php:68
+#: Controller/NewsController.php:63
 msgid "News item updated."
 msgstr ""
 
-#: Controller/NewsController.php:71
+#: Controller/NewsController.php:66
 msgid "Could not update news item."
 msgstr ""
 
-#: Controller/NewsController.php:89
+#: Controller/NewsController.php:84
 msgid "News item deleted."
 msgstr ""
 
-#: Controller/NewsController.php:92
+#: Controller/NewsController.php:87
 msgid "News item could not be deleted."
 msgstr ""
 
 #: Controller/ObjectReferencesController.php:37
-#: Controller/ObjectsController.php:511;607;650;671;686;757;768;786
+#: Controller/ObjectsController.php:587;625;653;735
 msgid "Invalid object"
 msgstr ""
 
-#: Controller/ObjectReferencesController.php:163
+#: Controller/ObjectReferencesController.php:178;230
 msgid "Invalid object reference"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:31
+#: Controller/ObjectReferencesController.php:186;189;237
+msgid "Invalid object reference."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:33
 msgid "All Objects"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:99
+#: Controller/ObjectTemplatesController.php:101
 msgid "Invalid object template"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:103
+#: Controller/ObjectTemplatesController.php:105
 msgid "Invalid object template id."
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:143
-msgid "ObjectTemplate deleted"
+#: Controller/ObjectTemplatesController.php:145
+msgid "Object Template deleted"
 msgstr ""
 
-#: Controller/ObjectsController.php:29
+#: Controller/ObjectTemplatesController.php:306
+msgid "Template not found"
+msgstr ""
+
+#: Controller/ObjectsController.php:32
 msgid "This action can only be reached via POST requests"
 msgstr ""
 
-#: Controller/ObjectsController.php:69;82;1272
-msgid "Invalid sharing group."
-msgstr ""
-
-#: Controller/ObjectsController.php:153
+#: Controller/ObjectsController.php:145
 msgid "You don't have permissions to create objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:181;1257;1309
+#: Controller/ObjectsController.php:168;1172;1219
 #: Model/Template.php:25
 msgid "Invalid template."
 msgstr ""
 
-#: Controller/ObjectsController.php:295;424;430
+#: Controller/ObjectsController.php:280;421;427
 msgid "Object could not be saved."
 msgstr ""
 
-#: Controller/ObjectsController.php:373;1006
-#: Model/Event.php:6248
+#: Controller/ObjectsController.php:359;802;906
+#: Model/Event.php:6483
 msgid "Invalid object."
 msgstr ""
 
-#: Controller/ObjectsController.php:377
+#: Controller/ObjectsController.php:364
 msgid "Insufficient permissions to edit this object."
 msgstr ""
 
-#: Controller/ObjectsController.php:449
+#: Controller/ObjectsController.php:380
+msgid "Force update anyway"
+msgstr ""
+
+#: Controller/ObjectsController.php:453
 msgid "Object attributes saved."
 msgstr ""
 
-#: Controller/ObjectsController.php:518
+#: Controller/ObjectsController.php:512
 msgid "This function can only be accessed via POST or PUT"
 msgstr ""
 
-#: Controller/ObjectsController.php:711
+#: Controller/ObjectsController.php:678;756
 msgid "Invalid template"
 msgstr ""
 
-#: Controller/ObjectsController.php:789
+#: Controller/ObjectsController.php:759
 msgid "Invalid fields"
 msgstr ""
 
-#: Controller/ObjectsController.php:796
+#: Controller/ObjectsController.php:766
 msgid "Invalid field"
 msgstr ""
 
-#: Controller/ObjectsController.php:822
+#: Controller/ObjectsController.php:791
 msgid "You don't have permissions to delete objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:926;933;937
+#: Controller/ObjectsController.php:886
 msgid "Object not found or not authorised."
 msgstr ""
 
-#: Controller/ObjectsController.php:1203
+#: Controller/ObjectsController.php:1115
 msgid "%s objects successfully reconstructed."
 msgstr ""
 
-#: Controller/ObjectsController.php:1213;1249
+#: Controller/ObjectsController.php:1125;1164
 msgid "This action can only be reached via AJAX."
 msgstr ""
 
-#: Controller/ObjectsController.php:1290
+#: Controller/ObjectsController.php:1182
+msgid "Invalid sharing group."
+msgstr ""
+
+#: Controller/ObjectsController.php:1200
 msgid "Failed to create an Object from Attributes. Error: "
 msgstr ""
 
-#: Controller/ObjectsController.php:1301
+#: Controller/ObjectsController.php:1211
 msgid "No Attribute selected."
 msgstr ""
 
-#: Controller/OrgBlacklistsController.php:15
-msgid "Organisation Blacklisting is not currently enabled on this instance."
+#: Controller/ObjectsController.php:1276
+msgid "Invalid object ID."
 msgstr ""
 
-#: Controller/OrganisationsController.php:28
+#: Controller/OrgBlocklistsController.php:15
+msgid "Organisation BlockListing is not currently enabled on this instance."
+msgstr ""
+
+#: Controller/OrganisationsController.php:31
 msgid "This feature is disabled on this instance for normal users."
 msgstr ""
 
-#: Controller/OrganisationsController.php:133
+#: Controller/OrganisationsController.php:87
+#: View/Elements/healthElements/diagnostics.ctp:34;46;159
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:30
+#: View/SharingGroups/view.ctp:14;20
+msgid "Unknown"
+msgstr ""
+
+#: Controller/OrganisationsController.php:138
 msgid "The organisation has been successfully added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:140
+#: Controller/OrganisationsController.php:145
 msgid "The organisation could not be added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:163;296;302
+#: Controller/OrganisationsController.php:160;233
+msgid "Not specified"
+msgstr ""
+
+#: Controller/OrganisationsController.php:169
 msgid "Invalid organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:169;249;255;308;335;368
+#: Controller/OrganisationsController.php:175;258;264;332
+#: Controller/UsersController.php:2136
 msgid "Invalid organisation"
 msgstr ""
 
-#: Controller/OrganisationsController.php:208
+#: Controller/OrganisationsController.php:207
 msgid "Organisation updated."
 msgstr ""
 
-#: Controller/OrganisationsController.php:223
+#: Controller/OrganisationsController.php:222
 msgid "The organisation could not be updated."
 msgstr ""
 
-#: Controller/OrganisationsController.php:272
+#: Controller/OrganisationsController.php:281
 msgid "Organisation deleted"
 msgstr ""
 
-#: Controller/OrganisationsController.php:279
+#: Controller/OrganisationsController.php:288
 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/OrganisationsController.php:373
-msgid "No landing page has been created for this organisation."
+#: Controller/OrganisationsController.php:358
+msgid "Organisation %s"
 msgstr ""
 
-#: Controller/OrganisationsController.php:422
+#: Controller/OrganisationsController.php:403
 msgid "This action is restricted to sync users"
 msgstr ""
 
-#: Controller/OrganisationsController.php:444
+#: Controller/OrganisationsController.php:425
 msgid "The organisation has been successfully merged."
 msgstr ""
 
-#: Controller/OrganisationsController.php:447
+#: Controller/OrganisationsController.php:428
 msgid "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"
 msgstr ""
 
-#: Controller/PostsController.php:54
-msgid "Discussion about Event #"
+#: Controller/PostsController.php:56
+msgid "Discussion about Event #%s (%s)"
 msgstr ""
 
-#: Controller/PostsController.php:80
+#: Controller/PostsController.php:73
 msgid "Invalid thread"
 msgstr ""
 
-#: Controller/PostsController.php:115
+#: Controller/PostsController.php:108
 msgid "Cannot post an empty message."
 msgstr ""
 
-#: Controller/PostsController.php:176
+#: Controller/PostsController.php:169
 msgid "Post added"
 msgstr ""
 
-#: Controller/PostsController.php:189
+#: Controller/PostsController.php:182
 msgid "The post could not be added."
 msgstr ""
 
-#: Controller/PostsController.php:208;256
+#: Controller/PostsController.php:201;249
 msgid "Invalid post"
 msgstr ""
 
-#: Controller/PostsController.php:211
-msgid "This is not your event."
+#: Controller/PostsController.php:204
+msgid "This is not your post."
 msgstr ""
 
-#: Controller/PostsController.php:219
+#: Controller/PostsController.php:212
 msgid "Post edited"
 msgstr ""
 
-#: Controller/PostsController.php:240
+#: Controller/PostsController.php:233
 msgid "The post could not be edited. Please, try again."
 msgstr ""
 
-#: Controller/PostsController.php:261
+#: Controller/PostsController.php:254
 msgid "This post doesn't belong to you, so you cannot delete it."
 msgstr ""
 
-#: Controller/PostsController.php:274
+#: Controller/PostsController.php:267
 msgid "Post and thread deleted"
 msgstr ""
 
-#: Controller/PostsController.php:283
+#: Controller/PostsController.php:276
 msgid "Post deleted"
 msgstr ""
 
@@ -1360,418 +1922,473 @@ msgstr ""
 msgid "Entry removed."
 msgstr ""
 
-#: Controller/RolesController.php:33
-msgid "Invalid role"
-msgstr ""
-
-#: Controller/RolesController.php:59;100
-msgid "The Role has been saved"
-msgstr ""
-
-#: Controller/RolesController.php:67;108
-msgid "The Role could not be saved. Please, try again."
-msgstr ""
-
-#: Controller/RolesController.php:85;151
+#: Controller/RolesController.php:57
 msgid "Invalid Role"
 msgstr ""
 
-#: Controller/RolesController.php:157
-msgid "Role deleted"
+#: Controller/RolesController.php:72
+msgid "The Role has been saved"
 msgstr ""
 
-#: Controller/RolesController.php:164
-msgid "Role could not be deleted"
+#: Controller/RolesController.php:80
+msgid "The Role could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/RolesController.php:200
+#: Controller/RolesController.php:105
+msgid "It is not possible to delete role that is assigned to users."
+msgstr ""
+
+#: Controller/RolesController.php:155
 msgid "Default role set."
 msgstr ""
 
-#: Controller/RolesController.php:200
+#: Controller/RolesController.php:155
 msgid "Default role unset."
 msgstr ""
 
-#: Controller/ServersController.php:237;436
+#: Controller/RolesController.php:170
+msgid "This endpoint expects a POST request."
+msgstr ""
+
+#: Controller/ServersController.php:165
+msgid "Event '%s' not found."
+msgstr ""
+
+#: Controller/ServersController.php:167
+msgid "Download failed. %s"
+msgstr ""
+
+#: Controller/ServersController.php:207
+msgid "Remote event preview"
+msgstr ""
+
+#: Controller/ServersController.php:215
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "Server overlap analysis matrix"
+msgstr ""
+
+#: Controller/ServersController.php:263;457
 msgid "The pull filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:247;446
+#: Controller/ServersController.php:273;467
 msgid "The push filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:302;476
+#: Controller/ServersController.php:330;497
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr ""
 
-#: Controller/ServersController.php:314
+#: Controller/ServersController.php:342
 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:350;532;2166
+#: Controller/ServersController.php:378;553;2332
 msgid "The server has been saved"
 msgstr ""
 
-#: Controller/ServersController.php:357;539
+#: Controller/ServersController.php:385;560
 msgid "The server could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
-#: Model/Server.php:5861
+#: Controller/ServersController.php:432;622;710;713;722;789;795;1634;1648
+#: Model/Server.php:4234
 msgid "Invalid server"
 msgstr ""
 
-#: Controller/ServersController.php:493
+#: Controller/ServersController.php:514
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr ""
 
-#: Controller/ServersController.php:604;2183;2225
+#: Controller/ServersController.php:618;2349;2391
 msgid "This endpoint expects POST requests."
 msgstr ""
 
-#: Controller/ServersController.php:612
+#: Controller/ServersController.php:626
 msgid "You don't have the privileges to do that."
 msgstr ""
 
-#: Controller/ServersController.php:621
+#: Controller/ServersController.php:635
 msgid "Server deleted"
 msgstr ""
 
-#: Controller/ServersController.php:630
+#: Controller/ServersController.php:644
 msgid "Server was not deleted"
 msgstr ""
 
-#: Controller/ServersController.php:668
+#: Controller/ServersController.php:674
+msgid "Settings saved"
+msgstr ""
+
+#: Controller/ServersController.php:676
+msgid "Could not save the settings. Invalid input."
+msgstr ""
+
+#: Controller/ServersController.php:725;728
 msgid "Pull setting not enabled for this server."
 msgstr ""
 
-#: Controller/ServersController.php:692
+#: Controller/ServersController.php:752
 msgid "Pulling."
 msgstr ""
 
-#: Controller/ServersController.php:702
+#: Controller/ServersController.php:762
 msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:748
+#: Controller/ServersController.php:808
 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:761
+#: Controller/ServersController.php:821
 msgid "Push complete. %s events pushed, %s events could not be pushed."
 msgstr ""
 
-#: Controller/ServersController.php:776
+#: Controller/ServersController.php:836
 msgid "Pushing."
 msgstr ""
 
-#: Controller/ServersController.php:786
+#: Controller/ServersController.php:846
 msgid "Push queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:814
+#: Controller/ServersController.php:874
 msgid "Filename not allowed"
 msgstr ""
 
-#: Controller/ServersController.php:819
+#: Controller/ServersController.php:879
 msgid "Incorrect extension or empty file."
 msgstr ""
 
-#: Controller/ServersController.php:901
-msgid "No organisation selected."
-msgstr ""
-
-#: Controller/ServersController.php:917;918;919;920;921;922;923;924;925;926;927;928;929;930;931
-#: View/Elements/healthElements/diagnostics.ctp:26;170;184;271;331
+#: Controller/ServersController.php:955;956;957;958;959;960;961;962;963;964;965;966;967;968
+#: View/Elements/healthElements/diagnostics.ctp:26;199;313;322;383
 #: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/submoduleStatus.ctp:23
-#: View/Servers/ajax/zeromqstatus.ctp:11
+#: View/Servers/ajax/zeromqstatus.ctp:12
 msgid "OK"
 msgstr ""
 
-#: Controller/ServersController.php:917
+#: Controller/ServersController.php:955
 msgid "not found"
 msgstr ""
 
-#: Controller/ServersController.php:917
+#: Controller/ServersController.php:955
 msgid "is not writeable"
 msgstr ""
 
-#: Controller/ServersController.php:918
+#: Controller/ServersController.php:956
 msgid "not readable"
 msgstr ""
 
-#: Controller/ServersController.php:919
+#: Controller/ServersController.php:957
 msgid "FAIL: settings not set"
 msgstr ""
 
-#: Controller/ServersController.php:919
+#: Controller/ServersController.php:957
 msgid "FAIL: Failed to load GnuPG"
 msgstr ""
 
-#: Controller/ServersController.php:919
+#: Controller/ServersController.php:957
 msgid "FAIL: Issues with the key/passphrase"
 msgstr ""
 
-#: Controller/ServersController.php:919
+#: Controller/ServersController.php:957
 msgid "FAIL: sign failed"
 msgstr ""
 
-#: Controller/ServersController.php:920
+#: Controller/ServersController.php:958
 msgid "not configured (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:920
+#: Controller/ServersController.php:958
 msgid "Getting URL via proxy failed"
 msgstr ""
 
-#: Controller/ServersController.php:921
+#: Controller/ServersController.php:959
 msgid "not enabled (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:921
+#: Controller/ServersController.php:959
 msgid "Python ZeroMQ library not installed correctly."
 msgstr ""
 
-#: Controller/ServersController.php:921
+#: Controller/ServersController.php:959
 msgid "ZeroMQ script not running."
 msgstr ""
 
-#: Controller/ServersController.php:922
+#: Controller/ServersController.php:960
 msgid "Some of the libraries related to STIX are not installed. Make sure that all libraries listed below are correctly installed."
 msgstr ""
 
-#: Controller/ServersController.php:923
+#: Controller/ServersController.php:961
 msgid "Incorrect STIX version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:924
+#: Controller/ServersController.php:962
 msgid "Incorrect STIX2 version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:925
+#: Controller/ServersController.php:963
 msgid "Incorrect CyBox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:926
+#: Controller/ServersController.php:964
 msgid "Incorrect mixbox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:927
+#: Controller/ServersController.php:965
 msgid "Incorrect maec version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:928
+#: Controller/ServersController.php:966
 msgid "Incorrect PyMISP version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:929
-msgid "Incorrect plyara version installed, found $current, expecting $expected"
-msgstr ""
-
-#: Controller/ServersController.php:930
+#: Controller/ServersController.php:967
 #: View/Events/filter_event_index.ctp:32;188
 #: View/Pages/doc/using_the_system.ctp:68;173
 msgid "High"
 msgstr ""
 
-#: Controller/ServersController.php:930
+#: Controller/ServersController.php:967
 msgid "Alternative setting used"
 msgstr ""
 
-#: Controller/ServersController.php:930
+#: Controller/ServersController.php:967
 msgid "Test failed"
 msgstr ""
 
-#: Controller/ServersController.php:931
+#: Controller/ServersController.php:968
 msgid "System not enabled"
 msgstr ""
 
-#: Controller/ServersController.php:931
+#: Controller/ServersController.php:968
 msgid "No modules found"
 msgstr ""
 
-#: Controller/ServersController.php:938
+#: Controller/ServersController.php:975
 msgid "MISP will not operate correctly or will be unsecure until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:942
+#: Controller/ServersController.php:979
 msgid "Some of the features of MISP cannot be utilised until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:946
+#: Controller/ServersController.php:983
 msgid "There are some optional tweaks that could be done to improve the looks of your MISP instance."
 msgstr ""
 
-#: Controller/ServersController.php:1165
+#: Controller/ServersController.php:1209
 msgid "Only one `update` worker can run at a time"
 msgstr ""
 
-#: Controller/ServersController.php:1177
+#: Controller/ServersController.php:1221
 msgid "Worker start signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1192
+#: Controller/ServersController.php:1236
 msgid "Worker stop signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1249
+#: Controller/ServersController.php:1251
+msgid "Background jobs not enabled"
+msgstr ""
+
+#: Controller/ServersController.php:1317
+msgid "Issue while contacting the remote server to retrieve event information"
+msgstr ""
+
+#: Controller/ServersController.php:1334
+msgid "This event could not be found or you don't have permissions to see it."
+msgstr ""
+
+#: Controller/ServersController.php:1337
+msgid "The event has been found."
+msgstr ""
+
+#: Controller/ServersController.php:1367
+#: View/Elements/global_menu.ctp:323
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Servers/id_translator.ctp:6
+msgid "Event ID translator"
+msgstr ""
+
+#: Controller/ServersController.php:1380
 msgid "This setting is redacted."
 msgstr ""
 
-#: Controller/ServersController.php:1274
+#: Controller/ServersController.php:1402
+msgid "Setting %s is invalid."
+msgstr ""
+
+#: Controller/ServersController.php:1405
 msgid "This setting can only be edited via the CLI."
 msgstr ""
 
-#: Controller/ServersController.php:1365;1377
+#: Controller/ServersController.php:1492
+msgid "Killing workers."
+msgstr ""
+
+#: Controller/ServersController.php:1504;1516
 msgid "Restarting workers."
 msgstr ""
 
-#: Controller/ServersController.php:1401
+#: Controller/ServersController.php:1531
 msgid "File not found."
 msgstr ""
 
-#: Controller/ServersController.php:1407
+#: Controller/ServersController.php:1537
 msgid "File could not be deleted."
 msgstr ""
 
-#: Controller/ServersController.php:1430;1446
+#: Controller/ServersController.php:1560;1576
 msgid "Upload failed."
 msgstr ""
 
-#: Controller/ServersController.php:1438
+#: Controller/ServersController.php:1568
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr ""
 
-#: Controller/ServersController.php:1505
+#: Controller/ServersController.php:1638
 msgid "Invalid user or user not found."
 msgstr ""
 
-#: Controller/ServersController.php:2052
+#: Controller/ServersController.php:1965
+msgid "Something went wrong. %s"
+msgstr ""
+
+#: Controller/ServersController.php:1970;2001
+msgid "YOUR_API_KEY"
+msgstr ""
+
+#: Controller/ServersController.php:2218
 msgid "Starting server caching."
 msgstr ""
 
-#: Controller/ServersController.php:2067
+#: Controller/ServersController.php:2233
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:2070
+#: Controller/ServersController.php:2236
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
-#: Controller/ServersController.php:2100
+#: Controller/ServersController.php:2266
 msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2109
+#: Controller/ServersController.php:2275
 msgid "Configured host org not found. Please make sure that the setting is current on the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2173
+#: Controller/ServersController.php:2339
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ServersController.php:2194
+#: Controller/ServersController.php:2360
 msgid "API key updated."
 msgstr ""
 
-#: Controller/ServersController.php:2207
+#: Controller/ServersController.php:2373
 msgid "ID has to be a valid server connection"
 msgstr ""
 
-#: Controller/ServersController.php:2210
+#: Controller/ServersController.php:2376
 msgid "Invalid direction. Valid options: "
 msgstr ""
 
-#: Controller/ServersController.php:2214
+#: Controller/ServersController.php:2380
 msgid "Priority changed."
 msgstr ""
 
-#: Controller/ServersController.php:2217
+#: Controller/ServersController.php:2383
 msgid "Priority could not be changed."
 msgstr ""
 
-#: Controller/ServersController.php:2228
+#: Controller/ServersController.php:2394
 msgid "Only site admin accounts can release the update lock."
 msgstr ""
 
-#: Controller/ServersController.php:2238
+#: Controller/ServersController.php:2404
 msgid "Only site admin accounts get the DB schema diagnostic."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:263
+#: Controller/ShadowAttributesController.php:234
 msgid "Could not discard proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:324
+#: Controller/ShadowAttributesController.php:289
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:372;375;384
+#: Controller/ShadowAttributesController.php:337;340;349
 msgid "The lines"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:424
+#: Controller/ShadowAttributesController.php:388
 msgid "The proposal has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:436;749
+#: Controller/ShadowAttributesController.php:400;707
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:438
+#: Controller/ShadowAttributesController.php:402
 msgid "The proposal could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:475
+#: Controller/ShadowAttributesController.php:448
 msgid "Invalid Proposal"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:505
+#: Controller/ShadowAttributesController.php:466
 msgid "Proposal not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:601
+#: Controller/ShadowAttributesController.php:560
 msgid "The attachment has been uploaded"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:603
+#: Controller/ShadowAttributesController.php:562
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:606
+#: Controller/ShadowAttributesController.php:565
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:740
+#: Controller/ShadowAttributesController.php:698
 msgid "The proposed Attribute has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:751
+#: Controller/ShadowAttributesController.php:709
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:884;894
+#: Controller/ShadowAttributesController.php:825;853
 msgid "Invalid proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:1010
-msgid "This feature is only available using the API to Sync users"
-msgstr ""
-
-#: Controller/ShadowAttributesController.php:1013
-msgid "Invalid UUID"
-msgstr ""
-
-#: Controller/SharingGroupsController.php:251
+#: Controller/SharingGroupsController.php:247
 msgid "Sharing Group deleted"
 msgstr ""
 
-#: Controller/SharingGroupsController.php:256
+#: Controller/SharingGroupsController.php:252
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr ""
 
+#: Controller/SharingGroupsController.php:363
+#: View/Organisations/view.ctp:72;73
+#: View/SharingGroups/index.ctp:4
+msgid "Sharing Groups"
+msgstr ""
+
+#: Controller/SharingGroupsController.php:444
+#: View/SharingGroups/view.ctp:2
+msgid "Sharing Group %s"
+msgstr ""
+
 #: Controller/SightingdbController.php:32
 msgid "SightingDB connection added."
 msgstr ""
@@ -1780,10 +2397,6 @@ msgstr ""
 msgid "SightingDB connection could not be added."
 msgstr ""
 
-#: Controller/SightingdbController.php:49;99;143
-msgid " Reason: %s"
-msgstr ""
-
 #: Controller/SightingdbController.php:71;123
 #: Model/Sightingdb.php:325
 msgid "Invalid SightingDB entry."
@@ -1809,214 +2422,259 @@ msgstr ""
 msgid "Pass a valid SightingDB ID"
 msgstr ""
 
-#: Controller/SightingsController.php:83
+#: Controller/SightingsController.php:87
 msgid "Could not add the Sighting. Reason: "
 msgstr ""
 
-#: Controller/SightingsController.php:96
+#: Controller/SightingsController.php:100
 msgid "Sighting added"
 msgstr ""
 
-#: Controller/SightingsController.php:149
+#: Controller/SightingsController.php:153
 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:155
-#: Model/DecayingModel.php:464
+#: Controller/SightingsController.php:159
+#: Model/DecayingModel.php:480
 msgid "Attribute not found"
 msgstr ""
 
-#: Controller/SightingsController.php:173
+#: Controller/SightingsController.php:177
 msgid "Invalid request."
 msgstr ""
 
-#: Controller/SightingsController.php:182
+#: Controller/SightingsController.php:186
 msgid "Sighting added."
 msgstr ""
 
-#: Controller/SightingsController.php:184
+#: Controller/SightingsController.php:188
 msgid "Sighting could not be added"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:56;177
+#: Controller/TagCollectionsController.php:59;180
 msgid "The tag collection has been saved"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:64;185
+#: Controller/TagCollectionsController.php:67;188
 msgid "The tag collection could not be added. Reason: "
 msgstr ""
 
-#: Controller/TagCollectionsController.php:85
+#: Controller/TagCollectionsController.php:88
 msgid "%s new tag collections added."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:154
+#: Controller/TagCollectionsController.php:157
 msgid "Invalid Tag Collection"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:161
+#: Controller/TagCollectionsController.php:164
 msgid "You don't have editing rights on this Tag Collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:201;391
+#: Controller/TagCollectionsController.php:204;372;421
 msgid "Invalid tag collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:207
+#: Controller/TagCollectionsController.php:210
 msgid "Tag collection deleted."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:215
+#: Controller/TagCollectionsController.php:218
 msgid "Tag collection could not be deleted."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:224
+#: Controller/TagCollectionsController.php:227
 msgid "You are not allowed to delete that."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:241
+#: Controller/TagCollectionsController.php:244
 msgid "Invalid tag collection"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:342
+#: Controller/TagCollectionsController.php:347
+msgid "Tag(s) added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:349
 msgid "Tag(s) could not be added."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:395
+#: Controller/TagCollectionsController.php:355
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:383
+msgid "Invalid tag collection tag."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:425
 msgid "Insufficient privileges to remove the tag from the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:406
+#: Controller/TagCollectionsController.php:436
 msgid "Invalid tag or tag not associated with the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:410
+#: Controller/TagCollectionsController.php:440
 msgid "Failed to remove tag from the collection."
 msgstr ""
 
-#: Controller/TagsController.php:370
+#: Controller/TagsController.php:304
 msgid "Tag deleted"
 msgstr ""
 
-#: Controller/TagsController.php:375
+#: Controller/TagsController.php:309
 msgid "Tag was not deleted"
 msgstr ""
 
-#: Controller/TagsController.php:599
+#: Controller/TagsController.php:464
 msgid "Favourite Tags"
 msgstr ""
 
-#: Controller/TagsController.php:605
+#: Controller/TagsController.php:470
 #: View/TagCollections/index.ctp:4
 msgid "Tag Collections"
 msgstr ""
 
-#: Controller/TagsController.php:610
+#: Controller/TagsController.php:475
 msgid "Custom Tags"
 msgstr ""
 
-#: Controller/TagsController.php:614
+#: Controller/TagsController.php:479
 msgid "All Tags"
 msgstr ""
 
-#: Controller/TagsController.php:622
-#: View/Taxonomies/view.ctp:2
+#: Controller/TagsController.php:487
 msgid "Taxonomy Library"
 msgstr ""
 
-#: Controller/TagsController.php:790
+#: Controller/TagsController.php:638
 msgid "Includes: "
 msgstr ""
 
-#: Controller/TagsController.php:867
+#: Controller/TagsController.php:715
 msgid "This functionality requires tagging permission."
 msgstr ""
 
-#: Controller/TagsController.php:881;905
+#: Controller/TagsController.php:729;753
 msgid "Cannot alter the tags of this data, only the organisation that has created the data (orgc) can modify global tags."
 msgstr ""
 
-#: Controller/TagsController.php:883;907
+#: Controller/TagsController.php:731;755
 msgid "Please consider using local tags if you are in the host organisation of the instance."
 msgstr ""
 
-#: Controller/TagsController.php:912;1058
+#: Controller/TagsController.php:760;930
 msgid "Invalid Target."
 msgstr ""
 
-#: Controller/TagsController.php:951
+#: Controller/TagsController.php:805
 msgid "Local tags can only be added by users of the host organisation."
 msgstr ""
 
-#: Controller/TagsController.php:964
+#: Controller/TagsController.php:814
+msgid "Tag not found and insufficient privileges to create it."
+msgstr ""
+
+#: Controller/TagsController.php:820
 msgid "Unable to create tag. Reason: "
 msgstr ""
 
-#: Controller/TagsController.php:1075
+#: Controller/TagsController.php:825
+msgid "Invalid Tag."
+msgstr ""
+
+#: Controller/TagsController.php:831
+msgid "Invalid Tag. This tag can only be set by a fixed organisation."
+msgstr ""
+
+#: Controller/TagsController.php:835
+msgid "Invalid Tag. This tag can only be set by a fixed user."
+msgstr ""
+
+#: Controller/TagsController.php:850
+msgid "%s already has the requested tag attached, no changes had to be made."
+msgstr ""
+
+#: Controller/TagsController.php:881
+msgid "Failed to attach tag to object."
+msgstr ""
+
+#: Controller/TagsController.php:885
+msgid "Failed to attach %s tags. Reasons: %s"
+msgstr ""
+
+#: Controller/TagsController.php:888
+msgid "Successfully attached %s tags to %s (%s)"
+msgstr ""
+
+#: Controller/TagsController.php:947
 msgid "Insufficient privileges to remove local tags from events you do not own."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:68
+#: Controller/TaxonomiesController.php:74
 msgid "Taxonomy not found."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:134
+#: Controller/TaxonomiesController.php:112
+#: View/Taxonomies/view.ctp:2
+msgid "%s Taxonomy Library"
+msgstr ""
+
+#: Controller/TaxonomiesController.php:141
 msgid "Taxonomy enabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:166
+#: Controller/TaxonomiesController.php:173
 msgid "Taxonomy disabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:234
+#: Controller/TaxonomiesController.php:251
 msgid "All taxonomy libraries are up to date already."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:237
+#: Controller/TaxonomiesController.php:254
 msgid "Could not update any of the taxonomy libraries"
 msgstr ""
 
-#: Controller/TaxonomiesController.php:240
-#: Controller/WarninglistsController.php:107
+#: Controller/TaxonomiesController.php:257
 msgid "Successfully updated "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:240;242
+#: Controller/TaxonomiesController.php:257;259
 msgid " taxonomy libraries."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:242
-#: Controller/WarninglistsController.php:109
+#: Controller/TaxonomiesController.php:259
 msgid " However, could not update "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:276;314;344
+#: Controller/TaxonomiesController.php:293;331;361
 msgid "The tag(s) has been saved."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:282;316;346
+#: Controller/TaxonomiesController.php:299;333;363
 msgid "The tag(s) could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:374
+#: Controller/TaxonomiesController.php:391
 msgid "The tag(s) has been hidden."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:376
+#: Controller/TaxonomiesController.php:393
 msgid "The tag(s) could not be hidden. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:413
-msgid "Taxonomy successfuly deleted."
-msgstr ""
-
-#: Controller/TaxonomiesController.php:416
-msgid "Taxonomy could not be deleted."
+#: Controller/TaxonomiesController.php:421
+msgid "Taxonomy successfully deleted."
 msgstr ""
 
 #: Controller/TaxonomiesController.php:424
-#: Controller/WarninglistsController.php:262
-msgid "This function can only be reached via AJAX."
+msgid "Taxonomy could not be deleted."
+msgstr ""
+
+#: Controller/TemplateElementsController.php:19;24
+msgid "No template with the provided ID exists, or you are not authorised to see it."
 msgstr ""
 
 #: Controller/TemplatesController.php:408
@@ -2027,260 +2685,315 @@ msgstr ""
 msgid "Event populated, but "
 msgstr ""
 
-#: Controller/UserSettingsController.php:129;276
+#: Controller/UserSettingsController.php:128;275
 msgid "Invalid ID passed."
 msgstr ""
 
-#: Controller/UserSettingsController.php:139;143;286;290
+#: Controller/UserSettingsController.php:138;142;285;289
 msgid "Invalid user setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:157;242;254
-#: Model/UserSetting.php:324
+#: Controller/UserSettingsController.php:156;241;253
+#: Model/UserSetting.php:378
 msgid "Invalid setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:161;294
-#: Model/UserSetting.php:328
+#: Controller/UserSettingsController.php:160;293
+#: Model/UserSetting.php:382
 msgid "This setting is restricted and requires the following permission(s): %s"
 msgstr ""
 
-#: Controller/UserSettingsController.php:193
+#: Controller/UserSettingsController.php:192
 msgid "Setting saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:206
+#: Controller/UserSettingsController.php:205
 msgid "Setting could not be saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:301
+#: Controller/UserSettingsController.php:300
 msgid "Setting deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:309
+#: Controller/UserSettingsController.php:308
 msgid "Setting could not be deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:322
+#: Controller/UserSettingsController.php:321
 msgid "Expecting POST or DELETE request."
 msgstr ""
 
-#: Controller/UserSettingsController.php:329
-msgid "This endpoint only aaccepts POST requests."
-msgstr ""
-
 #: Controller/UserSettingsController.php:335
 msgid "No path POSTed."
 msgstr ""
 
-#: Controller/UsersController.php:46;326
+#: Controller/UsersController.php:52
 msgid "Invalid user or not authorised."
 msgstr ""
 
-#: Controller/UsersController.php:66;566;815;834;1059
+#: Controller/UsersController.php:64;567;833;844;1082
 msgid "Invalid user"
 msgstr ""
 
-#: Controller/UsersController.php:154;722;887
+#: Controller/UsersController.php:156;723;896
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
-#: Controller/UsersController.php:206
+#: Controller/UsersController.php:211
 msgid "The profile has been updated"
 msgstr ""
 
-#: Controller/UsersController.php:211
+#: Controller/UsersController.php:215
 msgid "The profile could not be updated. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:256
+#: Controller/UsersController.php:259
 msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:265
+#: Controller/UsersController.php:268
 msgid "Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:275
+#: Controller/UsersController.php:278
 msgid "Submitted new password cannot be the same as the current one"
 msgstr ""
 
-#: Controller/UsersController.php:290
+#: Controller/UsersController.php:293
 msgid "Password Changed."
 msgstr ""
 
-#: Controller/UsersController.php:299
+#: Controller/UsersController.php:301
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr ""
 
-#: Controller/UsersController.php:442;468;575
-#: Model/Log.php:382
+#: Controller/UsersController.php:445;471;579
+#: Model/Log.php:405
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:733
+#: Controller/UsersController.php:734
 msgid "The user could not be saved. Invalid organisation."
 msgstr ""
 
-#: Controller/UsersController.php:755
+#: Controller/UsersController.php:745
+msgid "User notified of new credentials."
+msgstr ""
+
+#: Controller/UsersController.php:747
+msgid "User notification of new credentials could not be send."
+msgstr ""
+
+#: Controller/UsersController.php:765
 msgid "The user has been saved."
 msgstr ""
 
-#: Controller/UsersController.php:764;995
+#: Controller/UsersController.php:774;1016
 msgid "The user could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:987
+#: Controller/UsersController.php:1009
 msgid "The user has been saved"
 msgstr ""
 
-#: Controller/UsersController.php:1067
+#: Controller/UsersController.php:1090
 msgid "User deleted"
 msgstr ""
 
-#: Controller/UsersController.php:1071
+#: Controller/UsersController.php:1094
 msgid "User was not deleted"
 msgstr ""
 
-#: Controller/UsersController.php:1155
+#: Controller/UsersController.php:1165
 msgid "Invalid username or password, try again"
 msgstr ""
 
 #: Controller/UsersController.php:1254
+msgid "Welcome! Last login was on %s"
+msgstr ""
+
+#: Controller/UsersController.php:1281
 msgid "Good-Bye"
 msgstr ""
 
-#: Controller/UsersController.php:1273;1297
+#: Controller/UsersController.php:1301;1324
 msgid "This functionality is only accessible via POST requests."
 msgstr ""
 
-#: Controller/UsersController.php:1279
+#: Controller/UsersController.php:1307
 msgid "Invalid action."
 msgstr ""
 
-#: Controller/UsersController.php:1286
+#: Controller/UsersController.php:1314
 msgid "New authkey generated."
 msgstr ""
 
-#: Controller/UsersController.php:1301
+#: Controller/UsersController.php:1328
 msgid "Job initiated."
 msgstr ""
 
-#: Controller/UsersController.php:1303
+#: Controller/UsersController.php:1330
 msgid "%s authkeys reset, %s could not be reset."
 msgstr ""
 
-#: Controller/UsersController.php:1417
+#: Controller/UsersController.php:1442
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1545
+#: Controller/UsersController.php:1570
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1550
+#: Controller/UsersController.php:1575
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1587
+#: Controller/UsersController.php:1612
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1589
+#: Controller/UsersController.php:1614
 msgid "E-mails sent."
 msgstr ""
 
-#: Controller/UsersController.php:1663
+#: Controller/UsersController.php:1702
+msgid "The OTP is incorrect or has expired"
+msgstr ""
+
+#: Controller/UsersController.php:1747
+msgid "An email containing a OTP has been sent."
+msgstr ""
+
+#: Controller/UsersController.php:1749
+msgid "The email couldn't be sent, please reach out to your administrator."
+msgstr ""
+
+#: Controller/UsersController.php:1774
 msgid "Usage data"
 msgstr ""
 
-#: Controller/UsersController.php:1664
-#: View/Elements/global_menu.ctp:163
+#: Controller/UsersController.php:1775
+#: View/Cerebrates/view.ctp:57
+#: View/Elements/global_menu.ctp:201
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
-#: View/SharingGroups/view.ctp:39
+#: View/SharingGroups/view.ctp:30;43
 #: View/Users/statistics.ctp:27
 #: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr ""
 
-#: Controller/UsersController.php:1665
+#: Controller/UsersController.php:1776
 msgid "User and Organisation statistics"
 msgstr ""
 
-#: Controller/UsersController.php:1666
-#: View/Attributes/index.ctp:53
+#: Controller/UsersController.php:1777
+#: View/Attributes/index.ctp:47
 #: View/DecayingModel/decaying_tool_rest_search.ctp:28
-#: View/Elements/eventattribute.ctp:151
+#: View/Elements/eventattribute.ctp:128
+#: View/Elements/EventReports/reportHelpModal.ctp:53
 #: View/Elements/Events/eventIndexTable.ctp:37
 #: View/Elements/Feeds/eventattribute.ctp:46
-#: View/Elements/Servers/eventattribute.ctp:46
-#: View/Events/resolved_attributes.ctp:53
-#: View/Events/resolved_misp_format.ctp:66;94;289
-#: View/Events/view.ctp:127
+#: View/Elements/GalaxyClusters/relations_graph.ctp:450
+#: View/Elements/Servers/eventattribute.ctp:43
+#: View/Events/get_event_info_by_id.ctp:15
+#: View/Events/resolved_misp_format.ctp:68;145;340
+#: View/Events/view.ctp:100
 #: View/Feeds/preview_event.ctp:16
-#: View/Feeds/preview_index.ctp:39
+#: View/Feeds/preview_index.ctp:35
 #: View/Feeds/view.ctp:16
+#: View/GalaxyClusters/view_relations.ctp:117
 #: 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/Servers/preview_event.ctp:18
+#: View/Servers/preview_index.ctp:90
 #: View/TagCollections/index.ctp:10
-#: View/Tags/index.ctp:10
-#: View/Taxonomies/view.ctp:88
+#: View/Tags/index.ctp:117
+#: View/Taxonomies/view.ctp:68
 #: View/Templates/add.ctp:12
 #: View/Templates/edit.ctp:12
 #: View/Templates/view.ctp:19
 msgid "Tags"
 msgstr ""
 
-#: Controller/UsersController.php:1667
+#: Controller/UsersController.php:1778
 msgid "Attribute histogram"
 msgstr ""
 
-#: Controller/UsersController.php:1668
+#: Controller/UsersController.php:1779
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1669
+#: Controller/UsersController.php:1780
 msgid "Galaxy Matrix"
 msgstr ""
 
-#: Controller/UsersController.php:2252
+#: Controller/UsersController.php:2129
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:191
+#: View/EventReports/index.ctp:16
+#: View/EventReports/ajax/indexForEvent.ctp:50
+#: View/GalaxyClusterRelations/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:19
+#: View/Jobs/index.ctp:13;58
+#: View/ObjectTemplates/index.ctp:33
+#: View/Regexp/admin_add.ctp:17
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+#: View/Taxonomies/index.ctp:12
+#: View/UserSettings/index.ctp:41
+#: View/Users/admin_index.ctp:38
+#: View/Warninglists/index.ctp:20
+msgid "All"
+msgstr ""
+
+#: Controller/UsersController.php:2373
 msgid "Self registration is not enabled on this instance."
 msgstr ""
 
-#: Controller/UsersController.php:2278
+#: Controller/UsersController.php:2405
 msgid "We require at least the email field to be filled."
 msgstr ""
 
-#: Controller/UsersController.php:2284
+#: Controller/UsersController.php:2410
+msgid "Request could not be created."
+msgstr ""
+
+#: Controller/UsersController.php:2412
+msgid "Errors: %s"
+msgstr ""
+
+#: Controller/UsersController.php:2423
 msgid "User registration for %s."
 msgstr ""
 
-#: Controller/UsersController.php:2292
+#: Controller/UsersController.php:2431
 msgid "Request could not be created. Make sure that the email and org name fields are filled."
 msgstr ""
 
-#: Controller/UsersController.php:2299
+#: Controller/UsersController.php:2438
 msgid "Request sent. The administrators of this community have been notified."
 msgstr ""
 
-#: Controller/UsersController.php:2353
+#: Controller/UsersController.php:2485
 msgid "default"
 msgstr ""
 
-#: Controller/UsersController.php:2356;2357;2358
+#: Controller/UsersController.php:2488;2489;2490
+#: Model/Server.php:4388
 #: 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/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:20
 #: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: View/Elements/Users/userIndexTable.ctp:47;50;57;64;76;82
+#: View/Elements/Feeds/View/row_attribute.ctp:85
+#: View/Elements/Servers/View/row_attribute.ctp:125
+#: View/Elements/Users/userIndexTable.ctp:51;54;61;68;80;86
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:59
+#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:10
+#: View/Elements/healthElements/diagnostics.ctp:218;225
 #: View/Elements/templateElements/templateRowAttribute.ctp:63;74;86
 #: View/Elements/templateElements/templateRowFile.ctp:42;53;64
 #: View/EventDelegations/ajax/accept_delegation.ctp:10
@@ -2289,27 +3002,25 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:70
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:191
+#: View/Events/view.ctp:184
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
 #: 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/GalaxyClusters/ajax/publishConfirmationForm.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:32
-#: View/Objects/revise_object.ctp:92
+#: View/Objects/revise_object.ctp:83
 #: View/Objects/ajax/delete.ctp:19
 #: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
-#: View/Servers/preview_event.ctp:79
+#: View/Servers/index.ctp:112;113;114;115;116;117;151;152;157;158
+#: View/Servers/preview_event.ctp:47
 #: 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/view.ctp:5
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
 #: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
@@ -2320,17 +3031,22 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: Controller/UsersController.php:2356;2357;2358
+#: Controller/UsersController.php:2488;2489;2490
+#: Model/Server.php:4388
 #: 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/tagRemoveConfirmation.ctp:22
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: View/Elements/Users/userIndexTable.ctp:47;50;57;64;76;82
+#: View/Elements/Feeds/View/row_attribute.ctp:85
+#: View/Elements/Servers/View/row_attribute.ctp:125
+#: View/Elements/Users/userIndexTable.ctp:51;54;61;68;80;86
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:50
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:59
+#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:13
+#: View/Elements/healthElements/diagnostics.ctp:218;227
 #: View/Elements/templateElements/templateRowAttribute.ctp:64;75;87
 #: View/Elements/templateElements/templateRowFile.ctp:43;54;65
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2339,28 +3055,27 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:70;224
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:191
+#: View/Events/view.ctp:184
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:33
 #: 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/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:26
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:30
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/Objects/revise_object.ctp:92
+#: View/Objects/revise_object.ctp:83
 #: View/Objects/ajax/delete.ctp:24
 #: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
-#: View/Servers/preview_event.ctp:89
+#: View/Servers/index.ctp:112;113;114;115;116;117;147;151;152;157;158
+#: View/Servers/preview_event.ctp:47
 #: 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/view.ctp:5
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
 #: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
@@ -2372,107 +3087,123 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: Controller/UsersController.php:2495
+#: Controller/UsersController.php:2635
 msgid "Role ID not provided and no default role exist on the instance"
 msgstr ""
 
-#: Controller/UsersController.php:2509
+#: Controller/UsersController.php:2639
+msgid "No organisation selected. Supply an Organisation ID"
+msgstr ""
+
+#: Controller/UsersController.php:2657
 msgid "Added %s user(s)."
 msgstr ""
 
-#: Controller/UsersController.php:2512
+#: Controller/UsersController.php:2660
 msgid "Could not add %s user(s), reasons for the failure have been logged."
 msgstr ""
 
-#: Controller/UsersController.php:2515
+#: Controller/UsersController.php:2663
 msgid "No new users added - there was nothing to add."
 msgstr ""
 
-#: Controller/WarninglistsController.php:42
-msgid "This action is only accessible via POST requests."
+#: Controller/UsersController.php:2685
+msgid "This endpoint can only be triggered via POST requests."
 msgstr ""
 
-#: Controller/WarninglistsController.php:64
+#: Controller/UsersController.php:2711
+msgid "The upgrade process is complete, %s authkey(s) generated."
+msgstr ""
+
+#: Controller/WarninglistsController.php:77
 msgid "Warning list updated"
 msgstr ""
 
-#: Controller/WarninglistsController.php:80
+#: Controller/WarninglistsController.php:93
 msgid "Warning list failed to update"
 msgstr ""
 
-#: Controller/WarninglistsController.php:81
+#: Controller/WarninglistsController.php:94
 msgid " could not be installed/updated. Error: "
 msgstr ""
 
-#: Controller/WarninglistsController.php:95
+#: Controller/WarninglistsController.php:108
 msgid "Warninglist update (nothing to update)"
 msgstr ""
 
-#: Controller/WarninglistsController.php:96
+#: Controller/WarninglistsController.php:109
 msgid "Executed an update of the warning lists, but there was nothing to update."
 msgstr ""
 
-#: Controller/WarninglistsController.php:101
+#: Controller/WarninglistsController.php:114
 msgid "All warninglists are up to date already."
 msgstr ""
 
-#: Controller/WarninglistsController.php:104
+#: Controller/WarninglistsController.php:117
 msgid "Could not update any of the warning lists"
 msgstr ""
 
-#: Controller/WarninglistsController.php:132
+#: Controller/WarninglistsController.php:120
+msgid "Successfully updated %s warninglists."
+msgstr ""
+
+#: Controller/WarninglistsController.php:122
+msgid " However, could not update %s warninglists."
+msgstr ""
+
+#: Controller/WarninglistsController.php:145
 msgid "This function only accepts POST requests."
 msgstr ""
 
-#: Controller/WarninglistsController.php:160;233
+#: Controller/WarninglistsController.php:173;245
 msgid "Warninglist not found."
 msgstr ""
 
-#: Controller/WarninglistsController.php:164
+#: Controller/WarninglistsController.php:177
 msgid "Warninglist(s) not found."
 msgstr ""
 
-#: Controller/WarninglistsController.php:190
+#: Controller/WarninglistsController.php:202
 msgid " warninglist(s) "
 msgstr ""
 
-#: Controller/WarninglistsController.php:192
+#: Controller/WarninglistsController.php:204
 msgid "Warninglist(s) could not be toggled."
 msgstr ""
 
-#: Controller/WarninglistsController.php:200
+#: Controller/WarninglistsController.php:212
 msgid "Invalid Warninglist."
 msgstr ""
 
-#: Controller/WarninglistsController.php:209
+#: Controller/WarninglistsController.php:221
 msgid "Warninglist disabled"
 msgstr ""
 
-#: Controller/WarninglistsController.php:212
+#: Controller/WarninglistsController.php:224
 msgid "Warninglist enabled"
 msgstr ""
 
-#: Controller/WarninglistsController.php:220
+#: Controller/WarninglistsController.php:232
 msgid "This action is available via AJAX only."
 msgstr ""
 
-#: Controller/WarninglistsController.php:251
+#: Controller/WarninglistsController.php:263
 msgid "Warninglist successfuly deleted."
 msgstr ""
 
-#: Controller/WarninglistsController.php:254
+#: Controller/WarninglistsController.php:266
 msgid "Warninglists could not be deleted."
 msgstr ""
 
-#: Controller/WarninglistsController.php:272
+#: Controller/WarninglistsController.php:283
 msgid "No valid data received."
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:634
+#: Controller/Component/ACLComponent.php:778
 msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:688
+#: Controller/Component/ACLComponent.php:831
 msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
 msgstr ""
 
@@ -2500,28 +3231,50 @@ msgstr ""
 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."
+#: Controller/Component/BlockListComponent.php:54
+msgid "Pass a list of uuids via the \"uuids\" key in the request object."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:126
-msgid "Blacklist item added."
+#: Controller/Component/BlockListComponent.php:84
+msgid "Done. Added %d new entries to the blocklist. %d entries could not be saved."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:133
-msgid "Could not save the blacklist item"
+#: Controller/Component/BlockListComponent.php:113
+msgid "Blocklist item not found."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:155
-msgid "Invalid blacklist entry"
+#: Controller/Component/BlockListComponent.php:153
+msgid "Blocklist item added."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:159
-msgid "Blacklist entry removed"
+#: Controller/Component/BlockListComponent.php:160
+msgid "Could not save the blocklist item"
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:161
-msgid "Could not remove the blacklist entry"
+#: Controller/Component/BlockListComponent.php:183
+msgid "Blocklist entry removed"
+msgstr ""
+
+#: Controller/Component/BlockListComponent.php:189
+msgid "Could not remove the blocklist entry"
+msgstr ""
+
+#: Controller/Component/CRUDComponent.php:107
+msgid "%s added."
+msgstr ""
+
+#: Controller/Component/CRUDComponent.php:129
+msgid "%s could not be added."
+msgstr ""
+
+#: Controller/Component/CRUDComponent.php:146;198;210;227;240
+#: Controller/Component/ToolboxComponent.php:16;21;29
+#: Model/Galaxy.php:358;427;437;451
+msgid "Invalid %s."
+msgstr ""
+
+#: Controller/Component/CRUDComponent.php:260
+msgid "%s deleted."
 msgstr ""
 
 #: Controller/Component/DeprecationComponent.php:18
@@ -2572,1465 +3325,1647 @@ msgstr ""
 msgid "Rate limit exceeded."
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:603
+#: Controller/Component/RestResponseComponent.php:714
 msgid "The action that the user performed"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:609
-msgid "Is the sharing group selectable (active) when chosing distribution"
+#: Controller/Component/RestResponseComponent.php:720
+msgid "Is the sharing group selectable (active) when choosing distribution"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:614;1356
+#: Controller/Component/RestResponseComponent.php:725;1497
 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 ""
 
-#: Controller/Component/RestResponseComponent.php:620
+#: Controller/Component/RestResponseComponent.php:731
 msgid "All organisations contained on the instance will be part of the sharing group"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:626
+#: Controller/Component/RestResponseComponent.php:737
 msgid "hard-delete already soft-deleted attributes"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:633
+#: Controller/Component/RestResponseComponent.php:744
 msgid "Maturity of the event"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:640
+#: Controller/Component/RestResponseComponent.php:751
 msgid "Anonymise the information regarding the server on which the request was issued"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:646
+#: Controller/Component/RestResponseComponent.php:757
 msgid "Filter on attribute value"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:652
+#: Controller/Component/RestResponseComponent.php:763
 msgid "The authorisation key found on the external server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:658
+#: Controller/Component/RestResponseComponent.php:769
 msgid "The user receive alerts when events are published"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:664
+#: Controller/Component/RestResponseComponent.php:775
 msgid "The email's body"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:670
+#: Controller/Component/RestResponseComponent.php:781
 msgid "The feed is cached"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:682
+#: Controller/Component/RestResponseComponent.php:793
 msgid "A valid x509 certificate "
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:688
+#: Controller/Component/RestResponseComponent.php:799
 msgid "The text contained in the change field"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:694
+#: Controller/Component/RestResponseComponent.php:805
 msgid "The user will be prompted the change the password"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:700
+#: Controller/Component/RestResponseComponent.php:811
 msgid "A valid hexadecimal colour `#ffffff`"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:711
+#: Controller/Component/RestResponseComponent.php:822
 msgid "Contact details for the organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:717
+#: Controller/Component/RestResponseComponent.php:828
 msgid "The user receive alerts from `contact reporter` requests"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:734
+#: Controller/Component/RestResponseComponent.php:845
 msgid "Base64 encoded file contents"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:746
+#: Controller/Component/RestResponseComponent.php:857
 msgid "The user set date field on the event level. If you are using restSearch, you can use any of the valid time related filters (examples: 7d, timestamps, [14d, 7d] for ranges, etc.)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:781
+#: Controller/Component/RestResponseComponent.php:892
 msgid "The role is a default role (selected by default)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:787
+#: Controller/Component/RestResponseComponent.php:898
 msgid "Remove file after ingestion"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:793
+#: Controller/Component/RestResponseComponent.php:904
 msgid "Include deleted elements"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:799
+#: Controller/Component/RestResponseComponent.php:910
 msgid "Merge attributes (only add new attribute, remove revoked attributes)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:810
+#: Controller/Component/RestResponseComponent.php:921
 msgid "Disable the user account"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:822
+#: Controller/Component/RestResponseComponent.php:933
 msgid "Filter on user email"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:828
+#: Controller/Component/RestResponseComponent.php:939
 msgid "Set the password manually"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:839
-msgid "When uploading malicious samples, set this flag to tell MISP to encrpyt the sample and extract the file hashes. This will create a MISP object with the appropriate attributes."
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:850
-msgid "Should the warning list be enforced. Adds `blocked` field for matching attributes"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:863
-msgid "The timestamp at which the event was last modified"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:870
-msgid "The timestamp at which the attribute was last modified"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:882;1021
-msgid "Quick event description"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:888
-msgid "The tag is exported when synchronising with other instances"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:900
-msgid "Exclude local tags from the export"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:906
-msgid "The organisation have write access to this sharing group (they can add/remove other organisation)"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:912
-msgid "An external authorisation is required for this user"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:918
-msgid "A valid external auth key"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:931
-msgid "target_event option might be considered"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:943
-msgid "The date from which the event was published"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:949
-msgid "A valid GPG key"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:955
-msgid "The event contains proposals"
+#: Controller/Component/RestResponseComponent.php:950
+msgid "When uploading malicious samples, set this flag to tell MISP to encrypt the sample and extract the file hashes. This will create a MISP object with the appropriate attributes."
 msgstr ""
 
 #: Controller/Component/RestResponseComponent.php:961
+msgid "Should the warning list be enforced. Adds `blocked` field for matching attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:968
+#: View/Attributes/alternate_search_result.ctp:6
+#: View/EventDelegations/index.ctp:70
+msgid "Event id"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:981
+msgid "The timestamp at which the event was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:988
+msgid "The timestamp at which the attribute was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1000;1145
+msgid "Quick event description"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1006
+msgid "The tag is exported when synchronising with other instances"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1018
+msgid "Exclude local tags from the export"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1024
+msgid "The organisation have write access to this sharing group (they can add/remove other organisation)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1030
+msgid "An external authorisation is required for this user"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1036
+msgid "A valid external auth key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1049
+msgid "target_event option might be considered"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1061
+msgid "The date from which the event was published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1067
+msgid "Source galaxy cluster UUID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1073
+msgid "A valid GPG key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1079
+msgid "The event contains proposals"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1085
 msgid "Headers to be passed with the requests. All separated by `\\n`"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:967
+#: Controller/Component/RestResponseComponent.php:1091
 msgid "The tag is hidden (not selectable)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:979
+#: Controller/Component/RestResponseComponent.php:1103
 msgid "Include matching attributes in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:991
+#: Controller/Component/RestResponseComponent.php:1115
 msgid "Include matching events in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:997
+#: Controller/Component/RestResponseComponent.php:1121
 msgid "Include matching eventUuids in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1003
+#: Controller/Component/RestResponseComponent.php:1127
 msgid "Include tags of matching events in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1015
+#: Controller/Component/RestResponseComponent.php:1139
 msgid "Include proposals of matching events in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1028
+#: Controller/Component/RestResponseComponent.php:1152
 msgid "Specify whether the source (url field) is a directory (local) or an geniun url (network)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1034
+#: Controller/Component/RestResponseComponent.php:1158
 msgid "The IP of a login attempt"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1040
+#: Controller/Component/RestResponseComponent.php:1164
 msgid "JSON containing ID, UUID and name"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1046
+#: Controller/Component/RestResponseComponent.php:1170
 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)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1059
+#: Controller/Component/RestResponseComponent.php:1183
 msgid "Limit on the pagination"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1065
+#: Controller/Component/RestResponseComponent.php:1189
 msgid "If the organisation should have access to this instance, make sure that the Local organisation setting is checked. If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting."
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1071
+#: Controller/Component/RestResponseComponent.php:1195
 msgid "The lookup will not be visible in the feed correlation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1077
+#: Controller/Component/RestResponseComponent.php:1201
 msgid "Message to be included"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1083
-msgid "Will not return Attributes, shadow attribute and objects"
+#: Controller/Component/RestResponseComponent.php:1207
+msgid "Will only return the metadata of the given query scope, contained data is omitted."
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1089
+#: Controller/Component/RestResponseComponent.php:1213
 msgid "Will only return  id, timestamp, published and uuid"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1096
+#: Controller/Component/RestResponseComponent.php:1220
 msgid "Mock the query"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1120
+#: Controller/Component/RestResponseComponent.php:1244
 msgid "The last time the sharing group was modified"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1138
+#: Controller/Component/RestResponseComponent.php:1262
 msgid "The news are read"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1145
+#: Controller/Component/RestResponseComponent.php:1269
 msgid "The unique Signature Identification"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1151
+#: Controller/Component/RestResponseComponent.php:1275
 msgid "Can be either the ORG_ID or the ORG_NAME"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1157
+#: Controller/Component/RestResponseComponent.php:1281
 msgid "Describe the organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1163
+#: Controller/Component/RestResponseComponent.php:1287
 msgid "Organisation identifier (name)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1175;1181
+#: Controller/Component/RestResponseComponent.php:1299;1305
 msgid "Globally used uuid of an organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1187
+#: Controller/Component/RestResponseComponent.php:1311
 msgid "The IDS flags will be set to off for this feed"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1194
+#: Controller/Component/RestResponseComponent.php:1318
 msgid "Page number for the pagination"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1200
+#: Controller/Component/RestResponseComponent.php:1324
 msgid "The hardcoded password"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1272
+#: Controller/Component/RestResponseComponent.php:1401
 msgid "The name of the feed provider"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1278
+#: Controller/Component/RestResponseComponent.php:1407
 msgid "The event will be published"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1301
+#: Controller/Component/RestResponseComponent.php:1430
 msgid "Allow the download of events and their attribute from the server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1307
+#: Controller/Component/RestResponseComponent.php:1436
 msgid "Allow the upload of events and their attribute to the server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1313
+#: Controller/Component/RestResponseComponent.php:1442
 msgid "Allow the upload of sightings to the server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1319
+#: Controller/Component/RestResponseComponent.php:1448
+msgid "Destination galaxy cluster UUID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1454
+msgid "The type of the relation. Example: `is`, `related-to`, ..."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1460
 msgid "Concise summary for who this sharing group is releasable to"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1337
+#: Controller/Component/RestResponseComponent.php:1478
 msgid "Pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1362
+#: Controller/Component/RestResponseComponent.php:1503
 msgid "The sector of the organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1374
+#: Controller/Component/RestResponseComponent.php:1515
 msgid "Will only return the sharing group ID"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1387
+#: Controller/Component/RestResponseComponent.php:1528
 msgid "Sharing group ID"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1393
+#: Controller/Component/RestResponseComponent.php:1534
 msgid "The source of the Sighting (e.g. honeypot_1)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1405
+#: Controller/Component/RestResponseComponent.php:1546
+msgid "Only returns tags matching exactly the tag name (thus skipping synonyms and cluster's value)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1552
 msgid "The email's subject"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1411;1417
+#: Controller/Component/RestResponseComponent.php:1558;1564
 msgid "Base64 encoded certificate"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1435
+#: Controller/Component/RestResponseComponent.php:1582
 msgid "A tad ID to attach to created events"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1448
+#: Controller/Component/RestResponseComponent.php:1595
 msgid "The provided ID will be reused as an existing event"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1471
+#: Controller/Component/RestResponseComponent.php:1618
 msgid "Time of the sighting with the form `h:i:s`"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1483
+#: Controller/Component/RestResponseComponent.php:1630
 msgid "The title of the log"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1495
+#: Controller/Component/RestResponseComponent.php:1642
 msgid "The date to which the event was published"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1501
+#: Controller/Component/RestResponseComponent.php:1648
 msgid "The state of the `to_ids` flag"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1507
+#: Controller/Component/RestResponseComponent.php:1654
 msgid "The type of the attribute"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1535
+#: Controller/Component/RestResponseComponent.php:1682
 msgid "Placeholder containing values to sight"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1548
+#: Controller/Component/RestResponseComponent.php:1695
 msgid "Not supported (warninglist->checkvalues) expect an array"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1554
-msgid "Not supported (removeTag)"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:1560;1566;1572;1579;1585;1591;1597;1603;1614
+#: Controller/Component/RestResponseComponent.php:1701;1707;1713;1720;1726;1732;1738;1744;1755
 msgid "Not supported"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1771
+#: Controller/Component/RestResponseComponent.php:1902
+msgid "Also supports array of tags"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1907
+msgid "Attribute id"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1928
 msgid "Seen within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m)"
 msgstr ""
 
-#: Controller/Component/ToolboxComponent.php:18;26
-#: Model/Galaxy.php:220;277;287;301
-msgid "Invalid %s."
+#: Model/AppModel.php:1655
+msgid "Indexing %s -> %s"
 msgstr ""
 
-#: Model/AppModel.php:1466
-msgid "Indexing "
-msgstr ""
-
-#: Model/AppModel.php:1480
+#: Model/AppModel.php:1669
 msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1502
-msgid "Successfuly executed the SQL query for "
+#: Model/AppModel.php:1691
+msgid "Successfully executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1503
+#: Model/AppModel.php:1692
 msgid "The executed SQL query was: %s"
 msgstr ""
 
-#: Model/AppModel.php:1505
-msgid "Successfuly executed the SQL query for %s"
+#: Model/AppModel.php:1694
+msgid "Successfully executed the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1516;1580
+#: Model/AppModel.php:1705;1768
 msgid "Issues executing the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1517
+#: Model/AppModel.php:1706
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1517
+#: Model/AppModel.php:1706
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1519
+#: Model/AppModel.php:1708
 msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1528
-msgid "However, as this error is whitelisted, the update went through."
+#: Model/AppModel.php:1717
+msgid "However, as this error is allowed, the update went through."
 msgstr ""
 
-#: Model/AppModel.php:1547
+#: Model/AppModel.php:1736
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/AppModel.php:1550
+#: Model/AppModel.php:1739
 msgid "Failed to add index"
 msgstr ""
 
-#: Model/AppModel.php:1552
+#: Model/AppModel.php:1741
 msgid "The returned error is:"
 msgstr ""
 
-#: Model/AppModel.php:1581
+#: Model/AppModel.php:1769
 msgid "Database updates stopped as some errors occured and the stop flag is enabled."
 msgstr ""
 
-#: Model/AppModel.php:1740
+#: Model/AppModel.php:1920;1932
 msgid "Invalid JSON."
 msgstr ""
 
-#: Model/AppModel.php:1833;1891
+#: Model/AppModel.php:2030;2086
 msgid "Issues executing run_updates"
 msgstr ""
 
-#: Model/AppModel.php:1834
+#: Model/AppModel.php:2031
 msgid "Database updates are locked. Worker not spawned"
 msgstr ""
 
-#: Model/AppModel.php:1838;1896;1931
+#: Model/AppModel.php:2035;2091;2126
 msgid "Update done"
 msgstr ""
 
-#: Model/AppModel.php:1892
+#: Model/AppModel.php:2087
 msgid "Updates are locked. Stopping worker gracefully"
 msgstr ""
 
-#: Model/AppModel.php:1911
+#: Model/AppModel.php:2106
 msgid "Running update %s"
 msgstr ""
 
-#: Model/AppModel.php:1937
+#: Model/AppModel.php:2132
 msgid "Update done in another worker. Gracefuly stopping."
 msgstr ""
 
-#: Model/Attribute.php:63
+#: Model/Attribute.php:73
+#: Model/Server.php:4868;4877
 #: View/Events/filter_event_index.ctp:46;182
 msgid "Your organisation only"
 msgstr ""
 
-#: Model/Attribute.php:64
+#: Model/Attribute.php:74
+#: Model/Server.php:4868;4877
 #: View/Events/filter_event_index.ctp:46;183
 msgid "This community only"
 msgstr ""
 
-#: Model/Attribute.php:65
+#: Model/Attribute.php:75
+#: Model/Server.php:4868;4877
 #: View/Events/filter_event_index.ctp:46;184
 #: View/Pages/doc/using_the_system.ctp:51
 msgid "Connected communities"
 msgstr ""
 
-#: Model/Attribute.php:66
+#: Model/Attribute.php:76
+#: Model/Server.php:4868;4877
 #: View/Events/filter_event_index.ctp:46;185
 #: View/Pages/doc/using_the_system.ctp:58
 msgid "All communities"
 msgstr ""
 
-#: Model/Attribute.php:67
+#: Model/Attribute.php:77
 #: View/Elements/view_event_distribution_graph.ctp:24
 msgid "Sharing group"
 msgstr ""
 
-#: Model/Attribute.php:68
+#: Model/Attribute.php:78
 msgid "Inherit event"
 msgstr ""
 
-#: Model/Attribute.php:76
+#: Model/Attribute.php:355
+msgid "Composite type, but value not explodable"
+msgstr ""
+
+#: Model/Attribute.php:618
+msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
+msgstr ""
+
+#: Model/Attribute.php:771
+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:777
+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:784
+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:794
+msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
+msgstr ""
+
+#: Model/Attribute.php:803
+msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
+msgstr ""
+
+#: Model/Attribute.php:810
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:817
+msgid "Unknown HTTP method."
+msgstr ""
+
+#: Model/Attribute.php:825
+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:847
+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:852
+msgid "Invalid composite type. The format has to be %s."
+msgstr ""
+
+#: Model/Attribute.php:863
+msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
+msgstr ""
+
+#: Model/Attribute.php:871
+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:878
+msgid "Checksum has an invalid length or format (expected: filename|string characters). Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:886
+msgid "Invalid CIDR notation value found."
+msgstr ""
+
+#: Model/Attribute.php:891
+msgid "Invalid CIDR notation value found, for IPv4 must be lower or equal 32."
+msgstr ""
+
+#: Model/Attribute.php:895
+msgid "Invalid CIDR notation value found, for IPv6 must be lower or equal 128."
+msgstr ""
+
+#: Model/Attribute.php:898;901;916;955
+msgid "IP address has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:907;919;946
+msgid "Port numbers have to be integers between 1 and 65535."
+msgstr ""
+
+#: Model/Attribute.php:937
+msgid "%s has an invalid format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:943
+msgid "Hostname has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:958
+msgid "Domain name has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:973
+msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:980
+msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
+msgstr ""
+
+#: Model/Attribute.php:987
+msgid "Invalid format. Expected: CWE-x..."
+msgstr ""
+
+#: Model/Attribute.php:998
+msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
+msgstr ""
+
+#: Model/Attribute.php:1107
+msgid "Value must not contain new line character."
+msgstr ""
+
+#: Model/Attribute.php:1115
+msgid "Datetime has to be in the ISO 8601 format."
+msgstr ""
+
+#: Model/Attribute.php:1123
+#: Model/Server.php:1481
+msgid "The value has to be a whole number greater or equal 0."
+msgstr ""
+
+#: Model/Attribute.php:1126
+msgid "The value has to be a number between 0 and 10."
+msgstr ""
+
+#: Model/Attribute.php:1171
+msgid "AS number have to be integers between 1 and 4294967295"
+msgstr ""
+
+#: Model/Attribute.php:2077;2145
+msgid "Could not read user."
+msgstr ""
+
+#: Model/Attribute.php:2081
+msgid "Invalid hash type."
+msgstr ""
+
+#: Model/Attribute.php:2803
+msgid "This field is mandatory."
+msgstr ""
+
+#: Model/Attribute.php:3427
+msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
+msgstr ""
+
+#: Model/Attribute.php:4601
 msgid "Reference used by the publishing party (e.g. ticket number)"
 msgstr ""
 
-#: Model/Attribute.php:80
+#: Model/Attribute.php:4605
 msgid "Internal Attack Targeting and Compromise Information"
 msgstr ""
 
-#: Model/Attribute.php:81
+#: Model/Attribute.php:4606
 msgid "Targeting information to include recipient email, infected machines, department, and or locations."
 msgstr ""
 
-#: Model/Attribute.php:85
+#: Model/Attribute.php:4610
 msgid "All the info about how the malware is detected by the antivirus products"
 msgstr ""
 
-#: Model/Attribute.php:86
+#: Model/Attribute.php:4611
 msgid "List of anti-virus vendors detecting the malware or information on detection performance (e.g. 13/43 or 67%). Attachment with list of detection or link to VirusTotal could be placed here as well."
 msgstr ""
 
-#: Model/Attribute.php:90
+#: Model/Attribute.php:4615
 msgid "Information about how the malware is delivered"
 msgstr ""
 
-#: Model/Attribute.php:91
+#: Model/Attribute.php:4616
 msgid "Information about the way the malware payload is initially delivered, for example information about the email or web-site, vulnerability used, originating IP etc. Malware sample itself should be attached here."
 msgstr ""
 
-#: Model/Attribute.php:95
+#: Model/Attribute.php:4620
 msgid "Any artifact (files, registry keys etc.) dropped by the malware or other modifications to the system"
 msgstr ""
 
-#: Model/Attribute.php:99
+#: Model/Attribute.php:4624
 msgid "Info on where the malware gets installed in the system"
 msgstr ""
 
-#: Model/Attribute.php:100
+#: Model/Attribute.php:4625
 msgid "Location where the payload was placed in the system and the way it was installed. For example, a filename|md5 type attribute can be added here like this: c:\\windows\\system32\\malicious.exe|41d8cd98f00b204e9800998ecf8427e."
 msgstr ""
 
-#: Model/Attribute.php:104
+#: Model/Attribute.php:4629
 msgid "Mechanisms used by the malware to start at boot"
 msgstr ""
 
-#: Model/Attribute.php:105
+#: Model/Attribute.php:4630
 msgid "Mechanisms used by the malware to start at boot. This could be a registry key, legitimate driver modification, LNK file in startup"
 msgstr ""
 
-#: Model/Attribute.php:109
+#: Model/Attribute.php:4634
 msgid "Information about network traffic generated by the malware"
 msgstr ""
 
-#: Model/Attribute.php:113
+#: Model/Attribute.php:4638
 msgid "Information about the final payload(s)"
 msgstr ""
 
-#: Model/Attribute.php:114
+#: Model/Attribute.php:4639
 msgid "Information about the final payload(s). Can contain a function of the payload, e.g. keylogger, RAT, or a name if identified, such as Poison Ivy."
 msgstr ""
 
-#: Model/Attribute.php:118
+#: Model/Attribute.php:4643
 msgid "Identification of the group, organisation, or country behind the attack"
 msgstr ""
 
-#: Model/Attribute.php:122
+#: Model/Attribute.php:4647
 msgid "Any other result from additional analysis of the malware like tools output"
 msgstr ""
 
-#: Model/Attribute.php:123
+#: Model/Attribute.php:4648
 msgid "Any other result from additional analysis of the malware like tools output Examples: pdf-parser output, automated sandbox analysis, reverse engineering report."
 msgstr ""
 
-#: Model/Attribute.php:127
+#: Model/Attribute.php:4652
 msgid "Financial Fraud indicators"
 msgstr ""
 
-#: Model/Attribute.php:128
+#: Model/Attribute.php:4653
 msgid "Financial Fraud indicators, for example: IBAN Numbers, BIC codes, Credit card numbers, etc."
 msgstr ""
 
-#: Model/Attribute.php:132
+#: Model/Attribute.php:4657
 msgid "Tools supporting analysis or detection of the event"
 msgstr ""
 
-#: Model/Attribute.php:136
+#: Model/Attribute.php:4661
 msgid "Social networks and platforms"
 msgstr ""
 
-#: Model/Attribute.php:141
+#: Model/Attribute.php:4666
 msgid "A human being - natural person"
 msgstr ""
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:4670
 msgid "Attributes that are not part of any other category or are meant to be used as a component in MISP objects in the future"
 msgstr ""
 
-#: Model/Attribute.php:154;243
+#: Model/Attribute.php:4684;4788
 msgid "A checksum in md5 format"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:4684
 msgid "You are encouraged to use filename|md5 instead. A checksum in md5 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:4685
 msgid "A checksum in sha1 format"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:4685
 msgid "You are encouraged to use filename|sha1 instead. A checksum in sha1 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:4686
 msgid "A checksum in sha256 format"
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:4686
 msgid "You are encouraged to use filename|sha256 instead. A checksum in sha256 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:157
+#: Model/Attribute.php:4687
 #: View/Elements/healthElements/files.ctp:29
 msgid "Filename"
 msgstr ""
 
-#: Model/Attribute.php:158
+#: Model/Attribute.php:4688
 msgid "Microsoft Program database (PDB) path information"
 msgstr ""
 
-#: Model/Attribute.php:159
+#: Model/Attribute.php:4689
 msgid "A filename and an md5 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:159
+#: Model/Attribute.php:4689
 msgid "A filename and an md5 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:160
+#: Model/Attribute.php:4690
 msgid "A filename and an sha1 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:160
+#: Model/Attribute.php:4690
 msgid "A filename and an sha1 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:161
+#: Model/Attribute.php:4691
 msgid "A filename and an sha256 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:161
+#: Model/Attribute.php:4691
 msgid "A filename and an sha256 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:162
+#: Model/Attribute.php:4692
 msgid "A source IP address of the attacker"
 msgstr ""
 
-#: Model/Attribute.php:163
+#: Model/Attribute.php:4693
 msgid "A destination IP address of the attacker or C&C server"
 msgstr ""
 
-#: Model/Attribute.php:163
+#: Model/Attribute.php:4693
 msgid "A destination IP address of the attacker or C&C server. Also set the IDS flag on when this IP is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:164
+#: Model/Attribute.php:4694
 msgid "A full host/dnsname of an attacker"
 msgstr ""
 
-#: Model/Attribute.php:164
+#: Model/Attribute.php:4694
 msgid "A full host/dnsname of an attacker. Also set the IDS flag on when this hostname is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:165
+#: Model/Attribute.php:4695
 msgid "A domain name used in the malware"
 msgstr ""
 
-#: Model/Attribute.php:165
+#: Model/Attribute.php:4695
 msgid "A domain name used in the malware. Use this instead of hostname when the upper domain is important or can be used to create links between events."
 msgstr ""
 
-#: Model/Attribute.php:166
+#: Model/Attribute.php:4696
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:166
+#: Model/Attribute.php:4696
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:167
-msgid "The email address used to send the malware."
+#: Model/Attribute.php:4698
+msgid "The source email address. Used to describe the sender when describing an e-mail."
 msgstr ""
 
-#: Model/Attribute.php:168
+#: Model/Attribute.php:4699
 msgid "eduPersonPrincipalName - eppn - the NetId of the person for the purposes of inter-institutional authentication. Should be stored in the form of user@univ.edu, where univ.edu is the name of the local security domain."
 msgstr ""
 
-#: Model/Attribute.php:169
-msgid "A recipient email address"
+#: Model/Attribute.php:4700
+msgid "The destination email address. Used to describe the recipient when describing an e-mail."
 msgstr ""
 
-#: Model/Attribute.php:169
-msgid "A recipient email address that is not related to your constituency."
-msgstr ""
-
-#: Model/Attribute.php:170
+#: Model/Attribute.php:4701
 msgid "The subject of the email"
 msgstr ""
 
-#: Model/Attribute.php:171
+#: Model/Attribute.php:4702
 msgid "File name of the email attachment."
 msgstr ""
 
-#: Model/Attribute.php:172
+#: Model/Attribute.php:4703
 msgid "Email body"
 msgstr ""
 
-#: Model/Attribute.php:173
+#: Model/Attribute.php:4704
 msgid "A floating point value."
 msgstr ""
 
-#: Model/Attribute.php:174
+#: Model/Attribute.php:4705
+msgid "A git commit ID."
+msgstr ""
+
+#: Model/Attribute.php:4706
 msgid "url"
 msgstr ""
 
-#: Model/Attribute.php:175
+#: Model/Attribute.php:4707
 msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
 msgstr ""
 
-#: Model/Attribute.php:176
+#: Model/Attribute.php:4708
 msgid "The user-agent used by the malware in the HTTP request."
 msgstr ""
 
-#: Model/Attribute.php:177
+#: Model/Attribute.php:4709
 msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
 msgstr ""
 
-#: Model/Attribute.php:178
+#: Model/Attribute.php:4710
+msgid "JARM is a method for creating SSL/TLS server fingerprints."
+msgstr ""
+
+#: Model/Attribute.php:4711
+msgid "favicon-mmh3 is the murmur3 hash of a favicon as used in Shodan."
+msgstr ""
+
+#: Model/Attribute.php:4712
 msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
-#: Model/Attribute.php:179
+#: Model/Attribute.php:4713
 msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
-#: Model/Attribute.php:180
+#: Model/Attribute.php:4714
 msgid "Registry key or value"
 msgstr ""
 
-#: Model/Attribute.php:181
+#: Model/Attribute.php:4715
 msgid "Registry value + data separated by |"
 msgstr ""
 
-#: Model/Attribute.php:182
+#: Model/Attribute.php:4716
 msgid "Autonomous system"
 msgstr ""
 
-#: Model/Attribute.php:183
+#: Model/Attribute.php:4717
 msgid "An IDS rule in Snort rule-format"
 msgstr ""
 
-#: Model/Attribute.php:183
+#: Model/Attribute.php:4717
 msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
 msgstr ""
 
-#: Model/Attribute.php:184
+#: Model/Attribute.php:4718
 msgid "An NIDS rule in the Bro rule-format"
 msgstr ""
 
-#: Model/Attribute.php:184
+#: Model/Attribute.php:4718
 msgid "An NIDS rule in the Bro rule-format."
 msgstr ""
 
-#: Model/Attribute.php:185
+#: Model/Attribute.php:4719
 msgid "An NIDS rule in the Zeek rule-format"
 msgstr ""
 
-#: Model/Attribute.php:185
+#: Model/Attribute.php:4719
 msgid "An NIDS rule in the Zeek rule-format."
 msgstr ""
 
-#: Model/Attribute.php:186
+#: Model/Attribute.php:4720
 msgid "a community ID flow hashing algorithm to map multiple traffic monitors into common flow id"
 msgstr ""
 
-#: Model/Attribute.php:187
+#: Model/Attribute.php:4721
 msgid "Pattern in file that identifies the malware"
 msgstr ""
 
-#: Model/Attribute.php:188
+#: Model/Attribute.php:4722
 msgid "Pattern in network traffic that identifies the malware"
 msgstr ""
 
-#: Model/Attribute.php:189
+#: Model/Attribute.php:4723
 msgid "Pattern in memory dump that identifies the malware"
 msgstr ""
 
-#: Model/Attribute.php:190
+#: Model/Attribute.php:4724
+msgid "A pattern in the name of a file"
+msgstr ""
+
+#: Model/Attribute.php:4725
+msgid "A PGP public key"
+msgstr ""
+
+#: Model/Attribute.php:4726
+msgid "A PGP private key"
+msgstr ""
+
+#: Model/Attribute.php:4727
 msgid "Yara signature"
 msgstr ""
 
-#: Model/Attribute.php:191
+#: Model/Attribute.php:4728
 msgid "STIX 2 pattern"
 msgstr ""
 
-#: Model/Attribute.php:192
+#: Model/Attribute.php:4729
 msgid "Sigma - Generic Signature Format for SIEM Systems"
 msgstr ""
 
-#: Model/Attribute.php:193
+#: Model/Attribute.php:4730
 msgid "GENE - Go Evtx sigNature Engine"
 msgstr ""
 
-#: Model/Attribute.php:194
+#: Model/Attribute.php:4731
 msgid "Kusto query - Kusto from Microsoft Azure is a service for storing and running interactive analytics over Big Data."
 msgstr ""
 
-#: Model/Attribute.php:195
+#: Model/Attribute.php:4732
 msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
 msgstr ""
 
-#: Model/Attribute.php:196
+#: Model/Attribute.php:4733
 msgid "Identity card number"
 msgstr ""
 
-#: Model/Attribute.php:197
+#: Model/Attribute.php:4734
 msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
 msgstr ""
 
-#: Model/Attribute.php:198
+#: Model/Attribute.php:4735
 msgid "A reference to the vulnerability used in the exploit"
 msgstr ""
 
-#: Model/Attribute.php:199
+#: Model/Attribute.php:4736
+msgid "Common Platform Enumeration - structured naming scheme for information technology systems, software, and packages."
+msgstr ""
+
+#: Model/Attribute.php:4737
 msgid "A reference to the weakness used in the exploit"
 msgstr ""
 
-#: Model/Attribute.php:200
+#: Model/Attribute.php:4738
 msgid "Attachment with external information"
 msgstr ""
 
-#: Model/Attribute.php:200;201
+#: Model/Attribute.php:4738;4739
 msgid "Please upload files using the <em>Upload Attachment</em> button."
 msgstr ""
 
-#: Model/Attribute.php:201
+#: Model/Attribute.php:4739
 msgid "Attachment containing encrypted malware sample"
 msgstr ""
 
-#: Model/Attribute.php:202
+#: Model/Attribute.php:4740
 msgid "Link to an external information"
 msgstr ""
 
-#: Model/Attribute.php:203
+#: Model/Attribute.php:4741
 msgid "Comment or description in a human language"
 msgstr ""
 
-#: Model/Attribute.php:203
+#: Model/Attribute.php:4741
 msgid "Comment or description in a human language.  This will not be correlated with other attributes"
 msgstr ""
 
-#: Model/Attribute.php:204
+#: Model/Attribute.php:4742
 msgid "Name, ID or a reference"
 msgstr ""
 
-#: Model/Attribute.php:205
+#: Model/Attribute.php:4743
 msgid "A value in hexadecimal format"
 msgstr ""
 
-#: Model/Attribute.php:206
+#: Model/Attribute.php:4744
 msgid "Other attribute"
 msgstr ""
 
-#: Model/Attribute.php:207
+#: Model/Attribute.php:4745
 msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
 msgstr ""
 
-#: Model/Attribute.php:208
+#: Model/Attribute.php:4746
 msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
 msgstr ""
 
-#: Model/Attribute.php:209
+#: Model/Attribute.php:4747
+msgid "State of a process"
+msgstr ""
+
+#: Model/Attribute.php:4748
 msgid "Attack Targets Username(s)"
 msgstr ""
 
-#: Model/Attribute.php:210
+#: Model/Attribute.php:4749
 msgid "Attack Targets Email(s)"
 msgstr ""
 
-#: Model/Attribute.php:211
+#: Model/Attribute.php:4750
 msgid "Attack Targets Machine Name(s)"
 msgstr ""
 
-#: Model/Attribute.php:212
+#: Model/Attribute.php:4751
 msgid "Attack Targets Department or Organization(s)"
 msgstr ""
 
-#: Model/Attribute.php:213
+#: Model/Attribute.php:4752
 msgid "Attack Targets Physical Location(s)"
 msgstr ""
 
-#: Model/Attribute.php:214
+#: Model/Attribute.php:4753
 msgid "External Target Organizations Affected by this Attack"
 msgstr ""
 
-#: Model/Attribute.php:215
+#: Model/Attribute.php:4754
 msgid "Bitcoin Address"
 msgstr ""
 
-#: Model/Attribute.php:216
+#: Model/Attribute.php:4755
 msgid "Dash Address"
 msgstr ""
 
-#: Model/Attribute.php:217
+#: Model/Attribute.php:4756
 msgid "Monero Address"
 msgstr ""
 
-#: Model/Attribute.php:218
+#: Model/Attribute.php:4757
 msgid "International Bank Account Number"
 msgstr ""
 
-#: Model/Attribute.php:219
+#: Model/Attribute.php:4758
 msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
 msgstr ""
 
-#: Model/Attribute.php:220
+#: Model/Attribute.php:4759
 msgid "Bank account number without any routing number"
 msgstr ""
 
-#: Model/Attribute.php:221
+#: Model/Attribute.php:4760
 msgid "ABA routing transit number"
 msgstr ""
 
-#: Model/Attribute.php:222
+#: Model/Attribute.php:4761
 msgid "Bank Identification Number"
 msgstr ""
 
-#: Model/Attribute.php:223
+#: Model/Attribute.php:4762
 msgid "Credit-Card Number"
 msgstr ""
 
-#: Model/Attribute.php:224
+#: Model/Attribute.php:4763
 msgid "Premium-Rate Telephone Number"
 msgstr ""
 
-#: Model/Attribute.php:225
+#: Model/Attribute.php:4764
 msgid "Telephone Number"
 msgstr ""
 
-#: Model/Attribute.php:226
+#: Model/Attribute.php:4765
 msgid "A string identifying the threat actor"
 msgstr ""
 
-#: Model/Attribute.php:227
+#: Model/Attribute.php:4766
 msgid "Associated campaign name"
 msgstr ""
 
-#: Model/Attribute.php:228
+#: Model/Attribute.php:4767
 msgid "Associated campaign ID"
 msgstr ""
 
-#: Model/Attribute.php:230
+#: Model/Attribute.php:4769
 msgid "Uniform Resource Identifier"
 msgstr ""
 
-#: Model/Attribute.php:231
+#: Model/Attribute.php:4770
 msgid "Authenticode executable signature hash"
 msgstr ""
 
-#: Model/Attribute.php:231
+#: Model/Attribute.php:4770
 msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:232;244
+#: Model/Attribute.php:4771
+msgid "A VirusTotal checksum"
+msgstr ""
+
+#: Model/Attribute.php:4771
+msgid "You are encouraged to use filename|vhash instead. A checksum from VirusTotal, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:4772;4790
 msgid "A checksum in ssdeep format"
 msgstr ""
 
-#: Model/Attribute.php:232
+#: Model/Attribute.php:4772
 msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:233;245
+#: Model/Attribute.php:4773;4791
 msgid "Import hash - a hash created based on the imports in the sample."
 msgstr ""
 
-#: Model/Attribute.php:233
+#: Model/Attribute.php:4773
 msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:234
+#: Model/Attribute.php:4774
+msgid "telfhash is symbol hash for ELF files, just like imphash is imports hash for PE files."
+msgstr ""
+
+#: Model/Attribute.php:4774
+msgid "You are encouraged to use a file object with telfash"
+msgstr ""
+
+#: Model/Attribute.php:4775
 msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
 msgstr ""
 
-#: Model/Attribute.php:235
+#: Model/Attribute.php:4776
 msgid "A fuzzy hash of import table of Portable Executable format"
 msgstr ""
 
-#: Model/Attribute.php:235
+#: Model/Attribute.php:4776
 msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:236
+#: Model/Attribute.php:4777
 msgid "A checksum in sha-224 format"
 msgstr ""
 
-#: Model/Attribute.php:236
+#: Model/Attribute.php:4777
 msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:237
+#: Model/Attribute.php:4778
 msgid "A checksum in sha-384 format"
 msgstr ""
 
-#: Model/Attribute.php:237
+#: Model/Attribute.php:4778
 msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:238
+#: Model/Attribute.php:4779
 msgid "A checksum in sha-512 format"
 msgstr ""
 
-#: Model/Attribute.php:238
+#: Model/Attribute.php:4779
 msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:239
+#: Model/Attribute.php:4780
 msgid "A checksum in the sha-512/224 format"
 msgstr ""
 
-#: Model/Attribute.php:239
+#: Model/Attribute.php:4780
 msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:240
+#: Model/Attribute.php:4781
 msgid "A checksum in the sha-512/256 format"
 msgstr ""
 
-#: Model/Attribute.php:240
+#: Model/Attribute.php:4781
 msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:241
+#: Model/Attribute.php:4782
+msgid "A checksum in sha3-224 format"
+msgstr ""
+
+#: Model/Attribute.php:4782
+msgid "You are encouraged to use filename|sha3-224 instead. A checksum in sha3-224 format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:4783
+msgid "A checksum in sha3-256 format"
+msgstr ""
+
+#: Model/Attribute.php:4783
+msgid "You are encouraged to use filename|sha3-256 instead. A checksum in sha3-256 format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:4784
+msgid "A checksum in sha3-384 format"
+msgstr ""
+
+#: Model/Attribute.php:4784
+msgid "You are encouraged to use filename|sha3-384 instead. A checksum in sha3-384 format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:4785
+msgid "A checksum in sha3-512 format"
+msgstr ""
+
+#: Model/Attribute.php:4785
+msgid "You are encouraged to use filename|sha3-512 instead. A checksum in sha3-512 format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:4786
 msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
 msgstr ""
 
-#: Model/Attribute.php:241
+#: Model/Attribute.php:4786
 msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:242
+#: Model/Attribute.php:4787
 msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
 msgstr ""
 
-#: Model/Attribute.php:246
+#: Model/Attribute.php:4789
+msgid "A filename and a VirusTotal hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:4792
 msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
 msgstr ""
 
-#: Model/Attribute.php:247
+#: Model/Attribute.php:4793
 msgid "A filename and a PEhash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:248
+#: Model/Attribute.php:4794
 msgid "A filename and a sha-224 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:249
+#: Model/Attribute.php:4795
 msgid "A filename and a sha-384 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:250
+#: Model/Attribute.php:4796
 msgid "A filename and a sha-512 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:251
+#: Model/Attribute.php:4797
 msgid "A filename and a sha-512/224 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:252
+#: Model/Attribute.php:4798
 msgid "A filename and a sha-512/256 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:253
+#: Model/Attribute.php:4799
+msgid "A filename and an sha3-224 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:4800
+msgid "A filename and an sha3-256 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:4801
+msgid "A filename and an sha3-384 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:4802
+msgid "A filename and an sha3-512 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:4803
 msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:254
+#: Model/Attribute.php:4804
 msgid "A scheduled task in windows"
 msgstr ""
 
-#: Model/Attribute.php:255
+#: Model/Attribute.php:4805
 msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
 msgstr ""
 
-#: Model/Attribute.php:256
+#: Model/Attribute.php:4806
 msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
 msgstr ""
 
-#: Model/Attribute.php:257
+#: Model/Attribute.php:4807
 msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:258
+#: Model/Attribute.php:4808
 msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:259
+#: Model/Attribute.php:4809
 msgid "The name of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:260
+#: Model/Attribute.php:4810
 msgid "The org of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:261
+#: Model/Attribute.php:4811
 msgid "The registrar of the domain, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:262
+#: Model/Attribute.php:4812
 msgid "The date of domain's creation, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:267
+#: Model/Attribute.php:4817
 msgid "X509 fingerprint in SHA-1 format"
 msgstr ""
 
-#: Model/Attribute.php:268
+#: Model/Attribute.php:4818
 msgid "X509 fingerprint in MD5 format"
 msgstr ""
 
-#: Model/Attribute.php:269
+#: Model/Attribute.php:4819
 msgid "X509 fingerprint in SHA-256 format"
 msgstr ""
 
-#: Model/Attribute.php:270
+#: Model/Attribute.php:4820
 msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
 msgstr ""
 
-#: Model/Attribute.php:271
+#: Model/Attribute.php:4821
 msgid "Size expressed in bytes"
 msgstr ""
 
-#: Model/Attribute.php:272
+#: Model/Attribute.php:4822
 msgid "An integer counter, generally to be used in objects"
 msgstr ""
 
-#: Model/Attribute.php:273
+#: Model/Attribute.php:4823
 msgid "Datetime in the ISO 8601 format"
 msgstr ""
 
-#: Model/Attribute.php:274
-msgid "Common platform enumeration"
-msgstr ""
-
-#: Model/Attribute.php:275
+#: Model/Attribute.php:4824
 msgid "Port number"
 msgstr ""
 
-#: Model/Attribute.php:276
+#: Model/Attribute.php:4825
 msgid "IP destination and port number separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:277
+#: Model/Attribute.php:4826
 msgid "IP source and port number separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:278
+#: Model/Attribute.php:4827
 msgid "Hostname and port number separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:279
+#: Model/Attribute.php:4828
 msgid "Mac address"
 msgstr ""
 
-#: Model/Attribute.php:280
+#: Model/Attribute.php:4829
 msgid "Mac EUI-64 address"
 msgstr ""
 
-#: Model/Attribute.php:282
+#: Model/Attribute.php:4831
 msgid "Email destination display name"
 msgstr ""
 
-#: Model/Attribute.php:283
+#: Model/Attribute.php:4832
 msgid "Email source display name"
 msgstr ""
 
-#: Model/Attribute.php:284
+#: Model/Attribute.php:4833
 msgid "Email header"
 msgstr ""
 
-#: Model/Attribute.php:285
+#: Model/Attribute.php:4834
 msgid "Email reply to header"
 msgstr ""
 
-#: Model/Attribute.php:286
+#: Model/Attribute.php:4835
 msgid "Email x-mailer header"
 msgstr ""
 
-#: Model/Attribute.php:287
+#: Model/Attribute.php:4836
 msgid "The email mime boundary separating parts in a multipart email"
 msgstr ""
 
-#: Model/Attribute.php:288
+#: Model/Attribute.php:4837
 msgid "The email thread index header"
 msgstr ""
 
-#: Model/Attribute.php:289
+#: Model/Attribute.php:4838
 msgid "The email message ID"
 msgstr ""
 
-#: Model/Attribute.php:290
+#: Model/Attribute.php:4839
 msgid "A github user name"
 msgstr ""
 
-#: Model/Attribute.php:291
+#: Model/Attribute.php:4840
 msgid "A github repository"
 msgstr ""
 
-#: Model/Attribute.php:292
+#: Model/Attribute.php:4841
 msgid "A github organisation"
 msgstr ""
 
-#: Model/Attribute.php:293
+#: Model/Attribute.php:4842
 msgid "Jabber ID"
 msgstr ""
 
-#: Model/Attribute.php:294
+#: Model/Attribute.php:4843
 msgid "Twitter ID"
 msgstr ""
 
-#: Model/Attribute.php:295
+#: Model/Attribute.php:4844
+msgid "DKIM public key"
+msgstr ""
+
+#: Model/Attribute.php:4845
+msgid "DKIM signature"
+msgstr ""
+
+#: Model/Attribute.php:4846
 msgid "First name of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:296
+#: Model/Attribute.php:4847
 msgid "Middle name of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:297
+#: Model/Attribute.php:4848
 msgid "Last name of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:298
+#: Model/Attribute.php:4849
+msgid "Full name of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:4850
 msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
 msgstr ""
 
-#: Model/Attribute.php:299
+#: Model/Attribute.php:4851
 msgid "Place of birth of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:300
+#: Model/Attribute.php:4852
 msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
 msgstr ""
 
-#: Model/Attribute.php:301
+#: Model/Attribute.php:4853
 msgid "The passport number of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:302
+#: Model/Attribute.php:4854
 msgid "The country in which the passport was issued"
 msgstr ""
 
-#: Model/Attribute.php:303
+#: Model/Attribute.php:4855
 msgid "The expiration date of a passport"
 msgstr ""
 
-#: Model/Attribute.php:304
+#: Model/Attribute.php:4856
 msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
 msgstr ""
 
-#: Model/Attribute.php:305
+#: Model/Attribute.php:4857
 msgid "The nationality of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:306
+#: Model/Attribute.php:4858
 msgid "Visa number"
 msgstr ""
 
-#: Model/Attribute.php:307
+#: Model/Attribute.php:4859
 msgid "The date on which the visa was issued"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:4860
 msgid "The primary residence of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:309
+#: Model/Attribute.php:4861
 msgid "The country of residence of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:310
+#: Model/Attribute.php:4862
 msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
 msgstr ""
 
-#: Model/Attribute.php:311
+#: Model/Attribute.php:4863
 msgid "The frequent flyer number of a passenger"
 msgstr ""
 
-#: Model/Attribute.php:314
+#: Model/Attribute.php:4866
 msgid "Travel details"
 msgstr ""
 
-#: Model/Attribute.php:315
+#: Model/Attribute.php:4867
 msgid "Payment details"
 msgstr ""
 
-#: Model/Attribute.php:316
-msgid "The orignal port of embarkation"
+#: Model/Attribute.php:4868
+msgid "The original port of embarkation"
 msgstr ""
 
-#: Model/Attribute.php:317
+#: Model/Attribute.php:4869
 msgid "The port of clearance"
 msgstr ""
 
-#: Model/Attribute.php:318
+#: Model/Attribute.php:4870
 msgid "A Port where the passenger is transiting to"
 msgstr ""
 
-#: Model/Attribute.php:319
+#: Model/Attribute.php:4871
 msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
 msgstr ""
 
-#: Model/Attribute.php:320
+#: Model/Attribute.php:4872
 msgid "The application id of a mobile application"
 msgstr ""
 
-#: Model/Attribute.php:321
+#: Model/Attribute.php:4873
 msgid "Chrome extension id"
 msgstr ""
 
-#: Model/Attribute.php:322
+#: Model/Attribute.php:4874
 msgid "Cortex analysis result"
 msgstr ""
 
-#: Model/Attribute.php:323
+#: Model/Attribute.php:4875
 msgid "Boolean value - to be used in objects"
 msgstr ""
 
-#: Model/Attribute.php:324
+#: Model/Attribute.php:4876
 msgid "Anonymised value - described with the anonymisation object via a relationship"
 msgstr ""
 
-#: Model/Attribute.php:324
+#: Model/Attribute.php:4876
 msgid "Anonymised value - described with the anonymisation object via a relationship."
 msgstr ""
 
-#: Model/Attribute.php:644
-msgid "Composite type, but value not explodable"
+#: Model/AuthKey.php:55
+msgid "Expiration must be in YYYY-MM-DD format."
 msgstr ""
 
-#: Model/Attribute.php:791
-msgid "Delete of file attachment failed. Please report to administrator."
+#: Model/AuthKey.php:58
+msgid "Maximal key validity is %s days."
 msgstr ""
 
-#: Model/Attribute.php:935
-msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
+#: Model/Cerebrate.php:43
+msgid "Something went wrong. Error returned: %s"
 msgstr ""
 
-#: Model/Attribute.php:1074
-msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
+#: Model/Cerebrate.php:46
+msgid "Authentication failed."
 msgstr ""
 
-#: Model/Attribute.php:1081
-msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
+#: Model/Cerebrate.php:48
+msgid "Something went wrong with the request or the remote side is having issues."
 msgstr ""
 
-#: Model/Attribute.php:1088
-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!"
+#: Model/Cerebrate.php:164
+msgid "The organisation could not be saved."
 msgstr ""
 
-#: Model/Attribute.php:1099
-msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
-msgstr ""
-
-#: Model/Attribute.php:1110
-msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
-msgstr ""
-
-#: Model/Attribute.php:1117
-msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
-msgstr ""
-
-#: Model/Attribute.php:1132
-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:1150
-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:1155
-msgid "Invalid composite type. The format has to be %s."
-msgstr ""
-
-#: Model/Attribute.php:1166
-msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
-msgstr ""
-
-#: Model/Attribute.php:1174
-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:1185
-msgid "Invalid CIDR notation value found."
-msgstr ""
-
-#: Model/Attribute.php:1192;1243
-msgid "IP address has an invalid format."
-msgstr ""
-
-#: Model/Attribute.php:1197
-msgid "Port numbers have to be positive integers between 1 and 65535."
-msgstr ""
-
-#: Model/Attribute.php:1226
-msgid " name has an invalid format. Please double check the value or select type \"other\"."
-msgstr ""
-
-#: Model/Attribute.php:1246
-msgid "Domain name has an invalid format."
-msgstr ""
-
-#: Model/Attribute.php:1260
-msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
-msgstr ""
-
-#: Model/Attribute.php:1268
-msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
-msgstr ""
-
-#: Model/Attribute.php:1276
-msgid "Invalid format. Expected: CWE-x..."
-msgstr ""
-
-#: Model/Attribute.php:1287
-msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
-msgstr ""
-
-#: Model/Attribute.php:1405
-msgid "Datetime has to be in the ISO 8601 format."
-msgstr ""
-
-#: Model/Attribute.php:1411
-msgid "The value has to be a number greater or equal 0."
-msgstr ""
-
-#: Model/Attribute.php:1418
-msgid "The value has to be a number between 0 and 10."
-msgstr ""
-
-#: Model/Attribute.php:2297;2365
-msgid "Could not read user."
-msgstr ""
-
-#: Model/Attribute.php:2301
-msgid "Invalid hash type."
-msgstr ""
-
-#: Model/Attribute.php:2992
-msgid "This field is mandatory."
-msgstr ""
-
-#: Model/Attribute.php:3559
-msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
+#: Model/Cerebrate.php:171
+msgid "The retrieved data isn't a valid organisation."
 msgstr ""
 
 #: Model/Community.php:26;67
@@ -4049,6 +4984,14 @@ msgstr ""
 msgid "Community not found."
 msgstr ""
 
+#: Model/CorrelationExclusion.php:55
+msgid "Cleaning up excluded correlations."
+msgstr ""
+
+#: Model/CorrelationExclusion.php:66
+msgid "Cleanup queued for background execution."
+msgstr ""
+
 #: Model/Dashboard.php:55;64
 msgid "Invalid widget or widget not found."
 msgstr ""
@@ -4057,1354 +5000,1888 @@ msgstr ""
 msgid "Models could not be loaded or default decaying models folder is empty"
 msgstr ""
 
-#: Model/DecayingModel.php:351
+#: Model/DecayingModel.php:368
 msgid "No tags nor predicates with `numerical_value`"
 msgstr ""
 
-#: Model/DecayingModel.php:358
+#: Model/DecayingModel.php:375
 msgid "No predicate"
 msgstr ""
 
-#: Model/DecayingModel.php:437
+#: Model/DecayingModel.php:453
 msgid "The class for `%s` was not found or not loaded correctly"
 msgstr ""
 
-#: Model/Event.php:390
+#: Model/Event.php:287
 msgid "Click this to download all events and attributes that you have access to in MISP JSON format."
 msgstr ""
 
-#: Model/Event.php:398
+#: Model/Event.php:295
 msgid "Click this to download all events and attributes that you have access to in MISP XML format."
 msgstr ""
 
-#: Model/Event.php:406
+#: Model/Event.php:303
 #: View/Events/export_alternate.ctp:19
 msgid "Click this to download all attributes that are indicators and that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:414
+#: Model/Event.php:311
 #: View/Events/export_alternate.ctp:26
 msgid "Click this to download all attributes that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:422
-msgid "Click this to download all network related attributes that you have access to under the Suricata rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
+#: Model/Event.php:319
+msgid "Click this to download all network related attributes that you have access to under the Suricata rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a allowedlist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:430
-msgid "Click this to download all network related attributes that you have access to under the Snort rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
+#: Model/Event.php:327
+msgid "Click this to download all network related attributes that you have access to under the Snort rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a allowedlist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:438
-msgid "Click this to download all network related attributes that you have access to under the Bro rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
+#: Model/Event.php:335
+msgid "Click this to download all network related attributes that you have access to under the Bro rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a allowedlist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:446
-msgid "Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to."
+#: Model/Event.php:343
+msgid "Click this to download a STIX document containing the STIX version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:454
-msgid "Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
+#: Model/Event.php:351
+msgid "Click this to download a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:462
+#: Model/Event.php:359
 #: 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 ""
 
-#: Model/Event.php:470
+#: Model/Event.php:367
 msgid "Click on one of the buttons below to download all the attributes with the matching type. This list can be used to feed forensic software when searching for susipicious files. Only published events and attributes marked as IDS Signature are exported."
 msgstr ""
 
-#: Model/Event.php:478
+#: Model/Event.php:375
 msgid "Click this to download Yara rules generated from all relevant attributes."
 msgstr ""
 
-#: Model/Event.php:486
+#: Model/Event.php:383
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5799
+#: Model/Event.php:399
+msgid "Automatically blocked by deleting event"
+msgstr ""
+
+#: Model/Event.php:1321
+msgid "Remote version does not support event report."
+msgstr ""
+
+#: Model/Event.php:3210
+msgid "Mails blocked by org alert threshold."
+msgstr ""
+
+#: Model/Event.php:3243
+msgid "A new or modified event was just published on %s"
+msgstr ""
+
+#: Model/Event.php:3244
+msgid "If you would like to unsubscribe from receiving such alert e-mails, simply\ndisable publish alerts via %s"
+msgstr ""
+
+#: Model/Event.php:3268
+msgid "Mails sent."
+msgstr ""
+
+#: Model/Event.php:3740
+msgid "This is not a valid MISP XML file."
+msgstr ""
+
+#: Model/Event.php:3740
+msgid "This is not a valid MISP JSON file."
+msgstr ""
+
+#: Model/Event.php:6006
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:5801
+#: Model/Event.php:6008
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:5803
+#: Model/Event.php:6010
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:5806
+#: Model/Event.php:6013
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:5808
+#: Model/Event.php:6015
 msgid "Please "
 msgstr ""
 
-#: Model/Event.php:5810
+#: Model/Event.php:6017
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:5842
+#: Model/Event.php:6091
 msgid "#"
 msgstr ""
 
-#: Model/Event.php:5851
+#: Model/Event.php:6100
 msgid "%s not set"
 msgstr ""
 
-#: Model/Event.php:6100
+#: Model/Event.php:6346
 msgid "Could not add tags."
 msgstr ""
 
-#: Model/Event.php:6582
+#: Model/Event.php:6387
+msgid "Processing complete. %s"
+msgstr ""
+
+#: Model/Event.php:6849
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:86
-msgid "Invalid input source. The only valid options are %s. %s"
+#: Model/Event.php:6999
+msgid "%s from another event"
+msgstr ""
+
+#: Model/EventReport.php:114
+msgid "Event Report dropped due to validation for Event report %s failed: %s"
+msgstr ""
+
+#: Model/EventReport.php:115
+msgid "Validation errors: %s.%sFull report: %s"
+msgstr ""
+
+#: Model/EventReport.php:152
+msgid "Event Report doesn't have an UUID"
+msgstr ""
+
+#: Model/EventReport.php:164
+msgid "Event Report not found."
+msgstr ""
+
+#: Model/EventReport.php:203
+msgid "Failed to delete report"
+msgstr ""
+
+#: Model/EventReport.php:291;301;360
+msgid "Invalid report"
+msgstr ""
+
+#: Model/EventReport.php:352
+#: Model/GalaxyCluster.php:1390
+msgid "Invalid authorization requested"
+msgstr ""
+
+#: Model/EventReport.php:390
+msgid "Could not find associated event"
+msgstr ""
+
+#: Model/EventReport.php:393
+msgid "Only the creator organisation of the event can modify the report"
 msgstr ""
 
 #: Model/Feed.php:90
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:94
 msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
 msgstr ""
 
-#: Model/Feed.php:1496;1540
+#: Model/Feed.php:1215
+msgid "Feed %s: Fetching."
+msgstr ""
+
+#: Model/Feed.php:1221
+msgid "Could not fetch freetext feed %s. See error log for more details."
+msgstr ""
+
+#: Model/Feed.php:1241
+msgid "Feed %s: %s/%s values cached."
+msgstr ""
+
+#: Model/Feed.php:1645;1689
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1510
+#: Model/Feed.php:1659
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Feed.php:1687
+#: Model/Feed.php:1850
 msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Feed.php:1690
+#: Model/Feed.php:1853
 msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
 msgstr ""
 
-#: Model/Feed.php:1695
+#: Model/Feed.php:1858
 msgid "Invalid user id."
 msgstr ""
 
-#: Model/Feed.php:1715
+#: Model/Feed.php:1878
 msgid "Events related to feed %s purged."
 msgstr ""
 
-#: Model/Galaxy.php:421
+#: Model/Galaxy.php:310;315
+#: Model/GalaxyCluster.php:256
+msgid "Galaxy not found"
+msgstr ""
+
+#: Model/Galaxy.php:347
+msgid "Invalid Galaxy cluster"
+msgstr ""
+
+#: Model/Galaxy.php:571
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:1139
+#: Model/GalaxyCluster.php:249;374
+msgid "Incorrect permission"
+msgstr ""
+
+#: Model/GalaxyCluster.php:267;709
+msgid "Blocked by blocklist"
+msgstr ""
+
+#: Model/GalaxyCluster.php:275
+msgid "Cluster already exists in another galaxy"
+msgstr ""
+
+#: Model/GalaxyCluster.php:279
+msgid "Edit not allowed on default clusters"
+msgstr ""
+
+#: Model/GalaxyCluster.php:283
+msgid "Edit not allowed"
+msgstr ""
+
+#: Model/GalaxyCluster.php:304
+msgid "Cluster forks have to belong to the same galaxy as the parent"
+msgstr ""
+
+#: Model/GalaxyCluster.php:323
+msgid "The sync user has to have access to the sharing group in order to be able to edit it"
+msgstr ""
+
+#: Model/GalaxyCluster.php:379
+#: Model/GalaxyClusterRelation.php:297
+msgid "UUID not provided"
+msgstr ""
+
+#: Model/GalaxyCluster.php:382
+msgid "Unkown UUID"
+msgstr ""
+
+#: Model/GalaxyCluster.php:394
+msgid "Galaxy Cluster could not be saved: The sync user has to have access to the sharing group in order to be able to edit it."
+msgstr ""
+
+#: Model/GalaxyCluster.php:398
+msgid "Galaxy Cluster could not be saved: The user used to edit the cluster is not authorised to do so. This can be caused by the user not being of the same organisation as the original creator of the cluster whilst also not being a site administrator."
+msgstr ""
+
+#: Model/GalaxyCluster.php:739
+msgid "Organisation blocklisted (%s)"
+msgstr ""
+
+#: Model/GalaxyCluster.php:746
+msgid "Only non-default clusters can be saved"
+msgstr ""
+
+#: Model/GalaxyCluster.php:773
+msgid "Blocked an edit to an cluster that was created locally. This can happen if a synchronised cluster that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/GalaxyCluster.php:781
+msgid "Remote version is not newer than local one for cluster (%s)"
+msgstr ""
+
+#: Model/GalaxyCluster.php:800
+msgid "Issues while capturing relations have been logged."
+msgstr ""
+
+#: Model/GalaxyCluster.php:1358;1365;1398
+msgid "Invalid galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyCluster.php:1414
+msgid "You don't have the permission to do that."
+msgstr ""
+
+#: Model/GalaxyCluster.php:1422
+msgid "Only the creator organisation can modify the galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyCluster.php:1431
+msgid "Only the creator organisation with publishing capabilities can publish the galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyCluster.php:1608
+msgid "The remote user does not have the permission to manipulate galaxies - the upload of the galaxy clusters has been blocked."
+msgstr ""
+
+#: Model/GalaxyCluster.php:1855
+msgid "The distribution level of the cluster blocks it from being pushed."
+msgstr ""
+
+#: Model/GalaxyCluster.php:1857
+msgid "The sync user on the remote instance does not have the required privileges to handle this cluster."
+msgstr ""
+
+#: Model/GalaxyCluster.php:1862
+msgid "Uploading GalaxyCluster (%s) to Server (%s)"
+msgstr ""
+
+#: Model/GalaxyCluster.php:1957
+msgid "Failed because of errors: "
+msgstr ""
+
+#: Model/GalaxyCluster.php:1960
+msgid "failed downloading the galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:217;465
+msgid "Relation already exists"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:227;320
+msgid "referenced_galaxy_cluster_uuid not provided"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:233;325
+msgid "Invalid referenced galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:258
+msgid "Tags could not be saved for relation (%s)"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:285
+msgid "galaxy_cluster_id not provided"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:300
+msgid "Unkown ID"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:307
+msgid "Invalid source galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:434
+msgid "No referenced cluster UUID provided"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:434
+msgid "relation for cluster (%s)"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:449
+msgid "Referenced cluster not found"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:449;465
+msgid "relation to (%s) for cluster (%s)"
+msgstr ""
+
+#: Model/GalaxyClusterRelationTag.php:77
+msgid "Could not attach tag %s"
+msgstr ""
+
+#: Model/GalaxyClusterRelationTag.php:77
+msgid "relation (%s)"
+msgstr ""
+
+#: Model/Job.php:118
+msgid "Job done."
+msgstr ""
+
+#: Model/Job.php:118
+msgid "Job failed."
+msgstr ""
+
+#: Model/MispObject.php:389
+msgid "No valid template found and object lacking template information. (%s)"
+msgstr ""
+
+#: Model/MispObject.php:1211
 msgid "Selected Attributes do not exist."
 msgstr ""
 
-#: Model/Server.php:123
+#: Model/Server.php:131
 msgid "Server unreachable"
 msgstr ""
 
-#: Model/Server.php:124
+#: Model/Server.php:132
 msgid "Unexpected error"
 msgstr ""
 
-#: Model/Server.php:125
+#: Model/Server.php:133
 msgid "Authentication failed"
 msgstr ""
 
-#: Model/Server.php:126
+#: Model/Server.php:134
 msgid "Password change required"
 msgstr ""
 
-#: Model/Server.php:127
+#: Model/Server.php:135
 msgid "Terms not accepted"
 msgstr ""
 
-#: Model/Server.php:150
+#: Model/Server.php:158
 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:151
+#: Model/Server.php:159
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:163
+#: Model/Server.php:172
 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:164
+#: Model/Server.php:173
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:173
+#: Model/Server.php:182
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:174
+#: Model/Server.php:183
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:183
-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:185
-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:191
-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:199
-msgid "Unless set to true, the instance will only be accessible by site admins."
-msgstr ""
-
-#: Model/Server.php:207
-msgid "Select the language MISP should use. The default is english."
-msgstr ""
-
-#: Model/Server.php:217
-msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
-msgstr ""
-
-#: Model/Server.php:226
-msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
-msgstr ""
-
-#: Model/Server.php:235
-msgid "Enable some performance heavy correlations (currently CIDR correlation)"
-msgstr ""
-
-#: Model/Server.php:244
-msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
-msgstr ""
-
-#: Model/Server.php:253
-msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
-msgstr ""
-
-#: Model/Server.php:264
-msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
-msgstr ""
-
-#: Model/Server.php:274
-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:283
-msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
-msgstr ""
-
-#: Model/Server.php:291
-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:300
-msgid "The message that users will see if the instance is not live."
-msgstr ""
-
-#: Model/Server.php:302
-msgid "If this is not set the default value will be used."
-msgstr ""
-
-#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
-msgid "This setting is deprecated and can be safely removed."
-msgstr ""
-
-#: Model/Server.php:324
-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:334
-msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
-msgstr ""
-
-#: Model/Server.php:351
-msgid "Footer text prepending the \"Powered by MISP\" text."
-msgstr ""
-
-#: Model/Server.php:359
-msgid "Footer text following the \"Powered by MISP\" text."
-msgstr ""
-
-#: Model/Server.php:399
-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:407
-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:415
-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:423
-msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
-msgstr ""
-
-#: Model/Server.php:431
-msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
-msgstr ""
-
-#: Model/Server.php:440
-msgid "The MISP instance UUID. This UUID is used to identify this instance."
-msgstr ""
-
-#: Model/Server.php:442
-msgid "No valid UUID set"
-msgstr ""
-
-#: Model/Server.php:456
-msgid "Setting this setting to 'false' will hide all organisation names / logos."
-msgstr ""
-
-#: Model/Server.php:464
-msgid "Put the event threat level in the notification E-mail subject."
-msgstr ""
-
-#: Model/Server.php:472
-msgid "This is the TLP string for e-mails when email_subject_tag is not found."
-msgstr ""
-
-#: Model/Server.php:480
-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:488
-msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
-msgstr ""
-
-#: Model/Server.php:512
-msgid "Enables the use of MISP's background processing."
-msgstr ""
-
-#: Model/Server.php:520
-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:530
-msgid "Allow the XML caches to include the encoded attachments."
-msgstr ""
-
-#: Model/Server.php:538
-msgid "Always download attachments when loaded by a user in a browser"
-msgstr ""
-
-#: Model/Server.php:546
-msgid "The e-mail address that MISP should use for all notifications"
-msgstr ""
-
-#: Model/Server.php:554
-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:563
-msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
-msgstr ""
-
-#: Model/Server.php:579
-msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
-msgstr ""
-
-#: Model/Server.php:587
-msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
-msgstr ""
-
-#: Model/Server.php:595
-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:603
-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:611
-msgid "The default distribution setting for events (0-3)."
-msgstr ""
-
-#: Model/Server.php:620
-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:629
-msgid "The default threat level setting when creating events."
-msgstr ""
-
-#: Model/Server.php:638
-msgid "The tag collection to be applied to all events created manually."
-msgstr ""
-
-#: Model/Server.php:647
-msgid "The default setting for publish alerts when creating users."
-msgstr ""
-
-#: Model/Server.php:656
-msgid "Enable the tagging feature of MISP. This is highly recommended."
-msgstr ""
-
-#: Model/Server.php:664
-msgid "Show the full tag names on the event index."
-msgstr ""
-
-#: Model/Server.php:673
-msgid "Used on the login page, before the MISP logo"
-msgstr ""
-
-#: Model/Server.php:681
-msgid "Used on the login page, after the MISP logo"
-msgstr ""
-
-#: Model/Server.php:689
-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:697
-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:705
-msgid "Used in the page title, after the name of the page"
-msgstr ""
-
-#: Model/Server.php:713
-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:721
-msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
-msgstr ""
-
-#: Model/Server.php:729
-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:737
-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:745
-msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
-msgstr ""
-
-#: Model/Server.php:754
-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:763
-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:771
-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:778
-msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
-msgstr ""
-
-#: Model/Server.php:785
-msgid "If enabled, all log entries will include the IP address of the user."
-msgstr ""
-
-#: Model/Server.php:794
-msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
-msgstr ""
-
-#: Model/Server.php:802
-msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
-msgstr ""
-
-#: Model/Server.php:804
-msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
-msgstr ""
-
-#: Model/Server.php:811
-msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
-msgstr ""
-
-#: Model/Server.php:820
-msgid "You can decide to skip the logging of the paranoid logs to the database."
-msgstr ""
-
-#: Model/Server.php:829
-msgid "If paranoid logging is enabled, include the POST body in the entries."
-msgstr ""
-
-#: Model/Server.php:838
-msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
-msgstr ""
-
-#: Model/Server.php:847
-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:856
-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:865
-msgid "When enabled, the number of proposals for the events are shown on the index."
-msgstr ""
-
-#: Model/Server.php:874
-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:883
-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:892
-msgid "When enabled only Org and Site admins can edit a user's profile."
-msgstr ""
-
-#: Model/Server.php:902
-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:911
-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:920
-msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
-msgstr ""
-
-#: Model/Server.php:929
-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:938
-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 \"timestamp\" field of the event is used. Expected format: integer, in days"
-msgstr ""
-
-#: Model/Server.php:947
-msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:956
-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:966
-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:975
-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:984
-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:993
-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:1003
-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:1012
-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:1020
-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:1028
-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:1036
-msgid "The password on the redis server (if any) to be used for generic MISP tasks."
-msgstr ""
-
-#: Model/Server.php:1045
-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:1053
-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:1061
-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:1070
-msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
-msgstr ""
-
-#: Model/Server.php:1078
-msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
-msgstr ""
-
-#: Model/Server.php:1090
-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:1099
-msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
-msgstr ""
-
-#: Model/Server.php:1107
-msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
-msgstr ""
-
-#: Model/Server.php:1115
-msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
-msgstr ""
-
-#: Model/Server.php:1123
-msgid "The e-mail address that the instance's GnuPG key is tied to."
-msgstr ""
-
-#: Model/Server.php:1131
-msgid "The password (if it is set) of the GnuPG key of the instance."
-msgstr ""
-
-#: Model/Server.php:1140
-msgid "The location of the GnuPG homedir."
-msgstr ""
-
-#: Model/Server.php:1151
-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:1159
-msgid "The e-mail address that the instance's SMIME key is tied to."
-msgstr ""
-
-#: Model/Server.php:1167
-msgid "The location of the public half of the signing certificate."
-msgstr ""
-
-#: Model/Server.php:1175
-msgid "The location of the private half of the signing certificate."
-msgstr ""
-
-#: Model/Server.php:1183
-msgid "The password (if it is set) of the SMIME key of the instance."
-msgstr ""
-
-#: Model/Server.php:1195
-msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
-msgstr ""
-
-#: Model/Server.php:1203
-msgid "The TCP port for the HTTP proxy."
-msgstr ""
-
-#: Model/Server.php:1211
-msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
-msgstr ""
-
-#: Model/Server.php:1219
-msgid "The authentication username for the HTTP proxy."
-msgstr ""
-
-#: Model/Server.php:1227
-msgid "The authentication password for the HTTP proxy."
-msgstr ""
-
-#: Model/Server.php:1238
-msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
-msgstr ""
-
-#: Model/Server.php:1247
-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:1257
-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:1266
-msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
-msgstr ""
-
-#: Model/Server.php:1276
-msgid "The message sent shown to anyone trying to self-register."
-msgstr ""
-
-#: Model/Server.php:1284
-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:1292
-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:1300
-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:1309
-msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
-msgstr ""
-
-#: Model/Server.php:1318
-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:1327
-msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
-msgstr ""
-
-#: Model/Server.php:1337
-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:1339
-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:1346
-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:1355
-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:1364
-msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
-msgstr ""
-
-#: Model/Server.php:1373
-msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
-msgstr ""
-
-#: Model/Server.php:1385
-msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
-msgstr ""
-
-#: Model/Server.php:1393
-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:1404
-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:1412
-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:1420
-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:1429
-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:1437
-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:1448
-msgid "The default policy action for the values added to the RPZ."
-msgstr ""
-
-#: Model/Server.php:1457
-msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
-msgstr ""
-
-#: Model/Server.php:1465
-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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
-msgstr ""
-
-#: Model/Server.php:1473
-msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1481
-msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1489
-msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1497
-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:1505
-msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1513
-msgid "Nameserver"
-msgstr ""
-
-#: Model/Server.php:1521
-msgid "Alternate nameserver"
-msgstr ""
-
-#: Model/Server.php:1529
-msgid "The e-mail address specified in the SOA portion of the zone file."
-msgstr ""
-
-#: Model/Server.php:1537
-msgid "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."
-msgstr ""
-
-#: Model/Server.php:1545
-msgid "A comma separated list of Kafka bootstrap brokers"
-msgstr ""
-
-#: Model/Server.php:1553
-msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
-msgstr ""
-
-#: Model/Server.php:1561;1808
-msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
-msgstr ""
-
-#: Model/Server.php:1569;1816
-msgid "Enables or disables the publishing of any event creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1577
-msgid "Topic for publishing event creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1585
-msgid "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."
-msgstr ""
-
-#: Model/Server.php:1593
-msgid "Topic for publishing event information on publish."
-msgstr ""
-
-#: Model/Server.php:1601;1824
-msgid "Enables or disables the publishing of any object creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1609
-msgid "Topic for publishing object creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1617;1832
-msgid "Enables or disables the publishing of any object reference creations/deletions."
-msgstr ""
-
-#: Model/Server.php:1625
-msgid "Topic for publishing object reference creations/deletions."
-msgstr ""
-
-#: Model/Server.php:1633;1840
-msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
-msgstr ""
-
-#: Model/Server.php:1641
-msgid "Topic for publishing attribute creations/edits/soft deletions."
-msgstr ""
-
-#: Model/Server.php:1649
-msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1657
-msgid "Topic for publishing proposal creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1665;1848
-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:1673
-msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
-msgstr ""
-
-#: Model/Server.php:1681
-msgid "Enables or disables the publishing of new sightings."
-msgstr ""
-
-#: Model/Server.php:1689
-msgid "Topic for publishing sightings."
-msgstr ""
-
-#: Model/Server.php:1697
-msgid "Enables or disables the publishing of new/modified users."
-msgstr ""
-
-#: Model/Server.php:1705
-msgid "Topic for publishing new/modified users."
-msgstr ""
-
-#: Model/Server.php:1713
-msgid "Enables or disables the publishing of new/modified organisations."
-msgstr ""
-
-#: Model/Server.php:1721
-msgid "Topic for publishing new/modified organisations."
-msgstr ""
-
-#: Model/Server.php:1729
-msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
-msgstr ""
-
-#: Model/Server.php:1737
-msgid "Topic for publishing log entries."
-msgstr ""
-
-#: Model/Server.php:1745
-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:1754
-msgid "The port that the pub/sub feature will use."
-msgstr ""
-
-#: Model/Server.php:1763
-msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
-msgstr ""
-
-#: Model/Server.php:1772
-msgid "The port that Redis is listening on."
-msgstr ""
-
-#: Model/Server.php:1781
-msgid "The password, if set for Redis."
-msgstr ""
-
-#: Model/Server.php:1790
-msgid "The database to be used for queuing messages for the pub/sub functionality."
-msgstr ""
-
-#: Model/Server.php:1799
-msgid "The namespace to be used for queuing messages for the pub/sub functionality."
-msgstr ""
-
-#: Model/Server.php:1856
-msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
-msgstr ""
-
-#: Model/Server.php:1864
-msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
-msgstr ""
-
-#: Model/Server.php:1872
-msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
-msgstr ""
-
-#: Model/Server.php:1880
-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:1888
-msgid "Enabled logging to an ElasticSearch instance"
-msgstr ""
-
-#: Model/Server.php:1896
-msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
-msgstr ""
-
-#: Model/Server.php:1904
-msgid "The index in which to place logs"
-msgstr ""
-
-#: Model/Server.php:1912
-msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
-msgstr ""
-
-#: Model/Server.php:1920
-msgid "Bucket name to upload to"
-msgstr ""
-
-#: Model/Server.php:1928
-msgid "Region in which your S3 bucket resides"
-msgstr ""
-
-#: Model/Server.php:1936
-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:1944
-msgid "AWS secret key to use when uploading samples"
-msgstr ""
-
-#: Model/Server.php:1952
-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:1961
-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:1969
-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:1977
-msgid "Enable SightingDB integration."
-msgstr ""
-
-#: Model/Server.php:1985
-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:1995
-msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
-msgstr ""
-
-#: Model/Server.php:2004
-msgid "Use a header namespace for the auth header - default setting is enabled"
-msgstr ""
-
-#: Model/Server.php:2013
-msgid "The default header namespace for the auth header - default setting is HTTP_"
-msgstr ""
-
-#: Model/Server.php:2022
-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:2031
-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:2040
-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:2049
-msgid "Disable the logout button for users authenticate with the external auth mechanism."
-msgstr ""
-
-#: Model/Server.php:2057
-msgid "Enable/disable the enrichment services"
-msgstr ""
-
-#: Model/Server.php:2065
-msgid "Set a timeout for the enrichment services"
-msgstr ""
-
-#: Model/Server.php:2073
-msgid "Enable/disable the import services"
-msgstr ""
-
-#: Model/Server.php:2081
-msgid "Set a timeout for the import services"
-msgstr ""
-
-#: Model/Server.php:2089
-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:2097
-msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
-msgstr ""
-
-#: Model/Server.php:2105
-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:2113
-msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
-msgstr ""
-
-#: Model/Server.php:2121
-msgid "Enable/disable the export services"
-msgstr ""
-
-#: Model/Server.php:2129
-msgid "Set a timeout for the export services"
-msgstr ""
-
-#: Model/Server.php:2137
-msgid "Enable/disable the hover over information retrieved from the enrichment modules"
-msgstr ""
-
-#: Model/Server.php:2145
-msgid "Set a timeout for the hover services"
-msgstr ""
-
-#: Model/Server.php:2153
-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:2161
-msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
-msgstr ""
-
-#: Model/Server.php:2169
-msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
-msgstr ""
-
-#: Model/Server.php:2177
-msgid "The port used to access Cortex. By default, this is port 9000"
-msgstr ""
-
-#: Model/Server.php:2185
-msgid "Enable/disable the Cortex services"
-msgstr ""
-
-#: Model/Server.php:2193
-msgid "Set an authentication key to be passed to Cortex"
-msgstr ""
-
-#: Model/Server.php:2202
-msgid "Set a timeout for the Cortex services"
-msgstr ""
-
-#: Model/Server.php:2210
-msgid "Set to false to disable SSL verification. This is not recommended."
-msgstr ""
-
-#: Model/Server.php:2219
-msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
-msgstr ""
-
-#: Model/Server.php:2228
-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:2237
-msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
-msgstr ""
-
-#: Model/Server.php:2246
-msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
-msgstr ""
-
-#: Model/Server.php:2255
-msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
-msgstr ""
-
-#: Model/Server.php:2265
-msgid "The debug level of the instance, always use 0 for production instances."
-msgstr ""
-
-#: Model/Server.php:2274
-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:2441
+#: Model/Server.php:419
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2445
+#: Model/Server.php:423
 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:2472
-msgid "Empty event detected."
-msgstr ""
-
-#: Model/Server.php:2478
+#: Model/Server.php:447;463
 msgid "failed downloading the event"
 msgstr ""
 
-#: Model/Server.php:2557
+#: Model/Server.php:457
+msgid "Empty event detected."
+msgstr ""
+
+#: Model/Server.php:482
+msgid "Pulling relevant galaxy clusters."
+msgstr ""
+
+#: Model/Server.php:482
+msgid "Pulling galaxy clusters."
+msgstr ""
+
+#: Model/Server.php:501
 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:2559
+#: Model/Server.php:503
 msgid "Sorry, this is not yet implemented"
 msgstr ""
 
-#: Model/Server.php:2560
+#: Model/Server.php:504
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2572;2574
+#: Model/Server.php:516;518
 msgid "Unknown issue."
 msgstr ""
 
-#: Model/Server.php:3134
+#: Model/Server.php:680
+msgid "Error: got response code %s"
+msgstr ""
+
+#: Model/Server.php:916
+msgid "Push to server %s failed. Reason: %s"
+msgstr ""
+
+#: Model/Server.php:1088
+msgid "Push to server %s complete."
+msgstr ""
+
+#: Model/Server.php:1156
+msgid "GalaxyCluster %s"
+msgstr ""
+
+#: Model/Server.php:1283
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:3137
+#: Model/Server.php:1286
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:3145
+#: Model/Server.php:1296
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:3260
+#: Model/Server.php:1411
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3281
+#: Model/Server.php:1432
 msgid "Invalid language."
 msgstr ""
 
-#: Model/Server.php:3302
+#: Model/Server.php:1456
+msgid "No organisation selected."
+msgstr ""
+
+#: Model/Server.php:1463
 msgid "Invalid tag_collection."
 msgstr ""
 
-#: Model/Server.php:3310
+#: Model/Server.php:1471
 msgid "This setting has to be a number."
 msgstr ""
 
-#: Model/Server.php:3322
+#: Model/Server.php:1491
 msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
 msgstr ""
 
-#: Model/Server.php:3619
+#: Model/Server.php:1733
+msgid "Value is not a boolean, make sure that you convert 'true' to true for example."
+msgstr ""
+
+#: Model/Server.php:1799
 msgid "Invalid file path or file not accessible."
 msgstr ""
 
-#: Model/Server.php:3622
+#: Model/Server.php:1802
 msgid "File has to be in .pem format."
 msgstr ""
 
-#: Model/Server.php:3988
+#: Model/Server.php:1926
+msgid "Emailing is currently disabled. Enabling OTP without e-mailing being configured would lock all users out."
+msgstr ""
+
+#: Model/Server.php:2174
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr ""
 
-#: Model/Server.php:4120
+#: Model/Server.php:2306
 msgid "Organisation logos"
 msgstr ""
 
-#: Model/Server.php:4121
+#: Model/Server.php:2307
 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:4123
+#: Model/Server.php:2309
 msgid "48x48 pixel .png files"
 msgstr ""
 
-#: Model/Server.php:4126;4141
+#: Model/Server.php:2312;2327
 msgid "Filename must be in the following format: *.png"
 msgstr ""
 
-#: Model/Server.php:4130
+#: Model/Server.php:2316
 msgid "Additional image files"
 msgstr ""
 
-#: Model/Server.php:4131
+#: Model/Server.php:2317
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:4138
+#: Model/Server.php:2324
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:4228
-msgid "Invalid server."
+#: Model/Server.php:2361;2362
+#: View/SharingGroups/index.ctp:121
+msgid "Not defined"
 msgstr ""
 
-#: Model/Server.php:4259
+#: Model/Server.php:2363;2364
+msgid "Unknwon"
+msgstr ""
+
+#: Model/Server.php:2449
 msgid "Response was empty."
 msgstr ""
 
-#: Model/Server.php:4335
+#: Model/Server.php:2511
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:4604
+#: Model/Server.php:2800
 msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
 msgstr ""
 
-#: Model/Server.php:4675
+#: Model/Server.php:2872
 msgid "Can't check database schema for Postgres database type"
 msgstr ""
 
-#: Model/Server.php:4692
+#: Model/Server.php:2889
 msgid "Table `%s` does not exist"
 msgstr ""
 
-#: Model/Server.php:4719
+#: Model/Server.php:2916
 msgid "Column `%s` exists but should not"
 msgstr ""
 
-#: Model/Server.php:4752
+#: Model/Server.php:2949
 msgid "Column `%s` is different"
 msgstr ""
 
-#: Model/Server.php:4762
+#: Model/Server.php:2959
 msgid "Column `%s` does not exist but should"
 msgstr ""
 
-#: Model/Server.php:4775
+#: Model/Server.php:2972
 msgid "Table `%s` is an additional table"
 msgstr ""
 
-#: Model/Server.php:4799
+#: Model/Server.php:3045
+msgid "Column `%s` should be unique indexed, but contains duplicate values"
+msgstr ""
+
+#: Model/Server.php:3051
 msgid "Column `%s` should be indexed"
 msgstr ""
 
-#: Model/Server.php:4822
+#: Model/Server.php:3059
 msgid "Column `%s` is indexed but should not"
 msgstr ""
 
-#: Model/Server.php:5252
+#: Model/Server.php:3071
+msgid "Column `%s` has unique index, but should be non unique"
+msgstr ""
+
+#: Model/Server.php:3078
+msgid "Column `%s` should be unique index, but contains duplicate values"
+msgstr ""
+
+#: Model/Server.php:3089
+msgid "Column `%s` should be unique index"
+msgstr ""
+
+#: Model/Server.php:3578
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:5253
+#: Model/Server.php:3579
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:5257
+#: Model/Server.php:3583
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:5258
+#: Model/Server.php:3584
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:5560
+#: Model/Server.php:3914
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:5560;5589
+#: Model/Server.php:3914;3943
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:5572
+#: Model/Server.php:3926
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:5573
+#: Model/Server.php:3927
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:5717
+#: Model/Server.php:4086
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:5724
+#: Model/Server.php:4093
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:5731
+#: Model/Server.php:4100
 msgid "Invalid worker type."
 msgstr ""
 
-#: Model/Server.php:5911
+#: Model/Server.php:4287
 msgid "Could not reset the remote authentication key."
 msgstr ""
 
-#: Model/Server.php:5988
-msgid "Could not parse JSON: "
+#: Model/Server.php:4339
+msgid "Fetching the '%s' failed with HTTP error 404: Not Found"
 msgstr ""
 
-#: Model/Server.php:6008
-msgid "Could not reset fetch remote user account."
+#: Model/Server.php:4343;4348
+msgid "Fetching the '%s' failed with HTTP error %s: %s"
 msgstr ""
 
-#: Model/Server.php:6030
+#: Model/Server.php:4370
+msgid "Could not fetch remote user account."
+msgstr ""
+
+#: Model/Server.php:4386
+#: View/AuthKeys/add.ctp:9
+#: View/AuthKeys/index.ctp:42
+#: View/AuthKeys/view.ctp:38
+#: View/Elements/healthElements/workers.ctp:57
+#: View/Pages/doc/administration.ctp:166
+#: View/Pages/doc/using_the_system.ctp:255
+#: View/TagCollections/index.ctp:14
+#: View/UserSettings/index.ctp:56
+msgid "User"
+msgstr ""
+
+#: Model/Server.php:4387
+msgid "Role name"
+msgstr ""
+
+#: Model/Server.php:4387;4388
+msgid "Unknown, outdated instance"
+msgstr ""
+
+#: Model/Server.php:4388
+msgid "Sync flag"
+msgstr ""
+
+#: Model/Server.php:4392
+msgid "Auth key expiration"
+msgstr ""
+
+#: Model/Server.php:4396
 msgid "No user object received in response."
 msgstr ""
 
+#: Model/Server.php:4423
+msgid "The base url of the application (in the format https://www.mymispinstance.com or https://myserver.com/misp). Several features depend on this setting being correctly set to function."
+msgstr ""
+
+#: Model/Server.php:4425
+msgid "The currently 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:4431
+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:4439
+msgid "Unless set to true, the instance will only be accessible by site admins."
+msgstr ""
+
+#: Model/Server.php:4447
+msgid "Select the language MISP should use. The default is english."
+msgstr ""
+
+#: Model/Server.php:4459
+msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
+msgstr ""
+
+#: Model/Server.php:4468
+msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
+msgstr ""
+
+#: Model/Server.php:4477
+msgid "Enable some performance heavy correlations (currently CIDR correlation)"
+msgstr ""
+
+#: Model/Server.php:4486
+msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
+msgstr ""
+
+#: Model/Server.php:4495
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:4506
+msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:4516
+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:4525
+msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
+msgstr ""
+
+#: Model/Server.php:4533
+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:4542
+msgid "The message that users will see if the instance is not live."
+msgstr ""
+
+#: Model/Server.php:4544
+msgid "If this is not set the default value will be used."
+msgstr ""
+
+#: Model/Server.php:4550;4558;4585;4609;4617;4625;4633;4692;4740;4748;4823
+msgid "This setting is deprecated and can be safely removed."
+msgstr ""
+
+#: Model/Server.php:4566
+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:4576
+msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
+msgstr ""
+
+#: Model/Server.php:4593
+msgid "Footer text prepending the \"Powered by MISP\" text."
+msgstr ""
+
+#: Model/Server.php:4601
+msgid "Footer text following the \"Powered by MISP\" text."
+msgstr ""
+
+#: Model/Server.php:4641
+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:4649
+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:4657
+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:4665
+msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
+msgstr ""
+
+#: Model/Server.php:4673
+msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
+msgstr ""
+
+#: Model/Server.php:4684
+msgid "The MISP instance UUID. This UUID is used to identify this instance."
+msgstr ""
+
+#: Model/Server.php:4686
+msgid "No valid UUID set"
+msgstr ""
+
+#: Model/Server.php:4700
+msgid "Setting this setting to 'false' will hide all organisation names / logos."
+msgstr ""
+
+#: Model/Server.php:4708
+msgid "Put the event threat level in the notification E-mail subject."
+msgstr ""
+
+#: Model/Server.php:4716
+msgid "This is the TLP string for e-mails when email_subject_tag is not found."
+msgstr ""
+
+#: Model/Server.php:4724
+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:4732
+msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
+msgstr ""
+
+#: Model/Server.php:4756
+msgid "Enables the use of MISP's background processing."
+msgstr ""
+
+#: Model/Server.php:4764
+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:4774
+msgid "Allow the XML caches to include the encoded attachments."
+msgstr ""
+
+#: Model/Server.php:4782
+msgid "Always download attachments when loaded by a user in a browser"
+msgstr ""
+
+#: Model/Server.php:4790
+msgid "The Unix user MISP (php) is running as"
+msgstr ""
+
+#: Model/Server.php:4798
+msgid "The e-mail address that MISP should use for all notifications"
+msgstr ""
+
+#: Model/Server.php:4806
+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:4815
+msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
+msgstr ""
+
+#: Model/Server.php:4831
+msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
+msgstr ""
+
+#: Model/Server.php:4839
+msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
+msgstr ""
+
+#: Model/Server.php:4847
+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:4855
+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:4863
+msgid "The default distribution setting for events (0-3)."
+msgstr ""
+
+#: Model/Server.php:4872
+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:4877
+msgid "Inherit from event"
+msgstr ""
+
+#: Model/Server.php:4881
+msgid "The default threat level setting when creating events."
+msgstr ""
+
+#: Model/Server.php:4890
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:4901
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:4910
+msgid "Enable the tagging feature of MISP. This is highly recommended."
+msgstr ""
+
+#: Model/Server.php:4918
+msgid "Show the full tag names on the event index."
+msgstr ""
+
+#: Model/Server.php:4927
+msgid "Used on the login page, before the MISP logo"
+msgstr ""
+
+#: Model/Server.php:4935
+msgid "Used on the login page, after the MISP logo"
+msgstr ""
+
+#: Model/Server.php:4943
+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:4951
+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:4959
+msgid "Used in the page title, after the name of the page"
+msgstr ""
+
+#: Model/Server.php:4967
+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:4975
+msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
+msgstr ""
+
+#: Model/Server.php:4983
+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:4991
+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:4999
+msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
+msgstr ""
+
+#: Model/Server.php:5008
+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:5017
+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:5025
+msgid "Since version 2.3.107 you can start blocklisting 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:5032
+msgid "Blocklisting organisation UUIDs to prevent the creation of any event created by the blocklisted organisation."
+msgstr ""
+
+#: Model/Server.php:5039
+msgid "If enabled, all log entries will include the IP address of the user."
+msgstr ""
+
+#: Model/Server.php:5048
+msgid "If log_client_ip is enabled, you can customize which header field contains the client's IP address. This is generally used when you have a reverse proxy infront of your MISP instance."
+msgstr ""
+
+#: Model/Server.php:5057
+msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
+msgstr ""
+
+#: Model/Server.php:5065
+msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
+msgstr ""
+
+#: Model/Server.php:5067
+msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
+msgstr ""
+
+#: Model/Server.php:5074
+msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
+msgstr ""
+
+#: Model/Server.php:5083
+msgid "You can decide to skip the logging of the paranoid logs to the database."
+msgstr ""
+
+#: Model/Server.php:5092
+msgid "If paranoid logging is enabled, include the POST body in the entries."
+msgstr ""
+
+#: Model/Server.php:5101
+msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
+msgstr ""
+
+#: Model/Server.php:5110
+msgid "Log user IP and key usage on each API request. All logs for given keys are deleted after one year when this key is not used."
+msgstr ""
+
+#: Model/Server.php:5119
+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:5128
+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:5137
+msgid "When enabled, the number of proposals for the events are shown on the index."
+msgstr ""
+
+#: Model/Server.php:5146
+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:5155
+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:5164
+msgid "When enabled only Org and Site admins can edit a user's profile."
+msgstr ""
+
+#: Model/Server.php:5173
+msgid "When enabled only Site admins can change user email. This should be enabled if you manage user logins by external system."
+msgstr ""
+
+#: Model/Server.php:5182
+msgid "When enabled only Site admins can change user password. This should be enabled if you manage user passwords by external system."
+msgstr ""
+
+#: Model/Server.php:5191
+msgid "When enabled, Org Admins could not add new users. This should be enabled if you manage users by external system."
+msgstr ""
+
+#: Model/Server.php:5200
+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:5209
+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:5218
+msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
+msgstr ""
+
+#: Model/Server.php:5227
+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:5236
+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 \"timestamp\" field of the event is used. Expected format: integer, in days"
+msgstr ""
+
+#: Model/Server.php:5245
+msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:5254
+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:5264
+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:5273
+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:5282
+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:5291
+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:5301
+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:5310
+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:5318
+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:5326
+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:5334
+msgid "The password on the redis server (if any) to be used for generic MISP tasks."
+msgstr ""
+
+#: Model/Server.php:5343
+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:5351
+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:5359
+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:5368
+msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
+msgstr ""
+
+#: Model/Server.php:5376
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:5385
+msgid "Name of enrichment module that will be used for attachment malware scanning. This module must return av-signature or sb-signature object."
+msgstr ""
+
+#: Model/Server.php:5393
+msgid "Send to attachment scan module just file hash. This can be useful if module sends attachment to remote service and you don't want to leak real data."
+msgstr ""
+
+#: Model/Server.php:5402
+msgid "How long to wait for scan results in seconds."
+msgstr ""
+
+#: Model/Server.php:5414
+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:5423
+msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
+msgstr ""
+
+#: Model/Server.php:5431
+msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
+msgstr ""
+
+#: Model/Server.php:5439
+msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
+msgstr ""
+
+#: Model/Server.php:5447
+msgid "The e-mail address that the instance's GnuPG key is tied to."
+msgstr ""
+
+#: Model/Server.php:5455
+msgid "The password (if it is set) of the GnuPG key of the instance."
+msgstr ""
+
+#: Model/Server.php:5464
+msgid "The location of the GnuPG homedir."
+msgstr ""
+
+#: Model/Server.php:5472
+msgid "When enabled, the subject in signed and encrypted e-mails will not be sent in unencrypted form."
+msgstr ""
+
+#: Model/Server.php:5483
+msgid "Enable S/MIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if S/MIME is enabled."
+msgstr ""
+
+#: Model/Server.php:5491
+msgid "The e-mail address that the instance's S/MIME key is tied to."
+msgstr ""
+
+#: Model/Server.php:5499
+msgid "The location of the public half of the signing certificate."
+msgstr ""
+
+#: Model/Server.php:5507
+msgid "The location of the private half of the signing certificate."
+msgstr ""
+
+#: Model/Server.php:5515
+msgid "The password (if it is set) of the S/MIME key of the instance."
+msgstr ""
+
+#: Model/Server.php:5527
+msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
+msgstr ""
+
+#: Model/Server.php:5535
+msgid "The TCP port for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:5543
+msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
+msgstr ""
+
+#: Model/Server.php:5551
+msgid "The authentication username for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:5559
+msgid "The authentication password for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:5570
+msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
+msgstr ""
+
+#: Model/Server.php:5579
+msgid "Enforce CSP. Content Security Policy (CSP) is an added layer of security that helps to detect and mitigate certain types of attacks, including Cross Site Scripting (XSS) and data injection attacks. When disabled, violations will be just logged."
+msgstr ""
+
+#: Model/Server.php:5587
+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:5597
+msgid "Advanced authkeys will allow each user to create and manage a set of authkeys for themselves, each with individual expirations and comments. API keys are stored in a hashed state and can no longer be recovered from MISP. Users will be prompted to note down their key when creating a new authkey. You can generate a new set of API keys for all users on demand in the diagnostics page, or by triggering %s."
+msgstr ""
+
+#: Model/Server.php:5597
+msgid "the advanced upgrade"
+msgstr ""
+
+#: Model/Server.php:5605
+msgid "Maximal key lifetime in days. Use can limit that validity even more. Just newly created keys will be affected. When not set, key validity is not limited."
+msgstr ""
+
+#: Model/Server.php:5614
+msgid "When enabled, session is kept between API requests."
+msgstr ""
+
+#: Model/Server.php:5623
+msgid "This optionally can be enabled if an external auth provider is used. When set to true, it will disable the default form authentication."
+msgstr ""
+
+#: Model/Server.php:5631
+msgid "Enable this setting if you wish for users to be able to query any arbitrary URL via the rest client. Keep in mind that queries are executed by the MISP server, so internal IPs in your MISP's network may be reachable."
+msgstr ""
+
+#: Model/Server.php:5640
+msgid "If left empty, the baseurl of your MISP is used. However, in some instances (such as port-forwarded VM installations) this will not work. You can override the baseurl with a url through which your MISP can reach itself (typically https://127.0.0.1 would work)."
+msgstr ""
+
+#: Model/Server.php:5648
+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:5657
+msgid "Write syslog messages also to standard error output."
+msgstr ""
+
+#: Model/Server.php:5666
+msgid "Syslog message identifier."
+msgstr ""
+
+#: Model/Server.php:5675
+msgid "If enabled, any authkey will be replaced by asterisks in Audit log."
+msgstr ""
+
+#: Model/Server.php:5684
+msgid "If enabled, HTTP headers that block browser cache will be send. Static files (like images or JavaScripts) will still be cached, but not generated pages."
+msgstr ""
+
+#: Model/Server.php:5693
+msgid "If enabled, any POST, PUT or AJAX request will be allow just when Sec-Fetch-Site header is not defined or contains \"same-origin\"."
+msgstr ""
+
+#: Model/Server.php:5702
+msgid "Enable two step authentication with a OTP sent by email. Requires e-mailing to be enabled. Warning: You cannot use it in combination with external authentication plugins."
+msgstr ""
+
+#: Model/Server.php:5712
+msgid "Define the length of the OTP code sent by email"
+msgstr ""
+
+#: Model/Server.php:5721
+msgid "Define the validity (in minutes) of the OTP code sent by email"
+msgstr ""
+
+#: Model/Server.php:5731
+msgid "The message sent to the user when a new OTP is requested. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $otp = the new OTP generated by MISP, $username = the user's e-mail address, $org the Organisation managing the instance, $misp = the url of this instance, $contact = the e-mail address used to contact the support team (as set in MISP.contact), $ip the IP used to complete the first step of the login and $validity the validity time in minutes."
+msgstr ""
+
+#: Model/Server.php:5741
+msgid "A comma separated list of emails for which the OTP is disabled. Note that if you remove someone from this list, the OTP will only be asked at next login."
+msgstr ""
+
+#: Model/Server.php:5750
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:5760
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:5768
+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:5776
+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:5784
+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:5793
+msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
+msgstr ""
+
+#: Model/Server.php:5802
+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:5811
+msgid "Enabling this setting will block the organisation list from being visible in sharing group besides user with sharing group permission."
+msgstr ""
+
+#: Model/Server.php:5820
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:5830
+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:5832
+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:5839
+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:5848
+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:5857
+msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
+msgstr ""
+
+#: Model/Server.php:5866
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:5875
+msgid "When enabled, logged in username will be included in X-Username HTTP response header. This is useful for request logging on webserver/proxy side."
+msgstr ""
+
+#: Model/Server.php:5887
+msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
+msgstr ""
+
+#: Model/Server.php:5895
+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:5906
+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:5914
+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:5922
+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:5931
+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:5939
+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:5950
+msgid "The default policy action for the values added to the RPZ."
+msgstr ""
+
+#: Model/Server.php:5959
+msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
+msgstr ""
+
+#: Model/Server.php:5967
+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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
+msgstr ""
+
+#: Model/Server.php:5975
+msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:5983
+msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:5991
+msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:5999
+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:6007
+msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:6015
+msgid "Nameserver"
+msgstr ""
+
+#: Model/Server.php:6023
+msgid "Alternate nameserver"
+msgstr ""
+
+#: Model/Server.php:6031
+msgid "The e-mail address specified in the SOA portion of the zone file."
+msgstr ""
+
+#: Model/Server.php:6039
+msgid "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."
+msgstr ""
+
+#: Model/Server.php:6047
+msgid "A comma separated list of Kafka bootstrap brokers"
+msgstr ""
+
+#: Model/Server.php:6055
+msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
+msgstr ""
+
+#: Model/Server.php:6063;6337
+msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
+msgstr ""
+
+#: Model/Server.php:6071;6345
+msgid "Enables or disables the publishing of any event creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6079
+msgid "Topic for publishing event creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6087
+msgid "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."
+msgstr ""
+
+#: Model/Server.php:6095
+msgid "Topic for publishing event information on publish."
+msgstr ""
+
+#: Model/Server.php:6103;6353
+msgid "Enables or disables the publishing of any object creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6111
+msgid "Topic for publishing object creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6119;6361
+msgid "Enables or disables the publishing of any object reference creations/deletions."
+msgstr ""
+
+#: Model/Server.php:6127
+msgid "Topic for publishing object reference creations/deletions."
+msgstr ""
+
+#: Model/Server.php:6135;6369
+msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
+msgstr ""
+
+#: Model/Server.php:6143
+msgid "Topic for publishing attribute creations/edits/soft deletions."
+msgstr ""
+
+#: Model/Server.php:6151
+msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6159
+msgid "Topic for publishing proposal creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6167;6377
+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:6175
+msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
+msgstr ""
+
+#: Model/Server.php:6183
+msgid "Enables or disables the publishing of new sightings."
+msgstr ""
+
+#: Model/Server.php:6191
+msgid "Topic for publishing sightings."
+msgstr ""
+
+#: Model/Server.php:6199
+msgid "Enables or disables the publishing of new/modified users."
+msgstr ""
+
+#: Model/Server.php:6207
+msgid "Topic for publishing new/modified users."
+msgstr ""
+
+#: Model/Server.php:6215
+msgid "Enables or disables the publishing of new/modified organisations."
+msgstr ""
+
+#: Model/Server.php:6223
+msgid "Topic for publishing new/modified organisations."
+msgstr ""
+
+#: Model/Server.php:6231
+msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
+msgstr ""
+
+#: Model/Server.php:6239
+msgid "Topic for publishing log entries."
+msgstr ""
+
+#: Model/Server.php:6247
+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:6256
+msgid "The host that the pub/sub feature will use."
+msgstr ""
+
+#: Model/Server.php:6265
+msgid "The port that the pub/sub feature will use."
+msgstr ""
+
+#: Model/Server.php:6274
+msgid "The username that client need to use to connect to ZeroMQ."
+msgstr ""
+
+#: Model/Server.php:6283
+msgid "The password that client need to use to connect to ZeroMQ."
+msgstr ""
+
+#: Model/Server.php:6292
+msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
+msgstr ""
+
+#: Model/Server.php:6301
+msgid "The port that Redis is listening on."
+msgstr ""
+
+#: Model/Server.php:6310
+msgid "The password, if set for Redis."
+msgstr ""
+
+#: Model/Server.php:6319
+msgid "The database to be used for queuing messages for the pub/sub functionality."
+msgstr ""
+
+#: Model/Server.php:6328
+msgid "The namespace to be used for queuing messages for the pub/sub functionality."
+msgstr ""
+
+#: Model/Server.php:6385
+msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:6393
+msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:6401
+msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:6409
+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:6417
+msgid "Enabled logging to an ElasticSearch instance"
+msgstr ""
+
+#: Model/Server.php:6425
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
+msgstr ""
+
+#: Model/Server.php:6433
+msgid "The index in which to place logs"
+msgstr ""
+
+#: Model/Server.php:6441
+msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
+msgstr ""
+
+#: Model/Server.php:6449
+msgid "Bucket name to upload to"
+msgstr ""
+
+#: Model/Server.php:6457
+msgid "Region in which your S3 bucket resides"
+msgstr ""
+
+#: Model/Server.php:6465
+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:6473
+msgid "AWS secret key to use when uploading samples"
+msgstr ""
+
+#: Model/Server.php:6481
+msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner organisation alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and any organisation that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
+msgstr ""
+
+#: Model/Server.php:6487
+msgid "Event Owner Organisation"
+msgstr ""
+
+#: Model/Server.php:6488
+msgid "Sighting reporters"
+msgstr ""
+
+#: Model/Server.php:6489
+msgid "Everyone"
+msgstr ""
+
+#: Model/Server.php:6490
+msgid "Event Owner + host org sightings"
+msgstr ""
+
+#: Model/Server.php:6495
+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:6503
+msgid "When pushing sightings to another server, report all sightings from this instance as this organisation. This effectively hides all sightings from this instance behind a single organisation to the outside world. Sightings pulled from this instance follow the Sightings_policy above."
+msgstr ""
+
+#: Model/Server.php:6514
+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:6522
+msgid "Enable SightingDB integration."
+msgstr ""
+
+#: Model/Server.php:6530
+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:6540
+msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
+msgstr ""
+
+#: Model/Server.php:6549
+msgid "Use a header namespace for the auth header - default setting is enabled"
+msgstr ""
+
+#: Model/Server.php:6558
+msgid "The default header namespace for the auth header - default setting is HTTP_"
+msgstr ""
+
+#: Model/Server.php:6567
+msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Alternatively, 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:6576
+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:6585
+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:6594
+msgid "Disable the logout button for users authenticate with the external auth mechanism."
+msgstr ""
+
+#: Model/Server.php:6602
+msgid "Enable/disable the enrichment services"
+msgstr ""
+
+#: Model/Server.php:6610
+msgid "Set a timeout for the enrichment services"
+msgstr ""
+
+#: Model/Server.php:6618
+msgid "Enable/disable the import services"
+msgstr ""
+
+#: Model/Server.php:6626
+msgid "Set a timeout for the import services"
+msgstr ""
+
+#: Model/Server.php:6634
+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:6642
+msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:6650
+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:6658
+msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:6666
+msgid "Enable/disable the export services"
+msgstr ""
+
+#: Model/Server.php:6674
+msgid "Set a timeout for the export services"
+msgstr ""
+
+#: Model/Server.php:6682
+msgid "Enable/disable the hover over information retrieved from the enrichment modules"
+msgstr ""
+
+#: Model/Server.php:6690
+msgid "When enabled, users have to click on the magnifier icon to show the enrichment"
+msgstr ""
+
+#: Model/Server.php:6698
+msgid "Set a timeout for the hover services"
+msgstr ""
+
+#: Model/Server.php:6706
+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:6714
+msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:6722
+msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
+msgstr ""
+
+#: Model/Server.php:6730
+msgid "The port used to access Cortex. By default, this is port 9000"
+msgstr ""
+
+#: Model/Server.php:6738
+msgid "Enable/disable the Cortex services"
+msgstr ""
+
+#: Model/Server.php:6746
+msgid "Set an authentication key to be passed to Cortex"
+msgstr ""
+
+#: Model/Server.php:6755
+msgid "Set a timeout for the Cortex services"
+msgstr ""
+
+#: Model/Server.php:6763
+msgid "Set to false to disable SSL verification. This is not recommended."
+msgstr ""
+
+#: Model/Server.php:6772
+msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
+msgstr ""
+
+#: Model/Server.php:6781
+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:6790
+msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
+msgstr ""
+
+#: Model/Server.php:6799
+msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
+msgstr ""
+
+#: Model/Server.php:6808
+msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
+msgstr ""
+
+#: Model/Server.php:6818
+msgid "The debug level of the instance, always use 0 for production instances."
+msgstr ""
+
+#: Model/Server.php:6827
+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:526
+msgid "Pulling %s event."
+msgid_plural "Pulling %s events."
+msgstr[0] ""
+msgstr[1] ""
+
+#: Model/Sighting.php:426
+msgid "Others"
+msgstr ""
+
+#: Model/Sighting.php:836
+msgid "Invalid context."
+msgstr ""
+
+#: Model/Sighting.php:840
+msgid "An ID or UUID must be provided if the context is set."
+msgstr ""
+
 #: Model/Sightingdb.php:346
 msgid "Could not resolve Sightingdb address."
 msgstr ""
@@ -5421,47 +6898,47 @@ msgstr ""
 msgid "No response from the SightingDB server."
 msgstr ""
 
-#: Model/Taxonomy.php:619
+#: Model/Taxonomy.php:675
 msgid "Taxonomy `%s` is an exclusive Taxonomy"
 msgstr ""
 
-#: Model/Taxonomy.php:626
+#: Model/Taxonomy.php:682
 msgid "Predicate `%s` is exclusive"
 msgstr ""
 
-#: Model/User.php:1254
+#: Model/User.php:1033
 msgid "reset_all_sync_api_keys"
 msgstr ""
 
-#: Model/User.php:1255
+#: Model/User.php:1034
 msgid "Reseting all API keys"
 msgstr ""
 
-#: Model/User.php:1317
+#: Model/User.php:1096
 msgid "Reset in progress - %s/%s."
 msgstr ""
 
-#: Model/User.php:1322
+#: Model/User.php:1101
 msgid "%s authkeys reset, %s could not be reset"
 msgstr ""
 
-#: Model/User.php:1347
+#: Model/User.php:1127
 msgid "Authentication key for user %s (%s) updated."
 msgstr ""
 
-#: Model/User.php:1359
+#: Model/User.php:1143
 msgid "Dear user,\n\nan API key reset has been triggered by an administrator for your user account on %s.\n\nYour new API key is: %s\n\nPlease update your server's sync setup to reflect this change.\n\nWe apologise for the inconvenience."
 msgstr ""
 
-#: Model/User.php:1364
+#: Model/User.php:1148
 msgid "Dear user,\n\nan API key reset has been triggered by an administrator for your user account on %s.\n\nYour new API key can be retrieved by logging in using this sync user's account.\n\nPlease update your server's sync setup to reflect this change.\n\nWe apologise for the inconvenience."
 msgstr ""
 
-#: Model/User.php:1373
+#: Model/User.php:1157
 msgid "API key reset by administrator"
 msgstr ""
 
-#: Model/UserSetting.php:321
+#: Model/UserSetting.php:375
 msgid "This endpoint expects both a setting and a value to be set."
 msgstr ""
 
@@ -5495,71 +6972,367 @@ msgstr ""
 msgid "it has the following dependent items"
 msgstr ""
 
+#: View/Allowedlists/admin_add.ctp:4
+msgid "Add Signature Allowedlist"
+msgstr ""
+
+#: View/Allowedlists/admin_add.ctp:13
+#: View/DecayingModel/import.ctp:25
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:15
+#: View/Elements/genericElements/org_picker.ctp:17
+#: View/EventBlocklists/add.ctp:36
+#: View/Events/filter_event_index.ctp:125
+#: View/Feeds/add.ctp:220
+#: View/Feeds/import_feeds.ctp:20
+#: View/GalaxyClusterRelations/add.ctp:8
+#: View/OrgBlocklists/add.ctp:30
+#: View/Regexp/admin_add.ctp:32
+#: View/Regexp/admin_edit.ctp:42
+#: View/Servers/import.ctp:20
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+#: View/SharingGroups/index.ctp:12
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:20
+#: View/Tags/add.ctp:35
+#: View/Users/admin_filter_user_index.ctp:62
+msgid "Add"
+msgstr ""
+
+#: View/Allowedlists/admin_edit.ctp:4
+msgid "Edit Signature Allowedlist"
+msgstr ""
+
+#: View/Allowedlists/admin_edit.ctp:13
+#: View/Attributes/attribute_replace.ctp:38
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Elements/view_galaxy_matrix.ctp:73;209
+#: View/Elements/genericElements/Form/submitButton.ctp:9;26
+#: View/Events/contact.ctp:25
+#: View/Events/free_text_import.ctp:27
+#: View/Events/resolved_misp_format.ctp:437
+#: View/News/add.ctp:33
+#: View/News/edit.ctp:34
+#: View/ObjectReferences/ajax/add.ctp:131
+#: View/Objects/add.ctp:178
+#: View/Objects/ajax/quickAddAttributeForm.ctp:121
+#: View/Organisations/admin_add.ctp:48
+#: View/Organisations/admin_edit.ctp:59
+#: View/Posts/add.ctp:66
+#: View/Posts/edit.ctp:20
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:173
+#: View/Servers/ondemand_action.ctp:54
+#: 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/UserSettings/set_home_page.ctp:4
+#: View/UserSettings/set_setting.ctp:36
+#: View/Users/admin_email.ctp:54
+#: View/Users/admin_quick_email.ctp:23
+#: View/Users/change_pw.ctp:23
+#: View/Users/statistics_galaxymatrix.ctp:31
+msgid "Submit"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:2
+#: View/Allowedlists/index.ctp:2
+#: View/Elements/global_menu.ctp:156;161
+#: View/Pages/doc/administration.ctp:13
+#: View/Pages/doc/general.ctp:51
+#: View/Pages/doc/user_management.ctp:70
+msgid "Signature Allowedlist"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:3
+#: View/Allowedlists/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 ""
+
+#: View/Allowedlists/admin_index.ctp:7;40
+#: View/Allowedlists/index.ctp:7;35
+#: View/Attributes/index.ctp:32
+#: View/DecayingModel/decaying_tool_rest_search.ctp:12;64
+#: View/DecayingModel/index.ctp:6;162
+#: View/Elements/eventattribute.ctp:41
+#: View/Elements/eventdiscussion.ctp:16;122
+#: View/Elements/generic_table.ctp:10
+#: View/Elements/generic_table_row.ctp:10
+#: View/Elements/Feeds/eventattribute.ctp:20;87
+#: View/Elements/Servers/eventattribute.ctp:17;81
+#: View/Elements/genericElements/IndexTable/pagination_links.ctp:11
+#: View/EventBlocklists/index.ctp:6;78
+#: View/Events/index.ctp:6
+#: View/Events/proposal_event_index.ctp:6;89
+#: View/Events/ajax/index.ctp:10
+#: View/Feeds/freetext_index.ctp:18;78
+#: View/Feeds/preview_index.ctp:10;85
+#: View/Jobs/index.ctp:24;181
+#: View/Logs/admin_index.ctp:30;120
+#: View/Logs/event_index.ctp:10;54
+#: View/News/index.ctp:39
+#: View/Noticelists/index.ctp:6;76
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:8
+#: View/ObjectTemplates/index.ctp:6;136
+#: View/OrgBlocklists/index.ctp:6;45
+#: View/Organisations/index.ctp:35;159
+#: View/Regexp/admin_index.ctp:6;44
+#: View/Regexp/index.ctp:6;38
+#: View/Servers/index.ctp:6;196
+#: View/Servers/preview_index.ctp:11;186
+#: View/Tasks/index.ctp:11;99
+#: View/Taxonomies/view.ctp:33;170
+#: View/Templates/index.ctp:6;54
+#: View/Threads/index.ctp:6;90
+#: View/Users/ajax/admin_index.ctp:13;32
+msgid "previous"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:9;42
+#: View/Allowedlists/index.ctp:9;37
+#: View/Attributes/index.ctp:34
+#: View/DecayingModel/decaying_tool_rest_search.ctp:14;66
+#: View/DecayingModel/index.ctp:8;164
+#: View/Elements/eventattribute.ctp:43
+#: View/Elements/eventdiscussion.ctp:18;124
+#: View/Elements/generic_table.ctp:12
+#: View/Elements/generic_table_row.ctp:12
+#: View/Elements/Feeds/eventattribute.ctp:22;89
+#: View/Elements/Servers/eventattribute.ctp:19;83
+#: View/Elements/genericElements/IndexTable/pagination_links.ctp:27
+#: View/EventBlocklists/index.ctp:8;80
+#: View/Events/index.ctp:8
+#: View/Events/proposal_event_index.ctp:8;91
+#: View/Events/ajax/index.ctp:12
+#: View/Feeds/freetext_index.ctp:20;80
+#: View/Feeds/preview_index.ctp:12;87
+#: View/Jobs/index.ctp:26;183
+#: View/Logs/admin_index.ctp:32;122
+#: View/Logs/event_index.ctp:12;56
+#: View/News/index.ctp:41
+#: View/Noticelists/index.ctp:8;78
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:10
+#: View/ObjectTemplates/index.ctp:8;138
+#: View/OrgBlocklists/index.ctp:8;47
+#: View/Organisations/index.ctp:37;161
+#: View/Regexp/admin_index.ctp:8;46
+#: View/Regexp/index.ctp:8;40
+#: View/Servers/index.ctp:8;198
+#: View/Servers/preview_index.ctp:13;188
+#: View/Tasks/index.ctp:13;101
+#: View/Taxonomies/view.ctp:35;172
+#: View/Templates/index.ctp:8;56
+#: View/Threads/index.ctp:8;92
+#: View/Users/ajax/admin_index.ctp:15;34
+msgid "next"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:17
+#: View/Attributes/index.ctp:57
+#: View/DecayingModel/index.ctp:92
+#: View/Elements/eventattribute.ctp:161
+#: View/Elements/Events/eventIndexTable.ctp:60
+#: View/Elements/Users/userIndexTable.ctp:28
+#: View/Elements/genericElements/IndexTable/headers.ctp:43
+#: 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/EventBlocklists/index.ctp:48
+#: View/Events/export.ctp:26
+#: View/Events/resolved_attributes.ctp:54
+#: View/Feeds/preview_index.ctp:41
+#: View/Noticelists/index.ctp:30
+#: View/ObjectTemplates/index.ctp:65
+#: View/OrgBlocklists/index.ctp:19
+#: View/Organisations/index.ctp:95
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:18
+#: View/Servers/index.ctp:36
+#: View/Servers/preview_index.ctp:102
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/Sightings/ajax/list_sightings.ctp:15
+#: View/TagCollections/index.ctp:16
+#: View/Templates/index.ctp:20
+#: View/Threads/index.ctp:21
+msgid "Actions"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:24
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Elements/eventdiscussion.ctp:85;93
+#: View/Elements/Events/eventIndexTable.ctp:217
+#: View/Elements/Events/View/row_attribute.ctp:390
+#: View/Elements/Events/View/row_object.ctp:124;125
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/markdownEditor/markdownEditor.ctp:30
+#: View/EventBlocklists/edit.ctp:37
+#: View/EventBlocklists/index.ctp:62
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:288
+#: View/GalaxyClusterRelations/add.ctp:8
+#: View/News/index.ctp:22
+#: View/OrgBlocklists/edit.ctp:29
+#: View/OrgBlocklists/index.ctp:29
+#: View/Organisations/index.ctp:138
+#: View/Pages/doc/using_the_system.ctp:191
+#: View/Regexp/admin_index.ctp:27
+#: View/Roles/admin_edit.ctp:55
+#: View/Servers/index.ctp:177
+#: View/Tags/edit.ctp:36
+#: View/Tags/index.ctp:133
+#: View/Templates/edit.ctp:49
+#: View/Users/admin_index.ctp:211
+#: View/Users/edit.ctp:47
+msgid "Edit"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:25
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:16
+#: View/Elements/eventdiscussion.ctp:86;94
+#: View/Elements/Events/eventIndexTable.ctp:220
+#: View/Elements/TagCollections/index_row.ctp:45
+#: View/Elements/Users/userIndexTable.ctp:95
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:43
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+#: View/Elements/healthElements/files.ctp:73
+#: View/EventBlocklists/index.ctp:63
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
+#: View/EventReports/index.ctp:97
+#: View/EventReports/ajax/indexForEvent.ctp:113
+#: View/Events/view_graph.ctp:31
+#: View/Feeds/index.ctp:295
+#: View/GalaxyElements/ajax/index.ctp:67
+#: View/News/index.ctp:24
+#: View/ObjectReferences/ajax/delete.ctp:32
+#: View/ObjectTemplates/index.ctp:118
+#: View/Objects/ajax/delete.ctp:19
+#: View/OrgBlocklists/index.ctp:30
+#: View/Organisations/index.ctp:140
+#: View/Pages/doc/using_the_system.ctp:192
+#: View/Regexp/admin_index.ctp:28
+#: View/Servers/index.ctp:178
+#: View/Users/admin_index.ctp:221
+#: View/Warninglists/index.ctp:140
+msgid "Delete"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:25
+#: View/Elements/TagCollections/index_row.ctp:45
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:33
+#: View/Allowedlists/index.ctp:28
+#: View/Attributes/index.ctp:123
+#: View/DecayingModel/decaying_tool_rest_search.ctp:57
+#: View/DecayingModel/index.ctp:155
+#: View/Elements/eventdiscussion.ctp:115
+#: View/Elements/generic_table.ctp:47
+#: View/Elements/generic_table_row.ctp:39
+#: View/Elements/genericElements/IndexTable/pagination_counter.ctp:2
+#: View/EventBlocklists/index.ctp:71
+#: View/Events/index.ctp:103
+#: View/Events/proposal_event_index.ctp:82
+#: View/Events/ajax/index.ctp:21
+#: View/Feeds/preview_index.ctp:77
+#: View/Jobs/index.ctp:174
+#: View/Logs/admin_index.ctp:113
+#: View/Logs/event_index.ctp:47
+#: View/News/index.ctp:33
+#: View/Noticelists/index.ctp:69
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:60
+#: View/ObjectTemplates/index.ctp:129
+#: View/OrgBlocklists/index.ctp:38
+#: View/Organisations/index.ctp:152
+#: View/Regexp/admin_index.ctp:36
+#: View/Regexp/index.ctp:31
+#: View/Servers/index.ctp:189
+#: View/Servers/preview_index.ctp:178
+#: View/Tasks/index.ctp:92
+#: View/Taxonomies/view.ctp:163
+#: View/Templates/index.ctp:47
+#: View/Threads/index.ctp:83
+#: View/Users/ajax/admin_index.ctp:25
+msgid "Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}"
+msgstr ""
+
 #: View/Attributes/add.ctp:6
-#: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:115
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
 
 #: View/Attributes/add.ctp:6
-#: View/Attributes/edit.ctp:4
 msgid "Edit Attribute"
 msgstr ""
 
 #: View/Attributes/add.ctp:18
 #: View/Attributes/attribute_replace.ctp:12
-#: View/Attributes/edit.ctp:8
-#: View/ShadowAttributes/add.ctp:10
+#: View/ShadowAttributes/add.ctp:17
 #: View/ShadowAttributes/edit.ctp:8
 msgid "(choose one)"
 msgstr ""
 
 #: View/Attributes/add.ctp:25
+#: View/ShadowAttributes/add.ctp:24
 msgid "(choose category first)"
 msgstr ""
 
 #: View/Attributes/add.ctp:39
 #: View/Attributes/add_attachment.ctp:33
-#: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
+#: View/EventReports/add.ctp:25
 #: View/Events/add.ctp:33
 #: View/Feeds/add.ctp:198
 #: View/Feeds/edit.ctp:199
+#: View/GalaxyClusterRelations/add.ctp:37
+#: View/GalaxyClusters/add.ctp:40
 #: View/Objects/ajax/quickAddAttributeForm.ctp:69
-#: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
 msgstr ""
 
 #: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
-#: View/Attributes/edit.ctp:46
 #: View/Attributes/ajax/attributeEditMassForm.ctp:49
-#: View/Elements/eventattributecreation.ctp:42
+#: View/Objects/ajax/quickAddAttributeForm.ctp:112
 #: View/Pages/doc/using_the_system.ctp:93;95;131
-#: View/ShadowAttributes/add.ctp:28
+#: View/ShadowAttributes/add.ctp:38
 #: View/ShadowAttributes/add_attachment.ctp:13
 #: View/ShadowAttributes/edit.ctp:32
 msgid "Contextual Comment"
 msgstr ""
 
 #: View/Attributes/add.ctp:57
-#: View/Attributes/edit.ctp:55
-#: View/Elements/eventattributecreation.ctp:53
-#: View/ShadowAttributes/add.ctp:38
-msgid "for Intrusion Detection System"
+#: View/Attributes/ajax/attributeEditMassForm.ctp:33
+#: View/Objects/ajax/quickAddAttributeForm.ctp:94
+#: View/Pages/doc/using_the_system.ctp:96
+#: View/ShadowAttributes/add.ctp:43
+#: View/ShadowAttributes/edit.ctp:41
+msgid "For Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/add.ctp:155
+#: View/Attributes/add.ctp:139
+#: View/ShadowAttributes/add.ctp:100
 msgid "Timezone missing, auto-detected as: "
 msgstr ""
 
-#: View/Attributes/add.ctp:156
-msgid "The following value will be submited instead: "
+#: View/Attributes/add.ctp:140
+#: View/ShadowAttributes/add.ctp:101
+msgid "The following value will be submitted instead: "
 msgstr ""
 
-#: View/Attributes/add.ctp:164
-msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
+#: View/Attributes/add.ctp:148
+#: View/ShadowAttributes/add.ctp:109
+msgid "Value is not a valid datetime. Expected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr ""
 
 #: View/Attributes/add_attachment.ctp:4
@@ -5567,15 +7340,12 @@ msgid "Add Attachment(s)"
 msgstr ""
 
 #: 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_attachment.ctp:24
-#: View/Attributes/edit.ctp:24
 #: View/Objects/ajax/quickAddAttributeForm.ctp:59
 msgid "Distribution "
 msgstr ""
@@ -5585,10 +7355,14 @@ msgid "Is a malware sample (encrypt and hash)"
 msgstr ""
 
 #: View/Attributes/add_attachment.ctp:72
-msgid "Advanced extraction (if installed)"
+msgid "Advanced extraction is not installed"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:77
+#: View/Attributes/add_attachment.ctp:74
+msgid "Advanced extraction"
+msgstr ""
+
+#: View/Attributes/add_attachment.ctp:79
 #: View/Elements/healthElements/files.ctp:92
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
@@ -5609,33 +7383,31 @@ msgstr ""
 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
-#: View/EventDelegations/index.ctp:70
-msgid "Event id"
-msgstr ""
-
 #: View/Attributes/alternate_search_result.ctp:7
-#: View/Attributes/index.ctp:49
+#: View/Attributes/index.ctp:43
 #: View/DecayingModel/decaying_tool_rest_search.ctp:24
-#: View/Elements/eventattribute.ctp:147
+#: View/Elements/eventattribute.ctp:124
 #: View/Elements/Users/userIndexTable.ctp:4
-#: View/Feeds/index.ctp:125
+#: View/Feeds/index.ctp:126
 #: View/Feeds/preview_event.ctp:13
-#: View/Feeds/preview_index.ctp:38
+#: View/Feeds/preview_index.ctp:34
+#: View/GalaxyClusterBlocklists/index.ctp:34
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_index.ctp:50
+#: View/Servers/preview_event.ctp:5
+#: View/Users/admin_index.ctp:69
 #: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:8
-#: View/Elements/Events/View/row_attribute.ctp:71
-#: View/EventBlacklists/add.ctp:24
-#: View/EventBlacklists/edit.ctp:25
+#: View/Elements/Events/View/row_attribute.ctp:83
+#: View/EventBlocklists/add.ctp:24
+#: View/EventBlocklists/edit.ctp:25
 #: View/EventDelegations/index.ctp:78
 #: View/Events/add_misp_export_result.ctp:5
-#: View/Events/resolved_misp_format.ctp:51
+#: View/Events/resolved_misp_format.ctp:53
+#: View/ShadowAttributes/index.ctp:69
 msgid "Event info"
 msgstr ""
 
@@ -5644,7 +7416,7 @@ msgid "Event date"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:509
+#: View/Events/view.ctp:507
 msgid "Event graph"
 msgstr ""
 
@@ -5667,8 +7439,6 @@ msgid "Choose a category and a type, then paste a list of IOCs that match the se
 msgstr ""
 
 #: 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 ""
@@ -5685,9 +7455,7 @@ msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:33;41
 #: View/Attributes/ajax/attributeEditMassForm.ctp:80
-#: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
-#: View/ShadowAttributes/add.ctp:57
 #: 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
@@ -5705,58 +7473,19 @@ msgstr ""
 msgid "Replaceattributes"
 msgstr ""
 
-#: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:85
-#: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_galaxy_matrix.ctp:76;211
-#: View/Elements/genericElements/Form/submitButton.ctp:8;25
-#: View/Events/contact.ctp:29
-#: View/Events/free_text_import.ctp:27
-#: View/Events/resolved_misp_format.ctp:386
-#: View/News/add.ctp:33
-#: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:131
-#: View/Objects/add.ctp:166
-#: View/Objects/ajax/quickAddAttributeForm.ctp:119
-#: View/Organisations/admin_add.ctp:48
-#: View/Organisations/admin_edit.ctp:59
-#: View/Posts/add.ctp:66
-#: View/Posts/edit.ctp:20
-#: View/Servers/add.ctp:129
-#: View/Servers/edit.ctp:171
-#: View/Servers/ondemand_action.ctp:54
-#: 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/UserSettings/set_setting.ctp:36
-#: View/Users/admin_add.ctp:98
-#: 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/Users/statistics_galaxymatrix.ctp:31
-#: View/Whitelists/admin_edit.ctp:13
-msgid "Submit"
-msgstr ""
-
 #: View/Attributes/attribute_replace.ctp:44
 #: View/Attributes/ajax/attributeEditMassForm.ctp:89
 #: 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/tagRemoveConfirmation.ctp:22
 #: View/Attributes/ajax/toggle_correlation.ctp:25
-#: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
-#: View/Elements/view_galaxy_matrix.ctp:212
-#: View/Elements/genericElements/infoModal.ctp:40
-#: View/Elements/genericElements/Form/submitButton.ctp:13
+#: View/Elements/view_galaxy_matrix.ctp:210
+#: View/Elements/genericElements/infoModal.ctp:45
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:50
+#: View/Elements/genericElements/Form/submitButton.ctp:14
+#: View/Elements/markdownEditor/markdownEditor.ctp:135
 #: View/Elements/serverRuleElements/pull.ctp:73
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -5765,21 +7494,21 @@ msgstr ""
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/resolved_misp_format.ctp:387
+#: View/Events/resolved_misp_format.ctp:438
 #: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:35
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:33
 #: 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/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:26
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:30
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/add.ctp:135
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/Objects/add.ctp:172
-#: View/Objects/revise_object.ctp:112
+#: View/Objects/add.ctp:184
+#: View/Objects/revise_object.ctp:105
 #: View/Objects/ajax/delete.ctp:24
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:27
 #: View/Organisations/ajax/merge.ctp:71
@@ -5787,7 +7516,6 @@ msgstr ""
 #: 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:69
 #: View/ShadowAttributes/edit.ctp:68
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
@@ -5811,6 +7539,8 @@ msgstr ""
 #: View/Users/ajax/fetchpgpkey.ctp:26
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
+#: View/genericTemplates/confirm.ctp:18
+#: View/genericTemplates/delete.ctp:16;29
 msgid "Cancel"
 msgstr ""
 
@@ -5822,26 +7552,10 @@ msgstr ""
 msgid "No Failed Composites"
 msgstr ""
 
-#: View/Attributes/edit.ctp:13
-#: View/ShadowAttributes/add.ctp:16
-#: View/ShadowAttributes/edit.ctp:14
-msgid "Type "
-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:66
-#: View/ShadowAttributes/edit.ctp:56;65
-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/Attributes/ajax/hover_enrichment.ctp:33
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:521
+#: View/Events/view.ctp:522
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -5882,245 +7596,69 @@ msgstr ""
 msgid "Results for all attributes"
 msgstr ""
 
-#: View/Attributes/index.ctp:39;128
-#: View/DecayingModel/decaying_tool_rest_search.ctp:12;64
-#: View/DecayingModel/index.ctp:13;169
-#: View/Elements/eventattribute.ctp:60;247
-#: 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;87
-#: View/Elements/Servers/eventattribute.ctp:20;87
-#: View/Elements/genericElements/IndexTable/pagination.ctp:14
-#: View/EventBlacklists/index.ctp:13;85
-#: 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/preview_index.ctp:14;89
-#: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:31;188
-#: 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;143
-#: 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;105
-#: View/Roles/index.ctp:13;68
-#: View/Servers/index.ctp:13;202
-#: View/Servers/preview_index.ctp:15;190
-#: View/ShadowAttributes/index.ctp:12;128
-#: View/SharingGroups/index.ctp:13;107
-#: View/Tags/index.ctp:21;141
-#: View/Tasks/index.ctp:18;106
-#: View/Taxonomies/index.ctp:13;65
-#: View/Taxonomies/view.ctp:53;181
-#: View/Templates/index.ctp:13;61
-#: View/Threads/index.ctp:13;98
-#: 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;130
-#: View/DecayingModel/decaying_tool_rest_search.ctp:14;66
-#: View/DecayingModel/index.ctp:15;171
-#: View/Elements/eventattribute.ctp:62;249
-#: 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;89
-#: View/Elements/Servers/eventattribute.ctp:22;89
-#: View/Elements/genericElements/IndexTable/pagination.ctp:16
-#: View/EventBlacklists/index.ctp:15;87
-#: 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/preview_index.ctp:16;91
-#: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:33;190
-#: 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;145
-#: 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;107
-#: View/Roles/index.ctp:15;70
-#: View/Servers/index.ctp:15;204
-#: View/Servers/preview_index.ctp:17;192
-#: View/ShadowAttributes/index.ctp:14;130
-#: View/SharingGroups/index.ctp:15;109
-#: View/Tags/index.ctp:23;143
-#: View/Tasks/index.ctp:20;108
-#: View/Taxonomies/index.ctp:15;67
-#: View/Taxonomies/view.ctp:55;183
-#: View/Templates/index.ctp:15;63
-#: View/Threads/index.ctp:15;100
-#: 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:47
+#: View/Attributes/index.ctp:41
 #: View/DecayingModel/decaying_tool_rest_search.ctp:23
-#: View/Elements/eventattribute.ctp:139
+#: View/Elements/eventattribute.ctp:120
 #: View/Elements/Feeds/eventattribute.ctp:41
-#: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/proposal_event_index.ctp:30
-#: View/Events/view.ctp:143
+#: View/Elements/Servers/eventattribute.ctp:38
+#: View/Events/proposal_event_index.ctp:24
+#: View/Events/view.ctp:116
 #: View/Feeds/preview_event.ctp:25
 #: View/Objects/group_attributes_into_object.ctp:56
 #: 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
+#: View/Servers/preview_event.ctp:20
+#: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Date"
 msgstr ""
 
-#: View/Attributes/index.ctp:54
+#: View/Attributes/index.ctp:48
 #: View/DecayingModel/decaying_tool_rest_search.ctp:30
-#: View/Elements/eventattribute.ctp:158
-#: View/Elements/global_menu.ctp:94
-#: View/Events/view.ctp:533
+#: View/Elements/eventattribute.ctp:135
+#: View/Elements/global_menu.ctp:128
+#: View/Events/view.ctp:534
 #: View/Events/ajax/ajaxGalaxies.ctp:6
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr ""
 
-#: View/Attributes/index.ctp:56
-#: View/Elements/eventattribute.ctp:160
+#: View/Attributes/index.ctp:50
+#: View/Elements/eventattribute.ctp:137
 msgid "Correlate"
 msgstr ""
 
-#: View/Attributes/index.ctp:57
-#: View/Elements/eventattribute.ctp:161
+#: View/Attributes/index.ctp:51
+#: View/Elements/eventattribute.ctp:138
 #: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-#: View/Events/view.ctp:372
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/view.ctp:364
 #: View/Feeds/preview_event.ctp:73
 #: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
+#: View/Servers/preview_event.ctp:68
 msgid "Related Events"
 msgstr ""
 
-#: View/Attributes/index.ctp:58
-#: View/Elements/eventattribute.ctp:162
+#: View/Attributes/index.ctp:52
+#: View/Elements/eventattribute.ctp:139
 #: View/Elements/Feeds/eventattribute.ctp:49
-#: View/Elements/Servers/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:46
 msgid "Feed hits"
 msgstr ""
 
-#: View/Attributes/index.ctp:61
+#: View/Attributes/index.ctp:55
 #: View/DecayingModel/decaying_tool_rest_search.ctp:33
-#: View/Elements/eventattribute.ctp:165
-#: View/Events/view.ctp:252
+#: View/Elements/eventattribute.ctp:142
+#: View/Events/view.ctp:246
 msgid "Sightings"
 msgstr ""
 
-#: View/Attributes/index.ctp:62
-#: View/Elements/eventattribute.ctp:166
-#: View/Events/view.ctp:262
-#: View/GalaxyClusters/ajax/index.ctp:52
-#: View/Tags/index.ctp:73
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:143
+#: View/Events/view.ctp:255
+#: View/GalaxyClusters/ajax/index.ctp:126
+#: View/Tags/index.ctp:101
 msgid "Activity"
 msgstr ""
 
-#: View/Attributes/index.ctp:63
-#: View/DecayingModel/index.ctp:99
-#: View/Elements/eventattribute.ctp:184
-#: View/Elements/Events/eventIndexTable.ctp:60
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/genericElements/IndexTable/headers.ctp:33
-#: 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:55
-#: View/Events/export.ctp:26
-#: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/preview_index.ctp:45
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:72
-#: 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:36
-#: View/Servers/index.ctp:41
-#: View/Servers/preview_index.ctp:106
-#: View/SharingGroups/add.ctp:74;94
-#: View/SharingGroups/edit.ctp:74;102
-#: View/SharingGroups/index.ctp:48
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/TagCollections/index.ctp:16
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:28
-#: 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:121
-#: View/DecayingModel/decaying_tool_rest_search.ctp:57
-#: View/DecayingModel/index.ctp:162
-#: View/Elements/eventdiscussion.ctp:119
-#: View/Elements/generic_table.ctp:53
-#: View/Elements/generic_table_row.ctp:45
-#: View/Elements/genericElements/IndexTable/pagination_counter.ctp:5
-#: View/EventBlacklists/index.ctp:78
-#: View/Events/index.ctp:108
-#: View/Events/proposal_event_index.ctp:88
-#: View/Events/ajax/index.ctp:32
-#: View/Feeds/preview_index.ctp:81
-#: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:181
-#: 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:136
-#: 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:98
-#: View/Roles/index.ctp:61
-#: View/Servers/index.ctp:195
-#: View/Servers/preview_index.ctp:182
-#: View/ShadowAttributes/index.ctp:121
-#: View/SharingGroups/index.ctp:100
-#: View/Tags/index.ctp:134
-#: View/Tasks/index.ctp:99
-#: View/Taxonomies/index.ctp:58
-#: View/Taxonomies/view.ctp:174
-#: View/Templates/index.ctp:54
-#: View/Threads/index.ctp:91
-#: 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 ""
@@ -6134,8 +7672,9 @@ msgid "Value found: "
 msgstr ""
 
 #: View/Attributes/report_validation_issues_attributes.ctp:10
+#: View/Elements/healthElements/diagnostics.ctp:136
 #: View/Elements/templateElements/populateTemplateFile.ctp:21
-#: View/Errors/error403.ctp:3
+#: View/Errors/error403.ctp:4
 msgid "Error"
 msgstr ""
 
@@ -6172,7 +7711,7 @@ msgid "From the following organisation(s)"
 msgstr ""
 
 #: View/Attributes/search.ctp:29
-msgid "Only find IOCs flagged as to_ids"
+msgid "Only find IOCs flagged as to IDS"
 msgstr ""
 
 #: View/Attributes/search.ctp:33
@@ -6180,7 +7719,7 @@ msgid "Alternate Search Result (Events)"
 msgstr ""
 
 #: View/Attributes/search.ctp:47
-msgid "First seen and Last seen."
+msgid "First seen and Last seen"
 msgstr ""
 
 #: View/Attributes/search.ctp:48
@@ -6199,33 +7738,6 @@ msgstr ""
 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;98
-#: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/TagCollections/index_row.ctp:45
-#: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
-#: View/Elements/healthElements/files.ctp:73
-#: View/EventBlacklists/index.ctp:70
-#: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
-#: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:292
-#: View/News/index.ctp:24
-#: View/ObjectReferences/ajax/delete.ctp:32
-#: View/ObjectTemplates/index.ctp:125
-#: View/Objects/ajax/delete.ctp:19
-#: View/OrgBlacklists/index.ctp:37
-#: View/Organisations/index.ctp:140
-#: View/Pages/doc/using_the_system.ctp:192
-#: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:90
-#: View/Servers/index.ctp:183
-#: View/SharingGroups/index.ctp:89
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Delete"
-msgstr ""
-
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
@@ -6255,29 +7767,31 @@ msgid "Do not alter current settings"
 msgstr ""
 
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
-#: View/Elements/eventattributecreation.ctp:30
+#: View/Elements/GalaxyClusters/relations_graph.ctp:429
+#: View/EventReports/index.ctp:74
+#: View/EventReports/view.ctp:15
+#: View/EventReports/ajax/indexForEvent.ctp:97
 #: View/Events/resolved_attributes.ctp:51
-#: View/Events/resolved_misp_format.ctp:98;293
-#: View/Events/view.ctp:159
+#: View/Events/resolved_misp_format.ctp:96;149;344
+#: View/Events/view.ctp:152
 #: View/Feeds/add.ctp:189
 #: View/Feeds/edit.ctp:191
-#: View/Feeds/freetext_index.ctp:36
-#: View/Feeds/index.ctp:184
-#: View/Objects/add.ctp:47;118;214
+#: View/Feeds/freetext_index.ctp:32
+#: View/Feeds/index.ctp:185
+#: View/GalaxyClusterRelations/index.ctp:107
+#: View/GalaxyClusters/view.ctp:57
+#: View/GalaxyClusters/view_relations.ctp:42;109
+#: View/GalaxyClusters/ajax/index.ctp:174
+#: View/Objects/add.ctp:51;130;226
 #: View/Objects/group_attributes_into_object.ctp:12;59
-#: View/Objects/revise_object.ctp:35;69
+#: View/Objects/revise_object.ctp:11;59
 #: View/Pages/doc/using_the_system.ctp:34;90;126;186;211;237
-#: View/Servers/preview_event.ctp:53
+#: View/Servers/preview_event.ctp:33
 #: View/Templates/populate_event_from_template_attributes.ctp:11
-#: View/Threads/index.ctp:27
+#: View/Threads/index.ctp:20
 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:38
 msgid "Create proposals"
 msgstr ""
@@ -6347,19 +7861,33 @@ msgstr ""
 msgid "Export as %s"
 msgstr ""
 
-#: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
-msgid "Remove Tag"
+#: View/Attributes/ajax/hover_enrichment.ctp:14
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:68
+msgid "Error: %s"
+msgstr ""
+
+#: View/Attributes/ajax/hover_enrichment.ctp:18
+msgid "Empty results"
+msgstr ""
+
+#: View/Attributes/ajax/hover_enrichment.ctp:23
+msgid "Object: %s"
+msgstr ""
+
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:7
+msgid "Remove %s tag %s from %s %s?"
 msgstr ""
 
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
-msgid "Remove tag "
+#: View/Servers/id_translator.ctp:22
+msgid "local"
 msgstr ""
 
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
-msgid "from "
+msgid "global"
 msgstr ""
 
-#: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 msgid "Remove"
 msgstr ""
 
@@ -6379,6 +7907,461 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
+#: View/AuthKeys/add.ctp:4
+msgid "Add auth key"
+msgstr ""
+
+#: View/AuthKeys/add.ctp:5
+msgid "Auth keys are used for API access. A user can have more than one authkey, so if you would like to use separate keys per tool that queries MISP, add additional keys. Use the comment field to make identifying your keys easier."
+msgstr ""
+
+#: View/AuthKeys/add.ctp:15
+#: View/AuthKeys/index.ctp:68
+#: View/AuthKeys/view.ctp:45
+#: View/DecayingModel/decaying_tool_rest_search.ctp:31
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/resolved_misp_format.ctp:148;343
+#: View/GalaxyClusterBlocklists/add.ctp:38
+#: View/GalaxyClusterBlocklists/index.ctp:56
+#: View/Inbox/index.ctp:36
+#: View/ObjectReferences/ajax/add.ctp:30
+#: View/Objects/add.ctp:71;131
+#: View/Objects/group_attributes_into_object.ctp:30
+#: View/Objects/revise_object.ctp:12;57
+#: View/Pages/doc/using_the_system.ctp:234;284
+#: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
+msgid "Comment"
+msgstr ""
+
+#: View/AuthKeys/add.ctp:20
+msgid "Expiration (%s)"
+msgstr ""
+
+#: View/AuthKeys/add.ctp:20
+msgid "keep empty for maximal validity of %s days"
+msgstr ""
+
+#: View/AuthKeys/add.ctp:20
+msgid "keep empty for indefinite"
+msgstr ""
+
+#: View/AuthKeys/authkey_display.ctp:7;21
+msgid "Auth key created"
+msgstr ""
+
+#: View/AuthKeys/authkey_display.ctp:10;22
+msgid "Please make sure that you note down the auth key below, this is the only time the auth key is shown in plain text, so make sure you save it. If you lose the key, simply remove the entry and generate a new one."
+msgstr ""
+
+#: View/AuthKeys/authkey_display.ctp:11;23
+msgid "MISP will use the first and the last 4 characters for identification purposes."
+msgstr ""
+
+#: View/AuthKeys/authkey_display.ctp:15;25
+msgid "I have noted down my key, take me back now"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:14
+msgid "Add authentication key"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:29
+#: View/Cerebrates/index.ctp:70
+#: View/Cerebrates/preview_orgs.ctp:45
+#: View/Communities/index.ctp:25
+#: View/CorrelationExclusions/index.ctp:45
+#: View/Dashboards/list_templates.ctp:10
+#: View/EventBlocklists/index.ctp:28
+#: View/EventDelegations/index.ctp:41
+#: View/EventReports/index.ctp:33
+#: View/Events/index.ctp:89
+#: View/Feeds/index.ctp:67
+#: View/Feeds/preview_index.ctp:21
+#: View/Feeds/search_caches.ctp:26
+#: View/Galaxies/index.ctp:10
+#: View/GalaxyClusterBlocklists/index.ctp:19
+#: View/GalaxyClusterRelations/index.ctp:30
+#: View/GalaxyClusters/ajax/index.ctp:59
+#: View/Inbox/index.ctp:10
+#: View/ObjectTemplates/index.ctp:40
+#: View/Organisations/index.ctp:68
+#: View/Roles/index.ctp:133
+#: View/Servers/preview_index.ctp:60
+#: View/ShadowAttributes/index.ctp:25
+#: View/SharingGroups/index.ctp:36
+#: View/Sightingdb/index.ctp:10
+#: View/Tags/index.ctp:25
+#: View/Taxonomies/index.ctp:29
+#: View/Taxonomies/view.ctp:45
+#: View/Users/admin_index.ctp:55
+#: View/Users/registrations.ctp:26
+#: View/Warninglists/index.ctp:37
+msgid "Filter"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:30
+#: View/Cerebrates/index.ctp:71
+#: View/Cerebrates/preview_orgs.ctp:46
+#: View/Communities/index.ctp:26
+#: View/CorrelationExclusions/index.ctp:46
+#: View/Dashboards/list_templates.ctp:11
+#: View/Elements/eventattributetoolbar.ctp:231
+#: View/EventBlocklists/index.ctp:29
+#: View/EventDelegations/index.ctp:42
+#: View/EventReports/index.ctp:34
+#: View/Events/index.ctp:90
+#: View/Feeds/index.ctp:68
+#: View/Feeds/preview_index.ctp:22
+#: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:11
+#: View/GalaxyClusterBlocklists/index.ctp:20
+#: View/GalaxyClusterRelations/index.ctp:31
+#: View/GalaxyClusters/ajax/index.ctp:60
+#: View/Inbox/index.ctp:11
+#: View/ObjectTemplates/index.ctp:41
+#: View/Organisations/index.ctp:69
+#: View/Roles/index.ctp:134
+#: View/Servers/preview_index.ctp:61
+#: View/ShadowAttributes/index.ctp:26
+#: View/SharingGroups/index.ctp:37
+#: View/Sightingdb/index.ctp:11
+#: View/Tags/index.ctp:26
+#: View/Taxonomies/index.ctp:30
+#: View/Users/admin_index.ctp:56
+#: View/Users/registrations.ctp:27
+#: View/Warninglists/index.ctp:38
+msgid "Enter value to search"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:56
+#: View/AuthKeys/view.ctp:54
+#: View/Users/statistics_sightings.ctp:13
+msgid "Expiration"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:73
+msgid "Authentication key Index"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:74
+msgid "A list of API keys bound to a user."
+msgstr ""
+
+#: View/AuthKeys/index.ctp:92
+msgid "Delete auth key"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:25
+#: View/Elements/Events/eventIndexTable.ctp:34
+#: View/Elements/Users/userIndexTable.ctp:3
+#: View/EventReports/index.ctp:48
+#: View/EventReports/view.ctp:3
+#: View/EventReports/ajax/indexForEvent.ctp:71
+#: View/Events/get_event_info_by_id.ctp:12
+#: View/Feeds/index.ctp:85
+#: View/Feeds/view.ctp:3
+#: View/GalaxyClusters/ajax/index.ctp:67
+#: View/ObjectTemplates/view.ctp:3
+#: View/Objects/add.ctp:214
+#: View/Objects/group_attributes_into_object.ctp:54
+#: View/Organisations/view.ctp:5
+#: View/Organisations/ajax/merge.ctp:56;63
+#: View/Pages/doc/using_the_system.ctp:163;203
+#: View/Roles/index.ctp:4
+#: View/Servers/compare_servers.ctp:4
+#: View/Servers/index.ctp:14
+#: View/ShadowAttributes/index.ctp:34
+#: View/SharingGroups/index.ctp:49
+#: View/SharingGroups/view.ctp:6
+#: View/Tags/index.ctp:34
+#: View/Taxonomies/index.ctp:37
+#: View/Taxonomies/view.ctp:14
+#: View/Users/admin_index.ctp:63
+#: View/Users/view.ctp:3
+#: View/Warninglists/index.ctp:48
+msgid "ID"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:29
+#: View/Cerebrates/preview_orgs.ctp:15
+#: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
+#: View/Elements/Events/View/row_object.ctp:61
+#: View/Elements/GalaxyClusters/relations_graph.ctp:440
+#: View/EventReports/view.ctp:4
+#: View/Events/resolved_misp_format.ctp:94;144;339
+#: View/Events/show_i_o_c_results.ctp:10;32
+#: View/Feeds/preview_event.ctp:11
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:48
+#: View/ObjectTemplates/index.ctp:59
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:58
+#: View/OrgBlocklists/index.ctp:16
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
+#: View/Organisations/view.ctp:7
+#: View/Organisations/ajax/merge.ctp:58;65
+#: View/Pages/doc/using_the_system.ctp:204
+#: View/Servers/id_translator.ctp:45
+#: View/Servers/preview_event.ctp:4
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+#: View/SharingGroups/index.ctp:57
+#: View/SharingGroups/view.ctp:7
+#: View/TagCollections/index.ctp:8
+msgid "UUID"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:49
+#: View/Elements/Users/userIndexTable.ctp:19
+#: View/GalaxyClusterBlocklists/index.ctp:44
+#: View/Pages/doc/administration.ctp:183
+#: View/Pages/doc/using_the_system.ctp:272
+#: View/ShadowAttributes/index.ctp:92
+#: View/Users/admin_index.ctp:145
+#: View/Users/view.ctp:104
+msgid "Created"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:59
+msgid "Key usage"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:68
+msgid "Last used"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:69
+msgid "Not used yet"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:73
+msgid "Unique IPs"
+msgstr ""
+
+#: View/Cerebrates/add.ctp:31
+msgid "Pull Organisations"
+msgstr ""
+
+#: View/Cerebrates/add.ctp:36
+msgid "Pull Sharing Groups"
+msgstr ""
+
+#: View/Cerebrates/add.ctp:43
+msgid "Edit Cerebrate connection"
+msgstr ""
+
+#: View/Cerebrates/add.ctp:43
+msgid "Add Cerebrate connection"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:4
+#: View/Cerebrates/preview_orgs.ctp:4
+#: View/Cerebrates/view.ctp:9
+#: View/Communities/index.ctp:34
+#: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
+#: View/EventDelegations/index.ctp:50
+#: View/Feeds/search_caches.ctp:35
+#: View/GalaxyClusterBlocklists/index.ctp:28
+#: View/GalaxyClusterRelations/index.ctp:39
+#: View/GalaxyClusters/view_relations.ctp:8
+#: View/Inbox/index.ctp:19
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:5
+#: View/Sightingdb/index.ctp:26
+#: View/Templates/view.ctp:4
+#: View/UserSettings/index.ctp:50
+#: View/Users/registrations.ctp:39
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:9
+#: View/GalaxyClusterRelations/index.ctp:85
+#: View/GalaxyClusters/ajax/index.ctp:98
+#: View/Pages/doc/using_the_system.ctp:162
+#: View/Servers/preview_event.ctp:6
+msgid "Owner Org"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:15
+#: View/Cerebrates/preview_orgs.ctp:20
+#: View/Cerebrates/view.ctp:13
+#: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
+#: View/DecayingModel/index.ctp:81
+#: View/DecayingModel/view.ctp:14
+#: View/Elements/Events/View/row_attribute.ctp:214
+#: View/Elements/GalaxyClusters/relations_graph.ctp:425
+#: View/Elements/Servers/View/row_object.ctp:19
+#: View/Elements/templateElements/templateRowAttribute.ctp:12
+#: View/Elements/templateElements/templateRowFile.ctp:12
+#: View/Elements/templateElements/templateRowText.ctp:12
+#: View/EventReports/index.ctp:56
+#: View/EventReports/ajax/indexForEvent.ctp:77
+#: View/Events/resolved_misp_format.ctp:93
+#: View/Events/view.ctp:408
+#: View/Feeds/index.ctp:108
+#: View/Feeds/search_caches.ctp:47
+#: View/Feeds/view.ctp:4
+#: View/Galaxies/index.ctp:37
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/add.ctp:27
+#: View/GalaxyClusters/view.ctp:42
+#: View/ObjectTemplates/view.ctp:4
+#: View/Objects/add.ctp:218
+#: View/Objects/revise_object.ctp:8
+#: View/Organisations/ajax/merge.ctp:57;64
+#: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
+#: View/Roles/index.ctp:26
+#: View/Roles/view.ctp:9
+#: View/Servers/compare_servers.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
+#: View/SharingGroups/index.ctp:63
+#: View/SharingGroups/view.ctp:8;46;71
+#: View/Sightingdb/index.ctp:51
+#: View/Tags/index.ctp:54
+#: View/Templates/view.ctp:9
+#: View/Users/statistics_orgs.ctp:33
+#: View/Warninglists/index.ctp:56
+#: View/Warninglists/view.ctp:10
+msgid "Name"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:20
+#: View/Cerebrates/view.ctp:17
+#: View/Elements/Events/View/row_attribute.ctp:215
+#: View/EventReports/ajax/importReportFromUrl.ctp:13
+#: View/Events/automation.ctp:286
+#: View/Events/legacy_automation.ctp:394
+#: View/Events/view.ctp:409
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:139
+#: View/Feeds/view.ctp:5
+#: View/Pages/doc/using_the_system.ctp:445
+#: View/Servers/compare_servers.ctp:4
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
+#: View/SharingGroups/view.ctp:72
+msgid "URL"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:25
+#: View/Cerebrates/view.ctp:30
+#: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
+#: View/DecayingModel/index.ctp:82
+#: View/DecayingModel/view.ctp:21
+#: View/Elements/GalaxyClusters/relations_graph.ctp:427
+#: View/Elements/Servers/View/row_object.ctp:24
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
+#: 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:26
+#: View/Galaxies/index.ctp:53
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:44
+#: View/GalaxyClusters/ajax/index.ctp:150
+#: View/ObjectTemplates/view.ctp:10
+#: View/Objects/add.ctp:26;125;222
+#: View/Objects/group_attributes_into_object.ctp:8
+#: View/Objects/propose_objects_from_attributes.ctp:17
+#: View/Organisations/view.ctp:20
+#: 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/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:76
+#: View/SharingGroups/view.ctp:10
+#: View/Sightingdb/index.ctp:88
+#: View/TagCollections/index.ctp:15
+#: View/Taxonomies/index.ctp:49
+#: View/Taxonomies/view.ctp:16
+#: View/Templates/view.ctp:14
+#: View/Warninglists/index.ctp:67
+#: View/Warninglists/view.ctp:11
+msgid "Description"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:30
+msgid "Pull Orgs"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:36
+msgid "Pull SGs"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:56
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:818
+msgid "Add Cerebrate"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:78
+msgid "Linked Cerebrates"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:79
+msgid "You can connect your MISP to one or several Cerebrate instances to act as lookup directories for organisation and sharing group information."
+msgstr ""
+
+#: View/Cerebrates/index.ctp:92
+msgid "Pull all organisations"
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:9
+#: View/Elements/Servers/Module/type.ctp:11
+#: View/Elements/healthElements/diagnostics.ctp:419
+#: View/Pages/doc/administration.ctp:56;228
+#: View/Servers/ajax/submoduleStatus.ctp:6
+msgid "Status"
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:25
+#: View/Organisations/view.ctp:45
+#: View/Users/statistics_orgs.ctp:39
+msgid "Sector"
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:30
+#: View/Organisations/view.ctp:41
+#: View/Users/statistics_orgs.ctp:37
+msgid "Nationality"
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:54
+msgid "Organisations list via Cerebrate %s (%s)"
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:59
+msgid "Preview of the organisations known to the remote Cerebrate instance."
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:69
+msgid "Fetch organisation object"
+msgstr ""
+
+#: View/Cerebrates/view.ctp:23
+#: View/GalaxyClusters/view.ctp:62
+msgid "Owner Organisation"
+msgstr ""
+
+#: View/Cerebrates/view.ctp:39
+msgid "The Cerebrate Project"
+msgstr ""
+
 #: View/Communities/index.ctp:14
 msgid "Vetted by the MISP-project team"
 msgstr ""
@@ -6387,75 +8370,6 @@ msgstr ""
 msgid "Unvetted"
 msgstr ""
 
-#: View/Communities/index.ctp:25
-#: View/Dashboards/list_templates.ctp:10
-#: View/EventBlacklists/index.ctp:35
-#: View/EventDelegations/index.ctp:41
-#: View/Events/index.ctp:94
-#: View/Feeds/index.ctp:67
-#: View/Feeds/preview_index.ctp:25
-#: View/Feeds/search_caches.ctp:26
-#: View/Galaxies/index.ctp:25
-#: View/GalaxyClusters/ajax/index.ctp:27
-#: View/Inbox/index.ctp:10
-#: View/ObjectTemplates/index.ctp:47
-#: View/Organisations/index.ctp:75
-#: View/Servers/preview_index.ctp:64
-#: View/ShadowAttributes/index.ctp:37
-#: View/Sightingdb/index.ctp:10
-#: View/Tags/index.ctp:56
-#: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:35
-#: View/Users/registrations.ctp:26
-msgid "Filter"
-msgstr ""
-
-#: View/Communities/index.ctp:26
-#: View/Dashboards/list_templates.ctp:11
-#: View/Elements/eventattributetoolbar.ctp:231
-#: View/EventBlacklists/index.ctp:36
-#: View/EventDelegations/index.ctp:42
-#: View/Events/index.ctp:95
-#: View/Feeds/index.ctp:68
-#: View/Feeds/preview_index.ctp:26
-#: View/Feeds/search_caches.ctp:27
-#: View/Galaxies/index.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:28
-#: View/Inbox/index.ctp:11
-#: View/ObjectTemplates/index.ctp:48
-#: View/Organisations/index.ctp:76
-#: View/Servers/preview_index.ctp:65
-#: View/ShadowAttributes/index.ctp:38
-#: View/Sightingdb/index.ctp:11
-#: View/Users/admin_index.ctp:36
-#: View/Users/registrations.ctp:27
-msgid "Enter value to search"
-msgstr ""
-
-#: View/Communities/index.ctp:34
-#: View/Communities/view.ctp:4
-#: View/Dashboards/list_templates.ctp:19
-#: View/EventDelegations/index.ctp:50
-#: View/Feeds/index.ctp:85
-#: View/Feeds/search_caches.ctp:35
-#: View/Feeds/view.ctp:3
-#: View/Inbox/index.ctp:19
-#: View/ObjectTemplates/view.ctp:3
-#: View/Organisations/view.ctp:5
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:3
-#: View/Sightingdb/index.ctp:26
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/UserSettings/index.ctp:50
-#: View/Users/admin_index.ctp:44
-#: View/Users/admin_view.ctp:6
-#: View/Users/registrations.ctp:39
-#: View/Users/view.ctp:3
-#: View/Warninglists/view.ctp:9
-msgid "Id"
-msgstr ""
-
 #: View/Communities/index.ctp:40
 msgid "Vetted"
 msgstr ""
@@ -6468,46 +8382,6 @@ msgstr ""
 msgid "Community name"
 msgstr ""
 
-#: View/Communities/index.ctp:59
-#: View/Dashboards/list_templates.ctp:43
-#: View/Dashboards/save_template.ctp:21
-#: View/DecayingModel/index.ctp:89
-#: View/DecayingModel/view.ctp:21
-#: View/Elements/Servers/View/row_object.ctp:24
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
-#: 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:26
-#: View/Galaxies/index.ctp:65
-#: View/Galaxies/view.ctp:9
-#: View/GalaxyClusters/view.ctp:8
-#: View/GalaxyClusters/ajax/index.ctp:64
-#: View/ObjectTemplates/view.ctp:9
-#: View/Objects/add.ctp:22;113;210
-#: View/Objects/group_attributes_into_object.ctp:8
-#: View/Objects/propose_objects_from_attributes.ctp:17
-#: 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:46
-#: View/Sightingdb/index.ctp:88
-#: View/TagCollections/index.ctp:15
-#: View/Taxonomies/view.ctp:14
-#: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:11
-msgid "Description"
-msgstr ""
-
 #: View/Communities/index.ctp:63
 msgid "Self-reg"
 msgstr ""
@@ -6533,10 +8407,10 @@ msgid "Requestor E-mail address"
 msgstr ""
 
 #: View/Communities/request_access.ctp:15
-#: View/Jobs/index.ctp:104
-#: View/OrgBlacklists/add.ctp:17
-#: View/OrgBlacklists/index.ctp:22
-#: View/Organisations/view.ctp:6
+#: View/Jobs/index.ctp:97
+#: View/OrgBlocklists/add.ctp:18
+#: View/OrgBlocklists/index.ctp:15
+#: View/Organisations/view.ctp:11
 msgid "Organisation name"
 msgstr ""
 
@@ -6553,6 +8427,7 @@ msgid "Message to the community host organisation"
 msgstr ""
 
 #: View/Communities/request_access.ctp:37
+#: View/Elements/footer.ctp:15;17
 msgid "PGP public key"
 msgstr ""
 
@@ -6588,59 +8463,7 @@ msgstr ""
 msgid "Message:"
 msgstr ""
 
-#: View/Communities/view.ctp:5
-#: View/Dashboards/list_templates.ctp:25
-#: View/Elements/Events/View/row_object.ctp:72
-#: View/Events/resolved_misp_format.ctp:93;288
-#: View/Galaxies/view.ctp:8
-#: View/GalaxyClusters/view.ctp:9
-#: View/ObjectTemplates/index.ctp:66
-#: View/ObjectTemplates/view.ctp:6
-#: View/Objects/revise_object.ctp:68
-#: View/OrgBlacklists/index.ctp:23
-#: View/Organisations/admin_add.ctp:21
-#: View/Organisations/admin_edit.ctp:20
-#: View/Organisations/view.ctp:24
-#: View/Organisations/ajax/merge.ctp:58;65
-#: View/SharingGroups/add.ctp:72
-#: View/SharingGroups/edit.ctp:72
-#: View/SharingGroups/index.ctp:43
-#: View/TagCollections/index.ctp:8
-msgid "UUID"
-msgstr ""
-
-#: View/Communities/view.ctp:6
-#: View/Dashboards/list_templates.ctp:37
-#: View/DecayingModel/index.ctp:88
-#: View/DecayingModel/view.ctp:14
-#: View/Elements/Servers/View/row_object.ctp:19
-#: View/Elements/templateElements/templateRowAttribute.ctp:12
-#: View/Elements/templateElements/templateRowFile.ctp:12
-#: View/Elements/templateElements/templateRowText.ctp:12
-#: View/Feeds/index.ctp:108
-#: View/Feeds/search_caches.ctp:47
-#: View/Feeds/view.ctp:4
-#: View/Galaxies/index.ctp:49
-#: View/Galaxies/view.ctp:6
-#: View/GalaxyClusters/view.ctp:6
-#: View/ObjectTemplates/view.ctp:4
-#: View/Objects/add.ctp:206
-#: View/Objects/revise_object.ctp:27
-#: 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/Sightingdb/index.ctp:51
-#: View/Templates/view.ctp:9
-#: View/Users/statistics_orgs.ctp:33
-#: View/Warninglists/view.ctp:10
-msgid "Name"
-msgstr ""
-
 #: View/Communities/view.ctp:7
-#: View/SharingGroups/view.ctp:68
 msgid "Url"
 msgstr ""
 
@@ -6653,12 +8476,6 @@ msgid "Vetted by MISP-project"
 msgstr ""
 
 #: View/Communities/view.ctp:27
-#: View/Elements/footer.ctp:15
-#: View/Users/admin_add.ctp:70
-#: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:72
-#: View/Users/edit.ctp:23
-#: View/Users/view.ctp:32
 msgid "GnuPG key"
 msgstr ""
 
@@ -6667,12 +8484,62 @@ msgid "Community "
 msgstr ""
 
 #: View/Communities/view.ctp:51
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:766
 msgid "Request Access"
 msgstr ""
 
+#: View/CorrelationExclusions/add.ctp:4
+msgid "Add Correlation Exclusion Entry"
+msgstr ""
+
+#: View/CorrelationExclusions/add.ctp:5
+msgid "If you wish to exclude certain entries from being correlated on, simply add an entry here."
+msgstr ""
+
+#: View/CorrelationExclusions/add.ctp:9
+#: View/DecayingModel/decaying_tool_rest_search.ctp:27
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+#: 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/resolved_misp_format.ctp:143;338
+#: View/Events/show_i_o_c_results.ctp:13
+#: View/Feeds/freetext_index.ctp:29
+#: View/GalaxyClusters/update_cluster.ctp:19;47;85
+#: View/GalaxyClusters/ajax/index.ctp:83
+#: View/GalaxyElements/ajax/index.ctp:56
+#: View/Noticelists/view.ctp:42
+#: View/Objects/add.ctp:127;245
+#: View/Objects/group_attributes_into_object.ctp:58
+#: View/Objects/revise_object.ctp:55
+#: View/Objects/ajax/quickAddAttributeForm.ctp:78
+#: 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/UserSettings/index.ctp:68
+#: View/Users/admin_filter_user_index.ctp:71
+msgid "Value"
+msgstr ""
+
+#: View/CorrelationExclusions/index.ctp:14
+msgid "Add correlation exclusion entry"
+msgstr ""
+
+#: View/CorrelationExclusions/index.ctp:71
+msgid "Correlation Exclusions Index"
+msgstr ""
+
+#: View/CorrelationExclusions/index.ctp:72
+msgid "A list of values to exclude from the correlation engine."
+msgstr ""
+
+#: View/CorrelationExclusions/index.ctp:82
+msgid "Delete correlation exclusion entry"
+msgstr ""
+
 #: View/Dashboards/add.ctp:17
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:21
 msgid "Add Widget"
 msgstr ""
 
@@ -6717,15 +8584,21 @@ msgstr ""
 
 #: View/Dashboards/list_templates.ctp:52
 #: View/Dashboards/save_template.ctp:52
-#: View/SharingGroups/view.ctp:12
+#: View/SharingGroups/view.ctp:11
 msgid "Selectable"
 msgstr ""
 
 #: View/Dashboards/list_templates.ctp:58
 #: View/Dashboards/save_template.ctp:59
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
+#: View/Elements/GalaxyClusters/relations_graph.ctp:428
+#: View/EventReports/index.ctp:22
+#: View/EventReports/ajax/indexForEvent.ctp:56
+#: View/GalaxyClusterRelations/index.ctp:45
+#: View/GalaxyClusters/view.ctp:46
+#: View/GalaxyClusters/view_relations.ctp:13
+#: View/GalaxyClusters/ajax/index.ctp:24;120
+#: View/Jobs/index.ctp:64
+#: View/Roles/index.ctp:9;19
 msgid "Default"
 msgstr ""
 
@@ -6827,16 +8700,16 @@ msgstr ""
 #: View/Elements/templateElements/templateRowAttribute.ctp:30
 #: View/Elements/templateElements/templateRowFile.ctp:30
 #: View/Events/resolved_attributes.ctp:47
-#: View/Events/resolved_misp_format.ctp:90;285
+#: View/Events/resolved_misp_format.ctp:141;336
 #: View/Events/show_i_o_c_results.ctp:11
-#: View/Feeds/freetext_index.ctp:31
-#: View/Objects/add.ctp:114
+#: View/Feeds/freetext_index.ctp:27
+#: View/Objects/add.ctp:126
 #: View/Objects/group_attributes_into_object.ctp:57
 #: View/Objects/propose_objects_from_attributes.ctp:16
-#: View/Objects/revise_object.ctp:63
+#: View/Objects/revise_object.ctp:53
 #: 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:65
+#: View/ShadowAttributes/index.ctp:80
 #: 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
@@ -6847,7 +8720,7 @@ msgstr ""
 
 #: View/DecayingModel/decaying_tool.ctp:25
 #: View/DecayingModel/view.ctp:3
-#: View/Logs/admin_index.ctp:75
+#: View/Logs/admin_index.ctp:68
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr ""
@@ -6872,33 +8745,6 @@ msgstr ""
 msgid "Model's Settings"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool.ctp:137
-#: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:231
-#: View/Elements/Events/View/row_attribute.ctp:413
-#: View/Elements/TagCollections/index_row.ctp:44
-#: View/Elements/Users/userIndexTable.ctp:90
-#: View/EventBlacklists/edit.ctp:37
-#: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:220
-#: View/Feeds/index.ctp:285
-#: View/News/index.ctp:22
-#: View/OrgBlacklists/edit.ctp:30
-#: View/OrgBlacklists/index.ctp:36
-#: View/Organisations/index.ctp:138
-#: View/Pages/doc/using_the_system.ctp:191
-#: View/Regexp/admin_index.ctp:34
-#: View/Roles/admin_edit.ctp:56
-#: View/Roles/admin_index.ctp:89
-#: View/Servers/index.ctp:182
-#: View/SharingGroups/index.ctp:88
-#: View/Tags/edit.ctp:36
-#: View/Tags/index.ctp:124
-#: View/Templates/edit.ctp:49
-#: View/Whitelists/admin_index.ctp:31
-msgid "Edit"
-msgstr ""
-
 #: View/DecayingModel/decaying_tool.ctp:137
 #: View/Templates/add.ctp:49
 msgid "Create"
@@ -6933,7 +8779,7 @@ msgid "Default basescore"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_basescore.ctp:13
-#: View/Taxonomies/index.ctp:2
+#: View/Taxonomies/index.ctp:3
 msgid "Taxonomies"
 msgstr ""
 
@@ -6941,98 +8787,68 @@ msgstr ""
 msgid "Weight"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:91
+#: View/DecayingModel/decaying_tool_basescore.ctp:49
+msgid "Numerical value overriden by userSetting.&#10;Original numerical_value = %s"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:100
 msgid "Excluded"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:112
+#: View/DecayingModel/decaying_tool_basescore.ctp:121
 msgid "Placeholder for `Organisation source confidence`"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:115
+#: View/DecayingModel/decaying_tool_basescore.ctp:124
 msgid "Example"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:141;146;151
+#: View/DecayingModel/decaying_tool_basescore.ctp:150;155;160
 msgid "Pick a Taxonomy"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:157
+#: View/DecayingModel/decaying_tool_basescore.ctp:166
 msgid "Computation steps"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:160
+#: View/DecayingModel/decaying_tool_basescore.ctp:169
 msgid "Apply base score"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_rest_search.ctp:26
+#: View/Elements/GalaxyClusters/relations_graph.ctp:447
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:13
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:48
-#: View/Events/resolved_misp_format.ctp:91;286
+#: View/Events/resolved_misp_format.ctp:142;337
 #: View/Events/show_i_o_c_results.ctp:12
-#: View/Feeds/freetext_index.ctp:32
+#: View/Feeds/freetext_index.ctp:28
 #: View/Feeds/search_caches.ctp:41
 #: View/Inbox/index.ctp:25
-#: View/Objects/revise_object.ctp:64
+#: View/Objects/add.ctp:244
+#: View/Objects/revise_object.ctp:54
 #: 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:53;68
+#: View/ShadowAttributes/index.ctp:86
 #: View/SharingGroups/add.ctp:70
 #: View/SharingGroups/edit.ctp:70
-#: View/Sightings/ajax/list_sightings.ctp:7
+#: View/Sightings/ajax/list_sightings.ctp:11
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:38
+#: View/Warninglists/index.ctp:71
 #: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_rest_search.ctp:27
-#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
-#: 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/resolved_misp_format.ctp:92;287
-#: View/Events/show_i_o_c_results.ctp:13
-#: View/Feeds/freetext_index.ctp:33
-#: View/GalaxyClusters/ajax/index.ctp:37
-#: View/Noticelists/view.ctp:42
-#: View/Objects/add.ctp:115
-#: View/Objects/group_attributes_into_object.ctp:58
-#: View/Objects/revise_object.ctp:65
-#: View/Objects/ajax/quickAddAttributeForm.ctp:78
-#: 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/UserSettings/index.ctp:68
-#: View/Users/admin_filter_user_index.ctp:71
-msgid "Value"
-msgstr ""
-
 #: View/DecayingModel/decaying_tool_rest_search.ctp:29
 msgid "Event Tags"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_rest_search.ctp:31
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/resolved_misp_format.ctp:97;292
-#: View/Inbox/index.ctp:36
-#: View/ObjectReferences/ajax/add.ctp:30
-#: View/Objects/add.ctp:67;119
-#: View/Objects/group_attributes_into_object.ctp:30
-#: View/Objects/revise_object.ctp:49;67
-#: View/Pages/doc/using_the_system.ctp:234;284
-#: View/Templates/populate_event_from_template_attributes.ctp:9
-#: View/Users/registrations.ctp:88
-msgid "Comment"
-msgstr ""
-
 #: View/DecayingModel/decaying_tool_rest_search.ctp:35
-#: View/Elements/eventattribute.ctp:179
+#: View/Elements/eventattribute.ctp:156
 msgid "Score"
 msgstr ""
 
@@ -7046,7 +8862,8 @@ msgid "Decaying Model RestSearch"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_simulation.ctp:45
-#: View/Events/automation.ctp:24
+#: View/Elements/genericElements/ListTopBar/group_search.ctp:23
+#: View/Events/automation.ctp:38
 #: View/Logs/admin_index.ctp:20;21
 #: View/Logs/admin_search.ctp:25
 msgid "Search"
@@ -7106,6 +8923,8 @@ msgstr ""
 
 #: View/DecayingModel/import.ctp:10
 #: View/Feeds/import_feeds.ctp:10
+#: View/Galaxies/import.ctp:17
+#: View/GalaxyElements/ajax/flattenJson.ctp:11
 #: View/Servers/import.ctp:10
 #: View/TagCollections/import.ctp:10
 msgid "JSON"
@@ -7116,141 +8935,129 @@ msgid "Model JSON"
 msgstr ""
 
 #: View/DecayingModel/import.ctp:18
+#: View/Galaxies/import.ctp:23
 msgid "JSON file"
 msgstr ""
 
-#: View/DecayingModel/import.ctp:25
-#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:15
-#: View/Elements/genericElements/org_picker.ctp:17
-#: View/EventBlacklists/add.ctp:36
-#: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:220
-#: View/Feeds/import_feeds.ctp:20
-#: View/OrgBlacklists/add.ctp:29
-#: View/Regexp/admin_add.ctp:32
-#: View/Regexp/admin_edit.ctp:42
-#: View/Roles/admin_add.ctp:57
-#: View/Servers/import.ctp:20
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
-#: View/Sightings/ajax/add_sighting.ctp:33
-#: View/TagCollections/import.ctp:20
-#: View/Tags/add.ctp:35
-#: View/Users/admin_filter_user_index.ctp:62
-#: View/Whitelists/admin_add.ctp:13
-msgid "Add"
-msgstr ""
-
 #: View/DecayingModel/index.ctp:2
 msgid "Decaying Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:30;31
+#: View/DecayingModel/index.ctp:23;24
 msgid "All Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:41
+#: View/DecayingModel/index.ctp:34
 msgid "My models only"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:42
+#: View/DecayingModel/index.ctp:35
 msgid "My Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:53
+#: View/DecayingModel/index.ctp:46
 msgid "Models available to everyone"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:54
+#: View/DecayingModel/index.ctp:47
 msgid "Shared Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:65
+#: View/DecayingModel/index.ctp:58
 msgid "Default models only"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:66
+#: View/DecayingModel/index.ctp:59
 msgid "Default Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:86
+#: View/DecayingModel/index.ctp:79
 #: View/Pages/doc/using_the_system.ctp:398
 msgid "Organization"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:87
+#: View/DecayingModel/index.ctp:80
 msgid "Usable to everyone"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:91
+#: View/DecayingModel/index.ctp:84
 #: View/DecayingModel/view.ctp:40
 msgid "Parameters"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:92
+#: View/DecayingModel/index.ctp:85
 msgid "Pretty print"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:95
+#: View/DecayingModel/index.ctp:88
 #: View/DecayingModel/view.ctp:35
 msgid "Formula"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:96
+#: View/DecayingModel/index.ctp:89
 msgid "# Assigned Types"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:97
+#: View/DecayingModel/index.ctp:90
 #: View/DecayingModel/view.ctp:25
+#: View/Elements/GalaxyClusters/relations_graph.ctp:439
+#: View/Elements/genericElements/IndexTable/Fields/galaxy_cluster_link.ctp:27
 #: View/Galaxies/view.ctp:10
+#: View/GalaxyClusters/view.ctp:47
 #: View/ObjectTemplates/view.ctp:7
-#: View/Taxonomies/view.ctp:19
+#: View/Taxonomies/index.ctp:54
+#: View/Taxonomies/view.ctp:17
+#: View/Warninglists/index.ctp:61
 #: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:98
+#: View/DecayingModel/index.ctp:91
 #: View/DecayingModel/view.ctp:31
-#: View/Events/view.ctp:310
+#: View/Events/view.ctp:304
 #: View/Feeds/index.ctp:91
 #: View/Feeds/view.ctp:63
-#: View/Noticelists/index.ctp:63
-#: View/ObjectTemplates/index.ctp:35
+#: View/Noticelists/index.ctp:56
+#: View/ObjectTemplates/index.ctp:28
 #: View/Sightingdb/index.ctp:19
-#: View/Taxonomies/view.ctp:24
+#: View/Taxonomies/index.ctp:17;60
+#: View/Taxonomies/view.ctp:18
+#: View/Warninglists/index.ctp:25;89
 #: View/Warninglists/view.ctp:16
 msgid "Enabled"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:114
+#: View/DecayingModel/index.ctp:107
 #: View/DecayingModel/view.ctp:18
 msgid "Default Model from MISP Project"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:137
+#: View/DecayingModel/index.ctp:130
 msgid "Download model"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:142
+#: View/DecayingModel/index.ctp:135
 msgid "Are you sure you want to delete DecayingModel #"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:148
+#: View/DecayingModel/index.ctp:141
 msgid "Are you sure you want to disable DecayingModel #"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:150
+#: View/DecayingModel/index.ctp:143
 msgid "Are you sure you want to enable DecayingModel #"
 msgstr ""
 
 #: View/DecayingModel/view.ctp:5
-#: View/Events/view.ctp:86
+#: View/Elements/Events/eventIndexTable.ctp:22
+#: View/Events/view.ctp:61
 msgid "Creator org"
 msgstr ""
 
 #: View/DecayingModel/view.ctp:27
 #: View/SharingGroups/add.ctp:93
 #: View/SharingGroups/edit.ctp:101
-#: View/SharingGroups/view.ctp:69
+#: View/SharingGroups/view.ctp:73
 #: View/TagCollections/index.ctp:12
 msgid "All orgs"
 msgstr ""
@@ -7277,9 +9084,8 @@ msgstr ""
 
 #: View/Elements/ajaxAttributeTags.ctp:29
 #: View/Elements/ajaxTagCollectionTags.ctp:16
-#: View/Elements/ajaxTags.ctp:104
+#: View/Elements/ajaxTags.ctp:92
 #: View/Elements/ajaxTemplateTag.ctp:10
-#: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr ""
 
@@ -7290,116 +9096,103 @@ msgstr ""
 msgid "Add tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:73;74
+#: View/Elements/ajaxTags.ctp:10
+msgid "Missing taxonomies: <span class=\"red bold\">%s</span><br>"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:60;61
 msgid "Local tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:73;74
+#: View/Elements/ajaxTags.ctp:60;61
 msgid "Global tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:107
+#: View/Elements/ajaxTags.ctp:95
 msgid "Remove tag %s"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:123;124
-#: View/Elements/galaxyQuickView.ctp:122
-#: View/Elements/galaxyQuickViewMini.ctp:115
+#: View/Elements/ajaxTags.ctp:110;111
+#: View/Elements/galaxyQuickView.ctp:123
+#: View/Elements/galaxyQuickViewMini.ctp:99
 #: View/Templates/add.ctp:28
 #: View/Templates/edit.ctp:28
 msgid "Add a tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:141;142
-#: View/Elements/galaxyQuickView.ctp:135
-#: View/Elements/galaxyQuickViewMini.ctp:128
+#: View/Elements/ajaxTags.ctp:127;128
+#: View/Elements/galaxyQuickView.ctp:136
+#: View/Elements/galaxyQuickViewMini.ctp:112
 msgid "Add a local tag"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:67;69;254;256
+#: View/Elements/eventattribute.ctp:49;51;213;215
 #: View/Elements/Feeds/eventattribute.ctp:28;31;95;98
-#: View/Elements/Servers/eventattribute.ctp:28;31;95;98
+#: View/Elements/Servers/eventattribute.ctp:25;28;89;92
 msgid "view all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:132
+#: View/Elements/eventattribute.ctp:113
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/EventBlacklists/index.ctp:47
+#: View/EventBlocklists/index.ctp:40
 msgid "Select all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:132
+#: View/Elements/eventattribute.ctp:113
 msgid "Select all attributes/proposals on current page"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:138
+#: View/Elements/eventattribute.ctp:119
 #: View/Elements/Feeds/eventattribute.ctp:42
-#: View/Elements/Servers/eventattribute.ctp:42
-#: View/Objects/revise_object.ctp:52
+#: View/Elements/Servers/eventattribute.ctp:39
+#: View/Objects/revise_object.ctp:13
 msgid "First seen"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:138
+#: View/Elements/eventattribute.ctp:119
 #: View/Elements/Feeds/eventattribute.ctp:42
-#: View/Elements/Servers/eventattribute.ctp:42
-#: View/Objects/revise_object.ctp:56
+#: View/Elements/Servers/eventattribute.ctp:39
+#: View/Objects/revise_object.ctp:14
 msgid "Last seen"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:143
-#: View/Elements/eventdiscussion.ctp:143
-#: View/Events/view.ctp:219;230
+#: View/Elements/eventattribute.ctp:122
+#: View/Elements/eventdiscussion.ctp:138
+#: View/EventReports/view.ctp:6
+#: View/Events/view.ctp:212;223
 #: 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:48
 msgid "Event"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:154
+#: View/Elements/eventattribute.ctp:131
 #: View/Elements/eventattributetoolbar.ctp:201
 msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:171
+#: View/Elements/eventattribute.ctp:148
 #: View/Elements/eventattributetoolbar.ctp:185
 msgid "SightingDB"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:178
+#: View/Elements/eventattribute.ctp:155
 msgid "Decaying Score"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:227
+#: View/Elements/eventattribute.ctp:198
 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:231
+#: View/Elements/eventattribute.ctp:202
 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:205
-#: View/Galaxies/index.ctp:14
-#: View/GalaxyClusters/ajax/index.ctp:16
-#: View/Jobs/index.ctp:13;65
-#: View/ObjectTemplates/index.ctp:40
-#: View/Regexp/admin_add.ctp:17
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-#: View/UserSettings/index.ctp:41
-msgid "All"
-msgstr ""
-
 #: View/Elements/eventattributetoolbar.ctp:15
 msgid "Only show %s related attributes"
 msgstr ""
@@ -7409,7 +9202,7 @@ msgid "Only show proposals"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:25
-#: View/Logs/event_index.ctp:44
+#: View/Logs/event_index.ctp:37
 msgid "Proposal"
 msgstr ""
 
@@ -7418,7 +9211,7 @@ msgid "Only show correlating attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:33
-#: View/Events/view.ctp:306
+#: View/Events/view.ctp:300
 msgid "Correlation"
 msgstr ""
 
@@ -7427,8 +9220,9 @@ msgid "Only show potentially false positive attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:41
-#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:73
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:74;80;246
+#: View/Elements/healthElements/diagnostics.ctp:138
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr ""
@@ -7499,6 +9293,10 @@ msgid "Include deleted attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:166
+#: View/EventReports/index.ctp:27
+#: View/EventReports/view.ctp:28
+#: View/EventReports/ajax/indexForEvent.ctp:61
+#: View/GalaxyClusters/ajax/index.ctp:43
 msgid "Deleted"
 msgstr ""
 
@@ -7539,84 +9337,97 @@ msgid "%s active rule(s)"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:235
-#: View/Events/index.ctp:65
-#: View/Logs/admin_index.ctp:62
-#: View/Servers/preview_index.ctp:57
-#: View/Tags/index.ctp:52
+#: View/EventReports/index.ctp:38
+#: View/Events/index.ctp:60
+#: View/Galaxies/index.ctp:15
+#: View/Logs/admin_index.ctp:55
+#: View/Servers/preview_index.ctp:53
+#: View/SharingGroups/index.ctp:41
 msgid "Remove filters"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:34
+#: View/Elements/eventdiscussion.ctp:2
+#: View/Events/view.ctp:525
+msgid "Discussion"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:32
 msgid "Date: "
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:52
+#: View/Elements/eventdiscussion.ctp:34
+msgid "Top"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:48
 msgid "Deactivated user"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:73
-msgid "Message edited at "
+#: View/Elements/eventdiscussion.ctp:69
+msgid "Message edited at %s"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:83
+#: View/Elements/eventdiscussion.ctp:79
 msgid "User "
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:90;98
+#: View/Elements/eventdiscussion.ctp:86;94
 msgid "Are you sure you want to delete this post?"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:93;100
+#: View/Elements/eventdiscussion.ctp:89;96
 msgid "Reply"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:142
+#: View/Elements/eventdiscussion.ctp:137
 #: View/Posts/add.ctp:32
 msgid "Insert a quote - just paste your quote between the [quote][/quote] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:142
+#: View/Elements/eventdiscussion.ctp:137
+#: View/Elements/markdownEditor/markdownEditor.ctp:130
 #: View/Posts/add.ctp:32
 msgid "Quote"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:143
+#: View/Elements/eventdiscussion.ctp:138
+#: View/Posts/add.ctp:33
 msgid "Insert a link to an event - just enter the event ID between the [event][/event] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:139
 #: 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:144
+#: View/Elements/eventdiscussion.ctp:139
 #: View/Posts/add.ctp:34
 msgid "Thread"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:140
 #: View/Posts/add.ctp:35
 msgid "Insert a link [link][/link] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:140
 #: View/Posts/add.ctp:35
 msgid "Link"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:146
+#: View/Elements/eventdiscussion.ctp:141
 #: View/Posts/add.ctp:36
 msgid "Insert a code [code][/code] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:146
+#: View/Elements/eventdiscussion.ctp:141
+#: View/Elements/markdownEditor/markdownEditor.ctp:131
 #: View/Posts/add.ctp:36
 msgid "Code"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:157
-#: View/Users/ajax/emailConfirmTemplate.ctp:13
-msgid "Send"
+#: View/Elements/eventdiscussion.ctp:152
+msgid "Send comment"
 msgstr ""
 
 #: View/Elements/flashErrorMessage.ctp:2
@@ -7624,6 +9435,7 @@ msgid "Errors"
 msgstr ""
 
 #: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/GalaxyClusters/clusterElementUI.ctp:34
 #: View/Jobs/ajax/error.ctp:34
 msgid "Close"
 msgstr ""
@@ -7636,199 +9448,203 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: View/Elements/footer.ctp:17
-msgid "Could not locate the GnuPG public key."
+#: View/Elements/footer.ctp:19
+msgid "Could not locate the PGP public key."
 msgstr ""
 
 #: View/Elements/footer.ctp:24
-msgid "Could not locate SMIME certificate."
+msgid "S/MIME certificate"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:53
+#: View/Elements/footer.ctp:26
+msgid "Could not locate S/MIME certificate."
+msgstr ""
+
+#: View/Elements/form_seen_input.ctp:52
 msgid "First seen date"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:57
+#: View/Elements/form_seen_input.ctp:56
 msgid "Last seen date"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:63
+#: View/Elements/form_seen_input.ctp:62
 msgid "First seen time"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:64;69
+#: View/Elements/form_seen_input.ctp:63;68
 msgid "Expected format: HH:MM:SS.ssssss+TT:TT"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:68
+#: View/Elements/form_seen_input.ctp:67
 msgid "Last seen time"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:76
-#: View/Elements/galaxyQuickViewMini.ctp:79
+#: View/Elements/galaxyQuickView.ctp:77
+#: View/Elements/galaxyQuickViewMini.ctp:63
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:77
-#: View/Elements/galaxyQuickViewMini.ctp:80
+#: View/Elements/galaxyQuickView.ctp:78
+#: View/Elements/galaxyQuickViewMini.ctp:64
 msgid "View cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:83;84
-#: View/Elements/galaxyQuickViewMini.ctp:86;87
+#: View/Elements/galaxyQuickView.ctp:84;85
+#: View/Elements/galaxyQuickViewMini.ctp:70;71
 msgid "View all events containing this cluster."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:97
+#: View/Elements/galaxyQuickView.ctp:98
 msgid "detach"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:98
+#: View/Elements/galaxyQuickView.ctp:99
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:114
+#: View/Elements/galaxyQuickView.ctp:115
 msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:115
+#: View/Elements/galaxyQuickView.ctp:116
 msgid "View galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:122
-#: View/Elements/galaxyQuickViewMini.ctp:115
+#: View/Elements/galaxyQuickView.ctp:123
+#: View/Elements/galaxyQuickViewMini.ctp:99
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:135
-#: View/Elements/galaxyQuickViewMini.ctp:128
+#: View/Elements/galaxyQuickView.ctp:136
+#: View/Elements/galaxyQuickViewMini.ctp:112
 msgid "Add new local cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:100
+#: View/Elements/galaxyQuickViewMini.ctp:84
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:187
+#: View/Elements/generic_picker.ctp:217
 msgid "No item picked"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:209
+#: View/Elements/generic_picker.ctp:248
 msgid "Due to the large number of options, no contextual information is provided."
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:277
+#: View/Elements/generic_picker.ctp:316
 msgid "Nothing to pick"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:7
+#: View/Elements/global_menu.ctp:13
 msgid "Home"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:11
+#: View/Elements/global_menu.ctp:17
 #: View/Pages/doc/general.ctp:20
 msgid "Event Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
+#: View/Elements/global_menu.ctp:20
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:278;323
 #: 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:274;318
+#: View/Elements/global_menu.ctp:24
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:283;329
 #: View/Events/add.ctp:7
 #: 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:337
+#: View/Elements/global_menu.ctp:29
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:351
 #: 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:342
+#: View/Elements/global_menu.ctp:33
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:356
 #: 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:330
+#: View/Elements/global_menu.ctp:37
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+#: View/Elements/global_menu.ctp:45
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:372
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:377
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:47
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+#: View/Elements/global_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:383
 msgid "View delegation requests"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
+#: View/Elements/global_menu.ctp:61
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1074
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
+#: View/Elements/global_menu.ctp:65
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:291
 msgid "List Tag Collections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:61
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
+#: View/Elements/global_menu.ctp:69
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1079
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
+#: View/Elements/global_menu.ctp:74
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1107
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
+#: View/Elements/global_menu.ctp:78
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:74
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1142
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:82
+#: View/Elements/global_menu.ctp:90
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:389
 #: 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:86
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
-#: View/Events/automation.ctp:2
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+#: View/Events/automation.ctp:5
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
@@ -7836,17 +9652,37 @@ msgstr ""
 msgid "Automation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:98
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
+#: View/Elements/global_menu.ctp:106;426
+msgid "Blocklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:113;431
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409;999
+msgid "Manage Event Blocklists"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:123
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:609
+#: View/Users/dashboard.ctp:2
+msgid "Dashboard"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:132
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1301;1423;1467
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:105
+#: View/Elements/global_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1313;1479
+msgid "List Relationships"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:143
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:108;113
+#: View/Elements/global_menu.ctp:146;151
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -7855,107 +9691,98 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:118;123
-#: 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:128
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Elements/global_menu.ctp:166
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:507
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:132
+#: View/Elements/global_menu.ctp:170
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:139
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:490
+msgid "List Correlation Exclusions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:182
 #: View/Pages/doc/general.ctp:22;54
 msgid "Global Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:143
+#: View/Elements/global_menu.ctp:185
 #: 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:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
+#: View/Elements/global_menu.ctp:189
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:595
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:151
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
+#: View/Elements/global_menu.ctp:193
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:600
 msgid "My Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
+#: View/Elements/global_menu.ctp:197
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:605;904
 msgid "Set Setting"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:159
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
-#: View/Users/dashboard.ctp:2
-msgid "Dashboard"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:168
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
+#: View/Elements/global_menu.ctp:206
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:628
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:175
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
+#: View/Elements/global_menu.ctp:213
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1494
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
+#: View/Elements/global_menu.ctp:220
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:186
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
+#: View/Elements/global_menu.ctp:224
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:194
+#: View/Elements/global_menu.ctp:232
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1185
 msgid "Decaying Models Tool"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:199
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
+#: View/Elements/global_menu.ctp:237
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1191
 msgid "List Decaying Models"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:206
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
+#: View/Elements/global_menu.ctp:244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:658
 #: 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:210
+#: View/Elements/global_menu.ctp:248
 msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:214
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
+#: View/Elements/global_menu.ctp:252
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:662
 msgid "Terms & Conditions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:218
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
+#: View/Elements/global_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:666
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -7969,61 +9796,65 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:225
+#: View/Elements/global_menu.ctp:263
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:229
+#: View/Elements/global_menu.ctp:267
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:236
+#: View/Elements/global_menu.ctp:274
 #: View/Pages/doc/general.ctp:23;66
 msgid "Sync Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:240
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
+#: View/Elements/global_menu.ctp:278
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:674
 msgid "Create Sync Config"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
+#: View/Elements/global_menu.ctp:283
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 msgid "Import Server Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:250
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
+#: View/Elements/global_menu.ctp:288
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:255
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
+#: View/Elements/global_menu.ctp:293
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1212
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:260
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
+#: View/Elements/global_menu.ctp:298
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1216
 msgid "Search Feed Caches"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:265
+#: View/Elements/global_menu.ctp:303
 msgid "List SightingDB Connections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:270
+#: View/Elements/global_menu.ctp:308
 msgid "Add SightingDB Connection"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+#: View/Elements/global_menu.ctp:313
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
 msgid "List Communities"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:283
+#: View/Elements/global_menu.ctp:318
+msgid "Cerebrates"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:331
 #: View/Pages/doc/administration.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
@@ -8033,113 +9864,122 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
+#: View/Elements/global_menu.ctp:336
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:292
+#: View/Elements/global_menu.ctp:340
+msgid "List Auth Keys"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:344
 msgid "List User Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:296
+#: View/Elements/global_menu.ctp:348
 #: View/UserSettings/set_setting.ctp:5
 msgid "Set User Setting"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:300
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
+#: View/Elements/global_menu.ctp:352
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
 msgid "Add User"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:304
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+#: View/Elements/global_menu.ctp:357
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:308
+#: View/Elements/global_menu.ctp:361
 msgid "User Registrations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:315
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
+#: View/Elements/global_menu.ctp:369
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615;947
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:319
+#: View/Elements/global_menu.ctp:373
 msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:326
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+#: View/Elements/global_menu.ctp:381
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:959
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:330
+#: View/Elements/global_menu.ctp:385
 msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:338
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
+#: View/Elements/global_menu.ctp:394
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:965
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:347
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
+#: View/Elements/global_menu.ctp:403
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:976
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:356
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
+#: View/Elements/global_menu.ctp:412
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:982
 #: 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:365
-msgid "Blacklist Event"
+#: View/Elements/global_menu.ctp:417
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
+msgid "Event Block Rules"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:370
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
-msgid "Manage Event Blacklists"
+#: View/Elements/global_menu.ctp:440
+msgid "Blocklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:379
-msgid "Blacklist Organisation"
+#: View/Elements/global_menu.ctp:445
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1011
+msgid "Manage Org Blocklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:384
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
-msgid "Manage Org Blacklists"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:392
+#: View/Elements/global_menu.ctp:453
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:396
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+#: View/Elements/global_menu.ctp:457
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1020
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:400
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
+#: View/Elements/global_menu.ctp:461
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1024
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:436
+#: View/Elements/global_menu.ctp:474;475
+msgid "Set the current page as your home page in MISP"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:495
+#: View/Elements/dashboard/dashboard_notifications.ctp:2
+msgid "Notifications"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:501
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -8162,9 +10002,8 @@ msgstr ""
 
 #: View/Elements/view_event_distribution_graph.ctp:9
 #: View/Elements/view_timeline.ctp:23
-#: View/Layouts/dashboard.ctp:94
-#: View/Layouts/default.ctp:93
-#: View/Layouts/graph.ctp:84
+#: View/Layouts/dashboard.ctp:93
+#: View/Layouts/default.ctp:89
 msgid "Loading"
 msgstr ""
 
@@ -8195,9 +10034,9 @@ msgid "Display"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Events/index.ctp:58
+#: View/Events/index.ctp:53
 #: View/Pages/doc/using_the_system.ctp:197
-#: View/Servers/preview_index.ctp:50
+#: View/Servers/preview_index.ctp:46
 msgid "Filters"
 msgstr ""
 
@@ -8211,11 +10050,12 @@ msgstr ""
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: View/Elements/view_galaxy_matrix.ctp:91
+#: View/Elements/view_galaxy_matrix.ctp:88
+#: View/Elements/Events/View/value_field.ctp:116;160
 msgid "Show all"
 msgstr ""
 
-#: View/Elements/view_galaxy_matrix.ctp:129
+#: View/Elements/view_galaxy_matrix.ctp:127
 msgid "(%s items)"
 msgstr ""
 
@@ -8224,8 +10064,8 @@ msgid "Time scope"
 msgstr ""
 
 #: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
-#: View/Feeds/index.ctp:190
-#: View/Taxonomies/view.ctp:83
+#: View/Feeds/index.ctp:191
+#: View/Taxonomies/view.ctp:63
 msgid "Tag"
 msgstr ""
 
@@ -8254,13 +10094,105 @@ msgstr ""
 msgid "Pick an Attribute"
 msgstr ""
 
+#: View/Elements/EventReports/reportEditor.ctp:6
+msgid "invalid scope or id"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:3
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:24
+msgid "No html support, typographer & autolinker"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:4
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:25
+msgid "An additional syntax to reference MISP Elements"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:10
+#: View/EventReports/view.ctp:59
+#: View/EventReports/view_summary.ctp:22
+msgid "Markdown format"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:11
+msgid "The suported markdown format is similar to %s with some differences:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:18
+msgid "Markdown extended format"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:19
+msgid "In order to have a visually pleasant report but more importantly, avoid hardcoding element's value or ID, MISP elements such as attributes and objects can be referenced with the following special syntax"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:23
+msgid "Where:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:25
+msgid "Is the scope to which the UUID is related to."
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:27
+msgid "Can be one of the following: %s"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:29
+msgid "Is the UUID of the MISP element with only one exception for the tag"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:31;48;59;71
+msgid "Examples:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:38
+msgid "Pictures from attachment-type attributes"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:39
+msgid "Syntax for pictures is like the syntax for referencing MISP elements but with two differences:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:41
+msgid "The addition of the %s character to indicate that the picture should be displayed and not the atttribute"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:42
+msgid "The scope is fixed to %s as only attributes can contain a file"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:54
+msgid "Syntax for representing tags is similar the syntax for referencing MISP elements but with two differences:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:56;68
+msgid "The scope is fixed to %s"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:57
+msgid "The UUID is replaced by the tag name sa tags don't have UUID"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:65
+msgid "Event's Galaxy matrixes"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:66
+msgid "Syntax for embedding the ATT&CK matrix or any other galaxy matrixes is similar to the syntax for referencing MISP elements:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:69
+msgid "The matrix will be generated for the whole event for which the report is linked to"
+msgstr ""
+
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/EventBlacklists/index.ctp:47
+#: View/EventBlocklists/index.ctp:40
 msgid "Select all events on current page"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:27
-#: View/Events/view.ctp:96
+#: View/Events/view.ctp:71
 msgid "Owner org"
 msgstr ""
 
@@ -8306,167 +10238,159 @@ msgid "#Posts"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:53
-#: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:122
-#: View/Jobs/index.ctp:77
-#: 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_index.ctp:63
-#: View/Users/admin_view.ctp:8
-#: View/Users/registrations.ctp:61
-#: View/Users/view.ctp:4
-msgid "Email"
+#: View/Events/view.ctp:95
+msgid "Creator user"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:82;86;237
-#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/Events/eventIndexTable.ctp:79;223
+#: View/Elements/Users/userIndexTable.ctp:98
 #: 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:121
+#: View/Events/proposal_event_index.ctp:39;43
+#: View/Feeds/preview_index.ctp:69
+#: View/Noticelists/index.ctp:59
+#: View/ObjectTemplates/index.ctp:114
 #: View/Organisations/index.ctp:143
 #: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/index.ctp:103
-#: View/Servers/preview_index.ctp:174
-#: View/SharingGroups/index.ctp:91
-#: View/Taxonomies/index.ctp:49
-#: View/Warninglists/index.ctp:60
+#: View/Servers/index.ctp:96
+#: View/Servers/preview_index.ctp:170
+#: View/Users/admin_index.ctp:229
 msgid "View"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:157
+#: View/Elements/Events/eventIndexTable.ctp:145
 msgid " correlation(s). Show filtered event with correlation only."
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:175;180
+#: View/Elements/Events/eventIndexTable.ctp:161;166
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:185
+#: View/Elements/Events/eventIndexTable.ctp:171
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
+#: View/Elements/Events/eventIndexTable.ctp:212
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:212
 #: 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:227
+#: View/Elements/Events/eventIndexTable.ctp:213
 msgid "Not published"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
-#: View/Servers/index.ctp:183
-msgid "Are you sure you want to delete # %s?"
+#: View/Elements/Events/eventIndexTable.ctp:251
+msgid "Are you sure you want to delete #"
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:17
-msgid "Show "
-msgstr ""
-
-#: View/Elements/Events/View/attribute_correlations.ctp:17
-msgid " more..."
+msgid "Show %s more..."
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:53
-#: View/Events/view.ctp:399
+#: View/Events/view.ctp:391
 #: View/Feeds/preview_event.ctp:88
-#: View/Servers/preview_event.ctp:116
+#: View/Servers/preview_event.ctp:89
 msgid "Collapse…"
 msgstr ""
 
-#: View/Elements/Events/View/eventSightingValue.ctp:14
+#: View/Elements/Events/View/eventSightingValue.ctp:21
 msgid "- restricted to own organisation only."
 msgstr ""
 
-#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+#: View/Elements/Events/View/eventSightingValue.ctp:24;25
 msgid "Advanced Sightings"
 msgstr ""
 
-#: View/Elements/Events/View/related_event.ctp:26
-msgid "This related event contains %s unique correlation(s)"
-msgstr ""
+#: View/Elements/Events/View/related_event.ctp:27
+msgid "This related event contains %s unique correlation"
+msgid_plural "This related event contains %s unique correlations"
+msgstr[0] ""
+msgstr[1] ""
 
-#: View/Elements/Events/View/row_attribute.ctp:43
+#: View/Elements/Events/View/row_attribute.ctp:59
 msgid "Select attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:155
-#: View/Elements/Events/View/row_proposal.ctp:113
-#: View/Elements/Feeds/View/row_attribute.ctp:63
-#: View/Elements/Servers/View/row_attribute.ctp:70
-msgid "warning"
+#: View/Elements/Events/View/row_attribute.ctp:131
+msgid "Show hover enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:199;200
+#: View/Elements/Events/View/row_attribute.ctp:185;186
 #: View/Events/ajax/toggle_correlation.ctp:20
 msgid "Toggle correlation"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:326
+#: View/Elements/Events/View/row_attribute.ctp:216
+#: View/Events/view.ctp:410
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:120
+#: View/Feeds/view.ctp:31
+msgid "Provider"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:219
+msgid "Event UUIDs"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:307
 msgid "Toggle IDS flag"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:376
+#: View/Elements/Events/View/row_attribute.ctp:353
 msgid "Restore attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:377;417
+#: View/Elements/Events/View/row_attribute.ctp:354;394
 msgid "Permanently delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:384
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:384
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:389
+#: View/Elements/Events/View/row_attribute.ctp:366
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:389
+#: View/Elements/Events/View/row_attribute.ctp:366
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:393
+#: View/Elements/Events/View/row_attribute.ctp:370
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:394
+#: View/Elements/Events/View/row_attribute.ctp:371
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:404;409
+#: View/Elements/Events/View/row_attribute.ctp:381;386
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:409
+#: View/Elements/Events/View/row_attribute.ctp:386
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:421
+#: View/Elements/Events/View/row_attribute.ctp:398
 msgid "Soft-delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:68
-#: View/Elements/Feeds/View/row_object.ctp:19
-#: View/Events/resolved_misp_format.ctp:113
-msgid "Name: "
+#: View/Elements/Events/View/row_object.ctp:57
+msgid "Object name: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:69
+#: View/Elements/Events/View/row_object.ctp:58
 #: 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:20
@@ -8475,29 +10399,29 @@ msgstr ""
 #: View/Elements/Servers/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object_reference.ctp:7
 #: View/Elements/Servers/View/row_object_referenced_by.ctp:7
-#: View/Events/resolved_misp_format.ctp:114;135
+#: View/Events/resolved_misp_format.ctp:165;186
 msgid "Expand or Collapse"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:73
+#: View/Elements/Events/View/row_object.ctp:62
 msgid "Meta-category: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:74
+#: View/Elements/Events/View/row_object.ctp:63
 #: View/Elements/Feeds/View/row_object.ctp:24
 msgid "Description: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:75
+#: View/Elements/Events/View/row_object.ctp:64
 #: View/Elements/Feeds/View/row_object.ctp:25
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:139
+#: View/Elements/Events/View/row_object.ctp:129;139
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:139
+#: View/Elements/Events/View/row_object.ctp:129
 msgid "Soft delete object"
 msgstr ""
 
@@ -8507,7 +10431,7 @@ msgstr ""
 
 #: View/Elements/Events/View/row_object_reference.ctp:1
 #: View/Elements/Feeds/View/row_object_reference.ctp:1
-#: View/Events/resolved_misp_format.ctp:130
+#: View/Events/resolved_misp_format.ctp:181
 msgid "References: "
 msgstr ""
 
@@ -8516,7 +10440,7 @@ msgstr ""
 msgid "Add reference"
 msgstr ""
 
-#: View/Elements/Events/View/row_object_reference.ctp:51
+#: View/Elements/Events/View/row_object_reference.ctp:50
 msgid "Delete object reference"
 msgstr ""
 
@@ -8525,58 +10449,83 @@ msgstr ""
 msgid "Referenced by: "
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:41
+#: View/Elements/Events/View/row_proposal.ctp:40
 msgid "Select proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:194
-#: View/Elements/Events/View/row_proposal_delete.ctp:80
+#: View/Elements/Events/View/row_proposal.ctp:172
+#: View/Elements/Events/View/row_proposal_delete.ctp:76
 msgid "Accept Proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:194
-#: View/Elements/Events/View/row_proposal_delete.ctp:80
+#: View/Elements/Events/View/row_proposal.ctp:172
+#: View/Elements/Events/View/row_proposal_delete.ctp:76
 msgid "Accept proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:199
-#: View/Elements/Events/View/row_proposal_delete.ctp:85
+#: View/Elements/Events/View/row_proposal.ctp:177
+#: View/Elements/Events/View/row_proposal_delete.ctp:81
 msgid "Discard proposal"
 msgstr ""
 
-#: View/Elements/Events/View/sighting_field.ctp:12
+#: View/Elements/Events/View/row_proposal_delete.ctp:52
+msgid "DELETE"
+msgstr ""
+
+#: View/Elements/Events/View/sighting_field.ctp:30
 #: 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
+#: View/Elements/Events/View/sighting_field.ctp:31
 msgid "Mark as false-positive"
 msgstr ""
 
-#: View/Elements/Events/View/sighting_field.ctp:14
+#: View/Elements/Events/View/sighting_field.ctp:32
 msgid "Advanced sightings"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:52
-msgid "Cortex object"
+#: View/Elements/Events/View/value_field.ctp:51
+msgid "This file was not checked by AV scan. Do you really want to download it?"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:68
-msgid "Hexadecimal representation"
+#: View/Elements/Events/View/value_field.ctp:53
+msgid "According to AV scan, this file contains %s malware. Do you really want to download it?"
 msgstr ""
 
 #: View/Elements/Events/View/value_field.ctp:69
+msgid "This file contains malware %s"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:83
+msgid "Show more information about this vulnerability in external tool"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:94
+msgid "Show more information about this weakness in external tool"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:103
+msgid "Cortex object"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:124
+msgid "Hexadecimal representation"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:125
 msgid "Switch to binary representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:96
-msgid "Warning, this doesn't seem to be a legitimate "
+#: View/Elements/Events/View/value_field.ctp:168
+msgid "Warning, this doesn't seem to be a legitimate %s value"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:96
-msgid " value"
+#: View/Elements/Events/View/value_field.ctp:176
+#: View/Elements/Feeds/View/row_attribute.ctp:59
+msgid "warning"
 msgstr ""
 
 #: View/Elements/Feeds/View/feed_overlap_tool.ctp:9
@@ -8599,14 +10548,86 @@ msgstr ""
 msgid "Check coverage"
 msgstr ""
 
+#: View/Elements/Feeds/View/row_object.ctp:19
+#: View/Events/resolved_misp_format.ctp:164
+msgid "Name: "
+msgstr ""
+
 #: View/Elements/Feeds/View/row_object.ctp:23
 #: View/Elements/Servers/View/row_object.ctp:23
-#: View/ObjectTemplates/index.ctp:69
+#: View/ObjectTemplates/index.ctp:62
 #: View/ObjectTemplates/view.ctp:8
-#: View/Objects/revise_object.ctp:31
+#: View/Objects/revise_object.ctp:10
 msgid "Meta-category"
 msgstr ""
 
+#: View/Elements/GalaxyClusters/clusterElementUI.ctp:3
+msgid "Toggle Cluster Elements UI"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/clusterElementUI.ctp:10
+msgid "Edit Cluster's Elements"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/clusterElementUI.ctp:30
+msgid "Add Element"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/clusterElementUI.ctp:33
+msgid "Save changes"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:45
+msgid "This galaxy does not have any relationships."
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:426
+#: View/Events/view.ctp:504
+msgid "Galaxy"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:431;432
+msgid "Owner Org."
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:435;436
+msgid "Creator Org."
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:438
+msgid "Tag name"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:445
+#: View/Feeds/index.ctp:133
+#: View/GalaxyClusters/view.ctp:51
+#: View/Pages/doc/using_the_system.ctp:145
+#: View/Sightings/ajax/list_sightings.ctp:12
+#: View/Users/statistics_sightings.ctp:9
+msgid "Source"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:446
+#: View/Events/filter_event_index.ctp:133
+#: View/Feeds/index.ctp:150
+#: View/Users/admin_filter_user_index.ctp:70
+msgid "Target"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:460
+msgid "Numerical value: "
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:470
+msgid "Average value"
+msgstr ""
+
+#: View/Elements/Objects/object_add_attributes.ctp:40
+#: View/Elements/healthElements/diagnostics.ctp:208
+#: View/Taxonomies/index.ctp:67
+msgid "Required"
+msgstr ""
+
 #: View/Elements/Objects/object_similarities.ctp:76
 msgid "Update template and merge"
 msgstr ""
@@ -8651,40 +10672,36 @@ msgstr ""
 msgid "-- Select an option --"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:31;98
+#: View/Elements/Servers/eventattribute.ctp:28;92
 msgid "all"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:50
+#: View/Elements/Servers/eventattribute.ctp:47
 #: View/Elements/templateElements/templateRowAttribute.ctp:82
 #: View/Events/resolved_attributes.ctp:49
-#: View/Events/resolved_misp_format.ctp:95;290
-#: View/Feeds/freetext_index.ctp:34
-#: View/Objects/add.ctp:116
+#: View/Events/resolved_misp_format.ctp:146;341
+#: View/Feeds/freetext_index.ctp:30
+#: View/Objects/add.ctp:128
 #: 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:367
-#: View/Pages/doc/administration.ctp:56;228
-#: View/Servers/ajax/submoduleStatus.ctp:6
-msgid "Status"
-msgstr ""
-
-#: View/Elements/Servers/View/row_attribute.ctp:95
-#: View/Elements/Users/userIndexTable.ctp:66;67;70
+#: View/Elements/Servers/View/row_attribute.ctp:76
+#: View/Elements/Users/userIndexTable.ctp:70;71;74
 #: View/Elements/genericElements/key.ctp:2
+#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:6
+#: View/Elements/healthElements/diagnostics.ctp:400
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:243;250;257;278;285
+#: View/Events/automation.ctp:295;302;309;330;337
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
-#: View/Events/view.ctp:191
-#: View/GalaxyClusters/view.ctp:12
-#: View/Taxonomies/view.ctp:108;119;164
-#: View/Users/admin_view.ctp:95
+#: View/Events/view.ctp:184
+#: View/GalaxyClusters/view.ctp:56
+#: View/Servers/preview_event.ctp:47
+#: View/Taxonomies/view.ctp:97;108;153
+#: View/Users/view.ctp:105;110
 msgid "N/A"
 msgstr ""
 
@@ -8704,46 +10721,64 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
-#: View/Elements/TagCollections/index_row.ctp:45
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr ""
-
 #: View/Elements/TagCollections/index_row.ctp:51;52
 msgid "Download configuration"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:24
 #: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_edit.ctp:54
-#: View/Users/admin_index.ctp:56
-#: View/Users/admin_view.ctp:25
-#: View/Users/view.ctp:6
+#: View/Users/admin_edit.ctp:62
+#: View/Users/admin_index.ctp:75
+#: View/Users/view.ctp:17
 msgid "Role"
 msgstr ""
 
+#: View/Elements/Users/userIndexTable.ctp:10
+#: View/Users/admin_index.ctp:95
+msgid "Event alert"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:11
+#: View/Users/admin_index.ctp:102
+msgid "Contact alert"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:12
+#: View/Users/admin_index.ctp:109
+msgid "PGP Key"
+msgstr ""
+
 #: View/Elements/Users/userIndexTable.ctp:16
-msgid "Last login"
+#: View/Users/admin_add.ctp:62
+#: View/Users/admin_edit.ctp:65
+#: View/Users/admin_index.ctp:124
+#: View/Users/edit.ctp:21
+msgid "NIDS SID"
 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:71
-#: View/Users/admin_index.ctp:125
-msgid "Created"
+#: View/Users/admin_edit.ctp:81
+#: View/Users/view.ctp:76
+msgid "Terms accepted"
 msgstr ""
 
-#: View/Elements/Users/userIndexTable.ctp:88
-#: View/Users/admin_index.ctp:169
+#: View/Elements/Users/userIndexTable.ctp:18
+msgid "Last login"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:47
+#: View/Elements/genericElements/IndexTable/Fields/generic_field.ctp:26
+#: View/Users/view.ctp:32
+msgid "Reveal hidden value"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:92
+#: View/Users/admin_index.ctp:186
 msgid "Create new credentials and inform user"
 msgstr ""
 
-#: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
+#: View/Elements/Users/userIndexTable.ctp:95
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -8760,14 +10795,10 @@ msgid "Events published: "
 msgstr ""
 
 #: View/Elements/dashboard/dashboard_events.ctp:7
-#: View/Servers/index.ctp:107
+#: View/Servers/index.ctp:100
 msgid "Reset"
 msgstr ""
 
-#: View/Elements/dashboard/dashboard_notifications.ctp:2
-msgid "Notifications"
-msgstr ""
-
 #: View/Elements/dashboard/dashboard_notifications.ctp:4
 msgid "Proposals: "
 msgstr ""
@@ -8788,29 +10819,112 @@ msgstr ""
 msgid "Remove widget"
 msgstr ""
 
+#: View/Elements/dashboard/Widgets/Achievements.ctp:16
+msgid "Achievements Unlocked!"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/Achievements.ctp:18
+msgid "You don't have any achievement yet. Check them below to get started!"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/Achievements.ctp:29
+msgid "Next on your list:"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/Achievements.ctp:31
+msgid "Well done! You got them all."
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/Achievements.ctp:39
+msgid "Read more here"
+msgstr ""
+
 #: View/Elements/dashboard/Widgets/BarChart.ctp:38
 msgid "No data."
 msgstr ""
 
-#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Elements/genericElements/Form/genericForm.ctp:65
+#: View/GalaxyClusters/view_relations.ctp:106;119
+msgid "Picker"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:21
+msgid "Are you sure you want to delete %s %s (%s)?"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:24
+msgid "%s a %s propagates the deletion to other instances and lets you restore it in the future"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:24
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:6
+msgid "Soft-deleting"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:25
+msgid "%s a %s permanentaly deletes it"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:25
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:7
+msgid "Hard-deleting"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:37
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:15
+msgid "Soft-delete"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:43
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:21
+msgid "Hard-delete"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/pagination_links.ctp:5
+msgid "first"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/pagination_links.ctp:33
+msgid "last"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/action_toggle.ctp:34
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:41
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/action_toggle.ctp:46
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:54
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/action_toggle.ctp:49
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:57
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:63
 #: View/Feeds/add.ctp:213
 #: View/Feeds/edit.ctp:213
 msgid "Filter rules"
 msgstr ""
 
-#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:65
 #: View/Feeds/view.ctp:55
-#: View/Servers/index.ctp:120;121
+#: View/Servers/index.ctp:113;114
 msgid "Rules"
 msgstr ""
 
+#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:7
+msgid "Not applicable"
+msgstr ""
+
 #: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
-#: View/Servers/index.ctp:141
 msgid "Age: "
 msgstr ""
 
 #: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
-#: View/Servers/index.ctp:149
+#: View/Servers/index.ctp:142
 msgid "Not cached"
 msgstr ""
 
@@ -8818,6 +10932,56 @@ msgstr ""
 msgid "Cache feed"
 msgstr ""
 
+#: View/Elements/genericElements/IndexTable/Fields/checkbox_action.ctp:11
+msgid "%s toggle"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:17
+#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:17
+msgid "Indefinite"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:20
+#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:20
+msgid "Expired at %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:21
+#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:21
+msgid "Expired"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:25
+#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:25
+msgid "Will expire in %s day"
+msgid_plural "Will expire in %s days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: View/Elements/genericElements/IndexTable/Fields/galaxy_cluster_link.ctp:34
+msgid "Target galaxy cluster not found."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/galaxy_cluster_link.ctp:35
+msgid "Unkown cluster"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/in_out_counts.ctp:3;10
+msgid "This %s %s %s other %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/remote_status.ctp:9
+msgid "Object does not exist locally."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/remote_status.ctp:14
+msgid "Object exists locally."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/remote_status.ctp:18
+msgid "Object exists locally, but the following fields contain different information on the remote: %s"
+msgstr ""
+
 #: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
 #: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
 msgid "click here"
@@ -8847,538 +11011,618 @@ msgstr ""
 msgid "Feed not enabled"
 msgstr ""
 
-#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
-msgid "Could not retrieve current state."
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
-msgid "Field updated."
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
-msgid "Could not update field."
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17
 msgid "View Dashboard"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:29
 msgid "Import Config JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:37
 msgid "Export Config JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:45
 msgid "Save Dashboard Config"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:54
 msgid "List Dashboard Templates"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:70;147
 msgid "Populate From Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:75
 msgid "Enrichment Module Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:81
 msgid "Freetext Import Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:88
+#: View/ShadowAttributes/index.ctp:106
 msgid "View Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:93;1099;1399;1440
 msgid "View Correlation Graph"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:98
 msgid "View Event History"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:105
 #: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109
 msgid "Delete Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:110
+msgid "Are you sure you want to delete event #%s?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:119
 msgid "Add Object"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
 msgid "Add Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
-msgid "Populate from..."
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:133;424;425
+#: View/EventReports/ajax/indexForEvent.ctp:19
+msgid "Add Event Report"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:141
+msgid "Populate from…"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:155
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
-msgid "Merge attributes from..."
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:160
+msgid "Merge attributes from…"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:167
 msgid "Propose Attribute"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Publish (no email)"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:200
 msgid "Unpublish"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209
 msgid "Publish Sightings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:219
 msgid "Delegate Publishing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Discard Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:246
 msgid "Publish event to ZMQ"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:257
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:258
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:265
 msgid "Contact Reporter"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
-msgid "Download as..."
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:273;365
+msgid "Download as…"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296;301
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:308
 msgid "Export Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:314
 msgid "Import Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 msgid "Import from…"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
-msgid "List Regexp"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:404;994
+msgid "Blocklists Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
-msgid "New Regexp"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:419
+msgid "List Event Reports"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
-msgid "Perform on existing"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
-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:407
-msgid "Edit Regexp"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
-msgid "Delete Regexp"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
-msgid "View Warninglist"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
-msgid "Update Warninglists"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
-msgid "Are you sure you want to update all warninglists?"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:436
+msgid "View Event Report"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:441
-msgid "View Noticelist"
+msgid "Edit Event Report"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
-msgid "List Noticelist"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:453
+msgid "List Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
-msgid "Update Noticelists"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
-msgid "Do you wish to continue and update all noticelists?"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:458
+msgid "New Regexp"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:462
-msgid "List Whitelist"
+msgid "Perform on existing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
-msgid "New Whitelist"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:463
+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:470
+msgid "Edit Regexp"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:474
-msgid "Edit Whitelist"
+msgid "Delete Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
-msgid "Delete Whitelist"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475;564;741;870;941
+#: View/Servers/index.ctp:178
+msgid "Are you sure you want to delete #%s?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:484
+msgid "View Correlation Exclusion"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:495
+msgid "Add Correlation Exclusion"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "View Warninglist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Update Warninglists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:523
+msgid "View Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:529
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:534
+msgid "Update Noticelists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:535
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:547
+msgid "List Allowedlist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:552
+msgid "New Allowedlist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:559
+msgid "Edit Allowedlist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "Delete Allowedlist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:574
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580;586
 #: 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:499;697
-msgid "Reset Password"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:622;936
 msgid "View Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:634
 #: View/SharingGroups/edit.ctp:3
+#: View/SharingGroups/index.ctp:146
 msgid "Edit Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:639
+#: View/SharingGroups/index.ctp:135
 msgid "View Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690;723
 msgid "Explore Remote Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:699
 msgid "Explore Remote Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:711;1271
 msgid "Fetch This Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
-#: View/Feeds/preview_index.ctp:72
-#: View/Servers/preview_index.ctp:173
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:712;1272
+#: View/Feeds/preview_index.ctp:68
+#: View/Servers/preview_index.ctp:169
 msgid "Are you sure you want to fetch and save this event on your instance?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:731
 #: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:753
 msgid "New Servers"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 msgid "View community"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 msgid "Request E-mail"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:795
+msgid "List Cerebrates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:803
+msgid "View Cerebrate"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:810
+msgid "Edit Cerebrate"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:829
+#: View/Events/restore_deleted_events.ctp:48
+msgid "Restore Deleted Events"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:836
 msgid "View User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:844
+msgid "Reset Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:850
 msgid "Edit User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:855
 msgid "Delete User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:856
+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/genericElements/SideMenu/side_menu.ctp:864
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:869
 msgid "Delete Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:892
 msgid "Pending registrations"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 msgid "User settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "Add Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:923
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:940
 msgid "Delete Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
-#: View/Roles/admin_add.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:953
+#: View/Roles/admin_add.ctp:69
 msgid "Add Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
-msgid "Inbox"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1006
+msgid "Blocklists Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
-msgid "Blacklists Event"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
-msgid "Blacklists Organisation"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1033;1047
 msgid "View Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1038
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1052
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Threads"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "New Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1070
 msgid "List Favourite Tags"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1085
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1093;1112
 msgid "View Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1121
 msgid "Delete Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1129
 msgid "Update Taxonomies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1149
 msgid "View Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1155
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166
 msgid "Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "Force Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1176
 msgid "Import Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1181
 msgid "Add Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
-msgid "Decaying Tool"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1197
 msgid "View Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1203
 msgid "Edit Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1221
 msgid "Add Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1226
 msgid "Import Feeds from JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1232
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1237
 msgid "Export Feed settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1245
 msgid "Edit Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1250
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1256
 msgid "PreviewIndex"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1262
 msgid "PreviewEvent"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1281
 msgid "View News"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1286
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1291
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1307;1473
+msgid "List Cluster Blocklists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1320
 msgid "Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1321
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1326
 msgid "Force Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1327
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1334
+msgid "Import Galaxy Clusters"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1341
+msgid "Export Galaxy Clusters"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1349;1408;1429
 msgid "View Galaxy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1355;1435
 msgid "View Cluster"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1362
+msgid "Edit Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1369;1414
+msgid "Add Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1375
+msgid "Fork Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1390
+msgid "Unpublish Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1390;1457
+msgid "Publish Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1486
+msgid "Add Relationship"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1499
 msgid "Update Objects"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1505
 msgid "View Object Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1513
 #: View/Sightingdb/add.ctp:6
 msgid "Add SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1521
 msgid "Edit SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1526
 msgid "List SightingDB connections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu_post_link.ctp:26
-#: View/Errors/error403.ctp:4
-msgid "%s"
+#: View/Elements/genericElements/SingleViews/single_view.ctp:91
+msgid "%s view"
+msgstr ""
+
+#: View/Elements/genericElements/SingleViews/Fields/alignmentField.ctp:58
+msgid "Add organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SingleViews/Fields/alignmentField.ctp:58
+msgid "Add individual"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:4
@@ -9390,6 +11634,7 @@ msgid "Index diagnostic:"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:12
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63
 msgid "Notice"
 msgstr ""
 
@@ -9397,93 +11642,111 @@ msgstr ""
 msgid "The highlighted issues may be benign. if you are unsure, please open an issue and ask for clarification."
 msgstr ""
 
-#: View/Elements/healthElements/db_indexes_diagnostic.ctp:47
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:47;48
 msgid "Fix Database Index Schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:73
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:246
 msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:62
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:64
+msgid "An update is currently in progress."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:65
+msgid "You can check the current progress %s."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:65
+#: View/Events/automation.ctp:30
+#: View/Users/admin_index.ctp:6
+msgid "here"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:69
 msgid "The current database schema does not match the expected format."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:70;141
 msgid "Database schema diagnostic: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:68;74
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:75;81
 msgid "The MISP database state does not match the expected schema. Resolving these issues is recommended."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:69;75
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:76;82
 msgid "⚠ This diagnostic tool is in experimental state - the highlighted issues may be benign. If you are unsure, please open an issue on with the issues identified over at https://github.com/MISP/MISP for clarification."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:79
-msgid "Reveal benign deltas"
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:86
+msgid "Debug mode: Reveal benign deltas"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:87
+msgid "Most of the time, these benign deltas are artifacts coming from a different database version or RDBMS system used by this instance and thus, can be ignored."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
 msgid "Table name"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
 msgid "Expected schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
 msgid "Actual schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:127;128
 msgid "Fix Database schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:140
 msgid "The current database is correct"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
 msgid "Expected DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:155
 msgid "The current database version matches the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:156;161
 msgid "Actual DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:160
 msgid "The current database version does not match the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168
 msgid "Updates are locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;172
 msgid "Updates are not locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:171
 #: View/Servers/update_progress.ctp:32
 msgid "Updates are locked due to to many update fails"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:171
 msgid "Updates unlocked in %s"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:177;178
 msgid "DataSource: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:215
 msgid "Column diagnostic"
 msgstr ""
 
@@ -9513,447 +11776,524 @@ msgid "Outdated version"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:30
-msgid "Could not retrieve version from github"
+msgid "Could not retrieve version from GitHub"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:40
-msgid "Unable to fetch current commit id, check apache user read privilege."
+#: View/Elements/healthElements/diagnostics.ctp:39
+msgid "Unable to fetch current commit ID, check apache user read privilege."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:45
+#: View/Elements/healthElements/diagnostics.ctp:44
 msgid "Latest available version…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:52
+#: View/Elements/healthElements/diagnostics.ctp:49
 msgid "Status…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:59
+#: View/Elements/healthElements/diagnostics.ctp:52
 msgid "Current branch…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:57
 msgid "You are not on a branch, Update MISP will fail"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:68
-msgid "Pull the latest MISP version from github"
+#: View/Elements/healthElements/diagnostics.ctp:61
+msgid "Pull the latest MISP version from GitHub"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:61
 msgid "Update MISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:69
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Click the following button to go to the update progress page. This page lists all updates that are currently queued and executed."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:69
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "View Update Progress"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:71
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Submodules version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:72
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "Refresh submodules version."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:68
 msgid "Load all JSON into the database."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:76
+#: View/Elements/healthElements/diagnostics.ctp:69
 msgid "Load JSON into database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:79
+#: View/Elements/healthElements/diagnostics.ctp:72
 msgid "Writeable Directories and files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:80
+#: View/Elements/healthElements/diagnostics.ctp:73
 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:81
+#: View/Elements/healthElements/diagnostics.ctp:74
 msgid "Directories"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:88
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Directory "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:96
+#: View/Elements/healthElements/diagnostics.ctp:89
 msgid "Writeable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:103;117
+#: View/Elements/healthElements/diagnostics.ctp:96;110
 msgid "File "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:110
+#: View/Elements/healthElements/diagnostics.ctp:103
 msgid "Readable Files"
 msgstr ""
 
+#: View/Elements/healthElements/diagnostics.ctp:118
+msgid "Security Audit"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:120
+msgid "Congratulation, your instance pass all security checks."
+msgstr ""
+
 #: View/Elements/healthElements/diagnostics.ctp:125
+msgid "Area"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:126
+msgid "Level"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:127
+#: View/EventDelegations/index.ctp:82
+#: View/Events/automation.ctp:331;338
+#: 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/Elements/healthElements/diagnostics.ctp:140
+msgid "Hint"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:143
+msgid "More info"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:150
 msgid "PHP Settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:128;140
+#: View/Elements/healthElements/diagnostics.ctp:153;165
 msgid "Up to date"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:134
-#: View/Elements/healthElements/workers.ctp:83;85
-#: View/Organisations/view.ctp:26
-msgid "Unknown"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:136
+#: View/Elements/healthElements/diagnostics.ctp:161
 msgid "Issues determining version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:143;152
+#: View/Elements/healthElements/diagnostics.ctp:168;181
 msgid "Update highly recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:146;155
+#: View/Elements/healthElements/diagnostics.ctp:171;184
 msgid "Version unsupported, update ASAP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:159
+#: View/Elements/healthElements/diagnostics.ctp:176
+msgid "Version unsupported, 8.x support not available yet."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PHP ini path"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:189
 msgid "PHP Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:160;161
+#: View/Elements/healthElements/diagnostics.ctp:189;190
 msgid "recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:161
+#: View/Elements/healthElements/diagnostics.ctp:190
 msgid "PHP CLI Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:162
+#: View/Elements/healthElements/diagnostics.ctp:191
 msgid "Please note that the support for Python versions below 3.6 and below PHP 7.2 has been dropped as of 2020-01-01 and are henceforth considered unsupported. More info: "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:163
+#: View/Elements/healthElements/diagnostics.ctp:192
 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:170
+#: View/Elements/healthElements/diagnostics.ctp:199
 #: 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:174
+#: View/Elements/healthElements/diagnostics.ctp:203
 msgid "PHP Extensions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:184
-msgid "Not loaded"
+#: View/Elements/healthElements/diagnostics.ctp:207
+msgid "Extension"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
-msgid "Issues reading PHP settings. This could be due to the test script not being readable."
+#: View/Elements/healthElements/diagnostics.ctp:209
+msgid "Why to install"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:206
-msgid "Table"
+#: View/Elements/healthElements/diagnostics.ctp:210
+msgid "Web"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:211
-msgid "Used"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:217
-msgid "Reclaimable"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:223
-msgid "SQL database status"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:224
-msgid "Size of each individual table on disk, along with the size that can be freed via SQL optimize. Make sure that you always have at least 3x the size of the largest table in free space in order for the update scripts to work as expected."
+msgid "CLI"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:229
-msgid "Schema status"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:246
-msgid "Redis info"
+msgid "Version %s installed, but required at least %s"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:248
-msgid "PHP extension version"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:248
-msgid "Not installed."
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:250
-msgid "Redis version"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:251
-msgid "Memory allocator"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:252
-msgid "Memory usage"
+#: View/Elements/markdownEditor/markdownEditor.ctp:132
+msgid "Table"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:253
-msgid "Peak memory usage"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:254
-msgid "Total system memory"
+msgid "Used"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:259
+msgid "Reclaimable"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:265
+msgid "SQL database status"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:266
+msgid "Size of each individual table on disk, along with the size that can be freed via SQL optimize. Make sure that you always have at least 3x the size of the largest table in free space in order for the update scripts to work as expected."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:271
+msgid "Schema status"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:288
+msgid "Redis info"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:290
+msgid "PHP extension version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:290
+msgid "Not installed."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:292
+msgid "Redis version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:293
+msgid "Memory allocator"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:294
+msgid "Memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:295
+msgid "Peak memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:296
+msgid "Total system memory"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:301
 msgid "Advanced attachment handler"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:260
+#: View/Elements/healthElements/diagnostics.ctp:302
 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:265
+#: View/Elements/healthElements/diagnostics.ctp:307
 msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:265
+#: View/Elements/healthElements/diagnostics.ctp:307
 msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:277
+#: View/Elements/healthElements/diagnostics.ctp:319
+msgid "Attachment scan module"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:325
+msgid "Not available."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:329
 msgid "STIX and Cybox libraries"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:278
+#: View/Elements/healthElements/diagnostics.ctp:330
 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:279
+#: View/Elements/healthElements/diagnostics.ctp:331
 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:286
+#: View/Elements/healthElements/diagnostics.ctp:338
 msgid "Other versions might work but are not tested / recommended."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:295
+#: View/Elements/healthElements/diagnostics.ctp:347
 msgid "STIX and CyBox"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:295
+#: View/Elements/healthElements/diagnostics.ctp:347
 msgid "Could not read test script (stixtest.py)."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:309
+#: View/Elements/healthElements/diagnostics.ctp:361
 msgid " library version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:326
+#: View/Elements/healthElements/diagnostics.ctp:378
 msgid "Yara"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:327
+#: View/Elements/healthElements/diagnostics.ctp:379
 msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:334
+#: View/Elements/healthElements/diagnostics.ctp:386
 msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:336
+#: View/Elements/healthElements/diagnostics.ctp:388
 msgid "plyara library installed"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:340
+#: View/Elements/healthElements/diagnostics.ctp:392
 msgid "GnuPG"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:341
+#: View/Elements/healthElements/diagnostics.ctp:393
 msgid "This tool tests whether your GnuPG is set up correctly or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:349
+#: View/Elements/healthElements/diagnostics.ctp:398
 msgid "GnuPG installation and settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:352
+#: View/Elements/healthElements/diagnostics.ctp:400
+msgid "GnuPG version: %s"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:404
 msgid "ZeroMQ"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:353
+#: View/Elements/healthElements/diagnostics.ctp:405
 msgid "This tool tests whether the ZeroMQ extension is installed and functional."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:361
+#: View/Elements/healthElements/diagnostics.ctp:413
 msgid "ZeroMQ settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:365
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Start ZMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:365
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Start ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:365
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Start"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:366
+#: View/Elements/healthElements/diagnostics.ctp:418
 msgid "Stop ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:366
+#: View/Elements/healthElements/diagnostics.ctp:418
 msgid "Stop"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:367
+#: View/Elements/healthElements/diagnostics.ctp:419
 msgid "Check ZeroMQ service status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:369
+#: View/Elements/healthElements/diagnostics.ctp:421
 msgid "Proxy"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:422
 msgid "This tool tests whether your HTTP proxy settings are correct."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:378
+#: View/Elements/healthElements/diagnostics.ctp:430
 #: View/Pages/doc/administration.ctp:35
 msgid "Proxy settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:381
+#: View/Elements/healthElements/diagnostics.ctp:433
 msgid "Module System"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:382
+#: View/Elements/healthElements/diagnostics.ctp:434
 msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:397
+#: View/Elements/healthElements/diagnostics.ctp:449
 msgid " module system"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:403
+#: View/Elements/healthElements/diagnostics.ctp:455
 msgid "Session table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:404
+#: View/Elements/healthElements/diagnostics.ctp:456
 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:411
+#: View/Elements/healthElements/diagnostics.ctp:463
 msgid "Expired sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:417
+#: View/Elements/healthElements/diagnostics.ctp:469
 msgid "Purge sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:421
+#: View/Elements/healthElements/diagnostics.ctp:473
+msgid "Upgrade authkeys keys to the advanced keys format"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:476
+msgid "MISP can store the user API keys either in the clear directly attached to the users, or as of recently, it can generate a list of hashed keys for different purposes. If the latter feature is enabled, it might be useful to move all existing keys over to the new format so that users do not lose access to the system. In order to do so, run the following functionality."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:478
+msgid "Update Authkeys to advanced Authkeys"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:480
 msgid "Clean model cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:422
+#: View/Elements/healthElements/diagnostics.ctp:481
 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:423
+#: View/Elements/healthElements/diagnostics.ctp:482
 msgid "Clean cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:427
+#: View/Elements/healthElements/diagnostics.ctp:486
 msgid "Check for deprecated function usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:428
+#: View/Elements/healthElements/diagnostics.ctp:487
 msgid "In an effort to identify the usage of deprecated functionalities, MISP has started aggregating the count of access requests to these endpoints. Check the frequency of their use below along with the users to potentially warn about better ways of achieving their goals."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:431;432;434
+#: View/Elements/healthElements/diagnostics.ctp:490;491;493
 msgid "View deprecated endpoint usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:438;441
+#: View/Elements/healthElements/diagnostics.ctp:497;500
 msgid "Orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:439
+#: View/Elements/healthElements/diagnostics.ctp:498
 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:441;455
+#: View/Elements/healthElements/diagnostics.ctp:500;514
 msgid "Run the test below"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:443
+#: View/Elements/healthElements/diagnostics.ctp:502
 msgid "Check for orphaned attribute"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:443
+#: View/Elements/healthElements/diagnostics.ctp:502
 msgid "Check for orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:444
+#: View/Elements/healthElements/diagnostics.ctp:503
 msgid "Remove orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:445
+#: View/Elements/healthElements/diagnostics.ctp:504
 msgid "Remove published empty events"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:446;448
+#: View/Elements/healthElements/diagnostics.ctp:505;507
 #: View/Servers/ondemand_action.ctp:7
 msgid "Administrator On-demand Action"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:447
+#: View/Elements/healthElements/diagnostics.ctp:506
 msgid "Click the following button to go to the Administrator On-demand Action page."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:449;451
+#: View/Elements/healthElements/diagnostics.ctp:508;510
 msgid "Legacy Administrative Tools"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:450
+#: View/Elements/healthElements/diagnostics.ctp:509
 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:452
+#: View/Elements/healthElements/diagnostics.ctp:511
 msgid "Verify bad link on attachments"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:453
+#: View/Elements/healthElements/diagnostics.ctp:512
 msgid "Verify each attachment referenced in database is accessible on filesystem."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:455
+#: View/Elements/healthElements/diagnostics.ctp:514
 msgid "Non existing attachments referenced in Database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:457
+#: View/Elements/healthElements/diagnostics.ctp:516
 msgid "Check bad link on attachments"
 msgstr ""
 
+#: View/Elements/healthElements/diagnostics.ctp:517;519
+msgid "Recover deleted events"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:518
+msgid "Due to a bug introduced after 2.4.129, users could occasionally accidentally and unknowingly trigger event deletions. Use the tool below to display any events deleted during the timeframe when the bug was active and optionally recover individual events if you believe they were removed in error."
+msgstr ""
+
 #: View/Elements/healthElements/files.ctp:2
 msgid "Below you will find a list of the uploaded files based on type."
 msgstr ""
@@ -9979,18 +12319,14 @@ msgid "Size"
 msgstr ""
 
 #: View/Elements/healthElements/files.ctp:32
-#: View/Roles/admin_add.ctp:15
+#: View/Roles/admin_add.ctp:16
 #: View/Roles/admin_edit.ctp:15
-#: View/Roles/admin_index.ctp:25
-#: View/Roles/index.ctp:24
 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:90
-#: View/SharingGroups/index.ctp:89
+#: View/Regexp/admin_index.ctp:28
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
@@ -10139,16 +12475,6 @@ msgstr ""
 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/TagCollections/index.ctp:14
-#: View/UserSettings/index.ctp:56
-#: View/Users/admin_view.ctp:109
-#: View/Users/view.ctp:59
-msgid "User"
-msgstr ""
-
 #: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr ""
@@ -10193,6 +12519,205 @@ msgstr ""
 msgid "Restart dead workers"
 msgstr ""
 
+#: View/Elements/healthElements/workers.ctp:138
+msgid "Kill all workers"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:146
+msgid "Force kill all workers"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:151
+msgid "Are you sure you want to force kill all workers? This will issue a kill -9 and terminate any processing underway."
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:34
+msgid "Split Screen"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:39
+msgid "Markdown"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:43
+#: View/Galaxies/export.ctp:45
+msgid "Raw"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:50
+#: View/Objects/add.ctp:123
+msgid "Save"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:55
+msgid "Menu"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:67
+msgid "Download PDF (via print)"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:71
+msgid "Download Markdown"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:73
+msgid "Replace custom syntax by a valid one"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:75
+msgid "Download GFM simplified format"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:82
+msgid "Markdown parsing rules"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:87
+msgid "Image parsing"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:88;94
+#: View/Noticelists/index.ctp:29
+#: View/Pages/doc/using_the_system.ctp:371
+msgid "enabled"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:89;95
+#: View/Pages/doc/using_the_system.ctp:368
+msgid "disabled"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:93
+msgid "Link parsing"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:103
+msgid "Edit report"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:110
+msgid "Help"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:122
+msgid "Bold"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:123
+msgid "Italic"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:124
+msgid "Heading"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:125
+msgid "Strikethrough"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:127
+msgid "Unordered list"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:128
+msgid "Ordered list"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:141
+msgid "Last updated"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:143
+msgid "Toggle autocompletion while typing"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:149
+msgid "Synchronize scrolling"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:155
+msgid "Automatically render markdown when typing"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:161
+msgid "Toggle fullscreen mode"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:178
+msgid "You are about to save the document. Do you wish to proceed?"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:181
+msgid "In order to save the PDF, you have to set the print destination to `Save as PDF`."
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:182
+msgid "You are about to leave the page with unsaved changes. Do you want to proceed?"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:183
+msgid "Unsaved changes"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:27
+msgid "Command"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:27
+#: View/Events/recover_event.ctp:15
+#: View/Pages/doc/administration.ctp:133;184;197
+#: View/Pages/doc/using_the_system.ctp:269
+#: View/Servers/ondemand_action.ctp:3
+#: View/Servers/ajax/submoduleStatus.ctp:7
+#: View/Taxonomies/view.ctp:69
+msgid "Action"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:29
+msgid "Triggers autocomplete if applicable"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:30
+msgid "Makes text bold"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:31
+msgid "Makes text italic"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:32
+msgid "Insert a MISP Element"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:33
+msgid "Makes text as header"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:39;51
+msgid "Editor shortcuts"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:40
+msgid "Markdown plugin"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:59
+msgid "Markdown plugins"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:60
+msgid "Highlighted language"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:61
+msgid "Languages rendered in code block can be highlighted using the %s plugin. The list of supported languages can be found %s."
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:71
+msgid "Markdown viewer help"
+msgstr ""
+
 #: View/Elements/serverRuleElements/pull.ctp:3
 msgid "Set pull rules"
 msgstr ""
@@ -10292,6 +12817,7 @@ msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:68
 #: View/Elements/serverRuleElements/push.ctp:67
+#: View/GalaxyClusters/update_cluster.ctp:112
 msgid "Update"
 msgstr ""
 
@@ -10333,10 +12859,6 @@ msgstr ""
 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
@@ -10348,8 +12870,8 @@ msgid "Template ID"
 msgstr ""
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:26
-#: View/SharingGroups/view.ctp:23
+#: View/Organisations/view.ctp:30
+#: View/SharingGroups/view.ctp:13
 msgid "Created by"
 msgstr ""
 
@@ -10369,7 +12891,7 @@ msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
 #: View/ObjectReferences/ajax/add.ctp:86
-#: View/Objects/revise_object.ctp:62
+#: View/Objects/revise_object.ctp:52
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
 msgid "Attribute"
@@ -10420,23 +12942,27 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: View/Errors/error400.ctp:33
+#: View/Errors/error400.ctp:25
 msgid "You have tripped the cross-site request forgery protection of MISP"
 msgstr ""
 
-#: View/Errors/error400.ctp:35
+#: View/Errors/error400.ctp:27
 msgid "CSRF error"
 msgstr ""
 
-#: View/Errors/error400.ctp:36
+#: View/Errors/error400.ctp:28
 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
+#: View/Errors/error400.ctp:31
 msgid "Alternatively, click <a href=\"%s\">here</a> to continue to the start page."
 msgstr ""
 
-#: View/Errors/missing_connection.ctp:1
+#: View/Errors/error403.ctp:5
+msgid "%s"
+msgstr ""
+
+#: View/Errors/missing_connection.ctp:2
 #: View/Errors/missing_datasource_config.ctp:1
 msgid "Missing Database Connection"
 msgstr ""
@@ -10445,73 +12971,74 @@ msgstr ""
 msgid "PDO error"
 msgstr ""
 
-#: View/EventBlacklists/add.ctp:4
-msgid "Add Event Blacklist Entries"
+#: View/EventBlocklists/add.ctp:4
+msgid "Add Event Blocklist Entries"
 msgstr ""
 
-#: View/EventBlacklists/add.ctp:5
+#: View/EventBlocklists/add.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:9
-#: View/EventBlacklists/edit.ctp:9
-#: View/OrgBlacklists/add.ctp:9
-#: View/OrgBlacklists/edit.ctp:9
+#: View/EventBlocklists/add.ctp:9
+#: View/EventBlocklists/edit.ctp:9
+#: View/OrgBlocklists/add.ctp:10
+#: View/OrgBlocklists/edit.ctp:8
 msgid "UUIDs"
 msgstr ""
 
-#: View/EventBlacklists/add.ctp:12
-#: View/OrgBlacklists/add.ctp:12
+#: View/EventBlocklists/add.ctp:12
+#: View/GalaxyClusterBlocklists/add.ctp:3
+#: View/OrgBlocklists/add.ctp:13
 msgid "Enter a single or a list of UUIDs"
 msgstr ""
 
-#: View/EventBlacklists/add.ctp:18
+#: View/EventBlocklists/add.ctp:18
+#: View/GalaxyClusterBlocklists/add.ctp:4
 msgid "(Optional) The organisation that the event is associated with"
 msgstr ""
 
-#: View/EventBlacklists/add.ctp:25
+#: View/EventBlocklists/add.ctp:25
 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:31
-#: View/OrgBlacklists/add.ctp:24
+#: View/EventBlocklists/add.ctp:31
+#: View/OrgBlocklists/add.ctp:25
 msgid "(Optional) Any comments you would like to add regarding this (or these) entries."
 msgstr ""
 
-#: View/EventBlacklists/edit.ctp:4
-#: View/OrgBlacklists/edit.ctp:4
-msgid "Edit Event Blacklist Entries"
+#: View/EventBlocklists/edit.ctp:4
+msgid "Edit Event Blocklist Entries"
 msgstr ""
 
-#: View/EventBlacklists/edit.ctp:5
-#: View/OrgBlacklists/edit.ctp:5
+#: View/EventBlocklists/edit.ctp:5
 msgid "List of all the event UUIDs that you wish to block from being entered."
 msgstr ""
 
-#: View/EventBlacklists/edit.ctp:18
-#: View/OrgBlacklists/edit.ctp:18
+#: View/EventBlocklists/edit.ctp:18
+#: View/GalaxyClusterBlocklists/add.ctp:26
+#: View/OrgBlocklists/edit.ctp:17
 msgid "Creating organisation"
 msgstr ""
 
-#: View/EventBlacklists/index.ctp:2
-msgid "Event Blacklists"
+#: View/EventBlocklists/index.ctp:2
+msgid "Event Blocklists"
 msgstr ""
 
-#: View/EventBlacklists/index.ctp:51
-#: View/Events/resolved_misp_format.ctp:39
+#: View/EventBlocklists/index.ctp:44
+#: View/Events/resolved_misp_format.ctp:40
 msgid "Event UUID"
 msgstr ""
 
-#: View/EventBlacklists/index.ctp:70
-msgid "Are you sure you want to delete the blacklist entry for the event UUID %s?"
+#: View/EventBlocklists/index.ctp:63
+msgid "Are you sure you want to delete the blocklist entry for the event UUID %s?"
 msgstr ""
 
-#: View/EventBlacklists/mass_delete.ctp:10
-msgid "Delete blacklisted events"
+#: View/EventBlocklists/mass_delete.ctp:10
+msgid "Delete blocklisted events"
 msgstr ""
 
-#: View/EventBlacklists/mass_delete.ctp:12
-msgid "Are you sure you want to delete from the blacklist the selected events?"
+#: View/EventBlocklists/mass_delete.ctp:12
+msgid "Are you sure you want to delete from the blocklist the selected events?"
 msgstr ""
 
 #: View/EventDelegations/index.ctp:30
@@ -10531,21 +13058,11 @@ msgstr ""
 msgid "Recipient"
 msgstr ""
 
-#: View/EventDelegations/index.ctp:82
-#: View/Events/automation.ctp:279;286
-#: 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/EventDelegations/index.ctp:86
 msgid "Delegation index"
 msgstr ""
 
 #: View/EventDelegations/index.ctp:87
-#: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 
@@ -10623,13 +13140,7 @@ 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 ""
 
@@ -10638,11 +13149,6 @@ 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 ""
 
@@ -10662,16 +13168,135 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
+#: View/EventReports/add.ctp:6
+msgid "Add Event Report for Event #%s"
+msgstr ""
+
+#: View/EventReports/add.ctp:6
+msgid "Edit Event Report %s (event #%s)"
+msgstr ""
+
+#: View/EventReports/index.ctp:44
+msgid "Event Reports %s"
+msgstr ""
+
+#: View/EventReports/index.ctp:44
+msgid "for Event %s"
+msgstr ""
+
+#: View/EventReports/index.ctp:60
+#: View/EventReports/ajax/indexForEvent.ctp:82
+#: View/Events/resolved_misp_format.ctp:36
+#: View/Events/view.ctp:23
+#: View/Servers/preview_event.ctp:3
+#: View/ShadowAttributes/index.ctp:40
+#: View/Sightings/ajax/list_sightings.ctp:13
+msgid "Event ID"
+msgstr ""
+
+#: View/EventReports/index.ctp:67
+#: View/EventReports/view.ctp:23
+#: View/EventReports/ajax/indexForEvent.ctp:90
+msgid "Last update"
+msgstr ""
+
+#: View/EventReports/index.ctp:115
+#: View/EventReports/ajax/indexForEvent.ctp:131
+msgid "Restore report"
+msgstr ""
+
+#: View/EventReports/index.ctp:120
+#: View/EventReports/ajax/indexForEvent.ctp:136
+msgid "Are you sure you want to restore the Report?"
+msgstr ""
+
+#: View/EventReports/view_summary.ctp:3
+msgid "Event report: %s"
+msgstr ""
+
+#: View/EventReports/ajax/delete.ctp:3
+msgid "Delete Event Report"
+msgstr ""
+
+#: View/EventReports/ajax/delete.ctp:4
+msgid "report"
+msgstr ""
+
+#: View/EventReports/ajax/extractAllFromReport.ctp:6
+msgid "Automatic entities extraction"
+msgstr ""
+
+#: View/EventReports/ajax/extractAllFromReport.ctp:7
+msgid "Automatically extracting entities from a report will use the freetext import tools to extract and create attributes from the report."
+msgstr ""
+
+#: View/EventReports/ajax/extractAllFromReport.ctp:10
+msgid "Post extraction actions:"
+msgstr ""
+
+#: View/EventReports/ajax/extractAllFromReport.ctp:12
+msgid "Tag the event with contextual elements found in the report"
+msgstr ""
+
+#: View/EventReports/ajax/importReportFromUrl.ctp:5
+msgid "Import from URL (event %s)"
+msgstr ""
+
+#: View/EventReports/ajax/importReportFromUrl.ctp:13
+#: View/EventReports/ajax/indexForEvent.ctp:28
+msgid "Content for this URL will be downloaded and converted to Markdown"
+msgstr ""
+
+#: View/EventReports/ajax/indexForEvent.ctp:3
+msgid "Viewing reports in extended event view"
+msgstr ""
+
+#: View/EventReports/ajax/indexForEvent.ctp:27
+msgid "Import from URL"
+msgstr ""
+
+#: View/EventReports/ajax/indexForEvent.ctp:36
+msgid "Generate report from Event"
+msgstr ""
+
+#: View/EventReports/ajax/indexForEvent.ctp:37
+msgid "Based on filters, create a report summarizing the event"
+msgstr ""
+
+#: View/EventReports/ajax/indexForEvent.ctp:195
+msgid "Failed to load Event report table"
+msgstr ""
+
+#: View/EventReports/ajax/replaceSuggestionInReport.ctp:5
+msgid "Replace suggestions in report"
+msgstr ""
+
+#: View/EventReports/ajax/reportFromEvent.ctp:5
+msgid "Create report from event"
+msgstr ""
+
+#: View/EventReports/ajax/reportFromEvent.ctp:6
+msgid "Generate a report based on filtering criterias."
+msgstr ""
+
+#: View/EventReports/ajax/reportFromEvent.ctp:14
+msgid "REST search filters"
+msgstr ""
+
+#: View/EventReports/ajax/reportFromEvent.ctp:15
+msgid "Provide the filtering criterias for attributes to be taken into account in the report"
+msgstr ""
+
 #: View/Events/add.ctp:39
-#: View/Events/view.ctp:148
+#: View/Events/view.ctp:121
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
-#: View/Servers/preview_event.ctp:41
+#: View/Servers/preview_event.ctp:22
 msgid "Threat Level"
 msgstr ""
 
 #: View/Events/add.ctp:49
-#: View/ShadowAttributes/index.ctp:59
+#: View/Events/restore_deleted_events.ctp:14
 msgid "Event Info"
 msgstr ""
 
@@ -10721,7 +13346,7 @@ msgid "Details"
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:115
+#: View/Jobs/index.ctp:108
 msgid "Failed"
 msgstr ""
 
@@ -10734,703 +13359,774 @@ msgid "Event with this UUID already exists."
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:112
+#: View/Servers/preview_index.ctp:108
 msgid "Event "
 msgstr ""
 
-#: View/Events/automation.ctp:3
+#: View/Events/automation.ctp:6
 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:5
-msgid "You can use the <a href=\"/servers/rest\">REST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
+#: View/Events/automation.ctp:8
+msgid "You can use the <a href=\""
 msgstr ""
 
-#: View/Events/automation.ctp:6
+#: View/Events/automation.ctp:9
 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
-msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
-msgstr ""
-
-#: View/Events/automation.ctp:11
-msgid "Your current key is: <code>%s</code>. You can %s this key."
+#: View/Events/automation.ctp:10
+msgid "To view the old MISP automation page, click <a href=\""
 msgstr ""
 
 #: View/Events/automation.ctp:15
+msgid "Your current key is: <code>%s</code>. You can %s this key."
+msgstr ""
+
+#: View/Events/automation.ctp:19
 #: View/Events/legacy_automation.ctp:8
-#: View/Users/admin_view.ctp:37
-#: View/Users/view.ctp:20
+#: View/Users/view.ctp:35
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:26
+#: View/Events/automation.ctp:25
+msgid "You can view and manage your API keys under your profile, found %s"
+msgstr ""
+
+#: View/Events/automation.ctp:40
 #: 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:27
+#: View/Events/automation.ctp:41
 #: 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:28
+#: View/Events/automation.ctp:42
 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:31
+#: View/Events/automation.ctp:45
 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:32
+#: View/Events/automation.ctp:46
 msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr ""
 
-#: View/Events/automation.ctp:33
+#: View/Events/automation.ctp:47;112
 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:34
+#: View/Events/automation.ctp:48
 #: View/Events/legacy_automation.ctp:268;297
 msgid "Search for the given value in the attributes' value field."
 msgstr ""
 
-#: View/Events/automation.ctp:35
+#: View/Events/automation.ctp:49
 #: 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:36
+#: View/Events/automation.ctp:50
 #: View/Events/legacy_automation.ctp:61;270;299
 msgid "The attribute category, any valid MISP attribute category is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:37
+#: View/Events/automation.ctp:51
 #: View/Events/legacy_automation.ctp:271;300
 msgid "Search by the creator organisation by supplying the organisation identifier."
 msgstr ""
 
-#: View/Events/automation.ctp:38
+#: View/Events/automation.ctp:52
 #: 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:39
+#: View/Events/automation.ctp:53
 #: 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:40;160
+#: View/Events/automation.ctp:54;212
 #: 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:41;161
+#: View/Events/automation.ctp:55;213
 #: 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:42
+#: View/Events/automation.ctp:56
 #: View/Events/legacy_automation.ctp:282;307
 msgid "The events that should be included / excluded from the search"
 msgstr ""
 
-#: View/Events/automation.ctp:43
+#: View/Events/automation.ctp:57
 #: 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:44
+#: View/Events/automation.ctp:58
 #: 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:45
+#: View/Events/automation.ctp:59
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
-#: View/Events/automation.ctp:46
+#: View/Events/automation.ctp:60
 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:47
+#: View/Events/automation.ctp:61
 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:48
+#: View/Events/automation.ctp:62
 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:49
+#: View/Events/automation.ctp:63
 #: 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:50
+#: View/Events/automation.ctp:64
 #: 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:51
+#: View/Events/automation.ctp:65
 #: 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:52
+#: View/Events/automation.ctp:66
 #: 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:53
+#: View/Events/automation.ctp:67
 #: 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:54
+#: View/Events/automation.ctp:68
 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:55
+#: View/Events/automation.ctp:69
 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:56
+#: View/Events/automation.ctp:70
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:57
+#: View/Events/automation.ctp:71
 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:58
+#: View/Events/automation.ctp:72
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:71
+#: View/Events/automation.ctp:85
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:104
+msgid "Galaxy Cluster Search"
+msgstr ""
+
+#: View/Events/automation.ctp:106
+msgid "It is possible to search the database for galaxy clustesrs based on a list of criteria."
+msgstr ""
+
+#: View/Events/automation.ctp:107
+msgid "To return an cluster or a list of clusters in the JSON format, use the following syntax"
+msgstr ""
+
+#: View/Events/automation.ctp:108
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive"
+msgstr ""
+
+#: View/Events/automation.ctp:111
+msgid "Limit the number of results returned, depending on the scope (for example 10 clusters)."
+msgstr ""
+
+#: View/Events/automation.ctp:113
+msgid "Specify the exact local ID the be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:114
+msgid "Specify the exact local UUID the be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:115
+msgid "Specify the exact local ID of the galaxy containing all the clusters the be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:116
+msgid "Specify the exact local UUID of the galaxy containing all the clusters the be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:117
+msgid "Specify the publication state of the clusters to be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:118
+msgid "Specify the value of the clusters to be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:119
+msgid "Specify the UUID of the cluster that was forked by the returned clusters"
+msgstr ""
+
+#: View/Events/automation.ctp:120
+msgid "Specify the version of the cluster that was forked by the returned clusters"
+msgstr ""
+
+#: View/Events/automation.ctp:121
+msgid "Specify the version to be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:122
+msgid "Specify the distribution to be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:123
+msgid "Specify the org_id to get all clusters belonging to this organisation."
+msgstr ""
+
+#: View/Events/automation.ctp:124
+msgid "Specify the orgc_id to get all clusters that were created by this organisation."
+msgstr ""
+
+#: View/Events/automation.ctp:125
+msgid "Specify the tag name of the cluster to be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:126
+msgid "Specify if custom, default or both clusters should be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:127
+msgid "Only return the UUID and the version of the returned clusters"
+msgstr ""
+
+#: View/Events/automation.ctp:140
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:90
+#: View/Events/automation.ctp:142
 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:91
+#: View/Events/automation.ctp:143
 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:92
+#: View/Events/automation.ctp:144
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:95
+#: View/Events/automation.ctp:147
 msgid "URL parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:98
+#: View/Events/automation.ctp:150
 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:100
+#: View/Events/automation.ctp:152
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:103
+#: View/Events/automation.ctp:155
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:104
+#: View/Events/automation.ctp:156
 #: 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:107
+#: View/Events/automation.ctp:159
 #: 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:111
+#: View/Events/automation.ctp:163
 #: 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:113
+#: View/Events/automation.ctp:165
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:117
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:118
+#: View/Events/automation.ctp:170
 #: 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:119
+#: View/Events/automation.ctp:171
 #: 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:125
+#: View/Events/automation.ctp:177
 #: 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:128
+#: View/Events/automation.ctp:180
 #: 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:146
+#: View/Events/automation.ctp:198
 #: 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:148
+#: View/Events/automation.ctp:200
 #: 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:155
+#: View/Events/automation.ctp:207
 #: 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:158
+#: View/Events/automation.ctp:210
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:159
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:162
+#: View/Events/automation.ctp:214
 #: 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:163
+#: View/Events/automation.ctp:215
 #: 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:165
+#: View/Events/automation.ctp:217
 #: 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:166
+#: View/Events/automation.ctp:218
 #: 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:169
+#: View/Events/automation.ctp:221
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:170
+#: View/Events/automation.ctp:222
 #: 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:172
+#: View/Events/automation.ctp:224
 #: 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:177
+#: View/Events/automation.ctp:229
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:178
+#: View/Events/automation.ctp:230
 #: 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:180
+#: View/Events/automation.ctp:232
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:181
+#: View/Events/automation.ctp:233
 #: 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:182
+#: View/Events/automation.ctp:234
 #: 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:183
+#: View/Events/automation.ctp:235
 #: 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:185
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:241
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:193
+#: View/Events/automation.ctp:245
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:194
+#: View/Events/automation.ctp:246
 #: 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:195
+#: View/Events/automation.ctp:247
 #: 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:196
+#: View/Events/automation.ctp:248
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:197
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:199
+#: View/Events/automation.ctp:251
 #: 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:200
+#: View/Events/automation.ctp:252
 #: 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:201
+#: View/Events/automation.ctp:253
 #: 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:202
+#: View/Events/automation.ctp:254
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:264
 #: 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:213
+#: View/Events/automation.ctp:265
 #: 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:214
+#: View/Events/automation.ctp:266
 #: 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:215
+#: View/Events/automation.ctp:267
 #: 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:216
+#: View/Events/automation.ctp:268
 #: 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:217
+#: View/Events/automation.ctp:269
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:218
+#: View/Events/automation.ctp:270
 #: 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:219
+#: View/Events/automation.ctp:271
 #: 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:220
+#: View/Events/automation.ctp:272
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:221
+#: View/Events/automation.ctp:273
 #: 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:224
+#: View/Events/automation.ctp:276
 #: 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:226
+#: View/Events/automation.ctp:278
 #: 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:228
+#: View/Events/automation.ctp:280
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:229
+#: View/Events/automation.ctp:281
 #: 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:233
+#: View/Events/automation.ctp:285
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:234
-#: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:53
-#: View/Feeds/edit.ctp:84
-#: View/Feeds/index.ctp:138
-#: View/Feeds/view.ctp:5
-#: 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:235
+#: View/Events/automation.ctp:287
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:236
+#: View/Events/automation.ctp:288
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:237
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:397
-#: View/Servers/rest.ctp:161
+#: View/Servers/rest.ctp:162
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:294
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:244;264;265;271;272
+#: View/Events/automation.ctp:296;316;317;323;324
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:249
+#: View/Events/automation.ctp:301
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:251;258
+#: View/Events/automation.ctp:303;310
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:256
+#: View/Events/automation.ctp:308
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:263
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:270
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:277
+#: View/Events/automation.ctp:329
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:336
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:289
+#: View/Events/automation.ctp:341
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:294
+#: View/Events/automation.ctp:346
 #: 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:296
+#: View/Events/automation.ctp:348
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:297
+#: View/Events/automation.ctp:349
 #: 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:301
+#: View/Events/automation.ctp:353
 #: 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:312
+#: View/Events/automation.ctp:364
 #: 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:313
+#: View/Events/automation.ctp:365
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:366
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:315
+#: View/Events/automation.ctp:367
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:316
+#: View/Events/automation.ctp:368
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:317
+#: View/Events/automation.ctp:369
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:318
+#: View/Events/automation.ctp:370
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:319
+#: View/Events/automation.ctp:371
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:372
 #: 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:321
+#: View/Events/automation.ctp:373
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:322
+#: View/Events/automation.ctp:374
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:323
+#: View/Events/automation.ctp:375
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:324
+#: View/Events/automation.ctp:376
 #: 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:325
+#: View/Events/automation.ctp:377
 #: 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:328
+#: View/Events/automation.ctp:380
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:382
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:331
+#: View/Events/automation.ctp:383
 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:332
+#: View/Events/automation.ctp:384
 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:333
+#: View/Events/automation.ctp:385
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:395
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:397
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:346
+#: View/Events/automation.ctp:398
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:347
+#: View/Events/automation.ctp:399
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:348
+#: View/Events/automation.ctp:400
 msgid "Get worker info"
 msgstr ""
 
-#: View/Events/contact.ctp:8
-msgid "Contact organization reporting event "
+#: View/Events/contact.ctp:4
+msgid "Contact organization reporting event %s"
 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."
+#: View/Events/contact.ctp:5
+msgid "You are about to contact the organization %s 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
+#: View/Events/contact.ctp:17
 msgid "Submit only to the person that created the event"
 msgstr ""
 
@@ -11477,21 +14173,17 @@ msgid "Loading…"
 msgstr ""
 
 #: View/Events/export.ctp:78
-#: View/Jobs/index.ctp:122
+#: View/Jobs/index.ctp:115
 msgid "Queued"
 msgstr ""
 
 #: View/Events/export.ctp:83
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:7;127
+#: View/Jobs/index.ctp:7;120
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr ""
 
-#: View/Events/export.ctp:115;144
-msgid "Download"
-msgstr ""
-
 #: View/Events/export.ctp:125
 msgid "Generate"
 msgstr ""
@@ -11598,12 +14290,6 @@ msgstr ""
 msgid "Ongoing"
 msgstr ""
 
-#: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:149
-#: View/Users/admin_filter_user_index.ctp:70
-msgid "Target"
-msgstr ""
-
 #: View/Events/filter_event_index.ctp:145
 msgid "Delete filter"
 msgstr ""
@@ -11637,52 +14323,86 @@ msgstr ""
 msgid "Paste a list of IOCs into the field below for automatic detection."
 msgstr ""
 
+#: View/Events/get_event_info_by_id.ctp:2
+msgid "Matched event"
+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."
+#: View/Events/get_event_info_by_id.ctp:7
+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:99
+#: View/Events/get_event_info_by_id.ctp:13
+#: View/Events/view.ctp:147
+#: View/Feeds/preview_event.ctp:37
+#: View/Pages/doc/using_the_system.ctp:70;177;210
+#: View/Servers/preview_event.ctp:28
+msgid "Analysis"
+msgstr ""
+
+#: View/Events/get_event_info_by_id.ctp:14
+msgid "Threat level"
+msgstr ""
+
+#: View/Events/get_event_info_by_id.ctp:16
+#: View/Events/view.ctp:177
+#: View/Feeds/preview_event.ctp:42
+#: View/Pages/doc/using_the_system.ctp:185;212
+#: View/Servers/id_translator.ctp:46
+#: View/Servers/preview_event.ctp:40
+msgid "Info"
+msgstr ""
+
+#: View/Events/import_module.ctp:72
+msgid "File upload"
+msgstr ""
+
+#: View/Events/import_module.ctp:75
+msgid "Paste Input"
+msgstr ""
+
+#: View/Events/import_module.ctp:90
 msgid "Input File"
 msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:14
-#: View/Organisations/view.ctp:66;67
+#: View/GalaxyClusters/view.ctp:70
+#: View/Organisations/view.ctp:69;70
+#: View/SharingGroups/view.ctp:25
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:35
 msgid "Events"
 msgstr ""
 
-#: View/Events/index.ctp:34
-#: View/Logs/admin_index.ctp:54
-#: View/Servers/preview_index.ctp:37
+#: View/Events/index.ctp:29
+#: View/Logs/admin_index.ctp:47
+#: View/Servers/preview_index.ctp:33
 #: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr ""
 
-#: View/Events/index.ctp:45
+#: View/Events/index.ctp:40
 msgid "Delete selected Events"
 msgstr ""
 
-#: View/Events/index.ctp:73
+#: View/Events/index.ctp:68
 msgid "My events only"
 msgstr ""
 
-#: View/Events/index.ctp:74
+#: View/Events/index.ctp:69
 msgid "My Events"
 msgstr ""
 
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:77
 msgid "My organisation's events only"
 msgstr ""
 
-#: View/Events/index.ctp:83
+#: View/Events/index.ctp:78
 msgid "Org Events"
 msgstr ""
 
@@ -12006,39 +14726,70 @@ msgstr ""
 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 - WARNING: this feature is very outdated and should not be used anymore."
+#: View/Events/merge.ctp:5
+msgid "Merge data from event"
 msgstr ""
 
-#: View/Events/merge.ctp:9
-msgid "Event id to copy the attributes from"
+#: View/Events/merge.ctp:6
+msgid "Merge all objects, attributes and their respective tags from the selected event into event #%s"
 msgstr ""
 
-#: View/Events/merge.ctp:20
-msgid "copy only IDS attributes"
+#: View/Events/merge.ctp:13
+msgid "Source event ID or UUID"
 msgstr ""
 
-#: View/Events/merge.ctp:26
-#: View/Organisations/ajax/merge.ctp:70
-msgid "Merge"
+#: View/Events/merge.ctp:14
+msgid "ID or UUID of the event to merge from"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:2
 msgid "Event with proposals"
 msgstr ""
 
-#: View/Events/proposal_event_index.ctp:24
+#: View/Events/proposal_event_index.ctp:18
 #: View/Pages/doc/concepts.ctp:28
-#: View/ShadowAttributes/index.ctp:2
+#: View/ShadowAttributes/index.ctp:99
 msgid "Proposals"
 msgstr ""
 
-#: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:116
+#: View/Events/proposal_event_index.ctp:19
+#: View/Events/view.ctp:89
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr ""
 
+#: View/Events/proposal_event_index.ctp:21
+#: View/Jobs/index.ctp:70
+#: 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_index.ctp:82
+#: View/Users/registrations.ctp:61
+#: View/Users/view.ctp:5
+msgid "Email"
+msgstr ""
+
+#: View/Events/recover_event.ctp:3
+msgid "Return to the event restoration index"
+msgstr ""
+
+#: View/Events/recover_event.ctp:10
+#: View/Pages/doc/using_the_system.ctp:270
+msgid "Model"
+msgstr ""
+
+#: View/Events/recover_event.ctp:20
+msgid "Data"
+msgstr ""
+
+#: View/Events/recover_event.ctp:26
+msgid "Recovery process log"
+msgstr ""
+
+#: View/Events/recover_event.ctp:27
+msgid "Below is a list of actions the recovery process would take in order to restore the event."
+msgstr ""
+
 #: View/Events/report_validation_issues_events.ctp:2
 msgid "Listing invalid event validations"
 msgstr ""
@@ -12072,11 +14823,19 @@ msgid "Similar Attributes"
 msgstr ""
 
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/resolved_misp_format.ctp:96;291
-#: View/Objects/add.ctp:117
+#: View/Events/resolved_misp_format.ctp:147;342
+#: View/Objects/add.ctp:129
 msgid "Disable Correlation"
 msgstr ""
 
+#: View/Events/resolved_attributes.ctp:53
+msgid "Tags (separated by comma)"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:108
+msgid "10 +more"
+msgstr ""
+
 #: View/Events/resolved_attributes.ctp:195
 msgid "Remove resolved attribute"
 msgstr ""
@@ -12097,37 +14856,91 @@ msgstr ""
 msgid "Update all comment fields"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:36
-#: View/Events/view.ctp:53
-#: View/Servers/preview_event.ctp:12
-#: View/Sightings/ajax/list_sightings.ctp:9
-msgid "Event ID"
-msgstr ""
-
-#: View/Events/resolved_misp_format.ctp:43
+#: View/Events/resolved_misp_format.ctp:45
 msgid "Event creator org"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:78
-msgid "#Resolved Attributes"
+#: View/Events/resolved_misp_format.ctp:80
+msgid "# of resolved Attributes"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:89;284
+#: View/Events/resolved_misp_format.ctp:81
+msgid "# of resolved Reports"
+msgstr ""
+
+#: View/Events/resolved_misp_format.ctp:92;140;335
+#: View/GalaxyClusters/update_cluster.ctp:97
 msgid "Import"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:111
+#: View/Events/resolved_misp_format.ctp:95
+#: View/Events/show_i_o_c_results.ctp:34
+msgid "Content"
+msgstr ""
+
+#: View/Events/resolved_misp_format.ctp:162
 msgid "ID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:127
+#: View/Events/resolved_misp_format.ctp:178
 msgid "UUID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:128
+#: View/Events/resolved_misp_format.ctp:179
 msgid "Meta Category: "
 msgstr ""
 
+#: View/Events/resolved_misp_format.ctp:65
+msgid "%s (%s object)"
+msgid_plural "%s (%s objects)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: View/Events/restore_deleted_events.ctp:9
+msgid "Event Id"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:18
+#: View/Organisations/view.ctp:31
+msgid "Creation time"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:23
+msgid "Deletion time"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:28;38
+msgid "Event Creator"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:33
+msgid "Event Owner"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:43
+msgid "Deleted By"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:49
+msgid "Below are a list of events that can be recovered via the log entries. Make sure that your log table is well indexed (adding indeces to `model`, `model_id`, `created` and `action` highly recommended)."
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:57
+msgid "Mock the recovery process and output the potential changes"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:59
+msgid "Are you sure you want to mock the recovery of the event? No data will be modified, but the request might take some time."
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:67
+msgid "Execute the recovery process"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:69
+msgid "Are you sure you want to attempt to recover the event?"
+msgstr ""
+
 #: View/Events/show_i_o_c_results.ctp:2
 msgid ">Results of the import"
 msgstr ""
@@ -12140,13 +14953,6 @@ msgstr ""
 msgid "Successfully added attributes"
 msgstr ""
 
-#: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Feeds/preview_event.ctp:11
-#: 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 ""
@@ -12155,10 +14961,6 @@ msgstr ""
 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 ""
@@ -12183,200 +14985,240 @@ msgstr ""
 msgid "Include the original imported file as attachment"
 msgstr ""
 
-#: View/Events/view.ctp:61
+#: View/Events/view.ctp:31
 msgid "Extend this event"
 msgstr ""
 
-#: View/Events/view.ctp:67
+#: View/Events/view.ctp:36
+msgid "Check this event on different servers"
+msgstr ""
+
+#: View/Events/view.ctp:42
 #: View/Feeds/preview_event.ctp:13
+#: View/Servers/preview_event.ctp:5
 msgid "Source Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:76
+#: View/Events/view.ctp:51
+#: View/Servers/preview_event.ctp:6
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:154
-#: View/Feeds/preview_event.ctp:37
-#: View/Pages/doc/using_the_system.ctp:70;177;210
-#: View/Servers/preview_event.ctp:48
-msgid "Analysis"
+#: View/Events/view.ctp:140
+msgid "Undisclosed sharing group"
 msgstr ""
 
-#: View/Events/view.ctp:178
+#: View/Events/view.ctp:141
+msgid "your organisation is the local owner of this event, however it is not explicitly listed in the sharing group."
+msgstr ""
+
+#: View/Events/view.ctp:171
 msgid "Toggle advanced sharing network viewer"
 msgstr ""
 
-#: View/Events/view.ctp:184
-#: View/Feeds/preview_event.ctp:42
-#: View/Pages/doc/using_the_system.ctp:185;212
-msgid "Info"
-msgstr ""
-
-#: View/Events/view.ctp:188
+#: View/Events/view.ctp:181
 #: View/Feeds/preview_event.ctp:55;60;65
+#: View/GalaxyClusters/view.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:76
 #: View/Pages/doc/using_the_system.ctp:160;213
-#: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:112
+#: View/Servers/preview_event.ctp:44
+#: View/Servers/preview_index.ctp:108
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:194
-msgid " (%s Objects)"
-msgstr ""
-
-#: View/Events/view.ctp:194
-msgid " (%s Object)"
-msgstr ""
-
-#: View/Events/view.ctp:196
+#: View/Events/view.ctp:189
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:200
+#: View/Events/view.ctp:193
 msgid "First recorded change"
 msgstr ""
 
-#: View/Events/view.ctp:204
+#: View/Events/view.ctp:197
+#: View/Servers/preview_event.ctp:50
 msgid "Last change"
 msgstr ""
 
-#: View/Events/view.ctp:208
+#: View/Events/view.ctp:201
 msgid "Modification map"
 msgstr ""
 
-#: View/Events/view.ctp:214
+#: View/Events/view.ctp:207
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:233
+#: View/Events/view.ctp:226
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:240
+#: View/Events/view.ctp:231
+msgid "Currently in %s view."
+msgstr ""
+
+#: View/Events/view.ctp:233
 msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:240
+#: View/Events/view.ctp:233
 msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:271
+#: View/Events/view.ctp:240
+msgid "Switch to atomic view"
+msgstr ""
+
+#: View/Events/view.ctp:240
+msgid "Switch to extended view"
+msgstr ""
+
+#: View/Events/view.ctp:264
 msgid "%s has requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:270
 msgid "%s has requested that you take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:283
+#: View/Events/view.ctp:276
 msgid "You have requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:288
+#: View/Events/view.ctp:281
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:300
+#: View/Events/view.ctp:293
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:310
-#: View/Users/admin_index.ctp:155
-#: View/Users/admin_view.ctp:97
+#: View/Events/view.ctp:304
+#: View/Taxonomies/index.ctp:22
+#: View/Users/admin_index.ctp:48;172
+#: View/Users/view.ctp:113
+#: View/Warninglists/index.ctp:30
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:319
+#: View/Events/view.ctp:313
 #: View/Warninglists/view.ctp:24
 msgid "enable"
 msgstr ""
 
-#: View/Events/view.ctp:319
+#: View/Events/view.ctp:313
 #: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:330
+#: View/Events/view.ctp:323
 msgid "Extended view"
 msgstr ""
 
-#: View/Events/view.ctp:337
+#: View/Events/view.ctp:330
 msgid "Warning: Taxonomy inconsistencies"
 msgstr ""
 
-#: View/Events/view.ctp:382
+#: View/Events/view.ctp:374
 #: View/Feeds/preview_event.ctp:84
-#: View/Servers/preview_event.ctp:112
+#: View/Servers/preview_event.ctp:85
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:443;478
+#: View/Events/view.ctp:400
+msgid "Related Feeds"
+msgstr ""
+
+#: View/Events/view.ctp:400
+msgid "Show just attributes that has feed hits"
+msgstr ""
+
+#: View/Events/view.ctp:400;485
+msgid "(show)"
+msgstr ""
+
+#: View/Events/view.ctp:439;474
 msgid "This event has "
 msgstr ""
 
-#: View/Events/view.ctp:444;479
+#: View/Events/view.ctp:440;475
 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:487
+#: View/Events/view.ctp:484
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:503
+#: View/Events/view.ctp:485
+msgid "Show just attributes that has warning"
+msgstr ""
+
+#: View/Events/view.ctp:501
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:503
+#: View/Events/view.ctp:501
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:506
+#: View/Events/view.ctp:504
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:506
-msgid "Galaxy"
-msgstr ""
-
-#: View/Events/view.ctp:509
+#: View/Events/view.ctp:507
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:512
+#: View/Events/view.ctp:510
 msgid "Toggle Event timeline"
 msgstr ""
 
-#: View/Events/view.ctp:512
+#: View/Events/view.ctp:510
 msgid "Event timeline"
 msgstr ""
 
-#: View/Events/view.ctp:515
+#: View/Events/view.ctp:513
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:515
+#: View/Events/view.ctp:513
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:518
+#: View/Events/view.ctp:516
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:518
+#: View/Events/view.ctp:516
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:521
+#: View/Events/view.ctp:519
+msgid "Toggle reports"
+msgstr ""
+
+#: View/Events/view.ctp:519
+msgid "Event reports"
+msgstr ""
+
+#: View/Events/view.ctp:522
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:524
+#: View/Events/view.ctp:525
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:524
-msgid "Discussion"
+#: View/Events/view.ctp:548
+msgid "Event Reports"
+msgstr ""
+
+#: View/Events/view.ctp:187
+msgid " (%s Object)"
+msgid_plural " (%s Objects)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: View/Events/view_cluster_relations.ctp:3
+msgid "There are no Cluster relationships in this Event."
 msgstr ""
 
 #: View/Events/view_graph.ctp:20
@@ -12444,7 +15286,8 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: View/Feeds/index.ctp:161
+#: View/Feeds/index.ctp:162
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:25
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -12501,12 +15344,6 @@ msgstr ""
 msgid "Feed name"
 msgstr ""
 
-#: View/Feeds/add.ctp:26
-#: View/Feeds/index.ctp:119
-#: View/Feeds/view.ctp:31
-msgid "Provider"
-msgstr ""
-
 #: View/Feeds/add.ctp:27
 #: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
@@ -12555,9 +15392,9 @@ msgstr ""
 #: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
-#: View/Users/admin_edit.ctp:40
+#: View/Users/admin_edit.ctp:48
 #: View/Users/change_pw.ctp:9
-#: View/Users/edit.ctp:13
+#: View/Users/edit.ctp:14
 msgid "Password"
 msgstr ""
 
@@ -12681,8 +15518,8 @@ msgstr ""
 
 #: View/Feeds/add.ctp:218
 #: View/Feeds/edit.ctp:218
-#: View/Servers/add.ctp:116
-#: View/Servers/edit.ctp:155;162
+#: View/Servers/add.ctp:118
+#: View/Servers/edit.ctp:157;164
 msgid "Modify"
 msgstr ""
 
@@ -12711,53 +15548,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr ""
 
 #: View/Feeds/edit.ctp:234
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:190
+#: View/Servers/add.ctp:148
+#: View/Servers/edit.ctp:192
 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:235
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:149
+#: View/Servers/edit.ctp:191
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
 #: View/Feeds/edit.ctp:236
-#: View/Servers/add.ctp:148
-#: View/Servers/edit.ctp:191
+#: View/Servers/add.ctp:150
+#: View/Servers/edit.ctp:193
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:237
-#: View/Servers/add.ctp:149
-#: View/Servers/edit.ctp:192
+#: View/Servers/add.ctp:151
+#: View/Servers/edit.ctp:194
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
 #: View/Feeds/edit.ctp:238
-#: View/Servers/add.ctp:150
-#: View/Servers/edit.ctp:193
+#: View/Servers/add.ctp:152
+#: View/Servers/edit.ctp:195
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:239
-#: View/Servers/edit.ctp:194
+#: View/Servers/edit.ctp:196
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:240
-#: View/Servers/edit.ctp:195
+#: View/Servers/edit.ctp:197
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:241
-#: View/Servers/edit.ctp:196
+#: View/Servers/edit.ctp:198
 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:242
-#: View/Servers/add.ctp:154
-#: View/Servers/edit.ctp:198
+#: View/Servers/add.ctp:156
+#: View/Servers/edit.ctp:200
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -12769,7 +15606,7 @@ msgstr ""
 msgid "Fetch selected"
 msgstr ""
 
-#: View/Feeds/freetext_index.ctp:35
+#: View/Feeds/freetext_index.ctp:31
 msgid "Correlations"
 msgstr ""
 
@@ -12821,7 +15658,7 @@ msgstr ""
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:100;203
+#: View/Feeds/index.ctp:100;205
 msgid "Caching"
 msgstr ""
 
@@ -12829,84 +15666,76 @@ msgstr ""
 msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
 msgstr ""
 
-#: View/Feeds/index.ctp:113
+#: View/Feeds/index.ctp:114
 msgid "Format"
 msgstr ""
 
-#: View/Feeds/index.ctp:132
-#: View/GalaxyClusters/view.ctp:11
-#: 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/Feeds/index.ctp:144
-#: View/Servers/rest.ctp:164
+#: View/Feeds/index.ctp:145
+#: View/Servers/rest.ctp:166
 msgid "Headers"
 msgstr ""
 
-#: View/Feeds/index.ctp:168
+#: View/Feeds/index.ctp:169
 msgid "Delta"
 msgstr ""
 
-#: View/Feeds/index.ctp:169
+#: View/Feeds/index.ctp:170
 msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
-#: View/Feeds/index.ctp:176
+#: View/Feeds/index.ctp:177
 msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:177
+#: View/Feeds/index.ctp:178
 msgid "Override the IDS flags and set all derived attribute to IDS off"
 msgstr ""
 
-#: View/Feeds/index.ctp:196
+#: View/Feeds/index.ctp:198
 msgid "Visible"
 msgstr ""
 
-#: View/Feeds/index.ctp:211
+#: View/Feeds/index.ctp:214
 msgid "Feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:212
+#: View/Feeds/index.ctp:215
 msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
 msgstr ""
 
-#: View/Feeds/index.ctp:216
+#: View/Feeds/index.ctp:219
 msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:228
+#: View/Feeds/index.ctp:231
 msgid "Cache all feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:234
+#: View/Feeds/index.ctp:237
 msgid "Cache freetext/CSV feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:240
+#: View/Feeds/index.ctp:243
 msgid "Cache MISP feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:247
+#: View/Feeds/index.ctp:250
 msgid "Fetch and store all feed data"
 msgstr ""
 
-#: View/Feeds/index.ctp:255
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:261
+#: View/Feeds/index.ctp:264
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:294
+#: View/Feeds/index.ctp:297
 msgid "Are you sure you want to permanently remove the feed?"
 msgstr ""
 
-#: View/Feeds/index.ctp:302
+#: View/Feeds/index.ctp:305
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -12918,12 +15747,12 @@ msgstr ""
 msgid "You are currently viewing the event index of a feed (%s by %s)."
 msgstr ""
 
-#: View/Feeds/preview_index.ctp:44
+#: View/Feeds/preview_index.ctp:40
 msgid "Timestamp"
 msgstr ""
 
-#: View/Feeds/preview_index.ctp:72
-#: View/Servers/preview_index.ctp:173
+#: View/Feeds/preview_index.ctp:68
+#: View/Servers/preview_index.ctp:169
 msgid "Fetch the event"
 msgstr ""
 
@@ -12959,34 +15788,136 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:35
+#: View/Galaxies/export.ctp:6
+msgid "Export galaxy: %s"
+msgstr ""
+
+#: View/Galaxies/export.ctp:10
+msgid "Clusters' distribution:"
+msgstr ""
+
+#: View/Galaxies/export.ctp:19
+msgid "Include Custom Clusters"
+msgstr ""
+
+#: View/Galaxies/export.ctp:25
+msgid "Include Default Clusters"
+msgstr ""
+
+#: View/Galaxies/export.ctp:31
+msgid "Export format"
+msgstr ""
+
+#: View/Galaxies/export.ctp:33
+msgid "MISP Format"
+msgstr ""
+
+#: View/Galaxies/export.ctp:33
+msgid "To re-import in another MISP"
+msgstr ""
+
+#: View/Galaxies/export.ctp:34
+msgid "misp-galaxy format"
+msgstr ""
+
+#: View/Galaxies/export.ctp:34
+msgid "Usable to be integrated into the official repository"
+msgstr ""
+
+#: View/Galaxies/export.ctp:38
+msgid "Warning!"
+msgstr ""
+
+#: View/Galaxies/export.ctp:38
+msgid "The exported JSON will not contain the `category` key. Also, other keys such as `authors` and `version` may need to be adjusted manually."
+msgstr ""
+
+#: View/Galaxies/export.ctp:42
+msgid "Export type"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:5
+#: View/Galaxies/relations_graph.ctp:4
+msgid "Back to galaxy"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:8
+msgid "%s galaxy cluster extensions"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:126
+msgid "Update cluster to parent's new version"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:162
+msgid "Latest version of the parent cluster"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:253
+msgid "Version:"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:254
+msgid "ID:"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:256
+msgid "Description:"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:274
+msgid "Galaxy elements:"
+msgstr ""
+
+#: View/Galaxies/import.ctp:9
+msgid "Import galaxy clusters"
+msgstr ""
+
+#: View/Galaxies/import.ctp:10
+msgid "Paste a JSON of cluster to import or provide a JSON file below."
+msgstr ""
+
+#: View/Galaxies/import.ctp:18
+msgid "Galaxy JSON"
+msgstr ""
+
+#: View/Galaxies/index.ctp:23
 msgid "Galaxy Id"
 msgstr ""
 
-#: View/Galaxies/index.ctp:43
+#: View/Galaxies/index.ctp:31
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:55
-#: View/Noticelists/index.ctp:35
+#: View/Galaxies/index.ctp:43
+#: View/Noticelists/index.ctp:28
 msgid "version"
 msgstr ""
 
-#: View/Galaxies/index.ctp:60
+#: View/Galaxies/index.ctp:48
 #: View/Galaxies/view.ctp:7
 #: View/Sightingdb/index.ctp:71
-#: View/Taxonomies/view.ctp:9
+#: View/Taxonomies/index.ctp:43
+#: View/Taxonomies/view.ctp:15
 msgid "Namespace"
 msgstr ""
 
-#: View/Galaxies/index.ctp:69
+#: View/Galaxies/index.ctp:57
 msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/index.ctp:85
+#: View/Galaxies/index.ctp:73
 msgid "Are you sure you want to delete the Galaxy?"
 msgstr ""
 
+#: View/Galaxies/relations_graph.ctp:7
+msgid "%s galaxy cluster relationships"
+msgstr ""
+
+#: View/Galaxies/relations_graph.ctp:10
+msgid "There are no relations in this Galaxy"
+msgstr ""
+
 #: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr ""
@@ -12995,67 +15926,430 @@ msgstr ""
 msgid "Kill chain order"
 msgstr ""
 
+#: View/GalaxyClusterBlocklists/add.ctp:5
+msgid "(Optional) The cluster value that you would like to block"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:6
+msgid "(Optional) Any comments you would like to add regarding this (or these) entries"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:11
+msgid "Add block entry for Galaxy Cluster"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:11
+msgid "Edit block entry for Galaxy Cluster"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:16
+msgid "Cluster UUID"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:20
+#: View/GalaxyClusterRelations/add.ctp:24
+msgid "Pick target cluster"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:32
+#: View/GalaxyClusterBlocklists/index.ctp:50
+msgid "Cluster value"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/index.ctp:13
+msgid "+ Add entry to blocklist"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/index.ctp:39
+msgid "Galaxy Cluster UUID"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/index.ctp:62
+msgid "Galaxy Cluster Blocklist Index"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/index.ctp:63
+msgid "List all galaxy clusters that will be prevented to be created (also via synchronization) on this instance"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/index.ctp:80
+msgid "Are you sure you want to delete the entry?"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:3
+msgid "relationships which can be used to link clusters together and explain the context of the relationship."
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:8
+msgid "Galaxy Cluster Relationship"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:12
+#: View/GalaxyClusters/view_relations.ctp:90
+msgid "Source UUID"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:15
+msgid "Pick source cluster"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:21
+#: View/GalaxyClusters/view_relations.ctp:104
+#: View/ObjectReferences/ajax/add.ctp:42
+msgid "Target UUID"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:41
+#: View/GalaxyClusterRelations/index.ctp:69
+#: View/GalaxyClusters/view_relations.ctp:27
+msgid "Relationship Type"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:42
+msgid "is-similar"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:45
+msgid "Pick type"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:51
+msgid "Tag list"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:55
+msgid "Pick tags"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:19
+msgid "Default Galaxy Cluster Relations"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:24
+msgid "Custom Galaxy Cluster Relations"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:51
+msgid "Galaxy Cluster Source"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:60
+msgid "Galaxy Cluster Target"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:75
+#: View/GalaxyClusters/view_relations.ctp:32
+msgid "Relationship Tag"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:96
+#: View/GalaxyClusters/ajax/index.ctp:109
+msgid "Creator Org"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:113
+msgid "Galaxy Cluster Relationships Index"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:114
+msgid "List all relationships between Galaxy Clusters"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:146
+#: View/GalaxyClusters/view_relations.ctp:72
+msgid "Are you sure you want to delete the Relationship?"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:20
+msgid "Fork Galaxy Cluster"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:20
+msgid "Add Galaxy Cluster"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:21
+msgid "Edit Galaxy Cluster"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:43
+msgid "Forked Cluster data"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:77
+msgid "Galaxy Cluster Elements"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:82
+msgid "Toggle UI"
+msgstr ""
+
 #: View/GalaxyClusters/cluster_matrix.ctp:1
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:5
-msgid "Cluster ID"
+#: View/GalaxyClusters/update_cluster.ctp:2
+msgid "Merge updates from parent cluster"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:7
-msgid "Parent Galaxy"
+#: View/GalaxyClusters/update_cluster.ctp:4
+msgid "No new version available"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:10
-msgid "Collection UUID"
+#: View/GalaxyClusters/update_cluster.ctp:6
+msgid "This interface allows you to update the selected cluster to the latest version of its parent."
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:12
-msgid "Authors"
+#: View/GalaxyClusters/update_cluster.ctp:7
+msgid "You can pick galaxy cluster's elements to import from the parent to the selected cluster."
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:13
-msgid "Connector tag"
+#: View/GalaxyClusters/update_cluster.ctp:11
+msgid "Parent fork elements"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:18
-msgid "event(s)"
+#: View/GalaxyClusters/update_cluster.ctp:13
+msgid "Version: %s (newer)"
 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 %s?<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:46
-msgid "Synonyms"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:59
-msgid "#Events"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:94
-msgid "Are you sure you want to delete the Galaxy Cluster?"
-msgstr ""
-
-#: View/GalaxyElements/ajax/index.ctp:22
+#: View/GalaxyClusters/update_cluster.ctp:18;46;84
+#: View/GalaxyElements/ajax/index.ctp:51
 msgid "Key"
 msgstr ""
 
-#: View/Helper/GenericPickerHelper.php:90
+#: View/GalaxyClusters/update_cluster.ctp:25;53
+msgid "No cluster element"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:39
+msgid "Current elements"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:41
+msgid "Parent version: %s (older)"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:73
+msgid "You are all set!"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:73
+msgid "There are no new elements to be added from the parent cluster"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:78
+msgid "Elements in parent fork but not in this cluster"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:86
+msgid "Import element into the cluster"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:11
+msgid "%s (version: %s)"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:17
+msgid "New version available! <a href=\"%s\">Update cluster to version <b>%s</b></a>"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:31
+msgid "%s (parent version: %s)"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:41
+msgid "Cluster ID"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:43
+msgid "Parent Galaxy"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:49
+msgid "Collection UUID"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:56
+msgid "Authors"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:66
+msgid "Creator Organisation"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:69
+msgid "Connector tag"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:78
+msgid "Forked From"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:81
+msgid "Forked By"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:73
+#: View/SharingGroups/view.ctp:26
+msgid "%s event"
+msgid_plural "%s events"
+msgstr[0] ""
+msgstr[1] ""
+
+#: View/GalaxyClusters/view_relations.ctp:19
+msgid "Galaxy Cluster Target (galaxy :: cluster)"
+msgstr ""
+
+#: View/GalaxyClusters/view_relations.ctp:81
+msgid "Toggle Cluster relationships"
+msgstr ""
+
+#: View/GalaxyClusters/view_relations.ctp:94
+#: View/ObjectReferences/ajax/add.ctp:10;17
+msgid "Relationship type"
+msgstr ""
+
+#: View/GalaxyClusters/view_relations.ctp:96
+msgid "custom"
+msgstr ""
+
+#: View/GalaxyClusters/view_relations.ctp:96
+msgid "-- Custom relationship --"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:2
+msgid "Galaxy Cluster Deletion"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:4
+msgid "Are you sure you want to delete Galaxy Cluster %s (%s)?"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:6
+msgid "%s a cluster propagates the deletion to other instances and lets you restore it in the future"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:7
+msgid "%s a cluster permanentaly deletes it and prevents it be created again by blocklisting it"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "For default clusters, you can restore the cluster at any time by force updating your galaxies"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:29
+msgid "Custom"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:38
+msgid "My Clusters"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:48
+msgid "View Fork Tree"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:53
+msgid "View Galaxy Relationships"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:92
+msgid "Synonyms"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:134
+msgid "#Events"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:139
+msgid "#Relations"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:144
+msgid "cluster"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:145
+msgid "is being targeted by"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:146
+msgid "targets"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:189
+msgid "Are you sure you want to restore the Galaxy Cluster?"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:211
+msgid "Are you sure you want to publish the Galaxy Cluster?"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:6
+msgid "Publish cluster %s"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:8
+msgid "Unpublish cluster %s"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:16
+msgid "Are you sure you wish to publish the cluster?"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the cluster?"
+msgstr ""
+
+#: View/GalaxyElements/ajax/delete.ctp:3
+msgid "Delete Galaxy Cluster Element"
+msgstr ""
+
+#: View/GalaxyElements/ajax/delete.ctp:4
+msgid "galaxy element"
+msgstr ""
+
+#: View/GalaxyElements/ajax/flattenJson.ctp:6
+msgid "Convert JSON into galaxy cluster's elements"
+msgstr ""
+
+#: View/GalaxyElements/ajax/index.ctp:12
+msgid "Tabular view"
+msgstr ""
+
+#: View/GalaxyElements/ajax/index.ctp:22
+msgid "JSON view"
+msgstr ""
+
+#: View/GalaxyElements/ajax/index.ctp:39
+msgid "Add JSON as cluster's elements"
+msgstr ""
+
+#: View/GalaxyElements/ajax/index.ctp:40
+msgid "The provided JSON will be converted into Galaxy Cluster Elements"
+msgstr ""
+
+#: View/Helper/GenericPickerHelper.php:87
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Helper/GenericPickerHelper.php:92
+msgid "Use the picker instead"
+msgstr ""
+
+#: View/Helper/IconHelper.php:27
+msgid "Flag of %s"
+msgstr ""
+
+#: View/Helper/PivotHelper.php:28
+msgid "Remove pivot"
+msgstr ""
+
 #: View/Inbox/index.ctp:31
 #: 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
+#: View/Threads/index.ctp:15
 msgid "Title"
 msgstr ""
 
@@ -13084,70 +16378,70 @@ msgstr ""
 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:50
+#: View/Jobs/index.ctp:43
 msgid "Completed."
 msgstr ""
 
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:59
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:72
+#: View/Jobs/index.ctp:65
 msgid "Show default queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:78
+#: View/Jobs/index.ctp:71
 msgid "Show email queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:83
+#: View/Jobs/index.ctp:76
 msgid "Cache"
 msgstr ""
 
-#: View/Jobs/index.ctp:84
+#: View/Jobs/index.ctp:77
 msgid "Show cache queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:97
+#: View/Jobs/index.ctp:90
 msgid "Date created"
 msgstr ""
 
-#: View/Jobs/index.ctp:98
+#: View/Jobs/index.ctp:91
 msgid "Date modified"
 msgstr ""
 
-#: View/Jobs/index.ctp:99
+#: View/Jobs/index.ctp:92
 msgid "Process ID"
 msgstr ""
 
-#: View/Jobs/index.ctp:100
+#: View/Jobs/index.ctp:93
 #: View/Pages/doc/administration.ctp:223
 msgid "Worker"
 msgstr ""
 
-#: View/Jobs/index.ctp:101
+#: View/Jobs/index.ctp:94
 msgid "Job type"
 msgstr ""
 
-#: View/Jobs/index.ctp:102
+#: View/Jobs/index.ctp:95
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr ""
 
-#: View/Jobs/index.ctp:106
+#: View/Jobs/index.ctp:99
 #: View/Pages/doc/administration.ctp:229
 msgid "Retries"
 msgstr ""
 
-#: View/Jobs/index.ctp:118
+#: View/Jobs/index.ctp:111
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:122
+#: View/Jobs/index.ctp:115
 msgid "Running"
 msgstr ""
 
-#: View/Jobs/index.ctp:150
+#: View/Jobs/index.ctp:143
 msgid "View stacktrace"
 msgstr ""
 
@@ -13209,17 +16503,16 @@ msgid "from IP"
 msgstr ""
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:67
+#: View/ObjectTemplates/index.ctp:60
 #: View/ObjectTemplates/view.ctp:5
-#: View/Sightings/ajax/list_sightings.ctp:6
+#: View/Sightings/ajax/list_sightings.ctp:10
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
 #: View/UserSettings/index.ctp:35
 #: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
-#: View/Users/admin_edit.ctp:51
-#: View/Users/admin_view.ctp:17
-#: View/Users/view.ctp:5
+#: View/Users/admin_edit.ctp:59
+#: View/Users/view.ctp:14
 msgid "Organisation"
 msgstr ""
 
@@ -13250,7 +16543,7 @@ msgid "Edit news message"
 msgstr ""
 
 #: View/News/index.ctp:24
-msgid "Are you sure you want to delete news item # %s?"
+msgid "Are you sure you want to delete news item #%s?"
 msgstr ""
 
 #: View/News/index.ctp:47
@@ -13261,43 +16554,40 @@ msgstr ""
 msgid "Noticelists"
 msgstr ""
 
-#: View/Noticelists/index.ctp:32
+#: View/Noticelists/index.ctp:25
 msgid "Expanded name"
 msgstr ""
 
-#: View/Noticelists/index.ctp:33
+#: View/Noticelists/index.ctp:26
 msgid "ref"
 msgstr ""
 
-#: View/Noticelists/index.ctp:34
+#: View/Noticelists/index.ctp:27
 msgid "geographical_area"
 msgstr ""
 
-#: View/Noticelists/index.ctp:36
-#: View/Pages/doc/using_the_system.ctp:371
-msgid "enabled"
-msgstr ""
-
 #: View/Noticelists/view.ctp:21
-#: View/Taxonomies/view.ctp:29
+#: View/Taxonomies/view.ctp:8
 msgid "(disable)"
 msgstr ""
 
 #: View/Noticelists/view.ctp:21
-#: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:29;155
+#: View/Taxonomies/index.ctp:110
+#: View/Taxonomies/view.ctp:8;144
+#: View/Warninglists/index.ctp:115
 #: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr ""
 
 #: View/Noticelists/view.ctp:23
-#: View/Taxonomies/view.ctp:31
+#: View/Taxonomies/view.ctp:10
 msgid "(enable)"
 msgstr ""
 
 #: View/Noticelists/view.ctp:23
-#: View/Taxonomies/index.ctp:45
-#: View/Taxonomies/view.ctp:31;159
+#: View/Taxonomies/index.ctp:92
+#: View/Taxonomies/view.ctp:10;148
+#: View/Warninglists/index.ctp:97
 #: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr ""
@@ -13314,14 +16604,6 @@ msgstr ""
 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"
@@ -13347,33 +16629,33 @@ msgstr ""
 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:19
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:17
 msgid "Object relation"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:21
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:19
 msgid "Multiple"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:22
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:20
 msgid "UI-priority"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:24
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:22
 #: 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
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:23
 msgid "Sane defaults"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:26
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:24
 msgid "List of valid Values"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:27
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:25
 msgid "Disable correlation"
 msgstr ""
 
@@ -13381,134 +16663,140 @@ msgstr ""
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:60
+#: View/ObjectTemplates/index.ctp:53
+#: View/Users/admin_index.ctp:43
 msgid "Active"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:71
-#: View/ObjectTemplates/view.ctp:26
+#: View/ObjectTemplates/index.ctp:64
+#: View/ObjectTemplates/view.ctp:28
 msgid "Requirements"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:124
+#: View/ObjectTemplates/index.ctp:117
 msgid "Force update"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:124
+#: View/ObjectTemplates/index.ctp:117
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:125
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:33
+#: View/ObjectTemplates/view.ctp:35
 msgid " Object Template"
 msgstr ""
 
-#: View/Objects/add.ctp:7
+#: View/Objects/add.ctp:11
 msgid " Object"
 msgstr ""
 
-#: View/Objects/add.ctp:10
+#: View/Objects/add.ctp:14
 #: View/Objects/group_attributes_into_object.ctp:6
 msgid "Object Template"
 msgstr ""
 
-#: View/Objects/add.ctp:15
+#: View/Objects/add.ctp:19
 msgid "Update the template of this object to the newer version: "
 msgstr ""
 
-#: View/Objects/add.ctp:17
-msgid "Update template"
+#: View/Objects/add.ctp:21
+msgid "Update template to v%s"
 msgstr ""
 
-#: View/Objects/add.ctp:43
+#: View/Objects/add.ctp:47
 #: View/Objects/group_attributes_into_object.ctp:10
 msgid "Meta category"
 msgstr ""
 
-#: View/Objects/add.ctp:98
+#: View/Objects/add.ctp:110
 msgid "Warning, issues found with the template"
 msgstr ""
 
-#: View/Objects/add.ctp:111
-msgid "Save"
-msgstr ""
-
-#: View/Objects/add.ctp:112
+#: View/Objects/add.ctp:124
 msgid "Name :: type"
 msgstr ""
 
-#: View/Objects/add.ctp:169;180
+#: View/Objects/add.ctp:181;192
 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:184
+#: View/Objects/add.ctp:196
 msgid "Back"
 msgstr ""
 
-#: View/Objects/add.ctp:196
-msgid "Pre-update object's template"
+#: View/Objects/add.ctp:208
+msgid "Current Object state on older template version"
 msgstr ""
 
-#: View/Objects/add.ctp:202
-#: View/Objects/group_attributes_into_object.ctp:54
-#: View/Organisations/ajax/merge.ctp:56;63
-#: View/Pages/doc/using_the_system.ctp:163;203
-msgid "ID"
-msgstr ""
-
-#: View/Objects/add.ctp:218
-#: View/Objects/revise_object.ctp:45
+#: View/Objects/add.ctp:230
+#: View/Objects/revise_object.ctp:9
 msgid "Template version"
 msgstr ""
 
-#: View/Objects/add.ctp:225;285
+#: View/Objects/add.ctp:233
+msgid "The original object's template is unkown and some attributes might be lost. Please review carefully"
+msgstr ""
+
+#: View/Objects/add.ctp:234
+msgid "Unkown original template"
+msgstr ""
+
+#: View/Objects/add.ctp:242
+msgid "Obj. rel."
+msgstr ""
+
+#: View/Objects/add.ctp:243
+msgid "Categ."
+msgstr ""
+
+#: View/Objects/add.ctp:250;310
 msgid "Can not be merged automatically"
 msgstr ""
 
-#: View/Objects/add.ctp:230;290
+#: View/Objects/add.ctp:255;315
 msgid "This attribute type is missing from the new template. It will be lost if not taken care of right now."
 msgstr ""
 
-#: View/Objects/add.ctp:252
+#: View/Objects/add.ctp:277
 msgid "Insert"
 msgstr ""
 
-#: View/Objects/add.ctp:255
+#: View/Objects/add.ctp:280
 msgid "No valid type. This attribute will be lost."
 msgstr ""
 
-#: View/Objects/add.ctp:262
+#: View/Objects/add.ctp:287
 msgid "This attribute can be merged automatically. Injection in the template done."
 msgstr ""
 
-#: View/Objects/add.ctp:277
+#: View/Objects/add.ctp:302
 msgid "Attributes to merge"
 msgstr ""
 
-#: View/Objects/add.ctp:278
+#: View/Objects/add.ctp:303
 msgid "Contextual information and actions"
 msgstr ""
 
-#: View/Objects/add.ctp:288
+#: View/Objects/add.ctp:313
 msgid "Overwrite the current attribute value with this one"
 msgstr ""
 
-#: View/Objects/add.ctp:298
+#: View/Objects/add.ctp:323
 msgid "Original value: "
 msgstr ""
 
-#: View/Objects/add.ctp:303
+#: View/Objects/add.ctp:328
 msgid "Can be merged automatically. Injection done."
 msgstr ""
 
-#: View/Objects/add.ctp:306
+#: View/Objects/add.ctp:331
 msgid "An instance of this attribute already exists. However, as multiple instances are allowed by this template, the two attributes will be kept."
 msgstr ""
 
-#: View/Objects/add.ctp:335;346
+#: View/Objects/add.ctp:360;371
 msgid "Enter value manually"
 msgstr ""
 
@@ -13544,14 +16832,6 @@ msgstr ""
 msgid "Selected Attributes will be %s deleted"
 msgstr ""
 
-#: View/Objects/group_attributes_into_object.ctp:129
-msgid "hard"
-msgstr ""
-
-#: View/Objects/group_attributes_into_object.ctp:129
-msgid "soft"
-msgstr ""
-
 #: View/Objects/orphaned_object_diagnostics.ctp:3
 msgid "Object reconstruction"
 msgstr ""
@@ -13616,43 +16896,47 @@ msgstr ""
 msgid "This Attribute type is not allowed to be present multiple time in this Object. Consider only picking one."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:2
+#: View/Objects/revise_object.ctp:18
 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."
+#: View/Objects/revise_object.ctp:19
+msgid "Make sure that the below Object reflects your expectation before submitting it."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:66
+#: View/Objects/revise_object.ctp:56
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:110
+#: View/Objects/revise_object.ctp:103
 msgid "Create new object"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:111
+#: View/Objects/revise_object.ctp:103
+msgid "Update object"
+msgstr ""
+
+#: View/Objects/revise_object.ctp:104
 msgid "Back to review"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:114
+#: View/Objects/revise_object.ctp:107
 msgid "This event contains similar objects."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:115
+#: View/Objects/revise_object.ctp:108
 msgid "Instead of creating a new object, would you like to merge your new object into one of the following?"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:132
+#: View/Objects/revise_object.ctp:125
 msgid "All similar objects not displayed..."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:133
+#: View/Objects/revise_object.ctp:126
 msgid "%s Similar objects found. %s not displayed"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:170
+#: View/Objects/revise_object.ctp:164
 msgid "This attribute will NOT be merged into the similar object as it is conflicting with another attribute."
 msgstr ""
 
@@ -13672,24 +16956,32 @@ msgstr ""
 msgid "Add Object attribute"
 msgstr ""
 
-#: View/OrgBlacklists/add.ctp:4
-msgid "Add Organisation Blacklist Entries"
+#: View/OrgBlocklists/add.ctp:4
+msgid "Add Organisation Blocklist 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."
+#: View/OrgBlocklists/add.ctp:5
+msgid "Blocklisting an organisation prevents the creation of any event by that organisation on this instance as well as syncing of that organisation's events to this instance. It does not prevent a local user of the blocklisted organisation from logging in and editing or viewing data."
 msgstr ""
 
-#: View/OrgBlacklists/add.ctp:18
+#: View/OrgBlocklists/add.ctp:6
+msgid "Paste a list of all the organisation UUIDs that you want to add to the blocklist below (one per line)."
+msgstr ""
+
+#: View/OrgBlocklists/add.ctp:19
 msgid "(Optional) The organisation name that the organisation is associated with"
 msgstr ""
 
-#: View/OrgBlacklists/index.ctp:2
-msgid "Organisation Blacklists"
+#: View/OrgBlocklists/edit.ctp:4
+msgid "Edit Organisation Blocklist Entries"
 msgstr ""
 
-#: View/OrgBlacklists/index.ctp:37
-msgid "Are you sure you want to delete the blacklist entry for the organisation UUID %s?"
+#: View/OrgBlocklists/index.ctp:2
+msgid "Organisation Blocklists"
+msgstr ""
+
+#: View/OrgBlocklists/index.ctp:30
+msgid "Are you sure you want to delete the blocklist entry for the organisation UUID %s?"
 msgstr ""
 
 #: View/Organisations/admin_add.ctp:4
@@ -13762,7 +17054,7 @@ msgstr ""
 
 #: View/Organisations/admin_add.ctp:37
 #: View/Organisations/admin_edit.ctp:48
-msgid "Logo (48x48 png)"
+msgid "Logo (48×48 PNG or SVG)"
 msgstr ""
 
 #: View/Organisations/admin_add.ctp:43
@@ -13801,9 +17093,9 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: View/Organisations/index.ctp:5;67
+#: View/Organisations/index.ctp:5;60
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:57
+#: View/Users/statistics_data.ctp:59
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr ""
@@ -13812,7 +17104,7 @@ msgstr ""
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9;62
+#: View/Organisations/index.ctp:9;55
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -13821,7 +17113,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13;57
+#: View/Organisations/index.ctp:13;50
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr ""
@@ -13838,65 +17130,58 @@ msgstr ""
 msgid "View all"
 msgstr ""
 
-#: View/Organisations/index.ctp:86
+#: View/Organisations/index.ctp:79
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr ""
 
-#: View/Organisations/index.ctp:97
+#: View/Organisations/index.ctp:90
 msgid "Added by"
 msgstr ""
 
-#: View/Organisations/view.ctp:8
+#: View/Organisations/index.ctp:93
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr ""
+
+#: View/Organisations/view.ctp:13
 msgid "Local or remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:12
-#: View/SharingGroups/view.ctp:43
+#: View/Organisations/view.ctp:17
 msgid "Local"
 msgstr ""
 
-#: View/Organisations/view.ctp:12
+#: View/Organisations/view.ctp:17
 msgid "Remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:27
 msgid "Domain restrictions"
 msgstr ""
 
-#: View/Organisations/view.ctp:27
-msgid "Creation time"
-msgstr ""
-
-#: View/Organisations/view.ctp:28
+#: View/Organisations/view.ctp:32
 msgid "Last modified"
 msgstr ""
 
-#: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:39
-msgid "Sector"
-msgstr ""
-
-#: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:37
-msgid "Nationality"
-msgstr ""
-
-#: View/Organisations/view.ctp:30
+#: View/Organisations/view.ctp:45
 #: View/Organisations/ajax/merge.ctp:19
 msgid "Organisation type"
 msgstr ""
 
-#: View/Organisations/view.ctp:30
+#: View/Organisations/view.ctp:45
 msgid "Contact information"
 msgstr ""
 
-#: View/Organisations/view.ctp:39
+#: View/Organisations/view.ctp:54
 msgid "Organisation "
 msgstr ""
 
-#: View/Organisations/view.ctp:62;63
+#: View/Organisations/view.ctp:66;67
 msgid "Members"
 msgstr ""
 
@@ -13916,10 +17201,6 @@ msgstr ""
 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 ""
@@ -13944,6 +17225,10 @@ msgstr ""
 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 ""
@@ -14138,7 +17423,7 @@ msgid "Settings and Diagnostics"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:11;171
-msgid "Blacklist"
+msgid "Blocklist"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:14
@@ -14225,7 +17510,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
-#: View/Servers/edit.ctp:90
+#: View/Servers/edit.ctp:92
 msgid "Misc settings"
 msgstr ""
 
@@ -14302,11 +17587,11 @@ msgid "Displays OK if the worker is running. If the _schdlr_ worker is the only
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:59
-msgid "Import Blacklist"
+msgid "Import Blocklist"
 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."
+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 blocklisting the value in this section."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:61;69
@@ -14314,7 +17599,7 @@ 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."
+msgid "Administrators can add, edit or delete blocklisted 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
@@ -14338,19 +17623,19 @@ msgid "Add, edit or remove Regexp entries that will affect all newly created att
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:73
-msgid "Managing the Signature whitelist"
+msgid "Managing the Signature allowedlist"
 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."
+msgid "The signature allowedlist view, accessible through the administration menu on the left, allows administrators to create and maintain a list of addresses that are allowedlisted 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"
+msgid "Allowedlisting 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."
+msgid "While in the allowedlist view, click on New Allowedlist on the left to bring up the add allowedlist view to add a new address."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:77
@@ -14358,7 +17643,7 @@ 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."
+msgid "When viewing the list of allowedlisted addresses, the following pieces of information are shown: The ID of the allowedlist entry (assigned automatically when a new address is added), the address itself that is being allowedlisted and a set of controls allowing you to delete the entry or edit the address."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:79
@@ -14410,8 +17695,7 @@ msgid "The organisation of the user. Entering ADMIN into this field will give ad
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:91;120;170
-#: View/Roles/admin_index.ctp:2
-#: View/Roles/index.ctp:2
+#: View/Roles/index.ctp:140
 msgid "Roles"
 msgstr ""
 
@@ -14420,9 +17704,6 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:77
-#: View/Users/admin_edit.ctp:71
-#: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
 msgstr ""
 
@@ -14431,9 +17712,6 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:82
-#: View/Users/admin_edit.ctp:72
-#: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
 msgstr ""
 
@@ -14443,8 +17721,8 @@ 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:26
+#: View/Users/admin_edit.ctp:63
+#: View/Users/admin_index.ctp:87
 msgid "Authkey"
 msgstr ""
 
@@ -14497,9 +17775,6 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_index.ctp:76
-#: View/Users/admin_view.ctp:26
-#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -14528,7 +17803,6 @@ 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:95
 msgid "Newsread"
 msgstr ""
 
@@ -14588,14 +17862,6 @@ msgstr ""
 msgid "Contact your users here."
 msgstr ""
 
-#: View/Pages/doc/administration.ctp:133;184;197
-#: View/Pages/doc/using_the_system.ctp:269
-#: View/Servers/ondemand_action.ctp:3
-#: View/Servers/ajax/submoduleStatus.ctp:7
-#: 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 ""
@@ -14779,12 +18045,12 @@ msgid "Creation, deletion, Accept, Discard"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:172
-msgid "Whitelist"
+msgid "Allowedlist"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:173
-#: View/Regexp/admin_index.ctp:22
-#: View/Regexp/index.ctp:22
+#: View/Regexp/admin_index.ctp:15
+#: View/Regexp/index.ctp:15
 msgid "Regexp"
 msgstr ""
 
@@ -15013,7 +18279,7 @@ msgid "The time (in 24h format) when the task should be executed the next time i
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:240
-#: View/Tasks/index.ctp:38
+#: View/Tasks/index.ctp:31
 msgid "Next Run"
 msgstr ""
 
@@ -15316,7 +18582,7 @@ msgid "You can view the Regular Expression rules, which modify the data that can
 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."
+msgid "You can view the allowedlist 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
@@ -15610,7 +18876,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:53
+#: View/Users/statistics_data.ctp:55
 msgid "Activity Heatmap"
 msgstr ""
 
@@ -15627,7 +18893,7 @@ msgid "All the events and attributes that get entered into MISP will be run thro
 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."
+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 blocklist data by not defining a replacement for a regular expression."
 msgstr ""
 
 #: View/Pages/doc/user_management.ctp:70
@@ -16050,10 +19316,6 @@ msgstr ""
 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 ""
@@ -16390,10 +19652,6 @@ msgstr ""
 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 ""
@@ -16925,7 +20183,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:175
+#: View/Servers/index.ctp:171
 msgid "Push all"
 msgstr ""
 
@@ -16933,11 +20191,6 @@ msgstr ""
 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:172
-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 ""
@@ -17068,75 +20321,71 @@ msgstr ""
 msgid "Edit Import Regexp"
 msgstr ""
 
-#: View/Regexp/admin_index.ctp:23
-#: View/Regexp/index.ctp:23
+#: View/Regexp/admin_index.ctp:16
+#: View/Regexp/index.ctp:16
 msgid "Replacement"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:9
+#: View/Roles/admin_add.ctp:6
 #: View/Roles/admin_edit.ctp:9
 msgid "Restrict to site admins"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:19
-#: View/Roles/admin_edit.ctp:18
-#: View/Roles/admin_index.ctp:33
-msgid "Memory limit"
+#: View/Roles/admin_add.ctp:24
+msgid "Memory limit (%s)"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:20
-#: View/Roles/admin_edit.ctp:19
-msgid "Maximum execution time"
+#: View/Roles/admin_add.ctp:29
+msgid "Maximum execution time (%ss)"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:26
+#: View/Roles/admin_add.ctp:33
 #: View/Roles/admin_edit.ctp:26
 msgid "Enforce search rate limit"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:32
+#: View/Roles/admin_add.ctp:38
 #: View/Roles/admin_edit.ctp:32
 msgid "# of searches / 15 min"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:24
-msgid "Restricted to site admins"
+#: View/Roles/admin_edit.ctp:18
+msgid "Memory limit"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:34
+#: View/Roles/admin_edit.ctp:19
+msgid "Maximum execution time"
+msgstr ""
+
+#: View/Roles/index.ctp:31
+msgid "Permission"
+msgstr ""
+
+#: View/Roles/index.ctp:54
+msgid "Memory Limit"
+msgstr ""
+
+#: View/Roles/index.ctp:64
 msgid "Max execution time"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:35
+#: View/Roles/index.ctp:74
 msgid "Searches / 15 mins"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:41
-msgid "Default role"
+#: View/Roles/index.ctp:78
+msgid "Unlimited"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:53
-#: View/Roles/index.ctp:47
-msgid "%s permission %s"
+#: View/Roles/index.ctp:117
+msgid "Add role"
 msgstr ""
 
-#: View/Roles/index.ctp:36
-msgid "ok"
+#: View/Roles/index.ctp:141
+msgid "Instance specific permission roles."
 msgstr ""
 
-#: View/Roles/index.ctp:36
-msgid "remove"
-msgstr ""
-
-#: View/Roles/index.ctp:45
-msgid "Granted"
-msgstr ""
-
-#: View/Roles/index.ctp:45
-msgid "Not granted"
-msgstr ""
-
-#: View/Roles/view.ctp:5
+#: View/Roles/view.ctp:13
 msgid "Permission level"
 msgstr ""
 
@@ -17194,7 +20443,7 @@ msgstr ""
 
 #: View/Servers/add.ctp:67
 #: View/Servers/edit.ctp:74
-msgid "Remote Organisation's Uuid"
+msgid "Remote Organisation's UUID"
 msgstr ""
 
 #: View/Servers/add.ctp:76
@@ -17207,61 +20456,81 @@ msgstr ""
 msgid "Enabled synchronisation methods"
 msgstr ""
 
-#: View/Servers/add.ctp:100
+#: View/Servers/add.ctp:102
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:106
+#: View/Servers/add.ctp:108
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:111
-#: View/Servers/edit.ctp:150
+#: View/Servers/add.ctp:113
+#: View/Servers/edit.ctp:152
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
-msgid "Events with the following tags allowed: "
-msgstr ""
-
-#: View/Servers/add.ctp:113;119
-#: View/Servers/edit.ctp:152;158
-msgid "Events with the following tags blocked: "
-msgstr ""
-
 #: View/Servers/add.ctp:114;120
 #: View/Servers/edit.ctp:153;159
-msgid "Events with the following organisations allowed: "
+msgid "Events with the following tags allowed: "
 msgstr ""
 
 #: View/Servers/add.ctp:115;121
 #: View/Servers/edit.ctp:154;160
+msgid "Events with the following tags blocked: "
+msgstr ""
+
+#: View/Servers/add.ctp:116;122
+#: View/Servers/edit.ctp:155;161
+msgid "Events with the following organisations allowed: "
+msgstr ""
+
+#: View/Servers/add.ctp:117;123
+#: View/Servers/edit.ctp:156;162
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:117
-#: View/Servers/edit.ctp:156
+#: View/Servers/add.ctp:119
+#: View/Servers/edit.ctp:158
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:147
+#: View/Servers/edit.ctp:190
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:151
+#: View/Servers/add.ctp:153
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:152
+#: View/Servers/add.ctp:154
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:153
+#: View/Servers/add.ctp:155
 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/compare_servers.ctp:4
+msgid "Events count"
+msgstr ""
+
+#: View/Servers/compare_servers.ctp:11
+msgid "Server events overlap analysis matrix"
+msgstr ""
+
+#: View/Servers/compare_servers.ctp:37
+msgid "<b>S%s</b>: %s"
+msgstr ""
+
+#: View/Servers/compare_servers.ctp:62
+msgid "None or less than 1 % of the events of %s is contained in %s (%s matching events)"
+msgstr ""
+
+#: View/Servers/compare_servers.ctp:64
+msgid "%s % of the events of %s is contained in %s (%s matching events)"
+msgstr ""
+
 #: View/Servers/create_sync.ctp:4
 msgid "Server configuration"
 msgstr ""
@@ -17282,34 +20551,46 @@ msgstr ""
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:107
+#: View/Servers/edit.ctp:109
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:115;137
+#: View/Servers/edit.ctp:117;139
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:116;138
+#: View/Servers/edit.ctp:118;140
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:129
+#: View/Servers/edit.ctp:131
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:161
+#: View/Servers/edit.ctp:163
 msgid "Additional parameters: "
 msgstr ""
 
-#: View/Servers/edit.ctp:197
+#: View/Servers/edit.ctp:199
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:263;267
+#: View/Servers/edit.ctp:265;269
 msgid "Not set."
 msgstr ""
 
+#: View/Servers/event_block_rule.ctp:7
+msgid "Set event block rules"
+msgstr ""
+
+#: View/Servers/event_block_rule.ctp:8
+msgid "Event block rules allow you to add a simple tag filter to block events from being added or synced. Events with a tag that matches any of the tags in the rule list will be blocked. It is not possible to add more complex rules with boolean logic (NOT, AND)."
+msgstr ""
+
+#: View/Servers/event_block_rule.ctp:13
+msgid "Rule set (json)"
+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 ""
@@ -17322,6 +20603,50 @@ msgstr ""
 msgid "Apply filters to the remote instance's index"
 msgstr ""
 
+#: View/Servers/id_translator.ctp:7
+msgid "Allows to translate a local ID into the corresponding event ID on sync servers configured."
+msgstr ""
+
+#: View/Servers/id_translator.ctp:12
+msgid "Event ID or UUID"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:14
+msgid "1234"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:20
+msgid "Referencing an event which is"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:22
+msgid "remote"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:31
+msgid "ID referenced on server"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:48
+msgid "Local ID"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:51
+msgid "Remote ID:"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:53
+msgid "preview"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:57
+msgid "Remote server unreachable: %s"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:59
+msgid "Not found"
+msgstr ""
+
 #: View/Servers/import.ctp:4
 msgid "Paste server data"
 msgstr ""
@@ -17338,76 +20663,88 @@ msgstr ""
 msgid "Servers"
 msgstr ""
 
-#: View/Servers/index.ctp:23
+#: View/Servers/index.ctp:16
 msgid "Prio"
 msgstr ""
 
-#: View/Servers/index.ctp:24
+#: View/Servers/index.ctp:17
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:25
+#: View/Servers/index.ctp:18
 msgid "Sync user"
 msgstr ""
 
-#: View/Servers/index.ctp:26
+#: View/Servers/index.ctp:19
 msgid "Reset API key"
 msgstr ""
 
-#: View/Servers/index.ctp:35
+#: View/Servers/index.ctp:30
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:70
+#: View/Servers/index.ctp:65
 msgid "URL params"
 msgstr ""
 
-#: View/Servers/index.ctp:85;86
+#: View/Servers/index.ctp:80;81
 msgid "Move server priority up"
 msgstr ""
 
-#: View/Servers/index.ctp:85;86
+#: View/Servers/index.ctp:80;81
 msgid "Move server priority down"
 msgstr ""
 
-#: View/Servers/index.ctp:102
+#: View/Servers/index.ctp:95
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:102
+#: View/Servers/index.ctp:95
 #: View/Sightingdb/index.ctp:35
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:103
+#: View/Servers/index.ctp:96
 msgid "View the sync user of the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:111;112
+#: View/Servers/index.ctp:104;105
 msgid "Remotely reset API key"
 msgstr ""
 
-#: View/Servers/index.ctp:119
+#: View/Servers/index.ctp:112
 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:119
+#: View/Servers/index.ctp:112
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:169
+#: View/Servers/index.ctp:136
+msgid "Age: %s%s"
+msgstr ""
+
+#: View/Servers/index.ctp:162
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:171
+#: View/Servers/index.ctp:164
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
-#: View/Servers/index.ctp:171
+#: View/Servers/index.ctp:164
 msgid "Pull updates"
 msgstr ""
 
-#: View/Servers/index.ctp:178
+#: View/Servers/index.ctp:168
+msgid "Pull known relevant custom clusters"
+msgstr ""
+
+#: View/Servers/index.ctp:168
+msgid "Pull relevant clusters"
+msgstr ""
+
+#: View/Servers/index.ctp:174
 msgid "Cache instance"
 msgstr ""
 
@@ -17439,27 +20776,27 @@ msgstr ""
 msgid "This action has been done and cannot be run again."
 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
+#: View/Servers/preview_event.ctp:13
 msgid "Filter the remote instance by tag: %s"
 msgstr ""
 
-#: View/Servers/preview_event.ctp:31
+#: View/Servers/preview_event.ctp:13
 msgid "Filter the remote instance on the tag: %s"
 msgstr ""
 
+#: View/Servers/preview_event.ctp:60
+msgid "You are currently viewing an event on the remote instance %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
+#: View/Servers/preview_index.ctp:108
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:112
+#: View/Servers/preview_index.ctp:108
 msgid "published"
 msgstr ""
 
@@ -17519,51 +20856,55 @@ msgstr ""
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:69
+#: View/Servers/rest.ctp:70
 msgid "Use full path - disclose my apikey"
 msgstr ""
 
-#: View/Servers/rest.ctp:73
+#: View/Servers/rest.ctp:75
 msgid "Bookmark query"
 msgstr ""
 
-#: View/Servers/rest.ctp:82
+#: View/Servers/rest.ctp:84
 msgid "Bookmark name"
 msgstr ""
 
-#: View/Servers/rest.ctp:90
+#: View/Servers/rest.ctp:92
 msgid "Show result"
 msgstr ""
 
-#: View/Servers/rest.ctp:95
+#: View/Servers/rest.ctp:97
 msgid "Skip SSL validation"
 msgstr ""
 
-#: View/Servers/rest.ctp:102
+#: View/Servers/rest.ctp:104
 msgid "HTTP headers"
 msgstr ""
 
-#: View/Servers/rest.ctp:115
+#: View/Servers/rest.ctp:117
 msgid " Inject"
 msgstr ""
 
-#: View/Servers/rest.ctp:116
+#: View/Servers/rest.ctp:118
 msgid " Show rules"
 msgstr ""
 
-#: View/Servers/rest.ctp:125
+#: View/Servers/rest.ctp:127
 msgid "HTTP body"
 msgstr ""
 
-#: View/Servers/rest.ctp:133
+#: View/Servers/rest.ctp:135
 msgid "Run query"
 msgstr ""
 
-#: View/Servers/rest.ctp:162
+#: View/Servers/rest.ctp:163
+msgid "Queried URL"
+msgstr ""
+
+#: View/Servers/rest.ctp:164
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:163
+#: View/Servers/rest.ctp:165
 msgid "Request duration"
 msgstr ""
 
@@ -17576,46 +20917,54 @@ msgid "To edit a setting, simply double click it."
 msgstr ""
 
 #: View/Servers/update_progress.ctp:34
-msgid "Updates are locked due to an ongoing update process. Release lock only if you know what you are doing."
+msgid "Updates are locked due to an ongoing update process. Release the update lock only if you know what you are doing."
 msgstr ""
 
 #: View/Servers/update_progress.ctp:35
+msgid "Before unlocking, make sure %s is healthy"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:35
+msgid "the update worker"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:36
 msgid "automatically unlock in %smin %ssec"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:40
+#: View/Servers/update_progress.ctp:41
 msgid "Release update lock"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:54
+#: View/Servers/update_progress.ctp:55
 msgid "Complete update progression"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:55
+#: View/Servers/update_progress.ctp:56
 msgid "%s remaining"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:62
+#: View/Servers/update_progress.ctp:63
 msgid "Database Update progress for update %s"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:133
+#: View/Servers/update_progress.ctp:134
 msgid "Update "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:136
+#: View/Servers/update_progress.ctp:137
 msgid "Started @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:140
+#: View/Servers/update_progress.ctp:141
 msgid "Elapsed Time @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:192
+#: View/Servers/update_progress.ctp:193
 msgid "No update in progress"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:213
+#: View/Servers/update_progress.ctp:214
 msgid "Follow updates"
 msgstr ""
 
@@ -17663,6 +21012,10 @@ msgstr ""
 msgid "Update all submodules"
 msgstr ""
 
+#: View/Servers/ajax/submoduleStatus.ctp:32
+msgid " (%s days, %s hours older than super project)"
+msgstr ""
+
 #: View/Servers/ajax/submoduleStatus.ctp:36
 msgid "Newer version. Make sure to update MISP"
 msgstr ""
@@ -17679,8 +21032,12 @@ msgstr ""
 msgid "Update submodule"
 msgstr ""
 
+#: View/Servers/ajax/submoduleStatus.ctp:68
+msgid "Update result:"
+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."
+msgid "Do you want to pull the latest commit from the %s branch? If you have made local changes to MISP the merge will fail."
 msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:2
@@ -17688,68 +21045,72 @@ msgid "ZeroMQ Server Status"
 msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:5
-msgid "Start time"
+msgid "Reply time"
 msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:6
-msgid "Settings read at"
+msgid "Start time"
 msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:7
 msgid "Events processed"
 msgstr ""
 
-#: View/Servers/ajax/zeromqstatus.ctp:9
+#: View/Servers/ajax/zeromqstatus.ctp:8
+msgid "Messages processed"
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:10
 msgid "The ZeroMQ server is unreachable."
 msgstr ""
 
-#: View/Servers/ajax/zeromqstatus.ctp:11
+#: View/Servers/ajax/zeromqstatus.ctp:12
 msgid "Cancel prompt"
 msgstr ""
 
-#: View/ShadowAttributes/add.ctp:4
+#: View/ShadowAttributes/add.ctp:5
 #: View/ShadowAttributes/edit.ctp:4
 msgid "Add Proposal"
 msgstr ""
 
-#: View/ShadowAttributes/add.ctp:63;76
+#: View/ShadowAttributes/add.ctp:63
 #: View/ShadowAttributes/add_attachment.ctp:35
 #: View/ShadowAttributes/edit.ctp:62
 msgid "Propose"
 msgstr ""
 
-#: View/ShadowAttributes/edit.ctp:41
-msgid "IDS Signature?"
+#: View/ShadowAttributes/edit.ctp:14
+msgid "Type "
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:24
+#: View/ShadowAttributes/edit.ctp:56;65
+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/ShadowAttributes/index.ctp:12
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:29
+#: View/ShadowAttributes/index.ctp:17
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:50
+#: View/ShadowAttributes/index.ctp:49
 msgid "Proposal by"
 msgstr ""
 
 #: View/ShadowAttributes/index.ctp:56
+msgid "Change requested"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:63
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:62
+#: View/ShadowAttributes/index.ctp:75
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:91
-msgid "Attribute edit"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:93
-msgid "New Attribute"
-msgstr ""
-
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:7
 msgid "Are you sure you want to propose to delete Attribute #%s?"
 msgstr ""
@@ -17816,7 +21177,7 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:53
 #: View/SharingGroups/edit.ctp:53
-#: View/SharingGroups/index.ctp:47
+#: View/SharingGroups/index.ctp:86
 msgid "Releasable to"
 msgstr ""
 
@@ -17867,7 +21228,6 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:73
 #: View/SharingGroups/edit.ctp:73
-#: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr ""
 
@@ -17929,26 +21289,60 @@ msgstr ""
 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
+#: View/SharingGroups/index.ctp:24
 msgid "Active Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:31
+#: View/SharingGroups/index.ctp:29
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:82
+#: View/SharingGroups/index.ctp:69
+msgid "Creator"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:80
+msgid "Org count"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:89
+msgid "Organisations:"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:119
 msgid "Distribution List"
 msgstr ""
 
-#: View/SharingGroups/view.ctp:28
+#: View/SharingGroups/index.ctp:152
+msgid "Are you sure you want to delete the sharing group?"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:159
+msgid "Delete Sharing Group"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:9
+msgid "Releasability"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:19
 msgid "Synced by"
 msgstr ""
 
+#: View/SharingGroups/view.ctp:47
+msgid "Is local"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:48
+msgid "Can extend"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:31
+msgid "%s organisation"
+msgid_plural "%s organisations"
+msgstr[0] ""
+msgstr[1] ""
+
 #: View/Sightingdb/index.ctp:41
 msgid "Quick Search"
 msgstr ""
@@ -18006,12 +21400,12 @@ msgstr ""
 msgid "My org"
 msgstr ""
 
-#: View/Sightings/ajax/list_sightings.ctp:10
-msgid "Attribute ID"
+#: View/Sightings/ajax/list_sightings.ctp:3
+msgid "Delete sighting"
 msgstr ""
 
-#: View/Sightings/ajax/list_sightings.ctp:35
-msgid "Delete sighting"
+#: View/Sightings/ajax/list_sightings.ctp:14
+msgid "Attribute ID"
 msgstr ""
 
 #: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
@@ -18072,52 +21466,59 @@ msgstr ""
 msgid "Unselectable Tag"
 msgstr ""
 
-#: View/Tags/index.ctp:10
-msgid "Your Favourite Tags"
+#: View/Tags/index.ctp:14
+msgid "Simple"
 msgstr ""
 
-#: View/Tags/index.ctp:56
-msgid "Filter user tags"
+#: View/Tags/index.ctp:19
+msgid "Advanced"
 msgstr ""
 
-#: View/Tags/index.ctp:63
+#: View/Tags/index.ctp:40
 msgid "Exportable"
 msgstr ""
 
-#: View/Tags/index.ctp:64
-#: View/Taxonomies/view.ctp:128
+#: View/Tags/index.ctp:47
+#: View/Taxonomies/view.ctp:117
 msgid "Hidden"
 msgstr ""
 
-#: View/Tags/index.ctp:66
+#: View/Tags/index.ctp:63
 msgid "Restricted to org"
 msgstr ""
 
-#: View/Tags/index.ctp:68
+#: View/Tags/index.ctp:70
 msgid "Restricted to user"
 msgstr ""
 
-#: View/Tags/index.ctp:70
+#: View/Tags/index.ctp:77
 msgid "Taxonomy"
 msgstr ""
 
-#: View/Tags/index.ctp:71
+#: View/Tags/index.ctp:85
 msgid "Tagged events"
 msgstr ""
 
-#: View/Tags/index.ctp:72
+#: View/Tags/index.ctp:92
 msgid "Tagged attributes"
 msgstr ""
 
-#: View/Tags/index.ctp:74;119
+#: View/Tags/index.ctp:109
 msgid "Favourite"
 msgstr ""
 
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
+#: View/Tags/index.ctp:125
 msgid "View graph"
 msgstr ""
 
+#: View/Tags/index.ctp:142
+msgid "Are you sure you want to delete the Tag?"
+msgstr ""
+
+#: View/Tags/index.ctp:144
+msgid "Delete tag"
+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 ""
@@ -18126,81 +21527,89 @@ msgstr ""
 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:36
+#: View/Tasks/index.ctp:29
 msgid "Frequency (h)"
 msgstr ""
 
-#: View/Tasks/index.ctp:55
+#: View/Tasks/index.ctp:48
 msgid "Set frequency timer for scheduled task"
 msgstr ""
 
-#: View/Tasks/index.ctp:70
+#: View/Tasks/index.ctp:63
 msgid "Set scheduled time for task"
 msgstr ""
 
-#: View/Tasks/index.ctp:96
+#: View/Tasks/index.ctp:89
 msgid "Update all"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:26
-msgid "Required"
-msgstr ""
-
-#: View/Taxonomies/index.ctp:27
+#: View/Taxonomies/index.ctp:78
 msgid "Active Tags"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:38
+#: View/Taxonomies/index.ctp:84
 msgid "enable all"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:38
+#: View/Taxonomies/index.ctp:84
 msgid "Enable all tags"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:38
+#: View/Taxonomies/index.ctp:84
 msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:29
-msgid "Are you sure you want to disable this taxonomy library?"
-msgstr ""
-
-#: View/Taxonomies/index.ctp:45
-#: View/Taxonomies/view.ctp:31
+#: View/Taxonomies/index.ctp:97
+#: View/Taxonomies/view.ctp:10
 msgid "Are you sure you want to enable this taxonomy library?"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:50
+#: View/Taxonomies/index.ctp:115
+#: View/Taxonomies/view.ctp:8
+msgid "Are you sure you want to disable this taxonomy library?"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:131
 msgid "Delete taxonomy"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:62
+#: View/Taxonomies/index.ctp:140
+msgid "View taxonomy"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:42
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:68;69
+#: View/Taxonomies/view.ctp:48;49
 msgid "Hide selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:73;74
+#: View/Taxonomies/view.ctp:53;54
 msgid "Unhide selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:84
+#: View/Taxonomies/view.ctp:64
 msgid "Expanded"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:85
+#: View/Taxonomies/view.ctp:65
 msgid "Numerical value"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:154
+#: View/Taxonomies/view.ctp:85
+msgid "Numerical value overridden by userSetting.&#10;Original numerical_value = %s"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:126
+msgid "View correlation graph"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:143
 msgid "Refresh"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:159
+#: View/Taxonomies/view.ctp:148
 msgid "Refresh or enable"
 msgstr ""
 
@@ -18209,7 +21618,7 @@ 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."
+msgid "Are you sure you want to delete Taxonomy #%s?<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
@@ -18390,7 +21799,7 @@ msgstr ""
 msgid "Templates"
 msgstr ""
 
-#: View/Templates/index.ctp:45
+#: View/Templates/index.ctp:38
 msgid "Are you sure you want to delete Template #"
 msgstr ""
 
@@ -18422,23 +21831,23 @@ msgstr ""
 msgid "Shareable"
 msgstr ""
 
-#: View/Threads/index.ctp:23
+#: View/Threads/index.ctp:16
 msgid "Last Post On"
 msgstr ""
 
-#: View/Threads/index.ctp:24
+#: View/Threads/index.ctp:17
 msgid "Last Post By"
 msgstr ""
 
-#: View/Threads/index.ctp:25
+#: View/Threads/index.ctp:18
 msgid "Thread started On"
 msgstr ""
 
-#: View/Threads/index.ctp:26
+#: View/Threads/index.ctp:19
 msgid "Posts"
 msgstr ""
 
-#: View/Threads/index.ctp:81
+#: View/Threads/index.ctp:73
 msgid "View Discussion"
 msgstr ""
 
@@ -18486,11 +21895,11 @@ msgstr ""
 msgid "Accept registrations"
 msgstr ""
 
-#: View/Users/accept_registrations.ctp:98
+#: View/Users/accept_registrations.ctp:97
 msgid "The selected Role does not satisfy the user request"
 msgstr ""
 
-#: View/Users/accept_registrations.ctp:102
+#: View/Users/accept_registrations.ctp:101
 msgid "The selected Role satisfies the user request"
 msgstr ""
 
@@ -18499,19 +21908,20 @@ msgid "Admin Add User"
 msgstr ""
 
 #: View/Users/admin_add.ctp:32
-#: View/Users/admin_edit.ctp:32
+#: View/Users/admin_edit.ctp:37
 msgid "Set password"
 msgstr ""
 
 #: View/Users/admin_add.ctp:37
-#: View/Users/admin_edit.ctp:37
-#: View/Users/edit.ctp:10
-msgid "Length"
+#: View/Users/change_pw.ctp:6
+#: View/Users/edit.ctp:11
+msgid "Minimal length"
 msgstr ""
 
 #: View/Users/admin_add.ctp:38
-#: View/Users/admin_edit.ctp:38
-#: View/Users/edit.ctp:11
+#: View/Users/admin_edit.ctp:46
+#: View/Users/change_pw.ctp:7
+#: View/Users/edit.ctp:12
 msgid "Complexity"
 msgstr ""
 
@@ -18520,66 +21930,104 @@ msgid "Choose organisation"
 msgstr ""
 
 #: View/Users/admin_add.ctp:66
-#: View/Users/admin_edit.ctp:60
+#: View/Users/admin_edit.ctp:69
 msgid "Sync user for"
 msgstr ""
 
 #: View/Users/admin_add.ctp:70
-#: View/Users/admin_edit.ctp:64
-#: View/Users/edit.ctp:23
-msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL 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/admin_edit.ctp:73
 #: View/Users/edit.ctp:25
-msgid "Fetch GnuPG key"
+#: View/Users/view.ctp:80
+msgid "PGP key"
+msgstr ""
+
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:73
+#: View/Users/edit.ctp:25
+msgid "Paste the user's PGP key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch PGP key\" below."
+msgstr ""
+
+#: View/Users/admin_add.ctp:72
+#: View/Users/admin_edit.ctp:75
+msgid "Fetch the user's PGP key"
+msgstr ""
+
+#: View/Users/admin_add.ctp:72
+#: View/Users/admin_edit.ctp:75
+#: View/Users/edit.ctp:27
+msgid "Fetch PGP key"
 msgstr ""
 
 #: View/Users/admin_add.ctp:74
-#: View/Users/admin_edit.ctp:68
-msgid "SMIME key"
+#: View/Users/admin_edit.ctp:78
+#: View/Users/edit.ctp:30
+msgid "S/MIME Public certificate (PEM format)"
 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."
+#: View/Users/admin_edit.ctp:78
+msgid "Paste the user's S/MIME public key in PEM format here."
+msgstr ""
+
+#: View/Users/admin_add.ctp:80
+#: View/Users/admin_edit.ctp:88
+#: View/Users/edit.ctp:33
+msgid "Receive email alerts when events are published"
+msgstr ""
+
+#: View/Users/admin_add.ctp:85
+#: View/Users/admin_edit.ctp:89
+#: View/Users/edit.ctp:34
+msgid "Receive email alerts from \"Contact reporter\" requests"
 msgstr ""
 
 #: View/Users/admin_add.ctp:89
-#: View/Users/admin_edit.ctp:78
-msgid "Disable this user account"
+#: View/Users/admin_edit.ctp:90
+msgid "Immediately disable this user account"
 msgstr ""
 
 #: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
+#: View/Users/admin_add.ctp:99
+msgid "Create user"
+msgstr ""
+
 #: View/Users/admin_edit.ctp:4
 msgid "Admin Edit User"
 msgstr ""
 
-#: View/Users/admin_edit.ctp:69
-#: View/Users/admin_view.ctp:69
-#: View/Users/view.ctp:30
-msgid "Terms accepted"
+#: View/Users/admin_edit.ctp:8
+msgid "User login change is disabled on this instance"
 msgstr ""
 
-#: View/Users/admin_edit.ctp:74
-msgid "Reset Auth Key"
+#: View/Users/admin_edit.ctp:39;86
+msgid "User password change is disabled on this instance"
 msgstr ""
 
-#: View/Users/admin_edit.ctp:86
+#: View/Users/admin_edit.ctp:45
+msgid "Length"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:63
+msgid "(Reset)"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:84
+msgid "User must change password"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:98
 #: View/Users/change_pw.ctp:18
-#: View/Users/edit.ctp:36
+#: View/Users/edit.ctp:42
 msgid "Confirm with your current password"
 msgstr ""
 
+#: View/Users/admin_edit.ctp:103
+msgid "Edit user"
+msgstr ""
+
 #: View/Users/admin_email.ctp:2
 msgid "Contact User(s)"
 msgstr ""
@@ -18605,7 +22053,7 @@ msgid "You can then specify (if eligible) what the e-mail address of the target
 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."
+msgid "In the case of a new user, you can specify the future user's PGP key, to send his/her new key in an encrypted e-mail."
 msgstr ""
 
 #: View/Users/admin_email.ctp:13
@@ -18672,10 +22120,6 @@ msgstr ""
 msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
 msgstr ""
 
-#: View/Users/admin_index.ctp:6
-msgid "here"
-msgstr ""
-
 #: View/Users/admin_index.ctp:9;10
 msgid "Reset all sync user API keys"
 msgstr ""
@@ -18684,49 +22128,35 @@ msgstr ""
 msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
 msgstr ""
 
-#: View/Users/admin_index.ctp:68
-msgid "authkey"
+#: View/Users/admin_index.ctp:116
+msgid "S/MIME"
 msgstr ""
 
-#: View/Users/admin_index.ctp:83
-#: View/Users/admin_view.ctp:27
-#: View/Users/view.ctp:8
-msgid "Contactalert"
-msgstr ""
-
-#: View/Users/admin_index.ctp:90
-msgid "PGP Key"
-msgstr ""
-
-#: View/Users/admin_index.ctp:97
-msgid "SMIME"
-msgstr ""
-
-#: View/Users/admin_index.ctp:105
-msgid "NIDS SID"
-msgstr ""
-
-#: View/Users/admin_index.ctp:111
+#: View/Users/admin_index.ctp:130
 msgid "Terms Accepted"
 msgstr ""
 
-#: View/Users/admin_index.ctp:118
+#: View/Users/admin_index.ctp:137
 msgid "Last Login"
 msgstr ""
 
-#: View/Users/admin_index.ctp:132
+#: View/Users/admin_index.ctp:140
+msgid "Never"
+msgstr ""
+
+#: View/Users/admin_index.ctp:152
 msgid "External Auth"
 msgstr ""
 
-#: View/Users/admin_index.ctp:140
+#: View/Users/admin_index.ctp:160
 msgid "Monitored"
 msgstr ""
 
-#: View/Users/admin_index.ctp:162
+#: View/Users/admin_index.ctp:179
 msgid "Users index"
 msgstr ""
 
-#: View/Users/admin_index.ctp:201
+#: View/Users/admin_index.ctp:219
 msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -18742,52 +22172,6 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
-#: View/Users/admin_view.ctp:30
-#: View/Users/view.ctp:11
-msgid "Request API access"
-msgstr ""
-
-#: View/Users/admin_view.ctp:47
-msgid "Customauth header"
-msgstr ""
-
-#: View/Users/admin_view.ctp:55
-msgid "Invited By"
-msgstr ""
-
-#: View/Users/admin_view.ctp:67
-msgid "Org_admin"
-msgstr ""
-
-#: View/Users/admin_view.ctp:68
-#: View/Users/view.ctp:29
-msgid "NIDS Start SID"
-msgstr ""
-
-#: View/Users/admin_view.ctp:70
-msgid "Password change"
-msgstr ""
-
-#: View/Users/admin_view.ctp:78
-#: View/Users/view.ctp:38
-msgid "GnuPG fingerprint"
-msgstr ""
-
-#: View/Users/admin_view.ctp:83
-#: View/Users/view.ctp:43
-msgid "GnuPG status"
-msgstr ""
-
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:50
-msgid "S/MIME Public certificate"
-msgstr ""
-
-#: View/Users/admin_view.ctp:119
-#: View/Users/view.ctp:65
-msgid "Download user profile for data portability"
-msgstr ""
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr ""
@@ -18796,19 +22180,39 @@ msgstr ""
 msgid "No failed composites"
 msgstr ""
 
-#: View/Users/edit.ctp:27
-msgid "SMIME Public certificate (PEM format)"
+#: View/Users/email_otp.ctp:5
+msgid "Your administrator has turned on an additional authentication step which\n      requires you to enter a OTP (one time password) you have received via email."
 msgstr ""
 
-#: View/Users/login.ctp:37;53
+#: View/Users/email_otp.ctp:8
+msgid "Make sure to check your SPAM folder."
+msgstr ""
+
+#: View/Users/email_otp.ctp:9
+msgid "Resend"
+msgstr ""
+
+#: View/Users/email_otp.ctp:17
+msgid "Validate your OTP"
+msgstr ""
+
+#: View/Users/email_otp.ctp:21
+msgid "One Time Password"
+msgstr ""
+
+#: View/Users/email_otp.ctp:23
+msgid "Enter your OTP here"
+msgstr ""
+
+#: View/Users/login.ctp:38;53
 msgid "Login"
 msgstr ""
 
-#: View/Users/login.ctp:47
+#: View/Users/login.ctp:48
 msgid "Registration will be sent to the administrators of the instance for consideration."
 msgstr ""
 
-#: View/Users/login.ctp:48
+#: View/Users/login.ctp:49
 msgid "No account yet? Register now!"
 msgstr ""
 
@@ -18911,45 +22315,38 @@ msgstr ""
 msgid "Proposals active"
 msgstr ""
 
-#: View/Users/statistics.ctp:25
-#: View/Users/statistics_data.ctp:30
-#: View/Users/statistics_orgs.ctp:34
-#: View/Users/ajax/admin_index.ctp:3
-msgid "Users"
-msgstr ""
-
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:40
+#: View/Users/statistics_data.ctp:42
 msgid "Discussion threads"
 msgstr ""
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:45
+#: View/Users/statistics_data.ctp:47
 msgid "Discussion posts"
 msgstr ""
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:54
+#: View/Users/statistics_data.ctp:56
 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
+#: View/Users/statistics_data.ctp:73
 msgid "Go left"
 msgstr ""
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:77
+#: View/Users/statistics_data.ctp:79
 msgid "Go right"
 msgstr ""
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:124
+#: View/Users/statistics_data.ctp:126
 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
+#: View/Users/statistics_data.ctp:130
 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 ""
 
@@ -18966,6 +22363,10 @@ msgid "Local Organisations"
 msgstr ""
 
 #: View/Users/statistics_data.ctp:38
+msgid "Event creator orgs"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:40
 msgid "Average Users / Org"
 msgstr ""
 
@@ -19001,10 +22402,6 @@ msgstr ""
 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 ""
@@ -19037,6 +22434,74 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
+#: View/Users/view.ctp:10;69
+msgid "Send email to user"
+msgstr ""
+
+#: View/Users/view.ctp:18
+msgid "Event alert enabled"
+msgstr ""
+
+#: View/Users/view.ctp:19
+msgid "Contact alert enabled"
+msgstr ""
+
+#: View/Users/view.ctp:23;39
+msgid "Auth key"
+msgstr ""
+
+#: View/Users/view.ctp:24
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/view.ctp:47
+msgid "Customauth header"
+msgstr ""
+
+#: View/Users/view.ctp:56
+msgid "Invited By"
+msgstr ""
+
+#: View/Users/view.ctp:72
+msgid "Org admin"
+msgstr ""
+
+#: View/Users/view.ctp:74
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/view.ctp:77
+msgid "Must change password"
+msgstr ""
+
+#: View/Users/view.ctp:86
+msgid "PGP key fingerprint"
+msgstr ""
+
+#: View/Users/view.ctp:91
+msgid "PGP key status"
+msgstr ""
+
+#: View/Users/view.ctp:98
+msgid "S/MIME Public certificate"
+msgstr ""
+
+#: View/Users/view.ctp:109
+msgid "News read at"
+msgstr ""
+
+#: View/Users/view.ctp:126
+msgid "User %s"
+msgstr ""
+
+#: View/Users/view.ctp:136
+msgid "Download user profile for data portability"
+msgstr ""
+
+#: View/Users/view.ctp:138
+msgid "Auth keys"
+msgstr ""
+
 #: View/Users/ajax/discardRegistrations.ctp:5
 msgid "Discard User Registrations"
 msgstr ""
@@ -19053,6 +22518,10 @@ msgstr ""
 msgid "You are about to send a mail to %s recipient(s)?"
 msgstr ""
 
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
+msgid "Send"
+msgstr ""
+
 #: View/Users/ajax/fetchpgpkey.ctp:2
 msgid "Choose the key that you would like to use"
 msgstr ""
@@ -19078,7 +22547,7 @@ msgid "Associated E-mail addresses"
 msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:16
-msgid "Select GnuPG key"
+msgid "Select PGP key"
 msgstr ""
 
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:3
@@ -19109,26 +22578,18 @@ msgstr ""
 msgid "Submit password reset"
 msgstr ""
 
-#: View/Warninglists/index.ctp:2
+#: View/Warninglists/index.ctp:44
 msgid "Warninglists"
 msgstr ""
 
-#: View/Warninglists/index.ctp:35
+#: View/Warninglists/index.ctp:77
 msgid "Valid attributes"
 msgstr ""
 
-#: View/Warninglists/index.ctp:36
+#: View/Warninglists/index.ctp:83
 msgid "Entries"
 msgstr ""
 
-#: View/Warninglists/index.ctp:61
-msgid "Delete Warninglist"
-msgstr ""
-
-#: View/Warninglists/index.ctp:61
-msgid "Delete warninglist"
-msgstr ""
-
 #: View/Warninglists/view.ctp:14
 msgid "Accepted attribute types"
 msgstr ""
@@ -19141,21 +22602,48 @@ msgstr ""
 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"
+#: View/genericTemplates/delete.ctp:9
+msgid "Delete %s"
 msgstr ""
 
-#: View/Whitelists/admin_edit.ctp:4
-msgid "Edit Signature Whitelist"
+#: View/genericTemplates/delete.ctp:20
+msgid "Are you sure you want to delete %s #%s?"
 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)."
+#: Model/Allowedlist.php:validation for field name
+#: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
+#: Model/DecayingModelMapping.php:validation for field attribute_type;validation for field model_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/GalaxyClusterRelationTag.php:validation for field galaxy_cluster_relation_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/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
+msgid "valueNotEmpty"
+msgstr ""
+
+#: Model/Allowedlist.php:validation for field name
+msgid "Name not in the right format. Allowedlist 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 ""
+
+#: Model/Allowedlist.php:validation for field name
+#: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
+msgid "A similar name already exists."
 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/EventReport.php:validation for field event_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
@@ -19173,10 +22661,16 @@ msgid "Options : Payload delivery, Antivirus detection, Payload installation, Fi
 msgstr ""
 
 #: Model/Attribute.php:validation for field value
+#: Model/GalaxyCluster.php:validation for field value
+#: Model/GalaxyClusterRelation.php:validation for field referenced_galaxy_cluster_type
 #: Model/ShadowAttribute.php:validation for field value
 msgid "stringNotEmpty"
 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
 #: Model/ShadowAttribute.php:validation for field value
 msgid "Value not in the right type/format. Please double check the value or select type \"other\"."
@@ -19186,16 +22680,13 @@ msgstr ""
 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/GalaxyCluster.php:validation for field published
 #: Model/Server.php:validation for field push;validation for field pull;validation for field push_sightings
 #: 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
@@ -19204,22 +22695,28 @@ msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
 #: Model/Dashboard.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/Event.php:validation for field uuid
+#: Model/EventBlocklist.php:validation for field event_uuid
+#: Model/EventReport.php:validation for field uuid
+#: Model/GalaxyCluster.php:validation for field uuid
 #: Model/MispObject.php:validation for field uuid
-#: Model/OrgBlacklist.php:validation for field org_uuid
+#: Model/OrgBlocklist.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"
+#: Model/TagCollection.php:validation for field uuid
+msgid "Please provide a valid RFC 4122 UUID"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/EventReport.php:validation for field uuid
+#: Model/GalaxyCluster.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
+#: Model/EventReport.php:validation for field distribution
 msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group, Inherit event"
 msgstr ""
 
@@ -19229,27 +22726,6 @@ msgstr ""
 msgid "Invalid ISO 8601 format"
 msgstr ""
 
-#: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
-#: Model/DecayingModelMapping.php:validation for field attribute_type;validation for field model_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 ""
@@ -19270,8 +22746,14 @@ msgstr ""
 msgid "Options : 0, 1, 2 (for Initial, Ongoing, Completed)"
 msgstr ""
 
-#: Model/EventBlacklist.php:validation for field event_uuid
-msgid "Event already blacklisted."
+#: Model/Event.php:validation for field extends_uuid
+#: Model/GalaxyClusterBlocklist.php:validation for field cluster_uuid
+#: Model/GalaxyClusterRelation.php:validation for field galaxy_cluster_uuid;validation for field referenced_galaxy_cluster_uuid
+msgid "Please provide a valid UUID"
+msgstr ""
+
+#: Model/EventBlocklist.php:validation for field event_uuid
+msgid "Event already blocklisted."
 msgstr ""
 
 #: Model/EventGraph.php:validation for field network_json
@@ -19297,6 +22779,15 @@ msgstr ""
 msgid "Please enter a numeric event ID or leave this field blank."
 msgstr ""
 
+#: Model/GalaxyCluster.php:validation for field distribution
+#: Model/GalaxyClusterRelation.php:validation for field distribution
+msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group"
+msgstr ""
+
+#: Model/GalaxyClusterBlocklist.php:validation for field cluster_uuid
+msgid "Galaxy Cluster already blocklisted."
+msgstr ""
+
 #: Model/Log.php:validation for field action
 msgid "Options : ..."
 msgstr ""
@@ -19305,8 +22796,8 @@ msgstr ""
 msgid "A relationship with this name already exists."
 msgstr ""
 
-#: Model/OrgBlacklist.php:validation for field org_uuid
-msgid "Organisation already blacklisted."
+#: Model/OrgBlocklist.php:validation for field org_uuid
+msgid "Organisation already blocklisted."
 msgstr ""
 
 #: Model/Organisation.php:validation for field name
@@ -19365,12 +22856,6 @@ msgstr ""
 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 ""
@@ -19441,7 +22926,3 @@ msgstr ""
 msgid "isValidJson"
 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 ""
-

From 76472bf3fc851e769be3b011a3739f3f910cf002 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Fri, 26 Mar 2021 13:52:01 +0900
Subject: [PATCH 412/437] chg: [i18n] Fix mrg conflict

---
 app/Locale/default.pot | 11825 ++++++++++++++-------------------------
 1 file changed, 4172 insertions(+), 7653 deletions(-)
 mode change 100755 => 100644 app/Locale/default.pot

diff --git a/app/Locale/default.pot b/app/Locale/default.pot
old mode 100755
new mode 100644
index b977369d4..3744326ff
--- a/app/Locale/default.pot
+++ b/app/Locale/default.pot
@@ -38,7 +38,6 @@ msgid "Worker started."
 msgstr ""
 
 #: Console/Command/AdminShell.php:141
-#: Controller/Component/CRUDComponent.php:175
 msgid "%s updated."
 msgstr ""
 
@@ -46,171 +45,78 @@ msgstr ""
 msgid "Could not update %s."
 msgstr ""
 
-#: Console/Command/AdminShell.php:225
-msgid "All object templates are up to date already."
-msgstr ""
-
-#: Console/Command/AdminShell.php:227
-msgid "Could not update any of the object templates."
-msgstr ""
-
-#: Console/Command/AdminShell.php:229
-msgid "Successfully updated %s object templates."
-msgstr ""
-
-#: Console/Command/AdminShell.php:231
-msgid " However, could not update %s object templates."
-msgstr ""
-
-#: Console/Command/AdminShell.php:472
+#: Console/Command/AdminShell.php:466
 msgid "Update the JSON definitions of MISP."
 msgstr ""
 
-#: Console/Command/AdminShell.php:475
+#: Console/Command/AdminShell.php:469
 msgid "Update the submodules before ingestion."
 msgstr ""
 
-#: Console/Command/AdminShell.php:505
+#: Console/Command/AdminShell.php:499
 msgid "Last DB num which was successfully executed: "
 msgstr ""
 
-#: Console/Command/AdminShell.php:514
+#: Console/Command/AdminShell.php:508
 msgid "Something went wrong. Could not find the existing db version"
 msgstr ""
 
-#: Console/Command/AdminShell.php:517
+#: Console/Command/AdminShell.php:511
 msgid "DB was never successfully updated or we are on a fresh install"
 msgstr ""
 
-#: Console/Command/AdminShell.php:534
+#: Console/Command/AdminShell.php:528
 msgid "MISP mass sync authkey reset command line tool.\n\nUsage: %sConsole/cake resetSyncAuthkeys [user_id]"
 msgstr ""
 
-#: Console/Command/AdminShell.php:542
-#: Controller/UsersController.php:1311;2341
+#: Console/Command/AdminShell.php:536
+#: Controller/UsersController.php:1283;2221
 #: Model/Dashboard.php:129
 msgid "Invalid user."
 msgstr ""
 
-#: Console/Command/AdminShell.php:545
+#: Console/Command/AdminShell.php:539
 msgid "User has to be a site admin."
 msgstr ""
 
-#: Console/Command/AdminShell.php:569
+#: Console/Command/AdminShell.php:563
 msgid "\nError: %s\n"
 msgstr ""
 
-#: Console/Command/AdminShell.php:571
+#: Console/Command/AdminShell.php:565
 msgid "%s events purged.\n"
 msgstr ""
 
-#: Console/Command/AdminShell.php:593
+#: Console/Command/AdminShell.php:587
 msgid "> Database schema dumped on disk"
 msgstr ""
 
-#: Console/Command/AdminShell.php:595
+#: Console/Command/AdminShell.php:589
 msgid "Something went wrong. Could not find the existing db version or fetch the current database schema."
 msgstr ""
 
-#: Console/Command/DevShell.php:7
-msgid "Massaging the feed metadata file."
-msgstr ""
-
-#: Console/Command/DevShell.php:11
-msgid "Could not read the defaults.json file at %s. Exiting"
-msgstr ""
-
-#: Console/Command/DevShell.php:38
-msgid "Done. The feed definitions contain %s feeds and can be found at %s."
-msgstr ""
-
-#: Console/Command/DevShell.php:45
-msgid "Something went wrong."
-msgstr ""
-
-#: Console/Command/EventShell.php:20
-msgid "Import event from file into MISP."
-msgstr ""
-
-#: Console/Command/EventShell.php:23
-msgid "User ID that will owner of uploaded event."
-msgstr ""
-
-#: Console/Command/EventShell.php:24
-msgid "Path to JSON MISP file, can be gzipped or bz2 compressed."
-msgstr ""
-
-#: Console/Command/EventShell.php:83
-#: Controller/AttributesController.php:120;1170;1242;1372
-#: Controller/EventGraphController.php:62
-#: Controller/EventReportsController.php:512
-#: Controller/EventsController.php:1081;1506;1580;2272;2392;2530;2647;2734;3054;5130;5161;5400;5404;5413;5711;5717
-#: Controller/ObjectReferencesController.php:241
-#: Controller/PostsController.php:54
-#: Model/Galaxy.php:443
+#: Console/Command/EventShell.php:15
+#: Controller/AttributesController.php:118;122;126
+#: Controller/EventGraphController.php:34;69
+#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
+#: Controller/PostsController.php:56
+#: Model/Galaxy.php:293
 msgid "Invalid event"
 msgstr ""
 
-#: Console/Command/EventShell.php:463
-msgid "Recovering event %s"
-msgstr ""
-
-#: Console/Command/EventShell.php:468
-#: Controller/EventsController.php:5633
-msgid "Recovery complete. Event #%s recovered, using %s log entries."
-msgstr ""
-
 #: Console/Command/PasswordShell.php:46
 msgid "override password change"
 msgstr ""
 
-#: Console/Command/ServerShell.php:149
-#: Controller/ServersController.php:734
-msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled, %s sightings pulled, %s clusters pulled."
+#: Console/Command/ServerShell.php:83
+#: Controller/ServersController.php:674
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled, %s sightings pulled."
 msgstr ""
 
-#: Console/Command/ServerShell.php:152;156
+#: Console/Command/ServerShell.php:85
 msgid "ERROR: %s"
 msgstr ""
 
-#: Console/Command/ServerShell.php:358;514
-msgid "Job failed. See error logs for more details."
-msgstr ""
-
-#: Console/Command/ServerShell.php:369;525
-msgid "See error logs for more details."
-msgstr ""
-
-#: Console/Command/ServerShell.php:363;519
-msgid "%s feed from %s cached. Failed: %s"
-msgid_plural "%s feeds from %s cached. Failed: %s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: Console/Command/StatisticsShell.php:162
-msgid "Processing organisation %s / %s.%s"
-msgstr ""
-
-#: Console/Command/StatisticsShell.php:202
-msgid "Total local orgs: %s%s"
-msgstr ""
-
-#: Console/Command/StatisticsShell.php:203
-msgid "Local orgs with event creations: %s%s"
-msgstr ""
-
-#: Console/Command/StatisticsShell.php:204
-msgid "Average days until first event: %s"
-msgstr ""
-
-#: Console/Command/StatisticsShell.php:241
-msgid "Year over year growth of organisation count."
-msgstr ""
-
-#: Console/Command/StatisticsShell.php:250
-msgid "%s: %s %s%s"
-msgstr ""
-
 #: Console/Command/TrainingShell.php:682
 msgid "verbose mode"
 msgstr ""
@@ -219,382 +125,287 @@ msgstr ""
 msgid "interactive mode"
 msgstr ""
 
-#: Controller/AppController.php:355
-msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
-msgstr ""
-
-#: Controller/AppController.php:379
-msgid "WARNING: MISP is currently running under PHP 8.0, which is unsupported. Background jobs will fail, so please contact your administrator to run a supported PHP version (such as 7.4)"
-msgstr ""
-
-#: Controller/AppController.php:502
-msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
-msgstr ""
-
-#: Controller/AppController.php:537
+#: Controller/AppController.php:382
 msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
 msgstr ""
 
-#: Controller/AppController.php:537
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:969
+#: Controller/AppController.php:382
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
 msgid "Update Progress"
 msgstr ""
 
-#: Controller/AppController.php:558
-msgid "Your user account has been disabled."
+#: Controller/AppController.php:389
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
 msgstr ""
 
-#: Controller/AppController.php:894
-#: Controller/AttributesController.php:1784;1919
-#: Controller/EventsController.php:3126
+#: Controller/AppController.php:519
+msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
+msgstr ""
+
+#: Controller/AppController.php:739
+#: Controller/AttributesController.php:1917;2026;2130
+#: Controller/EventsController.php:3277
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr ""
 
-#: Controller/AppController.php:903
-#: Controller/AttributesController.php:1923
-#: Controller/EventsController.php:3130
+#: Controller/AppController.php:748
+#: Controller/AttributesController.php:2134
+#: Controller/EventsController.php:3281
 msgid "You have to be logged in to do that."
 msgstr ""
 
-#: Controller/AppController.php:919
-#: Controller/Component/IndexFilterComponent.php:25
+#: Controller/AppController.php:764
+#: Controller/Component/IndexFilterComponent.php:23
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr ""
 
-#: Controller/AppController.php:1035
+#: Controller/AppController.php:902
 msgid "All done. attribute_count generated from scratch for "
 msgstr ""
 
-#: Controller/AppController.php:1158
-#: Controller/AttributesController.php:1977
-#: Controller/ShadowAttributesController.php:1101
+#: Controller/AppController.php:1025
+#: Controller/AttributesController.php:2188
+#: Controller/ShadowAttributesController.php:1267
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr ""
 
-#: Controller/AppController.php:1357
+#: Controller/AppController.php:1211
 msgid "RestSearch is not implemented (yet) for this scope."
 msgstr ""
 
-#: Controller/AppController.php:1371
-msgid "Restsearch queries using GET and no parameters are not allowed. If you have passed parameters via a JSON body, make sure you use POST requests."
-msgstr ""
-
-#: Controller/AttributesController.php:113;1161
-#: Controller/EventGraphController.php:22;70
-#: Controller/EventReportsController.php:38
+#: Controller/AttributesController.php:109;1339
+#: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr ""
 
-#: Controller/AttributesController.php:116
+#: Controller/AttributesController.php:112
 msgid "You do not have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:123;363;523;719;1173;2957
-#: Controller/EventGraphController.php:81
-#: Controller/EventReportsController.php:515
-#: Controller/EventsController.php:2002;2023;2065;2158;5280;5326
-#: Controller/ObjectsController.php:47;177;740;805;1160
-#: Model/Attribute.php:4169;4173
+#: Controller/AttributesController.php:132;422;602;832;3168;3183
+#: Controller/EventGraphController.php:88
+#: Controller/EventsController.php:2107;2128;2162
+#: Controller/ObjectsController.php:837
+#: Model/Attribute.php:4323;4327
 msgid "You do not have permission to do that."
 msgstr ""
 
-#: Controller/AttributesController.php:143;369;744;1414
-#: Controller/EventsController.php:1884;1888
-msgid "Invalid Sharing Group or not authorised."
-msgstr ""
-
-#: Controller/AttributesController.php:330;1790
-msgid "Attribute does not exists or you do not have the permission to download this attribute."
-msgstr ""
-
-#: Controller/AttributesController.php:348
-msgid "Attribute not an attachment or malware-sample"
-msgstr ""
-
-#: Controller/AttributesController.php:360
-#: Controller/EventsController.php:4284;4654
-msgid "Invalid Event."
-msgstr ""
-
-#: Controller/AttributesController.php:385;534
-#: Controller/DecayingModelController.php:56
-#: Controller/GalaxiesController.php:162
-#: Controller/ShadowAttributesController.php:489
-msgid "PHP says file was not uploaded. Are you attacking me?"
-msgstr ""
-
-#: Controller/AttributesController.php:457
-msgid "Some of the attachments failed to upload. The failed files were: %s - This can be caused by the attachments already existing in the event."
-msgstr ""
-
-#: Controller/AttributesController.php:461
-msgid "The attachment(s) could not be saved. Please contact your administrator."
-msgstr ""
-
-#: Controller/AttributesController.php:537
-#: Controller/ShadowAttributesController.php:492;502
-msgid "There was a problem to upload the file."
-msgstr ""
-
-#: Controller/AttributesController.php:681
-msgid "The ThreatConnect data has been imported."
-msgstr ""
-
-#: Controller/AttributesController.php:684
-msgid "%s entries imported."
-msgstr ""
-
-#: Controller/AttributesController.php:688
-msgid "%s entries could not be imported."
-msgstr ""
-
-#: Controller/AttributesController.php:715;975;2007;2061;2621;2632;2638;2713;2829;2862;2874;2878
-#: Controller/ObjectsController.php:621
-#: Controller/ShadowAttributesController.php:801
-#: Controller/TagsController.php:390
-#: Model/Attribute.php:4161
+#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
+#: Controller/ObjectsController.php:641
+#: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
+#: Controller/TagsController.php:506
+#: Model/Attribute.php:4315
 msgid "Invalid attribute"
 msgstr ""
 
-#: Controller/AttributesController.php:768
+#: Controller/AttributesController.php:355
+#: Controller/ShadowAttributesController.php:483
+msgid "You do not have the permission to view this event."
+msgstr ""
+
+#: Controller/AttributesController.php:402
+msgid "Attribute not an attachment or malware-sample"
+msgstr ""
+
+#: Controller/AttributesController.php:419;586;892;1348
+#: Controller/EventsController.php:4432;4446;5219;5233
+msgid "Invalid Event."
+msgstr ""
+
+#: Controller/AttributesController.php:437;613
+#: Controller/DecayingModelController.php:56
+#: Controller/ShadowAttributesController.php:530
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr ""
+
+#: Controller/AttributesController.php:616
+#: Controller/ShadowAttributesController.php:533;543
+msgid "There was a problem to upload the file."
+msgstr ""
+
+#: Controller/AttributesController.php:760
+msgid "The ThreatConnect data has been imported."
+msgstr ""
+
+#: Controller/AttributesController.php:763
+msgid "%s entries imported."
+msgstr ""
+
+#: Controller/AttributesController.php:767
+msgid "%s entries could not be imported."
+msgstr ""
+
+#: Controller/AttributesController.php:876
 msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
 msgstr ""
 
-#: Controller/AttributesController.php:772;774
+#: Controller/AttributesController.php:880;882
+#: Controller/ShadowAttributesController.php:817
 msgid "Invalid attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:799
+#: Controller/AttributesController.php:909
 msgid "The attribute has been saved"
 msgstr ""
 
-#: Controller/AttributesController.php:836
+#: Controller/AttributesController.php:944
 msgid "The attribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/AttributesController.php:930
-#: Controller/EventsController.php:2410
-#: Controller/ShadowAttributesController.php:675
+#: Controller/AttributesController.php:1036
+#: Controller/ObjectsController.php:515
+msgid "Invalid event id."
+msgstr ""
+
+#: Controller/AttributesController.php:1072
+#: Controller/EventsController.php:2466
+#: Controller/ShadowAttributesController.php:717
 msgid "Invalid input."
 msgstr ""
 
-#: Controller/AttributesController.php:935
+#: Controller/AttributesController.php:1077
 msgid "Invalid field."
 msgstr ""
 
-#: Controller/AttributesController.php:1065;1141
+#: Controller/AttributesController.php:1125;1161
+msgid "Invalid attribute id."
+msgstr ""
+
+#: Controller/AttributesController.php:1242;1319
 msgid "This function is only accessible via POST requests."
 msgstr ""
 
-#: Controller/AttributesController.php:1072;1082
+#: Controller/AttributesController.php:1249;1259
 msgid "Attribute deleted"
 msgstr ""
 
-#: Controller/AttributesController.php:1077;1079
+#: Controller/AttributesController.php:1254;1256
 msgid "Attribute was not deleted"
 msgstr ""
 
-#: Controller/AttributesController.php:1103;2455
+#: Controller/AttributesController.php:1281;2675
+#: Controller/ShadowAttributesController.php:853
 msgid "Invalid Attribute"
 msgstr ""
 
-#: Controller/AttributesController.php:1130
+#: Controller/AttributesController.php:1308
 msgid "Could not restore the attribute"
 msgstr ""
 
-#: Controller/AttributesController.php:1199
+#: Controller/AttributesController.php:1374
 msgid "No matching attributes found."
 msgstr ""
 
-#: Controller/AttributesController.php:1233
-msgid "This method can only be accessed via AJAX and POST."
+#: Controller/AttributesController.php:1408
+msgid "This method can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:1236
-msgid "No event ID provided."
-msgstr ""
-
-#: Controller/AttributesController.php:1245;1375
+#: Controller/AttributesController.php:1418
 msgid "You are not authorized to edit this event."
 msgstr ""
 
-#: Controller/AttributesController.php:1249
-msgid "No attributes selected"
+#: Controller/AttributesController.php:1532
+msgid "No event ID provided."
 msgstr ""
 
-#: Controller/AttributesController.php:1295
-#: Controller/GalaxiesController.php:415
+#: Controller/AttributesController.php:1577
+#: Controller/GalaxiesController.php:276
 msgid "Synonyms: "
 msgstr ""
 
-#: Controller/AttributesController.php:1363
-msgid "This method can only be accessed via POST."
-msgstr ""
-
-#: Controller/AttributesController.php:1777
+#: Controller/AttributesController.php:1912;2019
 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:1954
-#: Controller/ShadowAttributesController.php:1079
+#: Controller/AttributesController.php:1925
+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:1945
+msgid "You don't have access to that event."
+msgstr ""
+
+#: Controller/AttributesController.php:2008
+msgid "No matches."
+msgstr ""
+
+#: Controller/AttributesController.php:2030;2039
+msgid "Invalid attribute or no authorisation to view it."
+msgstr ""
+
+#: Controller/AttributesController.php:2165
+#: Controller/ShadowAttributesController.php:1245
 msgid "All done. "
 msgstr ""
 
-#: Controller/AttributesController.php:1986;2037
+#: Controller/AttributesController.php:2197;2244
+#: Controller/ShadowAttributesController.php:1053
 msgid "Invalid field requested."
 msgstr ""
 
-#: Controller/AttributesController.php:1989;2040
+#: Controller/AttributesController.php:2200;2247
 msgid "This function can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:2065
+#: Controller/AttributesController.php:2282
 msgid "You do not have permission to do that"
 msgstr ""
 
-#: Controller/AttributesController.php:2092;2100
-#: Controller/EventsController.php:3518;3663
+#: Controller/AttributesController.php:2312;2320
+#: Controller/EventsController.php:3660;3813;5017
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:2121
+#: Controller/AttributesController.php:2341
 msgid "This action can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:2130;2381;2395;2406
-#: Controller/EventsController.php:2277
-#: Controller/OrganisationsController.php:420
-#: Controller/ServersController.php:718;799
+#: Controller/AttributesController.php:2350;2601;2615;2626
+#: Controller/OrganisationsController.php:439
+#: Controller/ServersController.php:661;739
 msgid "You are not authorised to do that."
 msgstr ""
 
-#: Controller/AttributesController.php:2235
-#: Controller/EventsController.php:4076
+#: Controller/AttributesController.php:2455
+#: Controller/EventsController.php:4225
 msgid "This functionality requires API key access."
 msgstr ""
 
-#: Controller/AttributesController.php:2243
+#: Controller/AttributesController.php:2463
 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:2255
+#: Controller/AttributesController.php:2475
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr ""
 
-#: Controller/AttributesController.php:2416
+#: Controller/AttributesController.php:2636
 msgid "Invalid script."
 msgstr ""
 
-#: Controller/AttributesController.php:2480
+#: Controller/AttributesController.php:2703
 msgid "No valid enrichment options found for this attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:2581
+#: Controller/AttributesController.php:2801
 msgid "Invalid type requested."
 msgstr ""
 
-#: Controller/AttributesController.php:2644;2868
-#: Controller/TagCollectionsController.php:258
+#: Controller/AttributesController.php:2864;3071
+#: Controller/TagCollectionsController.php:254
 msgid "Invalid tag"
 msgstr ""
 
-#: Controller/AttributesController.php:2840
-#: Controller/EventsController.php:3429
-msgid "Invalid tag."
-msgstr ""
-
-#: Controller/AttributesController.php:2946
-#: Controller/EventsController.php:5126
+#: Controller/AttributesController.php:3161
+#: Controller/EventsController.php:5215
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr ""
 
-#: Controller/AttributesController.php:2954
-#: Controller/ShadowAttributesController.php:620
+#: Controller/AttributesController.php:3165;3180
+#: Controller/ShadowAttributesController.php:662
 msgid "Invalid Attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:3104
-#: Controller/ShadowAttributesController.php:1113
-msgid "Invalid attribute ID."
-msgstr ""
-
-#: Controller/AttributesController.php:455
-msgid "The attachment have been uploaded."
-msgid_plural "The attachments have been uploaded."
-msgstr[0] ""
-msgstr[1] ""
-
-#: Controller/AttributesController.php:2812
-#: Controller/EventsController.php:3401
-msgid "Tag added."
-msgid_plural "Tags added."
-msgstr[0] ""
-msgstr[1] ""
-
-#: Controller/AttributesController.php:2815
-#: Controller/EventsController.php:3396
-msgid "Tag could not be added."
-msgid_plural "%s tags could not be added."
-msgstr[0] ""
-msgstr[1] ""
-
-#: Controller/AttributesController.php:2817
-msgid " However, %s tag was added."
-msgid_plural " However, %s tags were added."
-msgstr[0] ""
-msgstr[1] ""
-
-#: Controller/AuthKeysController.php:53
-msgid "Auth Keys"
-msgstr ""
-
-#: Controller/AuthKeysController.php:137
-#: View/AuthKeys/index.ctp:50
-#: View/AuthKeys/view.ctp:33
-msgid "Auth Key"
-msgstr ""
-
-#: Controller/CerebratesController.php:101;145;177
-msgid "Invalid Cerebrate instance ID provided."
-msgstr ""
-
-#: Controller/CerebratesController.php:116
-msgid "Added %s new organisations, updated %s existing organisations, %s failures."
-msgstr ""
-
-#: Controller/CerebratesController.php:125
-msgid "Sync organisation information"
-msgstr ""
-
-#: Controller/CerebratesController.php:126
-msgid "Are you sure you want to download and add / update the remote organisations from the Cerebrate node?"
-msgstr ""
-
-#: Controller/CerebratesController.php:127
-#: View/Pages/doc/using_the_system.ctp:419
-#: View/Servers/index.ctp:165
-msgid "Pull all"
-msgstr ""
-
-#: Controller/CerebratesController.php:193
-msgid "Organisation downloaded."
-msgstr ""
-
-#: Controller/CerebratesController.php:201
-msgid "Download organisation information"
-msgstr ""
-
-#: Controller/CerebratesController.php:202
-msgid "Are you sure you want to download and add / update the remote organisation?"
-msgstr ""
-
-#: Controller/CerebratesController.php:203
-#: View/Elements/markdownEditor/markdownEditor.ctp:62
-#: View/Events/export.ctp:115;144
-#: View/Galaxies/export.ctp:44
-msgid "Download"
-msgstr ""
-
 #: Controller/CommunitiesController.php:150
 msgid "Request sent."
 msgstr ""
@@ -607,81 +418,60 @@ msgstr ""
 msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
 msgstr ""
 
-#: Controller/CorrelationExclusionsController.php:31
-msgid "Correlation Exclusions index"
-msgstr ""
-
-#: Controller/CorrelationExclusionsController.php:68
-msgid "Correlation Exclusion"
-msgstr ""
-
-#: Controller/CorrelationExclusionsController.php:79
-msgid "Correlations cleanup initiated, based on the exclusion rules."
-msgstr ""
-
-#: Controller/CorrelationExclusionsController.php:87
-#: View/CorrelationExclusions/index.ctp:31
-msgid "Clean up correlations"
-msgstr ""
-
-#: Controller/CorrelationExclusionsController.php:88
-msgid "Execute the cleaning of all correlations that are at odds with the exclusion rules? This will delete all matching correlations."
-msgstr ""
-
-#: Controller/DashboardsController.php:37;253;422
+#: Controller/DashboardsController.php:34;246;415
 #: Model/Dashboard.php:240
 msgid "Invalid dashboard template."
 msgstr ""
 
-#: Controller/DashboardsController.php:92
+#: Controller/DashboardsController.php:89
 msgid "No widget name passed."
 msgstr ""
 
-#: Controller/DashboardsController.php:103
+#: Controller/DashboardsController.php:100
 msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
 msgstr ""
 
-#: Controller/DashboardsController.php:104
+#: Controller/DashboardsController.php:101
 msgid "Alias to use as the title of the widget"
 msgstr ""
 
-#: Controller/DashboardsController.php:117
+#: Controller/DashboardsController.php:114
 msgid "No setting data found."
 msgstr ""
 
-#: Controller/DashboardsController.php:128;211;216
+#: Controller/DashboardsController.php:125;205;210
 msgid "Settings updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:138
+#: Controller/DashboardsController.php:135
 msgid "Invalid widget."
 msgstr ""
 
-#: Controller/DashboardsController.php:154
-msgid "This endpoint can only be reached via POST requests."
-msgstr ""
-
-#: Controller/DashboardsController.php:163
+#: Controller/DashboardsController.php:156
 msgid "You need to specify the widget to use along with the configuration."
 msgstr ""
 
-#: Controller/DashboardsController.php:213;218
+#: Controller/DashboardsController.php:189
+msgid "This endpoint can only be reached via POST requests."
+msgstr ""
+
+#: Controller/DashboardsController.php:207;212
 msgid "Settings could not be updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:267;272
+#: Controller/DashboardsController.php:260;265
 msgid "Dashboard template updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:269;274
+#: Controller/DashboardsController.php:262;267
 msgid "Dashboard template could not be updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:282;289;300
+#: Controller/DashboardsController.php:275;282;293
 msgid "Unrestricted"
 msgstr ""
 
-#: Controller/DashboardsController.php:425
+#: Controller/DashboardsController.php:418
 msgid "Dashboard template removed."
 msgstr ""
 
@@ -695,7 +485,7 @@ msgstr ""
 
 #: Controller/DecayingModelController.php:36;105;207;243;264;276;354;387;399;409;430;442;452;544
 #: Controller/DecayingModelMappingController.php:25
-#: Model/DecayingModel.php:499;653
+#: Model/DecayingModel.php:483;619
 #: Model/DecayingModelMapping.php:30;59
 msgid "No Decaying Model with the provided ID exists"
 msgstr ""
@@ -705,7 +495,6 @@ msgid "Only one import field can be used"
 msgstr ""
 
 #: Controller/DecayingModelController.php:65
-#: Controller/GalaxiesController.php:171
 msgid "Error while decoding JSON"
 msgstr ""
 
@@ -835,797 +624,475 @@ msgstr ""
 msgid "Error Processing Request, can't parse the body"
 msgstr ""
 
-#: Controller/DecayingModelController.php:705
+#: Controller/DecayingModelController.php:712
 msgid "This method is only accessible via AJAX."
 msgstr ""
 
-#: Controller/EventBlocklistsController.php:12
-msgid "Event Blocklisting is not currently enabled on this instance."
+#: Controller/EventBlacklistsController.php:15
+msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr ""
 
-#: Controller/EventBlocklistsController.php:73
+#: Controller/EventBlacklistsController.php:76;98
 msgid "Invalid event IDs."
 msgstr ""
 
-#: Controller/EventBlocklistsController.php:84
-msgid "Failed to delete Event from EventBlocklist. Error: "
+#: Controller/EventBlacklistsController.php:87
+msgid "Failed to delete Event from EventBlacklist. Error: "
 msgstr ""
 
-#: Controller/EventBlocklistsController.php:95
-msgid "Invalid event blocklist IDs."
+#: Controller/EventsController.php:894
+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/EventReportsController.php:51;107;362
-msgid "Report saved."
-msgstr ""
-
-#: Controller/EventReportsController.php:72
-msgid "Event report %s"
-msgstr ""
-
-#: Controller/EventReportsController.php:80
-msgid "This function can only be reached via the API."
-msgstr ""
-
-#: Controller/EventReportsController.php:133
-msgid "Event Report %s %s deleted"
-msgstr ""
-
-#: Controller/EventReportsController.php:133;136
-#: Controller/GalaxyClustersController.php:716;726
-#: View/Objects/group_attributes_into_object.ctp:129
-msgid "hard"
-msgstr ""
-
-#: Controller/EventReportsController.php:133;136
-#: Controller/GalaxyClustersController.php:716;726
-#: View/Objects/group_attributes_into_object.ctp:129
-msgid "soft"
-msgstr ""
-
-#: Controller/EventReportsController.php:136
-msgid "Event Report %s could not be %s deleted.%sReasons: %s"
-msgstr ""
-
-#: Controller/EventReportsController.php:141;165;212;242;262;298
-#: Controller/GalaxyClustersController.php:740
-#: Controller/GalaxyElementsController.php:83
-#: Controller/TaxonomiesController.php:432
-#: Controller/WarninglistsController.php:274
-msgid "This function can only be reached via AJAX."
-msgstr ""
-
-#: Controller/EventReportsController.php:157
-msgid "Event Report %s restored"
-msgstr ""
-
-#: Controller/EventReportsController.php:160
-msgid "Event Report %s could not be %s restored.%sReasons: %s"
-msgstr ""
-
-#: Controller/EventReportsController.php:227
-msgid "Automatic extraction applied to Event Report %s"
-msgstr ""
-
-#: Controller/EventReportsController.php:230
-msgid "Automatic extraction could not be applied to Event Report %s.%sReasons: %s"
-msgstr ""
-
-#: Controller/EventReportsController.php:271
-msgid "`content` and `mapping` key cannot be empty"
-msgstr ""
-
-#: Controller/EventReportsController.php:283
-msgid "Suggestions applied to Event Report %s"
-msgstr ""
-
-#: Controller/EventReportsController.php:286
-msgid "Suggestions could not be applied to Event Report %s.%sReasons: %s"
-msgstr ""
-
-#: Controller/EventReportsController.php:303
-msgid "An URL must be provided"
-msgstr ""
-
-#: Controller/EventReportsController.php:310
-msgid "Report from - %s (%s)"
-msgstr ""
-
-#: Controller/EventReportsController.php:316
-msgid "Could not fetch report from URL. Fetcher module not enabled or could not download the page"
-msgstr ""
-
-#: Controller/EventReportsController.php:322
-msgid "Report downloaded and created"
-msgstr ""
-
-#: Controller/EventReportsController.php:350
-msgid "Event report (%s)"
-msgstr ""
-
-#: Controller/EventReportsController.php:356
-msgid "Could not generate markdown from the event"
-msgstr ""
-
-#: Controller/EventsController.php:848
-msgid "No X.509 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
+#: Controller/EventsController.php:896
 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 X.509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
+#: Controller/EventsController.php:902
+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
+#: Controller/EventsController.php:904
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:1491
-msgid "Event #%s"
-msgstr ""
-
-#: Controller/EventsController.php:1624
+#: Controller/EventsController.php:1731
 msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1838
-msgid "You do not have permissions to create events."
+#: Controller/EventsController.php:1942
+msgid "You don't have permissions to create events"
 msgstr ""
 
-#: Controller/EventsController.php:1844
+#: Controller/EventsController.php:1948
 msgid "No valid event data received."
 msgstr ""
 
-#: Controller/EventsController.php:1880
+#: Controller/EventsController.php:1984
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr ""
 
-#: Controller/EventsController.php:1912
-msgid "Event blocked by local blocklist."
+#: Controller/EventsController.php:1988;1992
+msgid "Invalid Sharing Group or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:1924;2011;2339
+#: Controller/EventsController.php:2016
+msgid "Event blocked by local blacklist."
+msgstr ""
+
+#: Controller/EventsController.php:2029;2116;2392
 msgid "The event has been saved"
 msgstr ""
 
-#: Controller/EventsController.php:1932
+#: Controller/EventsController.php:2037
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr ""
 
-#: Controller/EventsController.php:1938
-msgid "A blocklist entry is blocking you from creating any events. Please contact the administration team of this instance"
+#: Controller/EventsController.php:2043
+msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr ""
 
-#: Controller/EventsController.php:1940;2342
+#: Controller/EventsController.php:2045;2395
 msgid "The event could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/EventsController.php:1989
+#: Controller/EventsController.php:2094
 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:2037
+#: Controller/EventsController.php:2142
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr ""
 
-#: Controller/EventsController.php:2038
+#: Controller/EventsController.php:2143
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr ""
 
-#: Controller/EventsController.php:2052
-msgid "Could not process MISP export file. Probably file content is invalid."
-msgstr ""
-
-#: Controller/EventsController.php:2108
+#: Controller/EventsController.php:2204
 msgid "STIX document imported, event's created: "
 msgstr ""
 
-#: Controller/EventsController.php:2111
+#: Controller/EventsController.php:2207
 msgid "STIX document imported."
 msgstr ""
 
-#: Controller/EventsController.php:2114
+#: Controller/EventsController.php:2210
 msgid "Could not import STIX document: "
 msgstr ""
 
-#: Controller/EventsController.php:2121
-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 %s MB."
+#: Controller/EventsController.php:2217
+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:2148
-msgid "This action requires a target_id for GET requests and both a target_id and a source_id for POST requests."
+#: Controller/EventsController.php:2241;2326
+msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr ""
 
-#: Controller/EventsController.php:2155
-msgid "Invalid target event."
+#: Controller/EventsController.php:2249
+msgid "Invalid event ID entered."
 msgstr ""
 
-#: Controller/EventsController.php:2171
-msgid "Invalid source event."
+#: Controller/EventsController.php:2254
+msgid "You are not authorised to read the selected event."
 msgstr ""
 
-#: Controller/EventsController.php:2257
-msgid "Event merge results"
+#: Controller/EventsController.php:2551;2655;2726
+msgid "You don't have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:2489;2582;2653;3755;3771
-#: Controller/GalaxiesController.php:199
-msgid "You do not have the permission to do that."
-msgstr ""
-
-#: Controller/EventsController.php:2497
+#: Controller/EventsController.php:2560
 msgid "Event unpublished."
 msgstr ""
 
-#: Controller/EventsController.php:2594;2662
+#: Controller/EventsController.php:2667;2737
 msgid "Could not publish event - no tag for required taxonomies missing: %s"
 msgstr ""
 
-#: Controller/EventsController.php:2743
+#: Controller/EventsController.php:2819
 msgid "You must specify a message."
 msgstr ""
 
-#: Controller/EventsController.php:2761
+#: Controller/EventsController.php:2838
 msgid "Email sent to the reporter."
 msgstr ""
 
-#: Controller/EventsController.php:2770
+#: Controller/EventsController.php:2847
 msgid "Sending of email failed."
 msgstr ""
 
-#: Controller/EventsController.php:2819
+#: Controller/EventsController.php:2898
 msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
 msgstr ""
 
-#: Controller/EventsController.php:2907
+#: Controller/EventsController.php:2986
 msgid "This feature is currently disabled"
 msgstr ""
 
-#: Controller/EventsController.php:3023
+#: Controller/EventsController.php:3114
 msgid "Filename not allowed."
 msgstr ""
 
-#: Controller/EventsController.php:3043
+#: Controller/EventsController.php:3134
 msgid "Problem with writing the IoC file. Please report to site admin."
 msgstr ""
 
-#: Controller/EventsController.php:3119
+#: Controller/EventsController.php:3228
+msgid "This is not a valid MISP XML file."
+msgstr ""
+
+#: Controller/EventsController.php:3270
 msgid "Not yet implemented"
 msgstr ""
 
-#: Controller/EventsController.php:3137;3141
+#: Controller/EventsController.php:3288;3292
 msgid "Invalid event or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:3322
-msgid "Nothing to add."
+#: Controller/EventsController.php:3484
+#: Controller/TagCollectionsController.php:317
+msgid "Invalid Tag."
 msgstr ""
 
-#: Controller/EventsController.php:3338
-msgid "Tag not found."
-msgstr ""
-
-#: Controller/EventsController.php:3349
+#: Controller/EventsController.php:3500
+#: Controller/TagCollectionsController.php:333
 msgid "Tag is already attached to this event."
 msgstr ""
 
-#: Controller/EventsController.php:3363
+#: Controller/EventsController.php:3514
 msgid "Tag is not allowed due to taxonomy exclusivity settings"
 msgstr ""
 
-#: Controller/EventsController.php:3404
-msgid ", but %s could not be added: %s"
+#: Controller/EventsController.php:3545;3551
+#: Controller/TagCollectionsController.php:340
+msgid "Tag(s) added."
 msgstr ""
 
-#: Controller/EventsController.php:3418;3522;3670;4912;4939;5458;5462
-#: Controller/ObjectsController.php:44;174;1157
-#: Controller/TagsController.php:361
+#: Controller/EventsController.php:3547
+msgid "Tag could not be added."
+msgstr ""
+
+#: Controller/EventsController.php:3553
+#: Controller/TagCollectionsController.php:348
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3817;5021;5043;5550;5554
+#: Controller/ObjectsController.php:46;190;194;833;1245
 msgid "Invalid event."
 msgstr ""
 
-#: Controller/EventsController.php:3835;3976
+#: Controller/EventsController.php:3872;3902;3918
+msgid "You do not have the permission to do that."
+msgstr ""
+
+#: Controller/EventsController.php:3983;4124
 msgid "Invalid ID"
 msgstr ""
 
-#: Controller/EventsController.php:3839;3980;4557
+#: Controller/EventsController.php:3987;4128;4703
 msgid "Event not found or you are not authorised to view it."
 msgstr ""
 
-#: Controller/EventsController.php:3985
+#: Controller/EventsController.php:4134
 msgid "Freetext Import"
 msgstr ""
 
-#: Controller/EventsController.php:3991
+#: Controller/EventsController.php:4140
 msgid "Populate using a Template"
 msgstr ""
 
-#: Controller/EventsController.php:3997
+#: Controller/EventsController.php:4146
 msgid "OpenIOC Import"
 msgstr ""
 
-#: Controller/EventsController.php:4002
+#: Controller/EventsController.php:4151
 msgid "ThreatConnect Import"
 msgstr ""
 
-#: Controller/EventsController.php:4007
+#: Controller/EventsController.php:4156
 msgid "(Experimental) Forensic analysis - Mactime"
 msgstr ""
 
-#: Controller/EventsController.php:4026
+#: Controller/EventsController.php:4175
 msgid "MISP standard (recommended exchange format - lossless)"
 msgstr ""
 
-#: Controller/EventsController.php:4032
+#: Controller/EventsController.php:4181
 msgid "STIX 1.1.1 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4037
+#: Controller/EventsController.php:4186
 msgid "STIX 2.0 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4079;4086
+#: Controller/EventsController.php:4228;4235
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4115
+#: Controller/EventsController.php:4264
 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:4123
+#: Controller/EventsController.php:4272
 msgid "Event not found"
 msgstr ""
 
-#: Controller/EventsController.php:4146
+#: Controller/EventsController.php:4295
 msgid "Event not found."
 msgstr ""
 
-#: Controller/EventsController.php:4156
+#: Controller/EventsController.php:4305
 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:4181
+#: Controller/EventsController.php:4330
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4306;4328;4391;4416;4441;4471;4492
+#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
 msgid "Invalid type."
 msgstr ""
 
-#: Controller/EventsController.php:4622
+#: Controller/EventsController.php:4768
 msgid "Invalid method."
 msgstr ""
 
-#: Controller/EventsController.php:4737
+#: Controller/EventsController.php:4850
 msgid "%s services are not enabled."
 msgstr ""
 
-#: Controller/EventsController.php:4741
+#: Controller/EventsController.php:4854
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:4746
+#: Controller/EventsController.php:4859
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4800;4845
+#: Controller/EventsController.php:4914;4960
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:4812
+#: Controller/EventsController.php:4926
 msgid ": Enriched via the "
 msgstr ""
 
-#: Controller/EventsController.php:4862
+#: Controller/EventsController.php:4977
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:4915;5133
-#: Controller/PostsController.php:77
-#: Controller/TaxonomiesController.php:118;149;273;311;341;371
-msgid "You don't have permission to do that."
-msgstr ""
-
-#: Controller/EventsController.php:5034
+#: Controller/EventsController.php:5132
 msgid "Import service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5254
-#: Controller/WarninglistsController.php:241
+#: Controller/EventsController.php:5222;5236
+#: Controller/PostsController.php:60;84
+#: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
+msgid "You don't have permission to do that."
+msgstr ""
+
+#: Controller/EventsController.php:5363
+#: Controller/WarninglistsController.php:229
 msgid "Invalid ID."
 msgstr ""
 
-#: Controller/EventsController.php:5277;5323;5342
-#: Controller/ShadowAttributesController.php:266;477
-#: Model/EventReport.php:431
+#: Controller/EventsController.php:5411
+#: Controller/ShadowAttributesController.php:295;300;516
 msgid "Invalid Event"
 msgstr ""
 
-#: Controller/EventsController.php:5301
+#: Controller/EventsController.php:5432
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr ""
 
-#: Controller/EventsController.php:5368
-msgid "another user"
-msgstr ""
-
-#: Controller/EventsController.php:5373
-msgid "background job"
-msgstr ""
-
-#: Controller/EventsController.php:5375
-msgid "external tool"
-msgstr ""
-
-#: Controller/EventsController.php:5383
-msgid "Warning: Your view on this event might not be up to date as it is currently being edited by: %s"
-msgstr ""
-
-#: Controller/EventsController.php:5591
+#: Controller/EventsController.php:5683
 msgid "%s event(s) deleted."
 msgstr ""
 
-#: Controller/EventsController.php:5631
-msgid "Recovery simulation complete. Event #%s can be recovered using %s log entries."
-msgstr ""
-
-#: Controller/EventsController.php:5649;5692
-#: Controller/WarninglistsController.php:55
-msgid "This action is only accessible via POST requests."
-msgstr ""
-
-#: Controller/EventsController.php:5662
-msgid "Bootstraping recovering of event %s"
-msgstr ""
-
-#: Controller/EventsController.php:5685
-msgid "Recover event job queued. Job ID: %s"
-msgstr ""
-
-#: Controller/EventsController.php:3403
-msgid "Tag added"
-msgid_plural "%s tags added"
-msgstr[0] ""
-msgstr[1] ""
-
-#: Controller/FeedsController.php:41
+#: Controller/FeedsController.php:39
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:49
+#: Controller/FeedsController.php:47
 msgid "Default feed metadata loaded."
 msgstr ""
 
-#: Controller/FeedsController.php:275;387
+#: Controller/FeedsController.php:283;391
 msgid "Feed added."
 msgstr ""
 
-#: Controller/FeedsController.php:283
+#: Controller/FeedsController.php:291
 msgid "Feed could not be added. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:308;422;444;573;611;764
+#: Controller/FeedsController.php:316;426;448;577;618;829
 msgid "Invalid feed."
 msgstr ""
 
-#: Controller/FeedsController.php:395
+#: Controller/FeedsController.php:399
 msgid "Feed could not be updated. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:418
-#: Controller/OrganisationsController.php:253
-#: Controller/SharingGroupsController.php:233
-#: Controller/UsersController.php:1067
+#: Controller/FeedsController.php:422
+#: Controller/OrganisationsController.php:244
+#: Controller/SharingGroupsController.php:237
+#: Controller/UsersController.php:1044
 msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:451;577
+#: Controller/FeedsController.php:455;581
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:464;530
+#: Controller/FeedsController.php:468;534
 msgid "Starting fetch from Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:475
+#: Controller/FeedsController.php:479
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:480;482
+#: Controller/FeedsController.php:484;486
 msgid "Fetching the feed has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:486;547
+#: Controller/FeedsController.php:490;551
 msgid "Fetching the feed has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:559
+#: Controller/FeedsController.php:563
 msgid "No feed enabled."
 msgstr ""
 
-#: Controller/FeedsController.php:583;602
-#: Controller/ServersController.php:122
+#: Controller/FeedsController.php:587;606
+#: Controller/ServersController.php:116;161
 msgid "Download failed."
 msgstr ""
 
-#: Controller/FeedsController.php:590
+#: Controller/FeedsController.php:594
 msgid "Event added."
 msgstr ""
 
-#: Controller/FeedsController.php:593
+#: Controller/FeedsController.php:597
 msgid "Event already up to date."
 msgstr ""
 
-#: Controller/FeedsController.php:595
+#: Controller/FeedsController.php:599
 msgid "Event updated."
 msgstr ""
 
-#: Controller/FeedsController.php:599
+#: Controller/FeedsController.php:603
 msgid "Could not %s event."
 msgstr ""
 
-#: Controller/FeedsController.php:720
+#: Controller/FeedsController.php:700
+msgid "Feed could not be fetched. The HTTP error code returned was: "
+msgstr ""
+
+#: Controller/FeedsController.php:739;790
 msgid "Invalid feed type."
 msgstr ""
 
-#: Controller/FeedsController.php:770;807
+#: Controller/FeedsController.php:835;867
 msgid "Could not download the selected Event"
 msgstr ""
 
-#: Controller/FeedsController.php:805
+#: Controller/FeedsController.php:865
 msgid "This event is blocked by the Feed filters."
 msgstr ""
 
-#: Controller/FeedsController.php:843;847
+#: Controller/FeedsController.php:903;907
 msgid "Invalid Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:868
+#: Controller/FeedsController.php:928
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: Controller/FeedsController.php:872
+#: Controller/FeedsController.php:932
 msgid "Feed not found."
 msgstr ""
 
-#: Controller/FeedsController.php:881
+#: Controller/FeedsController.php:941
 msgid "Data pulled."
 msgstr ""
 
-#: Controller/FeedsController.php:883
+#: Controller/FeedsController.php:943
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:900
+#: Controller/FeedsController.php:960
 msgid "Starting feed caching."
 msgstr ""
 
-#: Controller/FeedsController.php:915
+#: Controller/FeedsController.php:975
 msgid "Caching the feeds has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:918
+#: Controller/FeedsController.php:978
 msgid "Caching the feeds has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:949
+#: Controller/FeedsController.php:1012
 msgid "Invalid feed list received."
 msgstr ""
 
-#: Controller/GalaxiesController.php:153
-msgid "Only one import field can be used at a time"
-msgstr ""
-
-#: Controller/GalaxiesController.php:176
-msgid "Galaxy clusters imported. %s imported, %s ignored, %s failed. %s"
-msgstr ""
-
-#: Controller/GalaxiesController.php:184
-msgid "Could not import galaxy clusters. %s imported, %s ignored, %s failed. %s"
-msgstr ""
-
-#: Controller/GalaxiesController.php:202
-msgid "This action is only accessible via a REST request."
-msgstr ""
-
-#: Controller/GalaxiesController.php:207
-msgid "%s imported, %s ignored, %s failed. %s"
-msgstr ""
-
-#: Controller/GalaxiesController.php:209
-msgid "Galaxy clusters imported. "
-msgstr ""
-
-#: Controller/GalaxiesController.php:212
-msgid "Could not import galaxy clusters. "
-msgstr ""
-
-#: Controller/GalaxiesController.php:260
-msgid "All sharing groups"
-msgstr ""
-
-#: Controller/GalaxiesController.php:281
+#: Controller/GalaxiesController.php:157
 msgid "All clusters"
 msgstr ""
 
-#: Controller/GalaxiesController.php:335
+#: Controller/GalaxiesController.php:207
 msgid "All namespaces"
 msgstr ""
 
-#: Controller/GalaxiesController.php:479
+#: Controller/GalaxiesController.php:337
 msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:482
+#: Controller/GalaxiesController.php:340
 msgid "Failed to parse request."
 msgstr ""
 
-#: Controller/GalaxyClusterBlocklistsController.php:59
-#: Controller/Component/BlockListComponent.php:179
-msgid "Invalid blocklist entry"
-msgstr ""
-
-#: Controller/GalaxyClusterBlocklistsController.php:75;97
-msgid "Invalid cluster IDs."
-msgstr ""
-
-#: Controller/GalaxyClusterBlocklistsController.php:86
-msgid "Failed to delete GalaxyCluster from GalaxyClusterBlocklist. Error: "
-msgstr ""
-
-#: Controller/GalaxyClusterRelationsController.php:94;193
-msgid "Invalid cluster relation"
-msgstr ""
-
-#: Controller/GalaxyClusterRelationsController.php:105
-msgid "This method can only be accessed via RestSearch."
-msgstr ""
-
-#: Controller/GalaxyClusterRelationsController.php:150;245
-msgid "Relationship added."
-msgstr ""
-
-#: Controller/GalaxyClusterRelationsController.php:154;249
-msgid "Relationship could not be added."
-msgstr ""
-
-#: Controller/GalaxyClusterRelationsController.php:176;265
-#: Controller/SightingdbController.php:49;99;143
-msgid " Reason: %s"
-msgstr ""
-
-#: Controller/GalaxyClusterRelationsController.php:198
-msgid "Default cluster relation cannot be edited"
-msgstr ""
-
-#: Controller/GalaxyClusterRelationsController.php:258
-#: Model/GalaxyClusterRelation.php:315
-msgid "Galaxy Cluster Relation could not be saved: The user has to have access to the sharing group in order to be able to edit it."
-msgstr ""
-
-#: Controller/GalaxyClusterRelationsController.php:284
-msgid "Relation not found."
-msgstr ""
-
-#: Controller/GalaxyClusterRelationsController.php:292
-msgid "Galaxy cluster relationship successfuly deleted."
-msgstr ""
-
-#: Controller/GalaxyClusterRelationsController.php:300
-msgid "Galaxy cluster relationship could not be deleted."
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:199
-msgid "This cluster is not published. Users will not be able to use it"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:216;220
-msgid "Invalid galaxy"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:279;280;386;387
-msgid "Invalid JSON"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:310;422
-msgid "Galaxy cluster saved"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:441
-#: View/GalaxyClusters/add.ctp:69
-msgid "Valid JSON array or comma separated"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:442
-msgid "Valid JSON array composed from Object of the form {key: keyname, value: actualValue}"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:465
-msgid "You can't publish a galaxy cluster that is already published"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:468
-msgid "Default galaxy cluster cannot be published"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:474
-msgid "Publish job queued. Job ID: %s"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:481
-msgid "Could not publish galaxy cluster"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:488
-msgid "Galaxy cluster published"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:511
-msgid "You can't unpublish a galaxy cluster that is not published"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:514
-msgid "Default galaxy cluster cannot be unpublished"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:520
-msgid "Could not unpublish galaxy cluster"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:527
-msgid "Galaxy cluster unpublished"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:714
-msgid "Galaxy cluster successfuly %s deleted%s."
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:717
-msgid " and added to the block list"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:726
-msgid "Galaxy cluster could not be %s deleted."
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:752
-msgid "Galaxy cluster successfuly restored."
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:760
-msgid "Galaxy cluster could not be %s restored."
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:769
-msgid "This function can only be reached via POST."
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:903
-msgid "Default galaxy cluster cannot be updated"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:906
-msgid "Galaxy cluster is not a fork"
-msgstr ""
-
-#: Controller/GalaxyClustersController.php:937
-msgid "Cluster updated to the newer version"
-msgstr ""
-
-#: Controller/GalaxyElementsController.php:65
-msgid "Element not found"
-msgstr ""
-
-#: Controller/GalaxyElementsController.php:74
-msgid "Galaxy element %s deleted"
-msgstr ""
-
-#: Controller/GalaxyElementsController.php:77
-msgid "Could not delete galaxy element"
-msgstr ""
-
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr ""
@@ -1634,259 +1101,230 @@ msgstr ""
 msgid "All jobs have been purged"
 msgstr ""
 
-#: Controller/NewsController.php:46
+#: Controller/NewsController.php:51
 msgid "News item added."
 msgstr ""
 
-#: Controller/NewsController.php:49
+#: Controller/NewsController.php:54
 msgid "The news item could not be added."
 msgstr ""
 
-#: Controller/NewsController.php:63
+#: Controller/NewsController.php:68
 msgid "News item updated."
 msgstr ""
 
-#: Controller/NewsController.php:66
+#: Controller/NewsController.php:71
 msgid "Could not update news item."
 msgstr ""
 
-#: Controller/NewsController.php:84
+#: Controller/NewsController.php:89
 msgid "News item deleted."
 msgstr ""
 
-#: Controller/NewsController.php:87
+#: Controller/NewsController.php:92
 msgid "News item could not be deleted."
 msgstr ""
 
 #: Controller/ObjectReferencesController.php:37
-#: Controller/ObjectsController.php:587;625;653;735
+#: Controller/ObjectsController.php:511;607;650;671;686;757;768;786
 msgid "Invalid object"
 msgstr ""
 
-#: Controller/ObjectReferencesController.php:178;230
+#: Controller/ObjectReferencesController.php:163
 msgid "Invalid object reference"
 msgstr ""
 
-#: Controller/ObjectReferencesController.php:186;189;237
-msgid "Invalid object reference."
-msgstr ""
-
-#: Controller/ObjectTemplatesController.php:33
+#: Controller/ObjectTemplatesController.php:31
 msgid "All Objects"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:101
+#: Controller/ObjectTemplatesController.php:99
 msgid "Invalid object template"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:105
+#: Controller/ObjectTemplatesController.php:103
 msgid "Invalid object template id."
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:145
-msgid "Object Template deleted"
+#: Controller/ObjectTemplatesController.php:143
+msgid "ObjectTemplate deleted"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:306
-msgid "Template not found"
-msgstr ""
-
-#: Controller/ObjectsController.php:32
+#: Controller/ObjectsController.php:29
 msgid "This action can only be reached via POST requests"
 msgstr ""
 
-#: Controller/ObjectsController.php:145
+#: Controller/ObjectsController.php:69;82;1272
+msgid "Invalid sharing group."
+msgstr ""
+
+#: Controller/ObjectsController.php:153
 msgid "You don't have permissions to create objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:168;1172;1219
+#: Controller/ObjectsController.php:181;1257;1309
 #: Model/Template.php:25
 msgid "Invalid template."
 msgstr ""
 
-#: Controller/ObjectsController.php:280;421;427
+#: Controller/ObjectsController.php:295;424;430
 msgid "Object could not be saved."
 msgstr ""
 
-#: Controller/ObjectsController.php:359;802;906
-#: Model/Event.php:6483
+#: Controller/ObjectsController.php:373;1006
+#: Model/Event.php:6248
 msgid "Invalid object."
 msgstr ""
 
-#: Controller/ObjectsController.php:364
+#: Controller/ObjectsController.php:377
 msgid "Insufficient permissions to edit this object."
 msgstr ""
 
-#: Controller/ObjectsController.php:380
-msgid "Force update anyway"
-msgstr ""
-
-#: Controller/ObjectsController.php:453
+#: Controller/ObjectsController.php:449
 msgid "Object attributes saved."
 msgstr ""
 
-#: Controller/ObjectsController.php:512
+#: Controller/ObjectsController.php:518
 msgid "This function can only be accessed via POST or PUT"
 msgstr ""
 
-#: Controller/ObjectsController.php:678;756
+#: Controller/ObjectsController.php:711
 msgid "Invalid template"
 msgstr ""
 
-#: Controller/ObjectsController.php:759
+#: Controller/ObjectsController.php:789
 msgid "Invalid fields"
 msgstr ""
 
-#: Controller/ObjectsController.php:766
+#: Controller/ObjectsController.php:796
 msgid "Invalid field"
 msgstr ""
 
-#: Controller/ObjectsController.php:791
+#: Controller/ObjectsController.php:822
 msgid "You don't have permissions to delete objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:886
+#: Controller/ObjectsController.php:926;933;937
 msgid "Object not found or not authorised."
 msgstr ""
 
-#: Controller/ObjectsController.php:1115
+#: Controller/ObjectsController.php:1203
 msgid "%s objects successfully reconstructed."
 msgstr ""
 
-#: Controller/ObjectsController.php:1125;1164
+#: Controller/ObjectsController.php:1213;1249
 msgid "This action can only be reached via AJAX."
 msgstr ""
 
-#: Controller/ObjectsController.php:1182
-msgid "Invalid sharing group."
-msgstr ""
-
-#: Controller/ObjectsController.php:1200
+#: Controller/ObjectsController.php:1290
 msgid "Failed to create an Object from Attributes. Error: "
 msgstr ""
 
-#: Controller/ObjectsController.php:1211
+#: Controller/ObjectsController.php:1301
 msgid "No Attribute selected."
 msgstr ""
 
-#: Controller/ObjectsController.php:1276
-msgid "Invalid object ID."
+#: Controller/OrgBlacklistsController.php:15
+msgid "Organisation Blacklisting is not currently enabled on this instance."
 msgstr ""
 
-#: Controller/OrgBlocklistsController.php:15
-msgid "Organisation BlockListing is not currently enabled on this instance."
-msgstr ""
-
-#: Controller/OrganisationsController.php:31
+#: Controller/OrganisationsController.php:28
 msgid "This feature is disabled on this instance for normal users."
 msgstr ""
 
-#: Controller/OrganisationsController.php:87
-#: View/Elements/healthElements/diagnostics.ctp:34;46;159
-#: View/Elements/healthElements/workers.ctp:83;85
-#: View/Organisations/view.ctp:30
-#: View/SharingGroups/view.ctp:14;20
-msgid "Unknown"
-msgstr ""
-
-#: Controller/OrganisationsController.php:138
+#: Controller/OrganisationsController.php:133
 msgid "The organisation has been successfully added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:145
+#: Controller/OrganisationsController.php:140
 msgid "The organisation could not be added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:160;233
-msgid "Not specified"
-msgstr ""
-
-#: Controller/OrganisationsController.php:169
+#: Controller/OrganisationsController.php:163;296;302
 msgid "Invalid organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:175;258;264;332
-#: Controller/UsersController.php:2136
+#: Controller/OrganisationsController.php:169;249;255;308;335;368
 msgid "Invalid organisation"
 msgstr ""
 
-#: Controller/OrganisationsController.php:207
+#: Controller/OrganisationsController.php:208
 msgid "Organisation updated."
 msgstr ""
 
-#: Controller/OrganisationsController.php:222
+#: Controller/OrganisationsController.php:223
 msgid "The organisation could not be updated."
 msgstr ""
 
-#: Controller/OrganisationsController.php:281
+#: Controller/OrganisationsController.php:272
 msgid "Organisation deleted"
 msgstr ""
 
-#: Controller/OrganisationsController.php:288
+#: Controller/OrganisationsController.php:279
 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/OrganisationsController.php:358
-msgid "Organisation %s"
+#: Controller/OrganisationsController.php:373
+msgid "No landing page has been created for this organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:403
+#: Controller/OrganisationsController.php:422
 msgid "This action is restricted to sync users"
 msgstr ""
 
-#: Controller/OrganisationsController.php:425
+#: Controller/OrganisationsController.php:444
 msgid "The organisation has been successfully merged."
 msgstr ""
 
-#: Controller/OrganisationsController.php:428
+#: Controller/OrganisationsController.php:447
 msgid "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"
 msgstr ""
 
-#: Controller/PostsController.php:56
-msgid "Discussion about Event #%s (%s)"
+#: Controller/PostsController.php:54
+msgid "Discussion about Event #"
 msgstr ""
 
-#: Controller/PostsController.php:73
+#: Controller/PostsController.php:80
 msgid "Invalid thread"
 msgstr ""
 
-#: Controller/PostsController.php:108
+#: Controller/PostsController.php:115
 msgid "Cannot post an empty message."
 msgstr ""
 
-#: Controller/PostsController.php:169
+#: Controller/PostsController.php:176
 msgid "Post added"
 msgstr ""
 
-#: Controller/PostsController.php:182
+#: Controller/PostsController.php:189
 msgid "The post could not be added."
 msgstr ""
 
-#: Controller/PostsController.php:201;249
+#: Controller/PostsController.php:208;256
 msgid "Invalid post"
 msgstr ""
 
-#: Controller/PostsController.php:204
-msgid "This is not your post."
+#: Controller/PostsController.php:211
+msgid "This is not your event."
 msgstr ""
 
-#: Controller/PostsController.php:212
+#: Controller/PostsController.php:219
 msgid "Post edited"
 msgstr ""
 
-#: Controller/PostsController.php:233
+#: Controller/PostsController.php:240
 msgid "The post could not be edited. Please, try again."
 msgstr ""
 
-#: Controller/PostsController.php:254
+#: Controller/PostsController.php:261
 msgid "This post doesn't belong to you, so you cannot delete it."
 msgstr ""
 
-#: Controller/PostsController.php:267
+#: Controller/PostsController.php:274
 msgid "Post and thread deleted"
 msgstr ""
 
-#: Controller/PostsController.php:276
+#: Controller/PostsController.php:283
 msgid "Post deleted"
 msgstr ""
 
@@ -1922,473 +1360,418 @@ msgstr ""
 msgid "Entry removed."
 msgstr ""
 
-#: Controller/RolesController.php:57
-msgid "Invalid Role"
+#: Controller/RolesController.php:33
+msgid "Invalid role"
 msgstr ""
 
-#: Controller/RolesController.php:72
+#: Controller/RolesController.php:59;100
 msgid "The Role has been saved"
 msgstr ""
 
-#: Controller/RolesController.php:80
+#: Controller/RolesController.php:67;108
 msgid "The Role could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/RolesController.php:105
-msgid "It is not possible to delete role that is assigned to users."
+#: Controller/RolesController.php:85;151
+msgid "Invalid Role"
 msgstr ""
 
-#: Controller/RolesController.php:155
+#: Controller/RolesController.php:157
+msgid "Role deleted"
+msgstr ""
+
+#: Controller/RolesController.php:164
+msgid "Role could not be deleted"
+msgstr ""
+
+#: Controller/RolesController.php:200
 msgid "Default role set."
 msgstr ""
 
-#: Controller/RolesController.php:155
+#: Controller/RolesController.php:200
 msgid "Default role unset."
 msgstr ""
 
-#: Controller/RolesController.php:170
-msgid "This endpoint expects a POST request."
-msgstr ""
-
-#: Controller/ServersController.php:165
-msgid "Event '%s' not found."
-msgstr ""
-
-#: Controller/ServersController.php:167
-msgid "Download failed. %s"
-msgstr ""
-
-#: Controller/ServersController.php:207
-msgid "Remote event preview"
-msgstr ""
-
-#: Controller/ServersController.php:215
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
-msgid "Server overlap analysis matrix"
-msgstr ""
-
-#: Controller/ServersController.php:263;457
+#: Controller/ServersController.php:237;436
 msgid "The pull filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:273;467
+#: Controller/ServersController.php:247;446
 msgid "The push filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:330;497
+#: Controller/ServersController.php:302;476
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr ""
 
-#: Controller/ServersController.php:342
+#: Controller/ServersController.php:314
 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:378;553;2332
+#: Controller/ServersController.php:350;532;2166
 msgid "The server has been saved"
 msgstr ""
 
-#: Controller/ServersController.php:385;560
+#: Controller/ServersController.php:357;539
 msgid "The server could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ServersController.php:432;622;710;713;722;789;795;1634;1648
-#: Model/Server.php:4234
+#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
+#: Model/Server.php:5861
 msgid "Invalid server"
 msgstr ""
 
-#: Controller/ServersController.php:514
+#: Controller/ServersController.php:493
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr ""
 
-#: Controller/ServersController.php:618;2349;2391
+#: Controller/ServersController.php:604;2183;2225
 msgid "This endpoint expects POST requests."
 msgstr ""
 
-#: Controller/ServersController.php:626
+#: Controller/ServersController.php:612
 msgid "You don't have the privileges to do that."
 msgstr ""
 
-#: Controller/ServersController.php:635
+#: Controller/ServersController.php:621
 msgid "Server deleted"
 msgstr ""
 
-#: Controller/ServersController.php:644
+#: Controller/ServersController.php:630
 msgid "Server was not deleted"
 msgstr ""
 
-#: Controller/ServersController.php:674
-msgid "Settings saved"
-msgstr ""
-
-#: Controller/ServersController.php:676
-msgid "Could not save the settings. Invalid input."
-msgstr ""
-
-#: Controller/ServersController.php:725;728
+#: Controller/ServersController.php:668
 msgid "Pull setting not enabled for this server."
 msgstr ""
 
-#: Controller/ServersController.php:752
+#: Controller/ServersController.php:692
 msgid "Pulling."
 msgstr ""
 
-#: Controller/ServersController.php:762
+#: Controller/ServersController.php:702
 msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:808
+#: Controller/ServersController.php:748
 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:821
+#: Controller/ServersController.php:761
 msgid "Push complete. %s events pushed, %s events could not be pushed."
 msgstr ""
 
-#: Controller/ServersController.php:836
+#: Controller/ServersController.php:776
 msgid "Pushing."
 msgstr ""
 
-#: Controller/ServersController.php:846
+#: Controller/ServersController.php:786
 msgid "Push queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:874
+#: Controller/ServersController.php:814
 msgid "Filename not allowed"
 msgstr ""
 
-#: Controller/ServersController.php:879
+#: Controller/ServersController.php:819
 msgid "Incorrect extension or empty file."
 msgstr ""
 
-#: Controller/ServersController.php:955;956;957;958;959;960;961;962;963;964;965;966;967;968
-#: View/Elements/healthElements/diagnostics.ctp:26;199;313;322;383
+#: Controller/ServersController.php:901
+msgid "No organisation selected."
+msgstr ""
+
+#: Controller/ServersController.php:917;918;919;920;921;922;923;924;925;926;927;928;929;930;931
+#: View/Elements/healthElements/diagnostics.ctp:26;170;184;271;331
 #: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/submoduleStatus.ctp:23
-#: View/Servers/ajax/zeromqstatus.ctp:12
+#: View/Servers/ajax/zeromqstatus.ctp:11
 msgid "OK"
 msgstr ""
 
-#: Controller/ServersController.php:955
+#: Controller/ServersController.php:917
 msgid "not found"
 msgstr ""
 
-#: Controller/ServersController.php:955
+#: Controller/ServersController.php:917
 msgid "is not writeable"
 msgstr ""
 
-#: Controller/ServersController.php:956
+#: Controller/ServersController.php:918
 msgid "not readable"
 msgstr ""
 
-#: Controller/ServersController.php:957
+#: Controller/ServersController.php:919
 msgid "FAIL: settings not set"
 msgstr ""
 
-#: Controller/ServersController.php:957
+#: Controller/ServersController.php:919
 msgid "FAIL: Failed to load GnuPG"
 msgstr ""
 
-#: Controller/ServersController.php:957
+#: Controller/ServersController.php:919
 msgid "FAIL: Issues with the key/passphrase"
 msgstr ""
 
-#: Controller/ServersController.php:957
+#: Controller/ServersController.php:919
 msgid "FAIL: sign failed"
 msgstr ""
 
-#: Controller/ServersController.php:958
+#: Controller/ServersController.php:920
 msgid "not configured (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:958
+#: Controller/ServersController.php:920
 msgid "Getting URL via proxy failed"
 msgstr ""
 
-#: Controller/ServersController.php:959
+#: Controller/ServersController.php:921
 msgid "not enabled (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:959
+#: Controller/ServersController.php:921
 msgid "Python ZeroMQ library not installed correctly."
 msgstr ""
 
-#: Controller/ServersController.php:959
+#: Controller/ServersController.php:921
 msgid "ZeroMQ script not running."
 msgstr ""
 
-#: Controller/ServersController.php:960
+#: Controller/ServersController.php:922
 msgid "Some of the libraries related to STIX are not installed. Make sure that all libraries listed below are correctly installed."
 msgstr ""
 
-#: Controller/ServersController.php:961
+#: Controller/ServersController.php:923
 msgid "Incorrect STIX version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:962
+#: Controller/ServersController.php:924
 msgid "Incorrect STIX2 version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:963
+#: Controller/ServersController.php:925
 msgid "Incorrect CyBox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:964
+#: Controller/ServersController.php:926
 msgid "Incorrect mixbox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:965
+#: Controller/ServersController.php:927
 msgid "Incorrect maec version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:966
+#: Controller/ServersController.php:928
 msgid "Incorrect PyMISP version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:967
+#: Controller/ServersController.php:929
+msgid "Incorrect plyara version installed, found $current, expecting $expected"
+msgstr ""
+
+#: Controller/ServersController.php:930
 #: View/Events/filter_event_index.ctp:32;188
 #: View/Pages/doc/using_the_system.ctp:68;173
 msgid "High"
 msgstr ""
 
-#: Controller/ServersController.php:967
+#: Controller/ServersController.php:930
 msgid "Alternative setting used"
 msgstr ""
 
-#: Controller/ServersController.php:967
+#: Controller/ServersController.php:930
 msgid "Test failed"
 msgstr ""
 
-#: Controller/ServersController.php:968
+#: Controller/ServersController.php:931
 msgid "System not enabled"
 msgstr ""
 
-#: Controller/ServersController.php:968
+#: Controller/ServersController.php:931
 msgid "No modules found"
 msgstr ""
 
-#: Controller/ServersController.php:975
+#: Controller/ServersController.php:938
 msgid "MISP will not operate correctly or will be unsecure until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:979
+#: Controller/ServersController.php:942
 msgid "Some of the features of MISP cannot be utilised until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:983
+#: Controller/ServersController.php:946
 msgid "There are some optional tweaks that could be done to improve the looks of your MISP instance."
 msgstr ""
 
-#: Controller/ServersController.php:1209
+#: Controller/ServersController.php:1165
 msgid "Only one `update` worker can run at a time"
 msgstr ""
 
-#: Controller/ServersController.php:1221
+#: Controller/ServersController.php:1177
 msgid "Worker start signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1236
+#: Controller/ServersController.php:1192
 msgid "Worker stop signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1251
-msgid "Background jobs not enabled"
-msgstr ""
-
-#: Controller/ServersController.php:1317
-msgid "Issue while contacting the remote server to retrieve event information"
-msgstr ""
-
-#: Controller/ServersController.php:1334
-msgid "This event could not be found or you don't have permissions to see it."
-msgstr ""
-
-#: Controller/ServersController.php:1337
-msgid "The event has been found."
-msgstr ""
-
-#: Controller/ServersController.php:1367
-#: View/Elements/global_menu.ctp:323
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
-#: View/Servers/id_translator.ctp:6
-msgid "Event ID translator"
-msgstr ""
-
-#: Controller/ServersController.php:1380
+#: Controller/ServersController.php:1249
 msgid "This setting is redacted."
 msgstr ""
 
-#: Controller/ServersController.php:1402
-msgid "Setting %s is invalid."
-msgstr ""
-
-#: Controller/ServersController.php:1405
+#: Controller/ServersController.php:1274
 msgid "This setting can only be edited via the CLI."
 msgstr ""
 
-#: Controller/ServersController.php:1492
-msgid "Killing workers."
-msgstr ""
-
-#: Controller/ServersController.php:1504;1516
+#: Controller/ServersController.php:1365;1377
 msgid "Restarting workers."
 msgstr ""
 
-#: Controller/ServersController.php:1531
+#: Controller/ServersController.php:1401
 msgid "File not found."
 msgstr ""
 
-#: Controller/ServersController.php:1537
+#: Controller/ServersController.php:1407
 msgid "File could not be deleted."
 msgstr ""
 
-#: Controller/ServersController.php:1560;1576
+#: Controller/ServersController.php:1430;1446
 msgid "Upload failed."
 msgstr ""
 
-#: Controller/ServersController.php:1568
+#: Controller/ServersController.php:1438
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr ""
 
-#: Controller/ServersController.php:1638
+#: Controller/ServersController.php:1505
 msgid "Invalid user or user not found."
 msgstr ""
 
-#: Controller/ServersController.php:1965
-msgid "Something went wrong. %s"
-msgstr ""
-
-#: Controller/ServersController.php:1970;2001
-msgid "YOUR_API_KEY"
-msgstr ""
-
-#: Controller/ServersController.php:2218
+#: Controller/ServersController.php:2052
 msgid "Starting server caching."
 msgstr ""
 
-#: Controller/ServersController.php:2233
+#: Controller/ServersController.php:2067
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:2236
+#: Controller/ServersController.php:2070
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
-#: Controller/ServersController.php:2266
+#: Controller/ServersController.php:2100
 msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2275
+#: Controller/ServersController.php:2109
 msgid "Configured host org not found. Please make sure that the setting is current on the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2339
+#: Controller/ServersController.php:2173
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ServersController.php:2360
+#: Controller/ServersController.php:2194
 msgid "API key updated."
 msgstr ""
 
-#: Controller/ServersController.php:2373
+#: Controller/ServersController.php:2207
 msgid "ID has to be a valid server connection"
 msgstr ""
 
-#: Controller/ServersController.php:2376
+#: Controller/ServersController.php:2210
 msgid "Invalid direction. Valid options: "
 msgstr ""
 
-#: Controller/ServersController.php:2380
+#: Controller/ServersController.php:2214
 msgid "Priority changed."
 msgstr ""
 
-#: Controller/ServersController.php:2383
+#: Controller/ServersController.php:2217
 msgid "Priority could not be changed."
 msgstr ""
 
-#: Controller/ServersController.php:2394
+#: Controller/ServersController.php:2228
 msgid "Only site admin accounts can release the update lock."
 msgstr ""
 
-#: Controller/ServersController.php:2404
+#: Controller/ServersController.php:2238
 msgid "Only site admin accounts get the DB schema diagnostic."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:234
+#: Controller/ShadowAttributesController.php:263
 msgid "Could not discard proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:289
+#: Controller/ShadowAttributesController.php:324
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:337;340;349
+#: Controller/ShadowAttributesController.php:372;375;384
 msgid "The lines"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:388
+#: Controller/ShadowAttributesController.php:424
 msgid "The proposal has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:400;707
+#: Controller/ShadowAttributesController.php:436;749
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:402
+#: Controller/ShadowAttributesController.php:438
 msgid "The proposal could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:448
+#: Controller/ShadowAttributesController.php:475
 msgid "Invalid Proposal"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:466
+#: Controller/ShadowAttributesController.php:505
 msgid "Proposal not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:560
+#: Controller/ShadowAttributesController.php:601
 msgid "The attachment has been uploaded"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:562
+#: Controller/ShadowAttributesController.php:603
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:565
+#: Controller/ShadowAttributesController.php:606
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:698
+#: Controller/ShadowAttributesController.php:740
 msgid "The proposed Attribute has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:709
+#: Controller/ShadowAttributesController.php:751
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:825;853
+#: Controller/ShadowAttributesController.php:884;894
 msgid "Invalid proposal."
 msgstr ""
 
-#: Controller/SharingGroupsController.php:247
+#: Controller/ShadowAttributesController.php:1010
+msgid "This feature is only available using the API to Sync users"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:1013
+msgid "Invalid UUID"
+msgstr ""
+
+#: Controller/SharingGroupsController.php:251
 msgid "Sharing Group deleted"
 msgstr ""
 
-#: Controller/SharingGroupsController.php:252
+#: Controller/SharingGroupsController.php:256
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr ""
 
-#: Controller/SharingGroupsController.php:363
-#: View/Organisations/view.ctp:72;73
-#: View/SharingGroups/index.ctp:4
-msgid "Sharing Groups"
-msgstr ""
-
-#: Controller/SharingGroupsController.php:444
-#: View/SharingGroups/view.ctp:2
-msgid "Sharing Group %s"
-msgstr ""
-
 #: Controller/SightingdbController.php:32
 msgid "SightingDB connection added."
 msgstr ""
@@ -2397,6 +1780,10 @@ msgstr ""
 msgid "SightingDB connection could not be added."
 msgstr ""
 
+#: Controller/SightingdbController.php:49;99;143
+msgid " Reason: %s"
+msgstr ""
+
 #: Controller/SightingdbController.php:71;123
 #: Model/Sightingdb.php:325
 msgid "Invalid SightingDB entry."
@@ -2422,259 +1809,214 @@ msgstr ""
 msgid "Pass a valid SightingDB ID"
 msgstr ""
 
-#: Controller/SightingsController.php:87
+#: Controller/SightingsController.php:83
 msgid "Could not add the Sighting. Reason: "
 msgstr ""
 
-#: Controller/SightingsController.php:100
+#: Controller/SightingsController.php:96
 msgid "Sighting added"
 msgstr ""
 
-#: Controller/SightingsController.php:153
+#: Controller/SightingsController.php:149
 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:159
-#: Model/DecayingModel.php:480
+#: Controller/SightingsController.php:155
+#: Model/DecayingModel.php:464
 msgid "Attribute not found"
 msgstr ""
 
-#: Controller/SightingsController.php:177
+#: Controller/SightingsController.php:173
 msgid "Invalid request."
 msgstr ""
 
-#: Controller/SightingsController.php:186
+#: Controller/SightingsController.php:182
 msgid "Sighting added."
 msgstr ""
 
-#: Controller/SightingsController.php:188
+#: Controller/SightingsController.php:184
 msgid "Sighting could not be added"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:59;180
+#: Controller/TagCollectionsController.php:56;177
 msgid "The tag collection has been saved"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:67;188
+#: Controller/TagCollectionsController.php:64;185
 msgid "The tag collection could not be added. Reason: "
 msgstr ""
 
-#: Controller/TagCollectionsController.php:88
+#: Controller/TagCollectionsController.php:85
 msgid "%s new tag collections added."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:157
+#: Controller/TagCollectionsController.php:154
 msgid "Invalid Tag Collection"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:164
+#: Controller/TagCollectionsController.php:161
 msgid "You don't have editing rights on this Tag Collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:204;372;421
+#: Controller/TagCollectionsController.php:201;391
 msgid "Invalid tag collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:210
+#: Controller/TagCollectionsController.php:207
 msgid "Tag collection deleted."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:218
+#: Controller/TagCollectionsController.php:215
 msgid "Tag collection could not be deleted."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:227
+#: Controller/TagCollectionsController.php:224
 msgid "You are not allowed to delete that."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:244
+#: Controller/TagCollectionsController.php:241
 msgid "Invalid tag collection"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:347
-msgid "Tag(s) added."
-msgstr ""
-
-#: Controller/TagCollectionsController.php:349
+#: Controller/TagCollectionsController.php:342
 msgid "Tag(s) could not be added."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:355
-msgid "All tags are already present, nothing to add."
-msgstr ""
-
-#: Controller/TagCollectionsController.php:383
-msgid "Invalid tag collection tag."
-msgstr ""
-
-#: Controller/TagCollectionsController.php:425
+#: Controller/TagCollectionsController.php:395
 msgid "Insufficient privileges to remove the tag from the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:436
+#: Controller/TagCollectionsController.php:406
 msgid "Invalid tag or tag not associated with the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:440
+#: Controller/TagCollectionsController.php:410
 msgid "Failed to remove tag from the collection."
 msgstr ""
 
-#: Controller/TagsController.php:304
+#: Controller/TagsController.php:370
 msgid "Tag deleted"
 msgstr ""
 
-#: Controller/TagsController.php:309
+#: Controller/TagsController.php:375
 msgid "Tag was not deleted"
 msgstr ""
 
-#: Controller/TagsController.php:464
+#: Controller/TagsController.php:599
 msgid "Favourite Tags"
 msgstr ""
 
-#: Controller/TagsController.php:470
+#: Controller/TagsController.php:605
 #: View/TagCollections/index.ctp:4
 msgid "Tag Collections"
 msgstr ""
 
-#: Controller/TagsController.php:475
+#: Controller/TagsController.php:610
 msgid "Custom Tags"
 msgstr ""
 
-#: Controller/TagsController.php:479
+#: Controller/TagsController.php:614
 msgid "All Tags"
 msgstr ""
 
-#: Controller/TagsController.php:487
+#: Controller/TagsController.php:622
+#: View/Taxonomies/view.ctp:2
 msgid "Taxonomy Library"
 msgstr ""
 
-#: Controller/TagsController.php:638
+#: Controller/TagsController.php:790
 msgid "Includes: "
 msgstr ""
 
-#: Controller/TagsController.php:715
+#: Controller/TagsController.php:867
 msgid "This functionality requires tagging permission."
 msgstr ""
 
-#: Controller/TagsController.php:729;753
+#: Controller/TagsController.php:881;905
 msgid "Cannot alter the tags of this data, only the organisation that has created the data (orgc) can modify global tags."
 msgstr ""
 
-#: Controller/TagsController.php:731;755
+#: Controller/TagsController.php:883;907
 msgid "Please consider using local tags if you are in the host organisation of the instance."
 msgstr ""
 
-#: Controller/TagsController.php:760;930
+#: Controller/TagsController.php:912;1058
 msgid "Invalid Target."
 msgstr ""
 
-#: Controller/TagsController.php:805
+#: Controller/TagsController.php:951
 msgid "Local tags can only be added by users of the host organisation."
 msgstr ""
 
-#: Controller/TagsController.php:814
-msgid "Tag not found and insufficient privileges to create it."
-msgstr ""
-
-#: Controller/TagsController.php:820
+#: Controller/TagsController.php:964
 msgid "Unable to create tag. Reason: "
 msgstr ""
 
-#: Controller/TagsController.php:825
-msgid "Invalid Tag."
-msgstr ""
-
-#: Controller/TagsController.php:831
-msgid "Invalid Tag. This tag can only be set by a fixed organisation."
-msgstr ""
-
-#: Controller/TagsController.php:835
-msgid "Invalid Tag. This tag can only be set by a fixed user."
-msgstr ""
-
-#: Controller/TagsController.php:850
-msgid "%s already has the requested tag attached, no changes had to be made."
-msgstr ""
-
-#: Controller/TagsController.php:881
-msgid "Failed to attach tag to object."
-msgstr ""
-
-#: Controller/TagsController.php:885
-msgid "Failed to attach %s tags. Reasons: %s"
-msgstr ""
-
-#: Controller/TagsController.php:888
-msgid "Successfully attached %s tags to %s (%s)"
-msgstr ""
-
-#: Controller/TagsController.php:947
+#: Controller/TagsController.php:1075
 msgid "Insufficient privileges to remove local tags from events you do not own."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:74
+#: Controller/TaxonomiesController.php:68
 msgid "Taxonomy not found."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:112
-#: View/Taxonomies/view.ctp:2
-msgid "%s Taxonomy Library"
-msgstr ""
-
-#: Controller/TaxonomiesController.php:141
+#: Controller/TaxonomiesController.php:134
 msgid "Taxonomy enabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:173
+#: Controller/TaxonomiesController.php:166
 msgid "Taxonomy disabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:251
+#: Controller/TaxonomiesController.php:234
 msgid "All taxonomy libraries are up to date already."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:254
+#: Controller/TaxonomiesController.php:237
 msgid "Could not update any of the taxonomy libraries"
 msgstr ""
 
-#: Controller/TaxonomiesController.php:257
+#: Controller/TaxonomiesController.php:240
+#: Controller/WarninglistsController.php:107
 msgid "Successfully updated "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:257;259
+#: Controller/TaxonomiesController.php:240;242
 msgid " taxonomy libraries."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:259
+#: Controller/TaxonomiesController.php:242
+#: Controller/WarninglistsController.php:109
 msgid " However, could not update "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:293;331;361
+#: Controller/TaxonomiesController.php:276;314;344
 msgid "The tag(s) has been saved."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:299;333;363
+#: Controller/TaxonomiesController.php:282;316;346
 msgid "The tag(s) could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:391
+#: Controller/TaxonomiesController.php:374
 msgid "The tag(s) has been hidden."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:393
+#: Controller/TaxonomiesController.php:376
 msgid "The tag(s) could not be hidden. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:421
-msgid "Taxonomy successfully deleted."
+#: Controller/TaxonomiesController.php:413
+msgid "Taxonomy successfuly deleted."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:424
+#: Controller/TaxonomiesController.php:416
 msgid "Taxonomy could not be deleted."
 msgstr ""
 
-#: Controller/TemplateElementsController.php:19;24
-msgid "No template with the provided ID exists, or you are not authorised to see it."
+#: Controller/TaxonomiesController.php:424
+#: Controller/WarninglistsController.php:262
+msgid "This function can only be reached via AJAX."
 msgstr ""
 
 #: Controller/TemplatesController.php:408
@@ -2685,315 +2027,260 @@ msgstr ""
 msgid "Event populated, but "
 msgstr ""
 
-#: Controller/UserSettingsController.php:128;275
+#: Controller/UserSettingsController.php:129;276
 msgid "Invalid ID passed."
 msgstr ""
 
-#: Controller/UserSettingsController.php:138;142;285;289
+#: Controller/UserSettingsController.php:139;143;286;290
 msgid "Invalid user setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:156;241;253
-#: Model/UserSetting.php:378
+#: Controller/UserSettingsController.php:157;242;254
+#: Model/UserSetting.php:324
 msgid "Invalid setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:160;293
-#: Model/UserSetting.php:382
+#: Controller/UserSettingsController.php:161;294
+#: Model/UserSetting.php:328
 msgid "This setting is restricted and requires the following permission(s): %s"
 msgstr ""
 
-#: Controller/UserSettingsController.php:192
+#: Controller/UserSettingsController.php:193
 msgid "Setting saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:205
+#: Controller/UserSettingsController.php:206
 msgid "Setting could not be saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:300
+#: Controller/UserSettingsController.php:301
 msgid "Setting deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:308
+#: Controller/UserSettingsController.php:309
 msgid "Setting could not be deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:321
+#: Controller/UserSettingsController.php:322
 msgid "Expecting POST or DELETE request."
 msgstr ""
 
+#: Controller/UserSettingsController.php:329
+msgid "This endpoint only aaccepts POST requests."
+msgstr ""
+
 #: Controller/UserSettingsController.php:335
 msgid "No path POSTed."
 msgstr ""
 
-#: Controller/UsersController.php:52
+#: Controller/UsersController.php:46;326
 msgid "Invalid user or not authorised."
 msgstr ""
 
-#: Controller/UsersController.php:64;567;833;844;1082
+#: Controller/UsersController.php:66;566;815;834;1059
 msgid "Invalid user"
 msgstr ""
 
-#: Controller/UsersController.php:156;723;896
+#: Controller/UsersController.php:154;722;887
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
-#: Controller/UsersController.php:211
+#: Controller/UsersController.php:206
 msgid "The profile has been updated"
 msgstr ""
 
-#: Controller/UsersController.php:215
+#: Controller/UsersController.php:211
 msgid "The profile could not be updated. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:259
+#: Controller/UsersController.php:256
 msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:268
+#: Controller/UsersController.php:265
 msgid "Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:278
+#: Controller/UsersController.php:275
 msgid "Submitted new password cannot be the same as the current one"
 msgstr ""
 
-#: Controller/UsersController.php:293
+#: Controller/UsersController.php:290
 msgid "Password Changed."
 msgstr ""
 
-#: Controller/UsersController.php:301
+#: Controller/UsersController.php:299
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr ""
 
-#: Controller/UsersController.php:445;471;579
-#: Model/Log.php:405
+#: Controller/UsersController.php:442;468;575
+#: Model/Log.php:382
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:734
+#: Controller/UsersController.php:733
 msgid "The user could not be saved. Invalid organisation."
 msgstr ""
 
-#: Controller/UsersController.php:745
-msgid "User notified of new credentials."
-msgstr ""
-
-#: Controller/UsersController.php:747
-msgid "User notification of new credentials could not be send."
-msgstr ""
-
-#: Controller/UsersController.php:765
+#: Controller/UsersController.php:755
 msgid "The user has been saved."
 msgstr ""
 
-#: Controller/UsersController.php:774;1016
+#: Controller/UsersController.php:764;995
 msgid "The user could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:1009
+#: Controller/UsersController.php:987
 msgid "The user has been saved"
 msgstr ""
 
-#: Controller/UsersController.php:1090
+#: Controller/UsersController.php:1067
 msgid "User deleted"
 msgstr ""
 
-#: Controller/UsersController.php:1094
+#: Controller/UsersController.php:1071
 msgid "User was not deleted"
 msgstr ""
 
-#: Controller/UsersController.php:1165
+#: Controller/UsersController.php:1155
 msgid "Invalid username or password, try again"
 msgstr ""
 
 #: Controller/UsersController.php:1254
-msgid "Welcome! Last login was on %s"
-msgstr ""
-
-#: Controller/UsersController.php:1281
 msgid "Good-Bye"
 msgstr ""
 
-#: Controller/UsersController.php:1301;1324
+#: Controller/UsersController.php:1273;1297
 msgid "This functionality is only accessible via POST requests."
 msgstr ""
 
-#: Controller/UsersController.php:1307
+#: Controller/UsersController.php:1279
 msgid "Invalid action."
 msgstr ""
 
-#: Controller/UsersController.php:1314
+#: Controller/UsersController.php:1286
 msgid "New authkey generated."
 msgstr ""
 
-#: Controller/UsersController.php:1328
+#: Controller/UsersController.php:1301
 msgid "Job initiated."
 msgstr ""
 
-#: Controller/UsersController.php:1330
+#: Controller/UsersController.php:1303
 msgid "%s authkeys reset, %s could not be reset."
 msgstr ""
 
-#: Controller/UsersController.php:1442
+#: Controller/UsersController.php:1417
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1570
+#: Controller/UsersController.php:1545
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1575
+#: Controller/UsersController.php:1550
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1612
+#: Controller/UsersController.php:1587
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1614
+#: Controller/UsersController.php:1589
 msgid "E-mails sent."
 msgstr ""
 
-#: Controller/UsersController.php:1702
-msgid "The OTP is incorrect or has expired"
-msgstr ""
-
-#: Controller/UsersController.php:1747
-msgid "An email containing a OTP has been sent."
-msgstr ""
-
-#: Controller/UsersController.php:1749
-msgid "The email couldn't be sent, please reach out to your administrator."
-msgstr ""
-
-#: Controller/UsersController.php:1774
+#: Controller/UsersController.php:1663
 msgid "Usage data"
 msgstr ""
 
-#: Controller/UsersController.php:1775
-#: View/Cerebrates/view.ctp:57
-#: View/Elements/global_menu.ctp:201
+#: Controller/UsersController.php:1664
+#: View/Elements/global_menu.ctp:163
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
-#: View/SharingGroups/view.ctp:30;43
+#: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
 #: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr ""
 
-#: Controller/UsersController.php:1776
+#: Controller/UsersController.php:1665
 msgid "User and Organisation statistics"
 msgstr ""
 
-#: Controller/UsersController.php:1777
-#: View/Attributes/index.ctp:47
+#: Controller/UsersController.php:1666
+#: View/Attributes/index.ctp:53
 #: View/DecayingModel/decaying_tool_rest_search.ctp:28
-#: View/Elements/eventattribute.ctp:128
-#: View/Elements/EventReports/reportHelpModal.ctp:53
+#: View/Elements/eventattribute.ctp:151
 #: View/Elements/Events/eventIndexTable.ctp:37
 #: View/Elements/Feeds/eventattribute.ctp:46
-#: View/Elements/GalaxyClusters/relations_graph.ctp:450
-#: View/Elements/Servers/eventattribute.ctp:43
-#: View/Events/get_event_info_by_id.ctp:15
-#: View/Events/resolved_misp_format.ctp:68;145;340
-#: View/Events/view.ctp:100
+#: View/Elements/Servers/eventattribute.ctp:46
+#: View/Events/resolved_attributes.ctp:53
+#: View/Events/resolved_misp_format.ctp:66;94;289
+#: View/Events/view.ctp:127
 #: View/Feeds/preview_event.ctp:16
-#: View/Feeds/preview_index.ctp:35
+#: View/Feeds/preview_index.ctp:39
 #: View/Feeds/view.ctp:16
-#: View/GalaxyClusters/view_relations.ctp:117
 #: View/Noticelists/view.ctp:43
 #: View/Pages/doc/using_the_system.ctp:164;207;318
-#: View/Servers/preview_event.ctp:18
-#: View/Servers/preview_index.ctp:90
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
 #: View/TagCollections/index.ctp:10
-#: View/Tags/index.ctp:117
-#: View/Taxonomies/view.ctp:68
+#: View/Tags/index.ctp:10
+#: View/Taxonomies/view.ctp:88
 #: View/Templates/add.ctp:12
 #: View/Templates/edit.ctp:12
 #: View/Templates/view.ctp:19
 msgid "Tags"
 msgstr ""
 
-#: Controller/UsersController.php:1778
+#: Controller/UsersController.php:1667
 msgid "Attribute histogram"
 msgstr ""
 
-#: Controller/UsersController.php:1779
+#: Controller/UsersController.php:1668
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1780
+#: Controller/UsersController.php:1669
 msgid "Galaxy Matrix"
 msgstr ""
 
-#: Controller/UsersController.php:2129
-#: View/Elements/eventattributetoolbar.ctp:6
-#: View/Elements/Events/eventIndexTable.ctp:191
-#: View/EventReports/index.ctp:16
-#: View/EventReports/ajax/indexForEvent.ctp:50
-#: View/GalaxyClusterRelations/index.ctp:14
-#: View/GalaxyClusters/ajax/index.ctp:19
-#: View/Jobs/index.ctp:13;58
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_add.ctp:17
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-#: View/Taxonomies/index.ctp:12
-#: View/UserSettings/index.ctp:41
-#: View/Users/admin_index.ctp:38
-#: View/Warninglists/index.ctp:20
-msgid "All"
-msgstr ""
-
-#: Controller/UsersController.php:2373
+#: Controller/UsersController.php:2252
 msgid "Self registration is not enabled on this instance."
 msgstr ""
 
-#: Controller/UsersController.php:2405
+#: Controller/UsersController.php:2278
 msgid "We require at least the email field to be filled."
 msgstr ""
 
-#: Controller/UsersController.php:2410
-msgid "Request could not be created."
-msgstr ""
-
-#: Controller/UsersController.php:2412
-msgid "Errors: %s"
-msgstr ""
-
-#: Controller/UsersController.php:2423
+#: Controller/UsersController.php:2284
 msgid "User registration for %s."
 msgstr ""
 
-#: Controller/UsersController.php:2431
+#: Controller/UsersController.php:2292
 msgid "Request could not be created. Make sure that the email and org name fields are filled."
 msgstr ""
 
-#: Controller/UsersController.php:2438
+#: Controller/UsersController.php:2299
 msgid "Request sent. The administrators of this community have been notified."
 msgstr ""
 
-#: Controller/UsersController.php:2485
+#: Controller/UsersController.php:2353
 msgid "default"
 msgstr ""
 
-#: Controller/UsersController.php:2488;2489;2490
-#: Model/Server.php:4388
+#: Controller/UsersController.php:2356;2357;2358
 #: 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:17
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
 #: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:85
-#: View/Elements/Servers/View/row_attribute.ctp:125
-#: View/Elements/Users/userIndexTable.ctp:51;54;61;68;80;86
-#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:59
-#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:10
-#: View/Elements/healthElements/diagnostics.ctp:218;225
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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
@@ -3002,25 +2289,27 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:70
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:184
+#: View/Events/view.ctp:191
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
 #: View/Events/ajax/handleSelected.ctp:17
 #: View/Events/ajax/toggle_correlation.ctp:20
 #: View/Feeds/preview_event.ctp:56
-#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:25
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
 #: View/ObjectReferences/ajax/delete.ctp:32
-#: View/Objects/revise_object.ctp:83
+#: View/Objects/revise_object.ctp:92
 #: View/Objects/ajax/delete.ctp:19
 #: View/Organisations/index.ctp:127
-#: View/Servers/index.ctp:112;113;114;115;116;117;151;152;157;158
-#: View/Servers/preview_event.ctp:47
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
+#: 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:5
+#: 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
@@ -3031,22 +2320,17 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: Controller/UsersController.php:2488;2489;2490
-#: Model/Server.php:4388
+#: Controller/UsersController.php:2356;2357;2358
 #: 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:22
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:85
-#: View/Elements/Servers/View/row_attribute.ctp:125
-#: View/Elements/Users/userIndexTable.ctp:51;54;61;68;80;86
-#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:50
-#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:59
-#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:13
-#: View/Elements/healthElements/diagnostics.ctp:218;227
+#: View/Elements/Feeds/View/row_attribute.ctp:89
+#: View/Elements/Servers/View/row_attribute.ctp:144
+#: 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
@@ -3055,27 +2339,28 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:70;224
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:184
+#: View/Events/view.ctp:191
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:33
 #: 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:26
-#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:30
+#: 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:83
+#: View/Objects/revise_object.ctp:92
 #: View/Objects/ajax/delete.ctp:24
 #: View/Organisations/index.ctp:127
-#: View/Servers/index.ctp:112;113;114;115;116;117;147;151;152;157;158
-#: View/Servers/preview_event.ctp:47
+#: View/Roles/admin_index.ctp:43;51
+#: View/Roles/index.ctp:36
+#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
+#: 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:5
+#: 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
@@ -3087,123 +2372,107 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: Controller/UsersController.php:2635
+#: Controller/UsersController.php:2495
 msgid "Role ID not provided and no default role exist on the instance"
 msgstr ""
 
-#: Controller/UsersController.php:2639
-msgid "No organisation selected. Supply an Organisation ID"
-msgstr ""
-
-#: Controller/UsersController.php:2657
+#: Controller/UsersController.php:2509
 msgid "Added %s user(s)."
 msgstr ""
 
-#: Controller/UsersController.php:2660
+#: Controller/UsersController.php:2512
 msgid "Could not add %s user(s), reasons for the failure have been logged."
 msgstr ""
 
-#: Controller/UsersController.php:2663
+#: Controller/UsersController.php:2515
 msgid "No new users added - there was nothing to add."
 msgstr ""
 
-#: Controller/UsersController.php:2685
-msgid "This endpoint can only be triggered via POST requests."
+#: Controller/WarninglistsController.php:42
+msgid "This action is only accessible via POST requests."
 msgstr ""
 
-#: Controller/UsersController.php:2711
-msgid "The upgrade process is complete, %s authkey(s) generated."
-msgstr ""
-
-#: Controller/WarninglistsController.php:77
+#: Controller/WarninglistsController.php:64
 msgid "Warning list updated"
 msgstr ""
 
-#: Controller/WarninglistsController.php:93
+#: Controller/WarninglistsController.php:80
 msgid "Warning list failed to update"
 msgstr ""
 
-#: Controller/WarninglistsController.php:94
+#: Controller/WarninglistsController.php:81
 msgid " could not be installed/updated. Error: "
 msgstr ""
 
-#: Controller/WarninglistsController.php:108
+#: Controller/WarninglistsController.php:95
 msgid "Warninglist update (nothing to update)"
 msgstr ""
 
-#: Controller/WarninglistsController.php:109
+#: Controller/WarninglistsController.php:96
 msgid "Executed an update of the warning lists, but there was nothing to update."
 msgstr ""
 
-#: Controller/WarninglistsController.php:114
+#: Controller/WarninglistsController.php:101
 msgid "All warninglists are up to date already."
 msgstr ""
 
-#: Controller/WarninglistsController.php:117
+#: Controller/WarninglistsController.php:104
 msgid "Could not update any of the warning lists"
 msgstr ""
 
-#: Controller/WarninglistsController.php:120
-msgid "Successfully updated %s warninglists."
-msgstr ""
-
-#: Controller/WarninglistsController.php:122
-msgid " However, could not update %s warninglists."
-msgstr ""
-
-#: Controller/WarninglistsController.php:145
+#: Controller/WarninglistsController.php:132
 msgid "This function only accepts POST requests."
 msgstr ""
 
-#: Controller/WarninglistsController.php:173;245
+#: Controller/WarninglistsController.php:160;233
 msgid "Warninglist not found."
 msgstr ""
 
-#: Controller/WarninglistsController.php:177
+#: Controller/WarninglistsController.php:164
 msgid "Warninglist(s) not found."
 msgstr ""
 
-#: Controller/WarninglistsController.php:202
+#: Controller/WarninglistsController.php:190
 msgid " warninglist(s) "
 msgstr ""
 
-#: Controller/WarninglistsController.php:204
+#: Controller/WarninglistsController.php:192
 msgid "Warninglist(s) could not be toggled."
 msgstr ""
 
-#: Controller/WarninglistsController.php:212
+#: Controller/WarninglistsController.php:200
 msgid "Invalid Warninglist."
 msgstr ""
 
-#: Controller/WarninglistsController.php:221
+#: Controller/WarninglistsController.php:209
 msgid "Warninglist disabled"
 msgstr ""
 
-#: Controller/WarninglistsController.php:224
+#: Controller/WarninglistsController.php:212
 msgid "Warninglist enabled"
 msgstr ""
 
-#: Controller/WarninglistsController.php:232
+#: Controller/WarninglistsController.php:220
 msgid "This action is available via AJAX only."
 msgstr ""
 
-#: Controller/WarninglistsController.php:263
+#: Controller/WarninglistsController.php:251
 msgid "Warninglist successfuly deleted."
 msgstr ""
 
-#: Controller/WarninglistsController.php:266
+#: Controller/WarninglistsController.php:254
 msgid "Warninglists could not be deleted."
 msgstr ""
 
-#: Controller/WarninglistsController.php:283
+#: Controller/WarninglistsController.php:272
 msgid "No valid data received."
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:778
+#: Controller/Component/ACLComponent.php:634
 msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:831
+#: Controller/Component/ACLComponent.php:688
 msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
 msgstr ""
 
@@ -3231,50 +2500,28 @@ msgstr ""
 msgid "%s was not deleted"
 msgstr ""
 
-#: Controller/Component/BlockListComponent.php:54
-msgid "Pass a list of uuids via the \"uuids\" key in the request object."
+#: Controller/Component/BlackListComponent.php:75
+msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
 msgstr ""
 
-#: Controller/Component/BlockListComponent.php:84
-msgid "Done. Added %d new entries to the blocklist. %d entries could not be saved."
+#: Controller/Component/BlackListComponent.php:126
+msgid "Blacklist item added."
 msgstr ""
 
-#: Controller/Component/BlockListComponent.php:113
-msgid "Blocklist item not found."
+#: Controller/Component/BlackListComponent.php:133
+msgid "Could not save the blacklist item"
 msgstr ""
 
-#: Controller/Component/BlockListComponent.php:153
-msgid "Blocklist item added."
+#: Controller/Component/BlackListComponent.php:155
+msgid "Invalid blacklist entry"
 msgstr ""
 
-#: Controller/Component/BlockListComponent.php:160
-msgid "Could not save the blocklist item"
+#: Controller/Component/BlackListComponent.php:159
+msgid "Blacklist entry removed"
 msgstr ""
 
-#: Controller/Component/BlockListComponent.php:183
-msgid "Blocklist entry removed"
-msgstr ""
-
-#: Controller/Component/BlockListComponent.php:189
-msgid "Could not remove the blocklist entry"
-msgstr ""
-
-#: Controller/Component/CRUDComponent.php:107
-msgid "%s added."
-msgstr ""
-
-#: Controller/Component/CRUDComponent.php:129
-msgid "%s could not be added."
-msgstr ""
-
-#: Controller/Component/CRUDComponent.php:146;198;210;227;240
-#: Controller/Component/ToolboxComponent.php:16;21;29
-#: Model/Galaxy.php:358;427;437;451
-msgid "Invalid %s."
-msgstr ""
-
-#: Controller/Component/CRUDComponent.php:260
-msgid "%s deleted."
+#: Controller/Component/BlackListComponent.php:161
+msgid "Could not remove the blacklist entry"
 msgstr ""
 
 #: Controller/Component/DeprecationComponent.php:18
@@ -3325,1647 +2572,1465 @@ msgstr ""
 msgid "Rate limit exceeded."
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:714
+#: Controller/Component/RestResponseComponent.php:603
 msgid "The action that the user performed"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:720
-msgid "Is the sharing group selectable (active) when choosing distribution"
+#: Controller/Component/RestResponseComponent.php:609
+msgid "Is the sharing group selectable (active) when chosing distribution"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:725;1497
+#: Controller/Component/RestResponseComponent.php:614;1356
 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 ""
 
-#: Controller/Component/RestResponseComponent.php:731
+#: Controller/Component/RestResponseComponent.php:620
 msgid "All organisations contained on the instance will be part of the sharing group"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:737
+#: Controller/Component/RestResponseComponent.php:626
 msgid "hard-delete already soft-deleted attributes"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:744
+#: Controller/Component/RestResponseComponent.php:633
 msgid "Maturity of the event"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:751
+#: Controller/Component/RestResponseComponent.php:640
 msgid "Anonymise the information regarding the server on which the request was issued"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:757
+#: Controller/Component/RestResponseComponent.php:646
 msgid "Filter on attribute value"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:763
+#: Controller/Component/RestResponseComponent.php:652
 msgid "The authorisation key found on the external server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:769
+#: Controller/Component/RestResponseComponent.php:658
 msgid "The user receive alerts when events are published"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:775
+#: Controller/Component/RestResponseComponent.php:664
 msgid "The email's body"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:781
+#: Controller/Component/RestResponseComponent.php:670
 msgid "The feed is cached"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:793
+#: Controller/Component/RestResponseComponent.php:682
 msgid "A valid x509 certificate "
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:799
+#: Controller/Component/RestResponseComponent.php:688
 msgid "The text contained in the change field"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:805
+#: Controller/Component/RestResponseComponent.php:694
 msgid "The user will be prompted the change the password"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:811
+#: Controller/Component/RestResponseComponent.php:700
 msgid "A valid hexadecimal colour `#ffffff`"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:822
+#: Controller/Component/RestResponseComponent.php:711
 msgid "Contact details for the organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:828
+#: Controller/Component/RestResponseComponent.php:717
 msgid "The user receive alerts from `contact reporter` requests"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:845
+#: Controller/Component/RestResponseComponent.php:734
 msgid "Base64 encoded file contents"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:857
+#: Controller/Component/RestResponseComponent.php:746
 msgid "The user set date field on the event level. If you are using restSearch, you can use any of the valid time related filters (examples: 7d, timestamps, [14d, 7d] for ranges, etc.)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:892
+#: Controller/Component/RestResponseComponent.php:781
 msgid "The role is a default role (selected by default)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:898
+#: Controller/Component/RestResponseComponent.php:787
 msgid "Remove file after ingestion"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:904
+#: Controller/Component/RestResponseComponent.php:793
 msgid "Include deleted elements"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:910
+#: Controller/Component/RestResponseComponent.php:799
 msgid "Merge attributes (only add new attribute, remove revoked attributes)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:921
+#: Controller/Component/RestResponseComponent.php:810
 msgid "Disable the user account"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:933
+#: Controller/Component/RestResponseComponent.php:822
 msgid "Filter on user email"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:939
+#: Controller/Component/RestResponseComponent.php:828
 msgid "Set the password manually"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:950
-msgid "When uploading malicious samples, set this flag to tell MISP to encrypt the sample and extract the file hashes. This will create a MISP object with the appropriate attributes."
+#: Controller/Component/RestResponseComponent.php:839
+msgid "When uploading malicious samples, set this flag to tell MISP to encrpyt the sample and extract the file hashes. This will create a MISP object with the appropriate attributes."
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:961
+#: Controller/Component/RestResponseComponent.php:850
 msgid "Should the warning list be enforced. Adds `blocked` field for matching attributes"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:968
-#: View/Attributes/alternate_search_result.ctp:6
-#: View/EventDelegations/index.ctp:70
-msgid "Event id"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:981
+#: Controller/Component/RestResponseComponent.php:863
 msgid "The timestamp at which the event was last modified"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:988
+#: Controller/Component/RestResponseComponent.php:870
 msgid "The timestamp at which the attribute was last modified"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1000;1145
+#: Controller/Component/RestResponseComponent.php:882;1021
 msgid "Quick event description"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1006
+#: Controller/Component/RestResponseComponent.php:888
 msgid "The tag is exported when synchronising with other instances"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1018
+#: Controller/Component/RestResponseComponent.php:900
 msgid "Exclude local tags from the export"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1024
+#: Controller/Component/RestResponseComponent.php:906
 msgid "The organisation have write access to this sharing group (they can add/remove other organisation)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1030
+#: Controller/Component/RestResponseComponent.php:912
 msgid "An external authorisation is required for this user"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1036
+#: Controller/Component/RestResponseComponent.php:918
 msgid "A valid external auth key"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1049
+#: Controller/Component/RestResponseComponent.php:931
 msgid "target_event option might be considered"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1061
+#: Controller/Component/RestResponseComponent.php:943
 msgid "The date from which the event was published"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1067
-msgid "Source galaxy cluster UUID"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:1073
+#: Controller/Component/RestResponseComponent.php:949
 msgid "A valid GPG key"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1079
+#: Controller/Component/RestResponseComponent.php:955
 msgid "The event contains proposals"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1085
+#: Controller/Component/RestResponseComponent.php:961
 msgid "Headers to be passed with the requests. All separated by `\\n`"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1091
+#: Controller/Component/RestResponseComponent.php:967
 msgid "The tag is hidden (not selectable)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1103
+#: Controller/Component/RestResponseComponent.php:979
 msgid "Include matching attributes in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1115
+#: Controller/Component/RestResponseComponent.php:991
 msgid "Include matching events in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1121
+#: Controller/Component/RestResponseComponent.php:997
 msgid "Include matching eventUuids in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1127
+#: Controller/Component/RestResponseComponent.php:1003
 msgid "Include tags of matching events in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1139
+#: Controller/Component/RestResponseComponent.php:1015
 msgid "Include proposals of matching events in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1152
+#: Controller/Component/RestResponseComponent.php:1028
 msgid "Specify whether the source (url field) is a directory (local) or an geniun url (network)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1158
+#: Controller/Component/RestResponseComponent.php:1034
 msgid "The IP of a login attempt"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1164
+#: Controller/Component/RestResponseComponent.php:1040
 msgid "JSON containing ID, UUID and name"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1170
+#: Controller/Component/RestResponseComponent.php:1046
 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)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1183
+#: Controller/Component/RestResponseComponent.php:1059
 msgid "Limit on the pagination"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1189
+#: Controller/Component/RestResponseComponent.php:1065
 msgid "If the organisation should have access to this instance, make sure that the Local organisation setting is checked. If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting."
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1195
+#: Controller/Component/RestResponseComponent.php:1071
 msgid "The lookup will not be visible in the feed correlation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1201
+#: Controller/Component/RestResponseComponent.php:1077
 msgid "Message to be included"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1207
-msgid "Will only return the metadata of the given query scope, contained data is omitted."
+#: Controller/Component/RestResponseComponent.php:1083
+msgid "Will not return Attributes, shadow attribute and objects"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1213
+#: Controller/Component/RestResponseComponent.php:1089
 msgid "Will only return  id, timestamp, published and uuid"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1220
+#: Controller/Component/RestResponseComponent.php:1096
 msgid "Mock the query"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1244
+#: Controller/Component/RestResponseComponent.php:1120
 msgid "The last time the sharing group was modified"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1262
+#: Controller/Component/RestResponseComponent.php:1138
 msgid "The news are read"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1269
+#: Controller/Component/RestResponseComponent.php:1145
 msgid "The unique Signature Identification"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1275
+#: Controller/Component/RestResponseComponent.php:1151
 msgid "Can be either the ORG_ID or the ORG_NAME"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1281
+#: Controller/Component/RestResponseComponent.php:1157
 msgid "Describe the organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1287
+#: Controller/Component/RestResponseComponent.php:1163
 msgid "Organisation identifier (name)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1299;1305
+#: Controller/Component/RestResponseComponent.php:1175;1181
 msgid "Globally used uuid of an organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1311
+#: Controller/Component/RestResponseComponent.php:1187
 msgid "The IDS flags will be set to off for this feed"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1318
+#: Controller/Component/RestResponseComponent.php:1194
 msgid "Page number for the pagination"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1324
+#: Controller/Component/RestResponseComponent.php:1200
 msgid "The hardcoded password"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1401
+#: Controller/Component/RestResponseComponent.php:1272
 msgid "The name of the feed provider"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1407
+#: Controller/Component/RestResponseComponent.php:1278
 msgid "The event will be published"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1430
+#: Controller/Component/RestResponseComponent.php:1301
 msgid "Allow the download of events and their attribute from the server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1436
+#: Controller/Component/RestResponseComponent.php:1307
 msgid "Allow the upload of events and their attribute to the server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1442
+#: Controller/Component/RestResponseComponent.php:1313
 msgid "Allow the upload of sightings to the server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1448
-msgid "Destination galaxy cluster UUID"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:1454
-msgid "The type of the relation. Example: `is`, `related-to`, ..."
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:1460
+#: Controller/Component/RestResponseComponent.php:1319
 msgid "Concise summary for who this sharing group is releasable to"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1478
+#: Controller/Component/RestResponseComponent.php:1337
 msgid "Pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1503
+#: Controller/Component/RestResponseComponent.php:1362
 msgid "The sector of the organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1515
+#: Controller/Component/RestResponseComponent.php:1374
 msgid "Will only return the sharing group ID"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1528
+#: Controller/Component/RestResponseComponent.php:1387
 msgid "Sharing group ID"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1534
+#: Controller/Component/RestResponseComponent.php:1393
 msgid "The source of the Sighting (e.g. honeypot_1)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1546
-msgid "Only returns tags matching exactly the tag name (thus skipping synonyms and cluster's value)"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:1552
+#: Controller/Component/RestResponseComponent.php:1405
 msgid "The email's subject"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1558;1564
+#: Controller/Component/RestResponseComponent.php:1411;1417
 msgid "Base64 encoded certificate"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1582
+#: Controller/Component/RestResponseComponent.php:1435
 msgid "A tad ID to attach to created events"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1595
+#: Controller/Component/RestResponseComponent.php:1448
 msgid "The provided ID will be reused as an existing event"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1618
+#: Controller/Component/RestResponseComponent.php:1471
 msgid "Time of the sighting with the form `h:i:s`"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1630
+#: Controller/Component/RestResponseComponent.php:1483
 msgid "The title of the log"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1642
+#: Controller/Component/RestResponseComponent.php:1495
 msgid "The date to which the event was published"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1648
+#: Controller/Component/RestResponseComponent.php:1501
 msgid "The state of the `to_ids` flag"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1654
+#: Controller/Component/RestResponseComponent.php:1507
 msgid "The type of the attribute"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1682
+#: Controller/Component/RestResponseComponent.php:1535
 msgid "Placeholder containing values to sight"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1695
+#: Controller/Component/RestResponseComponent.php:1548
 msgid "Not supported (warninglist->checkvalues) expect an array"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1701;1707;1713;1720;1726;1732;1738;1744;1755
+#: Controller/Component/RestResponseComponent.php:1554
+msgid "Not supported (removeTag)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1560;1566;1572;1579;1585;1591;1597;1603;1614
 msgid "Not supported"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1902
-msgid "Also supports array of tags"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:1907
-msgid "Attribute id"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:1928
+#: Controller/Component/RestResponseComponent.php:1771
 msgid "Seen within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m)"
 msgstr ""
 
-#: Model/AppModel.php:1655
-msgid "Indexing %s -> %s"
+#: Controller/Component/ToolboxComponent.php:18;26
+#: Model/Galaxy.php:220;277;287;301
+msgid "Invalid %s."
 msgstr ""
 
-#: Model/AppModel.php:1669
+#: Model/AppModel.php:1466
+msgid "Indexing "
+msgstr ""
+
+#: Model/AppModel.php:1480
 msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1691
-msgid "Successfully executed the SQL query for "
+#: Model/AppModel.php:1502
+msgid "Successfuly executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1692
+#: Model/AppModel.php:1503
 msgid "The executed SQL query was: %s"
 msgstr ""
 
-#: Model/AppModel.php:1694
-msgid "Successfully executed the SQL query for %s"
+#: Model/AppModel.php:1505
+msgid "Successfuly executed the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1705;1768
+#: Model/AppModel.php:1516;1580
 msgid "Issues executing the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1706
+#: Model/AppModel.php:1517
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1706
+#: Model/AppModel.php:1517
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1708
+#: Model/AppModel.php:1519
 msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1717
-msgid "However, as this error is allowed, the update went through."
+#: Model/AppModel.php:1528
+msgid "However, as this error is whitelisted, the update went through."
 msgstr ""
 
-#: Model/AppModel.php:1736
+#: Model/AppModel.php:1547
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/AppModel.php:1739
+#: Model/AppModel.php:1550
 msgid "Failed to add index"
 msgstr ""
 
-#: Model/AppModel.php:1741
+#: Model/AppModel.php:1552
 msgid "The returned error is:"
 msgstr ""
 
-#: Model/AppModel.php:1769
+#: Model/AppModel.php:1581
 msgid "Database updates stopped as some errors occured and the stop flag is enabled."
 msgstr ""
 
-#: Model/AppModel.php:1920;1932
+#: Model/AppModel.php:1740
 msgid "Invalid JSON."
 msgstr ""
 
-#: Model/AppModel.php:2030;2086
+#: Model/AppModel.php:1833;1891
 msgid "Issues executing run_updates"
 msgstr ""
 
-#: Model/AppModel.php:2031
+#: Model/AppModel.php:1834
 msgid "Database updates are locked. Worker not spawned"
 msgstr ""
 
-#: Model/AppModel.php:2035;2091;2126
+#: Model/AppModel.php:1838;1896;1931
 msgid "Update done"
 msgstr ""
 
-#: Model/AppModel.php:2087
+#: Model/AppModel.php:1892
 msgid "Updates are locked. Stopping worker gracefully"
 msgstr ""
 
-#: Model/AppModel.php:2106
+#: Model/AppModel.php:1911
 msgid "Running update %s"
 msgstr ""
 
-#: Model/AppModel.php:2132
+#: Model/AppModel.php:1937
 msgid "Update done in another worker. Gracefuly stopping."
 msgstr ""
 
-#: Model/Attribute.php:73
-#: Model/Server.php:4868;4877
+#: Model/Attribute.php:63
 #: View/Events/filter_event_index.ctp:46;182
 msgid "Your organisation only"
 msgstr ""
 
-#: Model/Attribute.php:74
-#: Model/Server.php:4868;4877
+#: Model/Attribute.php:64
 #: View/Events/filter_event_index.ctp:46;183
 msgid "This community only"
 msgstr ""
 
-#: Model/Attribute.php:75
-#: Model/Server.php:4868;4877
+#: Model/Attribute.php:65
 #: View/Events/filter_event_index.ctp:46;184
 #: View/Pages/doc/using_the_system.ctp:51
 msgid "Connected communities"
 msgstr ""
 
-#: Model/Attribute.php:76
-#: Model/Server.php:4868;4877
+#: Model/Attribute.php:66
 #: View/Events/filter_event_index.ctp:46;185
 #: View/Pages/doc/using_the_system.ctp:58
 msgid "All communities"
 msgstr ""
 
-#: Model/Attribute.php:77
+#: Model/Attribute.php:67
 #: View/Elements/view_event_distribution_graph.ctp:24
 msgid "Sharing group"
 msgstr ""
 
-#: Model/Attribute.php:78
+#: Model/Attribute.php:68
 msgid "Inherit event"
 msgstr ""
 
-#: Model/Attribute.php:355
-msgid "Composite type, but value not explodable"
-msgstr ""
-
-#: Model/Attribute.php:618
-msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
-msgstr ""
-
-#: Model/Attribute.php:771
-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:777
-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:784
-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:794
-msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
-msgstr ""
-
-#: Model/Attribute.php:803
-msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
-msgstr ""
-
-#: Model/Attribute.php:810
-msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
-msgstr ""
-
-#: Model/Attribute.php:817
-msgid "Unknown HTTP method."
-msgstr ""
-
-#: Model/Attribute.php:825
-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:847
-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:852
-msgid "Invalid composite type. The format has to be %s."
-msgstr ""
-
-#: Model/Attribute.php:863
-msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
-msgstr ""
-
-#: Model/Attribute.php:871
-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:878
-msgid "Checksum has an invalid length or format (expected: filename|string characters). Please double check the value or select type \"other\"."
-msgstr ""
-
-#: Model/Attribute.php:886
-msgid "Invalid CIDR notation value found."
-msgstr ""
-
-#: Model/Attribute.php:891
-msgid "Invalid CIDR notation value found, for IPv4 must be lower or equal 32."
-msgstr ""
-
-#: Model/Attribute.php:895
-msgid "Invalid CIDR notation value found, for IPv6 must be lower or equal 128."
-msgstr ""
-
-#: Model/Attribute.php:898;901;916;955
-msgid "IP address has an invalid format."
-msgstr ""
-
-#: Model/Attribute.php:907;919;946
-msgid "Port numbers have to be integers between 1 and 65535."
-msgstr ""
-
-#: Model/Attribute.php:937
-msgid "%s has an invalid format. Please double check the value or select type \"other\"."
-msgstr ""
-
-#: Model/Attribute.php:943
-msgid "Hostname has an invalid format."
-msgstr ""
-
-#: Model/Attribute.php:958
-msgid "Domain name has an invalid format."
-msgstr ""
-
-#: Model/Attribute.php:973
-msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
-msgstr ""
-
-#: Model/Attribute.php:980
-msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
-msgstr ""
-
-#: Model/Attribute.php:987
-msgid "Invalid format. Expected: CWE-x..."
-msgstr ""
-
-#: Model/Attribute.php:998
-msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
-msgstr ""
-
-#: Model/Attribute.php:1107
-msgid "Value must not contain new line character."
-msgstr ""
-
-#: Model/Attribute.php:1115
-msgid "Datetime has to be in the ISO 8601 format."
-msgstr ""
-
-#: Model/Attribute.php:1123
-#: Model/Server.php:1481
-msgid "The value has to be a whole number greater or equal 0."
-msgstr ""
-
-#: Model/Attribute.php:1126
-msgid "The value has to be a number between 0 and 10."
-msgstr ""
-
-#: Model/Attribute.php:1171
-msgid "AS number have to be integers between 1 and 4294967295"
-msgstr ""
-
-#: Model/Attribute.php:2077;2145
-msgid "Could not read user."
-msgstr ""
-
-#: Model/Attribute.php:2081
-msgid "Invalid hash type."
-msgstr ""
-
-#: Model/Attribute.php:2803
-msgid "This field is mandatory."
-msgstr ""
-
-#: Model/Attribute.php:3427
-msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
-msgstr ""
-
-#: Model/Attribute.php:4601
+#: Model/Attribute.php:76
 msgid "Reference used by the publishing party (e.g. ticket number)"
 msgstr ""
 
-#: Model/Attribute.php:4605
+#: Model/Attribute.php:80
 msgid "Internal Attack Targeting and Compromise Information"
 msgstr ""
 
-#: Model/Attribute.php:4606
+#: Model/Attribute.php:81
 msgid "Targeting information to include recipient email, infected machines, department, and or locations."
 msgstr ""
 
-#: Model/Attribute.php:4610
+#: Model/Attribute.php:85
 msgid "All the info about how the malware is detected by the antivirus products"
 msgstr ""
 
-#: Model/Attribute.php:4611
+#: Model/Attribute.php:86
 msgid "List of anti-virus vendors detecting the malware or information on detection performance (e.g. 13/43 or 67%). Attachment with list of detection or link to VirusTotal could be placed here as well."
 msgstr ""
 
-#: Model/Attribute.php:4615
+#: Model/Attribute.php:90
 msgid "Information about how the malware is delivered"
 msgstr ""
 
-#: Model/Attribute.php:4616
+#: Model/Attribute.php:91
 msgid "Information about the way the malware payload is initially delivered, for example information about the email or web-site, vulnerability used, originating IP etc. Malware sample itself should be attached here."
 msgstr ""
 
-#: Model/Attribute.php:4620
+#: Model/Attribute.php:95
 msgid "Any artifact (files, registry keys etc.) dropped by the malware or other modifications to the system"
 msgstr ""
 
-#: Model/Attribute.php:4624
+#: Model/Attribute.php:99
 msgid "Info on where the malware gets installed in the system"
 msgstr ""
 
-#: Model/Attribute.php:4625
+#: Model/Attribute.php:100
 msgid "Location where the payload was placed in the system and the way it was installed. For example, a filename|md5 type attribute can be added here like this: c:\\windows\\system32\\malicious.exe|41d8cd98f00b204e9800998ecf8427e."
 msgstr ""
 
-#: Model/Attribute.php:4629
+#: Model/Attribute.php:104
 msgid "Mechanisms used by the malware to start at boot"
 msgstr ""
 
-#: Model/Attribute.php:4630
+#: Model/Attribute.php:105
 msgid "Mechanisms used by the malware to start at boot. This could be a registry key, legitimate driver modification, LNK file in startup"
 msgstr ""
 
-#: Model/Attribute.php:4634
+#: Model/Attribute.php:109
 msgid "Information about network traffic generated by the malware"
 msgstr ""
 
-#: Model/Attribute.php:4638
+#: Model/Attribute.php:113
 msgid "Information about the final payload(s)"
 msgstr ""
 
-#: Model/Attribute.php:4639
+#: Model/Attribute.php:114
 msgid "Information about the final payload(s). Can contain a function of the payload, e.g. keylogger, RAT, or a name if identified, such as Poison Ivy."
 msgstr ""
 
-#: Model/Attribute.php:4643
+#: Model/Attribute.php:118
 msgid "Identification of the group, organisation, or country behind the attack"
 msgstr ""
 
-#: Model/Attribute.php:4647
+#: Model/Attribute.php:122
 msgid "Any other result from additional analysis of the malware like tools output"
 msgstr ""
 
-#: Model/Attribute.php:4648
+#: Model/Attribute.php:123
 msgid "Any other result from additional analysis of the malware like tools output Examples: pdf-parser output, automated sandbox analysis, reverse engineering report."
 msgstr ""
 
-#: Model/Attribute.php:4652
+#: Model/Attribute.php:127
 msgid "Financial Fraud indicators"
 msgstr ""
 
-#: Model/Attribute.php:4653
+#: Model/Attribute.php:128
 msgid "Financial Fraud indicators, for example: IBAN Numbers, BIC codes, Credit card numbers, etc."
 msgstr ""
 
-#: Model/Attribute.php:4657
+#: Model/Attribute.php:132
 msgid "Tools supporting analysis or detection of the event"
 msgstr ""
 
-#: Model/Attribute.php:4661
+#: Model/Attribute.php:136
 msgid "Social networks and platforms"
 msgstr ""
 
-#: Model/Attribute.php:4666
+#: Model/Attribute.php:141
 msgid "A human being - natural person"
 msgstr ""
 
-#: Model/Attribute.php:4670
+#: Model/Attribute.php:145
 msgid "Attributes that are not part of any other category or are meant to be used as a component in MISP objects in the future"
 msgstr ""
 
-#: Model/Attribute.php:4684;4788
+#: Model/Attribute.php:154;243
 msgid "A checksum in md5 format"
 msgstr ""
 
-#: Model/Attribute.php:4684
+#: Model/Attribute.php:154
 msgid "You are encouraged to use filename|md5 instead. A checksum in md5 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4685
+#: Model/Attribute.php:155
 msgid "A checksum in sha1 format"
 msgstr ""
 
-#: Model/Attribute.php:4685
+#: Model/Attribute.php:155
 msgid "You are encouraged to use filename|sha1 instead. A checksum in sha1 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4686
+#: Model/Attribute.php:156
 msgid "A checksum in sha256 format"
 msgstr ""
 
-#: Model/Attribute.php:4686
+#: Model/Attribute.php:156
 msgid "You are encouraged to use filename|sha256 instead. A checksum in sha256 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4687
+#: Model/Attribute.php:157
 #: View/Elements/healthElements/files.ctp:29
 msgid "Filename"
 msgstr ""
 
-#: Model/Attribute.php:4688
+#: Model/Attribute.php:158
 msgid "Microsoft Program database (PDB) path information"
 msgstr ""
 
-#: Model/Attribute.php:4689
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4689
+#: Model/Attribute.php:159
 msgid "A filename and an md5 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:4690
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4690
+#: Model/Attribute.php:160
 msgid "A filename and an sha1 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:4691
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4691
+#: Model/Attribute.php:161
 msgid "A filename and an sha256 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:4692
+#: Model/Attribute.php:162
 msgid "A source IP address of the attacker"
 msgstr ""
 
-#: Model/Attribute.php:4693
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server"
 msgstr ""
 
-#: Model/Attribute.php:4693
+#: Model/Attribute.php:163
 msgid "A destination IP address of the attacker or C&C server. Also set the IDS flag on when this IP is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:4694
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker"
 msgstr ""
 
-#: Model/Attribute.php:4694
+#: Model/Attribute.php:164
 msgid "A full host/dnsname of an attacker. Also set the IDS flag on when this hostname is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:4695
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware"
 msgstr ""
 
-#: Model/Attribute.php:4695
+#: Model/Attribute.php:165
 msgid "A domain name used in the malware. Use this instead of hostname when the upper domain is important or can be used to create links between events."
 msgstr ""
 
-#: Model/Attribute.php:4696
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4696
+#: Model/Attribute.php:166
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:4698
-msgid "The source email address. Used to describe the sender when describing an e-mail."
+#: Model/Attribute.php:167
+msgid "The email address used to send the malware."
 msgstr ""
 
-#: Model/Attribute.php:4699
+#: Model/Attribute.php:168
 msgid "eduPersonPrincipalName - eppn - the NetId of the person for the purposes of inter-institutional authentication. Should be stored in the form of user@univ.edu, where univ.edu is the name of the local security domain."
 msgstr ""
 
-#: Model/Attribute.php:4700
-msgid "The destination email address. Used to describe the recipient when describing an e-mail."
+#: Model/Attribute.php:169
+msgid "A recipient email address"
 msgstr ""
 
-#: Model/Attribute.php:4701
+#: Model/Attribute.php:169
+msgid "A recipient email address that is not related to your constituency."
+msgstr ""
+
+#: Model/Attribute.php:170
 msgid "The subject of the email"
 msgstr ""
 
-#: Model/Attribute.php:4702
+#: Model/Attribute.php:171
 msgid "File name of the email attachment."
 msgstr ""
 
-#: Model/Attribute.php:4703
+#: Model/Attribute.php:172
 msgid "Email body"
 msgstr ""
 
-#: Model/Attribute.php:4704
+#: Model/Attribute.php:173
 msgid "A floating point value."
 msgstr ""
 
-#: Model/Attribute.php:4705
-msgid "A git commit ID."
-msgstr ""
-
-#: Model/Attribute.php:4706
+#: Model/Attribute.php:174
 msgid "url"
 msgstr ""
 
-#: Model/Attribute.php:4707
+#: Model/Attribute.php:175
 msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
 msgstr ""
 
-#: Model/Attribute.php:4708
+#: Model/Attribute.php:176
 msgid "The user-agent used by the malware in the HTTP request."
 msgstr ""
 
-#: Model/Attribute.php:4709
+#: Model/Attribute.php:177
 msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
 msgstr ""
 
-#: Model/Attribute.php:4710
-msgid "JARM is a method for creating SSL/TLS server fingerprints."
-msgstr ""
-
-#: Model/Attribute.php:4711
-msgid "favicon-mmh3 is the murmur3 hash of a favicon as used in Shodan."
-msgstr ""
-
-#: Model/Attribute.php:4712
+#: Model/Attribute.php:178
 msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
-#: Model/Attribute.php:4713
+#: Model/Attribute.php:179
 msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
-#: Model/Attribute.php:4714
+#: Model/Attribute.php:180
 msgid "Registry key or value"
 msgstr ""
 
-#: Model/Attribute.php:4715
+#: Model/Attribute.php:181
 msgid "Registry value + data separated by |"
 msgstr ""
 
-#: Model/Attribute.php:4716
+#: Model/Attribute.php:182
 msgid "Autonomous system"
 msgstr ""
 
-#: Model/Attribute.php:4717
+#: Model/Attribute.php:183
 msgid "An IDS rule in Snort rule-format"
 msgstr ""
 
-#: Model/Attribute.php:4717
+#: Model/Attribute.php:183
 msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
 msgstr ""
 
-#: Model/Attribute.php:4718
+#: Model/Attribute.php:184
 msgid "An NIDS rule in the Bro rule-format"
 msgstr ""
 
-#: Model/Attribute.php:4718
+#: Model/Attribute.php:184
 msgid "An NIDS rule in the Bro rule-format."
 msgstr ""
 
-#: Model/Attribute.php:4719
+#: Model/Attribute.php:185
 msgid "An NIDS rule in the Zeek rule-format"
 msgstr ""
 
-#: Model/Attribute.php:4719
+#: Model/Attribute.php:185
 msgid "An NIDS rule in the Zeek rule-format."
 msgstr ""
 
-#: Model/Attribute.php:4720
+#: Model/Attribute.php:186
 msgid "a community ID flow hashing algorithm to map multiple traffic monitors into common flow id"
 msgstr ""
 
-#: Model/Attribute.php:4721
+#: Model/Attribute.php:187
 msgid "Pattern in file that identifies the malware"
 msgstr ""
 
-#: Model/Attribute.php:4722
+#: Model/Attribute.php:188
 msgid "Pattern in network traffic that identifies the malware"
 msgstr ""
 
-#: Model/Attribute.php:4723
+#: Model/Attribute.php:189
 msgid "Pattern in memory dump that identifies the malware"
 msgstr ""
 
-#: Model/Attribute.php:4724
-msgid "A pattern in the name of a file"
-msgstr ""
-
-#: Model/Attribute.php:4725
-msgid "A PGP public key"
-msgstr ""
-
-#: Model/Attribute.php:4726
-msgid "A PGP private key"
-msgstr ""
-
-#: Model/Attribute.php:4727
+#: Model/Attribute.php:190
 msgid "Yara signature"
 msgstr ""
 
-#: Model/Attribute.php:4728
+#: Model/Attribute.php:191
 msgid "STIX 2 pattern"
 msgstr ""
 
-#: Model/Attribute.php:4729
+#: Model/Attribute.php:192
 msgid "Sigma - Generic Signature Format for SIEM Systems"
 msgstr ""
 
-#: Model/Attribute.php:4730
+#: Model/Attribute.php:193
 msgid "GENE - Go Evtx sigNature Engine"
 msgstr ""
 
-#: Model/Attribute.php:4731
+#: Model/Attribute.php:194
 msgid "Kusto query - Kusto from Microsoft Azure is a service for storing and running interactive analytics over Big Data."
 msgstr ""
 
-#: Model/Attribute.php:4732
+#: Model/Attribute.php:195
 msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
 msgstr ""
 
-#: Model/Attribute.php:4733
+#: Model/Attribute.php:196
 msgid "Identity card number"
 msgstr ""
 
-#: Model/Attribute.php:4734
+#: Model/Attribute.php:197
 msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
 msgstr ""
 
-#: Model/Attribute.php:4735
+#: Model/Attribute.php:198
 msgid "A reference to the vulnerability used in the exploit"
 msgstr ""
 
-#: Model/Attribute.php:4736
-msgid "Common Platform Enumeration - structured naming scheme for information technology systems, software, and packages."
-msgstr ""
-
-#: Model/Attribute.php:4737
+#: Model/Attribute.php:199
 msgid "A reference to the weakness used in the exploit"
 msgstr ""
 
-#: Model/Attribute.php:4738
+#: Model/Attribute.php:200
 msgid "Attachment with external information"
 msgstr ""
 
-#: Model/Attribute.php:4738;4739
+#: Model/Attribute.php:200;201
 msgid "Please upload files using the <em>Upload Attachment</em> button."
 msgstr ""
 
-#: Model/Attribute.php:4739
+#: Model/Attribute.php:201
 msgid "Attachment containing encrypted malware sample"
 msgstr ""
 
-#: Model/Attribute.php:4740
+#: Model/Attribute.php:202
 msgid "Link to an external information"
 msgstr ""
 
-#: Model/Attribute.php:4741
+#: Model/Attribute.php:203
 msgid "Comment or description in a human language"
 msgstr ""
 
-#: Model/Attribute.php:4741
+#: Model/Attribute.php:203
 msgid "Comment or description in a human language.  This will not be correlated with other attributes"
 msgstr ""
 
-#: Model/Attribute.php:4742
+#: Model/Attribute.php:204
 msgid "Name, ID or a reference"
 msgstr ""
 
-#: Model/Attribute.php:4743
+#: Model/Attribute.php:205
 msgid "A value in hexadecimal format"
 msgstr ""
 
-#: Model/Attribute.php:4744
+#: Model/Attribute.php:206
 msgid "Other attribute"
 msgstr ""
 
-#: Model/Attribute.php:4745
+#: Model/Attribute.php:207
 msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
 msgstr ""
 
-#: Model/Attribute.php:4746
+#: Model/Attribute.php:208
 msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
 msgstr ""
 
-#: Model/Attribute.php:4747
-msgid "State of a process"
-msgstr ""
-
-#: Model/Attribute.php:4748
+#: Model/Attribute.php:209
 msgid "Attack Targets Username(s)"
 msgstr ""
 
-#: Model/Attribute.php:4749
+#: Model/Attribute.php:210
 msgid "Attack Targets Email(s)"
 msgstr ""
 
-#: Model/Attribute.php:4750
+#: Model/Attribute.php:211
 msgid "Attack Targets Machine Name(s)"
 msgstr ""
 
-#: Model/Attribute.php:4751
+#: Model/Attribute.php:212
 msgid "Attack Targets Department or Organization(s)"
 msgstr ""
 
-#: Model/Attribute.php:4752
+#: Model/Attribute.php:213
 msgid "Attack Targets Physical Location(s)"
 msgstr ""
 
-#: Model/Attribute.php:4753
+#: Model/Attribute.php:214
 msgid "External Target Organizations Affected by this Attack"
 msgstr ""
 
-#: Model/Attribute.php:4754
+#: Model/Attribute.php:215
 msgid "Bitcoin Address"
 msgstr ""
 
-#: Model/Attribute.php:4755
+#: Model/Attribute.php:216
 msgid "Dash Address"
 msgstr ""
 
-#: Model/Attribute.php:4756
+#: Model/Attribute.php:217
 msgid "Monero Address"
 msgstr ""
 
-#: Model/Attribute.php:4757
+#: Model/Attribute.php:218
 msgid "International Bank Account Number"
 msgstr ""
 
-#: Model/Attribute.php:4758
+#: Model/Attribute.php:219
 msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
 msgstr ""
 
-#: Model/Attribute.php:4759
+#: Model/Attribute.php:220
 msgid "Bank account number without any routing number"
 msgstr ""
 
-#: Model/Attribute.php:4760
+#: Model/Attribute.php:221
 msgid "ABA routing transit number"
 msgstr ""
 
-#: Model/Attribute.php:4761
+#: Model/Attribute.php:222
 msgid "Bank Identification Number"
 msgstr ""
 
-#: Model/Attribute.php:4762
+#: Model/Attribute.php:223
 msgid "Credit-Card Number"
 msgstr ""
 
-#: Model/Attribute.php:4763
+#: Model/Attribute.php:224
 msgid "Premium-Rate Telephone Number"
 msgstr ""
 
-#: Model/Attribute.php:4764
+#: Model/Attribute.php:225
 msgid "Telephone Number"
 msgstr ""
 
-#: Model/Attribute.php:4765
+#: Model/Attribute.php:226
 msgid "A string identifying the threat actor"
 msgstr ""
 
-#: Model/Attribute.php:4766
+#: Model/Attribute.php:227
 msgid "Associated campaign name"
 msgstr ""
 
-#: Model/Attribute.php:4767
+#: Model/Attribute.php:228
 msgid "Associated campaign ID"
 msgstr ""
 
-#: Model/Attribute.php:4769
+#: Model/Attribute.php:230
 msgid "Uniform Resource Identifier"
 msgstr ""
 
-#: Model/Attribute.php:4770
+#: Model/Attribute.php:231
 msgid "Authenticode executable signature hash"
 msgstr ""
 
-#: Model/Attribute.php:4770
+#: Model/Attribute.php:231
 msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4771
-msgid "A VirusTotal checksum"
-msgstr ""
-
-#: Model/Attribute.php:4771
-msgid "You are encouraged to use filename|vhash instead. A checksum from VirusTotal, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:4772;4790
+#: Model/Attribute.php:232;244
 msgid "A checksum in ssdeep format"
 msgstr ""
 
-#: Model/Attribute.php:4772
+#: Model/Attribute.php:232
 msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4773;4791
+#: Model/Attribute.php:233;245
 msgid "Import hash - a hash created based on the imports in the sample."
 msgstr ""
 
-#: Model/Attribute.php:4773
+#: Model/Attribute.php:233
 msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4774
-msgid "telfhash is symbol hash for ELF files, just like imphash is imports hash for PE files."
-msgstr ""
-
-#: Model/Attribute.php:4774
-msgid "You are encouraged to use a file object with telfash"
-msgstr ""
-
-#: Model/Attribute.php:4775
+#: Model/Attribute.php:234
 msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
 msgstr ""
 
-#: Model/Attribute.php:4776
+#: Model/Attribute.php:235
 msgid "A fuzzy hash of import table of Portable Executable format"
 msgstr ""
 
-#: Model/Attribute.php:4776
+#: Model/Attribute.php:235
 msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4777
+#: Model/Attribute.php:236
 msgid "A checksum in sha-224 format"
 msgstr ""
 
-#: Model/Attribute.php:4777
+#: Model/Attribute.php:236
 msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4778
+#: Model/Attribute.php:237
 msgid "A checksum in sha-384 format"
 msgstr ""
 
-#: Model/Attribute.php:4778
+#: Model/Attribute.php:237
 msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4779
+#: Model/Attribute.php:238
 msgid "A checksum in sha-512 format"
 msgstr ""
 
-#: Model/Attribute.php:4779
+#: Model/Attribute.php:238
 msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4780
+#: Model/Attribute.php:239
 msgid "A checksum in the sha-512/224 format"
 msgstr ""
 
-#: Model/Attribute.php:4780
+#: Model/Attribute.php:239
 msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4781
+#: Model/Attribute.php:240
 msgid "A checksum in the sha-512/256 format"
 msgstr ""
 
-#: Model/Attribute.php:4781
+#: Model/Attribute.php:240
 msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4782
-msgid "A checksum in sha3-224 format"
-msgstr ""
-
-#: Model/Attribute.php:4782
-msgid "You are encouraged to use filename|sha3-224 instead. A checksum in sha3-224 format, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:4783
-msgid "A checksum in sha3-256 format"
-msgstr ""
-
-#: Model/Attribute.php:4783
-msgid "You are encouraged to use filename|sha3-256 instead. A checksum in sha3-256 format, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:4784
-msgid "A checksum in sha3-384 format"
-msgstr ""
-
-#: Model/Attribute.php:4784
-msgid "You are encouraged to use filename|sha3-384 instead. A checksum in sha3-384 format, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:4785
-msgid "A checksum in sha3-512 format"
-msgstr ""
-
-#: Model/Attribute.php:4785
-msgid "You are encouraged to use filename|sha3-512 instead. A checksum in sha3-512 format, only use this if you don't know the correct filename"
-msgstr ""
-
-#: Model/Attribute.php:4786
+#: Model/Attribute.php:241
 msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
 msgstr ""
 
-#: Model/Attribute.php:4786
+#: Model/Attribute.php:241
 msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:4787
+#: Model/Attribute.php:242
 msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
 msgstr ""
 
-#: Model/Attribute.php:4789
-msgid "A filename and a VirusTotal hash separated by a |"
-msgstr ""
-
-#: Model/Attribute.php:4792
+#: Model/Attribute.php:246
 msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
 msgstr ""
 
-#: Model/Attribute.php:4793
+#: Model/Attribute.php:247
 msgid "A filename and a PEhash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4794
+#: Model/Attribute.php:248
 msgid "A filename and a sha-224 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4795
+#: Model/Attribute.php:249
 msgid "A filename and a sha-384 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4796
+#: Model/Attribute.php:250
 msgid "A filename and a sha-512 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4797
+#: Model/Attribute.php:251
 msgid "A filename and a sha-512/224 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4798
+#: Model/Attribute.php:252
 msgid "A filename and a sha-512/256 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4799
-msgid "A filename and an sha3-224 hash separated by a |"
-msgstr ""
-
-#: Model/Attribute.php:4800
-msgid "A filename and an sha3-256 hash separated by a |"
-msgstr ""
-
-#: Model/Attribute.php:4801
-msgid "A filename and an sha3-384 hash separated by a |"
-msgstr ""
-
-#: Model/Attribute.php:4802
-msgid "A filename and an sha3-512 hash separated by a |"
-msgstr ""
-
-#: Model/Attribute.php:4803
+#: Model/Attribute.php:253
 msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4804
+#: Model/Attribute.php:254
 msgid "A scheduled task in windows"
 msgstr ""
 
-#: Model/Attribute.php:4805
+#: Model/Attribute.php:255
 msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
 msgstr ""
 
-#: Model/Attribute.php:4806
+#: Model/Attribute.php:256
 msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
 msgstr ""
 
-#: Model/Attribute.php:4807
+#: Model/Attribute.php:257
 msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:4808
+#: Model/Attribute.php:258
 msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:4809
+#: Model/Attribute.php:259
 msgid "The name of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:4810
+#: Model/Attribute.php:260
 msgid "The org of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:4811
+#: Model/Attribute.php:261
 msgid "The registrar of the domain, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:4812
+#: Model/Attribute.php:262
 msgid "The date of domain's creation, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:4817
+#: Model/Attribute.php:267
 msgid "X509 fingerprint in SHA-1 format"
 msgstr ""
 
-#: Model/Attribute.php:4818
+#: Model/Attribute.php:268
 msgid "X509 fingerprint in MD5 format"
 msgstr ""
 
-#: Model/Attribute.php:4819
+#: Model/Attribute.php:269
 msgid "X509 fingerprint in SHA-256 format"
 msgstr ""
 
-#: Model/Attribute.php:4820
+#: Model/Attribute.php:270
 msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
 msgstr ""
 
-#: Model/Attribute.php:4821
+#: Model/Attribute.php:271
 msgid "Size expressed in bytes"
 msgstr ""
 
-#: Model/Attribute.php:4822
+#: Model/Attribute.php:272
 msgid "An integer counter, generally to be used in objects"
 msgstr ""
 
-#: Model/Attribute.php:4823
+#: Model/Attribute.php:273
 msgid "Datetime in the ISO 8601 format"
 msgstr ""
 
-#: Model/Attribute.php:4824
+#: Model/Attribute.php:274
+msgid "Common platform enumeration"
+msgstr ""
+
+#: Model/Attribute.php:275
 msgid "Port number"
 msgstr ""
 
-#: Model/Attribute.php:4825
+#: Model/Attribute.php:276
 msgid "IP destination and port number separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4826
+#: Model/Attribute.php:277
 msgid "IP source and port number separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4827
+#: Model/Attribute.php:278
 msgid "Hostname and port number separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:4828
+#: Model/Attribute.php:279
 msgid "Mac address"
 msgstr ""
 
-#: Model/Attribute.php:4829
+#: Model/Attribute.php:280
 msgid "Mac EUI-64 address"
 msgstr ""
 
-#: Model/Attribute.php:4831
+#: Model/Attribute.php:282
 msgid "Email destination display name"
 msgstr ""
 
-#: Model/Attribute.php:4832
+#: Model/Attribute.php:283
 msgid "Email source display name"
 msgstr ""
 
-#: Model/Attribute.php:4833
+#: Model/Attribute.php:284
 msgid "Email header"
 msgstr ""
 
-#: Model/Attribute.php:4834
+#: Model/Attribute.php:285
 msgid "Email reply to header"
 msgstr ""
 
-#: Model/Attribute.php:4835
+#: Model/Attribute.php:286
 msgid "Email x-mailer header"
 msgstr ""
 
-#: Model/Attribute.php:4836
+#: Model/Attribute.php:287
 msgid "The email mime boundary separating parts in a multipart email"
 msgstr ""
 
-#: Model/Attribute.php:4837
+#: Model/Attribute.php:288
 msgid "The email thread index header"
 msgstr ""
 
-#: Model/Attribute.php:4838
+#: Model/Attribute.php:289
 msgid "The email message ID"
 msgstr ""
 
-#: Model/Attribute.php:4839
+#: Model/Attribute.php:290
 msgid "A github user name"
 msgstr ""
 
-#: Model/Attribute.php:4840
+#: Model/Attribute.php:291
 msgid "A github repository"
 msgstr ""
 
-#: Model/Attribute.php:4841
+#: Model/Attribute.php:292
 msgid "A github organisation"
 msgstr ""
 
-#: Model/Attribute.php:4842
+#: Model/Attribute.php:293
 msgid "Jabber ID"
 msgstr ""
 
-#: Model/Attribute.php:4843
+#: Model/Attribute.php:294
 msgid "Twitter ID"
 msgstr ""
 
-#: Model/Attribute.php:4844
-msgid "DKIM public key"
-msgstr ""
-
-#: Model/Attribute.php:4845
-msgid "DKIM signature"
-msgstr ""
-
-#: Model/Attribute.php:4846
+#: Model/Attribute.php:295
 msgid "First name of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:4847
+#: Model/Attribute.php:296
 msgid "Middle name of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:4848
+#: Model/Attribute.php:297
 msgid "Last name of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:4849
-msgid "Full name of a natural person"
-msgstr ""
-
-#: Model/Attribute.php:4850
+#: Model/Attribute.php:298
 msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
 msgstr ""
 
-#: Model/Attribute.php:4851
+#: Model/Attribute.php:299
 msgid "Place of birth of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:4852
+#: Model/Attribute.php:300
 msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
 msgstr ""
 
-#: Model/Attribute.php:4853
+#: Model/Attribute.php:301
 msgid "The passport number of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:4854
+#: Model/Attribute.php:302
 msgid "The country in which the passport was issued"
 msgstr ""
 
-#: Model/Attribute.php:4855
+#: Model/Attribute.php:303
 msgid "The expiration date of a passport"
 msgstr ""
 
-#: Model/Attribute.php:4856
+#: Model/Attribute.php:304
 msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
 msgstr ""
 
-#: Model/Attribute.php:4857
+#: Model/Attribute.php:305
 msgid "The nationality of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:4858
+#: Model/Attribute.php:306
 msgid "Visa number"
 msgstr ""
 
-#: Model/Attribute.php:4859
+#: Model/Attribute.php:307
 msgid "The date on which the visa was issued"
 msgstr ""
 
-#: Model/Attribute.php:4860
+#: Model/Attribute.php:308
 msgid "The primary residence of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:4861
+#: Model/Attribute.php:309
 msgid "The country of residence of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:4862
+#: Model/Attribute.php:310
 msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
 msgstr ""
 
-#: Model/Attribute.php:4863
+#: Model/Attribute.php:311
 msgid "The frequent flyer number of a passenger"
 msgstr ""
 
-#: Model/Attribute.php:4866
+#: Model/Attribute.php:314
 msgid "Travel details"
 msgstr ""
 
-#: Model/Attribute.php:4867
+#: Model/Attribute.php:315
 msgid "Payment details"
 msgstr ""
 
-#: Model/Attribute.php:4868
-msgid "The original port of embarkation"
+#: Model/Attribute.php:316
+msgid "The orignal port of embarkation"
 msgstr ""
 
-#: Model/Attribute.php:4869
+#: Model/Attribute.php:317
 msgid "The port of clearance"
 msgstr ""
 
-#: Model/Attribute.php:4870
+#: Model/Attribute.php:318
 msgid "A Port where the passenger is transiting to"
 msgstr ""
 
-#: Model/Attribute.php:4871
+#: Model/Attribute.php:319
 msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
 msgstr ""
 
-#: Model/Attribute.php:4872
+#: Model/Attribute.php:320
 msgid "The application id of a mobile application"
 msgstr ""
 
-#: Model/Attribute.php:4873
+#: Model/Attribute.php:321
 msgid "Chrome extension id"
 msgstr ""
 
-#: Model/Attribute.php:4874
+#: Model/Attribute.php:322
 msgid "Cortex analysis result"
 msgstr ""
 
-#: Model/Attribute.php:4875
+#: Model/Attribute.php:323
 msgid "Boolean value - to be used in objects"
 msgstr ""
 
-#: Model/Attribute.php:4876
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship"
 msgstr ""
 
-#: Model/Attribute.php:4876
+#: Model/Attribute.php:324
 msgid "Anonymised value - described with the anonymisation object via a relationship."
 msgstr ""
 
-#: Model/AuthKey.php:55
-msgid "Expiration must be in YYYY-MM-DD format."
+#: Model/Attribute.php:644
+msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/AuthKey.php:58
-msgid "Maximal key validity is %s days."
+#: Model/Attribute.php:791
+msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Cerebrate.php:43
-msgid "Something went wrong. Error returned: %s"
+#: Model/Attribute.php:935
+msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Cerebrate.php:46
-msgid "Authentication failed."
+#: Model/Attribute.php:1074
+msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Cerebrate.php:48
-msgid "Something went wrong with the request or the remote side is having issues."
+#: Model/Attribute.php:1081
+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/Cerebrate.php:164
-msgid "The organisation could not be saved."
+#: Model/Attribute.php:1088
+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/Cerebrate.php:171
-msgid "The retrieved data isn't a valid organisation."
+#: Model/Attribute.php:1099
+msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
+msgstr ""
+
+#: Model/Attribute.php:1110
+msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
+msgstr ""
+
+#: Model/Attribute.php:1117
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1132
+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:1150
+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:1155
+msgid "Invalid composite type. The format has to be %s."
+msgstr ""
+
+#: Model/Attribute.php:1166
+msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
+msgstr ""
+
+#: Model/Attribute.php:1174
+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:1185
+msgid "Invalid CIDR notation value found."
+msgstr ""
+
+#: Model/Attribute.php:1192;1243
+msgid "IP address has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:1197
+msgid "Port numbers have to be positive integers between 1 and 65535."
+msgstr ""
+
+#: Model/Attribute.php:1226
+msgid " name has an invalid format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:1246
+msgid "Domain name has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:1260
+msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:1268
+msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
+msgstr ""
+
+#: Model/Attribute.php:1276
+msgid "Invalid format. Expected: CWE-x..."
+msgstr ""
+
+#: Model/Attribute.php:1287
+msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
+msgstr ""
+
+#: Model/Attribute.php:1405
+msgid "Datetime has to be in the ISO 8601 format."
+msgstr ""
+
+#: Model/Attribute.php:1411
+msgid "The value has to be a number greater or equal 0."
+msgstr ""
+
+#: Model/Attribute.php:1418
+msgid "The value has to be a number between 0 and 10."
+msgstr ""
+
+#: Model/Attribute.php:2297;2365
+msgid "Could not read user."
+msgstr ""
+
+#: Model/Attribute.php:2301
+msgid "Invalid hash type."
+msgstr ""
+
+#: Model/Attribute.php:2992
+msgid "This field is mandatory."
+msgstr ""
+
+#: Model/Attribute.php:3559
+msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
 #: Model/Community.php:26;67
@@ -4984,14 +4049,6 @@ msgstr ""
 msgid "Community not found."
 msgstr ""
 
-#: Model/CorrelationExclusion.php:55
-msgid "Cleaning up excluded correlations."
-msgstr ""
-
-#: Model/CorrelationExclusion.php:66
-msgid "Cleanup queued for background execution."
-msgstr ""
-
 #: Model/Dashboard.php:55;64
 msgid "Invalid widget or widget not found."
 msgstr ""
@@ -5000,1886 +4057,1352 @@ msgstr ""
 msgid "Models could not be loaded or default decaying models folder is empty"
 msgstr ""
 
-#: Model/DecayingModel.php:368
+#: Model/DecayingModel.php:351
 msgid "No tags nor predicates with `numerical_value`"
 msgstr ""
 
-#: Model/DecayingModel.php:375
+#: Model/DecayingModel.php:358
 msgid "No predicate"
 msgstr ""
 
-#: Model/DecayingModel.php:453
+#: Model/DecayingModel.php:437
 msgid "The class for `%s` was not found or not loaded correctly"
 msgstr ""
 
-#: Model/Event.php:287
+#: Model/Event.php:390
 msgid "Click this to download all events and attributes that you have access to in MISP JSON format."
 msgstr ""
 
-#: Model/Event.php:295
+#: Model/Event.php:398
 msgid "Click this to download all events and attributes that you have access to in MISP XML format."
 msgstr ""
 
-#: Model/Event.php:303
+#: Model/Event.php:406
 #: View/Events/export_alternate.ctp:19
 msgid "Click this to download all attributes that are indicators and that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:311
+#: Model/Event.php:414
 #: View/Events/export_alternate.ctp:26
 msgid "Click this to download all attributes that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:319
-msgid "Click this to download all network related attributes that you have access to under the Suricata rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a allowedlist containing host, domain name and IP numbers to exclude from the NIDS export."
+#: Model/Event.php:422
+msgid "Click this to download all network related attributes that you have access to under the Suricata rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:327
-msgid "Click this to download all network related attributes that you have access to under the Snort rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a allowedlist containing host, domain name and IP numbers to exclude from the NIDS export."
+#: Model/Event.php:430
+msgid "Click this to download all network related attributes that you have access to under the Snort rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:335
-msgid "Click this to download all network related attributes that you have access to under the Bro rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a allowedlist containing host, domain name and IP numbers to exclude from the NIDS export."
+#: Model/Event.php:438
+msgid "Click this to download all network related attributes that you have access to under the Bro rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:343
+#: Model/Event.php:446
 msgid "Click this to download a STIX document containing the STIX version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:351
+#: Model/Event.php:454
 msgid "Click this to download a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:359
+#: Model/Event.php:462
 #: 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 ""
 
-#: Model/Event.php:367
+#: Model/Event.php:470
 msgid "Click on one of the buttons below to download all the attributes with the matching type. This list can be used to feed forensic software when searching for susipicious files. Only published events and attributes marked as IDS Signature are exported."
 msgstr ""
 
-#: Model/Event.php:375
+#: Model/Event.php:478
 msgid "Click this to download Yara rules generated from all relevant attributes."
 msgstr ""
 
-#: Model/Event.php:383
+#: Model/Event.php:486
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:399
-msgid "Automatically blocked by deleting event"
-msgstr ""
-
-#: Model/Event.php:1321
-msgid "Remote version does not support event report."
-msgstr ""
-
-#: Model/Event.php:3210
-msgid "Mails blocked by org alert threshold."
-msgstr ""
-
-#: Model/Event.php:3243
-msgid "A new or modified event was just published on %s"
-msgstr ""
-
-#: Model/Event.php:3244
-msgid "If you would like to unsubscribe from receiving such alert e-mails, simply\ndisable publish alerts via %s"
-msgstr ""
-
-#: Model/Event.php:3268
-msgid "Mails sent."
-msgstr ""
-
-#: Model/Event.php:3740
-msgid "This is not a valid MISP XML file."
-msgstr ""
-
-#: Model/Event.php:3740
-msgid "This is not a valid MISP JSON file."
-msgstr ""
-
-#: Model/Event.php:6006
+#: Model/Event.php:5799
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:6008
+#: Model/Event.php:5801
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:6010
+#: Model/Event.php:5803
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:6013
+#: Model/Event.php:5806
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:6015
+#: Model/Event.php:5808
 msgid "Please "
 msgstr ""
 
-#: Model/Event.php:6017
+#: Model/Event.php:5810
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:6091
+#: Model/Event.php:5842
 msgid "#"
 msgstr ""
 
-#: Model/Event.php:6100
+#: Model/Event.php:5851
 msgid "%s not set"
 msgstr ""
 
-#: Model/Event.php:6346
+#: Model/Event.php:6100
 msgid "Could not add tags."
 msgstr ""
 
-#: Model/Event.php:6387
-msgid "Processing complete. %s"
-msgstr ""
-
-#: Model/Event.php:6849
+#: Model/Event.php:6582
 msgid "process_"
 msgstr ""
 
-#: Model/Event.php:6999
-msgid "%s from another event"
-msgstr ""
-
-#: Model/EventReport.php:114
-msgid "Event Report dropped due to validation for Event report %s failed: %s"
-msgstr ""
-
-#: Model/EventReport.php:115
-msgid "Validation errors: %s.%sFull report: %s"
-msgstr ""
-
-#: Model/EventReport.php:152
-msgid "Event Report doesn't have an UUID"
-msgstr ""
-
-#: Model/EventReport.php:164
-msgid "Event Report not found."
-msgstr ""
-
-#: Model/EventReport.php:203
-msgid "Failed to delete report"
-msgstr ""
-
-#: Model/EventReport.php:291;301;360
-msgid "Invalid report"
-msgstr ""
-
-#: Model/EventReport.php:352
-#: Model/GalaxyCluster.php:1390
-msgid "Invalid authorization requested"
-msgstr ""
-
-#: Model/EventReport.php:390
-msgid "Could not find associated event"
-msgstr ""
-
-#: Model/EventReport.php:393
-msgid "Only the creator organisation of the event can modify the report"
-msgstr ""
-
-#: Model/Feed.php:90
+#: Model/Feed.php:86
 msgid "Invalid input source. The only valid options are %s. %s"
 msgstr ""
 
-#: Model/Feed.php:94
+#: Model/Feed.php:90
 msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
 msgstr ""
 
-#: Model/Feed.php:1215
-msgid "Feed %s: Fetching."
-msgstr ""
-
-#: Model/Feed.php:1221
-msgid "Could not fetch freetext feed %s. See error log for more details."
-msgstr ""
-
-#: Model/Feed.php:1241
-msgid "Feed %s: %s/%s values cached."
-msgstr ""
-
-#: Model/Feed.php:1645;1689
+#: Model/Feed.php:1496;1540
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1659
+#: Model/Feed.php:1510
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Feed.php:1850
+#: Model/Feed.php:1687
 msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Feed.php:1853
+#: Model/Feed.php:1690
 msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
 msgstr ""
 
-#: Model/Feed.php:1858
+#: Model/Feed.php:1695
 msgid "Invalid user id."
 msgstr ""
 
-#: Model/Feed.php:1878
+#: Model/Feed.php:1715
 msgid "Events related to feed %s purged."
 msgstr ""
 
-#: Model/Galaxy.php:310;315
-#: Model/GalaxyCluster.php:256
-msgid "Galaxy not found"
-msgstr ""
-
-#: Model/Galaxy.php:347
-msgid "Invalid Galaxy cluster"
-msgstr ""
-
-#: Model/Galaxy.php:571
+#: Model/Galaxy.php:421
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/GalaxyCluster.php:249;374
-msgid "Incorrect permission"
-msgstr ""
-
-#: Model/GalaxyCluster.php:267;709
-msgid "Blocked by blocklist"
-msgstr ""
-
-#: Model/GalaxyCluster.php:275
-msgid "Cluster already exists in another galaxy"
-msgstr ""
-
-#: Model/GalaxyCluster.php:279
-msgid "Edit not allowed on default clusters"
-msgstr ""
-
-#: Model/GalaxyCluster.php:283
-msgid "Edit not allowed"
-msgstr ""
-
-#: Model/GalaxyCluster.php:304
-msgid "Cluster forks have to belong to the same galaxy as the parent"
-msgstr ""
-
-#: Model/GalaxyCluster.php:323
-msgid "The sync user has to have access to the sharing group in order to be able to edit it"
-msgstr ""
-
-#: Model/GalaxyCluster.php:379
-#: Model/GalaxyClusterRelation.php:297
-msgid "UUID not provided"
-msgstr ""
-
-#: Model/GalaxyCluster.php:382
-msgid "Unkown UUID"
-msgstr ""
-
-#: Model/GalaxyCluster.php:394
-msgid "Galaxy Cluster could not be saved: The sync user has to have access to the sharing group in order to be able to edit it."
-msgstr ""
-
-#: Model/GalaxyCluster.php:398
-msgid "Galaxy Cluster could not be saved: The user used to edit the cluster is not authorised to do so. This can be caused by the user not being of the same organisation as the original creator of the cluster whilst also not being a site administrator."
-msgstr ""
-
-#: Model/GalaxyCluster.php:739
-msgid "Organisation blocklisted (%s)"
-msgstr ""
-
-#: Model/GalaxyCluster.php:746
-msgid "Only non-default clusters can be saved"
-msgstr ""
-
-#: Model/GalaxyCluster.php:773
-msgid "Blocked an edit to an cluster that was created locally. This can happen if a synchronised cluster that was created on this instance was modified by an administrator on the remote side."
-msgstr ""
-
-#: Model/GalaxyCluster.php:781
-msgid "Remote version is not newer than local one for cluster (%s)"
-msgstr ""
-
-#: Model/GalaxyCluster.php:800
-msgid "Issues while capturing relations have been logged."
-msgstr ""
-
-#: Model/GalaxyCluster.php:1358;1365;1398
-msgid "Invalid galaxy cluster"
-msgstr ""
-
-#: Model/GalaxyCluster.php:1414
-msgid "You don't have the permission to do that."
-msgstr ""
-
-#: Model/GalaxyCluster.php:1422
-msgid "Only the creator organisation can modify the galaxy cluster"
-msgstr ""
-
-#: Model/GalaxyCluster.php:1431
-msgid "Only the creator organisation with publishing capabilities can publish the galaxy cluster"
-msgstr ""
-
-#: Model/GalaxyCluster.php:1608
-msgid "The remote user does not have the permission to manipulate galaxies - the upload of the galaxy clusters has been blocked."
-msgstr ""
-
-#: Model/GalaxyCluster.php:1855
-msgid "The distribution level of the cluster blocks it from being pushed."
-msgstr ""
-
-#: Model/GalaxyCluster.php:1857
-msgid "The sync user on the remote instance does not have the required privileges to handle this cluster."
-msgstr ""
-
-#: Model/GalaxyCluster.php:1862
-msgid "Uploading GalaxyCluster (%s) to Server (%s)"
-msgstr ""
-
-#: Model/GalaxyCluster.php:1957
-msgid "Failed because of errors: "
-msgstr ""
-
-#: Model/GalaxyCluster.php:1960
-msgid "failed downloading the galaxy cluster"
-msgstr ""
-
-#: Model/GalaxyClusterRelation.php:217;465
-msgid "Relation already exists"
-msgstr ""
-
-#: Model/GalaxyClusterRelation.php:227;320
-msgid "referenced_galaxy_cluster_uuid not provided"
-msgstr ""
-
-#: Model/GalaxyClusterRelation.php:233;325
-msgid "Invalid referenced galaxy cluster"
-msgstr ""
-
-#: Model/GalaxyClusterRelation.php:258
-msgid "Tags could not be saved for relation (%s)"
-msgstr ""
-
-#: Model/GalaxyClusterRelation.php:285
-msgid "galaxy_cluster_id not provided"
-msgstr ""
-
-#: Model/GalaxyClusterRelation.php:300
-msgid "Unkown ID"
-msgstr ""
-
-#: Model/GalaxyClusterRelation.php:307
-msgid "Invalid source galaxy cluster"
-msgstr ""
-
-#: Model/GalaxyClusterRelation.php:434
-msgid "No referenced cluster UUID provided"
-msgstr ""
-
-#: Model/GalaxyClusterRelation.php:434
-msgid "relation for cluster (%s)"
-msgstr ""
-
-#: Model/GalaxyClusterRelation.php:449
-msgid "Referenced cluster not found"
-msgstr ""
-
-#: Model/GalaxyClusterRelation.php:449;465
-msgid "relation to (%s) for cluster (%s)"
-msgstr ""
-
-#: Model/GalaxyClusterRelationTag.php:77
-msgid "Could not attach tag %s"
-msgstr ""
-
-#: Model/GalaxyClusterRelationTag.php:77
-msgid "relation (%s)"
-msgstr ""
-
-#: Model/Job.php:118
-msgid "Job done."
-msgstr ""
-
-#: Model/Job.php:118
-msgid "Job failed."
-msgstr ""
-
-#: Model/MispObject.php:389
-msgid "No valid template found and object lacking template information. (%s)"
-msgstr ""
-
-#: Model/MispObject.php:1211
+#: Model/MispObject.php:1139
 msgid "Selected Attributes do not exist."
 msgstr ""
 
-#: Model/Server.php:131
+#: Model/Server.php:123
 msgid "Server unreachable"
 msgstr ""
 
-#: Model/Server.php:132
+#: Model/Server.php:124
 msgid "Unexpected error"
 msgstr ""
 
-#: Model/Server.php:133
+#: Model/Server.php:125
 msgid "Authentication failed"
 msgstr ""
 
-#: Model/Server.php:134
+#: Model/Server.php:126
 msgid "Password change required"
 msgstr ""
 
-#: Model/Server.php:135
+#: Model/Server.php:127
 msgid "Terms not accepted"
 msgstr ""
 
-#: Model/Server.php:158
+#: Model/Server.php:150
 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:159
+#: Model/Server.php:151
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:172
+#: Model/Server.php:163
 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:173
+#: Model/Server.php:164
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:182
+#: Model/Server.php:173
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:183
+#: Model/Server.php:174
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:419
-msgid "Failed (partially?) because of validation errors: "
+#: Model/Server.php:183
+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:423
-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."
+#: Model/Server.php:185
+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:447;463
-msgid "failed downloading the event"
-msgstr ""
-
-#: Model/Server.php:457
-msgid "Empty event detected."
-msgstr ""
-
-#: Model/Server.php:482
-msgid "Pulling relevant galaxy clusters."
-msgstr ""
-
-#: Model/Server.php:482
-msgid "Pulling galaxy clusters."
-msgstr ""
-
-#: Model/Server.php:501
-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:503
-msgid "Sorry, this is not yet implemented"
-msgstr ""
-
-#: Model/Server.php:504
-msgid "Something went wrong while trying to pull"
-msgstr ""
-
-#: Model/Server.php:516;518
-msgid "Unknown issue."
-msgstr ""
-
-#: Model/Server.php:680
-msgid "Error: got response code %s"
-msgstr ""
-
-#: Model/Server.php:916
-msgid "Push to server %s failed. Reason: %s"
-msgstr ""
-
-#: Model/Server.php:1088
-msgid "Push to server %s complete."
-msgstr ""
-
-#: Model/Server.php:1156
-msgid "GalaxyCluster %s"
-msgstr ""
-
-#: Model/Server.php:1283
-msgid "Enable or disable the %s module."
-msgstr ""
-
-#: Model/Server.php:1286
-msgid "Restrict the %s module to the given organisation."
-msgstr ""
-
-#: Model/Server.php:1296
-msgid "Set this required module specific setting."
-msgstr ""
-
-#: Model/Server.php:1411
-msgid "Value not set."
-msgstr ""
-
-#: Model/Server.php:1432
-msgid "Invalid language."
-msgstr ""
-
-#: Model/Server.php:1456
-msgid "No organisation selected."
-msgstr ""
-
-#: Model/Server.php:1463
-msgid "Invalid tag_collection."
-msgstr ""
-
-#: Model/Server.php:1471
-msgid "This setting has to be a number."
-msgstr ""
-
-#: Model/Server.php:1491
-msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
-msgstr ""
-
-#: Model/Server.php:1733
-msgid "Value is not a boolean, make sure that you convert 'true' to true for example."
-msgstr ""
-
-#: Model/Server.php:1799
-msgid "Invalid file path or file not accessible."
-msgstr ""
-
-#: Model/Server.php:1802
-msgid "File has to be in .pem format."
-msgstr ""
-
-#: Model/Server.php:1926
-msgid "Emailing is currently disabled. Enabling OTP without e-mailing being configured would lock all users out."
-msgstr ""
-
-#: Model/Server.php:2174
-msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
-msgstr ""
-
-#: Model/Server.php:2306
-msgid "Organisation logos"
-msgstr ""
-
-#: Model/Server.php:2307
-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:2309
-msgid "48x48 pixel .png files"
-msgstr ""
-
-#: Model/Server.php:2312;2327
-msgid "Filename must be in the following format: *.png"
-msgstr ""
-
-#: Model/Server.php:2316
-msgid "Additional image files"
-msgstr ""
-
-#: Model/Server.php:2317
-msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
-msgstr ""
-
-#: Model/Server.php:2324
-msgid "text/html if served inline, anything that conveys the terms of use if served as download"
-msgstr ""
-
-#: Model/Server.php:2361;2362
-#: View/SharingGroups/index.ctp:121
-msgid "Not defined"
-msgstr ""
-
-#: Model/Server.php:2363;2364
-msgid "Unknwon"
-msgstr ""
-
-#: Model/Server.php:2449
-msgid "Response was empty."
-msgstr ""
-
-#: Model/Server.php:2511
-msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
-msgstr ""
-
-#: Model/Server.php:2800
-msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
-msgstr ""
-
-#: Model/Server.php:2872
-msgid "Can't check database schema for Postgres database type"
-msgstr ""
-
-#: Model/Server.php:2889
-msgid "Table `%s` does not exist"
-msgstr ""
-
-#: Model/Server.php:2916
-msgid "Column `%s` exists but should not"
-msgstr ""
-
-#: Model/Server.php:2949
-msgid "Column `%s` is different"
-msgstr ""
-
-#: Model/Server.php:2959
-msgid "Column `%s` does not exist but should"
-msgstr ""
-
-#: Model/Server.php:2972
-msgid "Table `%s` is an additional table"
-msgstr ""
-
-#: Model/Server.php:3045
-msgid "Column `%s` should be unique indexed, but contains duplicate values"
-msgstr ""
-
-#: Model/Server.php:3051
-msgid "Column `%s` should be indexed"
-msgstr ""
-
-#: Model/Server.php:3059
-msgid "Column `%s` is indexed but should not"
-msgstr ""
-
-#: Model/Server.php:3071
-msgid "Column `%s` has unique index, but should be non unique"
-msgstr ""
-
-#: Model/Server.php:3078
-msgid "Column `%s` should be unique index, but contains duplicate values"
-msgstr ""
-
-#: Model/Server.php:3089
-msgid "Column `%s` should be unique index"
-msgstr ""
-
-#: Model/Server.php:3578
-msgid "Removing a dead worker."
-msgstr ""
-
-#: Model/Server.php:3579
-msgid "Removing dead worker data. Worker was of type %s with pid %s"
-msgstr ""
-
-#: Model/Server.php:3583
-msgid "Stopping a worker."
-msgstr ""
-
-#: Model/Server.php:3584
-msgid "Stopping a worker. Worker was of type %s with pid %s"
-msgstr ""
-
-#: Model/Server.php:3914
-msgid "Invalid submodule."
-msgstr ""
-
-#: Model/Server.php:3914;3943
-msgid "unknown"
-msgstr ""
-
-#: Model/Server.php:3926
-msgid "update_after_pull"
-msgstr ""
-
-#: Model/Server.php:3927
-msgid "Updating: "
-msgstr ""
-
-#: Model/Server.php:4086
-msgid "Invalid worker."
-msgstr ""
-
-#: Model/Server.php:4093
-msgid "Background workers not enabled."
-msgstr ""
-
-#: Model/Server.php:4100
-msgid "Invalid worker type."
-msgstr ""
-
-#: Model/Server.php:4287
-msgid "Could not reset the remote authentication key."
-msgstr ""
-
-#: Model/Server.php:4339
-msgid "Fetching the '%s' failed with HTTP error 404: Not Found"
-msgstr ""
-
-#: Model/Server.php:4343;4348
-msgid "Fetching the '%s' failed with HTTP error %s: %s"
-msgstr ""
-
-#: Model/Server.php:4370
-msgid "Could not fetch remote user account."
-msgstr ""
-
-#: Model/Server.php:4386
-#: View/AuthKeys/add.ctp:9
-#: View/AuthKeys/index.ctp:42
-#: View/AuthKeys/view.ctp:38
-#: View/Elements/healthElements/workers.ctp:57
-#: View/Pages/doc/administration.ctp:166
-#: View/Pages/doc/using_the_system.ctp:255
-#: View/TagCollections/index.ctp:14
-#: View/UserSettings/index.ctp:56
-msgid "User"
-msgstr ""
-
-#: Model/Server.php:4387
-msgid "Role name"
-msgstr ""
-
-#: Model/Server.php:4387;4388
-msgid "Unknown, outdated instance"
-msgstr ""
-
-#: Model/Server.php:4388
-msgid "Sync flag"
-msgstr ""
-
-#: Model/Server.php:4392
-msgid "Auth key expiration"
-msgstr ""
-
-#: Model/Server.php:4396
-msgid "No user object received in response."
-msgstr ""
-
-#: Model/Server.php:4423
-msgid "The base url of the application (in the format https://www.mymispinstance.com or https://myserver.com/misp). Several features depend on this setting being correctly set to function."
-msgstr ""
-
-#: Model/Server.php:4425
-msgid "The currently 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:4431
+#: Model/Server.php:191
 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:4439
+#: Model/Server.php:199
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:4447
+#: Model/Server.php:207
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:4459
+#: Model/Server.php:217
 msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
 msgstr ""
 
-#: Model/Server.php:4468
+#: Model/Server.php:226
 msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
 msgstr ""
 
-#: Model/Server.php:4477
+#: Model/Server.php:235
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr ""
 
-#: Model/Server.php:4486
+#: Model/Server.php:244
 msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
 msgstr ""
 
-#: Model/Server.php:4495
+#: Model/Server.php:253
 msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
 msgstr ""
 
-#: Model/Server.php:4506
+#: Model/Server.php:264
 msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
 msgstr ""
 
-#: Model/Server.php:4516
+#: Model/Server.php:274
 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:4525
+#: Model/Server.php:283
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:4533
+#: Model/Server.php:291
 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:4542
+#: Model/Server.php:300
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:4544
+#: Model/Server.php:302
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:4550;4558;4585;4609;4617;4625;4633;4692;4740;4748;4823
+#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:4566
+#: Model/Server.php:324
 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:4576
+#: Model/Server.php:334
 msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
 msgstr ""
 
-#: Model/Server.php:4593
+#: Model/Server.php:351
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:4601
+#: Model/Server.php:359
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:4641
+#: Model/Server.php:399
 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:4649
+#: Model/Server.php:407
 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:4657
+#: Model/Server.php:415
 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:4665
+#: Model/Server.php:423
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:4673
+#: Model/Server.php:431
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:4684
+#: Model/Server.php:440
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:4686
+#: Model/Server.php:442
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:4700
+#: Model/Server.php:456
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:4708
+#: Model/Server.php:464
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:4716
+#: Model/Server.php:472
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:4724
+#: Model/Server.php:480
 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:4732
+#: Model/Server.php:488
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:4756
+#: Model/Server.php:512
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:4764
+#: Model/Server.php:520
 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:4774
+#: Model/Server.php:530
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:4782
+#: Model/Server.php:538
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:4790
-msgid "The Unix user MISP (php) is running as"
-msgstr ""
-
-#: Model/Server.php:4798
+#: Model/Server.php:546
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:4806
+#: Model/Server.php:554
 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:4815
+#: Model/Server.php:563
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:4831
+#: Model/Server.php:579
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:4839
+#: Model/Server.php:587
 msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
 msgstr ""
 
-#: Model/Server.php:4847
+#: Model/Server.php:595
 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:4855
+#: Model/Server.php:603
 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:4863
+#: Model/Server.php:611
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:4872
+#: Model/Server.php:620
 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:4877
-msgid "Inherit from event"
-msgstr ""
-
-#: Model/Server.php:4881
+#: Model/Server.php:629
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:4890
+#: Model/Server.php:638
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:4901
+#: Model/Server.php:647
 msgid "The default setting for publish alerts when creating users."
 msgstr ""
 
-#: Model/Server.php:4910
+#: Model/Server.php:656
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:4918
+#: Model/Server.php:664
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:4927
+#: Model/Server.php:673
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:4935
+#: Model/Server.php:681
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:4943
+#: Model/Server.php:689
 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:4951
+#: Model/Server.php:697
 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:4959
+#: Model/Server.php:705
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:4967
+#: Model/Server.php:713
 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:4975
+#: Model/Server.php:721
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:4983
+#: Model/Server.php:729
 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:4991
+#: Model/Server.php:737
 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:4999
+#: Model/Server.php:745
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:5008
+#: Model/Server.php:754
 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:5017
+#: Model/Server.php:763
 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:5025
-msgid "Since version 2.3.107 you can start blocklisting 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."
+#: Model/Server.php:771
+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:5032
-msgid "Blocklisting organisation UUIDs to prevent the creation of any event created by the blocklisted organisation."
+#: Model/Server.php:778
+msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:5039
+#: Model/Server.php:785
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:5048
-msgid "If log_client_ip is enabled, you can customize which header field contains the client's IP address. This is generally used when you have a reverse proxy infront of your MISP instance."
-msgstr ""
-
-#: Model/Server.php:5057
+#: Model/Server.php:794
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:5065
+#: Model/Server.php:802
 msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
 msgstr ""
 
-#: Model/Server.php:5067
+#: Model/Server.php:804
 msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
 msgstr ""
 
-#: Model/Server.php:5074
+#: Model/Server.php:811
 msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
 msgstr ""
 
-#: Model/Server.php:5083
+#: Model/Server.php:820
 msgid "You can decide to skip the logging of the paranoid logs to the database."
 msgstr ""
 
-#: Model/Server.php:5092
+#: Model/Server.php:829
 msgid "If paranoid logging is enabled, include the POST body in the entries."
 msgstr ""
 
-#: Model/Server.php:5101
+#: Model/Server.php:838
 msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
 msgstr ""
 
-#: Model/Server.php:5110
-msgid "Log user IP and key usage on each API request. All logs for given keys are deleted after one year when this key is not used."
-msgstr ""
-
-#: Model/Server.php:5119
+#: Model/Server.php:847
 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:5128
+#: Model/Server.php:856
 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:5137
+#: Model/Server.php:865
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:5146
+#: Model/Server.php:874
 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:5155
+#: Model/Server.php:883
 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:5164
+#: Model/Server.php:892
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:5173
-msgid "When enabled only Site admins can change user email. This should be enabled if you manage user logins by external system."
-msgstr ""
-
-#: Model/Server.php:5182
-msgid "When enabled only Site admins can change user password. This should be enabled if you manage user passwords by external system."
-msgstr ""
-
-#: Model/Server.php:5191
-msgid "When enabled, Org Admins could not add new users. This should be enabled if you manage users by external system."
-msgstr ""
-
-#: Model/Server.php:5200
+#: Model/Server.php:902
 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:5209
+#: Model/Server.php:911
 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:5218
+#: Model/Server.php:920
 msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
 msgstr ""
 
-#: Model/Server.php:5227
+#: Model/Server.php:929
 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:5236
+#: Model/Server.php:938
 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 \"timestamp\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:5245
+#: Model/Server.php:947
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:5254
+#: Model/Server.php:956
 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:5264
+#: Model/Server.php:966
 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:5273
+#: Model/Server.php:975
 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:5282
+#: Model/Server.php:984
 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:5291
+#: Model/Server.php:993
 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:5301
+#: Model/Server.php:1003
 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:5310
+#: Model/Server.php:1012
 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:5318
+#: Model/Server.php:1020
 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:5326
+#: Model/Server.php:1028
 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:5334
+#: Model/Server.php:1036
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:5343
+#: Model/Server.php:1045
 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:5351
+#: Model/Server.php:1053
 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:5359
+#: Model/Server.php:1061
 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:5368
+#: Model/Server.php:1070
 msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
 msgstr ""
 
-#: Model/Server.php:5376
+#: Model/Server.php:1078
 msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
 msgstr ""
 
-#: Model/Server.php:5385
-msgid "Name of enrichment module that will be used for attachment malware scanning. This module must return av-signature or sb-signature object."
-msgstr ""
-
-#: Model/Server.php:5393
-msgid "Send to attachment scan module just file hash. This can be useful if module sends attachment to remote service and you don't want to leak real data."
-msgstr ""
-
-#: Model/Server.php:5402
-msgid "How long to wait for scan results in seconds."
-msgstr ""
-
-#: Model/Server.php:5414
+#: Model/Server.php:1090
 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:5423
+#: Model/Server.php:1099
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:5431
+#: Model/Server.php:1107
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:5439
+#: Model/Server.php:1115
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:5447
+#: Model/Server.php:1123
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:5455
+#: Model/Server.php:1131
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:5464
+#: Model/Server.php:1140
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:5472
-msgid "When enabled, the subject in signed and encrypted e-mails will not be sent in unencrypted form."
+#: Model/Server.php:1151
+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:5483
-msgid "Enable S/MIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if S/MIME is enabled."
+#: Model/Server.php:1159
+msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:5491
-msgid "The e-mail address that the instance's S/MIME key is tied to."
-msgstr ""
-
-#: Model/Server.php:5499
+#: Model/Server.php:1167
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:5507
+#: Model/Server.php:1175
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:5515
-msgid "The password (if it is set) of the S/MIME key of the instance."
+#: Model/Server.php:1183
+msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:5527
+#: Model/Server.php:1195
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:5535
+#: Model/Server.php:1203
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:5543
+#: Model/Server.php:1211
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:5551
+#: Model/Server.php:1219
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:5559
+#: Model/Server.php:1227
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:5570
+#: Model/Server.php:1238
 msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
 msgstr ""
 
-#: Model/Server.php:5579
-msgid "Enforce CSP. Content Security Policy (CSP) is an added layer of security that helps to detect and mitigate certain types of attacks, including Cross Site Scripting (XSS) and data injection attacks. When disabled, violations will be just logged."
-msgstr ""
-
-#: Model/Server.php:5587
+#: Model/Server.php:1247
 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:5597
-msgid "Advanced authkeys will allow each user to create and manage a set of authkeys for themselves, each with individual expirations and comments. API keys are stored in a hashed state and can no longer be recovered from MISP. Users will be prompted to note down their key when creating a new authkey. You can generate a new set of API keys for all users on demand in the diagnostics page, or by triggering %s."
-msgstr ""
-
-#: Model/Server.php:5597
-msgid "the advanced upgrade"
-msgstr ""
-
-#: Model/Server.php:5605
-msgid "Maximal key lifetime in days. Use can limit that validity even more. Just newly created keys will be affected. When not set, key validity is not limited."
-msgstr ""
-
-#: Model/Server.php:5614
-msgid "When enabled, session is kept between API requests."
-msgstr ""
-
-#: Model/Server.php:5623
-msgid "This optionally can be enabled if an external auth provider is used. When set to true, it will disable the default form authentication."
-msgstr ""
-
-#: Model/Server.php:5631
-msgid "Enable this setting if you wish for users to be able to query any arbitrary URL via the rest client. Keep in mind that queries are executed by the MISP server, so internal IPs in your MISP's network may be reachable."
-msgstr ""
-
-#: Model/Server.php:5640
-msgid "If left empty, the baseurl of your MISP is used. However, in some instances (such as port-forwarded VM installations) this will not work. You can override the baseurl with a url through which your MISP can reach itself (typically https://127.0.0.1 would work)."
-msgstr ""
-
-#: Model/Server.php:5648
+#: Model/Server.php:1257
 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:5657
-msgid "Write syslog messages also to standard error output."
-msgstr ""
-
-#: Model/Server.php:5666
-msgid "Syslog message identifier."
-msgstr ""
-
-#: Model/Server.php:5675
-msgid "If enabled, any authkey will be replaced by asterisks in Audit log."
-msgstr ""
-
-#: Model/Server.php:5684
-msgid "If enabled, HTTP headers that block browser cache will be send. Static files (like images or JavaScripts) will still be cached, but not generated pages."
-msgstr ""
-
-#: Model/Server.php:5693
-msgid "If enabled, any POST, PUT or AJAX request will be allow just when Sec-Fetch-Site header is not defined or contains \"same-origin\"."
-msgstr ""
-
-#: Model/Server.php:5702
-msgid "Enable two step authentication with a OTP sent by email. Requires e-mailing to be enabled. Warning: You cannot use it in combination with external authentication plugins."
-msgstr ""
-
-#: Model/Server.php:5712
-msgid "Define the length of the OTP code sent by email"
-msgstr ""
-
-#: Model/Server.php:5721
-msgid "Define the validity (in minutes) of the OTP code sent by email"
-msgstr ""
-
-#: Model/Server.php:5731
-msgid "The message sent to the user when a new OTP is requested. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $otp = the new OTP generated by MISP, $username = the user's e-mail address, $org the Organisation managing the instance, $misp = the url of this instance, $contact = the e-mail address used to contact the support team (as set in MISP.contact), $ip the IP used to complete the first step of the login and $validity the validity time in minutes."
-msgstr ""
-
-#: Model/Server.php:5741
-msgid "A comma separated list of emails for which the OTP is disabled. Note that if you remove someone from this list, the OTP will only be asked at next login."
-msgstr ""
-
-#: Model/Server.php:5750
+#: Model/Server.php:1266
 msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
 msgstr ""
 
-#: Model/Server.php:5760
+#: Model/Server.php:1276
 msgid "The message sent shown to anyone trying to self-register."
 msgstr ""
 
-#: Model/Server.php:5768
+#: Model/Server.php:1284
 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:5776
+#: Model/Server.php:1292
 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:5784
+#: Model/Server.php:1300
 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:5793
+#: Model/Server.php:1309
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:5802
+#: Model/Server.php:1318
 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:5811
-msgid "Enabling this setting will block the organisation list from being visible in sharing group besides user with sharing group permission."
-msgstr ""
-
-#: Model/Server.php:5820
+#: Model/Server.php:1327
 msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
 msgstr ""
 
-#: Model/Server.php:5830
+#: Model/Server.php:1337
 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:5832
+#: Model/Server.php:1339
 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:5839
+#: Model/Server.php:1346
 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:5848
+#: Model/Server.php:1355
 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:5857
+#: Model/Server.php:1364
 msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
 msgstr ""
 
-#: Model/Server.php:5866
+#: Model/Server.php:1373
 msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
 msgstr ""
 
-#: Model/Server.php:5875
-msgid "When enabled, logged in username will be included in X-Username HTTP response header. This is useful for request logging on webserver/proxy side."
-msgstr ""
-
-#: Model/Server.php:5887
+#: Model/Server.php:1385
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:5895
+#: Model/Server.php:1393
 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:5906
+#: Model/Server.php:1404
 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:5914
+#: Model/Server.php:1412
 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:5922
+#: Model/Server.php:1420
 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:5931
+#: Model/Server.php:1429
 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:5939
+#: Model/Server.php:1437
 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:5950
+#: Model/Server.php:1448
 msgid "The default policy action for the values added to the RPZ."
 msgstr ""
 
-#: Model/Server.php:5959
+#: Model/Server.php:1457
 msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:5967
+#: Model/Server.php:1465
 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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
 msgstr ""
 
-#: Model/Server.php:5975
+#: Model/Server.php:1473
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:5983
+#: Model/Server.php:1481
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:5991
+#: Model/Server.php:1489
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:5999
+#: Model/Server.php:1497
 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:6007
+#: Model/Server.php:1505
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:6015
+#: Model/Server.php:1513
 msgid "Nameserver"
 msgstr ""
 
-#: Model/Server.php:6023
+#: Model/Server.php:1521
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:6031
+#: Model/Server.php:1529
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:6039
+#: Model/Server.php:1537
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:6047
+#: Model/Server.php:1545
 msgid "A comma separated list of Kafka bootstrap brokers"
 msgstr ""
 
-#: Model/Server.php:6055
+#: Model/Server.php:1553
 msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
 msgstr ""
 
-#: Model/Server.php:6063;6337
+#: Model/Server.php:1561;1808
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:6071;6345
+#: Model/Server.php:1569;1816
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:6079
+#: Model/Server.php:1577
 msgid "Topic for publishing event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:6087
+#: Model/Server.php:1585
 msgid "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."
 msgstr ""
 
-#: Model/Server.php:6095
+#: Model/Server.php:1593
 msgid "Topic for publishing event information on publish."
 msgstr ""
 
-#: Model/Server.php:6103;6353
+#: Model/Server.php:1601;1824
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:6111
+#: Model/Server.php:1609
 msgid "Topic for publishing object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:6119;6361
+#: Model/Server.php:1617;1832
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:6127
+#: Model/Server.php:1625
 msgid "Topic for publishing object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:6135;6369
+#: Model/Server.php:1633;1840
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:6143
+#: Model/Server.php:1641
 msgid "Topic for publishing attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:6151
+#: Model/Server.php:1649
 msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:6159
+#: Model/Server.php:1657
 msgid "Topic for publishing proposal creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:6167;6377
+#: Model/Server.php:1665;1848
 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:6175
+#: Model/Server.php:1673
 msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:6183
+#: Model/Server.php:1681
 msgid "Enables or disables the publishing of new sightings."
 msgstr ""
 
-#: Model/Server.php:6191
+#: Model/Server.php:1689
 msgid "Topic for publishing sightings."
 msgstr ""
 
-#: Model/Server.php:6199
+#: Model/Server.php:1697
 msgid "Enables or disables the publishing of new/modified users."
 msgstr ""
 
-#: Model/Server.php:6207
+#: Model/Server.php:1705
 msgid "Topic for publishing new/modified users."
 msgstr ""
 
-#: Model/Server.php:6215
+#: Model/Server.php:1713
 msgid "Enables or disables the publishing of new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:6223
+#: Model/Server.php:1721
 msgid "Topic for publishing new/modified organisations."
 msgstr ""
 
-#: Model/Server.php:6231
+#: Model/Server.php:1729
 msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:6239
+#: Model/Server.php:1737
 msgid "Topic for publishing log entries."
 msgstr ""
 
-#: Model/Server.php:6247
+#: Model/Server.php:1745
 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:6256
-msgid "The host that the pub/sub feature will use."
-msgstr ""
-
-#: Model/Server.php:6265
+#: Model/Server.php:1754
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:6274
-msgid "The username that client need to use to connect to ZeroMQ."
-msgstr ""
-
-#: Model/Server.php:6283
-msgid "The password that client need to use to connect to ZeroMQ."
-msgstr ""
-
-#: Model/Server.php:6292
+#: Model/Server.php:1763
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:6301
+#: Model/Server.php:1772
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:6310
+#: Model/Server.php:1781
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:6319
+#: Model/Server.php:1790
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:6328
+#: Model/Server.php:1799
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:6385
+#: Model/Server.php:1856
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:6393
+#: Model/Server.php:1864
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:6401
+#: Model/Server.php:1872
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:6409
+#: Model/Server.php:1880
 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:6417
+#: Model/Server.php:1888
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:6425
+#: Model/Server.php:1896
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:6433
+#: Model/Server.php:1904
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:6441
+#: Model/Server.php:1912
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:6449
+#: Model/Server.php:1920
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:6457
+#: Model/Server.php:1928
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:6465
+#: Model/Server.php:1936
 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:6473
+#: Model/Server.php:1944
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:6481
-msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner organisation alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and any organisation that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
+#: Model/Server.php:1952
+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:6487
-msgid "Event Owner Organisation"
-msgstr ""
-
-#: Model/Server.php:6488
-msgid "Sighting reporters"
-msgstr ""
-
-#: Model/Server.php:6489
-msgid "Everyone"
-msgstr ""
-
-#: Model/Server.php:6490
-msgid "Event Owner + host org sightings"
-msgstr ""
-
-#: Model/Server.php:6495
+#: Model/Server.php:1961
 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:6503
-msgid "When pushing sightings to another server, report all sightings from this instance as this organisation. This effectively hides all sightings from this instance behind a single organisation to the outside world. Sightings pulled from this instance follow the Sightings_policy above."
-msgstr ""
-
-#: Model/Server.php:6514
+#: Model/Server.php:1969
 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:6522
+#: Model/Server.php:1977
 msgid "Enable SightingDB integration."
 msgstr ""
 
-#: Model/Server.php:6530
+#: Model/Server.php:1985
 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:6540
+#: Model/Server.php:1995
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:6549
+#: Model/Server.php:2004
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:6558
+#: Model/Server.php:2013
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:6567
-msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Alternatively, 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."
+#: Model/Server.php:2022
+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:6576
+#: Model/Server.php:2031
 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:6585
+#: Model/Server.php:2040
 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:6594
+#: Model/Server.php:2049
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:6602
+#: Model/Server.php:2057
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:6610
+#: Model/Server.php:2065
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:6618
+#: Model/Server.php:2073
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:6626
+#: Model/Server.php:2081
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:6634
+#: Model/Server.php:2089
 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:6642
+#: Model/Server.php:2097
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:6650
+#: Model/Server.php:2105
 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:6658
+#: Model/Server.php:2113
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:6666
+#: Model/Server.php:2121
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:6674
+#: Model/Server.php:2129
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:6682
+#: Model/Server.php:2137
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:6690
-msgid "When enabled, users have to click on the magnifier icon to show the enrichment"
-msgstr ""
-
-#: Model/Server.php:6698
+#: Model/Server.php:2145
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:6706
+#: Model/Server.php:2153
 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:6714
+#: Model/Server.php:2161
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:6722
+#: Model/Server.php:2169
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:6730
+#: Model/Server.php:2177
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:6738
+#: Model/Server.php:2185
 msgid "Enable/disable the Cortex services"
 msgstr ""
 
-#: Model/Server.php:6746
+#: Model/Server.php:2193
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:6755
+#: Model/Server.php:2202
 msgid "Set a timeout for the Cortex services"
 msgstr ""
 
-#: Model/Server.php:6763
+#: Model/Server.php:2210
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:6772
+#: Model/Server.php:2219
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:6781
+#: Model/Server.php:2228
 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:6790
+#: Model/Server.php:2237
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:6799
+#: Model/Server.php:2246
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:6808
+#: Model/Server.php:2255
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:6818
+#: Model/Server.php:2265
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:6827
+#: Model/Server.php:2274
 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:526
-msgid "Pulling %s event."
-msgid_plural "Pulling %s events."
-msgstr[0] ""
-msgstr[1] ""
-
-#: Model/Sighting.php:426
-msgid "Others"
+#: Model/Server.php:2441
+msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Sighting.php:836
-msgid "Invalid context."
+#: Model/Server.php:2445
+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/Sighting.php:840
-msgid "An ID or UUID must be provided if the context is set."
+#: Model/Server.php:2472
+msgid "Empty event detected."
+msgstr ""
+
+#: Model/Server.php:2478
+msgid "failed downloading the event"
+msgstr ""
+
+#: Model/Server.php:2557
+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:2559
+msgid "Sorry, this is not yet implemented"
+msgstr ""
+
+#: Model/Server.php:2560
+msgid "Something went wrong while trying to pull"
+msgstr ""
+
+#: Model/Server.php:2572;2574
+msgid "Unknown issue."
+msgstr ""
+
+#: Model/Server.php:3134
+msgid "Enable or disable the %s module."
+msgstr ""
+
+#: Model/Server.php:3137
+msgid "Restrict the %s module to the given organisation."
+msgstr ""
+
+#: Model/Server.php:3145
+msgid "Set this required module specific setting."
+msgstr ""
+
+#: Model/Server.php:3260
+msgid "Value not set."
+msgstr ""
+
+#: Model/Server.php:3281
+msgid "Invalid language."
+msgstr ""
+
+#: Model/Server.php:3302
+msgid "Invalid tag_collection."
+msgstr ""
+
+#: Model/Server.php:3310
+msgid "This setting has to be a number."
+msgstr ""
+
+#: Model/Server.php:3322
+msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
+msgstr ""
+
+#: Model/Server.php:3619
+msgid "Invalid file path or file not accessible."
+msgstr ""
+
+#: Model/Server.php:3622
+msgid "File has to be in .pem format."
+msgstr ""
+
+#: Model/Server.php:3988
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:4120
+msgid "Organisation logos"
+msgstr ""
+
+#: Model/Server.php:4121
+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:4123
+msgid "48x48 pixel .png files"
+msgstr ""
+
+#: Model/Server.php:4126;4141
+msgid "Filename must be in the following format: *.png"
+msgstr ""
+
+#: Model/Server.php:4130
+msgid "Additional image files"
+msgstr ""
+
+#: Model/Server.php:4131
+msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
+msgstr ""
+
+#: Model/Server.php:4138
+msgid "text/html if served inline, anything that conveys the terms of use if served as download"
+msgstr ""
+
+#: Model/Server.php:4228
+msgid "Invalid server."
+msgstr ""
+
+#: Model/Server.php:4259
+msgid "Response was empty."
+msgstr ""
+
+#: Model/Server.php:4335
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr ""
+
+#: Model/Server.php:4604
+msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
+msgstr ""
+
+#: Model/Server.php:4675
+msgid "Can't check database schema for Postgres database type"
+msgstr ""
+
+#: Model/Server.php:4692
+msgid "Table `%s` does not exist"
+msgstr ""
+
+#: Model/Server.php:4719
+msgid "Column `%s` exists but should not"
+msgstr ""
+
+#: Model/Server.php:4752
+msgid "Column `%s` is different"
+msgstr ""
+
+#: Model/Server.php:4762
+msgid "Column `%s` does not exist but should"
+msgstr ""
+
+#: Model/Server.php:4775
+msgid "Table `%s` is an additional table"
+msgstr ""
+
+#: Model/Server.php:4799
+msgid "Column `%s` should be indexed"
+msgstr ""
+
+#: Model/Server.php:4822
+msgid "Column `%s` is indexed but should not"
+msgstr ""
+
+#: Model/Server.php:5252
+msgid "Removing a dead worker."
+msgstr ""
+
+#: Model/Server.php:5253
+msgid "Removing dead worker data. Worker was of type %s with pid %s"
+msgstr ""
+
+#: Model/Server.php:5257
+msgid "Stopping a worker."
+msgstr ""
+
+#: Model/Server.php:5258
+msgid "Stopping a worker. Worker was of type %s with pid %s"
+msgstr ""
+
+#: Model/Server.php:5560
+msgid "Invalid submodule."
+msgstr ""
+
+#: Model/Server.php:5560;5589
+msgid "unknown"
+msgstr ""
+
+#: Model/Server.php:5572
+msgid "update_after_pull"
+msgstr ""
+
+#: Model/Server.php:5573
+msgid "Updating: "
+msgstr ""
+
+#: Model/Server.php:5717
+msgid "Invalid worker."
+msgstr ""
+
+#: Model/Server.php:5724
+msgid "Background workers not enabled."
+msgstr ""
+
+#: Model/Server.php:5731
+msgid "Invalid worker type."
+msgstr ""
+
+#: Model/Server.php:5911
+msgid "Could not reset the remote authentication key."
+msgstr ""
+
+#: Model/Server.php:5988
+msgid "Could not parse JSON: "
+msgstr ""
+
+#: Model/Server.php:6008
+msgid "Could not reset fetch remote user account."
+msgstr ""
+
+#: Model/Server.php:6030
+msgid "No user object received in response."
 msgstr ""
 
 #: Model/Sightingdb.php:346
@@ -6898,47 +5421,47 @@ msgstr ""
 msgid "No response from the SightingDB server."
 msgstr ""
 
-#: Model/Taxonomy.php:675
+#: Model/Taxonomy.php:619
 msgid "Taxonomy `%s` is an exclusive Taxonomy"
 msgstr ""
 
-#: Model/Taxonomy.php:682
+#: Model/Taxonomy.php:626
 msgid "Predicate `%s` is exclusive"
 msgstr ""
 
-#: Model/User.php:1033
+#: Model/User.php:1254
 msgid "reset_all_sync_api_keys"
 msgstr ""
 
-#: Model/User.php:1034
+#: Model/User.php:1255
 msgid "Reseting all API keys"
 msgstr ""
 
-#: Model/User.php:1096
+#: Model/User.php:1317
 msgid "Reset in progress - %s/%s."
 msgstr ""
 
-#: Model/User.php:1101
+#: Model/User.php:1322
 msgid "%s authkeys reset, %s could not be reset"
 msgstr ""
 
-#: Model/User.php:1127
+#: Model/User.php:1347
 msgid "Authentication key for user %s (%s) updated."
 msgstr ""
 
-#: Model/User.php:1143
+#: Model/User.php:1359
 msgid "Dear user,\n\nan API key reset has been triggered by an administrator for your user account on %s.\n\nYour new API key is: %s\n\nPlease update your server's sync setup to reflect this change.\n\nWe apologise for the inconvenience."
 msgstr ""
 
-#: Model/User.php:1148
+#: Model/User.php:1364
 msgid "Dear user,\n\nan API key reset has been triggered by an administrator for your user account on %s.\n\nYour new API key can be retrieved by logging in using this sync user's account.\n\nPlease update your server's sync setup to reflect this change.\n\nWe apologise for the inconvenience."
 msgstr ""
 
-#: Model/User.php:1157
+#: Model/User.php:1373
 msgid "API key reset by administrator"
 msgstr ""
 
-#: Model/UserSetting.php:375
+#: Model/UserSetting.php:321
 msgid "This endpoint expects both a setting and a value to be set."
 msgstr ""
 
@@ -6972,367 +5495,71 @@ msgstr ""
 msgid "it has the following dependent items"
 msgstr ""
 
-#: View/Allowedlists/admin_add.ctp:4
-msgid "Add Signature Allowedlist"
-msgstr ""
-
-#: View/Allowedlists/admin_add.ctp:13
-#: View/DecayingModel/import.ctp:25
-#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:15
-#: View/Elements/genericElements/org_picker.ctp:17
-#: View/EventBlocklists/add.ctp:36
-#: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:220
-#: View/Feeds/import_feeds.ctp:20
-#: View/GalaxyClusterRelations/add.ctp:8
-#: View/OrgBlocklists/add.ctp:30
-#: View/Regexp/admin_add.ctp:32
-#: View/Regexp/admin_edit.ctp:42
-#: View/Servers/import.ctp:20
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
-#: View/SharingGroups/index.ctp:12
-#: View/Sightings/ajax/add_sighting.ctp:33
-#: View/TagCollections/import.ctp:20
-#: View/Tags/add.ctp:35
-#: View/Users/admin_filter_user_index.ctp:62
-msgid "Add"
-msgstr ""
-
-#: View/Allowedlists/admin_edit.ctp:4
-msgid "Edit Signature Allowedlist"
-msgstr ""
-
-#: View/Allowedlists/admin_edit.ctp:13
-#: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:85
-#: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_galaxy_matrix.ctp:73;209
-#: View/Elements/genericElements/Form/submitButton.ctp:9;26
-#: View/Events/contact.ctp:25
-#: View/Events/free_text_import.ctp:27
-#: View/Events/resolved_misp_format.ctp:437
-#: View/News/add.ctp:33
-#: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:131
-#: View/Objects/add.ctp:178
-#: View/Objects/ajax/quickAddAttributeForm.ctp:121
-#: View/Organisations/admin_add.ctp:48
-#: View/Organisations/admin_edit.ctp:59
-#: View/Posts/add.ctp:66
-#: View/Posts/edit.ctp:20
-#: View/Servers/add.ctp:131
-#: View/Servers/edit.ctp:173
-#: View/Servers/ondemand_action.ctp:54
-#: 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/UserSettings/set_home_page.ctp:4
-#: View/UserSettings/set_setting.ctp:36
-#: View/Users/admin_email.ctp:54
-#: View/Users/admin_quick_email.ctp:23
-#: View/Users/change_pw.ctp:23
-#: View/Users/statistics_galaxymatrix.ctp:31
-msgid "Submit"
-msgstr ""
-
-#: View/Allowedlists/admin_index.ctp:2
-#: View/Allowedlists/index.ctp:2
-#: View/Elements/global_menu.ctp:156;161
-#: View/Pages/doc/administration.ctp:13
-#: View/Pages/doc/general.ctp:51
-#: View/Pages/doc/user_management.ctp:70
-msgid "Signature Allowedlist"
-msgstr ""
-
-#: View/Allowedlists/admin_index.ctp:3
-#: View/Allowedlists/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 ""
-
-#: View/Allowedlists/admin_index.ctp:7;40
-#: View/Allowedlists/index.ctp:7;35
-#: View/Attributes/index.ctp:32
-#: View/DecayingModel/decaying_tool_rest_search.ctp:12;64
-#: View/DecayingModel/index.ctp:6;162
-#: View/Elements/eventattribute.ctp:41
-#: View/Elements/eventdiscussion.ctp:16;122
-#: View/Elements/generic_table.ctp:10
-#: View/Elements/generic_table_row.ctp:10
-#: View/Elements/Feeds/eventattribute.ctp:20;87
-#: View/Elements/Servers/eventattribute.ctp:17;81
-#: View/Elements/genericElements/IndexTable/pagination_links.ctp:11
-#: View/EventBlocklists/index.ctp:6;78
-#: View/Events/index.ctp:6
-#: View/Events/proposal_event_index.ctp:6;89
-#: View/Events/ajax/index.ctp:10
-#: View/Feeds/freetext_index.ctp:18;78
-#: View/Feeds/preview_index.ctp:10;85
-#: View/Jobs/index.ctp:24;181
-#: View/Logs/admin_index.ctp:30;120
-#: View/Logs/event_index.ctp:10;54
-#: View/News/index.ctp:39
-#: View/Noticelists/index.ctp:6;76
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:8
-#: View/ObjectTemplates/index.ctp:6;136
-#: View/OrgBlocklists/index.ctp:6;45
-#: View/Organisations/index.ctp:35;159
-#: View/Regexp/admin_index.ctp:6;44
-#: View/Regexp/index.ctp:6;38
-#: View/Servers/index.ctp:6;196
-#: View/Servers/preview_index.ctp:11;186
-#: View/Tasks/index.ctp:11;99
-#: View/Taxonomies/view.ctp:33;170
-#: View/Templates/index.ctp:6;54
-#: View/Threads/index.ctp:6;90
-#: View/Users/ajax/admin_index.ctp:13;32
-msgid "previous"
-msgstr ""
-
-#: View/Allowedlists/admin_index.ctp:9;42
-#: View/Allowedlists/index.ctp:9;37
-#: View/Attributes/index.ctp:34
-#: View/DecayingModel/decaying_tool_rest_search.ctp:14;66
-#: View/DecayingModel/index.ctp:8;164
-#: View/Elements/eventattribute.ctp:43
-#: View/Elements/eventdiscussion.ctp:18;124
-#: View/Elements/generic_table.ctp:12
-#: View/Elements/generic_table_row.ctp:12
-#: View/Elements/Feeds/eventattribute.ctp:22;89
-#: View/Elements/Servers/eventattribute.ctp:19;83
-#: View/Elements/genericElements/IndexTable/pagination_links.ctp:27
-#: View/EventBlocklists/index.ctp:8;80
-#: View/Events/index.ctp:8
-#: View/Events/proposal_event_index.ctp:8;91
-#: View/Events/ajax/index.ctp:12
-#: View/Feeds/freetext_index.ctp:20;80
-#: View/Feeds/preview_index.ctp:12;87
-#: View/Jobs/index.ctp:26;183
-#: View/Logs/admin_index.ctp:32;122
-#: View/Logs/event_index.ctp:12;56
-#: View/News/index.ctp:41
-#: View/Noticelists/index.ctp:8;78
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:10
-#: View/ObjectTemplates/index.ctp:8;138
-#: View/OrgBlocklists/index.ctp:8;47
-#: View/Organisations/index.ctp:37;161
-#: View/Regexp/admin_index.ctp:8;46
-#: View/Regexp/index.ctp:8;40
-#: View/Servers/index.ctp:8;198
-#: View/Servers/preview_index.ctp:13;188
-#: View/Tasks/index.ctp:13;101
-#: View/Taxonomies/view.ctp:35;172
-#: View/Templates/index.ctp:8;56
-#: View/Threads/index.ctp:8;92
-#: View/Users/ajax/admin_index.ctp:15;34
-msgid "next"
-msgstr ""
-
-#: View/Allowedlists/admin_index.ctp:17
-#: View/Attributes/index.ctp:57
-#: View/DecayingModel/index.ctp:92
-#: View/Elements/eventattribute.ctp:161
-#: View/Elements/Events/eventIndexTable.ctp:60
-#: View/Elements/Users/userIndexTable.ctp:28
-#: View/Elements/genericElements/IndexTable/headers.ctp:43
-#: 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/EventBlocklists/index.ctp:48
-#: View/Events/export.ctp:26
-#: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/preview_index.ctp:41
-#: View/Noticelists/index.ctp:30
-#: View/ObjectTemplates/index.ctp:65
-#: View/OrgBlocklists/index.ctp:19
-#: View/Organisations/index.ctp:95
-#: View/Pages/doc/using_the_system.ctp:187;238;286;382
-#: View/Regexp/admin_index.ctp:18
-#: View/Servers/index.ctp:36
-#: View/Servers/preview_index.ctp:102
-#: View/SharingGroups/add.ctp:74;94
-#: View/SharingGroups/edit.ctp:74;102
-#: View/Sightings/ajax/list_sightings.ctp:15
-#: View/TagCollections/index.ctp:16
-#: View/Templates/index.ctp:20
-#: View/Threads/index.ctp:21
-msgid "Actions"
-msgstr ""
-
-#: View/Allowedlists/admin_index.ctp:24
-#: View/DecayingModel/decaying_tool.ctp:137
-#: View/Elements/eventdiscussion.ctp:85;93
-#: View/Elements/Events/eventIndexTable.ctp:217
-#: View/Elements/Events/View/row_attribute.ctp:390
-#: View/Elements/Events/View/row_object.ctp:124;125
-#: View/Elements/TagCollections/index_row.ctp:44
-#: View/Elements/Users/userIndexTable.ctp:94
-#: View/Elements/markdownEditor/markdownEditor.ctp:30
-#: View/EventBlocklists/edit.ctp:37
-#: View/EventBlocklists/index.ctp:62
-#: View/Feeds/edit.ctp:220
-#: View/Feeds/index.ctp:288
-#: View/GalaxyClusterRelations/add.ctp:8
-#: View/News/index.ctp:22
-#: View/OrgBlocklists/edit.ctp:29
-#: View/OrgBlocklists/index.ctp:29
-#: View/Organisations/index.ctp:138
-#: View/Pages/doc/using_the_system.ctp:191
-#: View/Regexp/admin_index.ctp:27
-#: View/Roles/admin_edit.ctp:55
-#: View/Servers/index.ctp:177
-#: View/Tags/edit.ctp:36
-#: View/Tags/index.ctp:133
-#: View/Templates/edit.ctp:49
-#: View/Users/admin_index.ctp:211
-#: View/Users/edit.ctp:47
-msgid "Edit"
-msgstr ""
-
-#: View/Allowedlists/admin_index.ctp:25
-#: View/Attributes/ajax/attributeConfirmationForm.ctp:16
-#: View/Elements/eventdiscussion.ctp:86;94
-#: View/Elements/Events/eventIndexTable.ctp:220
-#: View/Elements/TagCollections/index_row.ctp:45
-#: View/Elements/Users/userIndexTable.ctp:95
-#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:43
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
-#: View/Elements/healthElements/files.ctp:73
-#: View/EventBlocklists/index.ctp:63
-#: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
-#: View/EventReports/index.ctp:97
-#: View/EventReports/ajax/indexForEvent.ctp:113
-#: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:295
-#: View/GalaxyElements/ajax/index.ctp:67
-#: View/News/index.ctp:24
-#: View/ObjectReferences/ajax/delete.ctp:32
-#: View/ObjectTemplates/index.ctp:118
-#: View/Objects/ajax/delete.ctp:19
-#: View/OrgBlocklists/index.ctp:30
-#: View/Organisations/index.ctp:140
-#: View/Pages/doc/using_the_system.ctp:192
-#: View/Regexp/admin_index.ctp:28
-#: View/Servers/index.ctp:178
-#: View/Users/admin_index.ctp:221
-#: View/Warninglists/index.ctp:140
-msgid "Delete"
-msgstr ""
-
-#: View/Allowedlists/admin_index.ctp:25
-#: View/Elements/TagCollections/index_row.ctp:45
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr ""
-
-#: View/Allowedlists/admin_index.ctp:33
-#: View/Allowedlists/index.ctp:28
-#: View/Attributes/index.ctp:123
-#: View/DecayingModel/decaying_tool_rest_search.ctp:57
-#: View/DecayingModel/index.ctp:155
-#: View/Elements/eventdiscussion.ctp:115
-#: View/Elements/generic_table.ctp:47
-#: View/Elements/generic_table_row.ctp:39
-#: View/Elements/genericElements/IndexTable/pagination_counter.ctp:2
-#: View/EventBlocklists/index.ctp:71
-#: View/Events/index.ctp:103
-#: View/Events/proposal_event_index.ctp:82
-#: View/Events/ajax/index.ctp:21
-#: View/Feeds/preview_index.ctp:77
-#: View/Jobs/index.ctp:174
-#: View/Logs/admin_index.ctp:113
-#: View/Logs/event_index.ctp:47
-#: View/News/index.ctp:33
-#: View/Noticelists/index.ctp:69
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:60
-#: View/ObjectTemplates/index.ctp:129
-#: View/OrgBlocklists/index.ctp:38
-#: View/Organisations/index.ctp:152
-#: View/Regexp/admin_index.ctp:36
-#: View/Regexp/index.ctp:31
-#: View/Servers/index.ctp:189
-#: View/Servers/preview_index.ctp:178
-#: View/Tasks/index.ctp:92
-#: View/Taxonomies/view.ctp:163
-#: View/Templates/index.ctp:47
-#: View/Threads/index.ctp:83
-#: View/Users/ajax/admin_index.ctp:25
-msgid "Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}"
-msgstr ""
-
 #: View/Attributes/add.ctp:6
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:115
+#: View/Elements/eventattributecreation.ctp:9
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
 
 #: View/Attributes/add.ctp:6
+#: View/Attributes/edit.ctp:4
 msgid "Edit Attribute"
 msgstr ""
 
 #: View/Attributes/add.ctp:18
 #: View/Attributes/attribute_replace.ctp:12
-#: View/ShadowAttributes/add.ctp:17
+#: View/Attributes/edit.ctp:8
+#: View/ShadowAttributes/add.ctp:10
 #: View/ShadowAttributes/edit.ctp:8
 msgid "(choose one)"
 msgstr ""
 
 #: View/Attributes/add.ctp:25
-#: View/ShadowAttributes/add.ctp:24
 msgid "(choose category first)"
 msgstr ""
 
 #: View/Attributes/add.ctp:39
 #: View/Attributes/add_attachment.ctp:33
+#: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
-#: View/EventReports/add.ctp:25
 #: View/Events/add.ctp:33
 #: View/Feeds/add.ctp:198
 #: View/Feeds/edit.ctp:199
-#: View/GalaxyClusterRelations/add.ctp:37
-#: View/GalaxyClusters/add.ctp:40
 #: View/Objects/ajax/quickAddAttributeForm.ctp:69
+#: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
 msgstr ""
 
 #: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
+#: View/Attributes/edit.ctp:46
 #: View/Attributes/ajax/attributeEditMassForm.ctp:49
-#: View/Objects/ajax/quickAddAttributeForm.ctp:112
+#: View/Elements/eventattributecreation.ctp:42
 #: View/Pages/doc/using_the_system.ctp:93;95;131
-#: View/ShadowAttributes/add.ctp:38
+#: View/ShadowAttributes/add.ctp:28
 #: View/ShadowAttributes/add_attachment.ctp:13
 #: View/ShadowAttributes/edit.ctp:32
 msgid "Contextual Comment"
 msgstr ""
 
 #: View/Attributes/add.ctp:57
-#: View/Attributes/ajax/attributeEditMassForm.ctp:33
-#: View/Objects/ajax/quickAddAttributeForm.ctp:94
-#: View/Pages/doc/using_the_system.ctp:96
-#: View/ShadowAttributes/add.ctp:43
-#: View/ShadowAttributes/edit.ctp:41
-msgid "For Intrusion Detection System"
+#: 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:139
-#: View/ShadowAttributes/add.ctp:100
+#: View/Attributes/add.ctp:155
 msgid "Timezone missing, auto-detected as: "
 msgstr ""
 
-#: View/Attributes/add.ctp:140
-#: View/ShadowAttributes/add.ctp:101
-msgid "The following value will be submitted instead: "
+#: View/Attributes/add.ctp:156
+msgid "The following value will be submited instead: "
 msgstr ""
 
-#: View/Attributes/add.ctp:148
-#: View/ShadowAttributes/add.ctp:109
-msgid "Value is not a valid datetime. Expected format YYYY-MM-DDTHH:mm:ssZ"
+#: View/Attributes/add.ctp:164
+msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr ""
 
 #: View/Attributes/add_attachment.ctp:4
@@ -7340,12 +5567,15 @@ msgid "Add Attachment(s)"
 msgstr ""
 
 #: 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_attachment.ctp:24
+#: View/Attributes/edit.ctp:24
 #: View/Objects/ajax/quickAddAttributeForm.ctp:59
 msgid "Distribution "
 msgstr ""
@@ -7355,14 +5585,10 @@ msgid "Is a malware sample (encrypt and hash)"
 msgstr ""
 
 #: View/Attributes/add_attachment.ctp:72
-msgid "Advanced extraction is not installed"
+msgid "Advanced extraction (if installed)"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:74
-msgid "Advanced extraction"
-msgstr ""
-
-#: View/Attributes/add_attachment.ctp:79
+#: View/Attributes/add_attachment.ctp:77
 #: View/Elements/healthElements/files.ctp:92
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
@@ -7383,31 +5609,33 @@ msgstr ""
 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
+#: View/EventDelegations/index.ctp:70
+msgid "Event id"
+msgstr ""
+
 #: View/Attributes/alternate_search_result.ctp:7
-#: View/Attributes/index.ctp:43
+#: View/Attributes/index.ctp:49
 #: View/DecayingModel/decaying_tool_rest_search.ctp:24
-#: View/Elements/eventattribute.ctp:124
+#: View/Elements/eventattribute.ctp:147
 #: View/Elements/Users/userIndexTable.ctp:4
-#: View/Feeds/index.ctp:126
+#: View/Feeds/index.ctp:125
 #: View/Feeds/preview_event.ctp:13
-#: View/Feeds/preview_index.ctp:34
-#: View/GalaxyClusterBlocklists/index.ctp:34
+#: View/Feeds/preview_index.ctp:38
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Servers/preview_event.ctp:5
-#: View/Users/admin_index.ctp:69
+#: View/Users/admin_index.ctp:50
 #: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:8
-#: View/Elements/Events/View/row_attribute.ctp:83
-#: View/EventBlocklists/add.ctp:24
-#: View/EventBlocklists/edit.ctp:25
+#: View/Elements/Events/View/row_attribute.ctp:71
+#: View/EventBlacklists/add.ctp:24
+#: View/EventBlacklists/edit.ctp:25
 #: View/EventDelegations/index.ctp:78
 #: View/Events/add_misp_export_result.ctp:5
-#: View/Events/resolved_misp_format.ctp:53
-#: View/ShadowAttributes/index.ctp:69
+#: View/Events/resolved_misp_format.ctp:51
 msgid "Event info"
 msgstr ""
 
@@ -7416,7 +5644,7 @@ msgid "Event date"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:507
+#: View/Events/view.ctp:509
 msgid "Event graph"
 msgstr ""
 
@@ -7439,6 +5667,8 @@ msgid "Choose a category and a type, then paste a list of IOCs that match the se
 msgstr ""
 
 #: 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 ""
@@ -7455,7 +5685,9 @@ msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:33;41
 #: View/Attributes/ajax/attributeEditMassForm.ctp:80
+#: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
+#: View/ShadowAttributes/add.ctp:57
 #: 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
@@ -7473,19 +5705,58 @@ msgstr ""
 msgid "Replaceattributes"
 msgstr ""
 
+#: View/Attributes/attribute_replace.ctp:38
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Elements/view_galaxy_matrix.ctp:76;211
+#: View/Elements/genericElements/Form/submitButton.ctp:8;25
+#: View/Events/contact.ctp:29
+#: View/Events/free_text_import.ctp:27
+#: View/Events/resolved_misp_format.ctp:386
+#: View/News/add.ctp:33
+#: View/News/edit.ctp:34
+#: View/ObjectReferences/ajax/add.ctp:131
+#: View/Objects/add.ctp:166
+#: View/Objects/ajax/quickAddAttributeForm.ctp:119
+#: View/Organisations/admin_add.ctp:48
+#: View/Organisations/admin_edit.ctp:59
+#: View/Posts/add.ctp:66
+#: View/Posts/edit.ctp:20
+#: View/Servers/add.ctp:129
+#: View/Servers/edit.ctp:171
+#: View/Servers/ondemand_action.ctp:54
+#: 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/UserSettings/set_setting.ctp:36
+#: View/Users/admin_add.ctp:98
+#: 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/Users/statistics_galaxymatrix.ctp:31
+#: View/Whitelists/admin_edit.ctp:13
+msgid "Submit"
+msgstr ""
+
 #: View/Attributes/attribute_replace.ctp:44
 #: View/Attributes/ajax/attributeEditMassForm.ctp:89
 #: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/exportSearch.ctp:32
-#: View/Attributes/ajax/tagRemoveConfirmation.ctp:22
+#: 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:210
-#: View/Elements/genericElements/infoModal.ctp:45
-#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:50
-#: View/Elements/genericElements/Form/submitButton.ctp:14
-#: View/Elements/markdownEditor/markdownEditor.ctp:135
+#: View/Elements/view_galaxy_matrix.ctp:212
+#: View/Elements/genericElements/infoModal.ctp:40
+#: View/Elements/genericElements/Form/submitButton.ctp:13
 #: View/Elements/serverRuleElements/pull.ctp:73
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -7494,21 +5765,21 @@ msgstr ""
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/resolved_misp_format.ctp:438
+#: View/Events/resolved_misp_format.ctp:387
 #: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:35
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:33
 #: View/Events/ajax/exportChoice.ctp:51
 #: View/Events/ajax/importChoice.ctp:12
-#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:26
-#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:30
+#: 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:135
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/Objects/add.ctp:184
-#: View/Objects/revise_object.ctp:105
+#: View/Objects/add.ctp:172
+#: View/Objects/revise_object.ctp:112
 #: View/Objects/ajax/delete.ctp:24
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:27
 #: View/Organisations/ajax/merge.ctp:71
@@ -7516,6 +5787,7 @@ msgstr ""
 #: 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:69
 #: View/ShadowAttributes/edit.ctp:68
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
@@ -7539,8 +5811,6 @@ msgstr ""
 #: View/Users/ajax/fetchpgpkey.ctp:26
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
-#: View/genericTemplates/confirm.ctp:18
-#: View/genericTemplates/delete.ctp:16;29
 msgid "Cancel"
 msgstr ""
 
@@ -7552,10 +5822,26 @@ msgstr ""
 msgid "No Failed Composites"
 msgstr ""
 
+#: View/Attributes/edit.ctp:13
+#: View/ShadowAttributes/add.ctp:16
+#: View/ShadowAttributes/edit.ctp:14
+msgid "Type "
+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:66
+#: View/ShadowAttributes/edit.ctp:56;65
+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/Attributes/ajax/hover_enrichment.ctp:33
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:522
+#: View/Events/view.ctp:521
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -7596,69 +5882,245 @@ msgstr ""
 msgid "Results for all attributes"
 msgstr ""
 
-#: View/Attributes/index.ctp:41
+#: View/Attributes/index.ctp:39;128
+#: View/DecayingModel/decaying_tool_rest_search.ctp:12;64
+#: View/DecayingModel/index.ctp:13;169
+#: View/Elements/eventattribute.ctp:60;247
+#: 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;87
+#: View/Elements/Servers/eventattribute.ctp:20;87
+#: View/Elements/genericElements/IndexTable/pagination.ctp:14
+#: View/EventBlacklists/index.ctp:13;85
+#: 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/preview_index.ctp:14;89
+#: View/GalaxyElements/ajax/index.ctp:11;44
+#: View/Jobs/index.ctp:31;188
+#: 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;143
+#: 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;105
+#: View/Roles/index.ctp:13;68
+#: View/Servers/index.ctp:13;202
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;128
+#: View/SharingGroups/index.ctp:13;107
+#: View/Tags/index.ctp:21;141
+#: View/Tasks/index.ctp:18;106
+#: View/Taxonomies/index.ctp:13;65
+#: View/Taxonomies/view.ctp:53;181
+#: View/Templates/index.ctp:13;61
+#: View/Threads/index.ctp:13;98
+#: 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;130
+#: View/DecayingModel/decaying_tool_rest_search.ctp:14;66
+#: View/DecayingModel/index.ctp:15;171
+#: View/Elements/eventattribute.ctp:62;249
+#: 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;89
+#: View/Elements/Servers/eventattribute.ctp:22;89
+#: View/Elements/genericElements/IndexTable/pagination.ctp:16
+#: View/EventBlacklists/index.ctp:15;87
+#: 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/preview_index.ctp:16;91
+#: View/GalaxyElements/ajax/index.ctp:13;46
+#: View/Jobs/index.ctp:33;190
+#: 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;145
+#: 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;107
+#: View/Roles/index.ctp:15;70
+#: View/Servers/index.ctp:15;204
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;130
+#: View/SharingGroups/index.ctp:15;109
+#: View/Tags/index.ctp:23;143
+#: View/Tasks/index.ctp:20;108
+#: View/Taxonomies/index.ctp:15;67
+#: View/Taxonomies/view.ctp:55;183
+#: View/Templates/index.ctp:15;63
+#: View/Threads/index.ctp:15;100
+#: 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:47
 #: View/DecayingModel/decaying_tool_rest_search.ctp:23
-#: View/Elements/eventattribute.ctp:120
+#: View/Elements/eventattribute.ctp:139
 #: View/Elements/Feeds/eventattribute.ctp:41
-#: View/Elements/Servers/eventattribute.ctp:38
-#: View/Events/proposal_event_index.ctp:24
-#: View/Events/view.ctp:116
+#: View/Elements/Servers/eventattribute.ctp:41
+#: View/Events/proposal_event_index.ctp:30
+#: View/Events/view.ctp:143
 #: View/Feeds/preview_event.ctp:25
 #: View/Objects/group_attributes_into_object.ctp:56
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
-#: View/Servers/preview_event.ctp:20
-#: View/Sightings/ajax/list_sightings.ctp:9
+#: View/Servers/preview_event.ctp:36
+#: View/Sightings/ajax/list_sightings.ctp:5
 msgid "Date"
 msgstr ""
 
-#: View/Attributes/index.ctp:48
+#: View/Attributes/index.ctp:54
 #: View/DecayingModel/decaying_tool_rest_search.ctp:30
-#: View/Elements/eventattribute.ctp:135
-#: View/Elements/global_menu.ctp:128
-#: View/Events/view.ctp:534
+#: View/Elements/eventattribute.ctp:158
+#: View/Elements/global_menu.ctp:94
+#: View/Events/view.ctp:533
 #: View/Events/ajax/ajaxGalaxies.ctp:6
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr ""
 
-#: View/Attributes/index.ctp:50
-#: View/Elements/eventattribute.ctp:137
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:160
 msgid "Correlate"
 msgstr ""
 
-#: View/Attributes/index.ctp:51
-#: View/Elements/eventattribute.ctp:138
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:161
 #: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:45
-#: View/Events/view.ctp:364
+#: View/Elements/Servers/eventattribute.ctp:48
+#: View/Events/view.ctp:372
 #: View/Feeds/preview_event.ctp:73
 #: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:68
+#: View/Servers/preview_event.ctp:95
 msgid "Related Events"
 msgstr ""
 
-#: View/Attributes/index.ctp:52
-#: View/Elements/eventattribute.ctp:139
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:162
 #: View/Elements/Feeds/eventattribute.ctp:49
-#: View/Elements/Servers/eventattribute.ctp:46
+#: View/Elements/Servers/eventattribute.ctp:49
 msgid "Feed hits"
 msgstr ""
 
-#: View/Attributes/index.ctp:55
+#: View/Attributes/index.ctp:61
 #: View/DecayingModel/decaying_tool_rest_search.ctp:33
-#: View/Elements/eventattribute.ctp:142
-#: View/Events/view.ctp:246
+#: View/Elements/eventattribute.ctp:165
+#: View/Events/view.ctp:252
 msgid "Sightings"
 msgstr ""
 
-#: View/Attributes/index.ctp:56
-#: View/Elements/eventattribute.ctp:143
-#: View/Events/view.ctp:255
-#: View/GalaxyClusters/ajax/index.ctp:126
-#: View/Tags/index.ctp:101
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:262
+#: View/GalaxyClusters/ajax/index.ctp:52
+#: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr ""
 
+#: View/Attributes/index.ctp:63
+#: View/DecayingModel/index.ctp:99
+#: View/Elements/eventattribute.ctp:184
+#: View/Elements/Events/eventIndexTable.ctp:60
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/genericElements/IndexTable/headers.ctp:33
+#: 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:55
+#: View/Events/export.ctp:26
+#: View/Events/resolved_attributes.ctp:54
+#: View/Feeds/preview_index.ctp:45
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:72
+#: 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:36
+#: View/Servers/index.ctp:41
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:48
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/TagCollections/index.ctp:16
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:28
+#: 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:121
+#: View/DecayingModel/decaying_tool_rest_search.ctp:57
+#: View/DecayingModel/index.ctp:162
+#: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
+#: View/Elements/genericElements/IndexTable/pagination_counter.ctp:5
+#: View/EventBlacklists/index.ctp:78
+#: View/Events/index.ctp:108
+#: View/Events/proposal_event_index.ctp:88
+#: View/Events/ajax/index.ctp:32
+#: View/Feeds/preview_index.ctp:81
+#: View/GalaxyElements/ajax/index.ctp:38
+#: View/Jobs/index.ctp:181
+#: 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:136
+#: 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:98
+#: View/Roles/index.ctp:61
+#: View/Servers/index.ctp:195
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:121
+#: View/SharingGroups/index.ctp:100
+#: View/Tags/index.ctp:134
+#: View/Tasks/index.ctp:99
+#: View/Taxonomies/index.ctp:58
+#: View/Taxonomies/view.ctp:174
+#: View/Templates/index.ctp:54
+#: View/Threads/index.ctp:91
+#: 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 ""
@@ -7672,9 +6134,8 @@ msgid "Value found: "
 msgstr ""
 
 #: View/Attributes/report_validation_issues_attributes.ctp:10
-#: View/Elements/healthElements/diagnostics.ctp:136
 #: View/Elements/templateElements/populateTemplateFile.ctp:21
-#: View/Errors/error403.ctp:4
+#: View/Errors/error403.ctp:3
 msgid "Error"
 msgstr ""
 
@@ -7711,7 +6172,7 @@ msgid "From the following organisation(s)"
 msgstr ""
 
 #: View/Attributes/search.ctp:29
-msgid "Only find IOCs flagged as to IDS"
+msgid "Only find IOCs flagged as to_ids"
 msgstr ""
 
 #: View/Attributes/search.ctp:33
@@ -7719,7 +6180,7 @@ msgid "Alternate Search Result (Events)"
 msgstr ""
 
 #: View/Attributes/search.ctp:47
-msgid "First seen and Last seen"
+msgid "First seen and Last seen."
 msgstr ""
 
 #: View/Attributes/search.ctp:48
@@ -7738,6 +6199,33 @@ msgstr ""
 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;98
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/TagCollections/index_row.ctp:45
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
+#: View/Elements/healthElements/files.ctp:73
+#: View/EventBlacklists/index.ctp:70
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
+#: View/Events/view_graph.ctp:31
+#: View/Feeds/index.ctp:292
+#: View/News/index.ctp:24
+#: View/ObjectReferences/ajax/delete.ctp:32
+#: View/ObjectTemplates/index.ctp:125
+#: View/Objects/ajax/delete.ctp:19
+#: View/OrgBlacklists/index.ctp:37
+#: View/Organisations/index.ctp:140
+#: View/Pages/doc/using_the_system.ctp:192
+#: View/Regexp/admin_index.ctp:35
+#: View/Roles/admin_index.ctp:90
+#: View/Servers/index.ctp:183
+#: View/SharingGroups/index.ctp:89
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Delete"
+msgstr ""
+
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
@@ -7767,31 +6255,29 @@ msgid "Do not alter current settings"
 msgstr ""
 
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
-#: View/Elements/GalaxyClusters/relations_graph.ctp:429
-#: View/EventReports/index.ctp:74
-#: View/EventReports/view.ctp:15
-#: View/EventReports/ajax/indexForEvent.ctp:97
+#: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:51
-#: View/Events/resolved_misp_format.ctp:96;149;344
-#: View/Events/view.ctp:152
+#: View/Events/resolved_misp_format.ctp:98;293
+#: View/Events/view.ctp:159
 #: View/Feeds/add.ctp:189
 #: View/Feeds/edit.ctp:191
-#: View/Feeds/freetext_index.ctp:32
-#: View/Feeds/index.ctp:185
-#: View/GalaxyClusterRelations/index.ctp:107
-#: View/GalaxyClusters/view.ctp:57
-#: View/GalaxyClusters/view_relations.ctp:42;109
-#: View/GalaxyClusters/ajax/index.ctp:174
-#: View/Objects/add.ctp:51;130;226
+#: View/Feeds/freetext_index.ctp:36
+#: View/Feeds/index.ctp:184
+#: View/Objects/add.ctp:47;118;214
 #: View/Objects/group_attributes_into_object.ctp:12;59
-#: View/Objects/revise_object.ctp:11;59
+#: View/Objects/revise_object.ctp:35;69
 #: View/Pages/doc/using_the_system.ctp:34;90;126;186;211;237
-#: View/Servers/preview_event.ctp:33
+#: View/Servers/preview_event.ctp:53
 #: View/Templates/populate_event_from_template_attributes.ctp:11
-#: View/Threads/index.ctp:20
+#: 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:38
 msgid "Create proposals"
 msgstr ""
@@ -7861,33 +6347,19 @@ msgstr ""
 msgid "Export as %s"
 msgstr ""
 
-#: View/Attributes/ajax/hover_enrichment.ctp:14
-#: View/Elements/templateElements/populateTemplateAttribute.ctp:68
-msgid "Error: %s"
-msgstr ""
-
-#: View/Attributes/ajax/hover_enrichment.ctp:18
-msgid "Empty results"
-msgstr ""
-
-#: View/Attributes/ajax/hover_enrichment.ctp:23
-msgid "Object: %s"
-msgstr ""
-
-#: View/Attributes/ajax/tagRemoveConfirmation.ctp:7
-msgid "Remove %s tag %s from %s %s?"
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
+msgid "Remove Tag"
 msgstr ""
 
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
-#: View/Servers/id_translator.ctp:22
-msgid "local"
+msgid "Remove tag "
 msgstr ""
 
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
-msgid "global"
+msgid "from "
 msgstr ""
 
-#: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 msgid "Remove"
 msgstr ""
 
@@ -7907,461 +6379,6 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
-#: View/AuthKeys/add.ctp:4
-msgid "Add auth key"
-msgstr ""
-
-#: View/AuthKeys/add.ctp:5
-msgid "Auth keys are used for API access. A user can have more than one authkey, so if you would like to use separate keys per tool that queries MISP, add additional keys. Use the comment field to make identifying your keys easier."
-msgstr ""
-
-#: View/AuthKeys/add.ctp:15
-#: View/AuthKeys/index.ctp:68
-#: View/AuthKeys/view.ctp:45
-#: View/DecayingModel/decaying_tool_rest_search.ctp:31
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/resolved_misp_format.ctp:148;343
-#: View/GalaxyClusterBlocklists/add.ctp:38
-#: View/GalaxyClusterBlocklists/index.ctp:56
-#: View/Inbox/index.ctp:36
-#: View/ObjectReferences/ajax/add.ctp:30
-#: View/Objects/add.ctp:71;131
-#: View/Objects/group_attributes_into_object.ctp:30
-#: View/Objects/revise_object.ctp:12;57
-#: View/Pages/doc/using_the_system.ctp:234;284
-#: View/Templates/populate_event_from_template_attributes.ctp:9
-#: View/Users/registrations.ctp:88
-msgid "Comment"
-msgstr ""
-
-#: View/AuthKeys/add.ctp:20
-msgid "Expiration (%s)"
-msgstr ""
-
-#: View/AuthKeys/add.ctp:20
-msgid "keep empty for maximal validity of %s days"
-msgstr ""
-
-#: View/AuthKeys/add.ctp:20
-msgid "keep empty for indefinite"
-msgstr ""
-
-#: View/AuthKeys/authkey_display.ctp:7;21
-msgid "Auth key created"
-msgstr ""
-
-#: View/AuthKeys/authkey_display.ctp:10;22
-msgid "Please make sure that you note down the auth key below, this is the only time the auth key is shown in plain text, so make sure you save it. If you lose the key, simply remove the entry and generate a new one."
-msgstr ""
-
-#: View/AuthKeys/authkey_display.ctp:11;23
-msgid "MISP will use the first and the last 4 characters for identification purposes."
-msgstr ""
-
-#: View/AuthKeys/authkey_display.ctp:15;25
-msgid "I have noted down my key, take me back now"
-msgstr ""
-
-#: View/AuthKeys/index.ctp:14
-msgid "Add authentication key"
-msgstr ""
-
-#: View/AuthKeys/index.ctp:29
-#: View/Cerebrates/index.ctp:70
-#: View/Cerebrates/preview_orgs.ctp:45
-#: View/Communities/index.ctp:25
-#: View/CorrelationExclusions/index.ctp:45
-#: View/Dashboards/list_templates.ctp:10
-#: View/EventBlocklists/index.ctp:28
-#: View/EventDelegations/index.ctp:41
-#: View/EventReports/index.ctp:33
-#: View/Events/index.ctp:89
-#: View/Feeds/index.ctp:67
-#: View/Feeds/preview_index.ctp:21
-#: View/Feeds/search_caches.ctp:26
-#: View/Galaxies/index.ctp:10
-#: View/GalaxyClusterBlocklists/index.ctp:19
-#: View/GalaxyClusterRelations/index.ctp:30
-#: View/GalaxyClusters/ajax/index.ctp:59
-#: View/Inbox/index.ctp:10
-#: View/ObjectTemplates/index.ctp:40
-#: View/Organisations/index.ctp:68
-#: View/Roles/index.ctp:133
-#: View/Servers/preview_index.ctp:60
-#: View/ShadowAttributes/index.ctp:25
-#: View/SharingGroups/index.ctp:36
-#: View/Sightingdb/index.ctp:10
-#: View/Tags/index.ctp:25
-#: View/Taxonomies/index.ctp:29
-#: View/Taxonomies/view.ctp:45
-#: View/Users/admin_index.ctp:55
-#: View/Users/registrations.ctp:26
-#: View/Warninglists/index.ctp:37
-msgid "Filter"
-msgstr ""
-
-#: View/AuthKeys/index.ctp:30
-#: View/Cerebrates/index.ctp:71
-#: View/Cerebrates/preview_orgs.ctp:46
-#: View/Communities/index.ctp:26
-#: View/CorrelationExclusions/index.ctp:46
-#: View/Dashboards/list_templates.ctp:11
-#: View/Elements/eventattributetoolbar.ctp:231
-#: View/EventBlocklists/index.ctp:29
-#: View/EventDelegations/index.ctp:42
-#: View/EventReports/index.ctp:34
-#: View/Events/index.ctp:90
-#: View/Feeds/index.ctp:68
-#: View/Feeds/preview_index.ctp:22
-#: View/Feeds/search_caches.ctp:27
-#: View/Galaxies/index.ctp:11
-#: View/GalaxyClusterBlocklists/index.ctp:20
-#: View/GalaxyClusterRelations/index.ctp:31
-#: View/GalaxyClusters/ajax/index.ctp:60
-#: View/Inbox/index.ctp:11
-#: View/ObjectTemplates/index.ctp:41
-#: View/Organisations/index.ctp:69
-#: View/Roles/index.ctp:134
-#: View/Servers/preview_index.ctp:61
-#: View/ShadowAttributes/index.ctp:26
-#: View/SharingGroups/index.ctp:37
-#: View/Sightingdb/index.ctp:11
-#: View/Tags/index.ctp:26
-#: View/Taxonomies/index.ctp:30
-#: View/Users/admin_index.ctp:56
-#: View/Users/registrations.ctp:27
-#: View/Warninglists/index.ctp:38
-msgid "Enter value to search"
-msgstr ""
-
-#: View/AuthKeys/index.ctp:56
-#: View/AuthKeys/view.ctp:54
-#: View/Users/statistics_sightings.ctp:13
-msgid "Expiration"
-msgstr ""
-
-#: View/AuthKeys/index.ctp:73
-msgid "Authentication key Index"
-msgstr ""
-
-#: View/AuthKeys/index.ctp:74
-msgid "A list of API keys bound to a user."
-msgstr ""
-
-#: View/AuthKeys/index.ctp:92
-msgid "Delete auth key"
-msgstr ""
-
-#: View/AuthKeys/view.ctp:25
-#: View/Elements/Events/eventIndexTable.ctp:34
-#: View/Elements/Users/userIndexTable.ctp:3
-#: View/EventReports/index.ctp:48
-#: View/EventReports/view.ctp:3
-#: View/EventReports/ajax/indexForEvent.ctp:71
-#: View/Events/get_event_info_by_id.ctp:12
-#: View/Feeds/index.ctp:85
-#: View/Feeds/view.ctp:3
-#: View/GalaxyClusters/ajax/index.ctp:67
-#: View/ObjectTemplates/view.ctp:3
-#: View/Objects/add.ctp:214
-#: View/Objects/group_attributes_into_object.ctp:54
-#: View/Organisations/view.ctp:5
-#: View/Organisations/ajax/merge.ctp:56;63
-#: View/Pages/doc/using_the_system.ctp:163;203
-#: View/Roles/index.ctp:4
-#: View/Servers/compare_servers.ctp:4
-#: View/Servers/index.ctp:14
-#: View/ShadowAttributes/index.ctp:34
-#: View/SharingGroups/index.ctp:49
-#: View/SharingGroups/view.ctp:6
-#: View/Tags/index.ctp:34
-#: View/Taxonomies/index.ctp:37
-#: View/Taxonomies/view.ctp:14
-#: View/Users/admin_index.ctp:63
-#: View/Users/view.ctp:3
-#: View/Warninglists/index.ctp:48
-msgid "ID"
-msgstr ""
-
-#: View/AuthKeys/view.ctp:29
-#: View/Cerebrates/preview_orgs.ctp:15
-#: View/Communities/view.ctp:5
-#: View/Dashboards/list_templates.ctp:25
-#: View/Elements/Events/View/row_object.ctp:61
-#: View/Elements/GalaxyClusters/relations_graph.ctp:440
-#: View/EventReports/view.ctp:4
-#: View/Events/resolved_misp_format.ctp:94;144;339
-#: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Feeds/preview_event.ctp:11
-#: View/Galaxies/view.ctp:8
-#: View/GalaxyClusters/view.ctp:48
-#: View/ObjectTemplates/index.ctp:59
-#: View/ObjectTemplates/view.ctp:6
-#: View/Objects/revise_object.ctp:58
-#: View/OrgBlocklists/index.ctp:16
-#: View/Organisations/admin_add.ctp:21
-#: View/Organisations/admin_edit.ctp:20
-#: View/Organisations/view.ctp:7
-#: View/Organisations/ajax/merge.ctp:58;65
-#: View/Pages/doc/using_the_system.ctp:204
-#: View/Servers/id_translator.ctp:45
-#: View/Servers/preview_event.ctp:4
-#: View/SharingGroups/add.ctp:72
-#: View/SharingGroups/edit.ctp:72
-#: View/SharingGroups/index.ctp:57
-#: View/SharingGroups/view.ctp:7
-#: View/TagCollections/index.ctp:8
-msgid "UUID"
-msgstr ""
-
-#: View/AuthKeys/view.ctp:49
-#: View/Elements/Users/userIndexTable.ctp:19
-#: View/GalaxyClusterBlocklists/index.ctp:44
-#: View/Pages/doc/administration.ctp:183
-#: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:92
-#: View/Users/admin_index.ctp:145
-#: View/Users/view.ctp:104
-msgid "Created"
-msgstr ""
-
-#: View/AuthKeys/view.ctp:59
-msgid "Key usage"
-msgstr ""
-
-#: View/AuthKeys/view.ctp:68
-msgid "Last used"
-msgstr ""
-
-#: View/AuthKeys/view.ctp:69
-msgid "Not used yet"
-msgstr ""
-
-#: View/AuthKeys/view.ctp:73
-msgid "Unique IPs"
-msgstr ""
-
-#: View/Cerebrates/add.ctp:31
-msgid "Pull Organisations"
-msgstr ""
-
-#: View/Cerebrates/add.ctp:36
-msgid "Pull Sharing Groups"
-msgstr ""
-
-#: View/Cerebrates/add.ctp:43
-msgid "Edit Cerebrate connection"
-msgstr ""
-
-#: View/Cerebrates/add.ctp:43
-msgid "Add Cerebrate connection"
-msgstr ""
-
-#: View/Cerebrates/index.ctp:4
-#: View/Cerebrates/preview_orgs.ctp:4
-#: View/Cerebrates/view.ctp:9
-#: View/Communities/index.ctp:34
-#: View/Communities/view.ctp:4
-#: View/Dashboards/list_templates.ctp:19
-#: View/EventDelegations/index.ctp:50
-#: View/Feeds/search_caches.ctp:35
-#: View/GalaxyClusterBlocklists/index.ctp:28
-#: View/GalaxyClusterRelations/index.ctp:39
-#: View/GalaxyClusters/view_relations.ctp:8
-#: View/Inbox/index.ctp:19
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:5
-#: View/Sightingdb/index.ctp:26
-#: View/Templates/view.ctp:4
-#: View/UserSettings/index.ctp:50
-#: View/Users/registrations.ctp:39
-#: View/Warninglists/view.ctp:9
-msgid "Id"
-msgstr ""
-
-#: View/Cerebrates/index.ctp:9
-#: View/GalaxyClusterRelations/index.ctp:85
-#: View/GalaxyClusters/ajax/index.ctp:98
-#: View/Pages/doc/using_the_system.ctp:162
-#: View/Servers/preview_event.ctp:6
-msgid "Owner Org"
-msgstr ""
-
-#: View/Cerebrates/index.ctp:15
-#: View/Cerebrates/preview_orgs.ctp:20
-#: View/Cerebrates/view.ctp:13
-#: View/Communities/view.ctp:6
-#: View/Dashboards/list_templates.ctp:37
-#: View/DecayingModel/index.ctp:81
-#: View/DecayingModel/view.ctp:14
-#: View/Elements/Events/View/row_attribute.ctp:214
-#: View/Elements/GalaxyClusters/relations_graph.ctp:425
-#: View/Elements/Servers/View/row_object.ctp:19
-#: View/Elements/templateElements/templateRowAttribute.ctp:12
-#: View/Elements/templateElements/templateRowFile.ctp:12
-#: View/Elements/templateElements/templateRowText.ctp:12
-#: View/EventReports/index.ctp:56
-#: View/EventReports/ajax/indexForEvent.ctp:77
-#: View/Events/resolved_misp_format.ctp:93
-#: View/Events/view.ctp:408
-#: View/Feeds/index.ctp:108
-#: View/Feeds/search_caches.ctp:47
-#: View/Feeds/view.ctp:4
-#: View/Galaxies/index.ctp:37
-#: View/Galaxies/view.ctp:6
-#: View/GalaxyClusters/add.ctp:27
-#: View/GalaxyClusters/view.ctp:42
-#: View/ObjectTemplates/view.ctp:4
-#: View/Objects/add.ctp:218
-#: View/Objects/revise_object.ctp:8
-#: View/Organisations/ajax/merge.ctp:57;64
-#: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/index.ctp:26
-#: View/Roles/view.ctp:9
-#: View/Servers/compare_servers.ctp:4
-#: View/SharingGroups/add.ctp:51;71;91
-#: View/SharingGroups/edit.ctp:51;71;99
-#: View/SharingGroups/index.ctp:63
-#: View/SharingGroups/view.ctp:8;46;71
-#: View/Sightingdb/index.ctp:51
-#: View/Tags/index.ctp:54
-#: View/Templates/view.ctp:9
-#: View/Users/statistics_orgs.ctp:33
-#: View/Warninglists/index.ctp:56
-#: View/Warninglists/view.ctp:10
-msgid "Name"
-msgstr ""
-
-#: View/Cerebrates/index.ctp:20
-#: View/Cerebrates/view.ctp:17
-#: View/Elements/Events/View/row_attribute.ctp:215
-#: View/EventReports/ajax/importReportFromUrl.ctp:13
-#: View/Events/automation.ctp:286
-#: View/Events/legacy_automation.ctp:394
-#: View/Events/view.ctp:409
-#: View/Feeds/add.ctp:53
-#: View/Feeds/edit.ctp:84
-#: View/Feeds/index.ctp:139
-#: View/Feeds/view.ctp:5
-#: View/Pages/doc/using_the_system.ctp:445
-#: View/Servers/compare_servers.ctp:4
-#: View/SharingGroups/add.ctp:92
-#: View/SharingGroups/edit.ctp:100
-#: View/SharingGroups/view.ctp:72
-msgid "URL"
-msgstr ""
-
-#: View/Cerebrates/index.ctp:25
-#: View/Cerebrates/view.ctp:30
-#: View/Communities/index.ctp:59
-#: View/Dashboards/list_templates.ctp:43
-#: View/Dashboards/save_template.ctp:21
-#: View/DecayingModel/index.ctp:82
-#: View/DecayingModel/view.ctp:21
-#: View/Elements/GalaxyClusters/relations_graph.ctp:427
-#: View/Elements/Servers/View/row_object.ctp:24
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
-#: 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:26
-#: View/Galaxies/index.ctp:53
-#: View/Galaxies/view.ctp:9
-#: View/GalaxyClusters/view.ctp:44
-#: View/GalaxyClusters/ajax/index.ctp:150
-#: View/ObjectTemplates/view.ctp:10
-#: View/Objects/add.ctp:26;125;222
-#: View/Objects/group_attributes_into_object.ctp:8
-#: View/Objects/propose_objects_from_attributes.ctp:17
-#: View/Organisations/view.ctp:20
-#: 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/SharingGroups/add.ctp:55
-#: View/SharingGroups/edit.ctp:55
-#: View/SharingGroups/index.ctp:76
-#: View/SharingGroups/view.ctp:10
-#: View/Sightingdb/index.ctp:88
-#: View/TagCollections/index.ctp:15
-#: View/Taxonomies/index.ctp:49
-#: View/Taxonomies/view.ctp:16
-#: View/Templates/view.ctp:14
-#: View/Warninglists/index.ctp:67
-#: View/Warninglists/view.ctp:11
-msgid "Description"
-msgstr ""
-
-#: View/Cerebrates/index.ctp:30
-msgid "Pull Orgs"
-msgstr ""
-
-#: View/Cerebrates/index.ctp:36
-msgid "Pull SGs"
-msgstr ""
-
-#: View/Cerebrates/index.ctp:56
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:818
-msgid "Add Cerebrate"
-msgstr ""
-
-#: View/Cerebrates/index.ctp:78
-msgid "Linked Cerebrates"
-msgstr ""
-
-#: View/Cerebrates/index.ctp:79
-msgid "You can connect your MISP to one or several Cerebrate instances to act as lookup directories for organisation and sharing group information."
-msgstr ""
-
-#: View/Cerebrates/index.ctp:92
-msgid "Pull all organisations"
-msgstr ""
-
-#: View/Cerebrates/preview_orgs.ctp:9
-#: View/Elements/Servers/Module/type.ctp:11
-#: View/Elements/healthElements/diagnostics.ctp:419
-#: View/Pages/doc/administration.ctp:56;228
-#: View/Servers/ajax/submoduleStatus.ctp:6
-msgid "Status"
-msgstr ""
-
-#: View/Cerebrates/preview_orgs.ctp:25
-#: View/Organisations/view.ctp:45
-#: View/Users/statistics_orgs.ctp:39
-msgid "Sector"
-msgstr ""
-
-#: View/Cerebrates/preview_orgs.ctp:30
-#: View/Organisations/view.ctp:41
-#: View/Users/statistics_orgs.ctp:37
-msgid "Nationality"
-msgstr ""
-
-#: View/Cerebrates/preview_orgs.ctp:54
-msgid "Organisations list via Cerebrate %s (%s)"
-msgstr ""
-
-#: View/Cerebrates/preview_orgs.ctp:59
-msgid "Preview of the organisations known to the remote Cerebrate instance."
-msgstr ""
-
-#: View/Cerebrates/preview_orgs.ctp:69
-msgid "Fetch organisation object"
-msgstr ""
-
-#: View/Cerebrates/view.ctp:23
-#: View/GalaxyClusters/view.ctp:62
-msgid "Owner Organisation"
-msgstr ""
-
-#: View/Cerebrates/view.ctp:39
-msgid "The Cerebrate Project"
-msgstr ""
-
 #: View/Communities/index.ctp:14
 msgid "Vetted by the MISP-project team"
 msgstr ""
@@ -8370,6 +6387,75 @@ msgstr ""
 msgid "Unvetted"
 msgstr ""
 
+#: View/Communities/index.ctp:25
+#: View/Dashboards/list_templates.ctp:10
+#: View/EventBlacklists/index.ctp:35
+#: View/EventDelegations/index.ctp:41
+#: View/Events/index.ctp:94
+#: View/Feeds/index.ctp:67
+#: View/Feeds/preview_index.ctp:25
+#: View/Feeds/search_caches.ctp:26
+#: View/Galaxies/index.ctp:25
+#: View/GalaxyClusters/ajax/index.ctp:27
+#: View/Inbox/index.ctp:10
+#: View/ObjectTemplates/index.ctp:47
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
+#: View/ShadowAttributes/index.ctp:37
+#: View/Sightingdb/index.ctp:10
+#: View/Tags/index.ctp:56
+#: View/Taxonomies/view.ctp:65
+#: View/Users/admin_index.ctp:35
+#: View/Users/registrations.ctp:26
+msgid "Filter"
+msgstr ""
+
+#: View/Communities/index.ctp:26
+#: View/Dashboards/list_templates.ctp:11
+#: View/Elements/eventattributetoolbar.ctp:231
+#: View/EventBlacklists/index.ctp:36
+#: View/EventDelegations/index.ctp:42
+#: View/Events/index.ctp:95
+#: View/Feeds/index.ctp:68
+#: View/Feeds/preview_index.ctp:26
+#: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:26
+#: View/GalaxyClusters/ajax/index.ctp:28
+#: View/Inbox/index.ctp:11
+#: View/ObjectTemplates/index.ctp:48
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+#: View/ShadowAttributes/index.ctp:38
+#: View/Sightingdb/index.ctp:11
+#: View/Users/admin_index.ctp:36
+#: View/Users/registrations.ctp:27
+msgid "Enter value to search"
+msgstr ""
+
+#: View/Communities/index.ctp:34
+#: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
+#: View/EventDelegations/index.ctp:50
+#: View/Feeds/index.ctp:85
+#: View/Feeds/search_caches.ctp:35
+#: View/Feeds/view.ctp:3
+#: View/Inbox/index.ctp:19
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Sightingdb/index.ctp:26
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/UserSettings/index.ctp:50
+#: View/Users/admin_index.ctp:44
+#: View/Users/admin_view.ctp:6
+#: View/Users/registrations.ctp:39
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
 #: View/Communities/index.ctp:40
 msgid "Vetted"
 msgstr ""
@@ -8382,6 +6468,46 @@ msgstr ""
 msgid "Community name"
 msgstr ""
 
+#: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
+#: View/DecayingModel/index.ctp:89
+#: View/DecayingModel/view.ctp:21
+#: View/Elements/Servers/View/row_object.ctp:24
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: 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:26
+#: View/Galaxies/index.ctp:65
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:8
+#: View/GalaxyClusters/ajax/index.ctp:64
+#: View/ObjectTemplates/view.ctp:9
+#: View/Objects/add.ctp:22;113;210
+#: View/Objects/group_attributes_into_object.ctp:8
+#: View/Objects/propose_objects_from_attributes.ctp:17
+#: 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:46
+#: View/Sightingdb/index.ctp:88
+#: View/TagCollections/index.ctp:15
+#: View/Taxonomies/view.ctp:14
+#: View/Templates/view.ctp:14
+#: View/Warninglists/view.ctp:11
+msgid "Description"
+msgstr ""
+
 #: View/Communities/index.ctp:63
 msgid "Self-reg"
 msgstr ""
@@ -8407,10 +6533,10 @@ msgid "Requestor E-mail address"
 msgstr ""
 
 #: View/Communities/request_access.ctp:15
-#: View/Jobs/index.ctp:97
-#: View/OrgBlocklists/add.ctp:18
-#: View/OrgBlocklists/index.ctp:15
-#: View/Organisations/view.ctp:11
+#: View/Jobs/index.ctp:104
+#: View/OrgBlacklists/add.ctp:17
+#: View/OrgBlacklists/index.ctp:22
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr ""
 
@@ -8427,7 +6553,6 @@ msgid "Message to the community host organisation"
 msgstr ""
 
 #: View/Communities/request_access.ctp:37
-#: View/Elements/footer.ctp:15;17
 msgid "PGP public key"
 msgstr ""
 
@@ -8463,7 +6588,59 @@ msgstr ""
 msgid "Message:"
 msgstr ""
 
+#: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
+#: View/Elements/Events/View/row_object.ctp:72
+#: View/Events/resolved_misp_format.ctp:93;288
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:9
+#: View/ObjectTemplates/index.ctp:66
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:68
+#: View/OrgBlacklists/index.ctp:23
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:58;65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+#: View/SharingGroups/index.ctp:43
+#: View/TagCollections/index.ctp:8
+msgid "UUID"
+msgstr ""
+
+#: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
+#: View/DecayingModel/index.ctp:88
+#: View/DecayingModel/view.ctp:14
+#: View/Elements/Servers/View/row_object.ctp:19
+#: View/Elements/templateElements/templateRowAttribute.ctp:12
+#: View/Elements/templateElements/templateRowFile.ctp:12
+#: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Feeds/index.ctp:108
+#: View/Feeds/search_caches.ctp:47
+#: View/Feeds/view.ctp:4
+#: View/Galaxies/index.ctp:49
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/view.ctp:6
+#: View/ObjectTemplates/view.ctp:4
+#: View/Objects/add.ctp:206
+#: View/Objects/revise_object.ctp:27
+#: 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/Sightingdb/index.ctp:51
+#: View/Templates/view.ctp:9
+#: View/Users/statistics_orgs.ctp:33
+#: View/Warninglists/view.ctp:10
+msgid "Name"
+msgstr ""
+
 #: View/Communities/view.ctp:7
+#: View/SharingGroups/view.ctp:68
 msgid "Url"
 msgstr ""
 
@@ -8476,6 +6653,12 @@ msgid "Vetted by MISP-project"
 msgstr ""
 
 #: View/Communities/view.ctp:27
+#: View/Elements/footer.ctp:15
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:64
+#: View/Users/admin_view.ctp:72
+#: View/Users/edit.ctp:23
+#: View/Users/view.ctp:32
 msgid "GnuPG key"
 msgstr ""
 
@@ -8484,62 +6667,12 @@ msgid "Community "
 msgstr ""
 
 #: View/Communities/view.ctp:51
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:766
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
 msgid "Request Access"
 msgstr ""
 
-#: View/CorrelationExclusions/add.ctp:4
-msgid "Add Correlation Exclusion Entry"
-msgstr ""
-
-#: View/CorrelationExclusions/add.ctp:5
-msgid "If you wish to exclude certain entries from being correlated on, simply add an entry here."
-msgstr ""
-
-#: View/CorrelationExclusions/add.ctp:9
-#: View/DecayingModel/decaying_tool_rest_search.ctp:27
-#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
-#: 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/resolved_misp_format.ctp:143;338
-#: View/Events/show_i_o_c_results.ctp:13
-#: View/Feeds/freetext_index.ctp:29
-#: View/GalaxyClusters/update_cluster.ctp:19;47;85
-#: View/GalaxyClusters/ajax/index.ctp:83
-#: View/GalaxyElements/ajax/index.ctp:56
-#: View/Noticelists/view.ctp:42
-#: View/Objects/add.ctp:127;245
-#: View/Objects/group_attributes_into_object.ctp:58
-#: View/Objects/revise_object.ctp:55
-#: View/Objects/ajax/quickAddAttributeForm.ctp:78
-#: 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/UserSettings/index.ctp:68
-#: View/Users/admin_filter_user_index.ctp:71
-msgid "Value"
-msgstr ""
-
-#: View/CorrelationExclusions/index.ctp:14
-msgid "Add correlation exclusion entry"
-msgstr ""
-
-#: View/CorrelationExclusions/index.ctp:71
-msgid "Correlation Exclusions Index"
-msgstr ""
-
-#: View/CorrelationExclusions/index.ctp:72
-msgid "A list of values to exclude from the correlation engine."
-msgstr ""
-
-#: View/CorrelationExclusions/index.ctp:82
-msgid "Delete correlation exclusion entry"
-msgstr ""
-
 #: View/Dashboards/add.ctp:17
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:21
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
 msgid "Add Widget"
 msgstr ""
 
@@ -8584,21 +6717,15 @@ msgstr ""
 
 #: View/Dashboards/list_templates.ctp:52
 #: View/Dashboards/save_template.ctp:52
-#: View/SharingGroups/view.ctp:11
+#: View/SharingGroups/view.ctp:12
 msgid "Selectable"
 msgstr ""
 
 #: View/Dashboards/list_templates.ctp:58
 #: View/Dashboards/save_template.ctp:59
-#: View/Elements/GalaxyClusters/relations_graph.ctp:428
-#: View/EventReports/index.ctp:22
-#: View/EventReports/ajax/indexForEvent.ctp:56
-#: View/GalaxyClusterRelations/index.ctp:45
-#: View/GalaxyClusters/view.ctp:46
-#: View/GalaxyClusters/view_relations.ctp:13
-#: View/GalaxyClusters/ajax/index.ctp:24;120
-#: View/Jobs/index.ctp:64
-#: View/Roles/index.ctp:9;19
+#: View/Jobs/index.ctp:71
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
 msgid "Default"
 msgstr ""
 
@@ -8700,16 +6827,16 @@ msgstr ""
 #: View/Elements/templateElements/templateRowAttribute.ctp:30
 #: View/Elements/templateElements/templateRowFile.ctp:30
 #: View/Events/resolved_attributes.ctp:47
-#: View/Events/resolved_misp_format.ctp:141;336
+#: View/Events/resolved_misp_format.ctp:90;285
 #: View/Events/show_i_o_c_results.ctp:11
-#: View/Feeds/freetext_index.ctp:27
-#: View/Objects/add.ctp:126
+#: View/Feeds/freetext_index.ctp:31
+#: View/Objects/add.ctp:114
 #: View/Objects/group_attributes_into_object.ctp:57
 #: View/Objects/propose_objects_from_attributes.ctp:16
-#: View/Objects/revise_object.ctp:53
+#: View/Objects/revise_object.ctp:63
 #: 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:80
+#: View/ShadowAttributes/index.ctp:65
 #: 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
@@ -8720,7 +6847,7 @@ msgstr ""
 
 #: View/DecayingModel/decaying_tool.ctp:25
 #: View/DecayingModel/view.ctp:3
-#: View/Logs/admin_index.ctp:68
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr ""
@@ -8745,6 +6872,33 @@ msgstr ""
 msgid "Model's Settings"
 msgstr ""
 
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Elements/eventdiscussion.ctp:89;97
+#: View/Elements/Events/eventIndexTable.ctp:231
+#: View/Elements/Events/View/row_attribute.ctp:413
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Users/userIndexTable.ctp:90
+#: View/EventBlacklists/edit.ctp:37
+#: View/EventBlacklists/index.ctp:69
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:285
+#: View/News/index.ctp:22
+#: View/OrgBlacklists/edit.ctp:30
+#: View/OrgBlacklists/index.ctp:36
+#: View/Organisations/index.ctp:138
+#: View/Pages/doc/using_the_system.ctp:191
+#: View/Regexp/admin_index.ctp:34
+#: View/Roles/admin_edit.ctp:56
+#: View/Roles/admin_index.ctp:89
+#: View/Servers/index.ctp:182
+#: View/SharingGroups/index.ctp:88
+#: View/Tags/edit.ctp:36
+#: View/Tags/index.ctp:124
+#: View/Templates/edit.ctp:49
+#: View/Whitelists/admin_index.ctp:31
+msgid "Edit"
+msgstr ""
+
 #: View/DecayingModel/decaying_tool.ctp:137
 #: View/Templates/add.ctp:49
 msgid "Create"
@@ -8779,7 +6933,7 @@ msgid "Default basescore"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_basescore.ctp:13
-#: View/Taxonomies/index.ctp:3
+#: View/Taxonomies/index.ctp:2
 msgid "Taxonomies"
 msgstr ""
 
@@ -8787,68 +6941,98 @@ msgstr ""
 msgid "Weight"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:49
-msgid "Numerical value overriden by userSetting.&#10;Original numerical_value = %s"
-msgstr ""
-
-#: View/DecayingModel/decaying_tool_basescore.ctp:100
+#: View/DecayingModel/decaying_tool_basescore.ctp:91
 msgid "Excluded"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:121
+#: View/DecayingModel/decaying_tool_basescore.ctp:112
 msgid "Placeholder for `Organisation source confidence`"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:124
+#: View/DecayingModel/decaying_tool_basescore.ctp:115
 msgid "Example"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:150;155;160
+#: View/DecayingModel/decaying_tool_basescore.ctp:141;146;151
 msgid "Pick a Taxonomy"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:166
+#: View/DecayingModel/decaying_tool_basescore.ctp:157
 msgid "Computation steps"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:169
+#: View/DecayingModel/decaying_tool_basescore.ctp:160
 msgid "Apply base score"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_rest_search.ctp:26
-#: View/Elements/GalaxyClusters/relations_graph.ctp:447
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:13
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:48
-#: View/Events/resolved_misp_format.ctp:142;337
+#: View/Events/resolved_misp_format.ctp:91;286
 #: View/Events/show_i_o_c_results.ctp:12
-#: View/Feeds/freetext_index.ctp:28
+#: View/Feeds/freetext_index.ctp:32
 #: View/Feeds/search_caches.ctp:41
 #: View/Inbox/index.ctp:25
-#: View/Objects/add.ctp:244
-#: View/Objects/revise_object.ctp:54
+#: View/Objects/revise_object.ctp:64
 #: 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:86
+#: View/ShadowAttributes/index.ctp:53;68
 #: View/SharingGroups/add.ctp:70
 #: View/SharingGroups/edit.ctp:70
-#: View/Sightings/ajax/list_sightings.ctp:11
+#: 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:38
-#: View/Warninglists/index.ctp:71
 #: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr ""
 
+#: View/DecayingModel/decaying_tool_rest_search.ctp:27
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+#: 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/resolved_misp_format.ctp:92;287
+#: View/Events/show_i_o_c_results.ctp:13
+#: View/Feeds/freetext_index.ctp:33
+#: View/GalaxyClusters/ajax/index.ctp:37
+#: View/Noticelists/view.ctp:42
+#: View/Objects/add.ctp:115
+#: View/Objects/group_attributes_into_object.ctp:58
+#: View/Objects/revise_object.ctp:65
+#: View/Objects/ajax/quickAddAttributeForm.ctp:78
+#: 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/UserSettings/index.ctp:68
+#: View/Users/admin_filter_user_index.ctp:71
+msgid "Value"
+msgstr ""
+
 #: View/DecayingModel/decaying_tool_rest_search.ctp:29
 msgid "Event Tags"
 msgstr ""
 
+#: View/DecayingModel/decaying_tool_rest_search.ctp:31
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/resolved_misp_format.ctp:97;292
+#: View/Inbox/index.ctp:36
+#: View/ObjectReferences/ajax/add.ctp:30
+#: View/Objects/add.ctp:67;119
+#: View/Objects/group_attributes_into_object.ctp:30
+#: View/Objects/revise_object.ctp:49;67
+#: View/Pages/doc/using_the_system.ctp:234;284
+#: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
+msgid "Comment"
+msgstr ""
+
 #: View/DecayingModel/decaying_tool_rest_search.ctp:35
-#: View/Elements/eventattribute.ctp:156
+#: View/Elements/eventattribute.ctp:179
 msgid "Score"
 msgstr ""
 
@@ -8862,8 +7046,7 @@ msgid "Decaying Model RestSearch"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_simulation.ctp:45
-#: View/Elements/genericElements/ListTopBar/group_search.ctp:23
-#: View/Events/automation.ctp:38
+#: View/Events/automation.ctp:24
 #: View/Logs/admin_index.ctp:20;21
 #: View/Logs/admin_search.ctp:25
 msgid "Search"
@@ -8923,8 +7106,6 @@ msgstr ""
 
 #: View/DecayingModel/import.ctp:10
 #: View/Feeds/import_feeds.ctp:10
-#: View/Galaxies/import.ctp:17
-#: View/GalaxyElements/ajax/flattenJson.ctp:11
 #: View/Servers/import.ctp:10
 #: View/TagCollections/import.ctp:10
 msgid "JSON"
@@ -8935,129 +7116,141 @@ msgid "Model JSON"
 msgstr ""
 
 #: View/DecayingModel/import.ctp:18
-#: View/Galaxies/import.ctp:23
 msgid "JSON file"
 msgstr ""
 
+#: View/DecayingModel/import.ctp:25
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:15
+#: View/Elements/genericElements/org_picker.ctp:17
+#: View/EventBlacklists/add.ctp:36
+#: View/Events/filter_event_index.ctp:125
+#: View/Feeds/add.ctp:220
+#: View/Feeds/import_feeds.ctp:20
+#: View/OrgBlacklists/add.ctp:29
+#: View/Regexp/admin_add.ctp:32
+#: View/Regexp/admin_edit.ctp:42
+#: View/Roles/admin_add.ctp:57
+#: View/Servers/import.ctp:20
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:20
+#: View/Tags/add.ctp:35
+#: View/Users/admin_filter_user_index.ctp:62
+#: View/Whitelists/admin_add.ctp:13
+msgid "Add"
+msgstr ""
+
 #: View/DecayingModel/index.ctp:2
 msgid "Decaying Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:23;24
+#: View/DecayingModel/index.ctp:30;31
 msgid "All Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:34
+#: View/DecayingModel/index.ctp:41
 msgid "My models only"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:35
+#: View/DecayingModel/index.ctp:42
 msgid "My Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:46
+#: View/DecayingModel/index.ctp:53
 msgid "Models available to everyone"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:47
+#: View/DecayingModel/index.ctp:54
 msgid "Shared Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:58
+#: View/DecayingModel/index.ctp:65
 msgid "Default models only"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:59
+#: View/DecayingModel/index.ctp:66
 msgid "Default Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:79
+#: View/DecayingModel/index.ctp:86
 #: View/Pages/doc/using_the_system.ctp:398
 msgid "Organization"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:80
+#: View/DecayingModel/index.ctp:87
 msgid "Usable to everyone"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:84
+#: View/DecayingModel/index.ctp:91
 #: View/DecayingModel/view.ctp:40
 msgid "Parameters"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:85
+#: View/DecayingModel/index.ctp:92
 msgid "Pretty print"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:88
+#: View/DecayingModel/index.ctp:95
 #: View/DecayingModel/view.ctp:35
 msgid "Formula"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:89
+#: View/DecayingModel/index.ctp:96
 msgid "# Assigned Types"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:90
+#: View/DecayingModel/index.ctp:97
 #: View/DecayingModel/view.ctp:25
-#: View/Elements/GalaxyClusters/relations_graph.ctp:439
-#: View/Elements/genericElements/IndexTable/Fields/galaxy_cluster_link.ctp:27
 #: View/Galaxies/view.ctp:10
-#: View/GalaxyClusters/view.ctp:47
 #: View/ObjectTemplates/view.ctp:7
-#: View/Taxonomies/index.ctp:54
-#: View/Taxonomies/view.ctp:17
-#: View/Warninglists/index.ctp:61
+#: View/Taxonomies/view.ctp:19
 #: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:91
+#: View/DecayingModel/index.ctp:98
 #: View/DecayingModel/view.ctp:31
-#: View/Events/view.ctp:304
+#: View/Events/view.ctp:310
 #: View/Feeds/index.ctp:91
 #: View/Feeds/view.ctp:63
-#: View/Noticelists/index.ctp:56
-#: View/ObjectTemplates/index.ctp:28
+#: View/Noticelists/index.ctp:63
+#: View/ObjectTemplates/index.ctp:35
 #: View/Sightingdb/index.ctp:19
-#: View/Taxonomies/index.ctp:17;60
-#: View/Taxonomies/view.ctp:18
-#: View/Warninglists/index.ctp:25;89
+#: View/Taxonomies/view.ctp:24
 #: View/Warninglists/view.ctp:16
 msgid "Enabled"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:107
+#: View/DecayingModel/index.ctp:114
 #: View/DecayingModel/view.ctp:18
 msgid "Default Model from MISP Project"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:130
+#: View/DecayingModel/index.ctp:137
 msgid "Download model"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:135
+#: View/DecayingModel/index.ctp:142
 msgid "Are you sure you want to delete DecayingModel #"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:141
+#: View/DecayingModel/index.ctp:148
 msgid "Are you sure you want to disable DecayingModel #"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:143
+#: View/DecayingModel/index.ctp:150
 msgid "Are you sure you want to enable DecayingModel #"
 msgstr ""
 
 #: View/DecayingModel/view.ctp:5
-#: View/Elements/Events/eventIndexTable.ctp:22
-#: View/Events/view.ctp:61
+#: View/Events/view.ctp:86
 msgid "Creator org"
 msgstr ""
 
 #: View/DecayingModel/view.ctp:27
 #: View/SharingGroups/add.ctp:93
 #: View/SharingGroups/edit.ctp:101
-#: View/SharingGroups/view.ctp:73
+#: View/SharingGroups/view.ctp:69
 #: View/TagCollections/index.ctp:12
 msgid "All orgs"
 msgstr ""
@@ -9084,8 +7277,9 @@ msgstr ""
 
 #: View/Elements/ajaxAttributeTags.ctp:29
 #: View/Elements/ajaxTagCollectionTags.ctp:16
-#: View/Elements/ajaxTags.ctp:92
+#: View/Elements/ajaxTags.ctp:104
 #: View/Elements/ajaxTemplateTag.ctp:10
+#: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr ""
 
@@ -9096,103 +7290,116 @@ msgstr ""
 msgid "Add tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:10
-msgid "Missing taxonomies: <span class=\"red bold\">%s</span><br>"
-msgstr ""
-
-#: View/Elements/ajaxTags.ctp:60;61
+#: View/Elements/ajaxTags.ctp:73;74
 msgid "Local tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:60;61
+#: View/Elements/ajaxTags.ctp:73;74
 msgid "Global tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:95
+#: View/Elements/ajaxTags.ctp:107
 msgid "Remove tag %s"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:110;111
-#: View/Elements/galaxyQuickView.ctp:123
-#: View/Elements/galaxyQuickViewMini.ctp:99
+#: View/Elements/ajaxTags.ctp:123;124
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 #: View/Templates/add.ctp:28
 #: View/Templates/edit.ctp:28
 msgid "Add a tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:127;128
-#: View/Elements/galaxyQuickView.ctp:136
-#: View/Elements/galaxyQuickViewMini.ctp:112
+#: View/Elements/ajaxTags.ctp:141;142
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
 msgid "Add a local tag"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:49;51;213;215
+#: View/Elements/eventattribute.ctp:67;69;254;256
 #: View/Elements/Feeds/eventattribute.ctp:28;31;95;98
-#: View/Elements/Servers/eventattribute.ctp:25;28;89;92
+#: View/Elements/Servers/eventattribute.ctp:28;31;95;98
 msgid "view all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:113
+#: View/Elements/eventattribute.ctp:132
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/EventBlocklists/index.ctp:40
+#: View/EventBlacklists/index.ctp:47
 msgid "Select all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:113
+#: View/Elements/eventattribute.ctp:132
 msgid "Select all attributes/proposals on current page"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:119
+#: View/Elements/eventattribute.ctp:138
 #: View/Elements/Feeds/eventattribute.ctp:42
-#: View/Elements/Servers/eventattribute.ctp:39
-#: View/Objects/revise_object.ctp:13
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:52
 msgid "First seen"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:119
+#: View/Elements/eventattribute.ctp:138
 #: View/Elements/Feeds/eventattribute.ctp:42
-#: View/Elements/Servers/eventattribute.ctp:39
-#: View/Objects/revise_object.ctp:14
+#: View/Elements/Servers/eventattribute.ctp:42
+#: View/Objects/revise_object.ctp:56
 msgid "Last seen"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:122
-#: View/Elements/eventdiscussion.ctp:138
-#: View/EventReports/view.ctp:6
-#: View/Events/view.ctp:212;223
+#: View/Elements/eventattribute.ctp:143
+#: View/Elements/eventdiscussion.ctp:143
+#: View/Events/view.ctp:219;230
 #: 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:48
 msgid "Event"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:131
+#: View/Elements/eventattribute.ctp:154
 #: View/Elements/eventattributetoolbar.ctp:201
 msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:148
+#: View/Elements/eventattribute.ctp:171
 #: View/Elements/eventattributetoolbar.ctp:185
 msgid "SightingDB"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:155
+#: View/Elements/eventattribute.ctp:178
 msgid "Decaying Score"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:198
+#: View/Elements/eventattribute.ctp:227
 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:202
+#: View/Elements/eventattribute.ctp:231
 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:205
+#: View/Galaxies/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:16
+#: View/Jobs/index.ctp:13;65
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_add.ctp:17
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+#: View/UserSettings/index.ctp:41
+msgid "All"
+msgstr ""
+
 #: View/Elements/eventattributetoolbar.ctp:15
 msgid "Only show %s related attributes"
 msgstr ""
@@ -9202,7 +7409,7 @@ msgid "Only show proposals"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:25
-#: View/Logs/event_index.ctp:37
+#: View/Logs/event_index.ctp:44
 msgid "Proposal"
 msgstr ""
 
@@ -9211,7 +7418,7 @@ msgid "Only show correlating attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:33
-#: View/Events/view.ctp:300
+#: View/Events/view.ctp:306
 msgid "Correlation"
 msgstr ""
 
@@ -9220,9 +7427,8 @@ msgid "Only show potentially false positive attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:41
-#: View/Elements/healthElements/db_indexes_diagnostic.ctp:73
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:74;80;246
-#: View/Elements/healthElements/diagnostics.ctp:138
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr ""
@@ -9293,10 +7499,6 @@ msgid "Include deleted attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:166
-#: View/EventReports/index.ctp:27
-#: View/EventReports/view.ctp:28
-#: View/EventReports/ajax/indexForEvent.ctp:61
-#: View/GalaxyClusters/ajax/index.ctp:43
 msgid "Deleted"
 msgstr ""
 
@@ -9337,97 +7539,84 @@ msgid "%s active rule(s)"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:235
-#: View/EventReports/index.ctp:38
-#: View/Events/index.ctp:60
-#: View/Galaxies/index.ctp:15
-#: View/Logs/admin_index.ctp:55
-#: View/Servers/preview_index.ctp:53
-#: View/SharingGroups/index.ctp:41
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
 msgid "Remove filters"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:2
-#: View/Events/view.ctp:525
-msgid "Discussion"
-msgstr ""
-
-#: View/Elements/eventdiscussion.ctp:32
+#: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:34
-msgid "Top"
-msgstr ""
-
-#: View/Elements/eventdiscussion.ctp:48
+#: View/Elements/eventdiscussion.ctp:52
 msgid "Deactivated user"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:69
-msgid "Message edited at %s"
+#: View/Elements/eventdiscussion.ctp:73
+msgid "Message edited at "
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:79
+#: View/Elements/eventdiscussion.ctp:83
 msgid "User "
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:86;94
+#: View/Elements/eventdiscussion.ctp:90;98
 msgid "Are you sure you want to delete this post?"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:89;96
+#: View/Elements/eventdiscussion.ctp:93;100
 msgid "Reply"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:137
+#: View/Elements/eventdiscussion.ctp:142
 #: View/Posts/add.ctp:32
 msgid "Insert a quote - just paste your quote between the [quote][/quote] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:137
-#: View/Elements/markdownEditor/markdownEditor.ctp:130
+#: View/Elements/eventdiscussion.ctp:142
 #: View/Posts/add.ctp:32
 msgid "Quote"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:138
-#: View/Posts/add.ctp:33
+#: View/Elements/eventdiscussion.ctp:143
 msgid "Insert a link to an event - just enter the event ID between the [event][/event] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:139
+#: View/Elements/eventdiscussion.ctp:144
 #: 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:139
+#: View/Elements/eventdiscussion.ctp:144
 #: View/Posts/add.ctp:34
 msgid "Thread"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:140
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Insert a link [link][/link] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:140
+#: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:35
 msgid "Link"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:141
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Insert a code [code][/code] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:141
-#: View/Elements/markdownEditor/markdownEditor.ctp:131
+#: View/Elements/eventdiscussion.ctp:146
 #: View/Posts/add.ctp:36
 msgid "Code"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:152
-msgid "Send comment"
+#: View/Elements/eventdiscussion.ctp:157
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
+msgid "Send"
 msgstr ""
 
 #: View/Elements/flashErrorMessage.ctp:2
@@ -9435,7 +7624,6 @@ msgid "Errors"
 msgstr ""
 
 #: View/Elements/flashErrorMessage.ctp:5
-#: View/Elements/GalaxyClusters/clusterElementUI.ctp:34
 #: View/Jobs/ajax/error.ctp:34
 msgid "Close"
 msgstr ""
@@ -9448,203 +7636,199 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: View/Elements/footer.ctp:19
-msgid "Could not locate the PGP public key."
+#: View/Elements/footer.ctp:17
+msgid "Could not locate the GnuPG public key."
 msgstr ""
 
 #: View/Elements/footer.ctp:24
-msgid "S/MIME certificate"
+msgid "Could not locate SMIME certificate."
 msgstr ""
 
-#: View/Elements/footer.ctp:26
-msgid "Could not locate S/MIME certificate."
-msgstr ""
-
-#: View/Elements/form_seen_input.ctp:52
+#: View/Elements/form_seen_input.ctp:53
 msgid "First seen date"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:56
+#: View/Elements/form_seen_input.ctp:57
 msgid "Last seen date"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:62
+#: View/Elements/form_seen_input.ctp:63
 msgid "First seen time"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:63;68
+#: View/Elements/form_seen_input.ctp:64;69
 msgid "Expected format: HH:MM:SS.ssssss+TT:TT"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:67
+#: View/Elements/form_seen_input.ctp:68
 msgid "Last seen time"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:77
-#: View/Elements/galaxyQuickViewMini.ctp:63
+#: View/Elements/galaxyQuickView.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:79
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:78
-#: View/Elements/galaxyQuickViewMini.ctp:64
+#: View/Elements/galaxyQuickView.ctp:77
+#: View/Elements/galaxyQuickViewMini.ctp:80
 msgid "View cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:84;85
-#: View/Elements/galaxyQuickViewMini.ctp:70;71
+#: View/Elements/galaxyQuickView.ctp:83;84
+#: View/Elements/galaxyQuickViewMini.ctp:86;87
 msgid "View all events containing this cluster."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:98
+#: View/Elements/galaxyQuickView.ctp:97
 msgid "detach"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:99
+#: View/Elements/galaxyQuickView.ctp:98
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:115
+#: View/Elements/galaxyQuickView.ctp:114
 msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:116
+#: View/Elements/galaxyQuickView.ctp:115
 msgid "View galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:123
-#: View/Elements/galaxyQuickViewMini.ctp:99
+#: View/Elements/galaxyQuickView.ctp:122
+#: View/Elements/galaxyQuickViewMini.ctp:115
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:136
-#: View/Elements/galaxyQuickViewMini.ctp:112
+#: View/Elements/galaxyQuickView.ctp:135
+#: View/Elements/galaxyQuickViewMini.ctp:128
 msgid "Add new local cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:84
+#: View/Elements/galaxyQuickViewMini.ctp:100
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:217
+#: View/Elements/generic_picker.ctp:187
 msgid "No item picked"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:248
+#: View/Elements/generic_picker.ctp:209
 msgid "Due to the large number of options, no contextual information is provided."
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:316
+#: View/Elements/generic_picker.ctp:277
 msgid "Nothing to pick"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:13
+#: View/Elements/global_menu.ctp:7
 msgid "Home"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:17
+#: View/Elements/global_menu.ctp:11
 #: View/Pages/doc/general.ctp:20
 msgid "Event Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:20
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:278;323
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:283;329
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:274;318
 #: View/Events/add.ctp:7
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:351
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:33
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:356
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:342
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:37
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:330
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:45
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:372
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:49
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:377
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:54
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:383
+#: View/Elements/global_menu.ctp:47
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
 msgid "View delegation requests"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:61
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1074
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:65
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:291
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
 msgid "List Tag Collections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:69
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1079
+#: View/Elements/global_menu.ctp:61
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:74
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1107
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:78
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:82
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1142
+#: View/Elements/global_menu.ctp:74
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:90
+#: View/Elements/global_menu.ctp:82
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:389
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
 #: 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:94
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
-#: View/Events/automation.ctp:5
+#: View/Elements/global_menu.ctp:86
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+#: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
@@ -9652,37 +7836,17 @@ msgstr ""
 msgid "Automation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:106;426
-msgid "Blocklist Event"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:113;431
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:409;999
-msgid "Manage Event Blocklists"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:123
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:609
-#: View/Users/dashboard.ctp:2
-msgid "Dashboard"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:132
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1301;1423;1467
+#: View/Elements/global_menu.ctp:98
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:136
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1313;1479
-msgid "List Relationships"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:143
+#: View/Elements/global_menu.ctp:105
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:146;151
+#: View/Elements/global_menu.ctp:108;113
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -9691,98 +7855,107 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:166
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:507
+#: View/Elements/global_menu.ctp:118;123
+#: 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:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:170
+#: View/Elements/global_menu.ctp:132
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:174
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:490
-msgid "List Correlation Exclusions"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:182
+#: View/Elements/global_menu.ctp:139
 #: View/Pages/doc/general.ctp:22;54
 msgid "Global Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:185
+#: View/Elements/global_menu.ctp:143
 #: 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:189
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:595
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:193
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:600
+#: View/Elements/global_menu.ctp:151
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
 msgid "My Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:197
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:605;904
+#: View/Elements/global_menu.ctp:155
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
 msgid "Set Setting"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:206
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:628
+#: View/Elements/global_menu.ctp:159
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
+#: View/Users/dashboard.ctp:2
+msgid "Dashboard"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:168
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:213
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1494
+#: View/Elements/global_menu.ctp:175
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:220
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:224
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
+#: View/Elements/global_menu.ctp:186
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:232
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1185
+#: View/Elements/global_menu.ctp:194
 msgid "Decaying Models Tool"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:237
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1191
+#: View/Elements/global_menu.ctp:199
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
 msgid "List Decaying Models"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:244
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:658
+#: View/Elements/global_menu.ctp:206
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
 #: 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:248
+#: View/Elements/global_menu.ctp:210
 msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:252
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:662
+#: View/Elements/global_menu.ctp:214
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
 msgid "Terms & Conditions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:256
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:666
+#: View/Elements/global_menu.ctp:218
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -9796,65 +7969,61 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:263
+#: View/Elements/global_menu.ctp:225
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:267
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:274
+#: View/Elements/global_menu.ctp:236
 #: View/Pages/doc/general.ctp:23;66
 msgid "Sync Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:278
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:674
+#: View/Elements/global_menu.ctp:240
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
 msgid "Create Sync Config"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:283
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
+#: View/Elements/global_menu.ctp:245
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
 msgid "Import Server Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
+#: View/Elements/global_menu.ctp:250
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:293
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1212
+#: View/Elements/global_menu.ctp:255
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:298
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1216
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "Search Feed Caches"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:303
+#: View/Elements/global_menu.ctp:265
 msgid "List SightingDB Connections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:308
+#: View/Elements/global_menu.ctp:270
 msgid "Add SightingDB Connection"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:313
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+#: View/Elements/global_menu.ctp:275
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
 msgid "List Communities"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:318
-msgid "Cerebrates"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:331
+#: View/Elements/global_menu.ctp:283
 #: View/Pages/doc/administration.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
@@ -9864,122 +8033,113 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:336
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
+#: View/Elements/global_menu.ctp:288
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:340
-msgid "List Auth Keys"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:344
+#: View/Elements/global_menu.ctp:292
 msgid "List User Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:348
+#: View/Elements/global_menu.ctp:296
 #: View/UserSettings/set_setting.ctp:5
 msgid "Set User Setting"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:352
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Elements/global_menu.ctp:300
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
 msgid "Add User"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:357
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
+#: View/Elements/global_menu.ctp:304
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:361
+#: View/Elements/global_menu.ctp:308
 msgid "User Registrations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:369
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:615;947
+#: View/Elements/global_menu.ctp:315
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:373
+#: View/Elements/global_menu.ctp:319
 msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:381
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:959
+#: View/Elements/global_menu.ctp:326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:385
+#: View/Elements/global_menu.ctp:330
 msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:394
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:965
+#: View/Elements/global_menu.ctp:338
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:403
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:976
+#: View/Elements/global_menu.ctp:347
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:412
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:982
+#: View/Elements/global_menu.ctp:356
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
 #: 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:417
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
-msgid "Event Block Rules"
+#: View/Elements/global_menu.ctp:365
+msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:440
-msgid "Blocklist Organisation"
+#: View/Elements/global_menu.ctp:370
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
+msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:445
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1011
-msgid "Manage Org Blocklists"
+#: View/Elements/global_menu.ctp:379
+msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:453
+#: View/Elements/global_menu.ctp:384
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
+msgid "Manage Org Blacklists"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:392
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:457
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1020
+#: View/Elements/global_menu.ctp:396
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:461
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1024
+#: View/Elements/global_menu.ctp:400
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:474;475
-msgid "Set the current page as your home page in MISP"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:495
-#: View/Elements/dashboard/dashboard_notifications.ctp:2
-msgid "Notifications"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:501
+#: View/Elements/global_menu.ctp:436
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -10002,8 +8162,9 @@ msgstr ""
 
 #: View/Elements/view_event_distribution_graph.ctp:9
 #: View/Elements/view_timeline.ctp:23
-#: View/Layouts/dashboard.ctp:93
-#: View/Layouts/default.ctp:89
+#: View/Layouts/dashboard.ctp:94
+#: View/Layouts/default.ctp:93
+#: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
 
@@ -10034,9 +8195,9 @@ msgid "Display"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Events/index.ctp:53
+#: View/Events/index.ctp:58
 #: View/Pages/doc/using_the_system.ctp:197
-#: View/Servers/preview_index.ctp:46
+#: View/Servers/preview_index.ctp:50
 msgid "Filters"
 msgstr ""
 
@@ -10050,12 +8211,11 @@ msgstr ""
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: View/Elements/view_galaxy_matrix.ctp:88
-#: View/Elements/Events/View/value_field.ctp:116;160
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr ""
 
-#: View/Elements/view_galaxy_matrix.ctp:127
+#: View/Elements/view_galaxy_matrix.ctp:129
 msgid "(%s items)"
 msgstr ""
 
@@ -10064,8 +8224,8 @@ msgid "Time scope"
 msgstr ""
 
 #: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
-#: View/Feeds/index.ctp:191
-#: View/Taxonomies/view.ctp:63
+#: View/Feeds/index.ctp:190
+#: View/Taxonomies/view.ctp:83
 msgid "Tag"
 msgstr ""
 
@@ -10094,105 +8254,13 @@ msgstr ""
 msgid "Pick an Attribute"
 msgstr ""
 
-#: View/Elements/EventReports/reportEditor.ctp:6
-msgid "invalid scope or id"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:3
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:24
-msgid "No html support, typographer & autolinker"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:4
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:25
-msgid "An additional syntax to reference MISP Elements"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:10
-#: View/EventReports/view.ctp:59
-#: View/EventReports/view_summary.ctp:22
-msgid "Markdown format"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:11
-msgid "The suported markdown format is similar to %s with some differences:"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:18
-msgid "Markdown extended format"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:19
-msgid "In order to have a visually pleasant report but more importantly, avoid hardcoding element's value or ID, MISP elements such as attributes and objects can be referenced with the following special syntax"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:23
-msgid "Where:"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:25
-msgid "Is the scope to which the UUID is related to."
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:27
-msgid "Can be one of the following: %s"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:29
-msgid "Is the UUID of the MISP element with only one exception for the tag"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:31;48;59;71
-msgid "Examples:"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:38
-msgid "Pictures from attachment-type attributes"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:39
-msgid "Syntax for pictures is like the syntax for referencing MISP elements but with two differences:"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:41
-msgid "The addition of the %s character to indicate that the picture should be displayed and not the atttribute"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:42
-msgid "The scope is fixed to %s as only attributes can contain a file"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:54
-msgid "Syntax for representing tags is similar the syntax for referencing MISP elements but with two differences:"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:56;68
-msgid "The scope is fixed to %s"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:57
-msgid "The UUID is replaced by the tag name sa tags don't have UUID"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:65
-msgid "Event's Galaxy matrixes"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:66
-msgid "Syntax for embedding the ATT&CK matrix or any other galaxy matrixes is similar to the syntax for referencing MISP elements:"
-msgstr ""
-
-#: View/Elements/EventReports/reportHelpModal.ctp:69
-msgid "The matrix will be generated for the whole event for which the report is linked to"
-msgstr ""
-
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/EventBlocklists/index.ctp:40
+#: View/EventBlacklists/index.ctp:47
 msgid "Select all events on current page"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:27
-#: View/Events/view.ctp:71
+#: View/Events/view.ctp:96
 msgid "Owner org"
 msgstr ""
 
@@ -10238,159 +8306,167 @@ msgid "#Posts"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:53
-#: View/Events/view.ctp:95
-msgid "Creator user"
+#: View/Events/proposal_event_index.ctp:27
+#: View/Events/view.ctp:122
+#: View/Jobs/index.ctp:77
+#: 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_index.ctp:63
+#: View/Users/admin_view.ctp:8
+#: View/Users/registrations.ctp:61
+#: View/Users/view.ctp:4
+msgid "Email"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:79;223
-#: View/Elements/Users/userIndexTable.ctp:98
+#: View/Elements/Events/eventIndexTable.ctp:82;86;237
+#: 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:39;43
-#: View/Feeds/preview_index.ctp:69
-#: View/Noticelists/index.ctp:59
-#: View/ObjectTemplates/index.ctp:114
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:121
 #: View/Organisations/index.ctp:143
 #: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/index.ctp:96
-#: View/Servers/preview_index.ctp:170
-#: View/Users/admin_index.ctp:229
+#: View/Servers/index.ctp:103
+#: View/Servers/preview_index.ctp:174
+#: View/SharingGroups/index.ctp:91
+#: View/Taxonomies/index.ctp:49
+#: View/Warninglists/index.ctp:60
 msgid "View"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:145
+#: View/Elements/Events/eventIndexTable.ctp:157
 msgid " correlation(s). Show filtered event with correlation only."
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:161;166
+#: View/Elements/Events/eventIndexTable.ctp:175;180
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:171
+#: View/Elements/Events/eventIndexTable.ctp:185
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:212
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
 msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:212
+#: View/Elements/Events/eventIndexTable.ctp:226
 #: 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:213
+#: View/Elements/Events/eventIndexTable.ctp:227
 msgid "Not published"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:251
-msgid "Are you sure you want to delete #"
+#: View/Elements/Events/eventIndexTable.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
+#: View/Servers/index.ctp:183
+msgid "Are you sure you want to delete # %s?"
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:17
-msgid "Show %s more..."
+msgid "Show "
+msgstr ""
+
+#: View/Elements/Events/View/attribute_correlations.ctp:17
+msgid " more..."
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:53
-#: View/Events/view.ctp:391
+#: View/Events/view.ctp:399
 #: View/Feeds/preview_event.ctp:88
-#: View/Servers/preview_event.ctp:89
+#: View/Servers/preview_event.ctp:116
 msgid "Collapse…"
 msgstr ""
 
-#: View/Elements/Events/View/eventSightingValue.ctp:21
+#: View/Elements/Events/View/eventSightingValue.ctp:14
 msgid "- restricted to own organisation only."
 msgstr ""
 
-#: View/Elements/Events/View/eventSightingValue.ctp:24;25
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
 msgid "Advanced Sightings"
 msgstr ""
 
-#: View/Elements/Events/View/related_event.ctp:27
-msgid "This related event contains %s unique correlation"
-msgid_plural "This related event contains %s unique correlations"
-msgstr[0] ""
-msgstr[1] ""
+#: View/Elements/Events/View/related_event.ctp:26
+msgid "This related event contains %s unique correlation(s)"
+msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:59
+#: View/Elements/Events/View/row_attribute.ctp:43
 msgid "Select attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:131
-msgid "Show hover enrichment"
+#: View/Elements/Events/View/row_attribute.ctp:155
+#: View/Elements/Events/View/row_proposal.ctp:113
+#: View/Elements/Feeds/View/row_attribute.ctp:63
+#: View/Elements/Servers/View/row_attribute.ctp:70
+msgid "warning"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:185;186
+#: View/Elements/Events/View/row_attribute.ctp:199;200
 #: View/Events/ajax/toggle_correlation.ctp:20
 msgid "Toggle correlation"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:216
-#: View/Events/view.ctp:410
-#: View/Feeds/add.ctp:26
-#: View/Feeds/index.ctp:120
-#: View/Feeds/view.ctp:31
-msgid "Provider"
-msgstr ""
-
-#: View/Elements/Events/View/row_attribute.ctp:219
-msgid "Event UUIDs"
-msgstr ""
-
-#: View/Elements/Events/View/row_attribute.ctp:307
+#: View/Elements/Events/View/row_attribute.ctp:326
 msgid "Toggle IDS flag"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:353
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Restore attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:354;394
+#: View/Elements/Events/View/row_attribute.ctp:377;417
 msgid "Permanently delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:361
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:361
+#: View/Elements/Events/View/row_attribute.ctp:384
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:366
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:366
+#: View/Elements/Events/View/row_attribute.ctp:389
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:370
+#: View/Elements/Events/View/row_attribute.ctp:393
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:371
+#: View/Elements/Events/View/row_attribute.ctp:394
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:381;386
+#: View/Elements/Events/View/row_attribute.ctp:404;409
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:386
+#: View/Elements/Events/View/row_attribute.ctp:409
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:398
+#: View/Elements/Events/View/row_attribute.ctp:421
 msgid "Soft-delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:57
-msgid "Object name: "
+#: View/Elements/Events/View/row_object.ctp:68
+#: View/Elements/Feeds/View/row_object.ctp:19
+#: View/Events/resolved_misp_format.ctp:113
+msgid "Name: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:58
+#: View/Elements/Events/View/row_object.ctp:69
 #: 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:20
@@ -10399,29 +8475,29 @@ msgstr ""
 #: View/Elements/Servers/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object_reference.ctp:7
 #: View/Elements/Servers/View/row_object_referenced_by.ctp:7
-#: View/Events/resolved_misp_format.ctp:165;186
+#: View/Events/resolved_misp_format.ctp:114;135
 msgid "Expand or Collapse"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:62
+#: View/Elements/Events/View/row_object.ctp:73
 msgid "Meta-category: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:63
+#: View/Elements/Events/View/row_object.ctp:74
 #: View/Elements/Feeds/View/row_object.ctp:24
 msgid "Description: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:64
+#: View/Elements/Events/View/row_object.ctp:75
 #: View/Elements/Feeds/View/row_object.ctp:25
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:129;139
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:129
+#: View/Elements/Events/View/row_object.ctp:139
 msgid "Soft delete object"
 msgstr ""
 
@@ -10431,7 +8507,7 @@ msgstr ""
 
 #: View/Elements/Events/View/row_object_reference.ctp:1
 #: View/Elements/Feeds/View/row_object_reference.ctp:1
-#: View/Events/resolved_misp_format.ctp:181
+#: View/Events/resolved_misp_format.ctp:130
 msgid "References: "
 msgstr ""
 
@@ -10440,7 +8516,7 @@ msgstr ""
 msgid "Add reference"
 msgstr ""
 
-#: View/Elements/Events/View/row_object_reference.ctp:50
+#: View/Elements/Events/View/row_object_reference.ctp:51
 msgid "Delete object reference"
 msgstr ""
 
@@ -10449,83 +8525,58 @@ msgstr ""
 msgid "Referenced by: "
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:40
+#: View/Elements/Events/View/row_proposal.ctp:41
 msgid "Select proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:172
-#: View/Elements/Events/View/row_proposal_delete.ctp:76
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept Proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:172
-#: View/Elements/Events/View/row_proposal_delete.ctp:76
+#: View/Elements/Events/View/row_proposal.ctp:194
+#: View/Elements/Events/View/row_proposal_delete.ctp:80
 msgid "Accept proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:177
-#: View/Elements/Events/View/row_proposal_delete.ctp:81
+#: View/Elements/Events/View/row_proposal.ctp:199
+#: View/Elements/Events/View/row_proposal_delete.ctp:85
 msgid "Discard proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal_delete.ctp:52
-msgid "DELETE"
-msgstr ""
-
-#: View/Elements/Events/View/sighting_field.ctp:30
+#: 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:31
+#: View/Elements/Events/View/sighting_field.ctp:13
 msgid "Mark as false-positive"
 msgstr ""
 
-#: View/Elements/Events/View/sighting_field.ctp:32
+#: View/Elements/Events/View/sighting_field.ctp:14
 msgid "Advanced sightings"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:51
-msgid "This file was not checked by AV scan. Do you really want to download it?"
-msgstr ""
-
-#: View/Elements/Events/View/value_field.ctp:53
-msgid "According to AV scan, this file contains %s malware. Do you really want to download it?"
-msgstr ""
-
-#: View/Elements/Events/View/value_field.ctp:69
-msgid "This file contains malware %s"
-msgstr ""
-
-#: View/Elements/Events/View/value_field.ctp:83
-msgid "Show more information about this vulnerability in external tool"
-msgstr ""
-
-#: View/Elements/Events/View/value_field.ctp:94
-msgid "Show more information about this weakness in external tool"
-msgstr ""
-
-#: View/Elements/Events/View/value_field.ctp:103
+#: View/Elements/Events/View/value_field.ctp:52
 msgid "Cortex object"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:124
+#: View/Elements/Events/View/value_field.ctp:68
 msgid "Hexadecimal representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:125
+#: View/Elements/Events/View/value_field.ctp:69
 msgid "Switch to binary representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:168
-msgid "Warning, this doesn't seem to be a legitimate %s value"
+#: View/Elements/Events/View/value_field.ctp:96
+msgid "Warning, this doesn't seem to be a legitimate "
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:176
-#: View/Elements/Feeds/View/row_attribute.ctp:59
-msgid "warning"
+#: View/Elements/Events/View/value_field.ctp:96
+msgid " value"
 msgstr ""
 
 #: View/Elements/Feeds/View/feed_overlap_tool.ctp:9
@@ -10548,86 +8599,14 @@ msgstr ""
 msgid "Check coverage"
 msgstr ""
 
-#: View/Elements/Feeds/View/row_object.ctp:19
-#: View/Events/resolved_misp_format.ctp:164
-msgid "Name: "
-msgstr ""
-
 #: View/Elements/Feeds/View/row_object.ctp:23
 #: View/Elements/Servers/View/row_object.ctp:23
-#: View/ObjectTemplates/index.ctp:62
+#: View/ObjectTemplates/index.ctp:69
 #: View/ObjectTemplates/view.ctp:8
-#: View/Objects/revise_object.ctp:10
+#: View/Objects/revise_object.ctp:31
 msgid "Meta-category"
 msgstr ""
 
-#: View/Elements/GalaxyClusters/clusterElementUI.ctp:3
-msgid "Toggle Cluster Elements UI"
-msgstr ""
-
-#: View/Elements/GalaxyClusters/clusterElementUI.ctp:10
-msgid "Edit Cluster's Elements"
-msgstr ""
-
-#: View/Elements/GalaxyClusters/clusterElementUI.ctp:30
-msgid "Add Element"
-msgstr ""
-
-#: View/Elements/GalaxyClusters/clusterElementUI.ctp:33
-msgid "Save changes"
-msgstr ""
-
-#: View/Elements/GalaxyClusters/relations_graph.ctp:45
-msgid "This galaxy does not have any relationships."
-msgstr ""
-
-#: View/Elements/GalaxyClusters/relations_graph.ctp:426
-#: View/Events/view.ctp:504
-msgid "Galaxy"
-msgstr ""
-
-#: View/Elements/GalaxyClusters/relations_graph.ctp:431;432
-msgid "Owner Org."
-msgstr ""
-
-#: View/Elements/GalaxyClusters/relations_graph.ctp:435;436
-msgid "Creator Org."
-msgstr ""
-
-#: View/Elements/GalaxyClusters/relations_graph.ctp:438
-msgid "Tag name"
-msgstr ""
-
-#: View/Elements/GalaxyClusters/relations_graph.ctp:445
-#: View/Feeds/index.ctp:133
-#: View/GalaxyClusters/view.ctp:51
-#: View/Pages/doc/using_the_system.ctp:145
-#: View/Sightings/ajax/list_sightings.ctp:12
-#: View/Users/statistics_sightings.ctp:9
-msgid "Source"
-msgstr ""
-
-#: View/Elements/GalaxyClusters/relations_graph.ctp:446
-#: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:150
-#: View/Users/admin_filter_user_index.ctp:70
-msgid "Target"
-msgstr ""
-
-#: View/Elements/GalaxyClusters/relations_graph.ctp:460
-msgid "Numerical value: "
-msgstr ""
-
-#: View/Elements/GalaxyClusters/relations_graph.ctp:470
-msgid "Average value"
-msgstr ""
-
-#: View/Elements/Objects/object_add_attributes.ctp:40
-#: View/Elements/healthElements/diagnostics.ctp:208
-#: View/Taxonomies/index.ctp:67
-msgid "Required"
-msgstr ""
-
 #: View/Elements/Objects/object_similarities.ctp:76
 msgid "Update template and merge"
 msgstr ""
@@ -10672,36 +8651,40 @@ msgstr ""
 msgid "-- Select an option --"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:28;92
+#: View/Elements/Servers/eventattribute.ctp:31;98
 msgid "all"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:50
 #: View/Elements/templateElements/templateRowAttribute.ctp:82
 #: View/Events/resolved_attributes.ctp:49
-#: View/Events/resolved_misp_format.ctp:146;341
-#: View/Feeds/freetext_index.ctp:30
-#: View/Objects/add.ctp:128
+#: View/Events/resolved_misp_format.ctp:95;290
+#: View/Feeds/freetext_index.ctp:34
+#: View/Objects/add.ctp:116
 #: View/Pages/doc/using_the_system.ctp:236;285
 #: View/Templates/populate_event_from_template_attributes.ctp:10
 msgid "IDS"
 msgstr ""
 
-#: View/Elements/Servers/View/row_attribute.ctp:76
-#: View/Elements/Users/userIndexTable.ctp:70;71;74
+#: View/Elements/Servers/Module/type.ctp:11
+#: View/Elements/healthElements/diagnostics.ctp:367
+#: View/Pages/doc/administration.ctp:56;228
+#: View/Servers/ajax/submoduleStatus.ctp:6
+msgid "Status"
+msgstr ""
+
+#: View/Elements/Servers/View/row_attribute.ctp:95
+#: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/genericElements/key.ctp:2
-#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:6
-#: View/Elements/healthElements/diagnostics.ctp:400
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:295;302;309;330;337
+#: View/Events/automation.ctp:243;250;257;278;285
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
-#: View/Events/view.ctp:184
-#: View/GalaxyClusters/view.ctp:56
-#: View/Servers/preview_event.ctp:47
-#: View/Taxonomies/view.ctp:97;108;153
-#: View/Users/view.ctp:105;110
+#: View/Events/view.ctp:191
+#: View/GalaxyClusters/view.ctp:12
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:95
 msgid "N/A"
 msgstr ""
 
@@ -10721,64 +8704,46 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
+#: View/Elements/TagCollections/index_row.ctp:45
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
+
 #: View/Elements/TagCollections/index_row.ctp:51;52
 msgid "Download configuration"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
+#: View/Roles/view.ctp:24
 #: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_edit.ctp:62
-#: View/Users/admin_index.ctp:75
-#: View/Users/view.ctp:17
+#: View/Users/admin_edit.ctp:54
+#: View/Users/admin_index.ctp:56
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr ""
 
-#: View/Elements/Users/userIndexTable.ctp:10
-#: View/Users/admin_index.ctp:95
-msgid "Event alert"
-msgstr ""
-
-#: View/Elements/Users/userIndexTable.ctp:11
-#: View/Users/admin_index.ctp:102
-msgid "Contact alert"
-msgstr ""
-
-#: View/Elements/Users/userIndexTable.ctp:12
-#: View/Users/admin_index.ctp:109
-msgid "PGP Key"
-msgstr ""
-
 #: View/Elements/Users/userIndexTable.ctp:16
-#: View/Users/admin_add.ctp:62
-#: View/Users/admin_edit.ctp:65
-#: View/Users/admin_index.ctp:124
-#: View/Users/edit.ctp:21
-msgid "NIDS SID"
-msgstr ""
-
-#: View/Elements/Users/userIndexTable.ctp:17
-#: View/Users/admin_edit.ctp:81
-#: View/Users/view.ctp:76
-msgid "Terms accepted"
-msgstr ""
-
-#: View/Elements/Users/userIndexTable.ctp:18
 msgid "Last login"
 msgstr ""
 
-#: View/Elements/Users/userIndexTable.ctp:47
-#: View/Elements/genericElements/IndexTable/Fields/generic_field.ctp:26
-#: View/Users/view.ctp:32
-msgid "Reveal hidden value"
+#: View/Elements/Users/userIndexTable.ctp:17
+#: View/Pages/doc/administration.ctp:183
+#: View/Pages/doc/using_the_system.ctp:272
+#: View/ShadowAttributes/index.ctp:71
+#: View/Users/admin_index.ctp:125
+msgid "Created"
 msgstr ""
 
-#: View/Elements/Users/userIndexTable.ctp:92
-#: View/Users/admin_index.ctp:186
+#: View/Elements/Users/userIndexTable.ctp:88
+#: View/Users/admin_index.ctp:169
 msgid "Create new credentials and inform user"
 msgstr ""
 
-#: View/Elements/Users/userIndexTable.ctp:95
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -10795,10 +8760,14 @@ msgid "Events published: "
 msgstr ""
 
 #: View/Elements/dashboard/dashboard_events.ctp:7
-#: View/Servers/index.ctp:100
+#: View/Servers/index.ctp:107
 msgid "Reset"
 msgstr ""
 
+#: View/Elements/dashboard/dashboard_notifications.ctp:2
+msgid "Notifications"
+msgstr ""
+
 #: View/Elements/dashboard/dashboard_notifications.ctp:4
 msgid "Proposals: "
 msgstr ""
@@ -10819,112 +8788,29 @@ msgstr ""
 msgid "Remove widget"
 msgstr ""
 
-#: View/Elements/dashboard/Widgets/Achievements.ctp:16
-msgid "Achievements Unlocked!"
-msgstr ""
-
-#: View/Elements/dashboard/Widgets/Achievements.ctp:18
-msgid "You don't have any achievement yet. Check them below to get started!"
-msgstr ""
-
-#: View/Elements/dashboard/Widgets/Achievements.ctp:29
-msgid "Next on your list:"
-msgstr ""
-
-#: View/Elements/dashboard/Widgets/Achievements.ctp:31
-msgid "Well done! You got them all."
-msgstr ""
-
-#: View/Elements/dashboard/Widgets/Achievements.ctp:39
-msgid "Read more here"
-msgstr ""
-
 #: View/Elements/dashboard/Widgets/BarChart.ctp:38
 msgid "No data."
 msgstr ""
 
-#: View/Elements/genericElements/Form/genericForm.ctp:65
-#: View/GalaxyClusters/view_relations.ctp:106;119
-msgid "Picker"
-msgstr ""
-
-#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:21
-msgid "Are you sure you want to delete %s %s (%s)?"
-msgstr ""
-
-#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:24
-msgid "%s a %s propagates the deletion to other instances and lets you restore it in the future"
-msgstr ""
-
-#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:24
-#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:6
-msgid "Soft-deleting"
-msgstr ""
-
-#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:25
-msgid "%s a %s permanentaly deletes it"
-msgstr ""
-
-#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:25
-#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:7
-msgid "Hard-deleting"
-msgstr ""
-
-#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:37
-#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:15
-msgid "Soft-delete"
-msgstr ""
-
-#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:43
-#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:21
-msgid "Hard-delete"
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/pagination_links.ctp:5
-msgid "first"
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/pagination_links.ctp:33
-msgid "last"
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/action_toggle.ctp:34
-#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:41
-msgid "Could not retrieve current state."
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/action_toggle.ctp:46
-#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:54
-msgid "Field updated."
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/action_toggle.ctp:49
-#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:57
-msgid "Could not update field."
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:63
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
 #: View/Feeds/add.ctp:213
 #: View/Feeds/edit.ctp:213
 msgid "Filter rules"
 msgstr ""
 
-#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:65
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
 #: View/Feeds/view.ctp:55
-#: View/Servers/index.ctp:113;114
+#: View/Servers/index.ctp:120;121
 msgid "Rules"
 msgstr ""
 
-#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:7
-msgid "Not applicable"
-msgstr ""
-
 #: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
+#: View/Servers/index.ctp:141
 msgid "Age: "
 msgstr ""
 
 #: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
-#: View/Servers/index.ctp:142
+#: View/Servers/index.ctp:149
 msgid "Not cached"
 msgstr ""
 
@@ -10932,56 +8818,6 @@ msgstr ""
 msgid "Cache feed"
 msgstr ""
 
-#: View/Elements/genericElements/IndexTable/Fields/checkbox_action.ctp:11
-msgid "%s toggle"
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:17
-#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:17
-msgid "Indefinite"
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:20
-#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:20
-msgid "Expired at %s"
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:21
-#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:21
-msgid "Expired"
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:25
-#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:25
-msgid "Will expire in %s day"
-msgid_plural "Will expire in %s days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: View/Elements/genericElements/IndexTable/Fields/galaxy_cluster_link.ctp:34
-msgid "Target galaxy cluster not found."
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/galaxy_cluster_link.ctp:35
-msgid "Unkown cluster"
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/in_out_counts.ctp:3;10
-msgid "This %s %s %s other %s"
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/remote_status.ctp:9
-msgid "Object does not exist locally."
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/remote_status.ctp:14
-msgid "Object exists locally."
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/remote_status.ctp:18
-msgid "Object exists locally, but the following fields contain different information on the remote: %s"
-msgstr ""
-
 #: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
 #: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
 msgid "click here"
@@ -11011,618 +8847,538 @@ msgstr ""
 msgid "Feed not enabled"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:17
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
 msgid "View Dashboard"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:29
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
 msgid "Import Config JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:37
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:32
 msgid "Export Config JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:45
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
 msgid "Save Dashboard Config"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
 msgid "List Dashboard Templates"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:70;147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
 msgid "Populate From Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:75
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
 msgid "Enrichment Module Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:81
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
 msgid "Freetext Import Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:88
-#: View/ShadowAttributes/index.ctp:106
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
 msgid "View Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:93;1099;1399;1440
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
 msgid "View Correlation Graph"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:98
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
 msgid "View Event History"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:105
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
 #: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:109
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
 msgid "Delete Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:110
-msgid "Are you sure you want to delete event #%s?"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:119
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
 msgid "Add Object"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
 msgid "Add Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:133;424;425
-#: View/EventReports/ajax/indexForEvent.ctp:19
-msgid "Add Event Report"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
+msgid "Populate from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:141
-msgid "Populate from…"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:155
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:160
-msgid "Merge attributes from…"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
+msgid "Merge attributes from..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:167
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
 msgid "Propose Attribute"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish (no email)"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:200
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Unpublish"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:209
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
 msgid "Publish Sightings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:219
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
 msgid "Delegate Publishing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 msgid "Discard Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:246
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Publish event to ZMQ"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:257
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:258
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:265
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
 msgid "Contact Reporter"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:273;365
-msgid "Download as…"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
+msgid "Download as..."
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:296;301
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:308
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
 msgid "Export Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:314
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
 msgid "Import Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
 msgid "Import from…"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:404;994
-msgid "Blocklists Event"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:419
-msgid "List Event Reports"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:436
-msgid "View Event Report"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
-msgid "Edit Event Report"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:453
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
 msgid "List Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:458
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
 msgid "New Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
 msgid "Perform on existing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:463
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
 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:470
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:407
 msgid "Edit Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
 msgid "Delete Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:475;564;741;870;941
-#: View/Servers/index.ctp:178
-msgid "Are you sure you want to delete #%s?"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:484
-msgid "View Correlation Exclusion"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:495
-msgid "Add Correlation Exclusion"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
 msgid "View Warninglist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
 msgid "Update Warninglists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
 msgid "Are you sure you want to update all warninglists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:523
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:441
 msgid "View Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:529
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
 msgid "List Noticelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:534
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
 msgid "Update Noticelists"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:535
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
 msgid "Do you wish to continue and update all noticelists?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:547
-msgid "List Allowedlist"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+msgid "List Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:552
-msgid "New Allowedlist"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
+msgid "New Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:559
-msgid "Edit Allowedlist"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:474
+msgid "Edit Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
-msgid "Delete Allowedlist"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
+msgid "Delete Whitelist"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:574
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:580;586
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
 #: 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:622;936
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:499;697
+msgid "Reset Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
 msgid "View Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:634
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
 #: View/SharingGroups/edit.ctp:3
-#: View/SharingGroups/index.ctp:146
 msgid "Edit Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:639
-#: View/SharingGroups/index.ctp:135
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
 msgid "View Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:690;723
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
 msgid "Explore Remote Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:699
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
 msgid "Explore Remote Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:711;1271
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
 msgid "Fetch This Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:712;1272
-#: View/Feeds/preview_index.ctp:68
-#: View/Servers/preview_index.ctp:169
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
+#: 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:731
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
 #: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:753
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
 msgid "New Servers"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
 msgid "View community"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
 msgid "Request E-mail"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:795
-msgid "List Cerebrates"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:803
-msgid "View Cerebrate"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:810
-msgid "Edit Cerebrate"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:829
-#: View/Events/restore_deleted_events.ctp:48
-msgid "Restore Deleted Events"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:836
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
 msgid "View User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:844
-msgid "Reset Password"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:850
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
 msgid "Edit User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:855
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
 msgid "Delete User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:856
-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/genericElements/SideMenu/side_menu.ctp:864
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:869
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
 msgid "Delete Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:892
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
 msgid "Pending registrations"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
 msgid "User settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
 msgid "Add Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:923
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:940
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
 msgid "Delete Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:953
-#: View/Roles/admin_add.ctp:69
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
+#: View/Roles/admin_add.ctp:4
 msgid "Add Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1006
-msgid "Blocklists Organisation"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
+msgid "Inbox"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1033;1047
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
+msgid "Blacklists Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+msgid "Blacklists Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
 msgid "View Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1038
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1052
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
 msgid "List Threads"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 msgid "New Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1070
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "List Favourite Tags"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1085
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1093;1112
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
 msgid "View Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1121
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
 msgid "Delete Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1129
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "Update Taxonomies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1149
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
 msgid "View Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1155
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
 msgid "Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
 msgid "Force Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1176
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
 msgid "Import Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1181
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
 msgid "Add Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1197
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
+msgid "Decaying Tool"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
 msgid "View Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1203
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
 msgid "Edit Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
 msgid "Add Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1226
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
 msgid "Import Feeds from JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1232
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1237
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
 msgid "Export Feed settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1245
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
 msgid "Edit Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1250
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
 msgid "PreviewIndex"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1262
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
 msgid "PreviewEvent"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1281
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
 msgid "View News"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1286
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1307;1473
-msgid "List Cluster Blocklists"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1320
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
 msgid "Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1321
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1326
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
 msgid "Force Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1327
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1334
-msgid "Import Galaxy Clusters"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1341
-msgid "Export Galaxy Clusters"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1349;1408;1429
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
 msgid "View Galaxy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1355;1435
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "View Cluster"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1362
-msgid "Edit Cluster"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1369;1414
-msgid "Add Cluster"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1375
-msgid "Fork Cluster"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1390
-msgid "Unpublish Cluster"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1390;1457
-msgid "Publish Cluster"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1486
-msgid "Add Relationship"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1499
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
 msgid "Update Objects"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1505
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
 msgid "View Object Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1513
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
 #: View/Sightingdb/add.ctp:6
 msgid "Add SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1521
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
 msgid "Edit SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1526
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
 msgid "List SightingDB connections"
 msgstr ""
 
-#: View/Elements/genericElements/SingleViews/single_view.ctp:91
-msgid "%s view"
-msgstr ""
-
-#: View/Elements/genericElements/SingleViews/Fields/alignmentField.ctp:58
-msgid "Add organisation"
-msgstr ""
-
-#: View/Elements/genericElements/SingleViews/Fields/alignmentField.ctp:58
-msgid "Add individual"
+#: View/Elements/genericElements/SideMenu/side_menu_post_link.ctp:26
+#: View/Errors/error403.ctp:4
+msgid "%s"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:4
@@ -11634,7 +9390,6 @@ msgid "Index diagnostic:"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:12
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:63
 msgid "Notice"
 msgstr ""
 
@@ -11642,111 +9397,93 @@ msgstr ""
 msgid "The highlighted issues may be benign. if you are unsure, please open an issue and ask for clarification."
 msgstr ""
 
-#: View/Elements/healthElements/db_indexes_diagnostic.ctp:47;48
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:47
 msgid "Fix Database Index Schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_indexes_diagnostic.ctp:73
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:246
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
 msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:64
-msgid "An update is currently in progress."
-msgstr ""
-
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:65
-msgid "You can check the current progress %s."
-msgstr ""
-
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:65
-#: View/Events/automation.ctp:30
-#: View/Users/admin_index.ctp:6
-msgid "here"
-msgstr ""
-
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:69
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:62
 msgid "The current database schema does not match the expected format."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:70;141
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
 msgid "Database schema diagnostic: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:75;81
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:68;74
 msgid "The MISP database state does not match the expected schema. Resolving these issues is recommended."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:76;82
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:69;75
 msgid "⚠ This diagnostic tool is in experimental state - the highlighted issues may be benign. If you are unsure, please open an issue on with the issues identified over at https://github.com/MISP/MISP for clarification."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:86
-msgid "Debug mode: Reveal benign deltas"
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:79
+msgid "Reveal benign deltas"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:87
-msgid "Most of the time, these benign deltas are artifacts coming from a different database version or RDBMS system used by this instance and thus, can be ignored."
-msgstr ""
-
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
 msgid "Table name"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
 msgid "Expected schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
 msgid "Actual schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:127;128
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
 msgid "Fix Database schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:140
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
 msgid "The current database is correct"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
 msgid "Expected DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:155
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
 msgid "The current database version matches the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:156;161
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
 msgid "Actual DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:160
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
 msgid "The current database version does not match the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:168
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
 msgid "Updates are locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;172
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
 msgid "Updates are not locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:171
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 #: View/Servers/update_progress.ctp:32
 msgid "Updates are locked due to to many update fails"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:171
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
 msgid "Updates unlocked in %s"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:177;178
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
 msgid "DataSource: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:215
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
 msgid "Column diagnostic"
 msgstr ""
 
@@ -11776,524 +9513,447 @@ msgid "Outdated version"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:30
-msgid "Could not retrieve version from GitHub"
+msgid "Could not retrieve version from github"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:39
-msgid "Unable to fetch current commit ID, check apache user read privilege."
+#: View/Elements/healthElements/diagnostics.ctp:40
+msgid "Unable to fetch current commit id, check apache user read privilege."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:44
+#: View/Elements/healthElements/diagnostics.ctp:45
 msgid "Latest available version…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:49
+#: View/Elements/healthElements/diagnostics.ctp:52
 msgid "Status…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:52
+#: View/Elements/healthElements/diagnostics.ctp:59
 msgid "Current branch…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:57
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "You are not on a branch, Update MISP will fail"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:61
-msgid "Pull the latest MISP version from GitHub"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:61
-msgid "Update MISP"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:62
-msgid "Click the following button to go to the update progress page. This page lists all updates that are currently queued and executed."
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:62
-msgid "View Update Progress"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:64
-msgid "Submodules version"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:65
-msgid "Refresh submodules version."
+#: View/Elements/healthElements/diagnostics.ctp:68
+msgid "Pull the latest MISP version from github"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:68
-msgid "Load all JSON into the database."
+msgid "Update MISP"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:69
-msgid "Load JSON into database"
+msgid "Click the following button to go to the update progress page. This page lists all updates that are currently queued and executed."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:69
+msgid "View Update Progress"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:71
+msgid "Submodules version"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:72
+msgid "Refresh submodules version."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:75
+msgid "Load all JSON into the database."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:76
+msgid "Load JSON into database"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:79
 msgid "Writeable Directories and files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:73
+#: View/Elements/healthElements/diagnostics.ctp:80
 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:74
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Directories"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:81
+#: View/Elements/healthElements/diagnostics.ctp:88
 msgid "Directory "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:89
+#: View/Elements/healthElements/diagnostics.ctp:96
 msgid "Writeable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:96;110
+#: View/Elements/healthElements/diagnostics.ctp:103;117
 msgid "File "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:103
+#: View/Elements/healthElements/diagnostics.ctp:110
 msgid "Readable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:118
-msgid "Security Audit"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:120
-msgid "Congratulation, your instance pass all security checks."
-msgstr ""
-
 #: View/Elements/healthElements/diagnostics.ctp:125
-msgid "Area"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:126
-msgid "Level"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:127
-#: View/EventDelegations/index.ctp:82
-#: View/Events/automation.ctp:331;338
-#: 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/Elements/healthElements/diagnostics.ctp:140
-msgid "Hint"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:143
-msgid "More info"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:150
 msgid "PHP Settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:153;165
+#: View/Elements/healthElements/diagnostics.ctp:128;140
 msgid "Up to date"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:161
+#: View/Elements/healthElements/diagnostics.ctp:134
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
+msgid "Unknown"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:136
 msgid "Issues determining version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:168;181
+#: View/Elements/healthElements/diagnostics.ctp:143;152
 msgid "Update highly recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:171;184
+#: View/Elements/healthElements/diagnostics.ctp:146;155
 msgid "Version unsupported, update ASAP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:176
-msgid "Version unsupported, 8.x support not available yet."
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:188
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP ini path"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:160
 msgid "PHP Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189;190
+#: View/Elements/healthElements/diagnostics.ctp:160;161
 msgid "recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:190
+#: View/Elements/healthElements/diagnostics.ctp:161
 msgid "PHP CLI Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:191
+#: View/Elements/healthElements/diagnostics.ctp:162
 msgid "Please note that the support for Python versions below 3.6 and below PHP 7.2 has been dropped as of 2020-01-01 and are henceforth considered unsupported. More info: "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:192
+#: View/Elements/healthElements/diagnostics.ctp:163
 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:199
+#: View/Elements/healthElements/diagnostics.ctp:170
 #: 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:203
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "PHP Extensions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:207
-msgid "Extension"
+#: View/Elements/healthElements/diagnostics.ctp:184
+msgid "Not loaded"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:209
-msgid "Why to install"
+#: View/Elements/healthElements/diagnostics.ctp:189
+msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:210
-msgid "Web"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:211
-msgid "CLI"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:229
-msgid "Version %s installed, but required at least %s"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:248
-#: View/Elements/markdownEditor/markdownEditor.ctp:132
+#: View/Elements/healthElements/diagnostics.ctp:206
 msgid "Table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:253
+#: View/Elements/healthElements/diagnostics.ctp:211
 msgid "Used"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:259
+#: View/Elements/healthElements/diagnostics.ctp:217
 msgid "Reclaimable"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:265
+#: View/Elements/healthElements/diagnostics.ctp:223
 msgid "SQL database status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:266
+#: View/Elements/healthElements/diagnostics.ctp:224
 msgid "Size of each individual table on disk, along with the size that can be freed via SQL optimize. Make sure that you always have at least 3x the size of the largest table in free space in order for the update scripts to work as expected."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:271
+#: View/Elements/healthElements/diagnostics.ctp:229
 msgid "Schema status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:288
+#: View/Elements/healthElements/diagnostics.ctp:246
 msgid "Redis info"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:290
+#: View/Elements/healthElements/diagnostics.ctp:248
 msgid "PHP extension version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:290
+#: View/Elements/healthElements/diagnostics.ctp:248
 msgid "Not installed."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:292
+#: View/Elements/healthElements/diagnostics.ctp:250
 msgid "Redis version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:293
+#: View/Elements/healthElements/diagnostics.ctp:251
 msgid "Memory allocator"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:294
+#: View/Elements/healthElements/diagnostics.ctp:252
 msgid "Memory usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:295
+#: View/Elements/healthElements/diagnostics.ctp:253
 msgid "Peak memory usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:296
+#: View/Elements/healthElements/diagnostics.ctp:254
 msgid "Total system memory"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:301
+#: View/Elements/healthElements/diagnostics.ctp:259
 msgid "Advanced attachment handler"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:302
+#: View/Elements/healthElements/diagnostics.ctp:260
 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:307
+#: View/Elements/healthElements/diagnostics.ctp:265
 msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:307
+#: View/Elements/healthElements/diagnostics.ctp:265
 msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:319
-msgid "Attachment scan module"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:325
-msgid "Not available."
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:329
+#: View/Elements/healthElements/diagnostics.ctp:277
 msgid "STIX and Cybox libraries"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:330
+#: View/Elements/healthElements/diagnostics.ctp:278
 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:331
+#: View/Elements/healthElements/diagnostics.ctp:279
 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:338
+#: View/Elements/healthElements/diagnostics.ctp:286
 msgid "Other versions might work but are not tested / recommended."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:347
+#: View/Elements/healthElements/diagnostics.ctp:295
 msgid "STIX and CyBox"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:347
+#: View/Elements/healthElements/diagnostics.ctp:295
 msgid "Could not read test script (stixtest.py)."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:361
+#: View/Elements/healthElements/diagnostics.ctp:309
 msgid " library version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:378
+#: View/Elements/healthElements/diagnostics.ctp:326
 msgid "Yara"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:379
+#: View/Elements/healthElements/diagnostics.ctp:327
 msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:386
+#: View/Elements/healthElements/diagnostics.ctp:334
 msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:388
+#: View/Elements/healthElements/diagnostics.ctp:336
 msgid "plyara library installed"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:392
+#: View/Elements/healthElements/diagnostics.ctp:340
 msgid "GnuPG"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:393
+#: View/Elements/healthElements/diagnostics.ctp:341
 msgid "This tool tests whether your GnuPG is set up correctly or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:398
+#: View/Elements/healthElements/diagnostics.ctp:349
 msgid "GnuPG installation and settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:400
-msgid "GnuPG version: %s"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:404
+#: View/Elements/healthElements/diagnostics.ctp:352
 msgid "ZeroMQ"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:405
+#: View/Elements/healthElements/diagnostics.ctp:353
 msgid "This tool tests whether the ZeroMQ extension is installed and functional."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:413
+#: View/Elements/healthElements/diagnostics.ctp:361
 msgid "ZeroMQ settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:417
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:417
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:417
+#: View/Elements/healthElements/diagnostics.ctp:365
 msgid "Start"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:418
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:418
+#: View/Elements/healthElements/diagnostics.ctp:366
 msgid "Stop"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:419
+#: View/Elements/healthElements/diagnostics.ctp:367
 msgid "Check ZeroMQ service status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:421
+#: View/Elements/healthElements/diagnostics.ctp:369
 msgid "Proxy"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:422
+#: View/Elements/healthElements/diagnostics.ctp:370
 msgid "This tool tests whether your HTTP proxy settings are correct."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:430
+#: View/Elements/healthElements/diagnostics.ctp:378
 #: View/Pages/doc/administration.ctp:35
 msgid "Proxy settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:433
+#: View/Elements/healthElements/diagnostics.ctp:381
 msgid "Module System"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:434
+#: View/Elements/healthElements/diagnostics.ctp:382
 msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:449
+#: View/Elements/healthElements/diagnostics.ctp:397
 msgid " module system"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:455
+#: View/Elements/healthElements/diagnostics.ctp:403
 msgid "Session table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:456
+#: View/Elements/healthElements/diagnostics.ctp:404
 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:463
+#: View/Elements/healthElements/diagnostics.ctp:411
 msgid "Expired sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:469
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Purge sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:473
-msgid "Upgrade authkeys keys to the advanced keys format"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:476
-msgid "MISP can store the user API keys either in the clear directly attached to the users, or as of recently, it can generate a list of hashed keys for different purposes. If the latter feature is enabled, it might be useful to move all existing keys over to the new format so that users do not lose access to the system. In order to do so, run the following functionality."
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:478
-msgid "Update Authkeys to advanced Authkeys"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:480
+#: View/Elements/healthElements/diagnostics.ctp:421
 msgid "Clean model cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:481
+#: View/Elements/healthElements/diagnostics.ctp:422
 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:482
+#: View/Elements/healthElements/diagnostics.ctp:423
 msgid "Clean cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:486
+#: View/Elements/healthElements/diagnostics.ctp:427
 msgid "Check for deprecated function usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:487
+#: View/Elements/healthElements/diagnostics.ctp:428
 msgid "In an effort to identify the usage of deprecated functionalities, MISP has started aggregating the count of access requests to these endpoints. Check the frequency of their use below along with the users to potentially warn about better ways of achieving their goals."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:490;491;493
+#: View/Elements/healthElements/diagnostics.ctp:431;432;434
 msgid "View deprecated endpoint usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:497;500
+#: View/Elements/healthElements/diagnostics.ctp:438;441
 msgid "Orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:498
+#: View/Elements/healthElements/diagnostics.ctp:439
 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:500;514
+#: View/Elements/healthElements/diagnostics.ctp:441;455
 msgid "Run the test below"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:502
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attribute"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:502
+#: View/Elements/healthElements/diagnostics.ctp:443
 msgid "Check for orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:503
+#: View/Elements/healthElements/diagnostics.ctp:444
 msgid "Remove orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:504
+#: View/Elements/healthElements/diagnostics.ctp:445
 msgid "Remove published empty events"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:505;507
+#: View/Elements/healthElements/diagnostics.ctp:446;448
 #: View/Servers/ondemand_action.ctp:7
 msgid "Administrator On-demand Action"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:506
+#: View/Elements/healthElements/diagnostics.ctp:447
 msgid "Click the following button to go to the Administrator On-demand Action page."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:508;510
+#: View/Elements/healthElements/diagnostics.ctp:449;451
 msgid "Legacy Administrative Tools"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:509
+#: View/Elements/healthElements/diagnostics.ctp:450
 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:511
+#: View/Elements/healthElements/diagnostics.ctp:452
 msgid "Verify bad link on attachments"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:512
+#: View/Elements/healthElements/diagnostics.ctp:453
 msgid "Verify each attachment referenced in database is accessible on filesystem."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:514
+#: View/Elements/healthElements/diagnostics.ctp:455
 msgid "Non existing attachments referenced in Database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:516
+#: View/Elements/healthElements/diagnostics.ctp:457
 msgid "Check bad link on attachments"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:517;519
-msgid "Recover deleted events"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:518
-msgid "Due to a bug introduced after 2.4.129, users could occasionally accidentally and unknowingly trigger event deletions. Use the tool below to display any events deleted during the timeframe when the bug was active and optionally recover individual events if you believe they were removed in error."
-msgstr ""
-
 #: View/Elements/healthElements/files.ctp:2
 msgid "Below you will find a list of the uploaded files based on type."
 msgstr ""
@@ -12319,14 +9979,18 @@ msgid "Size"
 msgstr ""
 
 #: View/Elements/healthElements/files.ctp:32
-#: View/Roles/admin_add.ctp:16
+#: View/Roles/admin_add.ctp:15
 #: View/Roles/admin_edit.ctp:15
+#: View/Roles/admin_index.ctp:25
+#: View/Roles/index.ctp:24
 msgid "Permissions"
 msgstr ""
 
 #: View/Elements/healthElements/files.ctp:73
 #: View/Organisations/index.ctp:140
-#: View/Regexp/admin_index.ctp:28
+#: View/Regexp/admin_index.ctp:35
+#: View/Roles/admin_index.ctp:90
+#: View/SharingGroups/index.ctp:89
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
@@ -12475,6 +10139,16 @@ msgstr ""
 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/TagCollections/index.ctp:14
+#: View/UserSettings/index.ctp:56
+#: View/Users/admin_view.ctp:109
+#: View/Users/view.ctp:59
+msgid "User"
+msgstr ""
+
 #: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr ""
@@ -12519,205 +10193,6 @@ msgstr ""
 msgid "Restart dead workers"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:138
-msgid "Kill all workers"
-msgstr ""
-
-#: View/Elements/healthElements/workers.ctp:146
-msgid "Force kill all workers"
-msgstr ""
-
-#: View/Elements/healthElements/workers.ctp:151
-msgid "Are you sure you want to force kill all workers? This will issue a kill -9 and terminate any processing underway."
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:34
-msgid "Split Screen"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:39
-msgid "Markdown"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:43
-#: View/Galaxies/export.ctp:45
-msgid "Raw"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:50
-#: View/Objects/add.ctp:123
-msgid "Save"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:55
-msgid "Menu"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:67
-msgid "Download PDF (via print)"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:71
-msgid "Download Markdown"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:73
-msgid "Replace custom syntax by a valid one"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:75
-msgid "Download GFM simplified format"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:82
-msgid "Markdown parsing rules"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:87
-msgid "Image parsing"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:88;94
-#: View/Noticelists/index.ctp:29
-#: View/Pages/doc/using_the_system.ctp:371
-msgid "enabled"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:89;95
-#: View/Pages/doc/using_the_system.ctp:368
-msgid "disabled"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:93
-msgid "Link parsing"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:103
-msgid "Edit report"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:110
-msgid "Help"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:122
-msgid "Bold"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:123
-msgid "Italic"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:124
-msgid "Heading"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:125
-msgid "Strikethrough"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:127
-msgid "Unordered list"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:128
-msgid "Ordered list"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:141
-msgid "Last updated"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:143
-msgid "Toggle autocompletion while typing"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:149
-msgid "Synchronize scrolling"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:155
-msgid "Automatically render markdown when typing"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:161
-msgid "Toggle fullscreen mode"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:178
-msgid "You are about to save the document. Do you wish to proceed?"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:181
-msgid "In order to save the PDF, you have to set the print destination to `Save as PDF`."
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:182
-msgid "You are about to leave the page with unsaved changes. Do you want to proceed?"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditor.ctp:183
-msgid "Unsaved changes"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:27
-msgid "Command"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:27
-#: View/Events/recover_event.ctp:15
-#: View/Pages/doc/administration.ctp:133;184;197
-#: View/Pages/doc/using_the_system.ctp:269
-#: View/Servers/ondemand_action.ctp:3
-#: View/Servers/ajax/submoduleStatus.ctp:7
-#: View/Taxonomies/view.ctp:69
-msgid "Action"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:29
-msgid "Triggers autocomplete if applicable"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:30
-msgid "Makes text bold"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:31
-msgid "Makes text italic"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:32
-msgid "Insert a MISP Element"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:33
-msgid "Makes text as header"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:39;51
-msgid "Editor shortcuts"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:40
-msgid "Markdown plugin"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:59
-msgid "Markdown plugins"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:60
-msgid "Highlighted language"
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:61
-msgid "Languages rendered in code block can be highlighted using the %s plugin. The list of supported languages can be found %s."
-msgstr ""
-
-#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:71
-msgid "Markdown viewer help"
-msgstr ""
-
 #: View/Elements/serverRuleElements/pull.ctp:3
 msgid "Set pull rules"
 msgstr ""
@@ -12817,7 +10292,6 @@ msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:68
 #: View/Elements/serverRuleElements/push.ctp:67
-#: View/GalaxyClusters/update_cluster.ctp:112
 msgid "Update"
 msgstr ""
 
@@ -12859,6 +10333,10 @@ msgstr ""
 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
@@ -12870,8 +10348,8 @@ msgid "Template ID"
 msgstr ""
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:30
-#: View/SharingGroups/view.ctp:13
+#: View/Organisations/view.ctp:26
+#: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr ""
 
@@ -12891,7 +10369,7 @@ msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
 #: View/ObjectReferences/ajax/add.ctp:86
-#: View/Objects/revise_object.ctp:52
+#: View/Objects/revise_object.ctp:62
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
 msgid "Attribute"
@@ -12942,27 +10420,23 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: View/Errors/error400.ctp:25
+#: View/Errors/error400.ctp:33
 msgid "You have tripped the cross-site request forgery protection of MISP"
 msgstr ""
 
-#: View/Errors/error400.ctp:27
+#: View/Errors/error400.ctp:35
 msgid "CSRF error"
 msgstr ""
 
-#: View/Errors/error400.ctp:28
+#: 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:31
+#: View/Errors/error400.ctp:39
 msgid "Alternatively, click <a href=\"%s\">here</a> to continue to the start page."
 msgstr ""
 
-#: View/Errors/error403.ctp:5
-msgid "%s"
-msgstr ""
-
-#: View/Errors/missing_connection.ctp:2
+#: View/Errors/missing_connection.ctp:1
 #: View/Errors/missing_datasource_config.ctp:1
 msgid "Missing Database Connection"
 msgstr ""
@@ -12971,74 +10445,73 @@ msgstr ""
 msgid "PDO error"
 msgstr ""
 
-#: View/EventBlocklists/add.ctp:4
-msgid "Add Event Blocklist Entries"
+#: View/EventBlacklists/add.ctp:4
+msgid "Add Event Blacklist Entries"
 msgstr ""
 
-#: View/EventBlocklists/add.ctp:5
+#: View/EventBlacklists/add.ctp:5
 msgid "Simply paste a list of all the event UUIDs that you wish to block from being entered."
 msgstr ""
 
-#: View/EventBlocklists/add.ctp:9
-#: View/EventBlocklists/edit.ctp:9
-#: View/OrgBlocklists/add.ctp:10
-#: View/OrgBlocklists/edit.ctp:8
+#: View/EventBlacklists/add.ctp:9
+#: View/EventBlacklists/edit.ctp:9
+#: View/OrgBlacklists/add.ctp:9
+#: View/OrgBlacklists/edit.ctp:9
 msgid "UUIDs"
 msgstr ""
 
-#: View/EventBlocklists/add.ctp:12
-#: View/GalaxyClusterBlocklists/add.ctp:3
-#: View/OrgBlocklists/add.ctp:13
+#: View/EventBlacklists/add.ctp:12
+#: View/OrgBlacklists/add.ctp:12
 msgid "Enter a single or a list of UUIDs"
 msgstr ""
 
-#: View/EventBlocklists/add.ctp:18
-#: View/GalaxyClusterBlocklists/add.ctp:4
+#: View/EventBlacklists/add.ctp:18
 msgid "(Optional) The organisation that the event is associated with"
 msgstr ""
 
-#: View/EventBlocklists/add.ctp:25
+#: View/EventBlacklists/add.ctp:25
 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/EventBlocklists/add.ctp:31
-#: View/OrgBlocklists/add.ctp:25
+#: View/EventBlacklists/add.ctp:31
+#: View/OrgBlacklists/add.ctp:24
 msgid "(Optional) Any comments you would like to add regarding this (or these) entries."
 msgstr ""
 
-#: View/EventBlocklists/edit.ctp:4
-msgid "Edit Event Blocklist Entries"
+#: View/EventBlacklists/edit.ctp:4
+#: View/OrgBlacklists/edit.ctp:4
+msgid "Edit Event Blacklist Entries"
 msgstr ""
 
-#: View/EventBlocklists/edit.ctp:5
+#: View/EventBlacklists/edit.ctp:5
+#: View/OrgBlacklists/edit.ctp:5
 msgid "List of all the event UUIDs that you wish to block from being entered."
 msgstr ""
 
-#: View/EventBlocklists/edit.ctp:18
-#: View/GalaxyClusterBlocklists/add.ctp:26
-#: View/OrgBlocklists/edit.ctp:17
+#: View/EventBlacklists/edit.ctp:18
+#: View/OrgBlacklists/edit.ctp:18
 msgid "Creating organisation"
 msgstr ""
 
-#: View/EventBlocklists/index.ctp:2
-msgid "Event Blocklists"
+#: View/EventBlacklists/index.ctp:2
+msgid "Event Blacklists"
 msgstr ""
 
-#: View/EventBlocklists/index.ctp:44
-#: View/Events/resolved_misp_format.ctp:40
+#: View/EventBlacklists/index.ctp:51
+#: View/Events/resolved_misp_format.ctp:39
 msgid "Event UUID"
 msgstr ""
 
-#: View/EventBlocklists/index.ctp:63
-msgid "Are you sure you want to delete the blocklist entry for the event UUID %s?"
+#: View/EventBlacklists/index.ctp:70
+msgid "Are you sure you want to delete the blacklist entry for the event UUID %s?"
 msgstr ""
 
-#: View/EventBlocklists/mass_delete.ctp:10
-msgid "Delete blocklisted events"
+#: View/EventBlacklists/mass_delete.ctp:10
+msgid "Delete blacklisted events"
 msgstr ""
 
-#: View/EventBlocklists/mass_delete.ctp:12
-msgid "Are you sure you want to delete from the blocklist the selected events?"
+#: View/EventBlacklists/mass_delete.ctp:12
+msgid "Are you sure you want to delete from the blacklist the selected events?"
 msgstr ""
 
 #: View/EventDelegations/index.ctp:30
@@ -13058,11 +10531,21 @@ msgstr ""
 msgid "Recipient"
 msgstr ""
 
+#: View/EventDelegations/index.ctp:82
+#: View/Events/automation.ctp:279;286
+#: 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/EventDelegations/index.ctp:86
 msgid "Delegation index"
 msgstr ""
 
 #: View/EventDelegations/index.ctp:87
+#: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 
@@ -13140,7 +10623,13 @@ 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 ""
 
@@ -13149,6 +10638,11 @@ 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 ""
 
@@ -13168,135 +10662,16 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/EventReports/add.ctp:6
-msgid "Add Event Report for Event #%s"
-msgstr ""
-
-#: View/EventReports/add.ctp:6
-msgid "Edit Event Report %s (event #%s)"
-msgstr ""
-
-#: View/EventReports/index.ctp:44
-msgid "Event Reports %s"
-msgstr ""
-
-#: View/EventReports/index.ctp:44
-msgid "for Event %s"
-msgstr ""
-
-#: View/EventReports/index.ctp:60
-#: View/EventReports/ajax/indexForEvent.ctp:82
-#: View/Events/resolved_misp_format.ctp:36
-#: View/Events/view.ctp:23
-#: View/Servers/preview_event.ctp:3
-#: View/ShadowAttributes/index.ctp:40
-#: View/Sightings/ajax/list_sightings.ctp:13
-msgid "Event ID"
-msgstr ""
-
-#: View/EventReports/index.ctp:67
-#: View/EventReports/view.ctp:23
-#: View/EventReports/ajax/indexForEvent.ctp:90
-msgid "Last update"
-msgstr ""
-
-#: View/EventReports/index.ctp:115
-#: View/EventReports/ajax/indexForEvent.ctp:131
-msgid "Restore report"
-msgstr ""
-
-#: View/EventReports/index.ctp:120
-#: View/EventReports/ajax/indexForEvent.ctp:136
-msgid "Are you sure you want to restore the Report?"
-msgstr ""
-
-#: View/EventReports/view_summary.ctp:3
-msgid "Event report: %s"
-msgstr ""
-
-#: View/EventReports/ajax/delete.ctp:3
-msgid "Delete Event Report"
-msgstr ""
-
-#: View/EventReports/ajax/delete.ctp:4
-msgid "report"
-msgstr ""
-
-#: View/EventReports/ajax/extractAllFromReport.ctp:6
-msgid "Automatic entities extraction"
-msgstr ""
-
-#: View/EventReports/ajax/extractAllFromReport.ctp:7
-msgid "Automatically extracting entities from a report will use the freetext import tools to extract and create attributes from the report."
-msgstr ""
-
-#: View/EventReports/ajax/extractAllFromReport.ctp:10
-msgid "Post extraction actions:"
-msgstr ""
-
-#: View/EventReports/ajax/extractAllFromReport.ctp:12
-msgid "Tag the event with contextual elements found in the report"
-msgstr ""
-
-#: View/EventReports/ajax/importReportFromUrl.ctp:5
-msgid "Import from URL (event %s)"
-msgstr ""
-
-#: View/EventReports/ajax/importReportFromUrl.ctp:13
-#: View/EventReports/ajax/indexForEvent.ctp:28
-msgid "Content for this URL will be downloaded and converted to Markdown"
-msgstr ""
-
-#: View/EventReports/ajax/indexForEvent.ctp:3
-msgid "Viewing reports in extended event view"
-msgstr ""
-
-#: View/EventReports/ajax/indexForEvent.ctp:27
-msgid "Import from URL"
-msgstr ""
-
-#: View/EventReports/ajax/indexForEvent.ctp:36
-msgid "Generate report from Event"
-msgstr ""
-
-#: View/EventReports/ajax/indexForEvent.ctp:37
-msgid "Based on filters, create a report summarizing the event"
-msgstr ""
-
-#: View/EventReports/ajax/indexForEvent.ctp:195
-msgid "Failed to load Event report table"
-msgstr ""
-
-#: View/EventReports/ajax/replaceSuggestionInReport.ctp:5
-msgid "Replace suggestions in report"
-msgstr ""
-
-#: View/EventReports/ajax/reportFromEvent.ctp:5
-msgid "Create report from event"
-msgstr ""
-
-#: View/EventReports/ajax/reportFromEvent.ctp:6
-msgid "Generate a report based on filtering criterias."
-msgstr ""
-
-#: View/EventReports/ajax/reportFromEvent.ctp:14
-msgid "REST search filters"
-msgstr ""
-
-#: View/EventReports/ajax/reportFromEvent.ctp:15
-msgid "Provide the filtering criterias for attributes to be taken into account in the report"
-msgstr ""
-
 #: View/Events/add.ctp:39
-#: View/Events/view.ctp:121
+#: View/Events/view.ctp:148
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
-#: View/Servers/preview_event.ctp:22
+#: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr ""
 
 #: View/Events/add.ctp:49
-#: View/Events/restore_deleted_events.ctp:14
+#: View/ShadowAttributes/index.ctp:59
 msgid "Event Info"
 msgstr ""
 
@@ -13346,7 +10721,7 @@ msgid "Details"
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:108
+#: View/Jobs/index.ctp:115
 msgid "Failed"
 msgstr ""
 
@@ -13359,774 +10734,703 @@ msgid "Event with this UUID already exists."
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:108
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr ""
 
-#: View/Events/automation.ctp:6
+#: 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:8
-msgid "You can use the <a href=\""
+#: View/Events/automation.ctp:5
+msgid "You can use the <a href=\"/servers/rest\">REST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
 msgstr ""
 
-#: View/Events/automation.ctp:9
+#: 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:10
-msgid "To view the old MISP automation page, click <a href=\""
+#: View/Events/automation.ctp:7
+msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
 msgstr ""
 
-#: View/Events/automation.ctp:15
+#: View/Events/automation.ctp:11
 msgid "Your current key is: <code>%s</code>. You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:19
+#: View/Events/automation.ctp:15
 #: View/Events/legacy_automation.ctp:8
-#: View/Users/view.ctp:35
+#: View/Users/admin_view.ctp:37
+#: View/Users/view.ctp:20
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:25
-msgid "You can view and manage your API keys under your profile, found %s"
-msgstr ""
-
-#: View/Events/automation.ctp:40
+#: View/Events/automation.ctp:26
 #: 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:41
+#: View/Events/automation.ctp:27
 #: 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:42
+#: View/Events/automation.ctp:28
 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:45
+#: View/Events/automation.ctp:31
 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:46
+#: View/Events/automation.ctp:32
 msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr ""
 
-#: View/Events/automation.ctp:47;112
+#: View/Events/automation.ctp:33
 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:48
+#: View/Events/automation.ctp:34
 #: View/Events/legacy_automation.ctp:268;297
 msgid "Search for the given value in the attributes' value field."
 msgstr ""
 
-#: View/Events/automation.ctp:49
+#: View/Events/automation.ctp:35
 #: 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:50
+#: View/Events/automation.ctp:36
 #: View/Events/legacy_automation.ctp:61;270;299
 msgid "The attribute category, any valid MISP attribute category is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:51
+#: View/Events/automation.ctp:37
 #: View/Events/legacy_automation.ctp:271;300
 msgid "Search by the creator organisation by supplying the organisation identifier."
 msgstr ""
 
-#: View/Events/automation.ctp:52
+#: View/Events/automation.ctp:38
 #: 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:53
+#: View/Events/automation.ctp:39
 #: 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:54;212
+#: View/Events/automation.ctp:40;160
 #: 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:55;213
+#: View/Events/automation.ctp:41;161
 #: 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:56
+#: View/Events/automation.ctp:42
 #: View/Events/legacy_automation.ctp:282;307
 msgid "The events that should be included / excluded from the search"
 msgstr ""
 
-#: View/Events/automation.ctp:57
+#: View/Events/automation.ctp:43
 #: 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:58
+#: View/Events/automation.ctp:44
 #: 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:59
+#: View/Events/automation.ctp:45
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
-#: View/Events/automation.ctp:60
+#: View/Events/automation.ctp:46
 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:61
+#: View/Events/automation.ctp:47
 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:62
+#: View/Events/automation.ctp:48
 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:63
+#: View/Events/automation.ctp:49
 #: 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:64
+#: View/Events/automation.ctp:50
 #: 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:65
+#: View/Events/automation.ctp:51
 #: 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:66
+#: View/Events/automation.ctp:52
 #: 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:67
+#: View/Events/automation.ctp:53
 #: 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:68
+#: View/Events/automation.ctp:54
 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:69
+#: View/Events/automation.ctp:55
 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:70
+#: View/Events/automation.ctp:56
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:71
+#: View/Events/automation.ctp:57
 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:72
+#: View/Events/automation.ctp:58
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:85
+#: View/Events/automation.ctp:71
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:104
-msgid "Galaxy Cluster Search"
-msgstr ""
-
-#: View/Events/automation.ctp:106
-msgid "It is possible to search the database for galaxy clustesrs based on a list of criteria."
-msgstr ""
-
-#: View/Events/automation.ctp:107
-msgid "To return an cluster or a list of clusters in the JSON format, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:108
-msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive"
-msgstr ""
-
-#: View/Events/automation.ctp:111
-msgid "Limit the number of results returned, depending on the scope (for example 10 clusters)."
-msgstr ""
-
-#: View/Events/automation.ctp:113
-msgid "Specify the exact local ID the be returned"
-msgstr ""
-
-#: View/Events/automation.ctp:114
-msgid "Specify the exact local UUID the be returned"
-msgstr ""
-
-#: View/Events/automation.ctp:115
-msgid "Specify the exact local ID of the galaxy containing all the clusters the be returned"
-msgstr ""
-
-#: View/Events/automation.ctp:116
-msgid "Specify the exact local UUID of the galaxy containing all the clusters the be returned"
-msgstr ""
-
-#: View/Events/automation.ctp:117
-msgid "Specify the publication state of the clusters to be returned"
-msgstr ""
-
-#: View/Events/automation.ctp:118
-msgid "Specify the value of the clusters to be returned"
-msgstr ""
-
-#: View/Events/automation.ctp:119
-msgid "Specify the UUID of the cluster that was forked by the returned clusters"
-msgstr ""
-
-#: View/Events/automation.ctp:120
-msgid "Specify the version of the cluster that was forked by the returned clusters"
-msgstr ""
-
-#: View/Events/automation.ctp:121
-msgid "Specify the version to be returned"
-msgstr ""
-
-#: View/Events/automation.ctp:122
-msgid "Specify the distribution to be returned"
-msgstr ""
-
-#: View/Events/automation.ctp:123
-msgid "Specify the org_id to get all clusters belonging to this organisation."
-msgstr ""
-
-#: View/Events/automation.ctp:124
-msgid "Specify the orgc_id to get all clusters that were created by this organisation."
-msgstr ""
-
-#: View/Events/automation.ctp:125
-msgid "Specify the tag name of the cluster to be returned"
-msgstr ""
-
-#: View/Events/automation.ctp:126
-msgid "Specify if custom, default or both clusters should be returned"
-msgstr ""
-
-#: View/Events/automation.ctp:127
-msgid "Only return the UUID and the version of the returned clusters"
-msgstr ""
-
-#: View/Events/automation.ctp:140
+#: View/Events/automation.ctp:88
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:142
+#: View/Events/automation.ctp:90
 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:143
+#: View/Events/automation.ctp:91
 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:144
+#: View/Events/automation.ctp:92
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:147
+#: View/Events/automation.ctp:95
 msgid "URL parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:150
+#: View/Events/automation.ctp:98
 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:152
+#: View/Events/automation.ctp:100
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:155
+#: View/Events/automation.ctp:103
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:156
+#: View/Events/automation.ctp:104
 #: 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:159
+#: View/Events/automation.ctp:107
 #: 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:163
+#: View/Events/automation.ctp:111
 #: 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:165
+#: View/Events/automation.ctp:113
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:169
+#: View/Events/automation.ctp:117
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:170
+#: View/Events/automation.ctp:118
 #: 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:171
+#: View/Events/automation.ctp:119
 #: 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:177
+#: View/Events/automation.ctp:125
 #: 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:180
+#: View/Events/automation.ctp:128
 #: 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:198
+#: View/Events/automation.ctp:146
 #: 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:200
+#: View/Events/automation.ctp:148
 #: 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:207
+#: View/Events/automation.ctp:155
 #: 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:210
+#: View/Events/automation.ctp:158
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:159
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:214
+#: View/Events/automation.ctp:162
 #: 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:215
+#: View/Events/automation.ctp:163
 #: 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:217
+#: View/Events/automation.ctp:165
 #: 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:218
+#: View/Events/automation.ctp:166
 #: 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:221
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:222
+#: View/Events/automation.ctp:170
 #: 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:224
+#: View/Events/automation.ctp:172
 #: 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:229
+#: View/Events/automation.ctp:177
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:230
+#: View/Events/automation.ctp:178
 #: 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:232
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:233
+#: View/Events/automation.ctp:181
 #: 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:234
+#: View/Events/automation.ctp:182
 #: 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:235
+#: View/Events/automation.ctp:183
 #: 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:237
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:241
+#: View/Events/automation.ctp:189
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:245
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:194
 #: 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:247
+#: View/Events/automation.ctp:195
 #: 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:248
+#: View/Events/automation.ctp:196
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:249
+#: View/Events/automation.ctp:197
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:251
+#: View/Events/automation.ctp:199
 #: 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:252
+#: View/Events/automation.ctp:200
 #: 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:253
+#: View/Events/automation.ctp:201
 #: 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:254
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:263
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:264
+#: View/Events/automation.ctp:212
 #: 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:265
+#: View/Events/automation.ctp:213
 #: 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:266
+#: View/Events/automation.ctp:214
 #: 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:267
+#: View/Events/automation.ctp:215
 #: 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:268
+#: View/Events/automation.ctp:216
 #: 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:269
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:270
+#: View/Events/automation.ctp:218
 #: 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:271
+#: View/Events/automation.ctp:219
 #: 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:272
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:273
+#: View/Events/automation.ctp:221
 #: 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:276
+#: View/Events/automation.ctp:224
 #: 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:278
+#: View/Events/automation.ctp:226
 #: 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:280
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:281
+#: View/Events/automation.ctp:229
 #: 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:285
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:287
+#: View/Events/automation.ctp:234
+#: View/Events/legacy_automation.ctp:394
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:138
+#: View/Feeds/view.ctp:5
+#: 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:235
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:288
+#: View/Events/automation.ctp:236
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:289
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:397
-#: View/Servers/rest.ctp:162
+#: View/Servers/rest.ctp:161
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:294
+#: View/Events/automation.ctp:242
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:296;316;317;323;324
+#: View/Events/automation.ctp:244;264;265;271;272
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:301
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:303;310
+#: View/Events/automation.ctp:251;258
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:256
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:315
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:322
+#: View/Events/automation.ctp:270
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:329
+#: View/Events/automation.ctp:277
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:336
+#: View/Events/automation.ctp:284
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:341
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:346
+#: View/Events/automation.ctp:294
 #: 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:348
+#: View/Events/automation.ctp:296
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:349
+#: View/Events/automation.ctp:297
 #: 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:353
+#: View/Events/automation.ctp:301
 #: 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:364
+#: View/Events/automation.ctp:312
 #: 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:365
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:366
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:367
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:368
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:369
+#: View/Events/automation.ctp:317
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:370
+#: View/Events/automation.ctp:318
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:371
+#: View/Events/automation.ctp:319
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:372
+#: View/Events/automation.ctp:320
 #: 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:373
+#: View/Events/automation.ctp:321
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:374
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:375
+#: View/Events/automation.ctp:323
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:376
+#: View/Events/automation.ctp:324
 #: 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:377
+#: View/Events/automation.ctp:325
 #: 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:380
+#: View/Events/automation.ctp:328
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:382
+#: View/Events/automation.ctp:330
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:383
+#: View/Events/automation.ctp:331
 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:384
+#: View/Events/automation.ctp:332
 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:385
+#: View/Events/automation.ctp:333
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:395
+#: View/Events/automation.ctp:343
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:397
+#: View/Events/automation.ctp:345
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:398
+#: View/Events/automation.ctp:346
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:399
+#: View/Events/automation.ctp:347
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:400
+#: View/Events/automation.ctp:348
 msgid "Get worker info"
 msgstr ""
 
-#: View/Events/contact.ctp:4
-msgid "Contact organization reporting event %s"
+#: View/Events/contact.ctp:8
+msgid "Contact organization reporting event "
 msgstr ""
 
-#: View/Events/contact.ctp:5
-msgid "You are about to contact the organization %s 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."
+#: 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:17
+#: View/Events/contact.ctp:21
 msgid "Submit only to the person that created the event"
 msgstr ""
 
@@ -14173,17 +11477,21 @@ msgid "Loading…"
 msgstr ""
 
 #: View/Events/export.ctp:78
-#: View/Jobs/index.ctp:115
+#: View/Jobs/index.ctp:122
 msgid "Queued"
 msgstr ""
 
 #: View/Events/export.ctp:83
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:7;120
+#: View/Jobs/index.ctp:7;127
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr ""
 
+#: View/Events/export.ctp:115;144
+msgid "Download"
+msgstr ""
+
 #: View/Events/export.ctp:125
 msgid "Generate"
 msgstr ""
@@ -14290,6 +11598,12 @@ msgstr ""
 msgid "Ongoing"
 msgstr ""
 
+#: View/Events/filter_event_index.ctp:133
+#: View/Feeds/index.ctp:149
+#: View/Users/admin_filter_user_index.ctp:70
+msgid "Target"
+msgstr ""
+
 #: View/Events/filter_event_index.ctp:145
 msgid "Delete filter"
 msgstr ""
@@ -14323,86 +11637,52 @@ msgstr ""
 msgid "Paste a list of IOCs into the field below for automatic detection."
 msgstr ""
 
-#: View/Events/get_event_info_by_id.ctp:2
-msgid "Matched event"
-msgstr ""
-
 #: View/Events/get_event_info_by_id.ctp:5
 msgid "No matching events found."
 msgstr ""
 
-#: View/Events/get_event_info_by_id.ctp:7
-msgid "This will still allow you to store the UUID. It will extend the assigned event as soon as it is created/becomes visible."
+#: 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/get_event_info_by_id.ctp:13
-#: View/Events/view.ctp:147
-#: View/Feeds/preview_event.ctp:37
-#: View/Pages/doc/using_the_system.ctp:70;177;210
-#: View/Servers/preview_event.ctp:28
-msgid "Analysis"
-msgstr ""
-
-#: View/Events/get_event_info_by_id.ctp:14
-msgid "Threat level"
-msgstr ""
-
-#: View/Events/get_event_info_by_id.ctp:16
-#: View/Events/view.ctp:177
-#: View/Feeds/preview_event.ctp:42
-#: View/Pages/doc/using_the_system.ctp:185;212
-#: View/Servers/id_translator.ctp:46
-#: View/Servers/preview_event.ctp:40
-msgid "Info"
-msgstr ""
-
-#: View/Events/import_module.ctp:72
-msgid "File upload"
-msgstr ""
-
-#: View/Events/import_module.ctp:75
-msgid "Paste Input"
-msgstr ""
-
-#: View/Events/import_module.ctp:90
+#: View/Events/import_module.ctp:99
 msgid "Input File"
 msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:70
-#: View/Organisations/view.ctp:69;70
-#: View/SharingGroups/view.ctp:25
+#: View/GalaxyClusters/view.ctp:14
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:35
 msgid "Events"
 msgstr ""
 
-#: View/Events/index.ctp:29
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
 #: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr ""
 
-#: View/Events/index.ctp:40
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr ""
 
-#: View/Events/index.ctp:68
+#: View/Events/index.ctp:73
 msgid "My events only"
 msgstr ""
 
-#: View/Events/index.ctp:69
+#: View/Events/index.ctp:74
 msgid "My Events"
 msgstr ""
 
-#: View/Events/index.ctp:77
+#: View/Events/index.ctp:82
 msgid "My organisation's events only"
 msgstr ""
 
-#: View/Events/index.ctp:78
+#: View/Events/index.ctp:83
 msgid "Org Events"
 msgstr ""
 
@@ -14726,70 +12006,39 @@ msgstr ""
 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:5
-msgid "Merge data from event"
+#: View/Events/merge.ctp:4
+msgid "Merge events - WARNING: this feature is very outdated and should not be used anymore."
 msgstr ""
 
-#: View/Events/merge.ctp:6
-msgid "Merge all objects, attributes and their respective tags from the selected event into event #%s"
+#: View/Events/merge.ctp:9
+msgid "Event id to copy the attributes from"
 msgstr ""
 
-#: View/Events/merge.ctp:13
-msgid "Source event ID or UUID"
+#: View/Events/merge.ctp:20
+msgid "copy only IDS attributes"
 msgstr ""
 
-#: View/Events/merge.ctp:14
-msgid "ID or UUID of the event to merge from"
+#: View/Events/merge.ctp:26
+#: View/Organisations/ajax/merge.ctp:70
+msgid "Merge"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:2
 msgid "Event with proposals"
 msgstr ""
 
-#: View/Events/proposal_event_index.ctp:18
+#: View/Events/proposal_event_index.ctp:24
 #: View/Pages/doc/concepts.ctp:28
-#: View/ShadowAttributes/index.ctp:99
+#: View/ShadowAttributes/index.ctp:2
 msgid "Proposals"
 msgstr ""
 
-#: View/Events/proposal_event_index.ctp:19
-#: View/Events/view.ctp:89
+#: View/Events/proposal_event_index.ctp:25
+#: View/Events/view.ctp:116
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr ""
 
-#: View/Events/proposal_event_index.ctp:21
-#: View/Jobs/index.ctp:70
-#: 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_index.ctp:82
-#: View/Users/registrations.ctp:61
-#: View/Users/view.ctp:5
-msgid "Email"
-msgstr ""
-
-#: View/Events/recover_event.ctp:3
-msgid "Return to the event restoration index"
-msgstr ""
-
-#: View/Events/recover_event.ctp:10
-#: View/Pages/doc/using_the_system.ctp:270
-msgid "Model"
-msgstr ""
-
-#: View/Events/recover_event.ctp:20
-msgid "Data"
-msgstr ""
-
-#: View/Events/recover_event.ctp:26
-msgid "Recovery process log"
-msgstr ""
-
-#: View/Events/recover_event.ctp:27
-msgid "Below is a list of actions the recovery process would take in order to restore the event."
-msgstr ""
-
 #: View/Events/report_validation_issues_events.ctp:2
 msgid "Listing invalid event validations"
 msgstr ""
@@ -14823,19 +12072,11 @@ msgid "Similar Attributes"
 msgstr ""
 
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/resolved_misp_format.ctp:147;342
-#: View/Objects/add.ctp:129
+#: View/Events/resolved_misp_format.ctp:96;291
+#: View/Objects/add.ctp:117
 msgid "Disable Correlation"
 msgstr ""
 
-#: View/Events/resolved_attributes.ctp:53
-msgid "Tags (separated by comma)"
-msgstr ""
-
-#: View/Events/resolved_attributes.ctp:108
-msgid "10 +more"
-msgstr ""
-
 #: View/Events/resolved_attributes.ctp:195
 msgid "Remove resolved attribute"
 msgstr ""
@@ -14856,91 +12097,37 @@ msgstr ""
 msgid "Update all comment fields"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:45
+#: View/Events/resolved_misp_format.ctp:36
+#: View/Events/view.ctp:53
+#: View/Servers/preview_event.ctp:12
+#: View/Sightings/ajax/list_sightings.ctp:9
+msgid "Event ID"
+msgstr ""
+
+#: View/Events/resolved_misp_format.ctp:43
 msgid "Event creator org"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:80
-msgid "# of resolved Attributes"
+#: View/Events/resolved_misp_format.ctp:78
+msgid "#Resolved Attributes"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:81
-msgid "# of resolved Reports"
-msgstr ""
-
-#: View/Events/resolved_misp_format.ctp:92;140;335
-#: View/GalaxyClusters/update_cluster.ctp:97
+#: View/Events/resolved_misp_format.ctp:89;284
 msgid "Import"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:95
-#: View/Events/show_i_o_c_results.ctp:34
-msgid "Content"
-msgstr ""
-
-#: View/Events/resolved_misp_format.ctp:162
+#: View/Events/resolved_misp_format.ctp:111
 msgid "ID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:178
+#: View/Events/resolved_misp_format.ctp:127
 msgid "UUID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:179
+#: View/Events/resolved_misp_format.ctp:128
 msgid "Meta Category: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:65
-msgid "%s (%s object)"
-msgid_plural "%s (%s objects)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: View/Events/restore_deleted_events.ctp:9
-msgid "Event Id"
-msgstr ""
-
-#: View/Events/restore_deleted_events.ctp:18
-#: View/Organisations/view.ctp:31
-msgid "Creation time"
-msgstr ""
-
-#: View/Events/restore_deleted_events.ctp:23
-msgid "Deletion time"
-msgstr ""
-
-#: View/Events/restore_deleted_events.ctp:28;38
-msgid "Event Creator"
-msgstr ""
-
-#: View/Events/restore_deleted_events.ctp:33
-msgid "Event Owner"
-msgstr ""
-
-#: View/Events/restore_deleted_events.ctp:43
-msgid "Deleted By"
-msgstr ""
-
-#: View/Events/restore_deleted_events.ctp:49
-msgid "Below are a list of events that can be recovered via the log entries. Make sure that your log table is well indexed (adding indeces to `model`, `model_id`, `created` and `action` highly recommended)."
-msgstr ""
-
-#: View/Events/restore_deleted_events.ctp:57
-msgid "Mock the recovery process and output the potential changes"
-msgstr ""
-
-#: View/Events/restore_deleted_events.ctp:59
-msgid "Are you sure you want to mock the recovery of the event? No data will be modified, but the request might take some time."
-msgstr ""
-
-#: View/Events/restore_deleted_events.ctp:67
-msgid "Execute the recovery process"
-msgstr ""
-
-#: View/Events/restore_deleted_events.ctp:69
-msgid "Are you sure you want to attempt to recover the event?"
-msgstr ""
-
 #: View/Events/show_i_o_c_results.ctp:2
 msgid ">Results of the import"
 msgstr ""
@@ -14953,6 +12140,13 @@ msgstr ""
 msgid "Successfully added attributes"
 msgstr ""
 
+#: View/Events/show_i_o_c_results.ctp:10;32
+#: View/Feeds/preview_event.ctp:11
+#: 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 ""
@@ -14961,6 +12155,10 @@ msgstr ""
 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 ""
@@ -14985,240 +12183,200 @@ msgstr ""
 msgid "Include the original imported file as attachment"
 msgstr ""
 
-#: View/Events/view.ctp:31
+#: View/Events/view.ctp:61
 msgid "Extend this event"
 msgstr ""
 
-#: View/Events/view.ctp:36
-msgid "Check this event on different servers"
-msgstr ""
-
-#: View/Events/view.ctp:42
+#: View/Events/view.ctp:67
 #: View/Feeds/preview_event.ctp:13
-#: View/Servers/preview_event.ctp:5
 msgid "Source Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:51
-#: View/Servers/preview_event.ctp:6
+#: View/Events/view.ctp:76
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:140
-msgid "Undisclosed sharing group"
+#: View/Events/view.ctp:154
+#: 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:141
-msgid "your organisation is the local owner of this event, however it is not explicitly listed in the sharing group."
-msgstr ""
-
-#: View/Events/view.ctp:171
+#: View/Events/view.ctp:178
 msgid "Toggle advanced sharing network viewer"
 msgstr ""
 
-#: View/Events/view.ctp:181
+#: View/Events/view.ctp:184
+#: View/Feeds/preview_event.ctp:42
+#: View/Pages/doc/using_the_system.ctp:185;212
+msgid "Info"
+msgstr ""
+
+#: View/Events/view.ctp:188
 #: View/Feeds/preview_event.ctp:55;60;65
-#: View/GalaxyClusters/view.ctp:45
-#: View/GalaxyClusters/ajax/index.ctp:76
 #: View/Pages/doc/using_the_system.ctp:160;213
-#: View/Servers/preview_event.ctp:44
-#: View/Servers/preview_index.ctp:108
+#: View/Servers/preview_event.ctp:78;88
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:189
+#: View/Events/view.ctp:194
+msgid " (%s Objects)"
+msgstr ""
+
+#: View/Events/view.ctp:194
+msgid " (%s Object)"
+msgstr ""
+
+#: View/Events/view.ctp:196
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:193
+#: View/Events/view.ctp:200
 msgid "First recorded change"
 msgstr ""
 
-#: View/Events/view.ctp:197
-#: View/Servers/preview_event.ctp:50
+#: View/Events/view.ctp:204
 msgid "Last change"
 msgstr ""
 
-#: View/Events/view.ctp:201
+#: View/Events/view.ctp:208
 msgid "Modification map"
 msgstr ""
 
-#: View/Events/view.ctp:207
+#: View/Events/view.ctp:214
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:226
+#: View/Events/view.ctp:233
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:231
-msgid "Currently in %s view."
-msgstr ""
-
-#: View/Events/view.ctp:233
+#: View/Events/view.ctp:240
 msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:233
+#: View/Events/view.ctp:240
 msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:240
-msgid "Switch to atomic view"
-msgstr ""
-
-#: View/Events/view.ctp:240
-msgid "Switch to extended view"
-msgstr ""
-
-#: View/Events/view.ctp:264
+#: View/Events/view.ctp:271
 msgid "%s has requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:270
+#: View/Events/view.ctp:277
 msgid "%s has requested that you take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:276
+#: View/Events/view.ctp:283
 msgid "You have requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:281
+#: View/Events/view.ctp:288
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:293
+#: View/Events/view.ctp:300
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:304
-#: View/Taxonomies/index.ctp:22
-#: View/Users/admin_index.ctp:48;172
-#: View/Users/view.ctp:113
-#: View/Warninglists/index.ctp:30
+#: View/Events/view.ctp:310
+#: View/Users/admin_index.ctp:155
+#: View/Users/admin_view.ctp:97
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:313
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "enable"
 msgstr ""
 
-#: View/Events/view.ctp:313
+#: View/Events/view.ctp:319
 #: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:323
+#: View/Events/view.ctp:330
 msgid "Extended view"
 msgstr ""
 
-#: View/Events/view.ctp:330
+#: View/Events/view.ctp:337
 msgid "Warning: Taxonomy inconsistencies"
 msgstr ""
 
-#: View/Events/view.ctp:374
+#: View/Events/view.ctp:382
 #: View/Feeds/preview_event.ctp:84
-#: View/Servers/preview_event.ctp:85
+#: View/Servers/preview_event.ctp:112
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:400
-msgid "Related Feeds"
-msgstr ""
-
-#: View/Events/view.ctp:400
-msgid "Show just attributes that has feed hits"
-msgstr ""
-
-#: View/Events/view.ctp:400;485
-msgid "(show)"
-msgstr ""
-
-#: View/Events/view.ctp:439;474
+#: View/Events/view.ctp:443;478
 msgid "This event has "
 msgstr ""
 
-#: View/Events/view.ctp:440;475
+#: View/Events/view.ctp:444;479
 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:484
+#: View/Events/view.ctp:487
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:485
-msgid "Show just attributes that has warning"
-msgstr ""
-
-#: View/Events/view.ctp:501
+#: View/Events/view.ctp:503
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:501
+#: View/Events/view.ctp:503
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:504
+#: View/Events/view.ctp:506
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:507
+#: View/Events/view.ctp:506
+msgid "Galaxy"
+msgstr ""
+
+#: View/Events/view.ctp:509
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:510
+#: View/Events/view.ctp:512
 msgid "Toggle Event timeline"
 msgstr ""
 
-#: View/Events/view.ctp:510
+#: View/Events/view.ctp:512
 msgid "Event timeline"
 msgstr ""
 
-#: View/Events/view.ctp:513
+#: View/Events/view.ctp:515
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:513
+#: View/Events/view.ctp:515
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:516
+#: View/Events/view.ctp:518
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:516
+#: View/Events/view.ctp:518
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:519
-msgid "Toggle reports"
-msgstr ""
-
-#: View/Events/view.ctp:519
-msgid "Event reports"
-msgstr ""
-
-#: View/Events/view.ctp:522
+#: View/Events/view.ctp:521
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:525
+#: View/Events/view.ctp:524
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:548
-msgid "Event Reports"
-msgstr ""
-
-#: View/Events/view.ctp:187
-msgid " (%s Object)"
-msgid_plural " (%s Objects)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: View/Events/view_cluster_relations.ctp:3
-msgid "There are no Cluster relationships in this Event."
+#: View/Events/view.ctp:524
+msgid "Discussion"
 msgstr ""
 
 #: View/Events/view_graph.ctp:20
@@ -15286,8 +12444,7 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: View/Feeds/index.ctp:162
-#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:25
+#: View/Feeds/index.ctp:161
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -15344,6 +12501,12 @@ msgstr ""
 msgid "Feed name"
 msgstr ""
 
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:119
+#: View/Feeds/view.ctp:31
+msgid "Provider"
+msgstr ""
+
 #: View/Feeds/add.ctp:27
 #: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
@@ -15392,9 +12555,9 @@ msgstr ""
 #: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
-#: View/Users/admin_edit.ctp:48
+#: View/Users/admin_edit.ctp:40
 #: View/Users/change_pw.ctp:9
-#: View/Users/edit.ctp:14
+#: View/Users/edit.ctp:13
 msgid "Password"
 msgstr ""
 
@@ -15518,8 +12681,8 @@ msgstr ""
 
 #: View/Feeds/add.ctp:218
 #: View/Feeds/edit.ctp:218
-#: View/Servers/add.ctp:118
-#: View/Servers/edit.ctp:157;164
+#: View/Servers/add.ctp:116
+#: View/Servers/edit.ctp:155;162
 msgid "Modify"
 msgstr ""
 
@@ -15548,53 +12711,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr ""
 
 #: View/Feeds/edit.ctp:234
-#: View/Servers/add.ctp:148
-#: View/Servers/edit.ctp:192
+#: View/Servers/add.ctp:146
+#: View/Servers/edit.ctp:190
 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:235
-#: View/Servers/add.ctp:149
-#: View/Servers/edit.ctp:191
+#: View/Servers/add.ctp:147
+#: View/Servers/edit.ctp:189
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
 #: View/Feeds/edit.ctp:236
-#: View/Servers/add.ctp:150
-#: View/Servers/edit.ctp:193
+#: View/Servers/add.ctp:148
+#: View/Servers/edit.ctp:191
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:237
-#: View/Servers/add.ctp:151
-#: View/Servers/edit.ctp:194
+#: View/Servers/add.ctp:149
+#: View/Servers/edit.ctp:192
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
 #: View/Feeds/edit.ctp:238
-#: View/Servers/add.ctp:152
-#: View/Servers/edit.ctp:195
+#: View/Servers/add.ctp:150
+#: View/Servers/edit.ctp:193
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:239
-#: View/Servers/edit.ctp:196
+#: View/Servers/edit.ctp:194
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:240
-#: View/Servers/edit.ctp:197
+#: View/Servers/edit.ctp:195
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:241
-#: View/Servers/edit.ctp:198
+#: View/Servers/edit.ctp:196
 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:242
-#: View/Servers/add.ctp:156
-#: View/Servers/edit.ctp:200
+#: View/Servers/add.ctp:154
+#: View/Servers/edit.ctp:198
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -15606,7 +12769,7 @@ msgstr ""
 msgid "Fetch selected"
 msgstr ""
 
-#: View/Feeds/freetext_index.ctp:31
+#: View/Feeds/freetext_index.ctp:35
 msgid "Correlations"
 msgstr ""
 
@@ -15658,7 +12821,7 @@ msgstr ""
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:100;205
+#: View/Feeds/index.ctp:100;203
 msgid "Caching"
 msgstr ""
 
@@ -15666,76 +12829,84 @@ msgstr ""
 msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
 msgstr ""
 
-#: View/Feeds/index.ctp:114
+#: View/Feeds/index.ctp:113
 msgid "Format"
 msgstr ""
 
-#: View/Feeds/index.ctp:145
-#: View/Servers/rest.ctp:166
+#: View/Feeds/index.ctp:132
+#: View/GalaxyClusters/view.ctp:11
+#: 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/Feeds/index.ctp:144
+#: View/Servers/rest.ctp:164
 msgid "Headers"
 msgstr ""
 
-#: View/Feeds/index.ctp:169
+#: View/Feeds/index.ctp:168
 msgid "Delta"
 msgstr ""
 
-#: View/Feeds/index.ctp:170
+#: View/Feeds/index.ctp:169
 msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
-#: View/Feeds/index.ctp:177
+#: View/Feeds/index.ctp:176
 msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:178
+#: View/Feeds/index.ctp:177
 msgid "Override the IDS flags and set all derived attribute to IDS off"
 msgstr ""
 
-#: View/Feeds/index.ctp:198
+#: View/Feeds/index.ctp:196
 msgid "Visible"
 msgstr ""
 
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:211
 msgid "Feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:212
 msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
 msgstr ""
 
-#: View/Feeds/index.ctp:219
+#: View/Feeds/index.ctp:216
 msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:231
+#: View/Feeds/index.ctp:228
 msgid "Cache all feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:237
+#: View/Feeds/index.ctp:234
 msgid "Cache freetext/CSV feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:243
+#: View/Feeds/index.ctp:240
 msgid "Cache MISP feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:250
+#: View/Feeds/index.ctp:247
 msgid "Fetch and store all feed data"
 msgstr ""
 
-#: View/Feeds/index.ctp:258
+#: View/Feeds/index.ctp:255
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:264
+#: View/Feeds/index.ctp:261
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:297
+#: View/Feeds/index.ctp:294
 msgid "Are you sure you want to permanently remove the feed?"
 msgstr ""
 
-#: View/Feeds/index.ctp:305
+#: View/Feeds/index.ctp:302
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -15747,12 +12918,12 @@ msgstr ""
 msgid "You are currently viewing the event index of a feed (%s by %s)."
 msgstr ""
 
-#: View/Feeds/preview_index.ctp:40
+#: View/Feeds/preview_index.ctp:44
 msgid "Timestamp"
 msgstr ""
 
-#: View/Feeds/preview_index.ctp:68
-#: View/Servers/preview_index.ctp:169
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr ""
 
@@ -15788,136 +12959,34 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/export.ctp:6
-msgid "Export galaxy: %s"
-msgstr ""
-
-#: View/Galaxies/export.ctp:10
-msgid "Clusters' distribution:"
-msgstr ""
-
-#: View/Galaxies/export.ctp:19
-msgid "Include Custom Clusters"
-msgstr ""
-
-#: View/Galaxies/export.ctp:25
-msgid "Include Default Clusters"
-msgstr ""
-
-#: View/Galaxies/export.ctp:31
-msgid "Export format"
-msgstr ""
-
-#: View/Galaxies/export.ctp:33
-msgid "MISP Format"
-msgstr ""
-
-#: View/Galaxies/export.ctp:33
-msgid "To re-import in another MISP"
-msgstr ""
-
-#: View/Galaxies/export.ctp:34
-msgid "misp-galaxy format"
-msgstr ""
-
-#: View/Galaxies/export.ctp:34
-msgid "Usable to be integrated into the official repository"
-msgstr ""
-
-#: View/Galaxies/export.ctp:38
-msgid "Warning!"
-msgstr ""
-
-#: View/Galaxies/export.ctp:38
-msgid "The exported JSON will not contain the `category` key. Also, other keys such as `authors` and `version` may need to be adjusted manually."
-msgstr ""
-
-#: View/Galaxies/export.ctp:42
-msgid "Export type"
-msgstr ""
-
-#: View/Galaxies/fork_tree.ctp:5
-#: View/Galaxies/relations_graph.ctp:4
-msgid "Back to galaxy"
-msgstr ""
-
-#: View/Galaxies/fork_tree.ctp:8
-msgid "%s galaxy cluster extensions"
-msgstr ""
-
-#: View/Galaxies/fork_tree.ctp:126
-msgid "Update cluster to parent's new version"
-msgstr ""
-
-#: View/Galaxies/fork_tree.ctp:162
-msgid "Latest version of the parent cluster"
-msgstr ""
-
-#: View/Galaxies/fork_tree.ctp:253
-msgid "Version:"
-msgstr ""
-
-#: View/Galaxies/fork_tree.ctp:254
-msgid "ID:"
-msgstr ""
-
-#: View/Galaxies/fork_tree.ctp:256
-msgid "Description:"
-msgstr ""
-
-#: View/Galaxies/fork_tree.ctp:274
-msgid "Galaxy elements:"
-msgstr ""
-
-#: View/Galaxies/import.ctp:9
-msgid "Import galaxy clusters"
-msgstr ""
-
-#: View/Galaxies/import.ctp:10
-msgid "Paste a JSON of cluster to import or provide a JSON file below."
-msgstr ""
-
-#: View/Galaxies/import.ctp:18
-msgid "Galaxy JSON"
-msgstr ""
-
-#: View/Galaxies/index.ctp:23
+#: View/Galaxies/index.ctp:35
 msgid "Galaxy Id"
 msgstr ""
 
-#: View/Galaxies/index.ctp:31
+#: View/Galaxies/index.ctp:43
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:43
-#: View/Noticelists/index.ctp:28
+#: View/Galaxies/index.ctp:55
+#: View/Noticelists/index.ctp:35
 msgid "version"
 msgstr ""
 
-#: View/Galaxies/index.ctp:48
+#: View/Galaxies/index.ctp:60
 #: View/Galaxies/view.ctp:7
 #: View/Sightingdb/index.ctp:71
-#: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:15
+#: View/Taxonomies/view.ctp:9
 msgid "Namespace"
 msgstr ""
 
-#: View/Galaxies/index.ctp:57
+#: View/Galaxies/index.ctp:69
 msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/index.ctp:73
+#: View/Galaxies/index.ctp:85
 msgid "Are you sure you want to delete the Galaxy?"
 msgstr ""
 
-#: View/Galaxies/relations_graph.ctp:7
-msgid "%s galaxy cluster relationships"
-msgstr ""
-
-#: View/Galaxies/relations_graph.ctp:10
-msgid "There are no relations in this Galaxy"
-msgstr ""
-
 #: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr ""
@@ -15926,430 +12995,67 @@ msgstr ""
 msgid "Kill chain order"
 msgstr ""
 
-#: View/GalaxyClusterBlocklists/add.ctp:5
-msgid "(Optional) The cluster value that you would like to block"
-msgstr ""
-
-#: View/GalaxyClusterBlocklists/add.ctp:6
-msgid "(Optional) Any comments you would like to add regarding this (or these) entries"
-msgstr ""
-
-#: View/GalaxyClusterBlocklists/add.ctp:11
-msgid "Add block entry for Galaxy Cluster"
-msgstr ""
-
-#: View/GalaxyClusterBlocklists/add.ctp:11
-msgid "Edit block entry for Galaxy Cluster"
-msgstr ""
-
-#: View/GalaxyClusterBlocklists/add.ctp:16
-msgid "Cluster UUID"
-msgstr ""
-
-#: View/GalaxyClusterBlocklists/add.ctp:20
-#: View/GalaxyClusterRelations/add.ctp:24
-msgid "Pick target cluster"
-msgstr ""
-
-#: View/GalaxyClusterBlocklists/add.ctp:32
-#: View/GalaxyClusterBlocklists/index.ctp:50
-msgid "Cluster value"
-msgstr ""
-
-#: View/GalaxyClusterBlocklists/index.ctp:13
-msgid "+ Add entry to blocklist"
-msgstr ""
-
-#: View/GalaxyClusterBlocklists/index.ctp:39
-msgid "Galaxy Cluster UUID"
-msgstr ""
-
-#: View/GalaxyClusterBlocklists/index.ctp:62
-msgid "Galaxy Cluster Blocklist Index"
-msgstr ""
-
-#: View/GalaxyClusterBlocklists/index.ctp:63
-msgid "List all galaxy clusters that will be prevented to be created (also via synchronization) on this instance"
-msgstr ""
-
-#: View/GalaxyClusterBlocklists/index.ctp:80
-msgid "Are you sure you want to delete the entry?"
-msgstr ""
-
-#: View/GalaxyClusterRelations/add.ctp:3
-msgid "relationships which can be used to link clusters together and explain the context of the relationship."
-msgstr ""
-
-#: View/GalaxyClusterRelations/add.ctp:8
-msgid "Galaxy Cluster Relationship"
-msgstr ""
-
-#: View/GalaxyClusterRelations/add.ctp:12
-#: View/GalaxyClusters/view_relations.ctp:90
-msgid "Source UUID"
-msgstr ""
-
-#: View/GalaxyClusterRelations/add.ctp:15
-msgid "Pick source cluster"
-msgstr ""
-
-#: View/GalaxyClusterRelations/add.ctp:21
-#: View/GalaxyClusters/view_relations.ctp:104
-#: View/ObjectReferences/ajax/add.ctp:42
-msgid "Target UUID"
-msgstr ""
-
-#: View/GalaxyClusterRelations/add.ctp:41
-#: View/GalaxyClusterRelations/index.ctp:69
-#: View/GalaxyClusters/view_relations.ctp:27
-msgid "Relationship Type"
-msgstr ""
-
-#: View/GalaxyClusterRelations/add.ctp:42
-msgid "is-similar"
-msgstr ""
-
-#: View/GalaxyClusterRelations/add.ctp:45
-msgid "Pick type"
-msgstr ""
-
-#: View/GalaxyClusterRelations/add.ctp:51
-msgid "Tag list"
-msgstr ""
-
-#: View/GalaxyClusterRelations/add.ctp:55
-msgid "Pick tags"
-msgstr ""
-
-#: View/GalaxyClusterRelations/index.ctp:19
-msgid "Default Galaxy Cluster Relations"
-msgstr ""
-
-#: View/GalaxyClusterRelations/index.ctp:24
-msgid "Custom Galaxy Cluster Relations"
-msgstr ""
-
-#: View/GalaxyClusterRelations/index.ctp:51
-msgid "Galaxy Cluster Source"
-msgstr ""
-
-#: View/GalaxyClusterRelations/index.ctp:60
-msgid "Galaxy Cluster Target"
-msgstr ""
-
-#: View/GalaxyClusterRelations/index.ctp:75
-#: View/GalaxyClusters/view_relations.ctp:32
-msgid "Relationship Tag"
-msgstr ""
-
-#: View/GalaxyClusterRelations/index.ctp:96
-#: View/GalaxyClusters/ajax/index.ctp:109
-msgid "Creator Org"
-msgstr ""
-
-#: View/GalaxyClusterRelations/index.ctp:113
-msgid "Galaxy Cluster Relationships Index"
-msgstr ""
-
-#: View/GalaxyClusterRelations/index.ctp:114
-msgid "List all relationships between Galaxy Clusters"
-msgstr ""
-
-#: View/GalaxyClusterRelations/index.ctp:146
-#: View/GalaxyClusters/view_relations.ctp:72
-msgid "Are you sure you want to delete the Relationship?"
-msgstr ""
-
-#: View/GalaxyClusters/add.ctp:20
-msgid "Fork Galaxy Cluster"
-msgstr ""
-
-#: View/GalaxyClusters/add.ctp:20
-msgid "Add Galaxy Cluster"
-msgstr ""
-
-#: View/GalaxyClusters/add.ctp:21
-msgid "Edit Galaxy Cluster"
-msgstr ""
-
-#: View/GalaxyClusters/add.ctp:43
-msgid "Forked Cluster data"
-msgstr ""
-
-#: View/GalaxyClusters/add.ctp:77
-msgid "Galaxy Cluster Elements"
-msgstr ""
-
-#: View/GalaxyClusters/add.ctp:82
-msgid "Toggle UI"
-msgstr ""
-
 #: View/GalaxyClusters/cluster_matrix.ctp:1
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/update_cluster.ctp:2
-msgid "Merge updates from parent cluster"
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:4
-msgid "No new version available"
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:6
-msgid "This interface allows you to update the selected cluster to the latest version of its parent."
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:7
-msgid "You can pick galaxy cluster's elements to import from the parent to the selected cluster."
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:11
-msgid "Parent fork elements"
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:13
-msgid "Version: %s (newer)"
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:18;46;84
-#: View/GalaxyElements/ajax/index.ctp:51
-msgid "Key"
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:25;53
-msgid "No cluster element"
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:39
-msgid "Current elements"
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:41
-msgid "Parent version: %s (older)"
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:73
-msgid "You are all set!"
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:73
-msgid "There are no new elements to be added from the parent cluster"
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:78
-msgid "Elements in parent fork but not in this cluster"
-msgstr ""
-
-#: View/GalaxyClusters/update_cluster.ctp:86
-msgid "Import element into the cluster"
-msgstr ""
-
-#: View/GalaxyClusters/view.ctp:11
-msgid "%s (version: %s)"
-msgstr ""
-
-#: View/GalaxyClusters/view.ctp:17
-msgid "New version available! <a href=\"%s\">Update cluster to version <b>%s</b></a>"
-msgstr ""
-
-#: View/GalaxyClusters/view.ctp:31
-msgid "%s (parent version: %s)"
-msgstr ""
-
-#: View/GalaxyClusters/view.ctp:41
+#: View/GalaxyClusters/view.ctp:5
 msgid "Cluster ID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:43
+#: View/GalaxyClusters/view.ctp:7
 msgid "Parent Galaxy"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:49
+#: View/GalaxyClusters/view.ctp:10
 msgid "Collection UUID"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:56
+#: View/GalaxyClusters/view.ctp:12
 msgid "Authors"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:66
-msgid "Creator Organisation"
-msgstr ""
-
-#: View/GalaxyClusters/view.ctp:69
+#: View/GalaxyClusters/view.ctp:13
 msgid "Connector tag"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:78
-msgid "Forked From"
-msgstr ""
-
-#: View/GalaxyClusters/view.ctp:81
-msgid "Forked By"
-msgstr ""
-
-#: View/GalaxyClusters/view.ctp:73
-#: View/SharingGroups/view.ctp:26
-msgid "%s event"
-msgid_plural "%s events"
-msgstr[0] ""
-msgstr[1] ""
-
-#: View/GalaxyClusters/view_relations.ctp:19
-msgid "Galaxy Cluster Target (galaxy :: cluster)"
-msgstr ""
-
-#: View/GalaxyClusters/view_relations.ctp:81
-msgid "Toggle Cluster relationships"
-msgstr ""
-
-#: View/GalaxyClusters/view_relations.ctp:94
-#: View/ObjectReferences/ajax/add.ctp:10;17
-msgid "Relationship type"
-msgstr ""
-
-#: View/GalaxyClusters/view_relations.ctp:96
-msgid "custom"
-msgstr ""
-
-#: View/GalaxyClusters/view_relations.ctp:96
-msgid "-- Custom relationship --"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:2
-msgid "Galaxy Cluster Deletion"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:4
-msgid "Are you sure you want to delete Galaxy Cluster %s (%s)?"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:6
-msgid "%s a cluster propagates the deletion to other instances and lets you restore it in the future"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:7
-msgid "%s a cluster permanentaly deletes it and prevents it be created again by blocklisting it"
+#: View/GalaxyClusters/view.ctp:18
+msgid "event(s)"
 msgstr ""
 
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
-msgid "For default clusters, you can restore the cluster at any time by force updating your galaxies"
+msgid "Galaxy Cluster Deletion"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:29
-msgid "Custom"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "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."
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:38
-msgid "My Clusters"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:48
-msgid "View Fork Tree"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:53
-msgid "View Galaxy Relationships"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:92
+#: View/GalaxyClusters/ajax/index.ctp:46
 msgid "Synonyms"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:134
+#: View/GalaxyClusters/ajax/index.ctp:59
 msgid "#Events"
 msgstr ""
 
-#: View/GalaxyClusters/ajax/index.ctp:139
-msgid "#Relations"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:144
-msgid "cluster"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:145
-msgid "is being targeted by"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:146
-msgid "targets"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:189
-msgid "Are you sure you want to restore the Galaxy Cluster?"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:211
-msgid "Are you sure you want to publish the Galaxy Cluster?"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:6
-msgid "Publish cluster %s"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:8
-msgid "Unpublish cluster %s"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:16
-msgid "Are you sure you wish to publish the cluster?"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:18
-msgid "Are you sure you wish to unpublish the cluster?"
-msgstr ""
-
-#: View/GalaxyElements/ajax/delete.ctp:3
-msgid "Delete Galaxy Cluster Element"
-msgstr ""
-
-#: View/GalaxyElements/ajax/delete.ctp:4
-msgid "galaxy element"
-msgstr ""
-
-#: View/GalaxyElements/ajax/flattenJson.ctp:6
-msgid "Convert JSON into galaxy cluster's elements"
-msgstr ""
-
-#: View/GalaxyElements/ajax/index.ctp:12
-msgid "Tabular view"
+#: View/GalaxyClusters/ajax/index.ctp:94
+msgid "Are you sure you want to delete the Galaxy Cluster?"
 msgstr ""
 
 #: View/GalaxyElements/ajax/index.ctp:22
-msgid "JSON view"
+msgid "Key"
 msgstr ""
 
-#: View/GalaxyElements/ajax/index.ctp:39
-msgid "Add JSON as cluster's elements"
-msgstr ""
-
-#: View/GalaxyElements/ajax/index.ctp:40
-msgid "The provided JSON will be converted into Galaxy Cluster Elements"
-msgstr ""
-
-#: View/Helper/GenericPickerHelper.php:87
+#: View/Helper/GenericPickerHelper.php:90
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
-#: View/Helper/GenericPickerHelper.php:92
-msgid "Use the picker instead"
-msgstr ""
-
-#: View/Helper/IconHelper.php:27
-msgid "Flag of %s"
-msgstr ""
-
-#: View/Helper/PivotHelper.php:28
-msgid "Remove pivot"
-msgstr ""
-
 #: View/Inbox/index.ctp:31
 #: 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:15
+#: View/Threads/index.ctp:22
 msgid "Title"
 msgstr ""
 
@@ -16378,70 +13084,70 @@ msgstr ""
 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:43
+#: View/Jobs/index.ctp:50
 msgid "Completed."
 msgstr ""
 
-#: View/Jobs/index.ctp:59
+#: View/Jobs/index.ctp:66
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:65
+#: View/Jobs/index.ctp:72
 msgid "Show default queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:71
+#: View/Jobs/index.ctp:78
 msgid "Show email queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:76
+#: View/Jobs/index.ctp:83
 msgid "Cache"
 msgstr ""
 
-#: View/Jobs/index.ctp:77
+#: View/Jobs/index.ctp:84
 msgid "Show cache queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:90
+#: View/Jobs/index.ctp:97
 msgid "Date created"
 msgstr ""
 
-#: View/Jobs/index.ctp:91
+#: View/Jobs/index.ctp:98
 msgid "Date modified"
 msgstr ""
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:99
 msgid "Process ID"
 msgstr ""
 
-#: View/Jobs/index.ctp:93
+#: View/Jobs/index.ctp:100
 #: View/Pages/doc/administration.ctp:223
 msgid "Worker"
 msgstr ""
 
-#: View/Jobs/index.ctp:94
+#: View/Jobs/index.ctp:101
 msgid "Job type"
 msgstr ""
 
-#: View/Jobs/index.ctp:95
+#: View/Jobs/index.ctp:102
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr ""
 
-#: View/Jobs/index.ctp:99
+#: View/Jobs/index.ctp:106
 #: View/Pages/doc/administration.ctp:229
 msgid "Retries"
 msgstr ""
 
-#: View/Jobs/index.ctp:111
+#: View/Jobs/index.ctp:118
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:115
+#: View/Jobs/index.ctp:122
 msgid "Running"
 msgstr ""
 
-#: View/Jobs/index.ctp:143
+#: View/Jobs/index.ctp:150
 msgid "View stacktrace"
 msgstr ""
 
@@ -16503,16 +13209,17 @@ msgid "from IP"
 msgstr ""
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:60
+#: View/ObjectTemplates/index.ctp:67
 #: View/ObjectTemplates/view.ctp:5
-#: View/Sightings/ajax/list_sightings.ctp:10
+#: View/Sightings/ajax/list_sightings.ctp:6
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
 #: View/UserSettings/index.ctp:35
 #: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
-#: View/Users/admin_edit.ctp:59
-#: View/Users/view.ctp:14
+#: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr ""
 
@@ -16543,7 +13250,7 @@ msgid "Edit news message"
 msgstr ""
 
 #: View/News/index.ctp:24
-msgid "Are you sure you want to delete news item #%s?"
+msgid "Are you sure you want to delete news item # %s?"
 msgstr ""
 
 #: View/News/index.ctp:47
@@ -16554,40 +13261,43 @@ msgstr ""
 msgid "Noticelists"
 msgstr ""
 
-#: View/Noticelists/index.ctp:25
+#: View/Noticelists/index.ctp:32
 msgid "Expanded name"
 msgstr ""
 
-#: View/Noticelists/index.ctp:26
+#: View/Noticelists/index.ctp:33
 msgid "ref"
 msgstr ""
 
-#: View/Noticelists/index.ctp:27
+#: View/Noticelists/index.ctp:34
 msgid "geographical_area"
 msgstr ""
 
+#: View/Noticelists/index.ctp:36
+#: View/Pages/doc/using_the_system.ctp:371
+msgid "enabled"
+msgstr ""
+
 #: View/Noticelists/view.ctp:21
-#: View/Taxonomies/view.ctp:8
+#: View/Taxonomies/view.ctp:29
 msgid "(disable)"
 msgstr ""
 
 #: View/Noticelists/view.ctp:21
-#: View/Taxonomies/index.ctp:110
-#: View/Taxonomies/view.ctp:8;144
-#: View/Warninglists/index.ctp:115
+#: View/Taxonomies/index.ctp:43
+#: View/Taxonomies/view.ctp:29;155
 #: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr ""
 
 #: View/Noticelists/view.ctp:23
-#: View/Taxonomies/view.ctp:10
+#: View/Taxonomies/view.ctp:31
 msgid "(enable)"
 msgstr ""
 
 #: View/Noticelists/view.ctp:23
-#: View/Taxonomies/index.ctp:92
-#: View/Taxonomies/view.ctp:10;148
-#: View/Warninglists/index.ctp:97
+#: View/Taxonomies/index.ctp:45
+#: View/Taxonomies/view.ctp:31;159
 #: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr ""
@@ -16604,6 +13314,14 @@ msgstr ""
 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"
@@ -16629,33 +13347,33 @@ msgstr ""
 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:17
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:19
 msgid "Object relation"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:19
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:21
 msgid "Multiple"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:20
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:22
 msgid "UI-priority"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:22
+#: 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:23
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:25
 msgid "Sane defaults"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:24
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:26
 msgid "List of valid Values"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:25
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:27
 msgid "Disable correlation"
 msgstr ""
 
@@ -16663,140 +13381,134 @@ msgstr ""
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:53
-#: View/Users/admin_index.ctp:43
+#: View/ObjectTemplates/index.ctp:60
 msgid "Active"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:64
-#: View/ObjectTemplates/view.ctp:28
+#: View/ObjectTemplates/index.ctp:71
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:117
+#: View/ObjectTemplates/index.ctp:124
 msgid "Force update"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:117
+#: View/ObjectTemplates/index.ctp:124
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:118
+#: View/ObjectTemplates/index.ctp:125
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:35
+#: View/ObjectTemplates/view.ctp:33
 msgid " Object Template"
 msgstr ""
 
-#: View/Objects/add.ctp:11
+#: View/Objects/add.ctp:7
 msgid " Object"
 msgstr ""
 
-#: View/Objects/add.ctp:14
+#: View/Objects/add.ctp:10
 #: View/Objects/group_attributes_into_object.ctp:6
 msgid "Object Template"
 msgstr ""
 
-#: View/Objects/add.ctp:19
+#: View/Objects/add.ctp:15
 msgid "Update the template of this object to the newer version: "
 msgstr ""
 
-#: View/Objects/add.ctp:21
-msgid "Update template to v%s"
+#: View/Objects/add.ctp:17
+msgid "Update template"
 msgstr ""
 
-#: View/Objects/add.ctp:47
+#: View/Objects/add.ctp:43
 #: View/Objects/group_attributes_into_object.ctp:10
 msgid "Meta category"
 msgstr ""
 
-#: View/Objects/add.ctp:110
+#: View/Objects/add.ctp:98
 msgid "Warning, issues found with the template"
 msgstr ""
 
-#: View/Objects/add.ctp:124
+#: View/Objects/add.ctp:111
+msgid "Save"
+msgstr ""
+
+#: View/Objects/add.ctp:112
 msgid "Name :: type"
 msgstr ""
 
-#: View/Objects/add.ctp:181;192
+#: View/Objects/add.ctp:169;180
 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:196
+#: View/Objects/add.ctp:184
 msgid "Back"
 msgstr ""
 
-#: View/Objects/add.ctp:208
-msgid "Current Object state on older template version"
+#: View/Objects/add.ctp:196
+msgid "Pre-update object's template"
 msgstr ""
 
-#: View/Objects/add.ctp:230
-#: View/Objects/revise_object.ctp:9
+#: View/Objects/add.ctp:202
+#: View/Objects/group_attributes_into_object.ctp:54
+#: View/Organisations/ajax/merge.ctp:56;63
+#: View/Pages/doc/using_the_system.ctp:163;203
+msgid "ID"
+msgstr ""
+
+#: View/Objects/add.ctp:218
+#: View/Objects/revise_object.ctp:45
 msgid "Template version"
 msgstr ""
 
-#: View/Objects/add.ctp:233
-msgid "The original object's template is unkown and some attributes might be lost. Please review carefully"
-msgstr ""
-
-#: View/Objects/add.ctp:234
-msgid "Unkown original template"
-msgstr ""
-
-#: View/Objects/add.ctp:242
-msgid "Obj. rel."
-msgstr ""
-
-#: View/Objects/add.ctp:243
-msgid "Categ."
-msgstr ""
-
-#: View/Objects/add.ctp:250;310
+#: View/Objects/add.ctp:225;285
 msgid "Can not be merged automatically"
 msgstr ""
 
-#: View/Objects/add.ctp:255;315
+#: View/Objects/add.ctp:230;290
 msgid "This attribute type is missing from the new template. It will be lost if not taken care of right now."
 msgstr ""
 
-#: View/Objects/add.ctp:277
+#: View/Objects/add.ctp:252
 msgid "Insert"
 msgstr ""
 
-#: View/Objects/add.ctp:280
+#: View/Objects/add.ctp:255
 msgid "No valid type. This attribute will be lost."
 msgstr ""
 
-#: View/Objects/add.ctp:287
+#: View/Objects/add.ctp:262
 msgid "This attribute can be merged automatically. Injection in the template done."
 msgstr ""
 
-#: View/Objects/add.ctp:302
+#: View/Objects/add.ctp:277
 msgid "Attributes to merge"
 msgstr ""
 
-#: View/Objects/add.ctp:303
+#: View/Objects/add.ctp:278
 msgid "Contextual information and actions"
 msgstr ""
 
-#: View/Objects/add.ctp:313
+#: View/Objects/add.ctp:288
 msgid "Overwrite the current attribute value with this one"
 msgstr ""
 
-#: View/Objects/add.ctp:323
+#: View/Objects/add.ctp:298
 msgid "Original value: "
 msgstr ""
 
-#: View/Objects/add.ctp:328
+#: View/Objects/add.ctp:303
 msgid "Can be merged automatically. Injection done."
 msgstr ""
 
-#: View/Objects/add.ctp:331
+#: View/Objects/add.ctp:306
 msgid "An instance of this attribute already exists. However, as multiple instances are allowed by this template, the two attributes will be kept."
 msgstr ""
 
-#: View/Objects/add.ctp:360;371
+#: View/Objects/add.ctp:335;346
 msgid "Enter value manually"
 msgstr ""
 
@@ -16832,6 +13544,14 @@ msgstr ""
 msgid "Selected Attributes will be %s deleted"
 msgstr ""
 
+#: View/Objects/group_attributes_into_object.ctp:129
+msgid "hard"
+msgstr ""
+
+#: View/Objects/group_attributes_into_object.ctp:129
+msgid "soft"
+msgstr ""
+
 #: View/Objects/orphaned_object_diagnostics.ctp:3
 msgid "Object reconstruction"
 msgstr ""
@@ -16896,47 +13616,43 @@ msgstr ""
 msgid "This Attribute type is not allowed to be present multiple time in this Object. Consider only picking one."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:18
+#: View/Objects/revise_object.ctp:2
 msgid "Object pre-save review"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:19
-msgid "Make sure that the below Object reflects your expectation before submitting it."
+#: 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:56
+#: View/Objects/revise_object.ctp:66
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:103
+#: View/Objects/revise_object.ctp:110
 msgid "Create new object"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:103
-msgid "Update object"
-msgstr ""
-
-#: View/Objects/revise_object.ctp:104
+#: View/Objects/revise_object.ctp:111
 msgid "Back to review"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:107
+#: View/Objects/revise_object.ctp:114
 msgid "This event contains similar objects."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:108
+#: View/Objects/revise_object.ctp:115
 msgid "Instead of creating a new object, would you like to merge your new object into one of the following?"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:125
+#: View/Objects/revise_object.ctp:132
 msgid "All similar objects not displayed..."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:126
+#: View/Objects/revise_object.ctp:133
 msgid "%s Similar objects found. %s not displayed"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:164
+#: View/Objects/revise_object.ctp:170
 msgid "This attribute will NOT be merged into the similar object as it is conflicting with another attribute."
 msgstr ""
 
@@ -16956,32 +13672,24 @@ msgstr ""
 msgid "Add Object attribute"
 msgstr ""
 
-#: View/OrgBlocklists/add.ctp:4
-msgid "Add Organisation Blocklist Entries"
+#: View/OrgBlacklists/add.ctp:4
+msgid "Add Organisation Blacklist Entries"
 msgstr ""
 
-#: View/OrgBlocklists/add.ctp:5
-msgid "Blocklisting an organisation prevents the creation of any event by that organisation on this instance as well as syncing of that organisation's events to this instance. It does not prevent a local user of the blocklisted organisation from logging in and editing or viewing data."
+#: 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/OrgBlocklists/add.ctp:6
-msgid "Paste a list of all the organisation UUIDs that you want to add to the blocklist below (one per line)."
-msgstr ""
-
-#: View/OrgBlocklists/add.ctp:19
+#: View/OrgBlacklists/add.ctp:18
 msgid "(Optional) The organisation name that the organisation is associated with"
 msgstr ""
 
-#: View/OrgBlocklists/edit.ctp:4
-msgid "Edit Organisation Blocklist Entries"
+#: View/OrgBlacklists/index.ctp:2
+msgid "Organisation Blacklists"
 msgstr ""
 
-#: View/OrgBlocklists/index.ctp:2
-msgid "Organisation Blocklists"
-msgstr ""
-
-#: View/OrgBlocklists/index.ctp:30
-msgid "Are you sure you want to delete the blocklist entry for the organisation UUID %s?"
+#: 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
@@ -17054,7 +13762,7 @@ msgstr ""
 
 #: View/Organisations/admin_add.ctp:37
 #: View/Organisations/admin_edit.ctp:48
-msgid "Logo (48×48 PNG or SVG)"
+msgid "Logo (48x48 png)"
 msgstr ""
 
 #: View/Organisations/admin_add.ctp:43
@@ -17093,9 +13801,9 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: View/Organisations/index.ctp:5;60
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:59
+#: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr ""
@@ -17104,7 +13812,7 @@ msgstr ""
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9;55
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -17113,7 +13821,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13;50
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr ""
@@ -17130,58 +13838,65 @@ msgstr ""
 msgid "View all"
 msgstr ""
 
-#: View/Organisations/index.ctp:79
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr ""
 
-#: View/Organisations/index.ctp:90
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr ""
 
-#: View/Organisations/index.ctp:93
-#: View/Users/statistics.ctp:25
-#: View/Users/statistics_data.ctp:30
-#: View/Users/statistics_orgs.ctp:34
-#: View/Users/ajax/admin_index.ctp:3
-msgid "Users"
-msgstr ""
-
-#: View/Organisations/view.ctp:13
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:12
+#: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr ""
 
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:27
+#: View/Organisations/view.ctp:22
 msgid "Domain restrictions"
 msgstr ""
 
-#: View/Organisations/view.ctp:32
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
 msgid "Last modified"
 msgstr ""
 
-#: View/Organisations/view.ctp:45
+#: View/Organisations/view.ctp:30
+#: View/Users/statistics_orgs.ctp:39
+msgid "Sector"
+msgstr ""
+
+#: View/Organisations/view.ctp:30
+#: View/Users/statistics_orgs.ctp:37
+msgid "Nationality"
+msgstr ""
+
+#: View/Organisations/view.ctp:30
 #: View/Organisations/ajax/merge.ctp:19
 msgid "Organisation type"
 msgstr ""
 
-#: View/Organisations/view.ctp:45
+#: View/Organisations/view.ctp:30
 msgid "Contact information"
 msgstr ""
 
-#: View/Organisations/view.ctp:54
+#: View/Organisations/view.ctp:39
 msgid "Organisation "
 msgstr ""
 
-#: View/Organisations/view.ctp:66;67
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr ""
 
@@ -17201,6 +13916,10 @@ msgstr ""
 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 ""
@@ -17225,10 +13944,6 @@ msgstr ""
 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 ""
@@ -17423,7 +14138,7 @@ msgid "Settings and Diagnostics"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:11;171
-msgid "Blocklist"
+msgid "Blacklist"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:14
@@ -17510,7 +14225,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
-#: View/Servers/edit.ctp:92
+#: View/Servers/edit.ctp:90
 msgid "Misc settings"
 msgstr ""
 
@@ -17587,11 +14302,11 @@ msgid "Displays OK if the worker is running. If the _schdlr_ worker is the only
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:59
-msgid "Import Blocklist"
+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 blocklisting the value in this section."
+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
@@ -17599,7 +14314,7 @@ msgid "Adding and modifying entries"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:62
-msgid "Administrators can add, edit or delete blocklisted items by using the appropriate functions in the list's action menu and the menu on the left."
+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
@@ -17623,19 +14338,19 @@ msgid "Add, edit or remove Regexp entries that will affect all newly created att
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:73
-msgid "Managing the Signature allowedlist"
+msgid "Managing the Signature whitelist"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:74
-msgid "The signature allowedlist view, accessible through the administration menu on the left, allows administrators to create and maintain a list of addresses that are allowedlisted from ever being added to the NIDS signatures. Addresses listed here will be commented out when exporting the NIDS list."
+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 "Allowedlisting an address"
+msgid "Whitelisting an address"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:76
-msgid "While in the allowedlist view, click on New Allowedlist on the left to bring up the add allowedlist view to add a new address."
+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
@@ -17643,7 +14358,7 @@ msgid "Managing the list"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:78
-msgid "When viewing the list of allowedlisted addresses, the following pieces of information are shown: The ID of the allowedlist entry (assigned automatically when a new address is added), the address itself that is being allowedlisted and a set of controls allowing you to delete the entry or edit the address."
+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
@@ -17695,7 +14410,8 @@ msgid "The organisation of the user. Entering ADMIN into this field will give ad
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:91;120;170
-#: View/Roles/index.ctp:140
+#: View/Roles/admin_index.ctp:2
+#: View/Roles/index.ctp:2
 msgid "Roles"
 msgstr ""
 
@@ -17704,6 +14420,9 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:92;121
+#: View/Users/admin_add.ctp:77
+#: View/Users/admin_edit.ctp:71
+#: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
 msgstr ""
 
@@ -17712,6 +14431,9 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
+#: View/Users/admin_add.ctp:82
+#: View/Users/admin_edit.ctp:72
+#: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
 msgstr ""
 
@@ -17721,8 +14443,8 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_edit.ctp:63
-#: View/Users/admin_index.ctp:87
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:26
 msgid "Authkey"
 msgstr ""
 
@@ -17775,6 +14497,9 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_index.ctp:76
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -17803,6 +14528,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:95
 msgid "Newsread"
 msgstr ""
 
@@ -17862,6 +14588,14 @@ msgstr ""
 msgid "Contact your users here."
 msgstr ""
 
+#: View/Pages/doc/administration.ctp:133;184;197
+#: View/Pages/doc/using_the_system.ctp:269
+#: View/Servers/ondemand_action.ctp:3
+#: View/Servers/ajax/submoduleStatus.ctp:7
+#: 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 ""
@@ -18045,12 +14779,12 @@ msgid "Creation, deletion, Accept, Discard"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:172
-msgid "Allowedlist"
+msgid "Whitelist"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:173
-#: View/Regexp/admin_index.ctp:15
-#: View/Regexp/index.ctp:15
+#: View/Regexp/admin_index.ctp:22
+#: View/Regexp/index.ctp:22
 msgid "Regexp"
 msgstr ""
 
@@ -18279,7 +15013,7 @@ msgid "The time (in 24h format) when the task should be executed the next time i
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:240
-#: View/Tasks/index.ctp:31
+#: View/Tasks/index.ctp:38
 msgid "Next Run"
 msgstr ""
 
@@ -18582,7 +15316,7 @@ msgid "You can view the Regular Expression rules, which modify the data that can
 msgstr ""
 
 #: View/Pages/doc/general.ctp:51
-msgid "You can view the allowedlist 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."
+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
@@ -18876,7 +15610,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:55
+#: View/Users/statistics_data.ctp:53
 msgid "Activity Heatmap"
 msgstr ""
 
@@ -18893,7 +15627,7 @@ msgid "All the events and attributes that get entered into MISP will be run thro
 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 blocklist data by not defining a replacement for a regular expression."
+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
@@ -19316,6 +16050,10 @@ msgstr ""
 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 ""
@@ -19652,6 +16390,10 @@ msgstr ""
 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 ""
@@ -20183,7 +16925,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:171
+#: View/Servers/index.ctp:175
 msgid "Push all"
 msgstr ""
 
@@ -20191,6 +16933,11 @@ msgstr ""
 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:172
+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 ""
@@ -20321,71 +17068,75 @@ msgstr ""
 msgid "Edit Import Regexp"
 msgstr ""
 
-#: View/Regexp/admin_index.ctp:16
-#: View/Regexp/index.ctp:16
+#: View/Regexp/admin_index.ctp:23
+#: View/Regexp/index.ctp:23
 msgid "Replacement"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:6
+#: View/Roles/admin_add.ctp:9
 #: View/Roles/admin_edit.ctp:9
 msgid "Restrict to site admins"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:24
-msgid "Memory limit (%s)"
-msgstr ""
-
-#: View/Roles/admin_add.ctp:29
-msgid "Maximum execution time (%ss)"
-msgstr ""
-
-#: View/Roles/admin_add.ctp:33
-#: View/Roles/admin_edit.ctp:26
-msgid "Enforce search rate limit"
-msgstr ""
-
-#: View/Roles/admin_add.ctp:38
-#: View/Roles/admin_edit.ctp:32
-msgid "# of searches / 15 min"
-msgstr ""
-
+#: View/Roles/admin_add.ctp:19
 #: View/Roles/admin_edit.ctp:18
+#: View/Roles/admin_index.ctp:33
 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:31
-msgid "Permission"
+#: View/Roles/admin_add.ctp:26
+#: View/Roles/admin_edit.ctp:26
+msgid "Enforce search rate limit"
 msgstr ""
 
-#: View/Roles/index.ctp:54
-msgid "Memory Limit"
+#: View/Roles/admin_add.ctp:32
+#: View/Roles/admin_edit.ctp:32
+msgid "# of searches / 15 min"
 msgstr ""
 
-#: View/Roles/index.ctp:64
+#: View/Roles/admin_index.ctp:24
+msgid "Restricted to site admins"
+msgstr ""
+
+#: View/Roles/admin_index.ctp:34
 msgid "Max execution time"
 msgstr ""
 
-#: View/Roles/index.ctp:74
+#: View/Roles/admin_index.ctp:35
 msgid "Searches / 15 mins"
 msgstr ""
 
-#: View/Roles/index.ctp:78
-msgid "Unlimited"
+#: View/Roles/admin_index.ctp:41
+msgid "Default role"
 msgstr ""
 
-#: View/Roles/index.ctp:117
-msgid "Add role"
+#: View/Roles/admin_index.ctp:53
+#: View/Roles/index.ctp:47
+msgid "%s permission %s"
 msgstr ""
 
-#: View/Roles/index.ctp:141
-msgid "Instance specific permission roles."
+#: View/Roles/index.ctp:36
+msgid "ok"
 msgstr ""
 
-#: View/Roles/view.ctp:13
+#: View/Roles/index.ctp:36
+msgid "remove"
+msgstr ""
+
+#: View/Roles/index.ctp:45
+msgid "Granted"
+msgstr ""
+
+#: View/Roles/index.ctp:45
+msgid "Not granted"
+msgstr ""
+
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr ""
 
@@ -20443,7 +17194,7 @@ msgstr ""
 
 #: View/Servers/add.ctp:67
 #: View/Servers/edit.ctp:74
-msgid "Remote Organisation's UUID"
+msgid "Remote Organisation's Uuid"
 msgstr ""
 
 #: View/Servers/add.ctp:76
@@ -20456,81 +17207,61 @@ msgstr ""
 msgid "Enabled synchronisation methods"
 msgstr ""
 
-#: View/Servers/add.ctp:102
+#: View/Servers/add.ctp:100
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:108
+#: View/Servers/add.ctp:106
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:113
-#: View/Servers/edit.ctp:152
+#: View/Servers/add.ctp:111
+#: View/Servers/edit.ctp:150
 msgid "Push rules:"
 msgstr ""
 
+#: View/Servers/add.ctp:112;118
+#: View/Servers/edit.ctp:151;157
+msgid "Events with the following tags allowed: "
+msgstr ""
+
+#: View/Servers/add.ctp:113;119
+#: View/Servers/edit.ctp:152;158
+msgid "Events with the following tags blocked: "
+msgstr ""
+
 #: View/Servers/add.ctp:114;120
 #: View/Servers/edit.ctp:153;159
-msgid "Events with the following tags allowed: "
+msgid "Events with the following organisations allowed: "
 msgstr ""
 
 #: View/Servers/add.ctp:115;121
 #: View/Servers/edit.ctp:154;160
-msgid "Events with the following tags blocked: "
-msgstr ""
-
-#: View/Servers/add.ctp:116;122
-#: View/Servers/edit.ctp:155;161
-msgid "Events with the following organisations allowed: "
-msgstr ""
-
-#: View/Servers/add.ctp:117;123
-#: View/Servers/edit.ctp:156;162
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:119
-#: View/Servers/edit.ctp:158
+#: View/Servers/add.ctp:117
+#: View/Servers/edit.ctp:156
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:190
+#: View/Servers/add.ctp:145
+#: View/Servers/edit.ctp:188
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:153
+#: View/Servers/add.ctp:151
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:154
+#: View/Servers/add.ctp:152
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:155
+#: View/Servers/add.ctp:153
 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/compare_servers.ctp:4
-msgid "Events count"
-msgstr ""
-
-#: View/Servers/compare_servers.ctp:11
-msgid "Server events overlap analysis matrix"
-msgstr ""
-
-#: View/Servers/compare_servers.ctp:37
-msgid "<b>S%s</b>: %s"
-msgstr ""
-
-#: View/Servers/compare_servers.ctp:62
-msgid "None or less than 1 % of the events of %s is contained in %s (%s matching events)"
-msgstr ""
-
-#: View/Servers/compare_servers.ctp:64
-msgid "%s % of the events of %s is contained in %s (%s matching events)"
-msgstr ""
-
 #: View/Servers/create_sync.ctp:4
 msgid "Server configuration"
 msgstr ""
@@ -20551,46 +17282,34 @@ msgstr ""
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:109
+#: View/Servers/edit.ctp:107
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:117;139
+#: View/Servers/edit.ctp:115;137
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:118;140
+#: View/Servers/edit.ctp:116;138
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:131
+#: View/Servers/edit.ctp:129
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:163
+#: View/Servers/edit.ctp:161
 msgid "Additional parameters: "
 msgstr ""
 
-#: View/Servers/edit.ctp:199
+#: View/Servers/edit.ctp:197
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:265;269
+#: View/Servers/edit.ctp:263;267
 msgid "Not set."
 msgstr ""
 
-#: View/Servers/event_block_rule.ctp:7
-msgid "Set event block rules"
-msgstr ""
-
-#: View/Servers/event_block_rule.ctp:8
-msgid "Event block rules allow you to add a simple tag filter to block events from being added or synced. Events with a tag that matches any of the tags in the rule list will be blocked. It is not possible to add more complex rules with boolean logic (NOT, AND)."
-msgstr ""
-
-#: View/Servers/event_block_rule.ctp:13
-msgid "Rule set (json)"
-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 ""
@@ -20603,50 +17322,6 @@ msgstr ""
 msgid "Apply filters to the remote instance's index"
 msgstr ""
 
-#: View/Servers/id_translator.ctp:7
-msgid "Allows to translate a local ID into the corresponding event ID on sync servers configured."
-msgstr ""
-
-#: View/Servers/id_translator.ctp:12
-msgid "Event ID or UUID"
-msgstr ""
-
-#: View/Servers/id_translator.ctp:14
-msgid "1234"
-msgstr ""
-
-#: View/Servers/id_translator.ctp:20
-msgid "Referencing an event which is"
-msgstr ""
-
-#: View/Servers/id_translator.ctp:22
-msgid "remote"
-msgstr ""
-
-#: View/Servers/id_translator.ctp:31
-msgid "ID referenced on server"
-msgstr ""
-
-#: View/Servers/id_translator.ctp:48
-msgid "Local ID"
-msgstr ""
-
-#: View/Servers/id_translator.ctp:51
-msgid "Remote ID:"
-msgstr ""
-
-#: View/Servers/id_translator.ctp:53
-msgid "preview"
-msgstr ""
-
-#: View/Servers/id_translator.ctp:57
-msgid "Remote server unreachable: %s"
-msgstr ""
-
-#: View/Servers/id_translator.ctp:59
-msgid "Not found"
-msgstr ""
-
 #: View/Servers/import.ctp:4
 msgid "Paste server data"
 msgstr ""
@@ -20663,88 +17338,76 @@ msgstr ""
 msgid "Servers"
 msgstr ""
 
-#: View/Servers/index.ctp:16
+#: View/Servers/index.ctp:23
 msgid "Prio"
 msgstr ""
 
-#: View/Servers/index.ctp:17
+#: View/Servers/index.ctp:24
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:18
+#: View/Servers/index.ctp:25
 msgid "Sync user"
 msgstr ""
 
-#: View/Servers/index.ctp:19
+#: View/Servers/index.ctp:26
 msgid "Reset API key"
 msgstr ""
 
-#: View/Servers/index.ctp:30
+#: View/Servers/index.ctp:35
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:65
+#: View/Servers/index.ctp:70
 msgid "URL params"
 msgstr ""
 
-#: View/Servers/index.ctp:80;81
+#: View/Servers/index.ctp:85;86
 msgid "Move server priority up"
 msgstr ""
 
-#: View/Servers/index.ctp:80;81
+#: View/Servers/index.ctp:85;86
 msgid "Move server priority down"
 msgstr ""
 
-#: View/Servers/index.ctp:95
+#: View/Servers/index.ctp:102
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:95
+#: View/Servers/index.ctp:102
 #: View/Sightingdb/index.ctp:35
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:96
+#: View/Servers/index.ctp:103
 msgid "View the sync user of the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:104;105
+#: View/Servers/index.ctp:111;112
 msgid "Remotely reset API key"
 msgstr ""
 
-#: View/Servers/index.ctp:112
+#: View/Servers/index.ctp:119
 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:112
+#: View/Servers/index.ctp:119
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:136
-msgid "Age: %s%s"
-msgstr ""
-
-#: View/Servers/index.ctp:162
+#: View/Servers/index.ctp:169
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:164
+#: View/Servers/index.ctp:171
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
-#: View/Servers/index.ctp:164
+#: View/Servers/index.ctp:171
 msgid "Pull updates"
 msgstr ""
 
-#: View/Servers/index.ctp:168
-msgid "Pull known relevant custom clusters"
-msgstr ""
-
-#: View/Servers/index.ctp:168
-msgid "Pull relevant clusters"
-msgstr ""
-
-#: View/Servers/index.ctp:174
+#: View/Servers/index.ctp:178
 msgid "Cache instance"
 msgstr ""
 
@@ -20776,27 +17439,27 @@ msgstr ""
 msgid "This action has been done and cannot be run again."
 msgstr ""
 
-#: View/Servers/preview_event.ctp:13
+#: 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:13
+#: View/Servers/preview_event.ctp:31
 msgid "Filter the remote instance on the tag: %s"
 msgstr ""
 
-#: View/Servers/preview_event.ctp:60
-msgid "You are currently viewing an event on the remote instance %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:108
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:108
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr ""
 
@@ -20856,55 +17519,51 @@ msgstr ""
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:70
+#: View/Servers/rest.ctp:69
 msgid "Use full path - disclose my apikey"
 msgstr ""
 
-#: View/Servers/rest.ctp:75
+#: View/Servers/rest.ctp:73
 msgid "Bookmark query"
 msgstr ""
 
-#: View/Servers/rest.ctp:84
+#: View/Servers/rest.ctp:82
 msgid "Bookmark name"
 msgstr ""
 
-#: View/Servers/rest.ctp:92
+#: View/Servers/rest.ctp:90
 msgid "Show result"
 msgstr ""
 
-#: View/Servers/rest.ctp:97
+#: View/Servers/rest.ctp:95
 msgid "Skip SSL validation"
 msgstr ""
 
-#: View/Servers/rest.ctp:104
+#: View/Servers/rest.ctp:102
 msgid "HTTP headers"
 msgstr ""
 
-#: View/Servers/rest.ctp:117
+#: View/Servers/rest.ctp:115
 msgid " Inject"
 msgstr ""
 
-#: View/Servers/rest.ctp:118
+#: View/Servers/rest.ctp:116
 msgid " Show rules"
 msgstr ""
 
-#: View/Servers/rest.ctp:127
+#: View/Servers/rest.ctp:125
 msgid "HTTP body"
 msgstr ""
 
-#: View/Servers/rest.ctp:135
+#: View/Servers/rest.ctp:133
 msgid "Run query"
 msgstr ""
 
-#: View/Servers/rest.ctp:163
-msgid "Queried URL"
-msgstr ""
-
-#: View/Servers/rest.ctp:164
+#: View/Servers/rest.ctp:162
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:165
+#: View/Servers/rest.ctp:163
 msgid "Request duration"
 msgstr ""
 
@@ -20917,54 +17576,46 @@ msgid "To edit a setting, simply double click it."
 msgstr ""
 
 #: View/Servers/update_progress.ctp:34
-msgid "Updates are locked due to an ongoing update process. Release the update lock only if you know what you are doing."
+msgid "Updates are locked due to an ongoing update process. Release lock only if you know what you are doing."
 msgstr ""
 
 #: View/Servers/update_progress.ctp:35
-msgid "Before unlocking, make sure %s is healthy"
-msgstr ""
-
-#: View/Servers/update_progress.ctp:35
-msgid "the update worker"
-msgstr ""
-
-#: View/Servers/update_progress.ctp:36
 msgid "automatically unlock in %smin %ssec"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:41
+#: View/Servers/update_progress.ctp:40
 msgid "Release update lock"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:55
+#: View/Servers/update_progress.ctp:54
 msgid "Complete update progression"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:56
+#: View/Servers/update_progress.ctp:55
 msgid "%s remaining"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:63
+#: View/Servers/update_progress.ctp:62
 msgid "Database Update progress for update %s"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:134
+#: View/Servers/update_progress.ctp:133
 msgid "Update "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:137
+#: View/Servers/update_progress.ctp:136
 msgid "Started @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:141
+#: View/Servers/update_progress.ctp:140
 msgid "Elapsed Time @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:193
+#: View/Servers/update_progress.ctp:192
 msgid "No update in progress"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:214
+#: View/Servers/update_progress.ctp:213
 msgid "Follow updates"
 msgstr ""
 
@@ -21012,10 +17663,6 @@ msgstr ""
 msgid "Update all submodules"
 msgstr ""
 
-#: View/Servers/ajax/submoduleStatus.ctp:32
-msgid " (%s days, %s hours older than super project)"
-msgstr ""
-
 #: View/Servers/ajax/submoduleStatus.ctp:36
 msgid "Newer version. Make sure to update MISP"
 msgstr ""
@@ -21032,12 +17679,8 @@ msgstr ""
 msgid "Update submodule"
 msgstr ""
 
-#: View/Servers/ajax/submoduleStatus.ctp:68
-msgid "Update result:"
-msgstr ""
-
 #: View/Servers/ajax/update.ctp:7
-msgid "Do you want to pull the latest commit from the %s branch? If you have made local changes to MISP the merge will fail."
+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
@@ -21045,72 +17688,68 @@ msgid "ZeroMQ Server Status"
 msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:5
-msgid "Reply time"
+msgid "Start time"
 msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:6
-msgid "Start time"
+msgid "Settings read at"
 msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:7
 msgid "Events processed"
 msgstr ""
 
-#: View/Servers/ajax/zeromqstatus.ctp:8
-msgid "Messages processed"
-msgstr ""
-
-#: View/Servers/ajax/zeromqstatus.ctp:10
+#: View/Servers/ajax/zeromqstatus.ctp:9
 msgid "The ZeroMQ server is unreachable."
 msgstr ""
 
-#: View/Servers/ajax/zeromqstatus.ctp:12
+#: View/Servers/ajax/zeromqstatus.ctp:11
 msgid "Cancel prompt"
 msgstr ""
 
-#: View/ShadowAttributes/add.ctp:5
+#: View/ShadowAttributes/add.ctp:4
 #: View/ShadowAttributes/edit.ctp:4
 msgid "Add Proposal"
 msgstr ""
 
-#: View/ShadowAttributes/add.ctp:63
+#: View/ShadowAttributes/add.ctp:63;76
 #: View/ShadowAttributes/add_attachment.ctp:35
 #: View/ShadowAttributes/edit.ctp:62
 msgid "Propose"
 msgstr ""
 
-#: View/ShadowAttributes/edit.ctp:14
-msgid "Type "
+#: View/ShadowAttributes/edit.ctp:41
+msgid "IDS Signature?"
 msgstr ""
 
-#: View/ShadowAttributes/edit.ctp:56;65
-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/ShadowAttributes/index.ctp:12
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:17
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:49
+#: View/ShadowAttributes/index.ctp:50
 msgid "Proposal by"
 msgstr ""
 
 #: View/ShadowAttributes/index.ctp:56
-msgid "Change requested"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:63
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:75
+#: View/ShadowAttributes/index.ctp:62
 msgid "Proposed value"
 msgstr ""
 
+#: View/ShadowAttributes/index.ctp:91
+msgid "Attribute edit"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:93
+msgid "New Attribute"
+msgstr ""
+
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:7
 msgid "Are you sure you want to propose to delete Attribute #%s?"
 msgstr ""
@@ -21177,7 +17816,7 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:53
 #: View/SharingGroups/edit.ctp:53
-#: View/SharingGroups/index.ctp:86
+#: View/SharingGroups/index.ctp:47
 msgid "Releasable to"
 msgstr ""
 
@@ -21228,6 +17867,7 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:73
 #: View/SharingGroups/edit.ctp:73
+#: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr ""
 
@@ -21289,60 +17929,26 @@ msgstr ""
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:24
+#: View/SharingGroups/index.ctp:2
+msgid "Sharing Groups"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:69
-msgid "Creator"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:80
-msgid "Org count"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:89
-msgid "Organisations:"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:119
+#: View/SharingGroups/index.ctp:82
 msgid "Distribution List"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:152
-msgid "Are you sure you want to delete the sharing group?"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:159
-msgid "Delete Sharing Group"
-msgstr ""
-
-#: View/SharingGroups/view.ctp:9
-msgid "Releasability"
-msgstr ""
-
-#: View/SharingGroups/view.ctp:19
+#: View/SharingGroups/view.ctp:28
 msgid "Synced by"
 msgstr ""
 
-#: View/SharingGroups/view.ctp:47
-msgid "Is local"
-msgstr ""
-
-#: View/SharingGroups/view.ctp:48
-msgid "Can extend"
-msgstr ""
-
-#: View/SharingGroups/view.ctp:31
-msgid "%s organisation"
-msgid_plural "%s organisations"
-msgstr[0] ""
-msgstr[1] ""
-
 #: View/Sightingdb/index.ctp:41
 msgid "Quick Search"
 msgstr ""
@@ -21400,12 +18006,12 @@ msgstr ""
 msgid "My org"
 msgstr ""
 
-#: View/Sightings/ajax/list_sightings.ctp:3
-msgid "Delete sighting"
+#: View/Sightings/ajax/list_sightings.ctp:10
+msgid "Attribute ID"
 msgstr ""
 
-#: View/Sightings/ajax/list_sightings.ctp:14
-msgid "Attribute ID"
+#: View/Sightings/ajax/list_sightings.ctp:35
+msgid "Delete sighting"
 msgstr ""
 
 #: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
@@ -21466,59 +18072,52 @@ msgstr ""
 msgid "Unselectable Tag"
 msgstr ""
 
-#: View/Tags/index.ctp:14
-msgid "Simple"
+#: View/Tags/index.ctp:10
+msgid "Your Favourite Tags"
 msgstr ""
 
-#: View/Tags/index.ctp:19
-msgid "Advanced"
-msgstr ""
-
-#: View/Tags/index.ctp:40
-msgid "Exportable"
-msgstr ""
-
-#: View/Tags/index.ctp:47
-#: View/Taxonomies/view.ctp:117
-msgid "Hidden"
+#: View/Tags/index.ctp:56
+msgid "Filter user tags"
 msgstr ""
 
 #: View/Tags/index.ctp:63
+msgid "Exportable"
+msgstr ""
+
+#: View/Tags/index.ctp:64
+#: View/Taxonomies/view.ctp:128
+msgid "Hidden"
+msgstr ""
+
+#: View/Tags/index.ctp:66
 msgid "Restricted to org"
 msgstr ""
 
-#: View/Tags/index.ctp:70
+#: View/Tags/index.ctp:68
 msgid "Restricted to user"
 msgstr ""
 
-#: View/Tags/index.ctp:77
+#: View/Tags/index.ctp:70
 msgid "Taxonomy"
 msgstr ""
 
-#: View/Tags/index.ctp:85
+#: View/Tags/index.ctp:71
 msgid "Tagged events"
 msgstr ""
 
-#: View/Tags/index.ctp:92
+#: View/Tags/index.ctp:72
 msgid "Tagged attributes"
 msgstr ""
 
-#: View/Tags/index.ctp:109
+#: View/Tags/index.ctp:74;119
 msgid "Favourite"
 msgstr ""
 
-#: View/Tags/index.ctp:125
+#: View/Tags/index.ctp:123
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr ""
 
-#: View/Tags/index.ctp:142
-msgid "Are you sure you want to delete the Tag?"
-msgstr ""
-
-#: View/Tags/index.ctp:144
-msgid "Delete tag"
-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 ""
@@ -21527,89 +18126,81 @@ msgstr ""
 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:29
+#: View/Tasks/index.ctp:36
 msgid "Frequency (h)"
 msgstr ""
 
-#: View/Tasks/index.ctp:48
+#: View/Tasks/index.ctp:55
 msgid "Set frequency timer for scheduled task"
 msgstr ""
 
-#: View/Tasks/index.ctp:63
+#: View/Tasks/index.ctp:70
 msgid "Set scheduled time for task"
 msgstr ""
 
-#: View/Tasks/index.ctp:89
+#: View/Tasks/index.ctp:96
 msgid "Update all"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:78
+#: View/Taxonomies/index.ctp:26
+msgid "Required"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:27
 msgid "Active Tags"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:84
+#: View/Taxonomies/index.ctp:38
 msgid "enable all"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:84
+#: View/Taxonomies/index.ctp:38
 msgid "Enable all tags"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:84
+#: View/Taxonomies/index.ctp:38
 msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:97
-#: View/Taxonomies/view.ctp:10
-msgid "Are you sure you want to enable this taxonomy library?"
-msgstr ""
-
-#: View/Taxonomies/index.ctp:115
-#: View/Taxonomies/view.ctp:8
+#: View/Taxonomies/index.ctp:43
+#: View/Taxonomies/view.ctp:29
 msgid "Are you sure you want to disable this taxonomy library?"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:131
+#: View/Taxonomies/index.ctp:45
+#: View/Taxonomies/view.ctp:31
+msgid "Are you sure you want to enable this taxonomy library?"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:50
 msgid "Delete taxonomy"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:140
-msgid "View taxonomy"
-msgstr ""
-
-#: View/Taxonomies/view.ctp:42
+#: View/Taxonomies/view.ctp:62
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:48;49
+#: View/Taxonomies/view.ctp:68;69
 msgid "Hide selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:53;54
+#: View/Taxonomies/view.ctp:73;74
 msgid "Unhide selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:64
+#: View/Taxonomies/view.ctp:84
 msgid "Expanded"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:65
+#: View/Taxonomies/view.ctp:85
 msgid "Numerical value"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:85
-msgid "Numerical value overridden by userSetting.&#10;Original numerical_value = %s"
-msgstr ""
-
-#: View/Taxonomies/view.ctp:126
-msgid "View correlation graph"
-msgstr ""
-
-#: View/Taxonomies/view.ctp:143
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:148
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr ""
 
@@ -21618,7 +18209,7 @@ msgid "Taxonomy Deletion"
 msgstr ""
 
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:11
-msgid "Are you sure you want to delete Taxonomy #%s?<br /> Associated tags will not be removed. You can reload the taxonomy at any time by updating your taxonomies."
+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
@@ -21799,7 +18390,7 @@ msgstr ""
 msgid "Templates"
 msgstr ""
 
-#: View/Templates/index.ctp:38
+#: View/Templates/index.ctp:45
 msgid "Are you sure you want to delete Template #"
 msgstr ""
 
@@ -21831,23 +18422,23 @@ msgstr ""
 msgid "Shareable"
 msgstr ""
 
-#: View/Threads/index.ctp:16
+#: View/Threads/index.ctp:23
 msgid "Last Post On"
 msgstr ""
 
-#: View/Threads/index.ctp:17
+#: View/Threads/index.ctp:24
 msgid "Last Post By"
 msgstr ""
 
-#: View/Threads/index.ctp:18
+#: View/Threads/index.ctp:25
 msgid "Thread started On"
 msgstr ""
 
-#: View/Threads/index.ctp:19
+#: View/Threads/index.ctp:26
 msgid "Posts"
 msgstr ""
 
-#: View/Threads/index.ctp:73
+#: View/Threads/index.ctp:81
 msgid "View Discussion"
 msgstr ""
 
@@ -21895,11 +18486,11 @@ msgstr ""
 msgid "Accept registrations"
 msgstr ""
 
-#: View/Users/accept_registrations.ctp:97
+#: View/Users/accept_registrations.ctp:98
 msgid "The selected Role does not satisfy the user request"
 msgstr ""
 
-#: View/Users/accept_registrations.ctp:101
+#: View/Users/accept_registrations.ctp:102
 msgid "The selected Role satisfies the user request"
 msgstr ""
 
@@ -21908,20 +18499,19 @@ msgid "Admin Add User"
 msgstr ""
 
 #: View/Users/admin_add.ctp:32
-#: View/Users/admin_edit.ctp:37
+#: View/Users/admin_edit.ctp:32
 msgid "Set password"
 msgstr ""
 
 #: View/Users/admin_add.ctp:37
-#: View/Users/change_pw.ctp:6
-#: View/Users/edit.ctp:11
-msgid "Minimal length"
+#: View/Users/admin_edit.ctp:37
+#: View/Users/edit.ctp:10
+msgid "Length"
 msgstr ""
 
 #: View/Users/admin_add.ctp:38
-#: View/Users/admin_edit.ctp:46
-#: View/Users/change_pw.ctp:7
-#: View/Users/edit.ctp:12
+#: View/Users/admin_edit.ctp:38
+#: View/Users/edit.ctp:11
 msgid "Complexity"
 msgstr ""
 
@@ -21930,104 +18520,66 @@ msgid "Choose organisation"
 msgstr ""
 
 #: View/Users/admin_add.ctp:66
-#: View/Users/admin_edit.ctp:69
+#: View/Users/admin_edit.ctp:60
 msgid "Sync user for"
 msgstr ""
 
 #: View/Users/admin_add.ctp:70
-#: View/Users/admin_edit.ctp:73
-#: View/Users/edit.ctp:25
-#: View/Users/view.ctp:80
-msgid "PGP key"
-msgstr ""
-
-#: View/Users/admin_add.ctp:70
-#: View/Users/admin_edit.ctp:73
-#: View/Users/edit.ctp:25
-msgid "Paste the user's PGP key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch PGP key\" below."
+#: View/Users/admin_edit.ctp:64
+#: View/Users/edit.ctp:23
+msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch GnuPG key\" below."
 msgstr ""
 
 #: View/Users/admin_add.ctp:72
-#: View/Users/admin_edit.ctp:75
-msgid "Fetch the user's PGP key"
+#: 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:75
-#: View/Users/edit.ctp:27
-msgid "Fetch PGP key"
+#: 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:78
-#: View/Users/edit.ctp:30
-msgid "S/MIME Public certificate (PEM format)"
+#: View/Users/admin_edit.ctp:68
+msgid "SMIME key"
 msgstr ""
 
 #: View/Users/admin_add.ctp:74
-#: View/Users/admin_edit.ctp:78
-msgid "Paste the user's S/MIME public key in PEM format here."
-msgstr ""
-
-#: View/Users/admin_add.ctp:80
-#: View/Users/admin_edit.ctp:88
-#: View/Users/edit.ctp:33
-msgid "Receive email alerts when events are published"
-msgstr ""
-
-#: View/Users/admin_add.ctp:85
-#: View/Users/admin_edit.ctp:89
-#: View/Users/edit.ctp:34
-msgid "Receive email alerts from \"Contact reporter\" requests"
+#: View/Users/admin_edit.ctp:68
+msgid "Paste the user's SMIME public key in PEM format here."
 msgstr ""
 
 #: View/Users/admin_add.ctp:89
-#: View/Users/admin_edit.ctp:90
-msgid "Immediately disable this user account"
+#: View/Users/admin_edit.ctp:78
+msgid "Disable this user account"
 msgstr ""
 
 #: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
-#: View/Users/admin_add.ctp:99
-msgid "Create user"
-msgstr ""
-
 #: View/Users/admin_edit.ctp:4
 msgid "Admin Edit User"
 msgstr ""
 
-#: View/Users/admin_edit.ctp:8
-msgid "User login change is disabled on this instance"
+#: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:69
+#: View/Users/view.ctp:30
+msgid "Terms accepted"
 msgstr ""
 
-#: View/Users/admin_edit.ctp:39;86
-msgid "User password change is disabled on this instance"
+#: View/Users/admin_edit.ctp:74
+msgid "Reset Auth Key"
 msgstr ""
 
-#: View/Users/admin_edit.ctp:45
-msgid "Length"
-msgstr ""
-
-#: View/Users/admin_edit.ctp:63
-msgid "(Reset)"
-msgstr ""
-
-#: View/Users/admin_edit.ctp:84
-msgid "User must change password"
-msgstr ""
-
-#: View/Users/admin_edit.ctp:98
+#: View/Users/admin_edit.ctp:86
 #: View/Users/change_pw.ctp:18
-#: View/Users/edit.ctp:42
+#: View/Users/edit.ctp:36
 msgid "Confirm with your current password"
 msgstr ""
 
-#: View/Users/admin_edit.ctp:103
-msgid "Edit user"
-msgstr ""
-
 #: View/Users/admin_email.ctp:2
 msgid "Contact User(s)"
 msgstr ""
@@ -22053,7 +18605,7 @@ msgid "You can then specify (if eligible) what the e-mail address of the target
 msgstr ""
 
 #: View/Users/admin_email.ctp:12
-msgid "In the case of a new user, you can specify the future user's PGP key, to send his/her new key in an encrypted e-mail."
+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
@@ -22120,6 +18672,10 @@ msgstr ""
 msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
 msgstr ""
 
+#: View/Users/admin_index.ctp:6
+msgid "here"
+msgstr ""
+
 #: View/Users/admin_index.ctp:9;10
 msgid "Reset all sync user API keys"
 msgstr ""
@@ -22128,35 +18684,49 @@ msgstr ""
 msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
 msgstr ""
 
-#: View/Users/admin_index.ctp:116
-msgid "S/MIME"
+#: View/Users/admin_index.ctp:68
+msgid "authkey"
 msgstr ""
 
-#: View/Users/admin_index.ctp:130
+#: View/Users/admin_index.ctp:83
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_index.ctp:90
+msgid "PGP Key"
+msgstr ""
+
+#: View/Users/admin_index.ctp:97
+msgid "SMIME"
+msgstr ""
+
+#: View/Users/admin_index.ctp:105
+msgid "NIDS SID"
+msgstr ""
+
+#: View/Users/admin_index.ctp:111
 msgid "Terms Accepted"
 msgstr ""
 
-#: View/Users/admin_index.ctp:137
+#: View/Users/admin_index.ctp:118
 msgid "Last Login"
 msgstr ""
 
-#: View/Users/admin_index.ctp:140
-msgid "Never"
-msgstr ""
-
-#: View/Users/admin_index.ctp:152
+#: View/Users/admin_index.ctp:132
 msgid "External Auth"
 msgstr ""
 
-#: View/Users/admin_index.ctp:160
+#: View/Users/admin_index.ctp:140
 msgid "Monitored"
 msgstr ""
 
-#: View/Users/admin_index.ctp:179
+#: View/Users/admin_index.ctp:162
 msgid "Users index"
 msgstr ""
 
-#: View/Users/admin_index.ctp:219
+#: View/Users/admin_index.ctp:201
 msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -22172,6 +18742,52 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/admin_view.ctp:47
+msgid "Customauth header"
+msgstr ""
+
+#: View/Users/admin_view.ctp:55
+msgid "Invited By"
+msgstr ""
+
+#: View/Users/admin_view.ctp:67
+msgid "Org_admin"
+msgstr ""
+
+#: View/Users/admin_view.ctp:68
+#: View/Users/view.ctp:29
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:70
+msgid "Password change"
+msgstr ""
+
+#: View/Users/admin_view.ctp:78
+#: View/Users/view.ctp:38
+msgid "GnuPG fingerprint"
+msgstr ""
+
+#: View/Users/admin_view.ctp:83
+#: View/Users/view.ctp:43
+msgid "GnuPG status"
+msgstr ""
+
+#: View/Users/admin_view.ctp:90
+#: View/Users/view.ctp:50
+msgid "S/MIME Public certificate"
+msgstr ""
+
+#: View/Users/admin_view.ctp:119
+#: View/Users/view.ctp:65
+msgid "Download user profile for data portability"
+msgstr ""
+
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr ""
@@ -22180,39 +18796,19 @@ msgstr ""
 msgid "No failed composites"
 msgstr ""
 
-#: View/Users/email_otp.ctp:5
-msgid "Your administrator has turned on an additional authentication step which\n      requires you to enter a OTP (one time password) you have received via email."
+#: View/Users/edit.ctp:27
+msgid "SMIME Public certificate (PEM format)"
 msgstr ""
 
-#: View/Users/email_otp.ctp:8
-msgid "Make sure to check your SPAM folder."
-msgstr ""
-
-#: View/Users/email_otp.ctp:9
-msgid "Resend"
-msgstr ""
-
-#: View/Users/email_otp.ctp:17
-msgid "Validate your OTP"
-msgstr ""
-
-#: View/Users/email_otp.ctp:21
-msgid "One Time Password"
-msgstr ""
-
-#: View/Users/email_otp.ctp:23
-msgid "Enter your OTP here"
-msgstr ""
-
-#: View/Users/login.ctp:38;53
+#: View/Users/login.ctp:37;53
 msgid "Login"
 msgstr ""
 
-#: View/Users/login.ctp:48
+#: View/Users/login.ctp:47
 msgid "Registration will be sent to the administrators of the instance for consideration."
 msgstr ""
 
-#: View/Users/login.ctp:49
+#: View/Users/login.ctp:48
 msgid "No account yet? Register now!"
 msgstr ""
 
@@ -22315,38 +18911,45 @@ msgstr ""
 msgid "Proposals active"
 msgstr ""
 
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr ""
+
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:42
+#: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
 msgstr ""
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:47
+#: View/Users/statistics_data.ctp:45
 msgid "Discussion posts"
 msgstr ""
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:56
+#: 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:73
+#: View/Users/statistics_data.ctp:71
 msgid "Go left"
 msgstr ""
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:79
+#: View/Users/statistics_data.ctp:77
 msgid "Go right"
 msgstr ""
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:126
+#: 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:130
+#: 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 ""
 
@@ -22363,10 +18966,6 @@ msgid "Local Organisations"
 msgstr ""
 
 #: View/Users/statistics_data.ctp:38
-msgid "Event creator orgs"
-msgstr ""
-
-#: View/Users/statistics_data.ctp:40
 msgid "Average Users / Org"
 msgstr ""
 
@@ -22402,6 +19001,10 @@ msgstr ""
 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 ""
@@ -22434,74 +19037,6 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
-#: View/Users/view.ctp:10;69
-msgid "Send email to user"
-msgstr ""
-
-#: View/Users/view.ctp:18
-msgid "Event alert enabled"
-msgstr ""
-
-#: View/Users/view.ctp:19
-msgid "Contact alert enabled"
-msgstr ""
-
-#: View/Users/view.ctp:23;39
-msgid "Auth key"
-msgstr ""
-
-#: View/Users/view.ctp:24
-msgid "Request API access"
-msgstr ""
-
-#: View/Users/view.ctp:47
-msgid "Customauth header"
-msgstr ""
-
-#: View/Users/view.ctp:56
-msgid "Invited By"
-msgstr ""
-
-#: View/Users/view.ctp:72
-msgid "Org admin"
-msgstr ""
-
-#: View/Users/view.ctp:74
-msgid "NIDS Start SID"
-msgstr ""
-
-#: View/Users/view.ctp:77
-msgid "Must change password"
-msgstr ""
-
-#: View/Users/view.ctp:86
-msgid "PGP key fingerprint"
-msgstr ""
-
-#: View/Users/view.ctp:91
-msgid "PGP key status"
-msgstr ""
-
-#: View/Users/view.ctp:98
-msgid "S/MIME Public certificate"
-msgstr ""
-
-#: View/Users/view.ctp:109
-msgid "News read at"
-msgstr ""
-
-#: View/Users/view.ctp:126
-msgid "User %s"
-msgstr ""
-
-#: View/Users/view.ctp:136
-msgid "Download user profile for data portability"
-msgstr ""
-
-#: View/Users/view.ctp:138
-msgid "Auth keys"
-msgstr ""
-
 #: View/Users/ajax/discardRegistrations.ctp:5
 msgid "Discard User Registrations"
 msgstr ""
@@ -22518,10 +19053,6 @@ msgstr ""
 msgid "You are about to send a mail to %s recipient(s)?"
 msgstr ""
 
-#: View/Users/ajax/emailConfirmTemplate.ctp:13
-msgid "Send"
-msgstr ""
-
 #: View/Users/ajax/fetchpgpkey.ctp:2
 msgid "Choose the key that you would like to use"
 msgstr ""
@@ -22547,7 +19078,7 @@ msgid "Associated E-mail addresses"
 msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:16
-msgid "Select PGP key"
+msgid "Select GnuPG key"
 msgstr ""
 
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:3
@@ -22578,18 +19109,26 @@ msgstr ""
 msgid "Submit password reset"
 msgstr ""
 
-#: View/Warninglists/index.ctp:44
+#: View/Warninglists/index.ctp:2
 msgid "Warninglists"
 msgstr ""
 
-#: View/Warninglists/index.ctp:77
+#: View/Warninglists/index.ctp:35
 msgid "Valid attributes"
 msgstr ""
 
-#: View/Warninglists/index.ctp:83
+#: View/Warninglists/index.ctp:36
 msgid "Entries"
 msgstr ""
 
+#: View/Warninglists/index.ctp:61
+msgid "Delete Warninglist"
+msgstr ""
+
+#: View/Warninglists/index.ctp:61
+msgid "Delete warninglist"
+msgstr ""
+
 #: View/Warninglists/view.ctp:14
 msgid "Accepted attribute types"
 msgstr ""
@@ -22602,48 +19141,21 @@ msgstr ""
 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/genericTemplates/delete.ctp:9
-msgid "Delete %s"
+#: View/Whitelists/admin_add.ctp:4
+msgid "Add Signature Whitelist"
 msgstr ""
 
-#: View/genericTemplates/delete.ctp:20
-msgid "Are you sure you want to delete %s #%s?"
+#: View/Whitelists/admin_edit.ctp:4
+msgid "Edit Signature Whitelist"
 msgstr ""
 
-#: Model/Allowedlist.php:validation for field name
-#: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
-#: Model/DecayingModelMapping.php:validation for field attribute_type;validation for field model_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/GalaxyClusterRelationTag.php:validation for field galaxy_cluster_relation_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/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
-msgid "valueNotEmpty"
-msgstr ""
-
-#: Model/Allowedlist.php:validation for field name
-msgid "Name not in the right format. Allowedlist 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 ""
-
-#: Model/Allowedlist.php:validation for field name
-#: Model/Tag.php:validation for field name
-#: Model/TagCollection.php:validation for field name
-msgid "A similar name already exists."
+#: 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/EventReport.php:validation for field event_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
@@ -22661,16 +19173,10 @@ msgid "Options : Payload delivery, Antivirus detection, Payload installation, Fi
 msgstr ""
 
 #: Model/Attribute.php:validation for field value
-#: Model/GalaxyCluster.php:validation for field value
-#: Model/GalaxyClusterRelation.php:validation for field referenced_galaxy_cluster_type
 #: Model/ShadowAttribute.php:validation for field value
 msgid "stringNotEmpty"
 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
 #: Model/ShadowAttribute.php:validation for field value
 msgid "Value not in the right type/format. Please double check the value or select type \"other\"."
@@ -22680,13 +19186,16 @@ msgstr ""
 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/GalaxyCluster.php:validation for field published
 #: Model/Server.php:validation for field push;validation for field pull;validation for field push_sightings
 #: 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
@@ -22695,28 +19204,22 @@ msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
 #: Model/Dashboard.php:validation for field uuid
-#: Model/Event.php:validation for field uuid
-#: Model/EventBlocklist.php:validation for field event_uuid
-#: Model/EventReport.php:validation for field uuid
-#: Model/GalaxyCluster.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/OrgBlocklist.php:validation for field org_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
-#: Model/TagCollection.php:validation for field uuid
-msgid "Please provide a valid RFC 4122 UUID"
+msgid "Please provide a valid UUID"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
-#: Model/EventReport.php:validation for field uuid
-#: Model/GalaxyCluster.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
-#: Model/EventReport.php:validation for field distribution
 msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group, Inherit event"
 msgstr ""
 
@@ -22726,6 +19229,27 @@ msgstr ""
 msgid "Invalid ISO 8601 format"
 msgstr ""
 
+#: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
+#: Model/DecayingModelMapping.php:validation for field attribute_type;validation for field model_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 ""
@@ -22746,14 +19270,8 @@ msgstr ""
 msgid "Options : 0, 1, 2 (for Initial, Ongoing, Completed)"
 msgstr ""
 
-#: Model/Event.php:validation for field extends_uuid
-#: Model/GalaxyClusterBlocklist.php:validation for field cluster_uuid
-#: Model/GalaxyClusterRelation.php:validation for field galaxy_cluster_uuid;validation for field referenced_galaxy_cluster_uuid
-msgid "Please provide a valid UUID"
-msgstr ""
-
-#: Model/EventBlocklist.php:validation for field event_uuid
-msgid "Event already blocklisted."
+#: Model/EventBlacklist.php:validation for field event_uuid
+msgid "Event already blacklisted."
 msgstr ""
 
 #: Model/EventGraph.php:validation for field network_json
@@ -22779,15 +19297,6 @@ msgstr ""
 msgid "Please enter a numeric event ID or leave this field blank."
 msgstr ""
 
-#: Model/GalaxyCluster.php:validation for field distribution
-#: Model/GalaxyClusterRelation.php:validation for field distribution
-msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group"
-msgstr ""
-
-#: Model/GalaxyClusterBlocklist.php:validation for field cluster_uuid
-msgid "Galaxy Cluster already blocklisted."
-msgstr ""
-
 #: Model/Log.php:validation for field action
 msgid "Options : ..."
 msgstr ""
@@ -22796,8 +19305,8 @@ msgstr ""
 msgid "A relationship with this name already exists."
 msgstr ""
 
-#: Model/OrgBlocklist.php:validation for field org_uuid
-msgid "Organisation already blocklisted."
+#: Model/OrgBlacklist.php:validation for field org_uuid
+msgid "Organisation already blacklisted."
 msgstr ""
 
 #: Model/Organisation.php:validation for field name
@@ -22856,6 +19365,12 @@ msgstr ""
 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 ""
@@ -22926,3 +19441,7 @@ msgstr ""
 msgid "isValidJson"
 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 ""
+

From 6d77c464cdf00550bfee05aaf135a14df8bf3676 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Fri, 26 Mar 2021 13:52:53 +0900
Subject: [PATCH 413/437] chg: [i18n] Updated base strings.

---
 app/Locale/default.pot | 13181 +++++++++++++++++++++++++--------------
 1 file changed, 8331 insertions(+), 4850 deletions(-)

diff --git a/app/Locale/default.pot b/app/Locale/default.pot
index 3744326ff..b977369d4 100644
--- a/app/Locale/default.pot
+++ b/app/Locale/default.pot
@@ -38,6 +38,7 @@ msgid "Worker started."
 msgstr ""
 
 #: Console/Command/AdminShell.php:141
+#: Controller/Component/CRUDComponent.php:175
 msgid "%s updated."
 msgstr ""
 
@@ -45,78 +46,171 @@ msgstr ""
 msgid "Could not update %s."
 msgstr ""
 
-#: Console/Command/AdminShell.php:466
+#: Console/Command/AdminShell.php:225
+msgid "All object templates are up to date already."
+msgstr ""
+
+#: Console/Command/AdminShell.php:227
+msgid "Could not update any of the object templates."
+msgstr ""
+
+#: Console/Command/AdminShell.php:229
+msgid "Successfully updated %s object templates."
+msgstr ""
+
+#: Console/Command/AdminShell.php:231
+msgid " However, could not update %s object templates."
+msgstr ""
+
+#: Console/Command/AdminShell.php:472
 msgid "Update the JSON definitions of MISP."
 msgstr ""
 
-#: Console/Command/AdminShell.php:469
+#: Console/Command/AdminShell.php:475
 msgid "Update the submodules before ingestion."
 msgstr ""
 
-#: Console/Command/AdminShell.php:499
+#: Console/Command/AdminShell.php:505
 msgid "Last DB num which was successfully executed: "
 msgstr ""
 
-#: Console/Command/AdminShell.php:508
+#: Console/Command/AdminShell.php:514
 msgid "Something went wrong. Could not find the existing db version"
 msgstr ""
 
-#: Console/Command/AdminShell.php:511
+#: Console/Command/AdminShell.php:517
 msgid "DB was never successfully updated or we are on a fresh install"
 msgstr ""
 
-#: Console/Command/AdminShell.php:528
+#: Console/Command/AdminShell.php:534
 msgid "MISP mass sync authkey reset command line tool.\n\nUsage: %sConsole/cake resetSyncAuthkeys [user_id]"
 msgstr ""
 
-#: Console/Command/AdminShell.php:536
-#: Controller/UsersController.php:1283;2221
+#: Console/Command/AdminShell.php:542
+#: Controller/UsersController.php:1311;2341
 #: Model/Dashboard.php:129
 msgid "Invalid user."
 msgstr ""
 
-#: Console/Command/AdminShell.php:539
+#: Console/Command/AdminShell.php:545
 msgid "User has to be a site admin."
 msgstr ""
 
-#: Console/Command/AdminShell.php:563
+#: Console/Command/AdminShell.php:569
 msgid "\nError: %s\n"
 msgstr ""
 
-#: Console/Command/AdminShell.php:565
+#: Console/Command/AdminShell.php:571
 msgid "%s events purged.\n"
 msgstr ""
 
-#: Console/Command/AdminShell.php:587
+#: Console/Command/AdminShell.php:593
 msgid "> Database schema dumped on disk"
 msgstr ""
 
-#: Console/Command/AdminShell.php:589
+#: Console/Command/AdminShell.php:595
 msgid "Something went wrong. Could not find the existing db version or fetch the current database schema."
 msgstr ""
 
-#: Console/Command/EventShell.php:15
-#: Controller/AttributesController.php:118;122;126
-#: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1137;1621;1706;2236;2312;2316;2320;2448;2545;2600;2648;2720;2810;3145;5270;5492;5496;5505
-#: Controller/PostsController.php:56
-#: Model/Galaxy.php:293
+#: Console/Command/DevShell.php:7
+msgid "Massaging the feed metadata file."
+msgstr ""
+
+#: Console/Command/DevShell.php:11
+msgid "Could not read the defaults.json file at %s. Exiting"
+msgstr ""
+
+#: Console/Command/DevShell.php:38
+msgid "Done. The feed definitions contain %s feeds and can be found at %s."
+msgstr ""
+
+#: Console/Command/DevShell.php:45
+msgid "Something went wrong."
+msgstr ""
+
+#: Console/Command/EventShell.php:20
+msgid "Import event from file into MISP."
+msgstr ""
+
+#: Console/Command/EventShell.php:23
+msgid "User ID that will owner of uploaded event."
+msgstr ""
+
+#: Console/Command/EventShell.php:24
+msgid "Path to JSON MISP file, can be gzipped or bz2 compressed."
+msgstr ""
+
+#: Console/Command/EventShell.php:83
+#: Controller/AttributesController.php:120;1170;1242;1372
+#: Controller/EventGraphController.php:62
+#: Controller/EventReportsController.php:512
+#: Controller/EventsController.php:1081;1506;1580;2272;2392;2530;2647;2734;3054;5130;5161;5400;5404;5413;5711;5717
+#: Controller/ObjectReferencesController.php:241
+#: Controller/PostsController.php:54
+#: Model/Galaxy.php:443
 msgid "Invalid event"
 msgstr ""
 
+#: Console/Command/EventShell.php:463
+msgid "Recovering event %s"
+msgstr ""
+
+#: Console/Command/EventShell.php:468
+#: Controller/EventsController.php:5633
+msgid "Recovery complete. Event #%s recovered, using %s log entries."
+msgstr ""
+
 #: Console/Command/PasswordShell.php:46
 msgid "override password change"
 msgstr ""
 
-#: Console/Command/ServerShell.php:83
-#: Controller/ServersController.php:674
-msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled, %s sightings pulled."
+#: Console/Command/ServerShell.php:149
+#: Controller/ServersController.php:734
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled, %s sightings pulled, %s clusters pulled."
 msgstr ""
 
-#: Console/Command/ServerShell.php:85
+#: Console/Command/ServerShell.php:152;156
 msgid "ERROR: %s"
 msgstr ""
 
+#: Console/Command/ServerShell.php:358;514
+msgid "Job failed. See error logs for more details."
+msgstr ""
+
+#: Console/Command/ServerShell.php:369;525
+msgid "See error logs for more details."
+msgstr ""
+
+#: Console/Command/ServerShell.php:363;519
+msgid "%s feed from %s cached. Failed: %s"
+msgid_plural "%s feeds from %s cached. Failed: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: Console/Command/StatisticsShell.php:162
+msgid "Processing organisation %s / %s.%s"
+msgstr ""
+
+#: Console/Command/StatisticsShell.php:202
+msgid "Total local orgs: %s%s"
+msgstr ""
+
+#: Console/Command/StatisticsShell.php:203
+msgid "Local orgs with event creations: %s%s"
+msgstr ""
+
+#: Console/Command/StatisticsShell.php:204
+msgid "Average days until first event: %s"
+msgstr ""
+
+#: Console/Command/StatisticsShell.php:241
+msgid "Year over year growth of organisation count."
+msgstr ""
+
+#: Console/Command/StatisticsShell.php:250
+msgid "%s: %s %s%s"
+msgstr ""
+
 #: Console/Command/TrainingShell.php:682
 msgid "verbose mode"
 msgstr ""
@@ -125,287 +219,382 @@ msgstr ""
 msgid "interactive mode"
 msgstr ""
 
-#: Controller/AppController.php:382
-msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
-msgstr ""
-
-#: Controller/AppController.php:382
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:821
-msgid "Update Progress"
-msgstr ""
-
-#: Controller/AppController.php:389
-msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
-msgstr ""
-
-#: Controller/AppController.php:519
+#: Controller/AppController.php:355
 msgid "WARNING: This functionality is deprecated and will be removed in the near future. "
 msgstr ""
 
-#: Controller/AppController.php:739
-#: Controller/AttributesController.php:1917;2026;2130
-#: Controller/EventsController.php:3277
+#: Controller/AppController.php:379
+msgid "WARNING: MISP is currently running under PHP 8.0, which is unsupported. Background jobs will fail, so please contact your administrator to run a supported PHP version (such as 7.4)"
+msgstr ""
+
+#: Controller/AppController.php:502
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr ""
+
+#: Controller/AppController.php:537
+msgid "Warning: MISP is currently disabled for all users. Enable it in Server Settings (Administration -> Server Settings -> MISP tab -> live). An update might also be in progress, you can see the progress in "
+msgstr ""
+
+#: Controller/AppController.php:537
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:969
+msgid "Update Progress"
+msgstr ""
+
+#: Controller/AppController.php:558
+msgid "Your user account has been disabled."
+msgstr ""
+
+#: Controller/AppController.php:894
+#: Controller/AttributesController.php:1784;1919
+#: Controller/EventsController.php:3126
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr ""
 
-#: Controller/AppController.php:748
-#: Controller/AttributesController.php:2134
-#: Controller/EventsController.php:3281
+#: Controller/AppController.php:903
+#: Controller/AttributesController.php:1923
+#: Controller/EventsController.php:3130
 msgid "You have to be logged in to do that."
 msgstr ""
 
-#: Controller/AppController.php:764
-#: Controller/Component/IndexFilterComponent.php:23
+#: Controller/AppController.php:919
+#: Controller/Component/IndexFilterComponent.php:25
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr ""
 
-#: Controller/AppController.php:902
+#: Controller/AppController.php:1035
 msgid "All done. attribute_count generated from scratch for "
 msgstr ""
 
-#: Controller/AppController.php:1025
-#: Controller/AttributesController.php:2188
-#: Controller/ShadowAttributesController.php:1267
+#: Controller/AppController.php:1158
+#: Controller/AttributesController.php:1977
+#: Controller/ShadowAttributesController.php:1101
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr ""
 
-#: Controller/AppController.php:1211
+#: Controller/AppController.php:1357
 msgid "RestSearch is not implemented (yet) for this scope."
 msgstr ""
 
-#: Controller/AttributesController.php:109;1339
-#: Controller/EventGraphController.php:19;77
+#: Controller/AppController.php:1371
+msgid "Restsearch queries using GET and no parameters are not allowed. If you have passed parameters via a JSON body, make sure you use POST requests."
+msgstr ""
+
+#: Controller/AttributesController.php:113;1161
+#: Controller/EventGraphController.php:22;70
+#: Controller/EventReportsController.php:38
 msgid "No event ID set."
 msgstr ""
 
-#: Controller/AttributesController.php:112
+#: Controller/AttributesController.php:116
 msgid "You do not have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:132;422;602;832;3168;3183
-#: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:2107;2128;2162
-#: Controller/ObjectsController.php:837
-#: Model/Attribute.php:4323;4327
+#: Controller/AttributesController.php:123;363;523;719;1173;2957
+#: Controller/EventGraphController.php:81
+#: Controller/EventReportsController.php:515
+#: Controller/EventsController.php:2002;2023;2065;2158;5280;5326
+#: Controller/ObjectsController.php:47;177;740;805;1160
+#: Model/Attribute.php:4169;4173
 msgid "You do not have permission to do that."
 msgstr ""
 
-#: Controller/AttributesController.php:345;800;805;824;1032;1121;2204;2218;2251;2273;2841;2852;2858;2927;3065;3077;3081
-#: Controller/ObjectsController.php:641
-#: Controller/ShadowAttributesController.php:810;1058;1082;1115;1125
-#: Controller/TagsController.php:506
-#: Model/Attribute.php:4315
-msgid "Invalid attribute"
+#: Controller/AttributesController.php:143;369;744;1414
+#: Controller/EventsController.php:1884;1888
+msgid "Invalid Sharing Group or not authorised."
 msgstr ""
 
-#: Controller/AttributesController.php:355
-#: Controller/ShadowAttributesController.php:483
-msgid "You do not have the permission to view this event."
+#: Controller/AttributesController.php:330;1790
+msgid "Attribute does not exists or you do not have the permission to download this attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:402
+#: Controller/AttributesController.php:348
 msgid "Attribute not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/AttributesController.php:419;586;892;1348
-#: Controller/EventsController.php:4432;4446;5219;5233
+#: Controller/AttributesController.php:360
+#: Controller/EventsController.php:4284;4654
 msgid "Invalid Event."
 msgstr ""
 
-#: Controller/AttributesController.php:437;613
+#: Controller/AttributesController.php:385;534
 #: Controller/DecayingModelController.php:56
-#: Controller/ShadowAttributesController.php:530
+#: Controller/GalaxiesController.php:162
+#: Controller/ShadowAttributesController.php:489
 msgid "PHP says file was not uploaded. Are you attacking me?"
 msgstr ""
 
-#: Controller/AttributesController.php:616
-#: Controller/ShadowAttributesController.php:533;543
+#: Controller/AttributesController.php:457
+msgid "Some of the attachments failed to upload. The failed files were: %s - This can be caused by the attachments already existing in the event."
+msgstr ""
+
+#: Controller/AttributesController.php:461
+msgid "The attachment(s) could not be saved. Please contact your administrator."
+msgstr ""
+
+#: Controller/AttributesController.php:537
+#: Controller/ShadowAttributesController.php:492;502
 msgid "There was a problem to upload the file."
 msgstr ""
 
-#: Controller/AttributesController.php:760
+#: Controller/AttributesController.php:681
 msgid "The ThreatConnect data has been imported."
 msgstr ""
 
-#: Controller/AttributesController.php:763
+#: Controller/AttributesController.php:684
 msgid "%s entries imported."
 msgstr ""
 
-#: Controller/AttributesController.php:767
+#: Controller/AttributesController.php:688
 msgid "%s entries could not be imported."
 msgstr ""
 
-#: Controller/AttributesController.php:876
+#: Controller/AttributesController.php:715;975;2007;2061;2621;2632;2638;2713;2829;2862;2874;2878
+#: Controller/ObjectsController.php:621
+#: Controller/ShadowAttributesController.php:801
+#: Controller/TagsController.php:390
+#: Model/Attribute.php:4161
+msgid "Invalid attribute"
+msgstr ""
+
+#: Controller/AttributesController.php:768
 msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
 msgstr ""
 
-#: Controller/AttributesController.php:880;882
-#: Controller/ShadowAttributesController.php:817
+#: Controller/AttributesController.php:772;774
 msgid "Invalid attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:909
+#: Controller/AttributesController.php:799
 msgid "The attribute has been saved"
 msgstr ""
 
-#: Controller/AttributesController.php:944
+#: Controller/AttributesController.php:836
 msgid "The attribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/AttributesController.php:1036
-#: Controller/ObjectsController.php:515
-msgid "Invalid event id."
-msgstr ""
-
-#: Controller/AttributesController.php:1072
-#: Controller/EventsController.php:2466
-#: Controller/ShadowAttributesController.php:717
+#: Controller/AttributesController.php:930
+#: Controller/EventsController.php:2410
+#: Controller/ShadowAttributesController.php:675
 msgid "Invalid input."
 msgstr ""
 
-#: Controller/AttributesController.php:1077
+#: Controller/AttributesController.php:935
 msgid "Invalid field."
 msgstr ""
 
-#: Controller/AttributesController.php:1125;1161
-msgid "Invalid attribute id."
-msgstr ""
-
-#: Controller/AttributesController.php:1242;1319
+#: Controller/AttributesController.php:1065;1141
 msgid "This function is only accessible via POST requests."
 msgstr ""
 
-#: Controller/AttributesController.php:1249;1259
+#: Controller/AttributesController.php:1072;1082
 msgid "Attribute deleted"
 msgstr ""
 
-#: Controller/AttributesController.php:1254;1256
+#: Controller/AttributesController.php:1077;1079
 msgid "Attribute was not deleted"
 msgstr ""
 
-#: Controller/AttributesController.php:1281;2675
-#: Controller/ShadowAttributesController.php:853
+#: Controller/AttributesController.php:1103;2455
 msgid "Invalid Attribute"
 msgstr ""
 
-#: Controller/AttributesController.php:1308
+#: Controller/AttributesController.php:1130
 msgid "Could not restore the attribute"
 msgstr ""
 
-#: Controller/AttributesController.php:1374
+#: Controller/AttributesController.php:1199
 msgid "No matching attributes found."
 msgstr ""
 
-#: Controller/AttributesController.php:1408
-msgid "This method can only be accessed via AJAX."
+#: Controller/AttributesController.php:1233
+msgid "This method can only be accessed via AJAX and POST."
 msgstr ""
 
-#: Controller/AttributesController.php:1418
-msgid "You are not authorized to edit this event."
-msgstr ""
-
-#: Controller/AttributesController.php:1532
+#: Controller/AttributesController.php:1236
 msgid "No event ID provided."
 msgstr ""
 
-#: Controller/AttributesController.php:1577
-#: Controller/GalaxiesController.php:276
+#: Controller/AttributesController.php:1245;1375
+msgid "You are not authorized to edit this event."
+msgstr ""
+
+#: Controller/AttributesController.php:1249
+msgid "No attributes selected"
+msgstr ""
+
+#: Controller/AttributesController.php:1295
+#: Controller/GalaxiesController.php:415
 msgid "Synonyms: "
 msgstr ""
 
-#: Controller/AttributesController.php:1912;2019
+#: Controller/AttributesController.php:1363
+msgid "This method can only be accessed via POST."
+msgstr ""
+
+#: Controller/AttributesController.php:1777
 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:1925
-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:1945
-msgid "You don't have access to that event."
-msgstr ""
-
-#: Controller/AttributesController.php:2008
-msgid "No matches."
-msgstr ""
-
-#: Controller/AttributesController.php:2030;2039
-msgid "Invalid attribute or no authorisation to view it."
-msgstr ""
-
-#: Controller/AttributesController.php:2165
-#: Controller/ShadowAttributesController.php:1245
+#: Controller/AttributesController.php:1954
+#: Controller/ShadowAttributesController.php:1079
 msgid "All done. "
 msgstr ""
 
-#: Controller/AttributesController.php:2197;2244
-#: Controller/ShadowAttributesController.php:1053
+#: Controller/AttributesController.php:1986;2037
 msgid "Invalid field requested."
 msgstr ""
 
-#: Controller/AttributesController.php:2200;2247
+#: Controller/AttributesController.php:1989;2040
 msgid "This function can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:2282
+#: Controller/AttributesController.php:2065
 msgid "You do not have permission to do that"
 msgstr ""
 
-#: Controller/AttributesController.php:2312;2320
-#: Controller/EventsController.php:3660;3813;5017
+#: Controller/AttributesController.php:2092;2100
+#: Controller/EventsController.php:3518;3663
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:2341
+#: Controller/AttributesController.php:2121
 msgid "This action can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:2350;2601;2615;2626
-#: Controller/OrganisationsController.php:439
-#: Controller/ServersController.php:661;739
+#: Controller/AttributesController.php:2130;2381;2395;2406
+#: Controller/EventsController.php:2277
+#: Controller/OrganisationsController.php:420
+#: Controller/ServersController.php:718;799
 msgid "You are not authorised to do that."
 msgstr ""
 
-#: Controller/AttributesController.php:2455
-#: Controller/EventsController.php:4225
+#: Controller/AttributesController.php:2235
+#: Controller/EventsController.php:4076
 msgid "This functionality requires API key access."
 msgstr ""
 
-#: Controller/AttributesController.php:2463
+#: Controller/AttributesController.php:2243
 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:2475
+#: Controller/AttributesController.php:2255
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr ""
 
-#: Controller/AttributesController.php:2636
+#: Controller/AttributesController.php:2416
 msgid "Invalid script."
 msgstr ""
 
-#: Controller/AttributesController.php:2703
+#: Controller/AttributesController.php:2480
 msgid "No valid enrichment options found for this attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:2801
+#: Controller/AttributesController.php:2581
 msgid "Invalid type requested."
 msgstr ""
 
-#: Controller/AttributesController.php:2864;3071
-#: Controller/TagCollectionsController.php:254
+#: Controller/AttributesController.php:2644;2868
+#: Controller/TagCollectionsController.php:258
 msgid "Invalid tag"
 msgstr ""
 
-#: Controller/AttributesController.php:3161
-#: Controller/EventsController.php:5215
+#: Controller/AttributesController.php:2840
+#: Controller/EventsController.php:3429
+msgid "Invalid tag."
+msgstr ""
+
+#: Controller/AttributesController.php:2946
+#: Controller/EventsController.php:5126
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr ""
 
-#: Controller/AttributesController.php:3165;3180
-#: Controller/ShadowAttributesController.php:662
+#: Controller/AttributesController.php:2954
+#: Controller/ShadowAttributesController.php:620
 msgid "Invalid Attribute."
 msgstr ""
 
+#: Controller/AttributesController.php:3104
+#: Controller/ShadowAttributesController.php:1113
+msgid "Invalid attribute ID."
+msgstr ""
+
+#: Controller/AttributesController.php:455
+msgid "The attachment have been uploaded."
+msgid_plural "The attachments have been uploaded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: Controller/AttributesController.php:2812
+#: Controller/EventsController.php:3401
+msgid "Tag added."
+msgid_plural "Tags added."
+msgstr[0] ""
+msgstr[1] ""
+
+#: Controller/AttributesController.php:2815
+#: Controller/EventsController.php:3396
+msgid "Tag could not be added."
+msgid_plural "%s tags could not be added."
+msgstr[0] ""
+msgstr[1] ""
+
+#: Controller/AttributesController.php:2817
+msgid " However, %s tag was added."
+msgid_plural " However, %s tags were added."
+msgstr[0] ""
+msgstr[1] ""
+
+#: Controller/AuthKeysController.php:53
+msgid "Auth Keys"
+msgstr ""
+
+#: Controller/AuthKeysController.php:137
+#: View/AuthKeys/index.ctp:50
+#: View/AuthKeys/view.ctp:33
+msgid "Auth Key"
+msgstr ""
+
+#: Controller/CerebratesController.php:101;145;177
+msgid "Invalid Cerebrate instance ID provided."
+msgstr ""
+
+#: Controller/CerebratesController.php:116
+msgid "Added %s new organisations, updated %s existing organisations, %s failures."
+msgstr ""
+
+#: Controller/CerebratesController.php:125
+msgid "Sync organisation information"
+msgstr ""
+
+#: Controller/CerebratesController.php:126
+msgid "Are you sure you want to download and add / update the remote organisations from the Cerebrate node?"
+msgstr ""
+
+#: Controller/CerebratesController.php:127
+#: View/Pages/doc/using_the_system.ctp:419
+#: View/Servers/index.ctp:165
+msgid "Pull all"
+msgstr ""
+
+#: Controller/CerebratesController.php:193
+msgid "Organisation downloaded."
+msgstr ""
+
+#: Controller/CerebratesController.php:201
+msgid "Download organisation information"
+msgstr ""
+
+#: Controller/CerebratesController.php:202
+msgid "Are you sure you want to download and add / update the remote organisation?"
+msgstr ""
+
+#: Controller/CerebratesController.php:203
+#: View/Elements/markdownEditor/markdownEditor.ctp:62
+#: View/Events/export.ctp:115;144
+#: View/Galaxies/export.ctp:44
+msgid "Download"
+msgstr ""
+
 #: Controller/CommunitiesController.php:150
 msgid "Request sent."
 msgstr ""
@@ -418,60 +607,81 @@ msgstr ""
 msgid "The message could not be sent (either because e-mailing is disabled or because encryption is misconfigured), however, you can view the e-mail that would have been sent below. Feel free to send it manually."
 msgstr ""
 
-#: Controller/DashboardsController.php:34;246;415
+#: Controller/CorrelationExclusionsController.php:31
+msgid "Correlation Exclusions index"
+msgstr ""
+
+#: Controller/CorrelationExclusionsController.php:68
+msgid "Correlation Exclusion"
+msgstr ""
+
+#: Controller/CorrelationExclusionsController.php:79
+msgid "Correlations cleanup initiated, based on the exclusion rules."
+msgstr ""
+
+#: Controller/CorrelationExclusionsController.php:87
+#: View/CorrelationExclusions/index.ctp:31
+msgid "Clean up correlations"
+msgstr ""
+
+#: Controller/CorrelationExclusionsController.php:88
+msgid "Execute the cleaning of all correlations that are at odds with the exclusion rules? This will delete all matching correlations."
+msgstr ""
+
+#: Controller/DashboardsController.php:37;253;422
 #: Model/Dashboard.php:240
 msgid "Invalid dashboard template."
 msgstr ""
 
-#: Controller/DashboardsController.php:89
+#: Controller/DashboardsController.php:92
 msgid "No widget name passed."
 msgstr ""
 
-#: Controller/DashboardsController.php:100
+#: Controller/DashboardsController.php:103
 msgid "Configuration of the widget that will be passed to the render. Check the view for more information"
 msgstr ""
 
-#: Controller/DashboardsController.php:101
+#: Controller/DashboardsController.php:104
 msgid "Alias to use as the title of the widget"
 msgstr ""
 
-#: Controller/DashboardsController.php:114
+#: Controller/DashboardsController.php:117
 msgid "No setting data found."
 msgstr ""
 
-#: Controller/DashboardsController.php:125;205;210
+#: Controller/DashboardsController.php:128;211;216
 msgid "Settings updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:135
+#: Controller/DashboardsController.php:138
 msgid "Invalid widget."
 msgstr ""
 
-#: Controller/DashboardsController.php:156
-msgid "You need to specify the widget to use along with the configuration."
-msgstr ""
-
-#: Controller/DashboardsController.php:189
+#: Controller/DashboardsController.php:154
 msgid "This endpoint can only be reached via POST requests."
 msgstr ""
 
-#: Controller/DashboardsController.php:207;212
+#: Controller/DashboardsController.php:163
+msgid "You need to specify the widget to use along with the configuration."
+msgstr ""
+
+#: Controller/DashboardsController.php:213;218
 msgid "Settings could not be updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:260;265
+#: Controller/DashboardsController.php:267;272
 msgid "Dashboard template updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:262;267
+#: Controller/DashboardsController.php:269;274
 msgid "Dashboard template could not be updated."
 msgstr ""
 
-#: Controller/DashboardsController.php:275;282;293
+#: Controller/DashboardsController.php:282;289;300
 msgid "Unrestricted"
 msgstr ""
 
-#: Controller/DashboardsController.php:418
+#: Controller/DashboardsController.php:425
 msgid "Dashboard template removed."
 msgstr ""
 
@@ -485,7 +695,7 @@ msgstr ""
 
 #: Controller/DecayingModelController.php:36;105;207;243;264;276;354;387;399;409;430;442;452;544
 #: Controller/DecayingModelMappingController.php:25
-#: Model/DecayingModel.php:483;619
+#: Model/DecayingModel.php:499;653
 #: Model/DecayingModelMapping.php:30;59
 msgid "No Decaying Model with the provided ID exists"
 msgstr ""
@@ -495,6 +705,7 @@ msgid "Only one import field can be used"
 msgstr ""
 
 #: Controller/DecayingModelController.php:65
+#: Controller/GalaxiesController.php:171
 msgid "Error while decoding JSON"
 msgstr ""
 
@@ -624,475 +835,797 @@ msgstr ""
 msgid "Error Processing Request, can't parse the body"
 msgstr ""
 
-#: Controller/DecayingModelController.php:712
+#: Controller/DecayingModelController.php:705
 msgid "This method is only accessible via AJAX."
 msgstr ""
 
-#: Controller/EventBlacklistsController.php:15
-msgid "Event Blacklisting is not currently enabled on this instance."
+#: Controller/EventBlocklistsController.php:12
+msgid "Event Blocklisting is not currently enabled on this instance."
 msgstr ""
 
-#: Controller/EventBlacklistsController.php:76;98
+#: Controller/EventBlocklistsController.php:73
 msgid "Invalid event IDs."
 msgstr ""
 
-#: Controller/EventBlacklistsController.php:87
-msgid "Failed to delete Event from EventBlacklist. Error: "
+#: Controller/EventBlocklistsController.php:84
+msgid "Failed to delete Event from EventBlocklist. Error: "
 msgstr ""
 
-#: Controller/EventsController.php:894
-msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
+#: Controller/EventBlocklistsController.php:95
+msgid "Invalid event blocklist IDs."
 msgstr ""
 
-#: Controller/EventsController.php:896
+#: Controller/EventReportsController.php:51;107;362
+msgid "Report saved."
+msgstr ""
+
+#: Controller/EventReportsController.php:72
+msgid "Event report %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:80
+msgid "This function can only be reached via the API."
+msgstr ""
+
+#: Controller/EventReportsController.php:133
+msgid "Event Report %s %s deleted"
+msgstr ""
+
+#: Controller/EventReportsController.php:133;136
+#: Controller/GalaxyClustersController.php:716;726
+#: View/Objects/group_attributes_into_object.ctp:129
+msgid "hard"
+msgstr ""
+
+#: Controller/EventReportsController.php:133;136
+#: Controller/GalaxyClustersController.php:716;726
+#: View/Objects/group_attributes_into_object.ctp:129
+msgid "soft"
+msgstr ""
+
+#: Controller/EventReportsController.php:136
+msgid "Event Report %s could not be %s deleted.%sReasons: %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:141;165;212;242;262;298
+#: Controller/GalaxyClustersController.php:740
+#: Controller/GalaxyElementsController.php:83
+#: Controller/TaxonomiesController.php:432
+#: Controller/WarninglistsController.php:274
+msgid "This function can only be reached via AJAX."
+msgstr ""
+
+#: Controller/EventReportsController.php:157
+msgid "Event Report %s restored"
+msgstr ""
+
+#: Controller/EventReportsController.php:160
+msgid "Event Report %s could not be %s restored.%sReasons: %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:227
+msgid "Automatic extraction applied to Event Report %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:230
+msgid "Automatic extraction could not be applied to Event Report %s.%sReasons: %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:271
+msgid "`content` and `mapping` key cannot be empty"
+msgstr ""
+
+#: Controller/EventReportsController.php:283
+msgid "Suggestions applied to Event Report %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:286
+msgid "Suggestions could not be applied to Event Report %s.%sReasons: %s"
+msgstr ""
+
+#: Controller/EventReportsController.php:303
+msgid "An URL must be provided"
+msgstr ""
+
+#: Controller/EventReportsController.php:310
+msgid "Report from - %s (%s)"
+msgstr ""
+
+#: Controller/EventReportsController.php:316
+msgid "Could not fetch report from URL. Fetcher module not enabled or could not download the page"
+msgstr ""
+
+#: Controller/EventReportsController.php:322
+msgid "Report downloaded and created"
+msgstr ""
+
+#: Controller/EventReportsController.php:350
+msgid "Event report (%s)"
+msgstr ""
+
+#: Controller/EventReportsController.php:356
+msgid "Could not generate markdown from the event"
+msgstr ""
+
+#: Controller/EventsController.php:848
+msgid "No X.509 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:902
-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."
+#: Controller/EventsController.php:856
+msgid "No X.509 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:904
+#: 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:1731
+#: Controller/EventsController.php:1491
+msgid "Event #%s"
+msgstr ""
+
+#: Controller/EventsController.php:1624
 msgid "You are currently logged in as a site administrator and about to edit an event not belonging to your organisation. This goes against the sharing model of MISP. Use a normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1942
-msgid "You don't have permissions to create events"
+#: Controller/EventsController.php:1838
+msgid "You do not have permissions to create events."
 msgstr ""
 
-#: Controller/EventsController.php:1948
+#: Controller/EventsController.php:1844
 msgid "No valid event data received."
 msgstr ""
 
-#: Controller/EventsController.php:1984
+#: Controller/EventsController.php:1880
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr ""
 
-#: Controller/EventsController.php:1988;1992
-msgid "Invalid Sharing Group or not authorised."
+#: Controller/EventsController.php:1912
+msgid "Event blocked by local blocklist."
 msgstr ""
 
-#: Controller/EventsController.php:2016
-msgid "Event blocked by local blacklist."
-msgstr ""
-
-#: Controller/EventsController.php:2029;2116;2392
+#: Controller/EventsController.php:1924;2011;2339
 msgid "The event has been saved"
 msgstr ""
 
-#: Controller/EventsController.php:2037
+#: Controller/EventsController.php:1932
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr ""
 
-#: Controller/EventsController.php:2043
-msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
+#: Controller/EventsController.php:1938
+msgid "A blocklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr ""
 
-#: Controller/EventsController.php:2045;2395
+#: Controller/EventsController.php:1940;2342
 msgid "The event could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/EventsController.php:2094
+#: Controller/EventsController.php:1989
 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:2142
+#: Controller/EventsController.php:2037
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr ""
 
-#: Controller/EventsController.php:2143
+#: Controller/EventsController.php:2038
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr ""
 
-#: Controller/EventsController.php:2204
+#: Controller/EventsController.php:2052
+msgid "Could not process MISP export file. Probably file content is invalid."
+msgstr ""
+
+#: Controller/EventsController.php:2108
 msgid "STIX document imported, event's created: "
 msgstr ""
 
-#: Controller/EventsController.php:2207
+#: Controller/EventsController.php:2111
 msgid "STIX document imported."
 msgstr ""
 
-#: Controller/EventsController.php:2210
+#: Controller/EventsController.php:2114
 msgid "Could not import STIX document: "
 msgstr ""
 
-#: Controller/EventsController.php:2217
-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 "
+#: Controller/EventsController.php:2121
+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 %s MB."
 msgstr ""
 
-#: Controller/EventsController.php:2241;2326
-msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
+#: Controller/EventsController.php:2148
+msgid "This action requires a target_id for GET requests and both a target_id and a source_id for POST requests."
 msgstr ""
 
-#: Controller/EventsController.php:2249
-msgid "Invalid event ID entered."
+#: Controller/EventsController.php:2155
+msgid "Invalid target event."
 msgstr ""
 
-#: Controller/EventsController.php:2254
-msgid "You are not authorised to read the selected event."
+#: Controller/EventsController.php:2171
+msgid "Invalid source event."
 msgstr ""
 
-#: Controller/EventsController.php:2551;2655;2726
-msgid "You don't have the permission to do that."
+#: Controller/EventsController.php:2257
+msgid "Event merge results"
 msgstr ""
 
-#: Controller/EventsController.php:2560
-msgid "Event unpublished."
-msgstr ""
-
-#: Controller/EventsController.php:2667;2737
-msgid "Could not publish event - no tag for required taxonomies missing: %s"
-msgstr ""
-
-#: Controller/EventsController.php:2819
-msgid "You must specify a message."
-msgstr ""
-
-#: Controller/EventsController.php:2838
-msgid "Email sent to the reporter."
-msgstr ""
-
-#: Controller/EventsController.php:2847
-msgid "Sending of email failed."
-msgstr ""
-
-#: Controller/EventsController.php:2898
-msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
-msgstr ""
-
-#: Controller/EventsController.php:2986
-msgid "This feature is currently disabled"
-msgstr ""
-
-#: Controller/EventsController.php:3114
-msgid "Filename not allowed."
-msgstr ""
-
-#: Controller/EventsController.php:3134
-msgid "Problem with writing the IoC file. Please report to site admin."
-msgstr ""
-
-#: Controller/EventsController.php:3228
-msgid "This is not a valid MISP XML file."
-msgstr ""
-
-#: Controller/EventsController.php:3270
-msgid "Not yet implemented"
-msgstr ""
-
-#: Controller/EventsController.php:3288;3292
-msgid "Invalid event or not authorised."
-msgstr ""
-
-#: Controller/EventsController.php:3484
-#: Controller/TagCollectionsController.php:317
-msgid "Invalid Tag."
-msgstr ""
-
-#: Controller/EventsController.php:3500
-#: Controller/TagCollectionsController.php:333
-msgid "Tag is already attached to this event."
-msgstr ""
-
-#: Controller/EventsController.php:3514
-msgid "Tag is not allowed due to taxonomy exclusivity settings"
-msgstr ""
-
-#: Controller/EventsController.php:3545;3551
-#: Controller/TagCollectionsController.php:340
-msgid "Tag(s) added."
-msgstr ""
-
-#: Controller/EventsController.php:3547
-msgid "Tag could not be added."
-msgstr ""
-
-#: Controller/EventsController.php:3553
-#: Controller/TagCollectionsController.php:348
-msgid "All tags are already present, nothing to add."
-msgstr ""
-
-#: Controller/EventsController.php:3817;5021;5043;5550;5554
-#: Controller/ObjectsController.php:46;190;194;833;1245
-msgid "Invalid event."
-msgstr ""
-
-#: Controller/EventsController.php:3872;3902;3918
+#: Controller/EventsController.php:2489;2582;2653;3755;3771
+#: Controller/GalaxiesController.php:199
 msgid "You do not have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:3983;4124
+#: Controller/EventsController.php:2497
+msgid "Event unpublished."
+msgstr ""
+
+#: Controller/EventsController.php:2594;2662
+msgid "Could not publish event - no tag for required taxonomies missing: %s"
+msgstr ""
+
+#: Controller/EventsController.php:2743
+msgid "You must specify a message."
+msgstr ""
+
+#: Controller/EventsController.php:2761
+msgid "Email sent to the reporter."
+msgstr ""
+
+#: Controller/EventsController.php:2770
+msgid "Sending of email failed."
+msgstr ""
+
+#: Controller/EventsController.php:2819
+msgid "Warning, you are logged in as a site admin, any export that you generate will contain the FULL UNRESTRICTED data-set. If you would like to generate an export for your own organisation, please log in with a different user."
+msgstr ""
+
+#: Controller/EventsController.php:2907
+msgid "This feature is currently disabled"
+msgstr ""
+
+#: Controller/EventsController.php:3023
+msgid "Filename not allowed."
+msgstr ""
+
+#: Controller/EventsController.php:3043
+msgid "Problem with writing the IoC file. Please report to site admin."
+msgstr ""
+
+#: Controller/EventsController.php:3119
+msgid "Not yet implemented"
+msgstr ""
+
+#: Controller/EventsController.php:3137;3141
+msgid "Invalid event or not authorised."
+msgstr ""
+
+#: Controller/EventsController.php:3322
+msgid "Nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3338
+msgid "Tag not found."
+msgstr ""
+
+#: Controller/EventsController.php:3349
+msgid "Tag is already attached to this event."
+msgstr ""
+
+#: Controller/EventsController.php:3363
+msgid "Tag is not allowed due to taxonomy exclusivity settings"
+msgstr ""
+
+#: Controller/EventsController.php:3404
+msgid ", but %s could not be added: %s"
+msgstr ""
+
+#: Controller/EventsController.php:3418;3522;3670;4912;4939;5458;5462
+#: Controller/ObjectsController.php:44;174;1157
+#: Controller/TagsController.php:361
+msgid "Invalid event."
+msgstr ""
+
+#: Controller/EventsController.php:3835;3976
 msgid "Invalid ID"
 msgstr ""
 
-#: Controller/EventsController.php:3987;4128;4703
+#: Controller/EventsController.php:3839;3980;4557
 msgid "Event not found or you are not authorised to view it."
 msgstr ""
 
-#: Controller/EventsController.php:4134
+#: Controller/EventsController.php:3985
 msgid "Freetext Import"
 msgstr ""
 
-#: Controller/EventsController.php:4140
+#: Controller/EventsController.php:3991
 msgid "Populate using a Template"
 msgstr ""
 
-#: Controller/EventsController.php:4146
+#: Controller/EventsController.php:3997
 msgid "OpenIOC Import"
 msgstr ""
 
-#: Controller/EventsController.php:4151
+#: Controller/EventsController.php:4002
 msgid "ThreatConnect Import"
 msgstr ""
 
-#: Controller/EventsController.php:4156
+#: Controller/EventsController.php:4007
 msgid "(Experimental) Forensic analysis - Mactime"
 msgstr ""
 
-#: Controller/EventsController.php:4175
+#: Controller/EventsController.php:4026
 msgid "MISP standard (recommended exchange format - lossless)"
 msgstr ""
 
-#: Controller/EventsController.php:4181
+#: Controller/EventsController.php:4032
 msgid "STIX 1.1.1 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4186
+#: Controller/EventsController.php:4037
 msgid "STIX 2.0 format (lossy)"
 msgstr ""
 
-#: Controller/EventsController.php:4228;4235
+#: Controller/EventsController.php:4079;4086
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4264
+#: Controller/EventsController.php:4115
 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:4272
+#: Controller/EventsController.php:4123
 msgid "Event not found"
 msgstr ""
 
-#: Controller/EventsController.php:4295
+#: Controller/EventsController.php:4146
 msgid "Event not found."
 msgstr ""
 
-#: Controller/EventsController.php:4305
+#: Controller/EventsController.php:4156
 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:4330
+#: Controller/EventsController.php:4181
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4469;4490;4549;4574;4599;4629;4650
+#: Controller/EventsController.php:4306;4328;4391;4416;4441;4471;4492
 msgid "Invalid type."
 msgstr ""
 
-#: Controller/EventsController.php:4768
+#: Controller/EventsController.php:4622
 msgid "Invalid method."
 msgstr ""
 
-#: Controller/EventsController.php:4850
+#: Controller/EventsController.php:4737
 msgid "%s services are not enabled."
 msgstr ""
 
-#: Controller/EventsController.php:4854
+#: Controller/EventsController.php:4741
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:4859
+#: Controller/EventsController.php:4746
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4914;4960
+#: Controller/EventsController.php:4800;4845
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:4926
+#: Controller/EventsController.php:4812
 msgid ": Enriched via the "
 msgstr ""
 
-#: Controller/EventsController.php:4977
+#: Controller/EventsController.php:4862
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:5132
-msgid "Import service not reachable."
-msgstr ""
-
-#: Controller/EventsController.php:5222;5236
-#: Controller/PostsController.php:60;84
-#: Controller/TaxonomiesController.php:111;142;174;256;294;324;354;384;393;402
+#: Controller/EventsController.php:4915;5133
+#: Controller/PostsController.php:77
+#: Controller/TaxonomiesController.php:118;149;273;311;341;371
 msgid "You don't have permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:5363
-#: Controller/WarninglistsController.php:229
+#: Controller/EventsController.php:5034
+msgid "Import service not reachable."
+msgstr ""
+
+#: Controller/EventsController.php:5254
+#: Controller/WarninglistsController.php:241
 msgid "Invalid ID."
 msgstr ""
 
-#: Controller/EventsController.php:5411
-#: Controller/ShadowAttributesController.php:295;300;516
+#: Controller/EventsController.php:5277;5323;5342
+#: Controller/ShadowAttributesController.php:266;477
+#: Model/EventReport.php:431
 msgid "Invalid Event"
 msgstr ""
 
-#: Controller/EventsController.php:5432
+#: Controller/EventsController.php:5301
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr ""
 
-#: Controller/EventsController.php:5683
+#: Controller/EventsController.php:5368
+msgid "another user"
+msgstr ""
+
+#: Controller/EventsController.php:5373
+msgid "background job"
+msgstr ""
+
+#: Controller/EventsController.php:5375
+msgid "external tool"
+msgstr ""
+
+#: Controller/EventsController.php:5383
+msgid "Warning: Your view on this event might not be up to date as it is currently being edited by: %s"
+msgstr ""
+
+#: Controller/EventsController.php:5591
 msgid "%s event(s) deleted."
 msgstr ""
 
-#: Controller/FeedsController.php:39
+#: Controller/EventsController.php:5631
+msgid "Recovery simulation complete. Event #%s can be recovered using %s log entries."
+msgstr ""
+
+#: Controller/EventsController.php:5649;5692
+#: Controller/WarninglistsController.php:55
+msgid "This action is only accessible via POST requests."
+msgstr ""
+
+#: Controller/EventsController.php:5662
+msgid "Bootstraping recovering of event %s"
+msgstr ""
+
+#: Controller/EventsController.php:5685
+msgid "Recover event job queued. Job ID: %s"
+msgstr ""
+
+#: Controller/EventsController.php:3403
+msgid "Tag added"
+msgid_plural "%s tags added"
+msgstr[0] ""
+msgstr[1] ""
+
+#: Controller/FeedsController.php:41
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:47
+#: Controller/FeedsController.php:49
 msgid "Default feed metadata loaded."
 msgstr ""
 
-#: Controller/FeedsController.php:283;391
+#: Controller/FeedsController.php:275;387
 msgid "Feed added."
 msgstr ""
 
-#: Controller/FeedsController.php:291
+#: Controller/FeedsController.php:283
 msgid "Feed could not be added. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:316;426;448;577;618;829
+#: Controller/FeedsController.php:308;422;444;573;611;764
 msgid "Invalid feed."
 msgstr ""
 
-#: Controller/FeedsController.php:399
+#: Controller/FeedsController.php:395
 msgid "Feed could not be updated. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:422
-#: Controller/OrganisationsController.php:244
-#: Controller/SharingGroupsController.php:237
-#: Controller/UsersController.php:1044
+#: Controller/FeedsController.php:418
+#: Controller/OrganisationsController.php:253
+#: Controller/SharingGroupsController.php:233
+#: Controller/UsersController.php:1067
 msgid "Action not allowed, post or delete request expected."
 msgstr ""
 
-#: Controller/FeedsController.php:455;581
+#: Controller/FeedsController.php:451;577
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:468;534
+#: Controller/FeedsController.php:464;530
 msgid "Starting fetch from Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:479
+#: Controller/FeedsController.php:475
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:484;486
+#: Controller/FeedsController.php:480;482
 msgid "Fetching the feed has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:490;551
+#: Controller/FeedsController.php:486;547
 msgid "Fetching the feed has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:563
+#: Controller/FeedsController.php:559
 msgid "No feed enabled."
 msgstr ""
 
-#: Controller/FeedsController.php:587;606
-#: Controller/ServersController.php:116;161
+#: Controller/FeedsController.php:583;602
+#: Controller/ServersController.php:122
 msgid "Download failed."
 msgstr ""
 
-#: Controller/FeedsController.php:594
+#: Controller/FeedsController.php:590
 msgid "Event added."
 msgstr ""
 
-#: Controller/FeedsController.php:597
+#: Controller/FeedsController.php:593
 msgid "Event already up to date."
 msgstr ""
 
-#: Controller/FeedsController.php:599
+#: Controller/FeedsController.php:595
 msgid "Event updated."
 msgstr ""
 
-#: Controller/FeedsController.php:603
+#: Controller/FeedsController.php:599
 msgid "Could not %s event."
 msgstr ""
 
-#: Controller/FeedsController.php:700
-msgid "Feed could not be fetched. The HTTP error code returned was: "
-msgstr ""
-
-#: Controller/FeedsController.php:739;790
+#: Controller/FeedsController.php:720
 msgid "Invalid feed type."
 msgstr ""
 
-#: Controller/FeedsController.php:835;867
+#: Controller/FeedsController.php:770;807
 msgid "Could not download the selected Event"
 msgstr ""
 
-#: Controller/FeedsController.php:865
+#: Controller/FeedsController.php:805
 msgid "This event is blocked by the Feed filters."
 msgstr ""
 
-#: Controller/FeedsController.php:903;907
+#: Controller/FeedsController.php:843;847
 msgid "Invalid Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:928
+#: Controller/FeedsController.php:868
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: Controller/FeedsController.php:932
+#: Controller/FeedsController.php:872
 msgid "Feed not found."
 msgstr ""
 
-#: Controller/FeedsController.php:941
+#: Controller/FeedsController.php:881
 msgid "Data pulled."
 msgstr ""
 
-#: Controller/FeedsController.php:943
+#: Controller/FeedsController.php:883
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:960
+#: Controller/FeedsController.php:900
 msgid "Starting feed caching."
 msgstr ""
 
-#: Controller/FeedsController.php:975
+#: Controller/FeedsController.php:915
 msgid "Caching the feeds has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:978
+#: Controller/FeedsController.php:918
 msgid "Caching the feeds has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:1012
+#: Controller/FeedsController.php:949
 msgid "Invalid feed list received."
 msgstr ""
 
-#: Controller/GalaxiesController.php:157
-msgid "All clusters"
+#: Controller/GalaxiesController.php:153
+msgid "Only one import field can be used at a time"
+msgstr ""
+
+#: Controller/GalaxiesController.php:176
+msgid "Galaxy clusters imported. %s imported, %s ignored, %s failed. %s"
+msgstr ""
+
+#: Controller/GalaxiesController.php:184
+msgid "Could not import galaxy clusters. %s imported, %s ignored, %s failed. %s"
+msgstr ""
+
+#: Controller/GalaxiesController.php:202
+msgid "This action is only accessible via a REST request."
 msgstr ""
 
 #: Controller/GalaxiesController.php:207
+msgid "%s imported, %s ignored, %s failed. %s"
+msgstr ""
+
+#: Controller/GalaxiesController.php:209
+msgid "Galaxy clusters imported. "
+msgstr ""
+
+#: Controller/GalaxiesController.php:212
+msgid "Could not import galaxy clusters. "
+msgstr ""
+
+#: Controller/GalaxiesController.php:260
+msgid "All sharing groups"
+msgstr ""
+
+#: Controller/GalaxiesController.php:281
+msgid "All clusters"
+msgstr ""
+
+#: Controller/GalaxiesController.php:335
 msgid "All namespaces"
 msgstr ""
 
-#: Controller/GalaxiesController.php:337
+#: Controller/GalaxiesController.php:479
 msgid "Failed to parse request or no clusters picked."
 msgstr ""
 
-#: Controller/GalaxiesController.php:340
+#: Controller/GalaxiesController.php:482
 msgid "Failed to parse request."
 msgstr ""
 
+#: Controller/GalaxyClusterBlocklistsController.php:59
+#: Controller/Component/BlockListComponent.php:179
+msgid "Invalid blocklist entry"
+msgstr ""
+
+#: Controller/GalaxyClusterBlocklistsController.php:75;97
+msgid "Invalid cluster IDs."
+msgstr ""
+
+#: Controller/GalaxyClusterBlocklistsController.php:86
+msgid "Failed to delete GalaxyCluster from GalaxyClusterBlocklist. Error: "
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:94;193
+msgid "Invalid cluster relation"
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:105
+msgid "This method can only be accessed via RestSearch."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:150;245
+msgid "Relationship added."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:154;249
+msgid "Relationship could not be added."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:176;265
+#: Controller/SightingdbController.php:49;99;143
+msgid " Reason: %s"
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:198
+msgid "Default cluster relation cannot be edited"
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:258
+#: Model/GalaxyClusterRelation.php:315
+msgid "Galaxy Cluster Relation could not be saved: The user has to have access to the sharing group in order to be able to edit it."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:284
+msgid "Relation not found."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:292
+msgid "Galaxy cluster relationship successfuly deleted."
+msgstr ""
+
+#: Controller/GalaxyClusterRelationsController.php:300
+msgid "Galaxy cluster relationship could not be deleted."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:199
+msgid "This cluster is not published. Users will not be able to use it"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:216;220
+msgid "Invalid galaxy"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:279;280;386;387
+msgid "Invalid JSON"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:310;422
+msgid "Galaxy cluster saved"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:441
+#: View/GalaxyClusters/add.ctp:69
+msgid "Valid JSON array or comma separated"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:442
+msgid "Valid JSON array composed from Object of the form {key: keyname, value: actualValue}"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:465
+msgid "You can't publish a galaxy cluster that is already published"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:468
+msgid "Default galaxy cluster cannot be published"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:474
+msgid "Publish job queued. Job ID: %s"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:481
+msgid "Could not publish galaxy cluster"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:488
+msgid "Galaxy cluster published"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:511
+msgid "You can't unpublish a galaxy cluster that is not published"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:514
+msgid "Default galaxy cluster cannot be unpublished"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:520
+msgid "Could not unpublish galaxy cluster"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:527
+msgid "Galaxy cluster unpublished"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:714
+msgid "Galaxy cluster successfuly %s deleted%s."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:717
+msgid " and added to the block list"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:726
+msgid "Galaxy cluster could not be %s deleted."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:752
+msgid "Galaxy cluster successfuly restored."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:760
+msgid "Galaxy cluster could not be %s restored."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:769
+msgid "This function can only be reached via POST."
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:903
+msgid "Default galaxy cluster cannot be updated"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:906
+msgid "Galaxy cluster is not a fork"
+msgstr ""
+
+#: Controller/GalaxyClustersController.php:937
+msgid "Cluster updated to the newer version"
+msgstr ""
+
+#: Controller/GalaxyElementsController.php:65
+msgid "Element not found"
+msgstr ""
+
+#: Controller/GalaxyElementsController.php:74
+msgid "Galaxy element %s deleted"
+msgstr ""
+
+#: Controller/GalaxyElementsController.php:77
+msgid "Could not delete galaxy element"
+msgstr ""
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr ""
@@ -1101,230 +1634,259 @@ msgstr ""
 msgid "All jobs have been purged"
 msgstr ""
 
-#: Controller/NewsController.php:51
+#: Controller/NewsController.php:46
 msgid "News item added."
 msgstr ""
 
-#: Controller/NewsController.php:54
+#: Controller/NewsController.php:49
 msgid "The news item could not be added."
 msgstr ""
 
-#: Controller/NewsController.php:68
+#: Controller/NewsController.php:63
 msgid "News item updated."
 msgstr ""
 
-#: Controller/NewsController.php:71
+#: Controller/NewsController.php:66
 msgid "Could not update news item."
 msgstr ""
 
-#: Controller/NewsController.php:89
+#: Controller/NewsController.php:84
 msgid "News item deleted."
 msgstr ""
 
-#: Controller/NewsController.php:92
+#: Controller/NewsController.php:87
 msgid "News item could not be deleted."
 msgstr ""
 
 #: Controller/ObjectReferencesController.php:37
-#: Controller/ObjectsController.php:511;607;650;671;686;757;768;786
+#: Controller/ObjectsController.php:587;625;653;735
 msgid "Invalid object"
 msgstr ""
 
-#: Controller/ObjectReferencesController.php:163
+#: Controller/ObjectReferencesController.php:178;230
 msgid "Invalid object reference"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:31
+#: Controller/ObjectReferencesController.php:186;189;237
+msgid "Invalid object reference."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:33
 msgid "All Objects"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:99
+#: Controller/ObjectTemplatesController.php:101
 msgid "Invalid object template"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:103
+#: Controller/ObjectTemplatesController.php:105
 msgid "Invalid object template id."
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:143
-msgid "ObjectTemplate deleted"
+#: Controller/ObjectTemplatesController.php:145
+msgid "Object Template deleted"
 msgstr ""
 
-#: Controller/ObjectsController.php:29
+#: Controller/ObjectTemplatesController.php:306
+msgid "Template not found"
+msgstr ""
+
+#: Controller/ObjectsController.php:32
 msgid "This action can only be reached via POST requests"
 msgstr ""
 
-#: Controller/ObjectsController.php:69;82;1272
-msgid "Invalid sharing group."
-msgstr ""
-
-#: Controller/ObjectsController.php:153
+#: Controller/ObjectsController.php:145
 msgid "You don't have permissions to create objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:181;1257;1309
+#: Controller/ObjectsController.php:168;1172;1219
 #: Model/Template.php:25
 msgid "Invalid template."
 msgstr ""
 
-#: Controller/ObjectsController.php:295;424;430
+#: Controller/ObjectsController.php:280;421;427
 msgid "Object could not be saved."
 msgstr ""
 
-#: Controller/ObjectsController.php:373;1006
-#: Model/Event.php:6248
+#: Controller/ObjectsController.php:359;802;906
+#: Model/Event.php:6483
 msgid "Invalid object."
 msgstr ""
 
-#: Controller/ObjectsController.php:377
+#: Controller/ObjectsController.php:364
 msgid "Insufficient permissions to edit this object."
 msgstr ""
 
-#: Controller/ObjectsController.php:449
+#: Controller/ObjectsController.php:380
+msgid "Force update anyway"
+msgstr ""
+
+#: Controller/ObjectsController.php:453
 msgid "Object attributes saved."
 msgstr ""
 
-#: Controller/ObjectsController.php:518
+#: Controller/ObjectsController.php:512
 msgid "This function can only be accessed via POST or PUT"
 msgstr ""
 
-#: Controller/ObjectsController.php:711
+#: Controller/ObjectsController.php:678;756
 msgid "Invalid template"
 msgstr ""
 
-#: Controller/ObjectsController.php:789
+#: Controller/ObjectsController.php:759
 msgid "Invalid fields"
 msgstr ""
 
-#: Controller/ObjectsController.php:796
+#: Controller/ObjectsController.php:766
 msgid "Invalid field"
 msgstr ""
 
-#: Controller/ObjectsController.php:822
+#: Controller/ObjectsController.php:791
 msgid "You don't have permissions to delete objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:926;933;937
+#: Controller/ObjectsController.php:886
 msgid "Object not found or not authorised."
 msgstr ""
 
-#: Controller/ObjectsController.php:1203
+#: Controller/ObjectsController.php:1115
 msgid "%s objects successfully reconstructed."
 msgstr ""
 
-#: Controller/ObjectsController.php:1213;1249
+#: Controller/ObjectsController.php:1125;1164
 msgid "This action can only be reached via AJAX."
 msgstr ""
 
-#: Controller/ObjectsController.php:1290
+#: Controller/ObjectsController.php:1182
+msgid "Invalid sharing group."
+msgstr ""
+
+#: Controller/ObjectsController.php:1200
 msgid "Failed to create an Object from Attributes. Error: "
 msgstr ""
 
-#: Controller/ObjectsController.php:1301
+#: Controller/ObjectsController.php:1211
 msgid "No Attribute selected."
 msgstr ""
 
-#: Controller/OrgBlacklistsController.php:15
-msgid "Organisation Blacklisting is not currently enabled on this instance."
+#: Controller/ObjectsController.php:1276
+msgid "Invalid object ID."
 msgstr ""
 
-#: Controller/OrganisationsController.php:28
+#: Controller/OrgBlocklistsController.php:15
+msgid "Organisation BlockListing is not currently enabled on this instance."
+msgstr ""
+
+#: Controller/OrganisationsController.php:31
 msgid "This feature is disabled on this instance for normal users."
 msgstr ""
 
-#: Controller/OrganisationsController.php:133
+#: Controller/OrganisationsController.php:87
+#: View/Elements/healthElements/diagnostics.ctp:34;46;159
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:30
+#: View/SharingGroups/view.ctp:14;20
+msgid "Unknown"
+msgstr ""
+
+#: Controller/OrganisationsController.php:138
 msgid "The organisation has been successfully added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:140
+#: Controller/OrganisationsController.php:145
 msgid "The organisation could not be added."
 msgstr ""
 
-#: Controller/OrganisationsController.php:163;296;302
+#: Controller/OrganisationsController.php:160;233
+msgid "Not specified"
+msgstr ""
+
+#: Controller/OrganisationsController.php:169
 msgid "Invalid organisation."
 msgstr ""
 
-#: Controller/OrganisationsController.php:169;249;255;308;335;368
+#: Controller/OrganisationsController.php:175;258;264;332
+#: Controller/UsersController.php:2136
 msgid "Invalid organisation"
 msgstr ""
 
-#: Controller/OrganisationsController.php:208
+#: Controller/OrganisationsController.php:207
 msgid "Organisation updated."
 msgstr ""
 
-#: Controller/OrganisationsController.php:223
+#: Controller/OrganisationsController.php:222
 msgid "The organisation could not be updated."
 msgstr ""
 
-#: Controller/OrganisationsController.php:272
+#: Controller/OrganisationsController.php:281
 msgid "Organisation deleted"
 msgstr ""
 
-#: Controller/OrganisationsController.php:279
+#: Controller/OrganisationsController.php:288
 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/OrganisationsController.php:373
-msgid "No landing page has been created for this organisation."
+#: Controller/OrganisationsController.php:358
+msgid "Organisation %s"
 msgstr ""
 
-#: Controller/OrganisationsController.php:422
+#: Controller/OrganisationsController.php:403
 msgid "This action is restricted to sync users"
 msgstr ""
 
-#: Controller/OrganisationsController.php:444
+#: Controller/OrganisationsController.php:425
 msgid "The organisation has been successfully merged."
 msgstr ""
 
-#: Controller/OrganisationsController.php:447
+#: Controller/OrganisationsController.php:428
 msgid "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"
 msgstr ""
 
-#: Controller/PostsController.php:54
-msgid "Discussion about Event #"
+#: Controller/PostsController.php:56
+msgid "Discussion about Event #%s (%s)"
 msgstr ""
 
-#: Controller/PostsController.php:80
+#: Controller/PostsController.php:73
 msgid "Invalid thread"
 msgstr ""
 
-#: Controller/PostsController.php:115
+#: Controller/PostsController.php:108
 msgid "Cannot post an empty message."
 msgstr ""
 
-#: Controller/PostsController.php:176
+#: Controller/PostsController.php:169
 msgid "Post added"
 msgstr ""
 
-#: Controller/PostsController.php:189
+#: Controller/PostsController.php:182
 msgid "The post could not be added."
 msgstr ""
 
-#: Controller/PostsController.php:208;256
+#: Controller/PostsController.php:201;249
 msgid "Invalid post"
 msgstr ""
 
-#: Controller/PostsController.php:211
-msgid "This is not your event."
+#: Controller/PostsController.php:204
+msgid "This is not your post."
 msgstr ""
 
-#: Controller/PostsController.php:219
+#: Controller/PostsController.php:212
 msgid "Post edited"
 msgstr ""
 
-#: Controller/PostsController.php:240
+#: Controller/PostsController.php:233
 msgid "The post could not be edited. Please, try again."
 msgstr ""
 
-#: Controller/PostsController.php:261
+#: Controller/PostsController.php:254
 msgid "This post doesn't belong to you, so you cannot delete it."
 msgstr ""
 
-#: Controller/PostsController.php:274
+#: Controller/PostsController.php:267
 msgid "Post and thread deleted"
 msgstr ""
 
-#: Controller/PostsController.php:283
+#: Controller/PostsController.php:276
 msgid "Post deleted"
 msgstr ""
 
@@ -1360,418 +1922,473 @@ msgstr ""
 msgid "Entry removed."
 msgstr ""
 
-#: Controller/RolesController.php:33
-msgid "Invalid role"
-msgstr ""
-
-#: Controller/RolesController.php:59;100
-msgid "The Role has been saved"
-msgstr ""
-
-#: Controller/RolesController.php:67;108
-msgid "The Role could not be saved. Please, try again."
-msgstr ""
-
-#: Controller/RolesController.php:85;151
+#: Controller/RolesController.php:57
 msgid "Invalid Role"
 msgstr ""
 
-#: Controller/RolesController.php:157
-msgid "Role deleted"
+#: Controller/RolesController.php:72
+msgid "The Role has been saved"
 msgstr ""
 
-#: Controller/RolesController.php:164
-msgid "Role could not be deleted"
+#: Controller/RolesController.php:80
+msgid "The Role could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/RolesController.php:200
+#: Controller/RolesController.php:105
+msgid "It is not possible to delete role that is assigned to users."
+msgstr ""
+
+#: Controller/RolesController.php:155
 msgid "Default role set."
 msgstr ""
 
-#: Controller/RolesController.php:200
+#: Controller/RolesController.php:155
 msgid "Default role unset."
 msgstr ""
 
-#: Controller/ServersController.php:237;436
+#: Controller/RolesController.php:170
+msgid "This endpoint expects a POST request."
+msgstr ""
+
+#: Controller/ServersController.php:165
+msgid "Event '%s' not found."
+msgstr ""
+
+#: Controller/ServersController.php:167
+msgid "Download failed. %s"
+msgstr ""
+
+#: Controller/ServersController.php:207
+msgid "Remote event preview"
+msgstr ""
+
+#: Controller/ServersController.php:215
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "Server overlap analysis matrix"
+msgstr ""
+
+#: Controller/ServersController.php:263;457
 msgid "The pull filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:247;446
+#: Controller/ServersController.php:273;467
 msgid "The push filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:302;476
+#: Controller/ServersController.php:330;497
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr ""
 
-#: Controller/ServersController.php:314
+#: Controller/ServersController.php:342
 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:350;532;2166
+#: Controller/ServersController.php:378;553;2332
 msgid "The server has been saved"
 msgstr ""
 
-#: Controller/ServersController.php:357;539
+#: Controller/ServersController.php:385;560
 msgid "The server could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ServersController.php:411;608;653;656;665;729;735;1501;1518
-#: Model/Server.php:5861
+#: Controller/ServersController.php:432;622;710;713;722;789;795;1634;1648
+#: Model/Server.php:4234
 msgid "Invalid server"
 msgstr ""
 
-#: Controller/ServersController.php:493
+#: Controller/ServersController.php:514
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr ""
 
-#: Controller/ServersController.php:604;2183;2225
+#: Controller/ServersController.php:618;2349;2391
 msgid "This endpoint expects POST requests."
 msgstr ""
 
-#: Controller/ServersController.php:612
+#: Controller/ServersController.php:626
 msgid "You don't have the privileges to do that."
 msgstr ""
 
-#: Controller/ServersController.php:621
+#: Controller/ServersController.php:635
 msgid "Server deleted"
 msgstr ""
 
-#: Controller/ServersController.php:630
+#: Controller/ServersController.php:644
 msgid "Server was not deleted"
 msgstr ""
 
-#: Controller/ServersController.php:668
+#: Controller/ServersController.php:674
+msgid "Settings saved"
+msgstr ""
+
+#: Controller/ServersController.php:676
+msgid "Could not save the settings. Invalid input."
+msgstr ""
+
+#: Controller/ServersController.php:725;728
 msgid "Pull setting not enabled for this server."
 msgstr ""
 
-#: Controller/ServersController.php:692
+#: Controller/ServersController.php:752
 msgid "Pulling."
 msgstr ""
 
-#: Controller/ServersController.php:702
+#: Controller/ServersController.php:762
 msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:748
+#: Controller/ServersController.php:808
 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:761
+#: Controller/ServersController.php:821
 msgid "Push complete. %s events pushed, %s events could not be pushed."
 msgstr ""
 
-#: Controller/ServersController.php:776
+#: Controller/ServersController.php:836
 msgid "Pushing."
 msgstr ""
 
-#: Controller/ServersController.php:786
+#: Controller/ServersController.php:846
 msgid "Push queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:814
+#: Controller/ServersController.php:874
 msgid "Filename not allowed"
 msgstr ""
 
-#: Controller/ServersController.php:819
+#: Controller/ServersController.php:879
 msgid "Incorrect extension or empty file."
 msgstr ""
 
-#: Controller/ServersController.php:901
-msgid "No organisation selected."
-msgstr ""
-
-#: Controller/ServersController.php:917;918;919;920;921;922;923;924;925;926;927;928;929;930;931
-#: View/Elements/healthElements/diagnostics.ctp:26;170;184;271;331
+#: Controller/ServersController.php:955;956;957;958;959;960;961;962;963;964;965;966;967;968
+#: View/Elements/healthElements/diagnostics.ctp:26;199;313;322;383
 #: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/submoduleStatus.ctp:23
-#: View/Servers/ajax/zeromqstatus.ctp:11
+#: View/Servers/ajax/zeromqstatus.ctp:12
 msgid "OK"
 msgstr ""
 
-#: Controller/ServersController.php:917
+#: Controller/ServersController.php:955
 msgid "not found"
 msgstr ""
 
-#: Controller/ServersController.php:917
+#: Controller/ServersController.php:955
 msgid "is not writeable"
 msgstr ""
 
-#: Controller/ServersController.php:918
+#: Controller/ServersController.php:956
 msgid "not readable"
 msgstr ""
 
-#: Controller/ServersController.php:919
+#: Controller/ServersController.php:957
 msgid "FAIL: settings not set"
 msgstr ""
 
-#: Controller/ServersController.php:919
+#: Controller/ServersController.php:957
 msgid "FAIL: Failed to load GnuPG"
 msgstr ""
 
-#: Controller/ServersController.php:919
+#: Controller/ServersController.php:957
 msgid "FAIL: Issues with the key/passphrase"
 msgstr ""
 
-#: Controller/ServersController.php:919
+#: Controller/ServersController.php:957
 msgid "FAIL: sign failed"
 msgstr ""
 
-#: Controller/ServersController.php:920
+#: Controller/ServersController.php:958
 msgid "not configured (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:920
+#: Controller/ServersController.php:958
 msgid "Getting URL via proxy failed"
 msgstr ""
 
-#: Controller/ServersController.php:921
+#: Controller/ServersController.php:959
 msgid "not enabled (so not tested)"
 msgstr ""
 
-#: Controller/ServersController.php:921
+#: Controller/ServersController.php:959
 msgid "Python ZeroMQ library not installed correctly."
 msgstr ""
 
-#: Controller/ServersController.php:921
+#: Controller/ServersController.php:959
 msgid "ZeroMQ script not running."
 msgstr ""
 
-#: Controller/ServersController.php:922
+#: Controller/ServersController.php:960
 msgid "Some of the libraries related to STIX are not installed. Make sure that all libraries listed below are correctly installed."
 msgstr ""
 
-#: Controller/ServersController.php:923
+#: Controller/ServersController.php:961
 msgid "Incorrect STIX version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:924
+#: Controller/ServersController.php:962
 msgid "Incorrect STIX2 version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:925
+#: Controller/ServersController.php:963
 msgid "Incorrect CyBox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:926
+#: Controller/ServersController.php:964
 msgid "Incorrect mixbox version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:927
+#: Controller/ServersController.php:965
 msgid "Incorrect maec version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:928
+#: Controller/ServersController.php:966
 msgid "Incorrect PyMISP version installed, found $current, expecting $expected"
 msgstr ""
 
-#: Controller/ServersController.php:929
-msgid "Incorrect plyara version installed, found $current, expecting $expected"
-msgstr ""
-
-#: Controller/ServersController.php:930
+#: Controller/ServersController.php:967
 #: View/Events/filter_event_index.ctp:32;188
 #: View/Pages/doc/using_the_system.ctp:68;173
 msgid "High"
 msgstr ""
 
-#: Controller/ServersController.php:930
+#: Controller/ServersController.php:967
 msgid "Alternative setting used"
 msgstr ""
 
-#: Controller/ServersController.php:930
+#: Controller/ServersController.php:967
 msgid "Test failed"
 msgstr ""
 
-#: Controller/ServersController.php:931
+#: Controller/ServersController.php:968
 msgid "System not enabled"
 msgstr ""
 
-#: Controller/ServersController.php:931
+#: Controller/ServersController.php:968
 msgid "No modules found"
 msgstr ""
 
-#: Controller/ServersController.php:938
+#: Controller/ServersController.php:975
 msgid "MISP will not operate correctly or will be unsecure until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:942
+#: Controller/ServersController.php:979
 msgid "Some of the features of MISP cannot be utilised until these issues are resolved."
 msgstr ""
 
-#: Controller/ServersController.php:946
+#: Controller/ServersController.php:983
 msgid "There are some optional tweaks that could be done to improve the looks of your MISP instance."
 msgstr ""
 
-#: Controller/ServersController.php:1165
+#: Controller/ServersController.php:1209
 msgid "Only one `update` worker can run at a time"
 msgstr ""
 
-#: Controller/ServersController.php:1177
+#: Controller/ServersController.php:1221
 msgid "Worker start signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1192
+#: Controller/ServersController.php:1236
 msgid "Worker stop signal sent"
 msgstr ""
 
-#: Controller/ServersController.php:1249
+#: Controller/ServersController.php:1251
+msgid "Background jobs not enabled"
+msgstr ""
+
+#: Controller/ServersController.php:1317
+msgid "Issue while contacting the remote server to retrieve event information"
+msgstr ""
+
+#: Controller/ServersController.php:1334
+msgid "This event could not be found or you don't have permissions to see it."
+msgstr ""
+
+#: Controller/ServersController.php:1337
+msgid "The event has been found."
+msgstr ""
+
+#: Controller/ServersController.php:1367
+#: View/Elements/global_menu.ctp:323
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:786
+#: View/Servers/id_translator.ctp:6
+msgid "Event ID translator"
+msgstr ""
+
+#: Controller/ServersController.php:1380
 msgid "This setting is redacted."
 msgstr ""
 
-#: Controller/ServersController.php:1274
+#: Controller/ServersController.php:1402
+msgid "Setting %s is invalid."
+msgstr ""
+
+#: Controller/ServersController.php:1405
 msgid "This setting can only be edited via the CLI."
 msgstr ""
 
-#: Controller/ServersController.php:1365;1377
+#: Controller/ServersController.php:1492
+msgid "Killing workers."
+msgstr ""
+
+#: Controller/ServersController.php:1504;1516
 msgid "Restarting workers."
 msgstr ""
 
-#: Controller/ServersController.php:1401
+#: Controller/ServersController.php:1531
 msgid "File not found."
 msgstr ""
 
-#: Controller/ServersController.php:1407
+#: Controller/ServersController.php:1537
 msgid "File could not be deleted."
 msgstr ""
 
-#: Controller/ServersController.php:1430;1446
+#: Controller/ServersController.php:1560;1576
 msgid "Upload failed."
 msgstr ""
 
-#: Controller/ServersController.php:1438
+#: Controller/ServersController.php:1568
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr ""
 
-#: Controller/ServersController.php:1505
+#: Controller/ServersController.php:1638
 msgid "Invalid user or user not found."
 msgstr ""
 
-#: Controller/ServersController.php:2052
+#: Controller/ServersController.php:1965
+msgid "Something went wrong. %s"
+msgstr ""
+
+#: Controller/ServersController.php:1970;2001
+msgid "YOUR_API_KEY"
+msgstr ""
+
+#: Controller/ServersController.php:2218
 msgid "Starting server caching."
 msgstr ""
 
-#: Controller/ServersController.php:2067
+#: Controller/ServersController.php:2233
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:2070
+#: Controller/ServersController.php:2236
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
-#: Controller/ServersController.php:2100
+#: Controller/ServersController.php:2266
 msgid "Cannot create sync config - no host org ID configured for the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2109
+#: Controller/ServersController.php:2275
 msgid "Configured host org not found. Please make sure that the setting is current on the instance."
 msgstr ""
 
-#: Controller/ServersController.php:2173
+#: Controller/ServersController.php:2339
 msgid "Could not save the server. Error: %s"
 msgstr ""
 
-#: Controller/ServersController.php:2194
+#: Controller/ServersController.php:2360
 msgid "API key updated."
 msgstr ""
 
-#: Controller/ServersController.php:2207
+#: Controller/ServersController.php:2373
 msgid "ID has to be a valid server connection"
 msgstr ""
 
-#: Controller/ServersController.php:2210
+#: Controller/ServersController.php:2376
 msgid "Invalid direction. Valid options: "
 msgstr ""
 
-#: Controller/ServersController.php:2214
+#: Controller/ServersController.php:2380
 msgid "Priority changed."
 msgstr ""
 
-#: Controller/ServersController.php:2217
+#: Controller/ServersController.php:2383
 msgid "Priority could not be changed."
 msgstr ""
 
-#: Controller/ServersController.php:2228
+#: Controller/ServersController.php:2394
 msgid "Only site admin accounts can release the update lock."
 msgstr ""
 
-#: Controller/ServersController.php:2238
+#: Controller/ServersController.php:2404
 msgid "Only site admin accounts get the DB schema diagnostic."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:263
+#: Controller/ShadowAttributesController.php:234
 msgid "Could not discard proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:324
+#: Controller/ShadowAttributesController.php:289
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:372;375;384
+#: Controller/ShadowAttributesController.php:337;340;349
 msgid "The lines"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:424
+#: Controller/ShadowAttributesController.php:388
 msgid "The proposal has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:436;749
+#: Controller/ShadowAttributesController.php:400;707
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:438
+#: Controller/ShadowAttributesController.php:402
 msgid "The proposal could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:475
+#: Controller/ShadowAttributesController.php:448
 msgid "Invalid Proposal"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:505
+#: Controller/ShadowAttributesController.php:466
 msgid "Proposal not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:601
+#: Controller/ShadowAttributesController.php:560
 msgid "The attachment has been uploaded"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:603
+#: Controller/ShadowAttributesController.php:562
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:606
+#: Controller/ShadowAttributesController.php:565
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:740
+#: Controller/ShadowAttributesController.php:698
 msgid "The proposed Attribute has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:751
+#: Controller/ShadowAttributesController.php:709
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:884;894
+#: Controller/ShadowAttributesController.php:825;853
 msgid "Invalid proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:1010
-msgid "This feature is only available using the API to Sync users"
-msgstr ""
-
-#: Controller/ShadowAttributesController.php:1013
-msgid "Invalid UUID"
-msgstr ""
-
-#: Controller/SharingGroupsController.php:251
+#: Controller/SharingGroupsController.php:247
 msgid "Sharing Group deleted"
 msgstr ""
 
-#: Controller/SharingGroupsController.php:256
+#: Controller/SharingGroupsController.php:252
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr ""
 
+#: Controller/SharingGroupsController.php:363
+#: View/Organisations/view.ctp:72;73
+#: View/SharingGroups/index.ctp:4
+msgid "Sharing Groups"
+msgstr ""
+
+#: Controller/SharingGroupsController.php:444
+#: View/SharingGroups/view.ctp:2
+msgid "Sharing Group %s"
+msgstr ""
+
 #: Controller/SightingdbController.php:32
 msgid "SightingDB connection added."
 msgstr ""
@@ -1780,10 +2397,6 @@ msgstr ""
 msgid "SightingDB connection could not be added."
 msgstr ""
 
-#: Controller/SightingdbController.php:49;99;143
-msgid " Reason: %s"
-msgstr ""
-
 #: Controller/SightingdbController.php:71;123
 #: Model/Sightingdb.php:325
 msgid "Invalid SightingDB entry."
@@ -1809,214 +2422,259 @@ msgstr ""
 msgid "Pass a valid SightingDB ID"
 msgstr ""
 
-#: Controller/SightingsController.php:83
+#: Controller/SightingsController.php:87
 msgid "Could not add the Sighting. Reason: "
 msgstr ""
 
-#: Controller/SightingsController.php:96
+#: Controller/SightingsController.php:100
 msgid "Sighting added"
 msgstr ""
 
-#: Controller/SightingsController.php:149
+#: Controller/SightingsController.php:153
 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:155
-#: Model/DecayingModel.php:464
+#: Controller/SightingsController.php:159
+#: Model/DecayingModel.php:480
 msgid "Attribute not found"
 msgstr ""
 
-#: Controller/SightingsController.php:173
+#: Controller/SightingsController.php:177
 msgid "Invalid request."
 msgstr ""
 
-#: Controller/SightingsController.php:182
+#: Controller/SightingsController.php:186
 msgid "Sighting added."
 msgstr ""
 
-#: Controller/SightingsController.php:184
+#: Controller/SightingsController.php:188
 msgid "Sighting could not be added"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:56;177
+#: Controller/TagCollectionsController.php:59;180
 msgid "The tag collection has been saved"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:64;185
+#: Controller/TagCollectionsController.php:67;188
 msgid "The tag collection could not be added. Reason: "
 msgstr ""
 
-#: Controller/TagCollectionsController.php:85
+#: Controller/TagCollectionsController.php:88
 msgid "%s new tag collections added."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:154
+#: Controller/TagCollectionsController.php:157
 msgid "Invalid Tag Collection"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:161
+#: Controller/TagCollectionsController.php:164
 msgid "You don't have editing rights on this Tag Collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:201;391
+#: Controller/TagCollectionsController.php:204;372;421
 msgid "Invalid tag collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:207
+#: Controller/TagCollectionsController.php:210
 msgid "Tag collection deleted."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:215
+#: Controller/TagCollectionsController.php:218
 msgid "Tag collection could not be deleted."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:224
+#: Controller/TagCollectionsController.php:227
 msgid "You are not allowed to delete that."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:241
+#: Controller/TagCollectionsController.php:244
 msgid "Invalid tag collection"
 msgstr ""
 
-#: Controller/TagCollectionsController.php:342
+#: Controller/TagCollectionsController.php:347
+msgid "Tag(s) added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:349
 msgid "Tag(s) could not be added."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:395
+#: Controller/TagCollectionsController.php:355
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:383
+msgid "Invalid tag collection tag."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:425
 msgid "Insufficient privileges to remove the tag from the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:406
+#: Controller/TagCollectionsController.php:436
 msgid "Invalid tag or tag not associated with the collection."
 msgstr ""
 
-#: Controller/TagCollectionsController.php:410
+#: Controller/TagCollectionsController.php:440
 msgid "Failed to remove tag from the collection."
 msgstr ""
 
-#: Controller/TagsController.php:370
+#: Controller/TagsController.php:304
 msgid "Tag deleted"
 msgstr ""
 
-#: Controller/TagsController.php:375
+#: Controller/TagsController.php:309
 msgid "Tag was not deleted"
 msgstr ""
 
-#: Controller/TagsController.php:599
+#: Controller/TagsController.php:464
 msgid "Favourite Tags"
 msgstr ""
 
-#: Controller/TagsController.php:605
+#: Controller/TagsController.php:470
 #: View/TagCollections/index.ctp:4
 msgid "Tag Collections"
 msgstr ""
 
-#: Controller/TagsController.php:610
+#: Controller/TagsController.php:475
 msgid "Custom Tags"
 msgstr ""
 
-#: Controller/TagsController.php:614
+#: Controller/TagsController.php:479
 msgid "All Tags"
 msgstr ""
 
-#: Controller/TagsController.php:622
-#: View/Taxonomies/view.ctp:2
+#: Controller/TagsController.php:487
 msgid "Taxonomy Library"
 msgstr ""
 
-#: Controller/TagsController.php:790
+#: Controller/TagsController.php:638
 msgid "Includes: "
 msgstr ""
 
-#: Controller/TagsController.php:867
+#: Controller/TagsController.php:715
 msgid "This functionality requires tagging permission."
 msgstr ""
 
-#: Controller/TagsController.php:881;905
+#: Controller/TagsController.php:729;753
 msgid "Cannot alter the tags of this data, only the organisation that has created the data (orgc) can modify global tags."
 msgstr ""
 
-#: Controller/TagsController.php:883;907
+#: Controller/TagsController.php:731;755
 msgid "Please consider using local tags if you are in the host organisation of the instance."
 msgstr ""
 
-#: Controller/TagsController.php:912;1058
+#: Controller/TagsController.php:760;930
 msgid "Invalid Target."
 msgstr ""
 
-#: Controller/TagsController.php:951
+#: Controller/TagsController.php:805
 msgid "Local tags can only be added by users of the host organisation."
 msgstr ""
 
-#: Controller/TagsController.php:964
+#: Controller/TagsController.php:814
+msgid "Tag not found and insufficient privileges to create it."
+msgstr ""
+
+#: Controller/TagsController.php:820
 msgid "Unable to create tag. Reason: "
 msgstr ""
 
-#: Controller/TagsController.php:1075
+#: Controller/TagsController.php:825
+msgid "Invalid Tag."
+msgstr ""
+
+#: Controller/TagsController.php:831
+msgid "Invalid Tag. This tag can only be set by a fixed organisation."
+msgstr ""
+
+#: Controller/TagsController.php:835
+msgid "Invalid Tag. This tag can only be set by a fixed user."
+msgstr ""
+
+#: Controller/TagsController.php:850
+msgid "%s already has the requested tag attached, no changes had to be made."
+msgstr ""
+
+#: Controller/TagsController.php:881
+msgid "Failed to attach tag to object."
+msgstr ""
+
+#: Controller/TagsController.php:885
+msgid "Failed to attach %s tags. Reasons: %s"
+msgstr ""
+
+#: Controller/TagsController.php:888
+msgid "Successfully attached %s tags to %s (%s)"
+msgstr ""
+
+#: Controller/TagsController.php:947
 msgid "Insufficient privileges to remove local tags from events you do not own."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:68
+#: Controller/TaxonomiesController.php:74
 msgid "Taxonomy not found."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:134
+#: Controller/TaxonomiesController.php:112
+#: View/Taxonomies/view.ctp:2
+msgid "%s Taxonomy Library"
+msgstr ""
+
+#: Controller/TaxonomiesController.php:141
 msgid "Taxonomy enabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:166
+#: Controller/TaxonomiesController.php:173
 msgid "Taxonomy disabled."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:234
+#: Controller/TaxonomiesController.php:251
 msgid "All taxonomy libraries are up to date already."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:237
+#: Controller/TaxonomiesController.php:254
 msgid "Could not update any of the taxonomy libraries"
 msgstr ""
 
-#: Controller/TaxonomiesController.php:240
-#: Controller/WarninglistsController.php:107
+#: Controller/TaxonomiesController.php:257
 msgid "Successfully updated "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:240;242
+#: Controller/TaxonomiesController.php:257;259
 msgid " taxonomy libraries."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:242
-#: Controller/WarninglistsController.php:109
+#: Controller/TaxonomiesController.php:259
 msgid " However, could not update "
 msgstr ""
 
-#: Controller/TaxonomiesController.php:276;314;344
+#: Controller/TaxonomiesController.php:293;331;361
 msgid "The tag(s) has been saved."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:282;316;346
+#: Controller/TaxonomiesController.php:299;333;363
 msgid "The tag(s) could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:374
+#: Controller/TaxonomiesController.php:391
 msgid "The tag(s) has been hidden."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:376
+#: Controller/TaxonomiesController.php:393
 msgid "The tag(s) could not be hidden. Please, try again."
 msgstr ""
 
-#: Controller/TaxonomiesController.php:413
-msgid "Taxonomy successfuly deleted."
-msgstr ""
-
-#: Controller/TaxonomiesController.php:416
-msgid "Taxonomy could not be deleted."
+#: Controller/TaxonomiesController.php:421
+msgid "Taxonomy successfully deleted."
 msgstr ""
 
 #: Controller/TaxonomiesController.php:424
-#: Controller/WarninglistsController.php:262
-msgid "This function can only be reached via AJAX."
+msgid "Taxonomy could not be deleted."
+msgstr ""
+
+#: Controller/TemplateElementsController.php:19;24
+msgid "No template with the provided ID exists, or you are not authorised to see it."
 msgstr ""
 
 #: Controller/TemplatesController.php:408
@@ -2027,260 +2685,315 @@ msgstr ""
 msgid "Event populated, but "
 msgstr ""
 
-#: Controller/UserSettingsController.php:129;276
+#: Controller/UserSettingsController.php:128;275
 msgid "Invalid ID passed."
 msgstr ""
 
-#: Controller/UserSettingsController.php:139;143;286;290
+#: Controller/UserSettingsController.php:138;142;285;289
 msgid "Invalid user setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:157;242;254
-#: Model/UserSetting.php:324
+#: Controller/UserSettingsController.php:156;241;253
+#: Model/UserSetting.php:378
 msgid "Invalid setting."
 msgstr ""
 
-#: Controller/UserSettingsController.php:161;294
-#: Model/UserSetting.php:328
+#: Controller/UserSettingsController.php:160;293
+#: Model/UserSetting.php:382
 msgid "This setting is restricted and requires the following permission(s): %s"
 msgstr ""
 
-#: Controller/UserSettingsController.php:193
+#: Controller/UserSettingsController.php:192
 msgid "Setting saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:206
+#: Controller/UserSettingsController.php:205
 msgid "Setting could not be saved."
 msgstr ""
 
-#: Controller/UserSettingsController.php:301
+#: Controller/UserSettingsController.php:300
 msgid "Setting deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:309
+#: Controller/UserSettingsController.php:308
 msgid "Setting could not be deleted."
 msgstr ""
 
-#: Controller/UserSettingsController.php:322
+#: Controller/UserSettingsController.php:321
 msgid "Expecting POST or DELETE request."
 msgstr ""
 
-#: Controller/UserSettingsController.php:329
-msgid "This endpoint only aaccepts POST requests."
-msgstr ""
-
 #: Controller/UserSettingsController.php:335
 msgid "No path POSTed."
 msgstr ""
 
-#: Controller/UsersController.php:46;326
+#: Controller/UsersController.php:52
 msgid "Invalid user or not authorised."
 msgstr ""
 
-#: Controller/UsersController.php:66;566;815;834;1059
+#: Controller/UsersController.php:64;567;833;844;1082
 msgid "Invalid user"
 msgstr ""
 
-#: Controller/UsersController.php:154;722;887
+#: Controller/UsersController.php:156;723;896
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
-#: Controller/UsersController.php:206
+#: Controller/UsersController.php:211
 msgid "The profile has been updated"
 msgstr ""
 
-#: Controller/UsersController.php:211
+#: Controller/UsersController.php:215
 msgid "The profile could not be updated. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:256
+#: Controller/UsersController.php:259
 msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:265
+#: Controller/UsersController.php:268
 msgid "Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:275
+#: Controller/UsersController.php:278
 msgid "Submitted new password cannot be the same as the current one"
 msgstr ""
 
-#: Controller/UsersController.php:290
+#: Controller/UsersController.php:293
 msgid "Password Changed."
 msgstr ""
 
-#: Controller/UsersController.php:299
+#: Controller/UsersController.php:301
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr ""
 
-#: Controller/UsersController.php:442;468;575
-#: Model/Log.php:382
+#: Controller/UsersController.php:445;471;579
+#: Model/Log.php:405
 msgid "Redacted"
 msgstr ""
 
-#: Controller/UsersController.php:733
+#: Controller/UsersController.php:734
 msgid "The user could not be saved. Invalid organisation."
 msgstr ""
 
-#: Controller/UsersController.php:755
+#: Controller/UsersController.php:745
+msgid "User notified of new credentials."
+msgstr ""
+
+#: Controller/UsersController.php:747
+msgid "User notification of new credentials could not be send."
+msgstr ""
+
+#: Controller/UsersController.php:765
 msgid "The user has been saved."
 msgstr ""
 
-#: Controller/UsersController.php:764;995
+#: Controller/UsersController.php:774;1016
 msgid "The user could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:987
+#: Controller/UsersController.php:1009
 msgid "The user has been saved"
 msgstr ""
 
-#: Controller/UsersController.php:1067
+#: Controller/UsersController.php:1090
 msgid "User deleted"
 msgstr ""
 
-#: Controller/UsersController.php:1071
+#: Controller/UsersController.php:1094
 msgid "User was not deleted"
 msgstr ""
 
-#: Controller/UsersController.php:1155
+#: Controller/UsersController.php:1165
 msgid "Invalid username or password, try again"
 msgstr ""
 
 #: Controller/UsersController.php:1254
+msgid "Welcome! Last login was on %s"
+msgstr ""
+
+#: Controller/UsersController.php:1281
 msgid "Good-Bye"
 msgstr ""
 
-#: Controller/UsersController.php:1273;1297
+#: Controller/UsersController.php:1301;1324
 msgid "This functionality is only accessible via POST requests."
 msgstr ""
 
-#: Controller/UsersController.php:1279
+#: Controller/UsersController.php:1307
 msgid "Invalid action."
 msgstr ""
 
-#: Controller/UsersController.php:1286
+#: Controller/UsersController.php:1314
 msgid "New authkey generated."
 msgstr ""
 
-#: Controller/UsersController.php:1301
+#: Controller/UsersController.php:1328
 msgid "Job initiated."
 msgstr ""
 
-#: Controller/UsersController.php:1303
+#: Controller/UsersController.php:1330
 msgid "%s authkeys reset, %s could not be reset."
 msgstr ""
 
-#: Controller/UsersController.php:1417
+#: Controller/UsersController.php:1442
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1545
+#: Controller/UsersController.php:1570
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1550
+#: Controller/UsersController.php:1575
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1587
+#: Controller/UsersController.php:1612
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1589
+#: Controller/UsersController.php:1614
 msgid "E-mails sent."
 msgstr ""
 
-#: Controller/UsersController.php:1663
+#: Controller/UsersController.php:1702
+msgid "The OTP is incorrect or has expired"
+msgstr ""
+
+#: Controller/UsersController.php:1747
+msgid "An email containing a OTP has been sent."
+msgstr ""
+
+#: Controller/UsersController.php:1749
+msgid "The email couldn't be sent, please reach out to your administrator."
+msgstr ""
+
+#: Controller/UsersController.php:1774
 msgid "Usage data"
 msgstr ""
 
-#: Controller/UsersController.php:1664
-#: View/Elements/global_menu.ctp:163
+#: Controller/UsersController.php:1775
+#: View/Cerebrates/view.ctp:57
+#: View/Elements/global_menu.ctp:201
 #: View/SharingGroups/add.ctp:19
 #: View/SharingGroups/edit.ctp:19
-#: View/SharingGroups/view.ctp:39
+#: View/SharingGroups/view.ctp:30;43
 #: View/Users/statistics.ctp:27
 #: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr ""
 
-#: Controller/UsersController.php:1665
+#: Controller/UsersController.php:1776
 msgid "User and Organisation statistics"
 msgstr ""
 
-#: Controller/UsersController.php:1666
-#: View/Attributes/index.ctp:53
+#: Controller/UsersController.php:1777
+#: View/Attributes/index.ctp:47
 #: View/DecayingModel/decaying_tool_rest_search.ctp:28
-#: View/Elements/eventattribute.ctp:151
+#: View/Elements/eventattribute.ctp:128
+#: View/Elements/EventReports/reportHelpModal.ctp:53
 #: View/Elements/Events/eventIndexTable.ctp:37
 #: View/Elements/Feeds/eventattribute.ctp:46
-#: View/Elements/Servers/eventattribute.ctp:46
-#: View/Events/resolved_attributes.ctp:53
-#: View/Events/resolved_misp_format.ctp:66;94;289
-#: View/Events/view.ctp:127
+#: View/Elements/GalaxyClusters/relations_graph.ctp:450
+#: View/Elements/Servers/eventattribute.ctp:43
+#: View/Events/get_event_info_by_id.ctp:15
+#: View/Events/resolved_misp_format.ctp:68;145;340
+#: View/Events/view.ctp:100
 #: View/Feeds/preview_event.ctp:16
-#: View/Feeds/preview_index.ctp:39
+#: View/Feeds/preview_index.ctp:35
 #: View/Feeds/view.ctp:16
+#: View/GalaxyClusters/view_relations.ctp:117
 #: 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/Servers/preview_event.ctp:18
+#: View/Servers/preview_index.ctp:90
 #: View/TagCollections/index.ctp:10
-#: View/Tags/index.ctp:10
-#: View/Taxonomies/view.ctp:88
+#: View/Tags/index.ctp:117
+#: View/Taxonomies/view.ctp:68
 #: View/Templates/add.ctp:12
 #: View/Templates/edit.ctp:12
 #: View/Templates/view.ctp:19
 msgid "Tags"
 msgstr ""
 
-#: Controller/UsersController.php:1667
+#: Controller/UsersController.php:1778
 msgid "Attribute histogram"
 msgstr ""
 
-#: Controller/UsersController.php:1668
+#: Controller/UsersController.php:1779
 msgid "Sightings toplists"
 msgstr ""
 
-#: Controller/UsersController.php:1669
+#: Controller/UsersController.php:1780
 msgid "Galaxy Matrix"
 msgstr ""
 
-#: Controller/UsersController.php:2252
+#: Controller/UsersController.php:2129
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:191
+#: View/EventReports/index.ctp:16
+#: View/EventReports/ajax/indexForEvent.ctp:50
+#: View/GalaxyClusterRelations/index.ctp:14
+#: View/GalaxyClusters/ajax/index.ctp:19
+#: View/Jobs/index.ctp:13;58
+#: View/ObjectTemplates/index.ctp:33
+#: View/Regexp/admin_add.ctp:17
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+#: View/Taxonomies/index.ctp:12
+#: View/UserSettings/index.ctp:41
+#: View/Users/admin_index.ctp:38
+#: View/Warninglists/index.ctp:20
+msgid "All"
+msgstr ""
+
+#: Controller/UsersController.php:2373
 msgid "Self registration is not enabled on this instance."
 msgstr ""
 
-#: Controller/UsersController.php:2278
+#: Controller/UsersController.php:2405
 msgid "We require at least the email field to be filled."
 msgstr ""
 
-#: Controller/UsersController.php:2284
+#: Controller/UsersController.php:2410
+msgid "Request could not be created."
+msgstr ""
+
+#: Controller/UsersController.php:2412
+msgid "Errors: %s"
+msgstr ""
+
+#: Controller/UsersController.php:2423
 msgid "User registration for %s."
 msgstr ""
 
-#: Controller/UsersController.php:2292
+#: Controller/UsersController.php:2431
 msgid "Request could not be created. Make sure that the email and org name fields are filled."
 msgstr ""
 
-#: Controller/UsersController.php:2299
+#: Controller/UsersController.php:2438
 msgid "Request sent. The administrators of this community have been notified."
 msgstr ""
 
-#: Controller/UsersController.php:2353
+#: Controller/UsersController.php:2485
 msgid "default"
 msgstr ""
 
-#: Controller/UsersController.php:2356;2357;2358
+#: Controller/UsersController.php:2488;2489;2490
+#: Model/Server.php:4388
 #: 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/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:20
 #: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: View/Elements/Users/userIndexTable.ctp:47;50;57;64;76;82
+#: View/Elements/Feeds/View/row_attribute.ctp:85
+#: View/Elements/Servers/View/row_attribute.ctp:125
+#: View/Elements/Users/userIndexTable.ctp:51;54;61;68;80;86
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:59
+#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:10
+#: View/Elements/healthElements/diagnostics.ctp:218;225
 #: View/Elements/templateElements/templateRowAttribute.ctp:63;74;86
 #: View/Elements/templateElements/templateRowFile.ctp:42;53;64
 #: View/EventDelegations/ajax/accept_delegation.ctp:10
@@ -2289,27 +3002,25 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:70
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:191
+#: View/Events/view.ctp:184
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
 #: 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/GalaxyClusters/ajax/publishConfirmationForm.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:32
-#: View/Objects/revise_object.ctp:92
+#: View/Objects/revise_object.ctp:83
 #: View/Objects/ajax/delete.ctp:19
 #: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;158;159;164;165
-#: View/Servers/preview_event.ctp:79
+#: View/Servers/index.ctp:112;113;114;115;116;117;151;152;157;158
+#: View/Servers/preview_event.ctp:47
 #: 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/view.ctp:5
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
 #: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
@@ -2320,17 +3031,22 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: Controller/UsersController.php:2356;2357;2358
+#: Controller/UsersController.php:2488;2489;2490
+#: Model/Server.php:4388
 #: 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/tagRemoveConfirmation.ctp:22
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Communities/view.ctp:14
-#: View/Elements/Feeds/View/row_attribute.ctp:89
-#: View/Elements/Servers/View/row_attribute.ctp:144
-#: View/Elements/Users/userIndexTable.ctp:47;50;57;64;76;82
+#: View/Elements/Feeds/View/row_attribute.ctp:85
+#: View/Elements/Servers/View/row_attribute.ctp:125
+#: View/Elements/Users/userIndexTable.ctp:51;54;61;68;80;86
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:50
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:59
+#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:13
+#: View/Elements/healthElements/diagnostics.ctp:218;227
 #: View/Elements/templateElements/templateRowAttribute.ctp:64;75;87
 #: View/Elements/templateElements/templateRowFile.ctp:43;54;65
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2339,28 +3055,27 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:70;224
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:191
+#: View/Events/view.ctp:184
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:33
 #: 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/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:26
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:30
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/Objects/revise_object.ctp:92
+#: View/Objects/revise_object.ctp:83
 #: View/Objects/ajax/delete.ctp:24
 #: View/Organisations/index.ctp:127
-#: View/Roles/admin_index.ctp:43;51
-#: View/Roles/index.ctp:36
-#: View/Servers/index.ctp:119;120;121;122;154;158;159;164;165
-#: View/Servers/preview_event.ctp:89
+#: View/Servers/index.ctp:112;113;114;115;116;117;147;151;152;157;158
+#: View/Servers/preview_event.ctp:47
 #: 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/view.ctp:5
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
 #: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
@@ -2372,107 +3087,123 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: Controller/UsersController.php:2495
+#: Controller/UsersController.php:2635
 msgid "Role ID not provided and no default role exist on the instance"
 msgstr ""
 
-#: Controller/UsersController.php:2509
+#: Controller/UsersController.php:2639
+msgid "No organisation selected. Supply an Organisation ID"
+msgstr ""
+
+#: Controller/UsersController.php:2657
 msgid "Added %s user(s)."
 msgstr ""
 
-#: Controller/UsersController.php:2512
+#: Controller/UsersController.php:2660
 msgid "Could not add %s user(s), reasons for the failure have been logged."
 msgstr ""
 
-#: Controller/UsersController.php:2515
+#: Controller/UsersController.php:2663
 msgid "No new users added - there was nothing to add."
 msgstr ""
 
-#: Controller/WarninglistsController.php:42
-msgid "This action is only accessible via POST requests."
+#: Controller/UsersController.php:2685
+msgid "This endpoint can only be triggered via POST requests."
 msgstr ""
 
-#: Controller/WarninglistsController.php:64
+#: Controller/UsersController.php:2711
+msgid "The upgrade process is complete, %s authkey(s) generated."
+msgstr ""
+
+#: Controller/WarninglistsController.php:77
 msgid "Warning list updated"
 msgstr ""
 
-#: Controller/WarninglistsController.php:80
+#: Controller/WarninglistsController.php:93
 msgid "Warning list failed to update"
 msgstr ""
 
-#: Controller/WarninglistsController.php:81
+#: Controller/WarninglistsController.php:94
 msgid " could not be installed/updated. Error: "
 msgstr ""
 
-#: Controller/WarninglistsController.php:95
+#: Controller/WarninglistsController.php:108
 msgid "Warninglist update (nothing to update)"
 msgstr ""
 
-#: Controller/WarninglistsController.php:96
+#: Controller/WarninglistsController.php:109
 msgid "Executed an update of the warning lists, but there was nothing to update."
 msgstr ""
 
-#: Controller/WarninglistsController.php:101
+#: Controller/WarninglistsController.php:114
 msgid "All warninglists are up to date already."
 msgstr ""
 
-#: Controller/WarninglistsController.php:104
+#: Controller/WarninglistsController.php:117
 msgid "Could not update any of the warning lists"
 msgstr ""
 
-#: Controller/WarninglistsController.php:132
+#: Controller/WarninglistsController.php:120
+msgid "Successfully updated %s warninglists."
+msgstr ""
+
+#: Controller/WarninglistsController.php:122
+msgid " However, could not update %s warninglists."
+msgstr ""
+
+#: Controller/WarninglistsController.php:145
 msgid "This function only accepts POST requests."
 msgstr ""
 
-#: Controller/WarninglistsController.php:160;233
+#: Controller/WarninglistsController.php:173;245
 msgid "Warninglist not found."
 msgstr ""
 
-#: Controller/WarninglistsController.php:164
+#: Controller/WarninglistsController.php:177
 msgid "Warninglist(s) not found."
 msgstr ""
 
-#: Controller/WarninglistsController.php:190
+#: Controller/WarninglistsController.php:202
 msgid " warninglist(s) "
 msgstr ""
 
-#: Controller/WarninglistsController.php:192
+#: Controller/WarninglistsController.php:204
 msgid "Warninglist(s) could not be toggled."
 msgstr ""
 
-#: Controller/WarninglistsController.php:200
+#: Controller/WarninglistsController.php:212
 msgid "Invalid Warninglist."
 msgstr ""
 
-#: Controller/WarninglistsController.php:209
+#: Controller/WarninglistsController.php:221
 msgid "Warninglist disabled"
 msgstr ""
 
-#: Controller/WarninglistsController.php:212
+#: Controller/WarninglistsController.php:224
 msgid "Warninglist enabled"
 msgstr ""
 
-#: Controller/WarninglistsController.php:220
+#: Controller/WarninglistsController.php:232
 msgid "This action is available via AJAX only."
 msgstr ""
 
-#: Controller/WarninglistsController.php:251
+#: Controller/WarninglistsController.php:263
 msgid "Warninglist successfuly deleted."
 msgstr ""
 
-#: Controller/WarninglistsController.php:254
+#: Controller/WarninglistsController.php:266
 msgid "Warninglists could not be deleted."
 msgstr ""
 
-#: Controller/WarninglistsController.php:272
+#: Controller/WarninglistsController.php:283
 msgid "No valid data received."
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:634
+#: Controller/Component/ACLComponent.php:778
 msgid "This could be an indication of an attempted privilege escalation on older vulnerable versions of MISP (<2.4.115)"
 msgstr ""
 
-#: Controller/Component/ACLComponent.php:688
+#: Controller/Component/ACLComponent.php:831
 msgid "User triggered security alert by attempting to access /%s/%s. Reason why this endpoint is of interest: %s"
 msgstr ""
 
@@ -2500,28 +3231,50 @@ msgstr ""
 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."
+#: Controller/Component/BlockListComponent.php:54
+msgid "Pass a list of uuids via the \"uuids\" key in the request object."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:126
-msgid "Blacklist item added."
+#: Controller/Component/BlockListComponent.php:84
+msgid "Done. Added %d new entries to the blocklist. %d entries could not be saved."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:133
-msgid "Could not save the blacklist item"
+#: Controller/Component/BlockListComponent.php:113
+msgid "Blocklist item not found."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:155
-msgid "Invalid blacklist entry"
+#: Controller/Component/BlockListComponent.php:153
+msgid "Blocklist item added."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:159
-msgid "Blacklist entry removed"
+#: Controller/Component/BlockListComponent.php:160
+msgid "Could not save the blocklist item"
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:161
-msgid "Could not remove the blacklist entry"
+#: Controller/Component/BlockListComponent.php:183
+msgid "Blocklist entry removed"
+msgstr ""
+
+#: Controller/Component/BlockListComponent.php:189
+msgid "Could not remove the blocklist entry"
+msgstr ""
+
+#: Controller/Component/CRUDComponent.php:107
+msgid "%s added."
+msgstr ""
+
+#: Controller/Component/CRUDComponent.php:129
+msgid "%s could not be added."
+msgstr ""
+
+#: Controller/Component/CRUDComponent.php:146;198;210;227;240
+#: Controller/Component/ToolboxComponent.php:16;21;29
+#: Model/Galaxy.php:358;427;437;451
+msgid "Invalid %s."
+msgstr ""
+
+#: Controller/Component/CRUDComponent.php:260
+msgid "%s deleted."
 msgstr ""
 
 #: Controller/Component/DeprecationComponent.php:18
@@ -2572,1465 +3325,1647 @@ msgstr ""
 msgid "Rate limit exceeded."
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:603
+#: Controller/Component/RestResponseComponent.php:714
 msgid "The action that the user performed"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:609
-msgid "Is the sharing group selectable (active) when chosing distribution"
+#: Controller/Component/RestResponseComponent.php:720
+msgid "Is the sharing group selectable (active) when choosing distribution"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:614;1356
+#: Controller/Component/RestResponseComponent.php:725;1497
 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 ""
 
-#: Controller/Component/RestResponseComponent.php:620
+#: Controller/Component/RestResponseComponent.php:731
 msgid "All organisations contained on the instance will be part of the sharing group"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:626
+#: Controller/Component/RestResponseComponent.php:737
 msgid "hard-delete already soft-deleted attributes"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:633
+#: Controller/Component/RestResponseComponent.php:744
 msgid "Maturity of the event"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:640
+#: Controller/Component/RestResponseComponent.php:751
 msgid "Anonymise the information regarding the server on which the request was issued"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:646
+#: Controller/Component/RestResponseComponent.php:757
 msgid "Filter on attribute value"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:652
+#: Controller/Component/RestResponseComponent.php:763
 msgid "The authorisation key found on the external server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:658
+#: Controller/Component/RestResponseComponent.php:769
 msgid "The user receive alerts when events are published"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:664
+#: Controller/Component/RestResponseComponent.php:775
 msgid "The email's body"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:670
+#: Controller/Component/RestResponseComponent.php:781
 msgid "The feed is cached"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:682
+#: Controller/Component/RestResponseComponent.php:793
 msgid "A valid x509 certificate "
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:688
+#: Controller/Component/RestResponseComponent.php:799
 msgid "The text contained in the change field"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:694
+#: Controller/Component/RestResponseComponent.php:805
 msgid "The user will be prompted the change the password"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:700
+#: Controller/Component/RestResponseComponent.php:811
 msgid "A valid hexadecimal colour `#ffffff`"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:711
+#: Controller/Component/RestResponseComponent.php:822
 msgid "Contact details for the organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:717
+#: Controller/Component/RestResponseComponent.php:828
 msgid "The user receive alerts from `contact reporter` requests"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:734
+#: Controller/Component/RestResponseComponent.php:845
 msgid "Base64 encoded file contents"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:746
+#: Controller/Component/RestResponseComponent.php:857
 msgid "The user set date field on the event level. If you are using restSearch, you can use any of the valid time related filters (examples: 7d, timestamps, [14d, 7d] for ranges, etc.)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:781
+#: Controller/Component/RestResponseComponent.php:892
 msgid "The role is a default role (selected by default)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:787
+#: Controller/Component/RestResponseComponent.php:898
 msgid "Remove file after ingestion"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:793
+#: Controller/Component/RestResponseComponent.php:904
 msgid "Include deleted elements"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:799
+#: Controller/Component/RestResponseComponent.php:910
 msgid "Merge attributes (only add new attribute, remove revoked attributes)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:810
+#: Controller/Component/RestResponseComponent.php:921
 msgid "Disable the user account"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:822
+#: Controller/Component/RestResponseComponent.php:933
 msgid "Filter on user email"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:828
+#: Controller/Component/RestResponseComponent.php:939
 msgid "Set the password manually"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:839
-msgid "When uploading malicious samples, set this flag to tell MISP to encrpyt the sample and extract the file hashes. This will create a MISP object with the appropriate attributes."
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:850
-msgid "Should the warning list be enforced. Adds `blocked` field for matching attributes"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:863
-msgid "The timestamp at which the event was last modified"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:870
-msgid "The timestamp at which the attribute was last modified"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:882;1021
-msgid "Quick event description"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:888
-msgid "The tag is exported when synchronising with other instances"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:900
-msgid "Exclude local tags from the export"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:906
-msgid "The organisation have write access to this sharing group (they can add/remove other organisation)"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:912
-msgid "An external authorisation is required for this user"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:918
-msgid "A valid external auth key"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:931
-msgid "target_event option might be considered"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:943
-msgid "The date from which the event was published"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:949
-msgid "A valid GPG key"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:955
-msgid "The event contains proposals"
+#: Controller/Component/RestResponseComponent.php:950
+msgid "When uploading malicious samples, set this flag to tell MISP to encrypt the sample and extract the file hashes. This will create a MISP object with the appropriate attributes."
 msgstr ""
 
 #: Controller/Component/RestResponseComponent.php:961
+msgid "Should the warning list be enforced. Adds `blocked` field for matching attributes"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:968
+#: View/Attributes/alternate_search_result.ctp:6
+#: View/EventDelegations/index.ctp:70
+msgid "Event id"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:981
+msgid "The timestamp at which the event was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:988
+msgid "The timestamp at which the attribute was last modified"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1000;1145
+msgid "Quick event description"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1006
+msgid "The tag is exported when synchronising with other instances"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1018
+msgid "Exclude local tags from the export"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1024
+msgid "The organisation have write access to this sharing group (they can add/remove other organisation)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1030
+msgid "An external authorisation is required for this user"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1036
+msgid "A valid external auth key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1049
+msgid "target_event option might be considered"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1061
+msgid "The date from which the event was published"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1067
+msgid "Source galaxy cluster UUID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1073
+msgid "A valid GPG key"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1079
+msgid "The event contains proposals"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1085
 msgid "Headers to be passed with the requests. All separated by `\\n`"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:967
+#: Controller/Component/RestResponseComponent.php:1091
 msgid "The tag is hidden (not selectable)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:979
+#: Controller/Component/RestResponseComponent.php:1103
 msgid "Include matching attributes in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:991
+#: Controller/Component/RestResponseComponent.php:1115
 msgid "Include matching events in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:997
+#: Controller/Component/RestResponseComponent.php:1121
 msgid "Include matching eventUuids in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1003
+#: Controller/Component/RestResponseComponent.php:1127
 msgid "Include tags of matching events in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1015
+#: Controller/Component/RestResponseComponent.php:1139
 msgid "Include proposals of matching events in the response"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1028
+#: Controller/Component/RestResponseComponent.php:1152
 msgid "Specify whether the source (url field) is a directory (local) or an geniun url (network)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1034
+#: Controller/Component/RestResponseComponent.php:1158
 msgid "The IP of a login attempt"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1040
+#: Controller/Component/RestResponseComponent.php:1164
 msgid "JSON containing ID, UUID and name"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1046
+#: Controller/Component/RestResponseComponent.php:1170
 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)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1059
+#: Controller/Component/RestResponseComponent.php:1183
 msgid "Limit on the pagination"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1065
+#: Controller/Component/RestResponseComponent.php:1189
 msgid "If the organisation should have access to this instance, make sure that the Local organisation setting is checked. If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting."
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1071
+#: Controller/Component/RestResponseComponent.php:1195
 msgid "The lookup will not be visible in the feed correlation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1077
+#: Controller/Component/RestResponseComponent.php:1201
 msgid "Message to be included"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1083
-msgid "Will not return Attributes, shadow attribute and objects"
+#: Controller/Component/RestResponseComponent.php:1207
+msgid "Will only return the metadata of the given query scope, contained data is omitted."
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1089
+#: Controller/Component/RestResponseComponent.php:1213
 msgid "Will only return  id, timestamp, published and uuid"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1096
+#: Controller/Component/RestResponseComponent.php:1220
 msgid "Mock the query"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1120
+#: Controller/Component/RestResponseComponent.php:1244
 msgid "The last time the sharing group was modified"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1138
+#: Controller/Component/RestResponseComponent.php:1262
 msgid "The news are read"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1145
+#: Controller/Component/RestResponseComponent.php:1269
 msgid "The unique Signature Identification"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1151
+#: Controller/Component/RestResponseComponent.php:1275
 msgid "Can be either the ORG_ID or the ORG_NAME"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1157
+#: Controller/Component/RestResponseComponent.php:1281
 msgid "Describe the organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1163
+#: Controller/Component/RestResponseComponent.php:1287
 msgid "Organisation identifier (name)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1175;1181
+#: Controller/Component/RestResponseComponent.php:1299;1305
 msgid "Globally used uuid of an organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1187
+#: Controller/Component/RestResponseComponent.php:1311
 msgid "The IDS flags will be set to off for this feed"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1194
+#: Controller/Component/RestResponseComponent.php:1318
 msgid "Page number for the pagination"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1200
+#: Controller/Component/RestResponseComponent.php:1324
 msgid "The hardcoded password"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1272
+#: Controller/Component/RestResponseComponent.php:1401
 msgid "The name of the feed provider"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1278
+#: Controller/Component/RestResponseComponent.php:1407
 msgid "The event will be published"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1301
+#: Controller/Component/RestResponseComponent.php:1430
 msgid "Allow the download of events and their attribute from the server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1307
+#: Controller/Component/RestResponseComponent.php:1436
 msgid "Allow the upload of events and their attribute to the server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1313
+#: Controller/Component/RestResponseComponent.php:1442
 msgid "Allow the upload of sightings to the server"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1319
+#: Controller/Component/RestResponseComponent.php:1448
+msgid "Destination galaxy cluster UUID"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1454
+msgid "The type of the relation. Example: `is`, `related-to`, ..."
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1460
 msgid "Concise summary for who this sharing group is releasable to"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1337
+#: Controller/Component/RestResponseComponent.php:1478
 msgid "Pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1362
+#: Controller/Component/RestResponseComponent.php:1503
 msgid "The sector of the organisation"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1374
+#: Controller/Component/RestResponseComponent.php:1515
 msgid "Will only return the sharing group ID"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1387
+#: Controller/Component/RestResponseComponent.php:1528
 msgid "Sharing group ID"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1393
+#: Controller/Component/RestResponseComponent.php:1534
 msgid "The source of the Sighting (e.g. honeypot_1)"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1405
+#: Controller/Component/RestResponseComponent.php:1546
+msgid "Only returns tags matching exactly the tag name (thus skipping synonyms and cluster's value)"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1552
 msgid "The email's subject"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1411;1417
+#: Controller/Component/RestResponseComponent.php:1558;1564
 msgid "Base64 encoded certificate"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1435
+#: Controller/Component/RestResponseComponent.php:1582
 msgid "A tad ID to attach to created events"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1448
+#: Controller/Component/RestResponseComponent.php:1595
 msgid "The provided ID will be reused as an existing event"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1471
+#: Controller/Component/RestResponseComponent.php:1618
 msgid "Time of the sighting with the form `h:i:s`"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1483
+#: Controller/Component/RestResponseComponent.php:1630
 msgid "The title of the log"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1495
+#: Controller/Component/RestResponseComponent.php:1642
 msgid "The date to which the event was published"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1501
+#: Controller/Component/RestResponseComponent.php:1648
 msgid "The state of the `to_ids` flag"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1507
+#: Controller/Component/RestResponseComponent.php:1654
 msgid "The type of the attribute"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1535
+#: Controller/Component/RestResponseComponent.php:1682
 msgid "Placeholder containing values to sight"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1548
+#: Controller/Component/RestResponseComponent.php:1695
 msgid "Not supported (warninglist->checkvalues) expect an array"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1554
-msgid "Not supported (removeTag)"
-msgstr ""
-
-#: Controller/Component/RestResponseComponent.php:1560;1566;1572;1579;1585;1591;1597;1603;1614
+#: Controller/Component/RestResponseComponent.php:1701;1707;1713;1720;1726;1732;1738;1744;1755
 msgid "Not supported"
 msgstr ""
 
-#: Controller/Component/RestResponseComponent.php:1771
+#: Controller/Component/RestResponseComponent.php:1902
+msgid "Also supports array of tags"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1907
+msgid "Attribute id"
+msgstr ""
+
+#: Controller/Component/RestResponseComponent.php:1928
 msgid "Seen within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m)"
 msgstr ""
 
-#: Controller/Component/ToolboxComponent.php:18;26
-#: Model/Galaxy.php:220;277;287;301
-msgid "Invalid %s."
+#: Model/AppModel.php:1655
+msgid "Indexing %s -> %s"
 msgstr ""
 
-#: Model/AppModel.php:1466
-msgid "Indexing "
-msgstr ""
-
-#: Model/AppModel.php:1480
+#: Model/AppModel.php:1669
 msgid "Issues executing the pre-update test `%s`. The returned error is: %s"
 msgstr ""
 
-#: Model/AppModel.php:1502
-msgid "Successfuly executed the SQL query for "
+#: Model/AppModel.php:1691
+msgid "Successfully executed the SQL query for "
 msgstr ""
 
-#: Model/AppModel.php:1503
+#: Model/AppModel.php:1692
 msgid "The executed SQL query was: %s"
 msgstr ""
 
-#: Model/AppModel.php:1505
-msgid "Successfuly executed the SQL query for %s"
+#: Model/AppModel.php:1694
+msgid "Successfully executed the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1516;1580
+#: Model/AppModel.php:1705;1768
 msgid "Issues executing the SQL query for %s"
 msgstr ""
 
-#: Model/AppModel.php:1517
+#: Model/AppModel.php:1706
 msgid "The executed SQL query was: "
 msgstr ""
 
-#: Model/AppModel.php:1517
+#: Model/AppModel.php:1706
 msgid " The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1519
+#: Model/AppModel.php:1708
 msgid "Issues executing the SQL query for `%s`. The returned error is: "
 msgstr ""
 
-#: Model/AppModel.php:1528
-msgid "However, as this error is whitelisted, the update went through."
+#: Model/AppModel.php:1717
+msgid "However, as this error is allowed, the update went through."
 msgstr ""
 
-#: Model/AppModel.php:1547
+#: Model/AppModel.php:1736
 msgid "Successfuly indexed "
 msgstr ""
 
-#: Model/AppModel.php:1550
+#: Model/AppModel.php:1739
 msgid "Failed to add index"
 msgstr ""
 
-#: Model/AppModel.php:1552
+#: Model/AppModel.php:1741
 msgid "The returned error is:"
 msgstr ""
 
-#: Model/AppModel.php:1581
+#: Model/AppModel.php:1769
 msgid "Database updates stopped as some errors occured and the stop flag is enabled."
 msgstr ""
 
-#: Model/AppModel.php:1740
+#: Model/AppModel.php:1920;1932
 msgid "Invalid JSON."
 msgstr ""
 
-#: Model/AppModel.php:1833;1891
+#: Model/AppModel.php:2030;2086
 msgid "Issues executing run_updates"
 msgstr ""
 
-#: Model/AppModel.php:1834
+#: Model/AppModel.php:2031
 msgid "Database updates are locked. Worker not spawned"
 msgstr ""
 
-#: Model/AppModel.php:1838;1896;1931
+#: Model/AppModel.php:2035;2091;2126
 msgid "Update done"
 msgstr ""
 
-#: Model/AppModel.php:1892
+#: Model/AppModel.php:2087
 msgid "Updates are locked. Stopping worker gracefully"
 msgstr ""
 
-#: Model/AppModel.php:1911
+#: Model/AppModel.php:2106
 msgid "Running update %s"
 msgstr ""
 
-#: Model/AppModel.php:1937
+#: Model/AppModel.php:2132
 msgid "Update done in another worker. Gracefuly stopping."
 msgstr ""
 
-#: Model/Attribute.php:63
+#: Model/Attribute.php:73
+#: Model/Server.php:4868;4877
 #: View/Events/filter_event_index.ctp:46;182
 msgid "Your organisation only"
 msgstr ""
 
-#: Model/Attribute.php:64
+#: Model/Attribute.php:74
+#: Model/Server.php:4868;4877
 #: View/Events/filter_event_index.ctp:46;183
 msgid "This community only"
 msgstr ""
 
-#: Model/Attribute.php:65
+#: Model/Attribute.php:75
+#: Model/Server.php:4868;4877
 #: View/Events/filter_event_index.ctp:46;184
 #: View/Pages/doc/using_the_system.ctp:51
 msgid "Connected communities"
 msgstr ""
 
-#: Model/Attribute.php:66
+#: Model/Attribute.php:76
+#: Model/Server.php:4868;4877
 #: View/Events/filter_event_index.ctp:46;185
 #: View/Pages/doc/using_the_system.ctp:58
 msgid "All communities"
 msgstr ""
 
-#: Model/Attribute.php:67
+#: Model/Attribute.php:77
 #: View/Elements/view_event_distribution_graph.ctp:24
 msgid "Sharing group"
 msgstr ""
 
-#: Model/Attribute.php:68
+#: Model/Attribute.php:78
 msgid "Inherit event"
 msgstr ""
 
-#: Model/Attribute.php:76
+#: Model/Attribute.php:355
+msgid "Composite type, but value not explodable"
+msgstr ""
+
+#: Model/Attribute.php:618
+msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
+msgstr ""
+
+#: Model/Attribute.php:771
+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:777
+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:784
+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:794
+msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
+msgstr ""
+
+#: Model/Attribute.php:803
+msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
+msgstr ""
+
+#: Model/Attribute.php:810
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:817
+msgid "Unknown HTTP method."
+msgstr ""
+
+#: Model/Attribute.php:825
+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:847
+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:852
+msgid "Invalid composite type. The format has to be %s."
+msgstr ""
+
+#: Model/Attribute.php:863
+msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
+msgstr ""
+
+#: Model/Attribute.php:871
+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:878
+msgid "Checksum has an invalid length or format (expected: filename|string characters). Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:886
+msgid "Invalid CIDR notation value found."
+msgstr ""
+
+#: Model/Attribute.php:891
+msgid "Invalid CIDR notation value found, for IPv4 must be lower or equal 32."
+msgstr ""
+
+#: Model/Attribute.php:895
+msgid "Invalid CIDR notation value found, for IPv6 must be lower or equal 128."
+msgstr ""
+
+#: Model/Attribute.php:898;901;916;955
+msgid "IP address has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:907;919;946
+msgid "Port numbers have to be integers between 1 and 65535."
+msgstr ""
+
+#: Model/Attribute.php:937
+msgid "%s has an invalid format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:943
+msgid "Hostname has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:958
+msgid "Domain name has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:973
+msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:980
+msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
+msgstr ""
+
+#: Model/Attribute.php:987
+msgid "Invalid format. Expected: CWE-x..."
+msgstr ""
+
+#: Model/Attribute.php:998
+msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
+msgstr ""
+
+#: Model/Attribute.php:1107
+msgid "Value must not contain new line character."
+msgstr ""
+
+#: Model/Attribute.php:1115
+msgid "Datetime has to be in the ISO 8601 format."
+msgstr ""
+
+#: Model/Attribute.php:1123
+#: Model/Server.php:1481
+msgid "The value has to be a whole number greater or equal 0."
+msgstr ""
+
+#: Model/Attribute.php:1126
+msgid "The value has to be a number between 0 and 10."
+msgstr ""
+
+#: Model/Attribute.php:1171
+msgid "AS number have to be integers between 1 and 4294967295"
+msgstr ""
+
+#: Model/Attribute.php:2077;2145
+msgid "Could not read user."
+msgstr ""
+
+#: Model/Attribute.php:2081
+msgid "Invalid hash type."
+msgstr ""
+
+#: Model/Attribute.php:2803
+msgid "This field is mandatory."
+msgstr ""
+
+#: Model/Attribute.php:3427
+msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
+msgstr ""
+
+#: Model/Attribute.php:4601
 msgid "Reference used by the publishing party (e.g. ticket number)"
 msgstr ""
 
-#: Model/Attribute.php:80
+#: Model/Attribute.php:4605
 msgid "Internal Attack Targeting and Compromise Information"
 msgstr ""
 
-#: Model/Attribute.php:81
+#: Model/Attribute.php:4606
 msgid "Targeting information to include recipient email, infected machines, department, and or locations."
 msgstr ""
 
-#: Model/Attribute.php:85
+#: Model/Attribute.php:4610
 msgid "All the info about how the malware is detected by the antivirus products"
 msgstr ""
 
-#: Model/Attribute.php:86
+#: Model/Attribute.php:4611
 msgid "List of anti-virus vendors detecting the malware or information on detection performance (e.g. 13/43 or 67%). Attachment with list of detection or link to VirusTotal could be placed here as well."
 msgstr ""
 
-#: Model/Attribute.php:90
+#: Model/Attribute.php:4615
 msgid "Information about how the malware is delivered"
 msgstr ""
 
-#: Model/Attribute.php:91
+#: Model/Attribute.php:4616
 msgid "Information about the way the malware payload is initially delivered, for example information about the email or web-site, vulnerability used, originating IP etc. Malware sample itself should be attached here."
 msgstr ""
 
-#: Model/Attribute.php:95
+#: Model/Attribute.php:4620
 msgid "Any artifact (files, registry keys etc.) dropped by the malware or other modifications to the system"
 msgstr ""
 
-#: Model/Attribute.php:99
+#: Model/Attribute.php:4624
 msgid "Info on where the malware gets installed in the system"
 msgstr ""
 
-#: Model/Attribute.php:100
+#: Model/Attribute.php:4625
 msgid "Location where the payload was placed in the system and the way it was installed. For example, a filename|md5 type attribute can be added here like this: c:\\windows\\system32\\malicious.exe|41d8cd98f00b204e9800998ecf8427e."
 msgstr ""
 
-#: Model/Attribute.php:104
+#: Model/Attribute.php:4629
 msgid "Mechanisms used by the malware to start at boot"
 msgstr ""
 
-#: Model/Attribute.php:105
+#: Model/Attribute.php:4630
 msgid "Mechanisms used by the malware to start at boot. This could be a registry key, legitimate driver modification, LNK file in startup"
 msgstr ""
 
-#: Model/Attribute.php:109
+#: Model/Attribute.php:4634
 msgid "Information about network traffic generated by the malware"
 msgstr ""
 
-#: Model/Attribute.php:113
+#: Model/Attribute.php:4638
 msgid "Information about the final payload(s)"
 msgstr ""
 
-#: Model/Attribute.php:114
+#: Model/Attribute.php:4639
 msgid "Information about the final payload(s). Can contain a function of the payload, e.g. keylogger, RAT, or a name if identified, such as Poison Ivy."
 msgstr ""
 
-#: Model/Attribute.php:118
+#: Model/Attribute.php:4643
 msgid "Identification of the group, organisation, or country behind the attack"
 msgstr ""
 
-#: Model/Attribute.php:122
+#: Model/Attribute.php:4647
 msgid "Any other result from additional analysis of the malware like tools output"
 msgstr ""
 
-#: Model/Attribute.php:123
+#: Model/Attribute.php:4648
 msgid "Any other result from additional analysis of the malware like tools output Examples: pdf-parser output, automated sandbox analysis, reverse engineering report."
 msgstr ""
 
-#: Model/Attribute.php:127
+#: Model/Attribute.php:4652
 msgid "Financial Fraud indicators"
 msgstr ""
 
-#: Model/Attribute.php:128
+#: Model/Attribute.php:4653
 msgid "Financial Fraud indicators, for example: IBAN Numbers, BIC codes, Credit card numbers, etc."
 msgstr ""
 
-#: Model/Attribute.php:132
+#: Model/Attribute.php:4657
 msgid "Tools supporting analysis or detection of the event"
 msgstr ""
 
-#: Model/Attribute.php:136
+#: Model/Attribute.php:4661
 msgid "Social networks and platforms"
 msgstr ""
 
-#: Model/Attribute.php:141
+#: Model/Attribute.php:4666
 msgid "A human being - natural person"
 msgstr ""
 
-#: Model/Attribute.php:145
+#: Model/Attribute.php:4670
 msgid "Attributes that are not part of any other category or are meant to be used as a component in MISP objects in the future"
 msgstr ""
 
-#: Model/Attribute.php:154;243
+#: Model/Attribute.php:4684;4788
 msgid "A checksum in md5 format"
 msgstr ""
 
-#: Model/Attribute.php:154
+#: Model/Attribute.php:4684
 msgid "You are encouraged to use filename|md5 instead. A checksum in md5 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:4685
 msgid "A checksum in sha1 format"
 msgstr ""
 
-#: Model/Attribute.php:155
+#: Model/Attribute.php:4685
 msgid "You are encouraged to use filename|sha1 instead. A checksum in sha1 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:4686
 msgid "A checksum in sha256 format"
 msgstr ""
 
-#: Model/Attribute.php:156
+#: Model/Attribute.php:4686
 msgid "You are encouraged to use filename|sha256 instead. A checksum in sha256 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:157
+#: Model/Attribute.php:4687
 #: View/Elements/healthElements/files.ctp:29
 msgid "Filename"
 msgstr ""
 
-#: Model/Attribute.php:158
+#: Model/Attribute.php:4688
 msgid "Microsoft Program database (PDB) path information"
 msgstr ""
 
-#: Model/Attribute.php:159
+#: Model/Attribute.php:4689
 msgid "A filename and an md5 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:159
+#: Model/Attribute.php:4689
 msgid "A filename and an md5 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:160
+#: Model/Attribute.php:4690
 msgid "A filename and an sha1 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:160
+#: Model/Attribute.php:4690
 msgid "A filename and an sha1 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:161
+#: Model/Attribute.php:4691
 msgid "A filename and an sha256 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:161
+#: Model/Attribute.php:4691
 msgid "A filename and an sha256 hash separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:162
+#: Model/Attribute.php:4692
 msgid "A source IP address of the attacker"
 msgstr ""
 
-#: Model/Attribute.php:163
+#: Model/Attribute.php:4693
 msgid "A destination IP address of the attacker or C&C server"
 msgstr ""
 
-#: Model/Attribute.php:163
+#: Model/Attribute.php:4693
 msgid "A destination IP address of the attacker or C&C server. Also set the IDS flag on when this IP is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:164
+#: Model/Attribute.php:4694
 msgid "A full host/dnsname of an attacker"
 msgstr ""
 
-#: Model/Attribute.php:164
+#: Model/Attribute.php:4694
 msgid "A full host/dnsname of an attacker. Also set the IDS flag on when this hostname is hardcoded in malware"
 msgstr ""
 
-#: Model/Attribute.php:165
+#: Model/Attribute.php:4695
 msgid "A domain name used in the malware"
 msgstr ""
 
-#: Model/Attribute.php:165
+#: Model/Attribute.php:4695
 msgid "A domain name used in the malware. Use this instead of hostname when the upper domain is important or can be used to create links between events."
 msgstr ""
 
-#: Model/Attribute.php:166
+#: Model/Attribute.php:4696
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:166
+#: Model/Attribute.php:4696
 msgid "A domain name and its IP address (as found in DNS lookup) separated by a | (no spaces)"
 msgstr ""
 
-#: Model/Attribute.php:167
-msgid "The email address used to send the malware."
+#: Model/Attribute.php:4698
+msgid "The source email address. Used to describe the sender when describing an e-mail."
 msgstr ""
 
-#: Model/Attribute.php:168
+#: Model/Attribute.php:4699
 msgid "eduPersonPrincipalName - eppn - the NetId of the person for the purposes of inter-institutional authentication. Should be stored in the form of user@univ.edu, where univ.edu is the name of the local security domain."
 msgstr ""
 
-#: Model/Attribute.php:169
-msgid "A recipient email address"
+#: Model/Attribute.php:4700
+msgid "The destination email address. Used to describe the recipient when describing an e-mail."
 msgstr ""
 
-#: Model/Attribute.php:169
-msgid "A recipient email address that is not related to your constituency."
-msgstr ""
-
-#: Model/Attribute.php:170
+#: Model/Attribute.php:4701
 msgid "The subject of the email"
 msgstr ""
 
-#: Model/Attribute.php:171
+#: Model/Attribute.php:4702
 msgid "File name of the email attachment."
 msgstr ""
 
-#: Model/Attribute.php:172
+#: Model/Attribute.php:4703
 msgid "Email body"
 msgstr ""
 
-#: Model/Attribute.php:173
+#: Model/Attribute.php:4704
 msgid "A floating point value."
 msgstr ""
 
-#: Model/Attribute.php:174
+#: Model/Attribute.php:4705
+msgid "A git commit ID."
+msgstr ""
+
+#: Model/Attribute.php:4706
 msgid "url"
 msgstr ""
 
-#: Model/Attribute.php:175
+#: Model/Attribute.php:4707
 msgid "HTTP method used by the malware (e.g. POST, GET, ...)."
 msgstr ""
 
-#: Model/Attribute.php:176
+#: Model/Attribute.php:4708
 msgid "The user-agent used by the malware in the HTTP request."
 msgstr ""
 
-#: Model/Attribute.php:177
+#: Model/Attribute.php:4709
 msgid "JA3 is a method for creating SSL/TLS client fingerprints that should be easy to produce on any platform and can be easily shared for threat intelligence."
 msgstr ""
 
-#: Model/Attribute.php:178
+#: Model/Attribute.php:4710
+msgid "JARM is a method for creating SSL/TLS server fingerprints."
+msgstr ""
+
+#: Model/Attribute.php:4711
+msgid "favicon-mmh3 is the murmur3 hash of a favicon as used in Shodan."
+msgstr ""
+
+#: Model/Attribute.php:4712
 msgid "hassh is a network fingerprinting standard which can be used to identify specific Client SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
-#: Model/Attribute.php:179
+#: Model/Attribute.php:4713
 msgid "hasshServer is a network fingerprinting standard which can be used to identify specific Server SSH implementations. The fingerprints can be easily stored, searched and shared in the form of an MD5 fingerprint."
 msgstr ""
 
-#: Model/Attribute.php:180
+#: Model/Attribute.php:4714
 msgid "Registry key or value"
 msgstr ""
 
-#: Model/Attribute.php:181
+#: Model/Attribute.php:4715
 msgid "Registry value + data separated by |"
 msgstr ""
 
-#: Model/Attribute.php:182
+#: Model/Attribute.php:4716
 msgid "Autonomous system"
 msgstr ""
 
-#: Model/Attribute.php:183
+#: Model/Attribute.php:4717
 msgid "An IDS rule in Snort rule-format"
 msgstr ""
 
-#: Model/Attribute.php:183
+#: Model/Attribute.php:4717
 msgid "An IDS rule in Snort rule-format. This rule will be automatically rewritten in the NIDS exports."
 msgstr ""
 
-#: Model/Attribute.php:184
+#: Model/Attribute.php:4718
 msgid "An NIDS rule in the Bro rule-format"
 msgstr ""
 
-#: Model/Attribute.php:184
+#: Model/Attribute.php:4718
 msgid "An NIDS rule in the Bro rule-format."
 msgstr ""
 
-#: Model/Attribute.php:185
+#: Model/Attribute.php:4719
 msgid "An NIDS rule in the Zeek rule-format"
 msgstr ""
 
-#: Model/Attribute.php:185
+#: Model/Attribute.php:4719
 msgid "An NIDS rule in the Zeek rule-format."
 msgstr ""
 
-#: Model/Attribute.php:186
+#: Model/Attribute.php:4720
 msgid "a community ID flow hashing algorithm to map multiple traffic monitors into common flow id"
 msgstr ""
 
-#: Model/Attribute.php:187
+#: Model/Attribute.php:4721
 msgid "Pattern in file that identifies the malware"
 msgstr ""
 
-#: Model/Attribute.php:188
+#: Model/Attribute.php:4722
 msgid "Pattern in network traffic that identifies the malware"
 msgstr ""
 
-#: Model/Attribute.php:189
+#: Model/Attribute.php:4723
 msgid "Pattern in memory dump that identifies the malware"
 msgstr ""
 
-#: Model/Attribute.php:190
+#: Model/Attribute.php:4724
+msgid "A pattern in the name of a file"
+msgstr ""
+
+#: Model/Attribute.php:4725
+msgid "A PGP public key"
+msgstr ""
+
+#: Model/Attribute.php:4726
+msgid "A PGP private key"
+msgstr ""
+
+#: Model/Attribute.php:4727
 msgid "Yara signature"
 msgstr ""
 
-#: Model/Attribute.php:191
+#: Model/Attribute.php:4728
 msgid "STIX 2 pattern"
 msgstr ""
 
-#: Model/Attribute.php:192
+#: Model/Attribute.php:4729
 msgid "Sigma - Generic Signature Format for SIEM Systems"
 msgstr ""
 
-#: Model/Attribute.php:193
+#: Model/Attribute.php:4730
 msgid "GENE - Go Evtx sigNature Engine"
 msgstr ""
 
-#: Model/Attribute.php:194
+#: Model/Attribute.php:4731
 msgid "Kusto query - Kusto from Microsoft Azure is a service for storing and running interactive analytics over Big Data."
 msgstr ""
 
-#: Model/Attribute.php:195
+#: Model/Attribute.php:4732
 msgid "A media type (also MIME type and content type) is a two-part identifier for file formats and format contents transmitted on the Internet"
 msgstr ""
 
-#: Model/Attribute.php:196
+#: Model/Attribute.php:4733
 msgid "Identity card number"
 msgstr ""
 
-#: Model/Attribute.php:197
+#: Model/Attribute.php:4734
 msgid "HTTP cookie as often stored on the user web client. This can include authentication cookie or session cookie."
 msgstr ""
 
-#: Model/Attribute.php:198
+#: Model/Attribute.php:4735
 msgid "A reference to the vulnerability used in the exploit"
 msgstr ""
 
-#: Model/Attribute.php:199
+#: Model/Attribute.php:4736
+msgid "Common Platform Enumeration - structured naming scheme for information technology systems, software, and packages."
+msgstr ""
+
+#: Model/Attribute.php:4737
 msgid "A reference to the weakness used in the exploit"
 msgstr ""
 
-#: Model/Attribute.php:200
+#: Model/Attribute.php:4738
 msgid "Attachment with external information"
 msgstr ""
 
-#: Model/Attribute.php:200;201
+#: Model/Attribute.php:4738;4739
 msgid "Please upload files using the <em>Upload Attachment</em> button."
 msgstr ""
 
-#: Model/Attribute.php:201
+#: Model/Attribute.php:4739
 msgid "Attachment containing encrypted malware sample"
 msgstr ""
 
-#: Model/Attribute.php:202
+#: Model/Attribute.php:4740
 msgid "Link to an external information"
 msgstr ""
 
-#: Model/Attribute.php:203
+#: Model/Attribute.php:4741
 msgid "Comment or description in a human language"
 msgstr ""
 
-#: Model/Attribute.php:203
+#: Model/Attribute.php:4741
 msgid "Comment or description in a human language.  This will not be correlated with other attributes"
 msgstr ""
 
-#: Model/Attribute.php:204
+#: Model/Attribute.php:4742
 msgid "Name, ID or a reference"
 msgstr ""
 
-#: Model/Attribute.php:205
+#: Model/Attribute.php:4743
 msgid "A value in hexadecimal format"
 msgstr ""
 
-#: Model/Attribute.php:206
+#: Model/Attribute.php:4744
 msgid "Other attribute"
 msgstr ""
 
-#: Model/Attribute.php:207
+#: Model/Attribute.php:4745
 msgid "Named pipe, use the format \\.\\pipe\\<PipeName>"
 msgstr ""
 
-#: Model/Attribute.php:208
+#: Model/Attribute.php:4746
 msgid "Mutex, use the format \\BaseNamedObjects\\<Mutex>"
 msgstr ""
 
-#: Model/Attribute.php:209
+#: Model/Attribute.php:4747
+msgid "State of a process"
+msgstr ""
+
+#: Model/Attribute.php:4748
 msgid "Attack Targets Username(s)"
 msgstr ""
 
-#: Model/Attribute.php:210
+#: Model/Attribute.php:4749
 msgid "Attack Targets Email(s)"
 msgstr ""
 
-#: Model/Attribute.php:211
+#: Model/Attribute.php:4750
 msgid "Attack Targets Machine Name(s)"
 msgstr ""
 
-#: Model/Attribute.php:212
+#: Model/Attribute.php:4751
 msgid "Attack Targets Department or Organization(s)"
 msgstr ""
 
-#: Model/Attribute.php:213
+#: Model/Attribute.php:4752
 msgid "Attack Targets Physical Location(s)"
 msgstr ""
 
-#: Model/Attribute.php:214
+#: Model/Attribute.php:4753
 msgid "External Target Organizations Affected by this Attack"
 msgstr ""
 
-#: Model/Attribute.php:215
+#: Model/Attribute.php:4754
 msgid "Bitcoin Address"
 msgstr ""
 
-#: Model/Attribute.php:216
+#: Model/Attribute.php:4755
 msgid "Dash Address"
 msgstr ""
 
-#: Model/Attribute.php:217
+#: Model/Attribute.php:4756
 msgid "Monero Address"
 msgstr ""
 
-#: Model/Attribute.php:218
+#: Model/Attribute.php:4757
 msgid "International Bank Account Number"
 msgstr ""
 
-#: Model/Attribute.php:219
+#: Model/Attribute.php:4758
 msgid "Bank Identifier Code Number also known as SWIFT-BIC, SWIFT code or ISO 9362 code"
 msgstr ""
 
-#: Model/Attribute.php:220
+#: Model/Attribute.php:4759
 msgid "Bank account number without any routing number"
 msgstr ""
 
-#: Model/Attribute.php:221
+#: Model/Attribute.php:4760
 msgid "ABA routing transit number"
 msgstr ""
 
-#: Model/Attribute.php:222
+#: Model/Attribute.php:4761
 msgid "Bank Identification Number"
 msgstr ""
 
-#: Model/Attribute.php:223
+#: Model/Attribute.php:4762
 msgid "Credit-Card Number"
 msgstr ""
 
-#: Model/Attribute.php:224
+#: Model/Attribute.php:4763
 msgid "Premium-Rate Telephone Number"
 msgstr ""
 
-#: Model/Attribute.php:225
+#: Model/Attribute.php:4764
 msgid "Telephone Number"
 msgstr ""
 
-#: Model/Attribute.php:226
+#: Model/Attribute.php:4765
 msgid "A string identifying the threat actor"
 msgstr ""
 
-#: Model/Attribute.php:227
+#: Model/Attribute.php:4766
 msgid "Associated campaign name"
 msgstr ""
 
-#: Model/Attribute.php:228
+#: Model/Attribute.php:4767
 msgid "Associated campaign ID"
 msgstr ""
 
-#: Model/Attribute.php:230
+#: Model/Attribute.php:4769
 msgid "Uniform Resource Identifier"
 msgstr ""
 
-#: Model/Attribute.php:231
+#: Model/Attribute.php:4770
 msgid "Authenticode executable signature hash"
 msgstr ""
 
-#: Model/Attribute.php:231
+#: Model/Attribute.php:4770
 msgid "You are encouraged to use filename|authentihash instead. Authenticode executable signature hash, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:232;244
+#: Model/Attribute.php:4771
+msgid "A VirusTotal checksum"
+msgstr ""
+
+#: Model/Attribute.php:4771
+msgid "You are encouraged to use filename|vhash instead. A checksum from VirusTotal, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:4772;4790
 msgid "A checksum in ssdeep format"
 msgstr ""
 
-#: Model/Attribute.php:232
+#: Model/Attribute.php:4772
 msgid "You are encouraged to use filename|ssdeep instead. A checksum in the SSDeep format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:233;245
+#: Model/Attribute.php:4773;4791
 msgid "Import hash - a hash created based on the imports in the sample."
 msgstr ""
 
-#: Model/Attribute.php:233
+#: Model/Attribute.php:4773
 msgid "You are encouraged to use filename|imphash instead. A hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:234
+#: Model/Attribute.php:4774
+msgid "telfhash is symbol hash for ELF files, just like imphash is imports hash for PE files."
+msgstr ""
+
+#: Model/Attribute.php:4774
+msgid "You are encouraged to use a file object with telfash"
+msgstr ""
+
+#: Model/Attribute.php:4775
 msgid "PEhash - a hash calculated based of certain pieces of a PE executable file"
 msgstr ""
 
-#: Model/Attribute.php:235
+#: Model/Attribute.php:4776
 msgid "A fuzzy hash of import table of Portable Executable format"
 msgstr ""
 
-#: Model/Attribute.php:235
+#: Model/Attribute.php:4776
 msgid "You are encouraged to use filename|impfuzzy instead. A fuzzy hash created based on the imports in the sample, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:236
+#: Model/Attribute.php:4777
 msgid "A checksum in sha-224 format"
 msgstr ""
 
-#: Model/Attribute.php:236
+#: Model/Attribute.php:4777
 msgid "You are encouraged to use filename|sha224 instead. A checksum in sha224 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:237
+#: Model/Attribute.php:4778
 msgid "A checksum in sha-384 format"
 msgstr ""
 
-#: Model/Attribute.php:237
+#: Model/Attribute.php:4778
 msgid "You are encouraged to use filename|sha384 instead. A checksum in sha384 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:238
+#: Model/Attribute.php:4779
 msgid "A checksum in sha-512 format"
 msgstr ""
 
-#: Model/Attribute.php:238
+#: Model/Attribute.php:4779
 msgid "You are encouraged to use filename|sha512 instead. A checksum in sha512 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:239
+#: Model/Attribute.php:4780
 msgid "A checksum in the sha-512/224 format"
 msgstr ""
 
-#: Model/Attribute.php:239
+#: Model/Attribute.php:4780
 msgid "You are encouraged to use filename|sha512/224 instead. A checksum in sha512/224 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:240
+#: Model/Attribute.php:4781
 msgid "A checksum in the sha-512/256 format"
 msgstr ""
 
-#: Model/Attribute.php:240
+#: Model/Attribute.php:4781
 msgid "You are encouraged to use filename|sha512/256 instead. A checksum in sha512/256 format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:241
+#: Model/Attribute.php:4782
+msgid "A checksum in sha3-224 format"
+msgstr ""
+
+#: Model/Attribute.php:4782
+msgid "You are encouraged to use filename|sha3-224 instead. A checksum in sha3-224 format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:4783
+msgid "A checksum in sha3-256 format"
+msgstr ""
+
+#: Model/Attribute.php:4783
+msgid "You are encouraged to use filename|sha3-256 instead. A checksum in sha3-256 format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:4784
+msgid "A checksum in sha3-384 format"
+msgstr ""
+
+#: Model/Attribute.php:4784
+msgid "You are encouraged to use filename|sha3-384 instead. A checksum in sha3-384 format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:4785
+msgid "A checksum in sha3-512 format"
+msgstr ""
+
+#: Model/Attribute.php:4785
+msgid "You are encouraged to use filename|sha3-512 instead. A checksum in sha3-512 format, only use this if you don't know the correct filename"
+msgstr ""
+
+#: Model/Attribute.php:4786
 msgid "A checksum in the Trend Micro Locality Sensitive Hash format"
 msgstr ""
 
-#: Model/Attribute.php:241
+#: Model/Attribute.php:4786
 msgid "You are encouraged to use filename|tlsh instead. A checksum in the Trend Micro Locality Sensitive Hash format, only use this if you don't know the correct filename"
 msgstr ""
 
-#: Model/Attribute.php:242
+#: Model/Attribute.php:4787
 msgid "An Apple Code Directory Hash, identifying a code-signed Mach-O executable file"
 msgstr ""
 
-#: Model/Attribute.php:246
+#: Model/Attribute.php:4789
+msgid "A filename and a VirusTotal hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:4792
 msgid "Import fuzzy hash - a fuzzy hash created based on the imports in the sample."
 msgstr ""
 
-#: Model/Attribute.php:247
+#: Model/Attribute.php:4793
 msgid "A filename and a PEhash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:248
+#: Model/Attribute.php:4794
 msgid "A filename and a sha-224 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:249
+#: Model/Attribute.php:4795
 msgid "A filename and a sha-384 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:250
+#: Model/Attribute.php:4796
 msgid "A filename and a sha-512 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:251
+#: Model/Attribute.php:4797
 msgid "A filename and a sha-512/224 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:252
+#: Model/Attribute.php:4798
 msgid "A filename and a sha-512/256 hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:253
+#: Model/Attribute.php:4799
+msgid "A filename and an sha3-224 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:4800
+msgid "A filename and an sha3-256 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:4801
+msgid "A filename and an sha3-384 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:4802
+msgid "A filename and an sha3-512 hash separated by a |"
+msgstr ""
+
+#: Model/Attribute.php:4803
 msgid "A filename and a Trend Micro Locality Sensitive Hash separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:254
+#: Model/Attribute.php:4804
 msgid "A scheduled task in windows"
 msgstr ""
 
-#: Model/Attribute.php:255
+#: Model/Attribute.php:4805
 msgid "A windows service name. This is the name used internally by windows. Not to be confused with the windows-service-displayname."
 msgstr ""
 
-#: Model/Attribute.php:256
+#: Model/Attribute.php:4806
 msgid "A windows service's displayname, not to be confused with the windows-service-name. This is the name that applications will generally display as the service's name in applications."
 msgstr ""
 
-#: Model/Attribute.php:257
+#: Model/Attribute.php:4807
 msgid "The e-mail of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:258
+#: Model/Attribute.php:4808
 msgid "The phone number of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:259
+#: Model/Attribute.php:4809
 msgid "The name of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:260
+#: Model/Attribute.php:4810
 msgid "The org of a domain's registrant, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:261
+#: Model/Attribute.php:4811
 msgid "The registrar of the domain, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:262
+#: Model/Attribute.php:4812
 msgid "The date of domain's creation, obtained from the WHOIS information."
 msgstr ""
 
-#: Model/Attribute.php:267
+#: Model/Attribute.php:4817
 msgid "X509 fingerprint in SHA-1 format"
 msgstr ""
 
-#: Model/Attribute.php:268
+#: Model/Attribute.php:4818
 msgid "X509 fingerprint in MD5 format"
 msgstr ""
 
-#: Model/Attribute.php:269
+#: Model/Attribute.php:4819
 msgid "X509 fingerprint in SHA-256 format"
 msgstr ""
 
-#: Model/Attribute.php:270
+#: Model/Attribute.php:4820
 msgid "RFC1035 mandates that DNS zones should have a SOA (Statement Of Authority) record that contains an email address where a PoC for the domain could be contacted. This can sometimes be used for attribution/linkage between different domains even if protected by whois privacy"
 msgstr ""
 
-#: Model/Attribute.php:271
+#: Model/Attribute.php:4821
 msgid "Size expressed in bytes"
 msgstr ""
 
-#: Model/Attribute.php:272
+#: Model/Attribute.php:4822
 msgid "An integer counter, generally to be used in objects"
 msgstr ""
 
-#: Model/Attribute.php:273
+#: Model/Attribute.php:4823
 msgid "Datetime in the ISO 8601 format"
 msgstr ""
 
-#: Model/Attribute.php:274
-msgid "Common platform enumeration"
-msgstr ""
-
-#: Model/Attribute.php:275
+#: Model/Attribute.php:4824
 msgid "Port number"
 msgstr ""
 
-#: Model/Attribute.php:276
+#: Model/Attribute.php:4825
 msgid "IP destination and port number separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:277
+#: Model/Attribute.php:4826
 msgid "IP source and port number separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:278
+#: Model/Attribute.php:4827
 msgid "Hostname and port number separated by a |"
 msgstr ""
 
-#: Model/Attribute.php:279
+#: Model/Attribute.php:4828
 msgid "Mac address"
 msgstr ""
 
-#: Model/Attribute.php:280
+#: Model/Attribute.php:4829
 msgid "Mac EUI-64 address"
 msgstr ""
 
-#: Model/Attribute.php:282
+#: Model/Attribute.php:4831
 msgid "Email destination display name"
 msgstr ""
 
-#: Model/Attribute.php:283
+#: Model/Attribute.php:4832
 msgid "Email source display name"
 msgstr ""
 
-#: Model/Attribute.php:284
+#: Model/Attribute.php:4833
 msgid "Email header"
 msgstr ""
 
-#: Model/Attribute.php:285
+#: Model/Attribute.php:4834
 msgid "Email reply to header"
 msgstr ""
 
-#: Model/Attribute.php:286
+#: Model/Attribute.php:4835
 msgid "Email x-mailer header"
 msgstr ""
 
-#: Model/Attribute.php:287
+#: Model/Attribute.php:4836
 msgid "The email mime boundary separating parts in a multipart email"
 msgstr ""
 
-#: Model/Attribute.php:288
+#: Model/Attribute.php:4837
 msgid "The email thread index header"
 msgstr ""
 
-#: Model/Attribute.php:289
+#: Model/Attribute.php:4838
 msgid "The email message ID"
 msgstr ""
 
-#: Model/Attribute.php:290
+#: Model/Attribute.php:4839
 msgid "A github user name"
 msgstr ""
 
-#: Model/Attribute.php:291
+#: Model/Attribute.php:4840
 msgid "A github repository"
 msgstr ""
 
-#: Model/Attribute.php:292
+#: Model/Attribute.php:4841
 msgid "A github organisation"
 msgstr ""
 
-#: Model/Attribute.php:293
+#: Model/Attribute.php:4842
 msgid "Jabber ID"
 msgstr ""
 
-#: Model/Attribute.php:294
+#: Model/Attribute.php:4843
 msgid "Twitter ID"
 msgstr ""
 
-#: Model/Attribute.php:295
+#: Model/Attribute.php:4844
+msgid "DKIM public key"
+msgstr ""
+
+#: Model/Attribute.php:4845
+msgid "DKIM signature"
+msgstr ""
+
+#: Model/Attribute.php:4846
 msgid "First name of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:296
+#: Model/Attribute.php:4847
 msgid "Middle name of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:297
+#: Model/Attribute.php:4848
 msgid "Last name of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:298
+#: Model/Attribute.php:4849
+msgid "Full name of a natural person"
+msgstr ""
+
+#: Model/Attribute.php:4850
 msgid "Date of birth of a natural person (in YYYY-MM-DD format)"
 msgstr ""
 
-#: Model/Attribute.php:299
+#: Model/Attribute.php:4851
 msgid "Place of birth of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:300
+#: Model/Attribute.php:4852
 msgid "The gender of a natural person (Male, Female, Other, Prefer not to say)"
 msgstr ""
 
-#: Model/Attribute.php:301
+#: Model/Attribute.php:4853
 msgid "The passport number of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:302
+#: Model/Attribute.php:4854
 msgid "The country in which the passport was issued"
 msgstr ""
 
-#: Model/Attribute.php:303
+#: Model/Attribute.php:4855
 msgid "The expiration date of a passport"
 msgstr ""
 
-#: Model/Attribute.php:304
+#: Model/Attribute.php:4856
 msgid "The Redress Control Number is the record identifier for people who apply for redress through the DHS Travel Redress Inquiry Program (DHS TRIP). DHS TRIP is for travelers who have been repeatedly identified for additional screening and who want to file an inquiry to have erroneous information corrected in DHS systems"
 msgstr ""
 
-#: Model/Attribute.php:305
+#: Model/Attribute.php:4857
 msgid "The nationality of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:306
+#: Model/Attribute.php:4858
 msgid "Visa number"
 msgstr ""
 
-#: Model/Attribute.php:307
+#: Model/Attribute.php:4859
 msgid "The date on which the visa was issued"
 msgstr ""
 
-#: Model/Attribute.php:308
+#: Model/Attribute.php:4860
 msgid "The primary residence of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:309
+#: Model/Attribute.php:4861
 msgid "The country of residence of a natural person"
 msgstr ""
 
-#: Model/Attribute.php:310
+#: Model/Attribute.php:4862
 msgid "A Special Service Request is a function to an airline to provide a particular facility for A Passenger or passengers. "
 msgstr ""
 
-#: Model/Attribute.php:311
+#: Model/Attribute.php:4863
 msgid "The frequent flyer number of a passenger"
 msgstr ""
 
-#: Model/Attribute.php:314
+#: Model/Attribute.php:4866
 msgid "Travel details"
 msgstr ""
 
-#: Model/Attribute.php:315
+#: Model/Attribute.php:4867
 msgid "Payment details"
 msgstr ""
 
-#: Model/Attribute.php:316
-msgid "The orignal port of embarkation"
+#: Model/Attribute.php:4868
+msgid "The original port of embarkation"
 msgstr ""
 
-#: Model/Attribute.php:317
+#: Model/Attribute.php:4869
 msgid "The port of clearance"
 msgstr ""
 
-#: Model/Attribute.php:318
+#: Model/Attribute.php:4870
 msgid "A Port where the passenger is transiting to"
 msgstr ""
 
-#: Model/Attribute.php:319
+#: Model/Attribute.php:4871
 msgid "The Passenger Name Record Locator is a key under which the reservation for a trip is stored in the system. The PNR contains, among other data, the name, flight segments and address of the passenger. It is defined by a combination of five or six letters and numbers."
 msgstr ""
 
-#: Model/Attribute.php:320
+#: Model/Attribute.php:4872
 msgid "The application id of a mobile application"
 msgstr ""
 
-#: Model/Attribute.php:321
+#: Model/Attribute.php:4873
 msgid "Chrome extension id"
 msgstr ""
 
-#: Model/Attribute.php:322
+#: Model/Attribute.php:4874
 msgid "Cortex analysis result"
 msgstr ""
 
-#: Model/Attribute.php:323
+#: Model/Attribute.php:4875
 msgid "Boolean value - to be used in objects"
 msgstr ""
 
-#: Model/Attribute.php:324
+#: Model/Attribute.php:4876
 msgid "Anonymised value - described with the anonymisation object via a relationship"
 msgstr ""
 
-#: Model/Attribute.php:324
+#: Model/Attribute.php:4876
 msgid "Anonymised value - described with the anonymisation object via a relationship."
 msgstr ""
 
-#: Model/Attribute.php:644
-msgid "Composite type, but value not explodable"
+#: Model/AuthKey.php:55
+msgid "Expiration must be in YYYY-MM-DD format."
 msgstr ""
 
-#: Model/Attribute.php:791
-msgid "Delete of file attachment failed. Please report to administrator."
+#: Model/AuthKey.php:58
+msgid "Maximal key validity is %s days."
 msgstr ""
 
-#: Model/Attribute.php:935
-msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
+#: Model/Cerebrate.php:43
+msgid "Something went wrong. Error returned: %s"
 msgstr ""
 
-#: Model/Attribute.php:1074
-msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
+#: Model/Cerebrate.php:46
+msgid "Authentication failed."
 msgstr ""
 
-#: Model/Attribute.php:1081
-msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
+#: Model/Cerebrate.php:48
+msgid "Something went wrong with the request or the remote side is having issues."
 msgstr ""
 
-#: Model/Attribute.php:1088
-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!"
+#: Model/Cerebrate.php:164
+msgid "The organisation could not be saved."
 msgstr ""
 
-#: Model/Attribute.php:1099
-msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
-msgstr ""
-
-#: Model/Attribute.php:1110
-msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
-msgstr ""
-
-#: Model/Attribute.php:1117
-msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
-msgstr ""
-
-#: Model/Attribute.php:1132
-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:1150
-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:1155
-msgid "Invalid composite type. The format has to be %s."
-msgstr ""
-
-#: Model/Attribute.php:1166
-msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
-msgstr ""
-
-#: Model/Attribute.php:1174
-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:1185
-msgid "Invalid CIDR notation value found."
-msgstr ""
-
-#: Model/Attribute.php:1192;1243
-msgid "IP address has an invalid format."
-msgstr ""
-
-#: Model/Attribute.php:1197
-msgid "Port numbers have to be positive integers between 1 and 65535."
-msgstr ""
-
-#: Model/Attribute.php:1226
-msgid " name has an invalid format. Please double check the value or select type \"other\"."
-msgstr ""
-
-#: Model/Attribute.php:1246
-msgid "Domain name has an invalid format."
-msgstr ""
-
-#: Model/Attribute.php:1260
-msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
-msgstr ""
-
-#: Model/Attribute.php:1268
-msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
-msgstr ""
-
-#: Model/Attribute.php:1276
-msgid "Invalid format. Expected: CWE-x..."
-msgstr ""
-
-#: Model/Attribute.php:1287
-msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
-msgstr ""
-
-#: Model/Attribute.php:1405
-msgid "Datetime has to be in the ISO 8601 format."
-msgstr ""
-
-#: Model/Attribute.php:1411
-msgid "The value has to be a number greater or equal 0."
-msgstr ""
-
-#: Model/Attribute.php:1418
-msgid "The value has to be a number between 0 and 10."
-msgstr ""
-
-#: Model/Attribute.php:2297;2365
-msgid "Could not read user."
-msgstr ""
-
-#: Model/Attribute.php:2301
-msgid "Invalid hash type."
-msgstr ""
-
-#: Model/Attribute.php:2992
-msgid "This field is mandatory."
-msgstr ""
-
-#: Model/Attribute.php:3559
-msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
+#: Model/Cerebrate.php:171
+msgid "The retrieved data isn't a valid organisation."
 msgstr ""
 
 #: Model/Community.php:26;67
@@ -4049,6 +4984,14 @@ msgstr ""
 msgid "Community not found."
 msgstr ""
 
+#: Model/CorrelationExclusion.php:55
+msgid "Cleaning up excluded correlations."
+msgstr ""
+
+#: Model/CorrelationExclusion.php:66
+msgid "Cleanup queued for background execution."
+msgstr ""
+
 #: Model/Dashboard.php:55;64
 msgid "Invalid widget or widget not found."
 msgstr ""
@@ -4057,1354 +5000,1888 @@ msgstr ""
 msgid "Models could not be loaded or default decaying models folder is empty"
 msgstr ""
 
-#: Model/DecayingModel.php:351
+#: Model/DecayingModel.php:368
 msgid "No tags nor predicates with `numerical_value`"
 msgstr ""
 
-#: Model/DecayingModel.php:358
+#: Model/DecayingModel.php:375
 msgid "No predicate"
 msgstr ""
 
-#: Model/DecayingModel.php:437
+#: Model/DecayingModel.php:453
 msgid "The class for `%s` was not found or not loaded correctly"
 msgstr ""
 
-#: Model/Event.php:390
+#: Model/Event.php:287
 msgid "Click this to download all events and attributes that you have access to in MISP JSON format."
 msgstr ""
 
-#: Model/Event.php:398
+#: Model/Event.php:295
 msgid "Click this to download all events and attributes that you have access to in MISP XML format."
 msgstr ""
 
-#: Model/Event.php:406
+#: Model/Event.php:303
 #: View/Events/export_alternate.ctp:19
 msgid "Click this to download all attributes that are indicators and that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:414
+#: Model/Event.php:311
 #: View/Events/export_alternate.ctp:26
 msgid "Click this to download all attributes that you have access to (except file attachments) in CSV format."
 msgstr ""
 
-#: Model/Event.php:422
-msgid "Click this to download all network related attributes that you have access to under the Suricata rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
+#: Model/Event.php:319
+msgid "Click this to download all network related attributes that you have access to under the Suricata rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a allowedlist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:430
-msgid "Click this to download all network related attributes that you have access to under the Snort rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
+#: Model/Event.php:327
+msgid "Click this to download all network related attributes that you have access to under the Snort rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a allowedlist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:438
-msgid "Click this to download all network related attributes that you have access to under the Bro rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a whitelist containing host, domain name and IP numbers to exclude from the NIDS export."
+#: Model/Event.php:335
+msgid "Click this to download all network related attributes that you have access to under the Bro rule format. Only published events and attributes marked as IDS Signature are exported. Administration is able to maintain a allowedlist containing host, domain name and IP numbers to exclude from the NIDS export."
 msgstr ""
 
-#: Model/Event.php:446
+#: Model/Event.php:343
 msgid "Click this to download a STIX document containing the STIX version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:454
+#: Model/Event.php:351
 msgid "Click this to download a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
 msgstr ""
 
-#: Model/Event.php:462
+#: Model/Event.php:359
 #: 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 ""
 
-#: Model/Event.php:470
+#: Model/Event.php:367
 msgid "Click on one of the buttons below to download all the attributes with the matching type. This list can be used to feed forensic software when searching for susipicious files. Only published events and attributes marked as IDS Signature are exported."
 msgstr ""
 
-#: Model/Event.php:478
+#: Model/Event.php:375
 msgid "Click this to download Yara rules generated from all relevant attributes."
 msgstr ""
 
-#: Model/Event.php:486
+#: Model/Event.php:383
 msgid "Click this to download Yara rules generated from all relevant attributes. Rules are returned in a JSON format with information about origin (generated or parsed) and validity."
 msgstr ""
 
-#: Model/Event.php:5799
+#: Model/Event.php:399
+msgid "Automatically blocked by deleting event"
+msgstr ""
+
+#: Model/Event.php:1321
+msgid "Remote version does not support event report."
+msgstr ""
+
+#: Model/Event.php:3210
+msgid "Mails blocked by org alert threshold."
+msgstr ""
+
+#: Model/Event.php:3243
+msgid "A new or modified event was just published on %s"
+msgstr ""
+
+#: Model/Event.php:3244
+msgid "If you would like to unsubscribe from receiving such alert e-mails, simply\ndisable publish alerts via %s"
+msgstr ""
+
+#: Model/Event.php:3268
+msgid "Mails sent."
+msgstr ""
+
+#: Model/Event.php:3740
+msgid "This is not a valid MISP XML file."
+msgstr ""
+
+#: Model/Event.php:3740
+msgid "This is not a valid MISP JSON file."
+msgstr ""
+
+#: Model/Event.php:6006
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:5801
+#: Model/Event.php:6008
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:5803
+#: Model/Event.php:6010
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:5806
+#: Model/Event.php:6013
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:5808
+#: Model/Event.php:6015
 msgid "Please "
 msgstr ""
 
-#: Model/Event.php:5810
+#: Model/Event.php:6017
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:5842
+#: Model/Event.php:6091
 msgid "#"
 msgstr ""
 
-#: Model/Event.php:5851
+#: Model/Event.php:6100
 msgid "%s not set"
 msgstr ""
 
-#: Model/Event.php:6100
+#: Model/Event.php:6346
 msgid "Could not add tags."
 msgstr ""
 
-#: Model/Event.php:6582
+#: Model/Event.php:6387
+msgid "Processing complete. %s"
+msgstr ""
+
+#: Model/Event.php:6849
 msgid "process_"
 msgstr ""
 
-#: Model/Feed.php:86
-msgid "Invalid input source. The only valid options are %s. %s"
+#: Model/Event.php:6999
+msgid "%s from another event"
+msgstr ""
+
+#: Model/EventReport.php:114
+msgid "Event Report dropped due to validation for Event report %s failed: %s"
+msgstr ""
+
+#: Model/EventReport.php:115
+msgid "Validation errors: %s.%sFull report: %s"
+msgstr ""
+
+#: Model/EventReport.php:152
+msgid "Event Report doesn't have an UUID"
+msgstr ""
+
+#: Model/EventReport.php:164
+msgid "Event Report not found."
+msgstr ""
+
+#: Model/EventReport.php:203
+msgid "Failed to delete report"
+msgstr ""
+
+#: Model/EventReport.php:291;301;360
+msgid "Invalid report"
+msgstr ""
+
+#: Model/EventReport.php:352
+#: Model/GalaxyCluster.php:1390
+msgid "Invalid authorization requested"
+msgstr ""
+
+#: Model/EventReport.php:390
+msgid "Could not find associated event"
+msgstr ""
+
+#: Model/EventReport.php:393
+msgid "Only the creator organisation of the event can modify the report"
 msgstr ""
 
 #: Model/Feed.php:90
+msgid "Invalid input source. The only valid options are %s. %s"
+msgstr ""
+
+#: Model/Feed.php:94
 msgid "Security.disable_local_feed_access is currently enabled, local feeds are thereby not allowed."
 msgstr ""
 
-#: Model/Feed.php:1496;1540
+#: Model/Feed.php:1215
+msgid "Feed %s: Fetching."
+msgstr ""
+
+#: Model/Feed.php:1221
+msgid "Could not fetch freetext feed %s. See error log for more details."
+msgstr ""
+
+#: Model/Feed.php:1241
+msgid "Feed %s: %s/%s values cached."
+msgstr ""
+
+#: Model/Feed.php:1645;1689
 msgid "Event %s"
 msgstr ""
 
-#: Model/Feed.php:1510
+#: Model/Feed.php:1659
 msgid "Feed %s"
 msgstr ""
 
-#: Model/Feed.php:1687
+#: Model/Feed.php:1850
 msgid "Invalid feed id."
 msgstr ""
 
-#: Model/Feed.php:1690
+#: Model/Feed.php:1853
 msgid "Feed has to be either a CSV or a freetext feed for the purging to work."
 msgstr ""
 
-#: Model/Feed.php:1695
+#: Model/Feed.php:1858
 msgid "Invalid user id."
 msgstr ""
 
-#: Model/Feed.php:1715
+#: Model/Feed.php:1878
 msgid "Events related to feed %s purged."
 msgstr ""
 
-#: Model/Galaxy.php:421
+#: Model/Galaxy.php:310;315
+#: Model/GalaxyCluster.php:256
+msgid "Galaxy not found"
+msgstr ""
+
+#: Model/Galaxy.php:347
+msgid "Invalid Galaxy cluster"
+msgstr ""
+
+#: Model/Galaxy.php:571
 msgid "Galaxy cannot be represented as a matrix"
 msgstr ""
 
-#: Model/MispObject.php:1139
+#: Model/GalaxyCluster.php:249;374
+msgid "Incorrect permission"
+msgstr ""
+
+#: Model/GalaxyCluster.php:267;709
+msgid "Blocked by blocklist"
+msgstr ""
+
+#: Model/GalaxyCluster.php:275
+msgid "Cluster already exists in another galaxy"
+msgstr ""
+
+#: Model/GalaxyCluster.php:279
+msgid "Edit not allowed on default clusters"
+msgstr ""
+
+#: Model/GalaxyCluster.php:283
+msgid "Edit not allowed"
+msgstr ""
+
+#: Model/GalaxyCluster.php:304
+msgid "Cluster forks have to belong to the same galaxy as the parent"
+msgstr ""
+
+#: Model/GalaxyCluster.php:323
+msgid "The sync user has to have access to the sharing group in order to be able to edit it"
+msgstr ""
+
+#: Model/GalaxyCluster.php:379
+#: Model/GalaxyClusterRelation.php:297
+msgid "UUID not provided"
+msgstr ""
+
+#: Model/GalaxyCluster.php:382
+msgid "Unkown UUID"
+msgstr ""
+
+#: Model/GalaxyCluster.php:394
+msgid "Galaxy Cluster could not be saved: The sync user has to have access to the sharing group in order to be able to edit it."
+msgstr ""
+
+#: Model/GalaxyCluster.php:398
+msgid "Galaxy Cluster could not be saved: The user used to edit the cluster is not authorised to do so. This can be caused by the user not being of the same organisation as the original creator of the cluster whilst also not being a site administrator."
+msgstr ""
+
+#: Model/GalaxyCluster.php:739
+msgid "Organisation blocklisted (%s)"
+msgstr ""
+
+#: Model/GalaxyCluster.php:746
+msgid "Only non-default clusters can be saved"
+msgstr ""
+
+#: Model/GalaxyCluster.php:773
+msgid "Blocked an edit to an cluster that was created locally. This can happen if a synchronised cluster that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/GalaxyCluster.php:781
+msgid "Remote version is not newer than local one for cluster (%s)"
+msgstr ""
+
+#: Model/GalaxyCluster.php:800
+msgid "Issues while capturing relations have been logged."
+msgstr ""
+
+#: Model/GalaxyCluster.php:1358;1365;1398
+msgid "Invalid galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyCluster.php:1414
+msgid "You don't have the permission to do that."
+msgstr ""
+
+#: Model/GalaxyCluster.php:1422
+msgid "Only the creator organisation can modify the galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyCluster.php:1431
+msgid "Only the creator organisation with publishing capabilities can publish the galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyCluster.php:1608
+msgid "The remote user does not have the permission to manipulate galaxies - the upload of the galaxy clusters has been blocked."
+msgstr ""
+
+#: Model/GalaxyCluster.php:1855
+msgid "The distribution level of the cluster blocks it from being pushed."
+msgstr ""
+
+#: Model/GalaxyCluster.php:1857
+msgid "The sync user on the remote instance does not have the required privileges to handle this cluster."
+msgstr ""
+
+#: Model/GalaxyCluster.php:1862
+msgid "Uploading GalaxyCluster (%s) to Server (%s)"
+msgstr ""
+
+#: Model/GalaxyCluster.php:1957
+msgid "Failed because of errors: "
+msgstr ""
+
+#: Model/GalaxyCluster.php:1960
+msgid "failed downloading the galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:217;465
+msgid "Relation already exists"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:227;320
+msgid "referenced_galaxy_cluster_uuid not provided"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:233;325
+msgid "Invalid referenced galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:258
+msgid "Tags could not be saved for relation (%s)"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:285
+msgid "galaxy_cluster_id not provided"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:300
+msgid "Unkown ID"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:307
+msgid "Invalid source galaxy cluster"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:434
+msgid "No referenced cluster UUID provided"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:434
+msgid "relation for cluster (%s)"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:449
+msgid "Referenced cluster not found"
+msgstr ""
+
+#: Model/GalaxyClusterRelation.php:449;465
+msgid "relation to (%s) for cluster (%s)"
+msgstr ""
+
+#: Model/GalaxyClusterRelationTag.php:77
+msgid "Could not attach tag %s"
+msgstr ""
+
+#: Model/GalaxyClusterRelationTag.php:77
+msgid "relation (%s)"
+msgstr ""
+
+#: Model/Job.php:118
+msgid "Job done."
+msgstr ""
+
+#: Model/Job.php:118
+msgid "Job failed."
+msgstr ""
+
+#: Model/MispObject.php:389
+msgid "No valid template found and object lacking template information. (%s)"
+msgstr ""
+
+#: Model/MispObject.php:1211
 msgid "Selected Attributes do not exist."
 msgstr ""
 
-#: Model/Server.php:123
+#: Model/Server.php:131
 msgid "Server unreachable"
 msgstr ""
 
-#: Model/Server.php:124
+#: Model/Server.php:132
 msgid "Unexpected error"
 msgstr ""
 
-#: Model/Server.php:125
+#: Model/Server.php:133
 msgid "Authentication failed"
 msgstr ""
 
-#: Model/Server.php:126
+#: Model/Server.php:134
 msgid "Password change required"
 msgstr ""
 
-#: Model/Server.php:127
+#: Model/Server.php:135
 msgid "Terms not accepted"
 msgstr ""
 
-#: Model/Server.php:150
+#: Model/Server.php:158
 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:151
+#: Model/Server.php:159
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:163
+#: Model/Server.php:172
 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:164
+#: Model/Server.php:173
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:173
+#: Model/Server.php:182
 msgid "The background workers can be managed via the CLI in addition to the UI / API management tools"
 msgstr ""
 
-#: Model/Server.php:174
+#: Model/Server.php:183
 msgid "Managing the background workers"
 msgstr ""
 
-#: Model/Server.php:183
-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:185
-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:191
-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:199
-msgid "Unless set to true, the instance will only be accessible by site admins."
-msgstr ""
-
-#: Model/Server.php:207
-msgid "Select the language MISP should use. The default is english."
-msgstr ""
-
-#: Model/Server.php:217
-msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
-msgstr ""
-
-#: Model/Server.php:226
-msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
-msgstr ""
-
-#: Model/Server.php:235
-msgid "Enable some performance heavy correlations (currently CIDR correlation)"
-msgstr ""
-
-#: Model/Server.php:244
-msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
-msgstr ""
-
-#: Model/Server.php:253
-msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
-msgstr ""
-
-#: Model/Server.php:264
-msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
-msgstr ""
-
-#: Model/Server.php:274
-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:283
-msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
-msgstr ""
-
-#: Model/Server.php:291
-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:300
-msgid "The message that users will see if the instance is not live."
-msgstr ""
-
-#: Model/Server.php:302
-msgid "If this is not set the default value will be used."
-msgstr ""
-
-#: Model/Server.php:308;316;343;367;375;383;391;448;496;504;571
-msgid "This setting is deprecated and can be safely removed."
-msgstr ""
-
-#: Model/Server.php:324
-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:334
-msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
-msgstr ""
-
-#: Model/Server.php:351
-msgid "Footer text prepending the \"Powered by MISP\" text."
-msgstr ""
-
-#: Model/Server.php:359
-msgid "Footer text following the \"Powered by MISP\" text."
-msgstr ""
-
-#: Model/Server.php:399
-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:407
-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:415
-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:423
-msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
-msgstr ""
-
-#: Model/Server.php:431
-msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
-msgstr ""
-
-#: Model/Server.php:440
-msgid "The MISP instance UUID. This UUID is used to identify this instance."
-msgstr ""
-
-#: Model/Server.php:442
-msgid "No valid UUID set"
-msgstr ""
-
-#: Model/Server.php:456
-msgid "Setting this setting to 'false' will hide all organisation names / logos."
-msgstr ""
-
-#: Model/Server.php:464
-msgid "Put the event threat level in the notification E-mail subject."
-msgstr ""
-
-#: Model/Server.php:472
-msgid "This is the TLP string for e-mails when email_subject_tag is not found."
-msgstr ""
-
-#: Model/Server.php:480
-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:488
-msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
-msgstr ""
-
-#: Model/Server.php:512
-msgid "Enables the use of MISP's background processing."
-msgstr ""
-
-#: Model/Server.php:520
-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:530
-msgid "Allow the XML caches to include the encoded attachments."
-msgstr ""
-
-#: Model/Server.php:538
-msgid "Always download attachments when loaded by a user in a browser"
-msgstr ""
-
-#: Model/Server.php:546
-msgid "The e-mail address that MISP should use for all notifications"
-msgstr ""
-
-#: Model/Server.php:554
-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:563
-msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
-msgstr ""
-
-#: Model/Server.php:579
-msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
-msgstr ""
-
-#: Model/Server.php:587
-msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
-msgstr ""
-
-#: Model/Server.php:595
-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:603
-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:611
-msgid "The default distribution setting for events (0-3)."
-msgstr ""
-
-#: Model/Server.php:620
-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:629
-msgid "The default threat level setting when creating events."
-msgstr ""
-
-#: Model/Server.php:638
-msgid "The tag collection to be applied to all events created manually."
-msgstr ""
-
-#: Model/Server.php:647
-msgid "The default setting for publish alerts when creating users."
-msgstr ""
-
-#: Model/Server.php:656
-msgid "Enable the tagging feature of MISP. This is highly recommended."
-msgstr ""
-
-#: Model/Server.php:664
-msgid "Show the full tag names on the event index."
-msgstr ""
-
-#: Model/Server.php:673
-msgid "Used on the login page, before the MISP logo"
-msgstr ""
-
-#: Model/Server.php:681
-msgid "Used on the login page, after the MISP logo"
-msgstr ""
-
-#: Model/Server.php:689
-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:697
-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:705
-msgid "Used in the page title, after the name of the page"
-msgstr ""
-
-#: Model/Server.php:713
-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:721
-msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
-msgstr ""
-
-#: Model/Server.php:729
-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:737
-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:745
-msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
-msgstr ""
-
-#: Model/Server.php:754
-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:763
-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:771
-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:778
-msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
-msgstr ""
-
-#: Model/Server.php:785
-msgid "If enabled, all log entries will include the IP address of the user."
-msgstr ""
-
-#: Model/Server.php:794
-msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
-msgstr ""
-
-#: Model/Server.php:802
-msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
-msgstr ""
-
-#: Model/Server.php:804
-msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
-msgstr ""
-
-#: Model/Server.php:811
-msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
-msgstr ""
-
-#: Model/Server.php:820
-msgid "You can decide to skip the logging of the paranoid logs to the database."
-msgstr ""
-
-#: Model/Server.php:829
-msgid "If paranoid logging is enabled, include the POST body in the entries."
-msgstr ""
-
-#: Model/Server.php:838
-msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
-msgstr ""
-
-#: Model/Server.php:847
-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:856
-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:865
-msgid "When enabled, the number of proposals for the events are shown on the index."
-msgstr ""
-
-#: Model/Server.php:874
-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:883
-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:892
-msgid "When enabled only Org and Site admins can edit a user's profile."
-msgstr ""
-
-#: Model/Server.php:902
-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:911
-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:920
-msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
-msgstr ""
-
-#: Model/Server.php:929
-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:938
-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 \"timestamp\" field of the event is used. Expected format: integer, in days"
-msgstr ""
-
-#: Model/Server.php:947
-msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:956
-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:966
-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:975
-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:984
-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:993
-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:1003
-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:1012
-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:1020
-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:1028
-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:1036
-msgid "The password on the redis server (if any) to be used for generic MISP tasks."
-msgstr ""
-
-#: Model/Server.php:1045
-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:1053
-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:1061
-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:1070
-msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
-msgstr ""
-
-#: Model/Server.php:1078
-msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
-msgstr ""
-
-#: Model/Server.php:1090
-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:1099
-msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
-msgstr ""
-
-#: Model/Server.php:1107
-msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
-msgstr ""
-
-#: Model/Server.php:1115
-msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
-msgstr ""
-
-#: Model/Server.php:1123
-msgid "The e-mail address that the instance's GnuPG key is tied to."
-msgstr ""
-
-#: Model/Server.php:1131
-msgid "The password (if it is set) of the GnuPG key of the instance."
-msgstr ""
-
-#: Model/Server.php:1140
-msgid "The location of the GnuPG homedir."
-msgstr ""
-
-#: Model/Server.php:1151
-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:1159
-msgid "The e-mail address that the instance's SMIME key is tied to."
-msgstr ""
-
-#: Model/Server.php:1167
-msgid "The location of the public half of the signing certificate."
-msgstr ""
-
-#: Model/Server.php:1175
-msgid "The location of the private half of the signing certificate."
-msgstr ""
-
-#: Model/Server.php:1183
-msgid "The password (if it is set) of the SMIME key of the instance."
-msgstr ""
-
-#: Model/Server.php:1195
-msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
-msgstr ""
-
-#: Model/Server.php:1203
-msgid "The TCP port for the HTTP proxy."
-msgstr ""
-
-#: Model/Server.php:1211
-msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
-msgstr ""
-
-#: Model/Server.php:1219
-msgid "The authentication username for the HTTP proxy."
-msgstr ""
-
-#: Model/Server.php:1227
-msgid "The authentication password for the HTTP proxy."
-msgstr ""
-
-#: Model/Server.php:1238
-msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
-msgstr ""
-
-#: Model/Server.php:1247
-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:1257
-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:1266
-msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
-msgstr ""
-
-#: Model/Server.php:1276
-msgid "The message sent shown to anyone trying to self-register."
-msgstr ""
-
-#: Model/Server.php:1284
-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:1292
-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:1300
-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:1309
-msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
-msgstr ""
-
-#: Model/Server.php:1318
-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:1327
-msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
-msgstr ""
-
-#: Model/Server.php:1337
-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:1339
-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:1346
-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:1355
-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:1364
-msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
-msgstr ""
-
-#: Model/Server.php:1373
-msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
-msgstr ""
-
-#: Model/Server.php:1385
-msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
-msgstr ""
-
-#: Model/Server.php:1393
-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:1404
-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:1412
-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:1420
-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:1429
-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:1437
-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:1448
-msgid "The default policy action for the values added to the RPZ."
-msgstr ""
-
-#: Model/Server.php:1457
-msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
-msgstr ""
-
-#: Model/Server.php:1465
-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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
-msgstr ""
-
-#: Model/Server.php:1473
-msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1481
-msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1489
-msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1497
-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:1505
-msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1513
-msgid "Nameserver"
-msgstr ""
-
-#: Model/Server.php:1521
-msgid "Alternate nameserver"
-msgstr ""
-
-#: Model/Server.php:1529
-msgid "The e-mail address specified in the SOA portion of the zone file."
-msgstr ""
-
-#: Model/Server.php:1537
-msgid "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."
-msgstr ""
-
-#: Model/Server.php:1545
-msgid "A comma separated list of Kafka bootstrap brokers"
-msgstr ""
-
-#: Model/Server.php:1553
-msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
-msgstr ""
-
-#: Model/Server.php:1561;1808
-msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
-msgstr ""
-
-#: Model/Server.php:1569;1816
-msgid "Enables or disables the publishing of any event creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1577
-msgid "Topic for publishing event creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1585
-msgid "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."
-msgstr ""
-
-#: Model/Server.php:1593
-msgid "Topic for publishing event information on publish."
-msgstr ""
-
-#: Model/Server.php:1601;1824
-msgid "Enables or disables the publishing of any object creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1609
-msgid "Topic for publishing object creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1617;1832
-msgid "Enables or disables the publishing of any object reference creations/deletions."
-msgstr ""
-
-#: Model/Server.php:1625
-msgid "Topic for publishing object reference creations/deletions."
-msgstr ""
-
-#: Model/Server.php:1633;1840
-msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
-msgstr ""
-
-#: Model/Server.php:1641
-msgid "Topic for publishing attribute creations/edits/soft deletions."
-msgstr ""
-
-#: Model/Server.php:1649
-msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1657
-msgid "Topic for publishing proposal creations/edits/deletions."
-msgstr ""
-
-#: Model/Server.php:1665;1848
-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:1673
-msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
-msgstr ""
-
-#: Model/Server.php:1681
-msgid "Enables or disables the publishing of new sightings."
-msgstr ""
-
-#: Model/Server.php:1689
-msgid "Topic for publishing sightings."
-msgstr ""
-
-#: Model/Server.php:1697
-msgid "Enables or disables the publishing of new/modified users."
-msgstr ""
-
-#: Model/Server.php:1705
-msgid "Topic for publishing new/modified users."
-msgstr ""
-
-#: Model/Server.php:1713
-msgid "Enables or disables the publishing of new/modified organisations."
-msgstr ""
-
-#: Model/Server.php:1721
-msgid "Topic for publishing new/modified organisations."
-msgstr ""
-
-#: Model/Server.php:1729
-msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
-msgstr ""
-
-#: Model/Server.php:1737
-msgid "Topic for publishing log entries."
-msgstr ""
-
-#: Model/Server.php:1745
-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:1754
-msgid "The port that the pub/sub feature will use."
-msgstr ""
-
-#: Model/Server.php:1763
-msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
-msgstr ""
-
-#: Model/Server.php:1772
-msgid "The port that Redis is listening on."
-msgstr ""
-
-#: Model/Server.php:1781
-msgid "The password, if set for Redis."
-msgstr ""
-
-#: Model/Server.php:1790
-msgid "The database to be used for queuing messages for the pub/sub functionality."
-msgstr ""
-
-#: Model/Server.php:1799
-msgid "The namespace to be used for queuing messages for the pub/sub functionality."
-msgstr ""
-
-#: Model/Server.php:1856
-msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
-msgstr ""
-
-#: Model/Server.php:1864
-msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
-msgstr ""
-
-#: Model/Server.php:1872
-msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
-msgstr ""
-
-#: Model/Server.php:1880
-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:1888
-msgid "Enabled logging to an ElasticSearch instance"
-msgstr ""
-
-#: Model/Server.php:1896
-msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
-msgstr ""
-
-#: Model/Server.php:1904
-msgid "The index in which to place logs"
-msgstr ""
-
-#: Model/Server.php:1912
-msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
-msgstr ""
-
-#: Model/Server.php:1920
-msgid "Bucket name to upload to"
-msgstr ""
-
-#: Model/Server.php:1928
-msgid "Region in which your S3 bucket resides"
-msgstr ""
-
-#: Model/Server.php:1936
-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:1944
-msgid "AWS secret key to use when uploading samples"
-msgstr ""
-
-#: Model/Server.php:1952
-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:1961
-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:1969
-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:1977
-msgid "Enable SightingDB integration."
-msgstr ""
-
-#: Model/Server.php:1985
-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:1995
-msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
-msgstr ""
-
-#: Model/Server.php:2004
-msgid "Use a header namespace for the auth header - default setting is enabled"
-msgstr ""
-
-#: Model/Server.php:2013
-msgid "The default header namespace for the auth header - default setting is HTTP_"
-msgstr ""
-
-#: Model/Server.php:2022
-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:2031
-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:2040
-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:2049
-msgid "Disable the logout button for users authenticate with the external auth mechanism."
-msgstr ""
-
-#: Model/Server.php:2057
-msgid "Enable/disable the enrichment services"
-msgstr ""
-
-#: Model/Server.php:2065
-msgid "Set a timeout for the enrichment services"
-msgstr ""
-
-#: Model/Server.php:2073
-msgid "Enable/disable the import services"
-msgstr ""
-
-#: Model/Server.php:2081
-msgid "Set a timeout for the import services"
-msgstr ""
-
-#: Model/Server.php:2089
-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:2097
-msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
-msgstr ""
-
-#: Model/Server.php:2105
-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:2113
-msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
-msgstr ""
-
-#: Model/Server.php:2121
-msgid "Enable/disable the export services"
-msgstr ""
-
-#: Model/Server.php:2129
-msgid "Set a timeout for the export services"
-msgstr ""
-
-#: Model/Server.php:2137
-msgid "Enable/disable the hover over information retrieved from the enrichment modules"
-msgstr ""
-
-#: Model/Server.php:2145
-msgid "Set a timeout for the hover services"
-msgstr ""
-
-#: Model/Server.php:2153
-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:2161
-msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
-msgstr ""
-
-#: Model/Server.php:2169
-msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
-msgstr ""
-
-#: Model/Server.php:2177
-msgid "The port used to access Cortex. By default, this is port 9000"
-msgstr ""
-
-#: Model/Server.php:2185
-msgid "Enable/disable the Cortex services"
-msgstr ""
-
-#: Model/Server.php:2193
-msgid "Set an authentication key to be passed to Cortex"
-msgstr ""
-
-#: Model/Server.php:2202
-msgid "Set a timeout for the Cortex services"
-msgstr ""
-
-#: Model/Server.php:2210
-msgid "Set to false to disable SSL verification. This is not recommended."
-msgstr ""
-
-#: Model/Server.php:2219
-msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
-msgstr ""
-
-#: Model/Server.php:2228
-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:2237
-msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
-msgstr ""
-
-#: Model/Server.php:2246
-msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
-msgstr ""
-
-#: Model/Server.php:2255
-msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
-msgstr ""
-
-#: Model/Server.php:2265
-msgid "The debug level of the instance, always use 0 for production instances."
-msgstr ""
-
-#: Model/Server.php:2274
-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:2441
+#: Model/Server.php:419
 msgid "Failed (partially?) because of validation errors: "
 msgstr ""
 
-#: Model/Server.php:2445
+#: Model/Server.php:423
 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:2472
-msgid "Empty event detected."
-msgstr ""
-
-#: Model/Server.php:2478
+#: Model/Server.php:447;463
 msgid "failed downloading the event"
 msgstr ""
 
-#: Model/Server.php:2557
+#: Model/Server.php:457
+msgid "Empty event detected."
+msgstr ""
+
+#: Model/Server.php:482
+msgid "Pulling relevant galaxy clusters."
+msgstr ""
+
+#: Model/Server.php:482
+msgid "Pulling galaxy clusters."
+msgstr ""
+
+#: Model/Server.php:501
 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:2559
+#: Model/Server.php:503
 msgid "Sorry, this is not yet implemented"
 msgstr ""
 
-#: Model/Server.php:2560
+#: Model/Server.php:504
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2572;2574
+#: Model/Server.php:516;518
 msgid "Unknown issue."
 msgstr ""
 
-#: Model/Server.php:3134
+#: Model/Server.php:680
+msgid "Error: got response code %s"
+msgstr ""
+
+#: Model/Server.php:916
+msgid "Push to server %s failed. Reason: %s"
+msgstr ""
+
+#: Model/Server.php:1088
+msgid "Push to server %s complete."
+msgstr ""
+
+#: Model/Server.php:1156
+msgid "GalaxyCluster %s"
+msgstr ""
+
+#: Model/Server.php:1283
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:3137
+#: Model/Server.php:1286
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:3145
+#: Model/Server.php:1296
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:3260
+#: Model/Server.php:1411
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3281
+#: Model/Server.php:1432
 msgid "Invalid language."
 msgstr ""
 
-#: Model/Server.php:3302
+#: Model/Server.php:1456
+msgid "No organisation selected."
+msgstr ""
+
+#: Model/Server.php:1463
 msgid "Invalid tag_collection."
 msgstr ""
 
-#: Model/Server.php:3310
+#: Model/Server.php:1471
 msgid "This setting has to be a number."
 msgstr ""
 
-#: Model/Server.php:3322
+#: Model/Server.php:1491
 msgid "The cookie timeout is currently lower than the session timeout. This will invalidate the cookie before the session expires."
 msgstr ""
 
-#: Model/Server.php:3619
+#: Model/Server.php:1733
+msgid "Value is not a boolean, make sure that you convert 'true' to true for example."
+msgstr ""
+
+#: Model/Server.php:1799
 msgid "Invalid file path or file not accessible."
 msgstr ""
 
-#: Model/Server.php:3622
+#: Model/Server.php:1802
 msgid "File has to be in .pem format."
 msgstr ""
 
-#: Model/Server.php:3988
+#: Model/Server.php:1926
+msgid "Emailing is currently disabled. Enabling OTP without e-mailing being configured would lock all users out."
+msgstr ""
+
+#: Model/Server.php:2174
 msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
 msgstr ""
 
-#: Model/Server.php:4120
+#: Model/Server.php:2306
 msgid "Organisation logos"
 msgstr ""
 
-#: Model/Server.php:4121
+#: Model/Server.php:2307
 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:4123
+#: Model/Server.php:2309
 msgid "48x48 pixel .png files"
 msgstr ""
 
-#: Model/Server.php:4126;4141
+#: Model/Server.php:2312;2327
 msgid "Filename must be in the following format: *.png"
 msgstr ""
 
-#: Model/Server.php:4130
+#: Model/Server.php:2316
 msgid "Additional image files"
 msgstr ""
 
-#: Model/Server.php:4131
+#: Model/Server.php:2317
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:4138
+#: Model/Server.php:2324
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:4228
-msgid "Invalid server."
+#: Model/Server.php:2361;2362
+#: View/SharingGroups/index.ctp:121
+msgid "Not defined"
 msgstr ""
 
-#: Model/Server.php:4259
+#: Model/Server.php:2363;2364
+msgid "Unknwon"
+msgstr ""
+
+#: Model/Server.php:2449
 msgid "Response was empty."
 msgstr ""
 
-#: Model/Server.php:4335
+#: Model/Server.php:2511
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:4604
+#: Model/Server.php:2800
 msgid "% The command below is a suggestion and might be incorrect. Please ask if you are not sure what you are doing."
 msgstr ""
 
-#: Model/Server.php:4675
+#: Model/Server.php:2872
 msgid "Can't check database schema for Postgres database type"
 msgstr ""
 
-#: Model/Server.php:4692
+#: Model/Server.php:2889
 msgid "Table `%s` does not exist"
 msgstr ""
 
-#: Model/Server.php:4719
+#: Model/Server.php:2916
 msgid "Column `%s` exists but should not"
 msgstr ""
 
-#: Model/Server.php:4752
+#: Model/Server.php:2949
 msgid "Column `%s` is different"
 msgstr ""
 
-#: Model/Server.php:4762
+#: Model/Server.php:2959
 msgid "Column `%s` does not exist but should"
 msgstr ""
 
-#: Model/Server.php:4775
+#: Model/Server.php:2972
 msgid "Table `%s` is an additional table"
 msgstr ""
 
-#: Model/Server.php:4799
+#: Model/Server.php:3045
+msgid "Column `%s` should be unique indexed, but contains duplicate values"
+msgstr ""
+
+#: Model/Server.php:3051
 msgid "Column `%s` should be indexed"
 msgstr ""
 
-#: Model/Server.php:4822
+#: Model/Server.php:3059
 msgid "Column `%s` is indexed but should not"
 msgstr ""
 
-#: Model/Server.php:5252
+#: Model/Server.php:3071
+msgid "Column `%s` has unique index, but should be non unique"
+msgstr ""
+
+#: Model/Server.php:3078
+msgid "Column `%s` should be unique index, but contains duplicate values"
+msgstr ""
+
+#: Model/Server.php:3089
+msgid "Column `%s` should be unique index"
+msgstr ""
+
+#: Model/Server.php:3578
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:5253
+#: Model/Server.php:3579
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:5257
+#: Model/Server.php:3583
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:5258
+#: Model/Server.php:3584
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:5560
+#: Model/Server.php:3914
 msgid "Invalid submodule."
 msgstr ""
 
-#: Model/Server.php:5560;5589
+#: Model/Server.php:3914;3943
 msgid "unknown"
 msgstr ""
 
-#: Model/Server.php:5572
+#: Model/Server.php:3926
 msgid "update_after_pull"
 msgstr ""
 
-#: Model/Server.php:5573
+#: Model/Server.php:3927
 msgid "Updating: "
 msgstr ""
 
-#: Model/Server.php:5717
+#: Model/Server.php:4086
 msgid "Invalid worker."
 msgstr ""
 
-#: Model/Server.php:5724
+#: Model/Server.php:4093
 msgid "Background workers not enabled."
 msgstr ""
 
-#: Model/Server.php:5731
+#: Model/Server.php:4100
 msgid "Invalid worker type."
 msgstr ""
 
-#: Model/Server.php:5911
+#: Model/Server.php:4287
 msgid "Could not reset the remote authentication key."
 msgstr ""
 
-#: Model/Server.php:5988
-msgid "Could not parse JSON: "
+#: Model/Server.php:4339
+msgid "Fetching the '%s' failed with HTTP error 404: Not Found"
 msgstr ""
 
-#: Model/Server.php:6008
-msgid "Could not reset fetch remote user account."
+#: Model/Server.php:4343;4348
+msgid "Fetching the '%s' failed with HTTP error %s: %s"
 msgstr ""
 
-#: Model/Server.php:6030
+#: Model/Server.php:4370
+msgid "Could not fetch remote user account."
+msgstr ""
+
+#: Model/Server.php:4386
+#: View/AuthKeys/add.ctp:9
+#: View/AuthKeys/index.ctp:42
+#: View/AuthKeys/view.ctp:38
+#: View/Elements/healthElements/workers.ctp:57
+#: View/Pages/doc/administration.ctp:166
+#: View/Pages/doc/using_the_system.ctp:255
+#: View/TagCollections/index.ctp:14
+#: View/UserSettings/index.ctp:56
+msgid "User"
+msgstr ""
+
+#: Model/Server.php:4387
+msgid "Role name"
+msgstr ""
+
+#: Model/Server.php:4387;4388
+msgid "Unknown, outdated instance"
+msgstr ""
+
+#: Model/Server.php:4388
+msgid "Sync flag"
+msgstr ""
+
+#: Model/Server.php:4392
+msgid "Auth key expiration"
+msgstr ""
+
+#: Model/Server.php:4396
 msgid "No user object received in response."
 msgstr ""
 
+#: Model/Server.php:4423
+msgid "The base url of the application (in the format https://www.mymispinstance.com or https://myserver.com/misp). Several features depend on this setting being correctly set to function."
+msgstr ""
+
+#: Model/Server.php:4425
+msgid "The currently 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:4431
+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:4439
+msgid "Unless set to true, the instance will only be accessible by site admins."
+msgstr ""
+
+#: Model/Server.php:4447
+msgid "Select the language MISP should use. The default is english."
+msgstr ""
+
+#: Model/Server.php:4459
+msgid "This values controls the internal fetcher's memory envelope when it comes to attributes. The number provided is the amount of attributes that can be loaded for each MB of PHP memory available in one shot. Consider lowering this number if your instance has a lot of attribute tags / attribute galaxies attached."
+msgstr ""
+
+#: Model/Server.php:4468
+msgid "This value controls the divisor for attribute weighting when it comes to loading full events. Meaning that it will load coefficient / divisor number of attributes per MB of memory available. Consider raising this number if you have a lot of correlations or highly contextualised events (large number of event level galaxies/tags)."
+msgstr ""
+
+#: Model/Server.php:4477
+msgid "Enable some performance heavy correlations (currently CIDR correlation)"
+msgstr ""
+
+#: Model/Server.php:4486
+msgid "Enable this setting to directly save the config.php file without first creating a temporary file and moving it to avoid concurency issues. Generally not recommended, but useful when for example other tools modify/maintain the config.php file."
+msgstr ""
+
+#: Model/Server.php:4495
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:4506
+msgid "MISP will default to the bundled mozilla certificate bundle shipped with the framework, which is rather stale. If you wish to use an alternate bundle, just set this setting using the path to the bundle to use. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:4516
+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:4525
+msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
+msgstr ""
+
+#: Model/Server.php:4533
+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:4542
+msgid "The message that users will see if the instance is not live."
+msgstr ""
+
+#: Model/Server.php:4544
+msgid "If this is not set the default value will be used."
+msgstr ""
+
+#: Model/Server.php:4550;4558;4585;4609;4617;4625;4633;4692;4740;4748;4823
+msgid "This setting is deprecated and can be safely removed."
+msgstr ""
+
+#: Model/Server.php:4566
+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:4576
+msgid "Disable displaying / modifications to the threat level altogether on the instance (deprecated field)."
+msgstr ""
+
+#: Model/Server.php:4593
+msgid "Footer text prepending the \"Powered by MISP\" text."
+msgstr ""
+
+#: Model/Server.php:4601
+msgid "Footer text following the \"Powered by MISP\" text."
+msgstr ""
+
+#: Model/Server.php:4641
+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:4649
+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:4657
+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:4665
+msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
+msgstr ""
+
+#: Model/Server.php:4673
+msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
+msgstr ""
+
+#: Model/Server.php:4684
+msgid "The MISP instance UUID. This UUID is used to identify this instance."
+msgstr ""
+
+#: Model/Server.php:4686
+msgid "No valid UUID set"
+msgstr ""
+
+#: Model/Server.php:4700
+msgid "Setting this setting to 'false' will hide all organisation names / logos."
+msgstr ""
+
+#: Model/Server.php:4708
+msgid "Put the event threat level in the notification E-mail subject."
+msgstr ""
+
+#: Model/Server.php:4716
+msgid "This is the TLP string for e-mails when email_subject_tag is not found."
+msgstr ""
+
+#: Model/Server.php:4724
+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:4732
+msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
+msgstr ""
+
+#: Model/Server.php:4756
+msgid "Enables the use of MISP's background processing."
+msgstr ""
+
+#: Model/Server.php:4764
+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:4774
+msgid "Allow the XML caches to include the encoded attachments."
+msgstr ""
+
+#: Model/Server.php:4782
+msgid "Always download attachments when loaded by a user in a browser"
+msgstr ""
+
+#: Model/Server.php:4790
+msgid "The Unix user MISP (php) is running as"
+msgstr ""
+
+#: Model/Server.php:4798
+msgid "The e-mail address that MISP should use for all notifications"
+msgstr ""
+
+#: Model/Server.php:4806
+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:4815
+msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
+msgstr ""
+
+#: Model/Server.php:4831
+msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
+msgstr ""
+
+#: Model/Server.php:4839
+msgid "Turn Weakness type attributes into links linking to the provided CWE lookup"
+msgstr ""
+
+#: Model/Server.php:4847
+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:4855
+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:4863
+msgid "The default distribution setting for events (0-3)."
+msgstr ""
+
+#: Model/Server.php:4872
+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:4877
+msgid "Inherit from event"
+msgstr ""
+
+#: Model/Server.php:4881
+msgid "The default threat level setting when creating events."
+msgstr ""
+
+#: Model/Server.php:4890
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:4901
+msgid "The default setting for publish alerts when creating users."
+msgstr ""
+
+#: Model/Server.php:4910
+msgid "Enable the tagging feature of MISP. This is highly recommended."
+msgstr ""
+
+#: Model/Server.php:4918
+msgid "Show the full tag names on the event index."
+msgstr ""
+
+#: Model/Server.php:4927
+msgid "Used on the login page, before the MISP logo"
+msgstr ""
+
+#: Model/Server.php:4935
+msgid "Used on the login page, after the MISP logo"
+msgstr ""
+
+#: Model/Server.php:4943
+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:4951
+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:4959
+msgid "Used in the page title, after the name of the page"
+msgstr ""
+
+#: Model/Server.php:4967
+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:4975
+msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
+msgstr ""
+
+#: Model/Server.php:4983
+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:4991
+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:4999
+msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
+msgstr ""
+
+#: Model/Server.php:5008
+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:5017
+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:5025
+msgid "Since version 2.3.107 you can start blocklisting 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:5032
+msgid "Blocklisting organisation UUIDs to prevent the creation of any event created by the blocklisted organisation."
+msgstr ""
+
+#: Model/Server.php:5039
+msgid "If enabled, all log entries will include the IP address of the user."
+msgstr ""
+
+#: Model/Server.php:5048
+msgid "If log_client_ip is enabled, you can customize which header field contains the client's IP address. This is generally used when you have a reverse proxy infront of your MISP instance."
+msgstr ""
+
+#: Model/Server.php:5057
+msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
+msgstr ""
+
+#: Model/Server.php:5065
+msgid "This functionality allows you to completely disable any logs from being saved in your SQL backend. This is HIGHLY advised against, you lose all the functionalities provided by the audit log subsystem along with the event history (as these are built based on the logs on the fly). Only enable this if you understand and accept the associated risks."
+msgstr ""
+
+#: Model/Server.php:5067
+msgid "Logging has now been disabled - your audit logs will not capture failed authentication attempts, your event history logs are not being populated and no system maintenance messages are being logged."
+msgstr ""
+
+#: Model/Server.php:5074
+msgid "If this functionality is enabled all page requests will be logged. Keep in mind this is extremely verbose and will become a burden to your database."
+msgstr ""
+
+#: Model/Server.php:5083
+msgid "You can decide to skip the logging of the paranoid logs to the database."
+msgstr ""
+
+#: Model/Server.php:5092
+msgid "If paranoid logging is enabled, include the POST body in the entries."
+msgstr ""
+
+#: Model/Server.php:5101
+msgid "Log user IPs on each request. 30 day retention for lookups by IP to get the last authenticated user ID for the given IP, whilst on the reverse, indefinitely stores all associated IPs for a user ID."
+msgstr ""
+
+#: Model/Server.php:5110
+msgid "Log user IP and key usage on each API request. All logs for given keys are deleted after one year when this key is not used."
+msgstr ""
+
+#: Model/Server.php:5119
+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:5128
+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:5137
+msgid "When enabled, the number of proposals for the events are shown on the index."
+msgstr ""
+
+#: Model/Server.php:5146
+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:5155
+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:5164
+msgid "When enabled only Org and Site admins can edit a user's profile."
+msgstr ""
+
+#: Model/Server.php:5173
+msgid "When enabled only Site admins can change user email. This should be enabled if you manage user logins by external system."
+msgstr ""
+
+#: Model/Server.php:5182
+msgid "When enabled only Site admins can change user password. This should be enabled if you manage user passwords by external system."
+msgstr ""
+
+#: Model/Server.php:5191
+msgid "When enabled, Org Admins could not add new users. This should be enabled if you manage users by external system."
+msgstr ""
+
+#: Model/Server.php:5200
+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:5209
+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:5218
+msgid "Set a value to limit the number of email alerts that events can generate per creator organisation (for example, if an organisation pushes out 2000 events in one shot, only alert on the first 20)."
+msgstr ""
+
+#: Model/Server.php:5227
+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:5236
+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 \"timestamp\" field of the event is used. Expected format: integer, in days"
+msgstr ""
+
+#: Model/Server.php:5245
+msgid "If the MISP.block_old_event_alert setting is set, this setting will control the threshold for the event.date field, indicating 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:5254
+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:5264
+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:5273
+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:5282
+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:5291
+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:5301
+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:5310
+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:5318
+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:5326
+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:5334
+msgid "The password on the redis server (if any) to be used for generic MISP tasks."
+msgstr ""
+
+#: Model/Server.php:5343
+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:5351
+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:5359
+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:5368
+msgid "Sets the minimum time before being able to re-trigger an update if the previous one failed. (safe guard to avoid starting the same update multiple time)"
+msgstr ""
+
+#: Model/Server.php:5376
+msgid "This is a performance tweak to change the behaviour of restSearch to use attribute filters solely for blocking. This means that a lookup on the event scope with for example the type field set will be ignored unless it's used to strip unwanted attributes from the results. If left disabled, passing [ip-src, ip-dst] for example will return any event with at least one ip-src or ip-dst attribute. This is generally not considered to be too useful and is a heavy burden on the database."
+msgstr ""
+
+#: Model/Server.php:5385
+msgid "Name of enrichment module that will be used for attachment malware scanning. This module must return av-signature or sb-signature object."
+msgstr ""
+
+#: Model/Server.php:5393
+msgid "Send to attachment scan module just file hash. This can be useful if module sends attachment to remote service and you don't want to leak real data."
+msgstr ""
+
+#: Model/Server.php:5402
+msgid "How long to wait for scan results in seconds."
+msgstr ""
+
+#: Model/Server.php:5414
+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:5423
+msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
+msgstr ""
+
+#: Model/Server.php:5431
+msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
+msgstr ""
+
+#: Model/Server.php:5439
+msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
+msgstr ""
+
+#: Model/Server.php:5447
+msgid "The e-mail address that the instance's GnuPG key is tied to."
+msgstr ""
+
+#: Model/Server.php:5455
+msgid "The password (if it is set) of the GnuPG key of the instance."
+msgstr ""
+
+#: Model/Server.php:5464
+msgid "The location of the GnuPG homedir."
+msgstr ""
+
+#: Model/Server.php:5472
+msgid "When enabled, the subject in signed and encrypted e-mails will not be sent in unencrypted form."
+msgstr ""
+
+#: Model/Server.php:5483
+msgid "Enable S/MIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if S/MIME is enabled."
+msgstr ""
+
+#: Model/Server.php:5491
+msgid "The e-mail address that the instance's S/MIME key is tied to."
+msgstr ""
+
+#: Model/Server.php:5499
+msgid "The location of the public half of the signing certificate."
+msgstr ""
+
+#: Model/Server.php:5507
+msgid "The location of the private half of the signing certificate."
+msgstr ""
+
+#: Model/Server.php:5515
+msgid "The password (if it is set) of the S/MIME key of the instance."
+msgstr ""
+
+#: Model/Server.php:5527
+msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
+msgstr ""
+
+#: Model/Server.php:5535
+msgid "The TCP port for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:5543
+msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
+msgstr ""
+
+#: Model/Server.php:5551
+msgid "The authentication username for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:5559
+msgid "The authentication password for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:5570
+msgid "Disabling this setting will remove all form tampering protection. Do not set this setting pretty much ever. You were warned."
+msgstr ""
+
+#: Model/Server.php:5579
+msgid "Enforce CSP. Content Security Policy (CSP) is an added layer of security that helps to detect and mitigate certain types of attacks, including Cross Site Scripting (XSS) and data injection attacks. When disabled, violations will be just logged."
+msgstr ""
+
+#: Model/Server.php:5587
+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:5597
+msgid "Advanced authkeys will allow each user to create and manage a set of authkeys for themselves, each with individual expirations and comments. API keys are stored in a hashed state and can no longer be recovered from MISP. Users will be prompted to note down their key when creating a new authkey. You can generate a new set of API keys for all users on demand in the diagnostics page, or by triggering %s."
+msgstr ""
+
+#: Model/Server.php:5597
+msgid "the advanced upgrade"
+msgstr ""
+
+#: Model/Server.php:5605
+msgid "Maximal key lifetime in days. Use can limit that validity even more. Just newly created keys will be affected. When not set, key validity is not limited."
+msgstr ""
+
+#: Model/Server.php:5614
+msgid "When enabled, session is kept between API requests."
+msgstr ""
+
+#: Model/Server.php:5623
+msgid "This optionally can be enabled if an external auth provider is used. When set to true, it will disable the default form authentication."
+msgstr ""
+
+#: Model/Server.php:5631
+msgid "Enable this setting if you wish for users to be able to query any arbitrary URL via the rest client. Keep in mind that queries are executed by the MISP server, so internal IPs in your MISP's network may be reachable."
+msgstr ""
+
+#: Model/Server.php:5640
+msgid "If left empty, the baseurl of your MISP is used. However, in some instances (such as port-forwarded VM installations) this will not work. You can override the baseurl with a url through which your MISP can reach itself (typically https://127.0.0.1 would work)."
+msgstr ""
+
+#: Model/Server.php:5648
+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:5657
+msgid "Write syslog messages also to standard error output."
+msgstr ""
+
+#: Model/Server.php:5666
+msgid "Syslog message identifier."
+msgstr ""
+
+#: Model/Server.php:5675
+msgid "If enabled, any authkey will be replaced by asterisks in Audit log."
+msgstr ""
+
+#: Model/Server.php:5684
+msgid "If enabled, HTTP headers that block browser cache will be send. Static files (like images or JavaScripts) will still be cached, but not generated pages."
+msgstr ""
+
+#: Model/Server.php:5693
+msgid "If enabled, any POST, PUT or AJAX request will be allow just when Sec-Fetch-Site header is not defined or contains \"same-origin\"."
+msgstr ""
+
+#: Model/Server.php:5702
+msgid "Enable two step authentication with a OTP sent by email. Requires e-mailing to be enabled. Warning: You cannot use it in combination with external authentication plugins."
+msgstr ""
+
+#: Model/Server.php:5712
+msgid "Define the length of the OTP code sent by email"
+msgstr ""
+
+#: Model/Server.php:5721
+msgid "Define the validity (in minutes) of the OTP code sent by email"
+msgstr ""
+
+#: Model/Server.php:5731
+msgid "The message sent to the user when a new OTP is requested. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $otp = the new OTP generated by MISP, $username = the user's e-mail address, $org the Organisation managing the instance, $misp = the url of this instance, $contact = the e-mail address used to contact the support team (as set in MISP.contact), $ip the IP used to complete the first step of the login and $validity the validity time in minutes."
+msgstr ""
+
+#: Model/Server.php:5741
+msgid "A comma separated list of emails for which the OTP is disabled. Note that if you remove someone from this list, the OTP will only be asked at next login."
+msgstr ""
+
+#: Model/Server.php:5750
+msgid "Enabling this setting will allow users to have access to the pre-auth registration form. This will create an inbox entry for administrators to review."
+msgstr ""
+
+#: Model/Server.php:5760
+msgid "The message sent shown to anyone trying to self-register."
+msgstr ""
+
+#: Model/Server.php:5768
+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:5776
+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:5784
+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:5793
+msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
+msgstr ""
+
+#: Model/Server.php:5802
+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:5811
+msgid "Enabling this setting will block the organisation list from being visible in sharing group besides user with sharing group permission."
+msgstr ""
+
+#: Model/Server.php:5820
+msgid "Disabling this setting will allow the creation/modification of local feeds (as opposed to network feeds). Enabling this setting will restrict feed sources to be network based only. When disabled, keep in mind that a malicious site administrator could get access to any arbitrary file on the system that the apache user has access to. Make sure that proper safe-guards are in place. This setting can only be modified via the CLI."
+msgstr ""
+
+#: Model/Server.php:5830
+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:5832
+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:5839
+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:5848
+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:5857
+msgid "Enable this setting to create verbose logs of synced event data for debugging reasons. Logs are saved in your MISP directory's app/files/scripts/tmp/ directory."
+msgstr ""
+
+#: Model/Server.php:5866
+msgid "Enables the functionality to monitor users - thereby enabling all logging functionalities for a single user. This functionality is intrusive and potentially heavy on the system - use it with care."
+msgstr ""
+
+#: Model/Server.php:5875
+msgid "When enabled, logged in username will be included in X-Username HTTP response header. This is useful for request logging on webserver/proxy side."
+msgstr ""
+
+#: Model/Server.php:5887
+msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
+msgstr ""
+
+#: Model/Server.php:5895
+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:5906
+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:5914
+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:5922
+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:5931
+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:5939
+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:5950
+msgid "The default policy action for the values added to the RPZ."
+msgstr ""
+
+#: Model/Server.php:5959
+msgid "The default walled garden used by the RPZ export if the Local-Data policy setting is picked for the export."
+msgstr ""
+
+#: Model/Server.php:5967
+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). Setting it to $time will give you an unixtime-based serial (good then you need more than 99 revisions per day)."
+msgstr ""
+
+#: Model/Server.php:5975
+msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:5983
+msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:5991
+msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:5999
+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:6007
+msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:6015
+msgid "Nameserver"
+msgstr ""
+
+#: Model/Server.php:6023
+msgid "Alternate nameserver"
+msgstr ""
+
+#: Model/Server.php:6031
+msgid "The e-mail address specified in the SOA portion of the zone file."
+msgstr ""
+
+#: Model/Server.php:6039
+msgid "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."
+msgstr ""
+
+#: Model/Server.php:6047
+msgid "A comma separated list of Kafka bootstrap brokers"
+msgstr ""
+
+#: Model/Server.php:6055
+msgid "A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored."
+msgstr ""
+
+#: Model/Server.php:6063;6337
+msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
+msgstr ""
+
+#: Model/Server.php:6071;6345
+msgid "Enables or disables the publishing of any event creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6079
+msgid "Topic for publishing event creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6087
+msgid "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."
+msgstr ""
+
+#: Model/Server.php:6095
+msgid "Topic for publishing event information on publish."
+msgstr ""
+
+#: Model/Server.php:6103;6353
+msgid "Enables or disables the publishing of any object creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6111
+msgid "Topic for publishing object creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6119;6361
+msgid "Enables or disables the publishing of any object reference creations/deletions."
+msgstr ""
+
+#: Model/Server.php:6127
+msgid "Topic for publishing object reference creations/deletions."
+msgstr ""
+
+#: Model/Server.php:6135;6369
+msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
+msgstr ""
+
+#: Model/Server.php:6143
+msgid "Topic for publishing attribute creations/edits/soft deletions."
+msgstr ""
+
+#: Model/Server.php:6151
+msgid "Enables or disables the publishing of any proposal creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6159
+msgid "Topic for publishing proposal creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:6167;6377
+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:6175
+msgid "Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
+msgstr ""
+
+#: Model/Server.php:6183
+msgid "Enables or disables the publishing of new sightings."
+msgstr ""
+
+#: Model/Server.php:6191
+msgid "Topic for publishing sightings."
+msgstr ""
+
+#: Model/Server.php:6199
+msgid "Enables or disables the publishing of new/modified users."
+msgstr ""
+
+#: Model/Server.php:6207
+msgid "Topic for publishing new/modified users."
+msgstr ""
+
+#: Model/Server.php:6215
+msgid "Enables or disables the publishing of new/modified organisations."
+msgstr ""
+
+#: Model/Server.php:6223
+msgid "Topic for publishing new/modified organisations."
+msgstr ""
+
+#: Model/Server.php:6231
+msgid "Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings."
+msgstr ""
+
+#: Model/Server.php:6239
+msgid "Topic for publishing log entries."
+msgstr ""
+
+#: Model/Server.php:6247
+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:6256
+msgid "The host that the pub/sub feature will use."
+msgstr ""
+
+#: Model/Server.php:6265
+msgid "The port that the pub/sub feature will use."
+msgstr ""
+
+#: Model/Server.php:6274
+msgid "The username that client need to use to connect to ZeroMQ."
+msgstr ""
+
+#: Model/Server.php:6283
+msgid "The password that client need to use to connect to ZeroMQ."
+msgstr ""
+
+#: Model/Server.php:6292
+msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
+msgstr ""
+
+#: Model/Server.php:6301
+msgid "The port that Redis is listening on."
+msgstr ""
+
+#: Model/Server.php:6310
+msgid "The password, if set for Redis."
+msgstr ""
+
+#: Model/Server.php:6319
+msgid "The database to be used for queuing messages for the pub/sub functionality."
+msgstr ""
+
+#: Model/Server.php:6328
+msgid "The namespace to be used for queuing messages for the pub/sub functionality."
+msgstr ""
+
+#: Model/Server.php:6385
+msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:6393
+msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:6401
+msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:6409
+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:6417
+msgid "Enabled logging to an ElasticSearch instance"
+msgstr ""
+
+#: Model/Server.php:6425
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
+msgstr ""
+
+#: Model/Server.php:6433
+msgid "The index in which to place logs"
+msgstr ""
+
+#: Model/Server.php:6441
+msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
+msgstr ""
+
+#: Model/Server.php:6449
+msgid "Bucket name to upload to"
+msgstr ""
+
+#: Model/Server.php:6457
+msgid "Region in which your S3 bucket resides"
+msgstr ""
+
+#: Model/Server.php:6465
+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:6473
+msgid "AWS secret key to use when uploading samples"
+msgstr ""
+
+#: Model/Server.php:6481
+msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner organisation alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and any organisation that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
+msgstr ""
+
+#: Model/Server.php:6487
+msgid "Event Owner Organisation"
+msgstr ""
+
+#: Model/Server.php:6488
+msgid "Sighting reporters"
+msgstr ""
+
+#: Model/Server.php:6489
+msgid "Everyone"
+msgstr ""
+
+#: Model/Server.php:6490
+msgid "Event Owner + host org sightings"
+msgstr ""
+
+#: Model/Server.php:6495
+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:6503
+msgid "When pushing sightings to another server, report all sightings from this instance as this organisation. This effectively hides all sightings from this instance behind a single organisation to the outside world. Sightings pulled from this instance follow the Sightings_policy above."
+msgstr ""
+
+#: Model/Server.php:6514
+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:6522
+msgid "Enable SightingDB integration."
+msgstr ""
+
+#: Model/Server.php:6530
+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:6540
+msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
+msgstr ""
+
+#: Model/Server.php:6549
+msgid "Use a header namespace for the auth header - default setting is enabled"
+msgstr ""
+
+#: Model/Server.php:6558
+msgid "The default header namespace for the auth header - default setting is HTTP_"
+msgstr ""
+
+#: Model/Server.php:6567
+msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Alternatively, 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:6576
+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:6585
+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:6594
+msgid "Disable the logout button for users authenticate with the external auth mechanism."
+msgstr ""
+
+#: Model/Server.php:6602
+msgid "Enable/disable the enrichment services"
+msgstr ""
+
+#: Model/Server.php:6610
+msgid "Set a timeout for the enrichment services"
+msgstr ""
+
+#: Model/Server.php:6618
+msgid "Enable/disable the import services"
+msgstr ""
+
+#: Model/Server.php:6626
+msgid "Set a timeout for the import services"
+msgstr ""
+
+#: Model/Server.php:6634
+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:6642
+msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:6650
+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:6658
+msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:6666
+msgid "Enable/disable the export services"
+msgstr ""
+
+#: Model/Server.php:6674
+msgid "Set a timeout for the export services"
+msgstr ""
+
+#: Model/Server.php:6682
+msgid "Enable/disable the hover over information retrieved from the enrichment modules"
+msgstr ""
+
+#: Model/Server.php:6690
+msgid "When enabled, users have to click on the magnifier icon to show the enrichment"
+msgstr ""
+
+#: Model/Server.php:6698
+msgid "Set a timeout for the hover services"
+msgstr ""
+
+#: Model/Server.php:6706
+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:6714
+msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:6722
+msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
+msgstr ""
+
+#: Model/Server.php:6730
+msgid "The port used to access Cortex. By default, this is port 9000"
+msgstr ""
+
+#: Model/Server.php:6738
+msgid "Enable/disable the Cortex services"
+msgstr ""
+
+#: Model/Server.php:6746
+msgid "Set an authentication key to be passed to Cortex"
+msgstr ""
+
+#: Model/Server.php:6755
+msgid "Set a timeout for the Cortex services"
+msgstr ""
+
+#: Model/Server.php:6763
+msgid "Set to false to disable SSL verification. This is not recommended."
+msgstr ""
+
+#: Model/Server.php:6772
+msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
+msgstr ""
+
+#: Model/Server.php:6781
+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:6790
+msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
+msgstr ""
+
+#: Model/Server.php:6799
+msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
+msgstr ""
+
+#: Model/Server.php:6808
+msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
+msgstr ""
+
+#: Model/Server.php:6818
+msgid "The debug level of the instance, always use 0 for production instances."
+msgstr ""
+
+#: Model/Server.php:6827
+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:526
+msgid "Pulling %s event."
+msgid_plural "Pulling %s events."
+msgstr[0] ""
+msgstr[1] ""
+
+#: Model/Sighting.php:426
+msgid "Others"
+msgstr ""
+
+#: Model/Sighting.php:836
+msgid "Invalid context."
+msgstr ""
+
+#: Model/Sighting.php:840
+msgid "An ID or UUID must be provided if the context is set."
+msgstr ""
+
 #: Model/Sightingdb.php:346
 msgid "Could not resolve Sightingdb address."
 msgstr ""
@@ -5421,47 +6898,47 @@ msgstr ""
 msgid "No response from the SightingDB server."
 msgstr ""
 
-#: Model/Taxonomy.php:619
+#: Model/Taxonomy.php:675
 msgid "Taxonomy `%s` is an exclusive Taxonomy"
 msgstr ""
 
-#: Model/Taxonomy.php:626
+#: Model/Taxonomy.php:682
 msgid "Predicate `%s` is exclusive"
 msgstr ""
 
-#: Model/User.php:1254
+#: Model/User.php:1033
 msgid "reset_all_sync_api_keys"
 msgstr ""
 
-#: Model/User.php:1255
+#: Model/User.php:1034
 msgid "Reseting all API keys"
 msgstr ""
 
-#: Model/User.php:1317
+#: Model/User.php:1096
 msgid "Reset in progress - %s/%s."
 msgstr ""
 
-#: Model/User.php:1322
+#: Model/User.php:1101
 msgid "%s authkeys reset, %s could not be reset"
 msgstr ""
 
-#: Model/User.php:1347
+#: Model/User.php:1127
 msgid "Authentication key for user %s (%s) updated."
 msgstr ""
 
-#: Model/User.php:1359
+#: Model/User.php:1143
 msgid "Dear user,\n\nan API key reset has been triggered by an administrator for your user account on %s.\n\nYour new API key is: %s\n\nPlease update your server's sync setup to reflect this change.\n\nWe apologise for the inconvenience."
 msgstr ""
 
-#: Model/User.php:1364
+#: Model/User.php:1148
 msgid "Dear user,\n\nan API key reset has been triggered by an administrator for your user account on %s.\n\nYour new API key can be retrieved by logging in using this sync user's account.\n\nPlease update your server's sync setup to reflect this change.\n\nWe apologise for the inconvenience."
 msgstr ""
 
-#: Model/User.php:1373
+#: Model/User.php:1157
 msgid "API key reset by administrator"
 msgstr ""
 
-#: Model/UserSetting.php:321
+#: Model/UserSetting.php:375
 msgid "This endpoint expects both a setting and a value to be set."
 msgstr ""
 
@@ -5495,71 +6972,367 @@ msgstr ""
 msgid "it has the following dependent items"
 msgstr ""
 
+#: View/Allowedlists/admin_add.ctp:4
+msgid "Add Signature Allowedlist"
+msgstr ""
+
+#: View/Allowedlists/admin_add.ctp:13
+#: View/DecayingModel/import.ctp:25
+#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:15
+#: View/Elements/genericElements/org_picker.ctp:17
+#: View/EventBlocklists/add.ctp:36
+#: View/Events/filter_event_index.ctp:125
+#: View/Feeds/add.ctp:220
+#: View/Feeds/import_feeds.ctp:20
+#: View/GalaxyClusterRelations/add.ctp:8
+#: View/OrgBlocklists/add.ctp:30
+#: View/Regexp/admin_add.ctp:32
+#: View/Regexp/admin_edit.ctp:42
+#: View/Servers/import.ctp:20
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+#: View/SharingGroups/index.ctp:12
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:20
+#: View/Tags/add.ctp:35
+#: View/Users/admin_filter_user_index.ctp:62
+msgid "Add"
+msgstr ""
+
+#: View/Allowedlists/admin_edit.ctp:4
+msgid "Edit Signature Allowedlist"
+msgstr ""
+
+#: View/Allowedlists/admin_edit.ctp:13
+#: View/Attributes/attribute_replace.ctp:38
+#: View/Attributes/ajax/attributeEditMassForm.ctp:85
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Elements/view_galaxy_matrix.ctp:73;209
+#: View/Elements/genericElements/Form/submitButton.ctp:9;26
+#: View/Events/contact.ctp:25
+#: View/Events/free_text_import.ctp:27
+#: View/Events/resolved_misp_format.ctp:437
+#: View/News/add.ctp:33
+#: View/News/edit.ctp:34
+#: View/ObjectReferences/ajax/add.ctp:131
+#: View/Objects/add.ctp:178
+#: View/Objects/ajax/quickAddAttributeForm.ctp:121
+#: View/Organisations/admin_add.ctp:48
+#: View/Organisations/admin_edit.ctp:59
+#: View/Posts/add.ctp:66
+#: View/Posts/edit.ctp:20
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:173
+#: View/Servers/ondemand_action.ctp:54
+#: 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/UserSettings/set_home_page.ctp:4
+#: View/UserSettings/set_setting.ctp:36
+#: View/Users/admin_email.ctp:54
+#: View/Users/admin_quick_email.ctp:23
+#: View/Users/change_pw.ctp:23
+#: View/Users/statistics_galaxymatrix.ctp:31
+msgid "Submit"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:2
+#: View/Allowedlists/index.ctp:2
+#: View/Elements/global_menu.ctp:156;161
+#: View/Pages/doc/administration.ctp:13
+#: View/Pages/doc/general.ctp:51
+#: View/Pages/doc/user_management.ctp:70
+msgid "Signature Allowedlist"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:3
+#: View/Allowedlists/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 ""
+
+#: View/Allowedlists/admin_index.ctp:7;40
+#: View/Allowedlists/index.ctp:7;35
+#: View/Attributes/index.ctp:32
+#: View/DecayingModel/decaying_tool_rest_search.ctp:12;64
+#: View/DecayingModel/index.ctp:6;162
+#: View/Elements/eventattribute.ctp:41
+#: View/Elements/eventdiscussion.ctp:16;122
+#: View/Elements/generic_table.ctp:10
+#: View/Elements/generic_table_row.ctp:10
+#: View/Elements/Feeds/eventattribute.ctp:20;87
+#: View/Elements/Servers/eventattribute.ctp:17;81
+#: View/Elements/genericElements/IndexTable/pagination_links.ctp:11
+#: View/EventBlocklists/index.ctp:6;78
+#: View/Events/index.ctp:6
+#: View/Events/proposal_event_index.ctp:6;89
+#: View/Events/ajax/index.ctp:10
+#: View/Feeds/freetext_index.ctp:18;78
+#: View/Feeds/preview_index.ctp:10;85
+#: View/Jobs/index.ctp:24;181
+#: View/Logs/admin_index.ctp:30;120
+#: View/Logs/event_index.ctp:10;54
+#: View/News/index.ctp:39
+#: View/Noticelists/index.ctp:6;76
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:8
+#: View/ObjectTemplates/index.ctp:6;136
+#: View/OrgBlocklists/index.ctp:6;45
+#: View/Organisations/index.ctp:35;159
+#: View/Regexp/admin_index.ctp:6;44
+#: View/Regexp/index.ctp:6;38
+#: View/Servers/index.ctp:6;196
+#: View/Servers/preview_index.ctp:11;186
+#: View/Tasks/index.ctp:11;99
+#: View/Taxonomies/view.ctp:33;170
+#: View/Templates/index.ctp:6;54
+#: View/Threads/index.ctp:6;90
+#: View/Users/ajax/admin_index.ctp:13;32
+msgid "previous"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:9;42
+#: View/Allowedlists/index.ctp:9;37
+#: View/Attributes/index.ctp:34
+#: View/DecayingModel/decaying_tool_rest_search.ctp:14;66
+#: View/DecayingModel/index.ctp:8;164
+#: View/Elements/eventattribute.ctp:43
+#: View/Elements/eventdiscussion.ctp:18;124
+#: View/Elements/generic_table.ctp:12
+#: View/Elements/generic_table_row.ctp:12
+#: View/Elements/Feeds/eventattribute.ctp:22;89
+#: View/Elements/Servers/eventattribute.ctp:19;83
+#: View/Elements/genericElements/IndexTable/pagination_links.ctp:27
+#: View/EventBlocklists/index.ctp:8;80
+#: View/Events/index.ctp:8
+#: View/Events/proposal_event_index.ctp:8;91
+#: View/Events/ajax/index.ctp:12
+#: View/Feeds/freetext_index.ctp:20;80
+#: View/Feeds/preview_index.ctp:12;87
+#: View/Jobs/index.ctp:26;183
+#: View/Logs/admin_index.ctp:32;122
+#: View/Logs/event_index.ctp:12;56
+#: View/News/index.ctp:41
+#: View/Noticelists/index.ctp:8;78
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:10
+#: View/ObjectTemplates/index.ctp:8;138
+#: View/OrgBlocklists/index.ctp:8;47
+#: View/Organisations/index.ctp:37;161
+#: View/Regexp/admin_index.ctp:8;46
+#: View/Regexp/index.ctp:8;40
+#: View/Servers/index.ctp:8;198
+#: View/Servers/preview_index.ctp:13;188
+#: View/Tasks/index.ctp:13;101
+#: View/Taxonomies/view.ctp:35;172
+#: View/Templates/index.ctp:8;56
+#: View/Threads/index.ctp:8;92
+#: View/Users/ajax/admin_index.ctp:15;34
+msgid "next"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:17
+#: View/Attributes/index.ctp:57
+#: View/DecayingModel/index.ctp:92
+#: View/Elements/eventattribute.ctp:161
+#: View/Elements/Events/eventIndexTable.ctp:60
+#: View/Elements/Users/userIndexTable.ctp:28
+#: View/Elements/genericElements/IndexTable/headers.ctp:43
+#: 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/EventBlocklists/index.ctp:48
+#: View/Events/export.ctp:26
+#: View/Events/resolved_attributes.ctp:54
+#: View/Feeds/preview_index.ctp:41
+#: View/Noticelists/index.ctp:30
+#: View/ObjectTemplates/index.ctp:65
+#: View/OrgBlocklists/index.ctp:19
+#: View/Organisations/index.ctp:95
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:18
+#: View/Servers/index.ctp:36
+#: View/Servers/preview_index.ctp:102
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/Sightings/ajax/list_sightings.ctp:15
+#: View/TagCollections/index.ctp:16
+#: View/Templates/index.ctp:20
+#: View/Threads/index.ctp:21
+msgid "Actions"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:24
+#: View/DecayingModel/decaying_tool.ctp:137
+#: View/Elements/eventdiscussion.ctp:85;93
+#: View/Elements/Events/eventIndexTable.ctp:217
+#: View/Elements/Events/View/row_attribute.ctp:390
+#: View/Elements/Events/View/row_object.ctp:124;125
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/markdownEditor/markdownEditor.ctp:30
+#: View/EventBlocklists/edit.ctp:37
+#: View/EventBlocklists/index.ctp:62
+#: View/Feeds/edit.ctp:220
+#: View/Feeds/index.ctp:288
+#: View/GalaxyClusterRelations/add.ctp:8
+#: View/News/index.ctp:22
+#: View/OrgBlocklists/edit.ctp:29
+#: View/OrgBlocklists/index.ctp:29
+#: View/Organisations/index.ctp:138
+#: View/Pages/doc/using_the_system.ctp:191
+#: View/Regexp/admin_index.ctp:27
+#: View/Roles/admin_edit.ctp:55
+#: View/Servers/index.ctp:177
+#: View/Tags/edit.ctp:36
+#: View/Tags/index.ctp:133
+#: View/Templates/edit.ctp:49
+#: View/Users/admin_index.ctp:211
+#: View/Users/edit.ctp:47
+msgid "Edit"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:25
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:16
+#: View/Elements/eventdiscussion.ctp:86;94
+#: View/Elements/Events/eventIndexTable.ctp:220
+#: View/Elements/TagCollections/index_row.ctp:45
+#: View/Elements/Users/userIndexTable.ctp:95
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:43
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+#: View/Elements/healthElements/files.ctp:73
+#: View/EventBlocklists/index.ctp:63
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
+#: View/EventReports/index.ctp:97
+#: View/EventReports/ajax/indexForEvent.ctp:113
+#: View/Events/view_graph.ctp:31
+#: View/Feeds/index.ctp:295
+#: View/GalaxyElements/ajax/index.ctp:67
+#: View/News/index.ctp:24
+#: View/ObjectReferences/ajax/delete.ctp:32
+#: View/ObjectTemplates/index.ctp:118
+#: View/Objects/ajax/delete.ctp:19
+#: View/OrgBlocklists/index.ctp:30
+#: View/Organisations/index.ctp:140
+#: View/Pages/doc/using_the_system.ctp:192
+#: View/Regexp/admin_index.ctp:28
+#: View/Servers/index.ctp:178
+#: View/Users/admin_index.ctp:221
+#: View/Warninglists/index.ctp:140
+msgid "Delete"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:25
+#: View/Elements/TagCollections/index_row.ctp:45
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
+
+#: View/Allowedlists/admin_index.ctp:33
+#: View/Allowedlists/index.ctp:28
+#: View/Attributes/index.ctp:123
+#: View/DecayingModel/decaying_tool_rest_search.ctp:57
+#: View/DecayingModel/index.ctp:155
+#: View/Elements/eventdiscussion.ctp:115
+#: View/Elements/generic_table.ctp:47
+#: View/Elements/generic_table_row.ctp:39
+#: View/Elements/genericElements/IndexTable/pagination_counter.ctp:2
+#: View/EventBlocklists/index.ctp:71
+#: View/Events/index.ctp:103
+#: View/Events/proposal_event_index.ctp:82
+#: View/Events/ajax/index.ctp:21
+#: View/Feeds/preview_index.ctp:77
+#: View/Jobs/index.ctp:174
+#: View/Logs/admin_index.ctp:113
+#: View/Logs/event_index.ctp:47
+#: View/News/index.ctp:33
+#: View/Noticelists/index.ctp:69
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:60
+#: View/ObjectTemplates/index.ctp:129
+#: View/OrgBlocklists/index.ctp:38
+#: View/Organisations/index.ctp:152
+#: View/Regexp/admin_index.ctp:36
+#: View/Regexp/index.ctp:31
+#: View/Servers/index.ctp:189
+#: View/Servers/preview_index.ctp:178
+#: View/Tasks/index.ctp:92
+#: View/Taxonomies/view.ctp:163
+#: View/Templates/index.ctp:47
+#: View/Threads/index.ctp:83
+#: View/Users/ajax/admin_index.ctp:25
+msgid "Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}"
+msgstr ""
+
 #: View/Attributes/add.ctp:6
-#: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:114
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:115
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
 
 #: View/Attributes/add.ctp:6
-#: View/Attributes/edit.ctp:4
 msgid "Edit Attribute"
 msgstr ""
 
 #: View/Attributes/add.ctp:18
 #: View/Attributes/attribute_replace.ctp:12
-#: View/Attributes/edit.ctp:8
-#: View/ShadowAttributes/add.ctp:10
+#: View/ShadowAttributes/add.ctp:17
 #: View/ShadowAttributes/edit.ctp:8
 msgid "(choose one)"
 msgstr ""
 
 #: View/Attributes/add.ctp:25
+#: View/ShadowAttributes/add.ctp:24
 msgid "(choose category first)"
 msgstr ""
 
 #: View/Attributes/add.ctp:39
 #: View/Attributes/add_attachment.ctp:33
-#: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
+#: View/EventReports/add.ctp:25
 #: View/Events/add.ctp:33
 #: View/Feeds/add.ctp:198
 #: View/Feeds/edit.ctp:199
+#: View/GalaxyClusterRelations/add.ctp:37
+#: View/GalaxyClusters/add.ctp:40
 #: View/Objects/ajax/quickAddAttributeForm.ctp:69
-#: View/SharingGroups/view.ctp:2
 msgid "Sharing Group"
 msgstr ""
 
 #: View/Attributes/add.ctp:52
 #: View/Attributes/add_attachment.ctp:41
-#: View/Attributes/edit.ctp:46
 #: View/Attributes/ajax/attributeEditMassForm.ctp:49
-#: View/Elements/eventattributecreation.ctp:42
+#: View/Objects/ajax/quickAddAttributeForm.ctp:112
 #: View/Pages/doc/using_the_system.ctp:93;95;131
-#: View/ShadowAttributes/add.ctp:28
+#: View/ShadowAttributes/add.ctp:38
 #: View/ShadowAttributes/add_attachment.ctp:13
 #: View/ShadowAttributes/edit.ctp:32
 msgid "Contextual Comment"
 msgstr ""
 
 #: View/Attributes/add.ctp:57
-#: View/Attributes/edit.ctp:55
-#: View/Elements/eventattributecreation.ctp:53
-#: View/ShadowAttributes/add.ctp:38
-msgid "for Intrusion Detection System"
+#: View/Attributes/ajax/attributeEditMassForm.ctp:33
+#: View/Objects/ajax/quickAddAttributeForm.ctp:94
+#: View/Pages/doc/using_the_system.ctp:96
+#: View/ShadowAttributes/add.ctp:43
+#: View/ShadowAttributes/edit.ctp:41
+msgid "For Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/add.ctp:155
+#: View/Attributes/add.ctp:139
+#: View/ShadowAttributes/add.ctp:100
 msgid "Timezone missing, auto-detected as: "
 msgstr ""
 
-#: View/Attributes/add.ctp:156
-msgid "The following value will be submited instead: "
+#: View/Attributes/add.ctp:140
+#: View/ShadowAttributes/add.ctp:101
+msgid "The following value will be submitted instead: "
 msgstr ""
 
-#: View/Attributes/add.ctp:164
-msgid "Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ"
+#: View/Attributes/add.ctp:148
+#: View/ShadowAttributes/add.ctp:109
+msgid "Value is not a valid datetime. Expected format YYYY-MM-DDTHH:mm:ssZ"
 msgstr ""
 
 #: View/Attributes/add_attachment.ctp:4
@@ -5567,15 +7340,12 @@ msgid "Add Attachment(s)"
 msgstr ""
 
 #: 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_attachment.ctp:24
-#: View/Attributes/edit.ctp:24
 #: View/Objects/ajax/quickAddAttributeForm.ctp:59
 msgid "Distribution "
 msgstr ""
@@ -5585,10 +7355,14 @@ msgid "Is a malware sample (encrypt and hash)"
 msgstr ""
 
 #: View/Attributes/add_attachment.ctp:72
-msgid "Advanced extraction (if installed)"
+msgid "Advanced extraction is not installed"
 msgstr ""
 
-#: View/Attributes/add_attachment.ctp:77
+#: View/Attributes/add_attachment.ctp:74
+msgid "Advanced extraction"
+msgstr ""
+
+#: View/Attributes/add_attachment.ctp:79
 #: View/Elements/healthElements/files.ctp:92
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
@@ -5609,33 +7383,31 @@ msgstr ""
 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
-#: View/EventDelegations/index.ctp:70
-msgid "Event id"
-msgstr ""
-
 #: View/Attributes/alternate_search_result.ctp:7
-#: View/Attributes/index.ctp:49
+#: View/Attributes/index.ctp:43
 #: View/DecayingModel/decaying_tool_rest_search.ctp:24
-#: View/Elements/eventattribute.ctp:147
+#: View/Elements/eventattribute.ctp:124
 #: View/Elements/Users/userIndexTable.ctp:4
-#: View/Feeds/index.ctp:125
+#: View/Feeds/index.ctp:126
 #: View/Feeds/preview_event.ctp:13
-#: View/Feeds/preview_index.ctp:38
+#: View/Feeds/preview_index.ctp:34
+#: View/GalaxyClusterBlocklists/index.ctp:34
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_index.ctp:50
+#: View/Servers/preview_event.ctp:5
+#: View/Users/admin_index.ctp:69
 #: View/Users/registrations.ctp:66
 msgid "Org"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:8
-#: View/Elements/Events/View/row_attribute.ctp:71
-#: View/EventBlacklists/add.ctp:24
-#: View/EventBlacklists/edit.ctp:25
+#: View/Elements/Events/View/row_attribute.ctp:83
+#: View/EventBlocklists/add.ctp:24
+#: View/EventBlocklists/edit.ctp:25
 #: View/EventDelegations/index.ctp:78
 #: View/Events/add_misp_export_result.ctp:5
-#: View/Events/resolved_misp_format.ctp:51
+#: View/Events/resolved_misp_format.ctp:53
+#: View/ShadowAttributes/index.ctp:69
 msgid "Event info"
 msgstr ""
 
@@ -5644,7 +7416,7 @@ msgid "Event date"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:509
+#: View/Events/view.ctp:507
 msgid "Event graph"
 msgstr ""
 
@@ -5667,8 +7439,6 @@ msgid "Choose a category and a type, then paste a list of IOCs that match the se
 msgstr ""
 
 #: 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 ""
@@ -5685,9 +7455,7 @@ msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:33;41
 #: View/Attributes/ajax/attributeEditMassForm.ctp:80
-#: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
-#: View/ShadowAttributes/add.ctp:57
 #: 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
@@ -5705,58 +7473,19 @@ msgstr ""
 msgid "Replaceattributes"
 msgstr ""
 
-#: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:85
-#: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_galaxy_matrix.ctp:76;211
-#: View/Elements/genericElements/Form/submitButton.ctp:8;25
-#: View/Events/contact.ctp:29
-#: View/Events/free_text_import.ctp:27
-#: View/Events/resolved_misp_format.ctp:386
-#: View/News/add.ctp:33
-#: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:131
-#: View/Objects/add.ctp:166
-#: View/Objects/ajax/quickAddAttributeForm.ctp:119
-#: View/Organisations/admin_add.ctp:48
-#: View/Organisations/admin_edit.ctp:59
-#: View/Posts/add.ctp:66
-#: View/Posts/edit.ctp:20
-#: View/Servers/add.ctp:129
-#: View/Servers/edit.ctp:171
-#: View/Servers/ondemand_action.ctp:54
-#: 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/UserSettings/set_setting.ctp:36
-#: View/Users/admin_add.ctp:98
-#: 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/Users/statistics_galaxymatrix.ctp:31
-#: View/Whitelists/admin_edit.ctp:13
-msgid "Submit"
-msgstr ""
-
 #: View/Attributes/attribute_replace.ctp:44
 #: View/Attributes/ajax/attributeEditMassForm.ctp:89
 #: 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/tagRemoveConfirmation.ctp:22
 #: View/Attributes/ajax/toggle_correlation.ctp:25
-#: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
-#: View/Elements/view_galaxy_matrix.ctp:212
-#: View/Elements/genericElements/infoModal.ctp:40
-#: View/Elements/genericElements/Form/submitButton.ctp:13
+#: View/Elements/view_galaxy_matrix.ctp:210
+#: View/Elements/genericElements/infoModal.ctp:45
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:50
+#: View/Elements/genericElements/Form/submitButton.ctp:14
+#: View/Elements/markdownEditor/markdownEditor.ctp:135
 #: View/Elements/serverRuleElements/pull.ctp:73
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -5765,21 +7494,21 @@ msgstr ""
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/resolved_misp_format.ctp:387
+#: View/Events/resolved_misp_format.ctp:438
 #: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:35
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:33
 #: 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/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:26
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:30
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/add.ctp:135
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/Objects/add.ctp:172
-#: View/Objects/revise_object.ctp:112
+#: View/Objects/add.ctp:184
+#: View/Objects/revise_object.ctp:105
 #: View/Objects/ajax/delete.ctp:24
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:27
 #: View/Organisations/ajax/merge.ctp:71
@@ -5787,7 +7516,6 @@ msgstr ""
 #: 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:69
 #: View/ShadowAttributes/edit.ctp:68
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
@@ -5811,6 +7539,8 @@ msgstr ""
 #: View/Users/ajax/fetchpgpkey.ctp:26
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
+#: View/genericTemplates/confirm.ctp:18
+#: View/genericTemplates/delete.ctp:16;29
 msgid "Cancel"
 msgstr ""
 
@@ -5822,26 +7552,10 @@ msgstr ""
 msgid "No Failed Composites"
 msgstr ""
 
-#: View/Attributes/edit.ctp:13
-#: View/ShadowAttributes/add.ctp:16
-#: View/ShadowAttributes/edit.ctp:14
-msgid "Type "
-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:66
-#: View/ShadowAttributes/edit.ctp:56;65
-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/Attributes/ajax/hover_enrichment.ctp:33
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:521
+#: View/Events/view.ctp:522
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -5882,245 +7596,69 @@ msgstr ""
 msgid "Results for all attributes"
 msgstr ""
 
-#: View/Attributes/index.ctp:39;128
-#: View/DecayingModel/decaying_tool_rest_search.ctp:12;64
-#: View/DecayingModel/index.ctp:13;169
-#: View/Elements/eventattribute.ctp:60;247
-#: 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;87
-#: View/Elements/Servers/eventattribute.ctp:20;87
-#: View/Elements/genericElements/IndexTable/pagination.ctp:14
-#: View/EventBlacklists/index.ctp:13;85
-#: 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/preview_index.ctp:14;89
-#: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:31;188
-#: 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;143
-#: 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;105
-#: View/Roles/index.ctp:13;68
-#: View/Servers/index.ctp:13;202
-#: View/Servers/preview_index.ctp:15;190
-#: View/ShadowAttributes/index.ctp:12;128
-#: View/SharingGroups/index.ctp:13;107
-#: View/Tags/index.ctp:21;141
-#: View/Tasks/index.ctp:18;106
-#: View/Taxonomies/index.ctp:13;65
-#: View/Taxonomies/view.ctp:53;181
-#: View/Templates/index.ctp:13;61
-#: View/Threads/index.ctp:13;98
-#: 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;130
-#: View/DecayingModel/decaying_tool_rest_search.ctp:14;66
-#: View/DecayingModel/index.ctp:15;171
-#: View/Elements/eventattribute.ctp:62;249
-#: 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;89
-#: View/Elements/Servers/eventattribute.ctp:22;89
-#: View/Elements/genericElements/IndexTable/pagination.ctp:16
-#: View/EventBlacklists/index.ctp:15;87
-#: 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/preview_index.ctp:16;91
-#: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:33;190
-#: 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;145
-#: 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;107
-#: View/Roles/index.ctp:15;70
-#: View/Servers/index.ctp:15;204
-#: View/Servers/preview_index.ctp:17;192
-#: View/ShadowAttributes/index.ctp:14;130
-#: View/SharingGroups/index.ctp:15;109
-#: View/Tags/index.ctp:23;143
-#: View/Tasks/index.ctp:20;108
-#: View/Taxonomies/index.ctp:15;67
-#: View/Taxonomies/view.ctp:55;183
-#: View/Templates/index.ctp:15;63
-#: View/Threads/index.ctp:15;100
-#: 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:47
+#: View/Attributes/index.ctp:41
 #: View/DecayingModel/decaying_tool_rest_search.ctp:23
-#: View/Elements/eventattribute.ctp:139
+#: View/Elements/eventattribute.ctp:120
 #: View/Elements/Feeds/eventattribute.ctp:41
-#: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/proposal_event_index.ctp:30
-#: View/Events/view.ctp:143
+#: View/Elements/Servers/eventattribute.ctp:38
+#: View/Events/proposal_event_index.ctp:24
+#: View/Events/view.ctp:116
 #: View/Feeds/preview_event.ctp:25
 #: View/Objects/group_attributes_into_object.ctp:56
 #: 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
+#: View/Servers/preview_event.ctp:20
+#: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Date"
 msgstr ""
 
-#: View/Attributes/index.ctp:54
+#: View/Attributes/index.ctp:48
 #: View/DecayingModel/decaying_tool_rest_search.ctp:30
-#: View/Elements/eventattribute.ctp:158
-#: View/Elements/global_menu.ctp:94
-#: View/Events/view.ctp:533
+#: View/Elements/eventattribute.ctp:135
+#: View/Elements/global_menu.ctp:128
+#: View/Events/view.ctp:534
 #: View/Events/ajax/ajaxGalaxies.ctp:6
 #: View/TagCollections/index.ctp:11
 msgid "Galaxies"
 msgstr ""
 
-#: View/Attributes/index.ctp:56
-#: View/Elements/eventattribute.ctp:160
+#: View/Attributes/index.ctp:50
+#: View/Elements/eventattribute.ctp:137
 msgid "Correlate"
 msgstr ""
 
-#: View/Attributes/index.ctp:57
-#: View/Elements/eventattribute.ctp:161
+#: View/Attributes/index.ctp:51
+#: View/Elements/eventattribute.ctp:138
 #: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-#: View/Events/view.ctp:372
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/view.ctp:364
 #: View/Feeds/preview_event.ctp:73
 #: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
+#: View/Servers/preview_event.ctp:68
 msgid "Related Events"
 msgstr ""
 
-#: View/Attributes/index.ctp:58
-#: View/Elements/eventattribute.ctp:162
+#: View/Attributes/index.ctp:52
+#: View/Elements/eventattribute.ctp:139
 #: View/Elements/Feeds/eventattribute.ctp:49
-#: View/Elements/Servers/eventattribute.ctp:49
+#: View/Elements/Servers/eventattribute.ctp:46
 msgid "Feed hits"
 msgstr ""
 
-#: View/Attributes/index.ctp:61
+#: View/Attributes/index.ctp:55
 #: View/DecayingModel/decaying_tool_rest_search.ctp:33
-#: View/Elements/eventattribute.ctp:165
-#: View/Events/view.ctp:252
+#: View/Elements/eventattribute.ctp:142
+#: View/Events/view.ctp:246
 msgid "Sightings"
 msgstr ""
 
-#: View/Attributes/index.ctp:62
-#: View/Elements/eventattribute.ctp:166
-#: View/Events/view.ctp:262
-#: View/GalaxyClusters/ajax/index.ctp:52
-#: View/Tags/index.ctp:73
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:143
+#: View/Events/view.ctp:255
+#: View/GalaxyClusters/ajax/index.ctp:126
+#: View/Tags/index.ctp:101
 msgid "Activity"
 msgstr ""
 
-#: View/Attributes/index.ctp:63
-#: View/DecayingModel/index.ctp:99
-#: View/Elements/eventattribute.ctp:184
-#: View/Elements/Events/eventIndexTable.ctp:60
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/genericElements/IndexTable/headers.ctp:33
-#: 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:55
-#: View/Events/export.ctp:26
-#: View/Events/resolved_attributes.ctp:54
-#: View/Feeds/preview_index.ctp:45
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:72
-#: 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:36
-#: View/Servers/index.ctp:41
-#: View/Servers/preview_index.ctp:106
-#: View/SharingGroups/add.ctp:74;94
-#: View/SharingGroups/edit.ctp:74;102
-#: View/SharingGroups/index.ctp:48
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/TagCollections/index.ctp:16
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:28
-#: 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:121
-#: View/DecayingModel/decaying_tool_rest_search.ctp:57
-#: View/DecayingModel/index.ctp:162
-#: View/Elements/eventdiscussion.ctp:119
-#: View/Elements/generic_table.ctp:53
-#: View/Elements/generic_table_row.ctp:45
-#: View/Elements/genericElements/IndexTable/pagination_counter.ctp:5
-#: View/EventBlacklists/index.ctp:78
-#: View/Events/index.ctp:108
-#: View/Events/proposal_event_index.ctp:88
-#: View/Events/ajax/index.ctp:32
-#: View/Feeds/preview_index.ctp:81
-#: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:181
-#: 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:136
-#: 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:98
-#: View/Roles/index.ctp:61
-#: View/Servers/index.ctp:195
-#: View/Servers/preview_index.ctp:182
-#: View/ShadowAttributes/index.ctp:121
-#: View/SharingGroups/index.ctp:100
-#: View/Tags/index.ctp:134
-#: View/Tasks/index.ctp:99
-#: View/Taxonomies/index.ctp:58
-#: View/Taxonomies/view.ctp:174
-#: View/Templates/index.ctp:54
-#: View/Threads/index.ctp:91
-#: 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 ""
@@ -6134,8 +7672,9 @@ msgid "Value found: "
 msgstr ""
 
 #: View/Attributes/report_validation_issues_attributes.ctp:10
+#: View/Elements/healthElements/diagnostics.ctp:136
 #: View/Elements/templateElements/populateTemplateFile.ctp:21
-#: View/Errors/error403.ctp:3
+#: View/Errors/error403.ctp:4
 msgid "Error"
 msgstr ""
 
@@ -6172,7 +7711,7 @@ msgid "From the following organisation(s)"
 msgstr ""
 
 #: View/Attributes/search.ctp:29
-msgid "Only find IOCs flagged as to_ids"
+msgid "Only find IOCs flagged as to IDS"
 msgstr ""
 
 #: View/Attributes/search.ctp:33
@@ -6180,7 +7719,7 @@ msgid "Alternate Search Result (Events)"
 msgstr ""
 
 #: View/Attributes/search.ctp:47
-msgid "First seen and Last seen."
+msgid "First seen and Last seen"
 msgstr ""
 
 #: View/Attributes/search.ctp:48
@@ -6199,33 +7738,6 @@ msgstr ""
 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;98
-#: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/TagCollections/index_row.ctp:45
-#: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
-#: View/Elements/healthElements/files.ctp:73
-#: View/EventBlacklists/index.ctp:70
-#: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
-#: View/Events/view_graph.ctp:31
-#: View/Feeds/index.ctp:292
-#: View/News/index.ctp:24
-#: View/ObjectReferences/ajax/delete.ctp:32
-#: View/ObjectTemplates/index.ctp:125
-#: View/Objects/ajax/delete.ctp:19
-#: View/OrgBlacklists/index.ctp:37
-#: View/Organisations/index.ctp:140
-#: View/Pages/doc/using_the_system.ctp:192
-#: View/Regexp/admin_index.ctp:35
-#: View/Roles/admin_index.ctp:90
-#: View/Servers/index.ctp:183
-#: View/SharingGroups/index.ctp:89
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Delete"
-msgstr ""
-
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
@@ -6255,29 +7767,31 @@ msgid "Do not alter current settings"
 msgstr ""
 
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
-#: View/Elements/eventattributecreation.ctp:30
+#: View/Elements/GalaxyClusters/relations_graph.ctp:429
+#: View/EventReports/index.ctp:74
+#: View/EventReports/view.ctp:15
+#: View/EventReports/ajax/indexForEvent.ctp:97
 #: View/Events/resolved_attributes.ctp:51
-#: View/Events/resolved_misp_format.ctp:98;293
-#: View/Events/view.ctp:159
+#: View/Events/resolved_misp_format.ctp:96;149;344
+#: View/Events/view.ctp:152
 #: View/Feeds/add.ctp:189
 #: View/Feeds/edit.ctp:191
-#: View/Feeds/freetext_index.ctp:36
-#: View/Feeds/index.ctp:184
-#: View/Objects/add.ctp:47;118;214
+#: View/Feeds/freetext_index.ctp:32
+#: View/Feeds/index.ctp:185
+#: View/GalaxyClusterRelations/index.ctp:107
+#: View/GalaxyClusters/view.ctp:57
+#: View/GalaxyClusters/view_relations.ctp:42;109
+#: View/GalaxyClusters/ajax/index.ctp:174
+#: View/Objects/add.ctp:51;130;226
 #: View/Objects/group_attributes_into_object.ctp:12;59
-#: View/Objects/revise_object.ctp:35;69
+#: View/Objects/revise_object.ctp:11;59
 #: View/Pages/doc/using_the_system.ctp:34;90;126;186;211;237
-#: View/Servers/preview_event.ctp:53
+#: View/Servers/preview_event.ctp:33
 #: View/Templates/populate_event_from_template_attributes.ctp:11
-#: View/Threads/index.ctp:27
+#: View/Threads/index.ctp:20
 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:38
 msgid "Create proposals"
 msgstr ""
@@ -6347,19 +7861,33 @@ msgstr ""
 msgid "Export as %s"
 msgstr ""
 
-#: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
-msgid "Remove Tag"
+#: View/Attributes/ajax/hover_enrichment.ctp:14
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:68
+msgid "Error: %s"
+msgstr ""
+
+#: View/Attributes/ajax/hover_enrichment.ctp:18
+msgid "Empty results"
+msgstr ""
+
+#: View/Attributes/ajax/hover_enrichment.ctp:23
+msgid "Object: %s"
+msgstr ""
+
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:7
+msgid "Remove %s tag %s from %s %s?"
 msgstr ""
 
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
-msgid "Remove tag "
+#: View/Servers/id_translator.ctp:22
+msgid "local"
 msgstr ""
 
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
-msgid "from "
+msgid "global"
 msgstr ""
 
-#: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 msgid "Remove"
 msgstr ""
 
@@ -6379,6 +7907,461 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
+#: View/AuthKeys/add.ctp:4
+msgid "Add auth key"
+msgstr ""
+
+#: View/AuthKeys/add.ctp:5
+msgid "Auth keys are used for API access. A user can have more than one authkey, so if you would like to use separate keys per tool that queries MISP, add additional keys. Use the comment field to make identifying your keys easier."
+msgstr ""
+
+#: View/AuthKeys/add.ctp:15
+#: View/AuthKeys/index.ctp:68
+#: View/AuthKeys/view.ctp:45
+#: View/DecayingModel/decaying_tool_rest_search.ctp:31
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/resolved_misp_format.ctp:148;343
+#: View/GalaxyClusterBlocklists/add.ctp:38
+#: View/GalaxyClusterBlocklists/index.ctp:56
+#: View/Inbox/index.ctp:36
+#: View/ObjectReferences/ajax/add.ctp:30
+#: View/Objects/add.ctp:71;131
+#: View/Objects/group_attributes_into_object.ctp:30
+#: View/Objects/revise_object.ctp:12;57
+#: View/Pages/doc/using_the_system.ctp:234;284
+#: View/Templates/populate_event_from_template_attributes.ctp:9
+#: View/Users/registrations.ctp:88
+msgid "Comment"
+msgstr ""
+
+#: View/AuthKeys/add.ctp:20
+msgid "Expiration (%s)"
+msgstr ""
+
+#: View/AuthKeys/add.ctp:20
+msgid "keep empty for maximal validity of %s days"
+msgstr ""
+
+#: View/AuthKeys/add.ctp:20
+msgid "keep empty for indefinite"
+msgstr ""
+
+#: View/AuthKeys/authkey_display.ctp:7;21
+msgid "Auth key created"
+msgstr ""
+
+#: View/AuthKeys/authkey_display.ctp:10;22
+msgid "Please make sure that you note down the auth key below, this is the only time the auth key is shown in plain text, so make sure you save it. If you lose the key, simply remove the entry and generate a new one."
+msgstr ""
+
+#: View/AuthKeys/authkey_display.ctp:11;23
+msgid "MISP will use the first and the last 4 characters for identification purposes."
+msgstr ""
+
+#: View/AuthKeys/authkey_display.ctp:15;25
+msgid "I have noted down my key, take me back now"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:14
+msgid "Add authentication key"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:29
+#: View/Cerebrates/index.ctp:70
+#: View/Cerebrates/preview_orgs.ctp:45
+#: View/Communities/index.ctp:25
+#: View/CorrelationExclusions/index.ctp:45
+#: View/Dashboards/list_templates.ctp:10
+#: View/EventBlocklists/index.ctp:28
+#: View/EventDelegations/index.ctp:41
+#: View/EventReports/index.ctp:33
+#: View/Events/index.ctp:89
+#: View/Feeds/index.ctp:67
+#: View/Feeds/preview_index.ctp:21
+#: View/Feeds/search_caches.ctp:26
+#: View/Galaxies/index.ctp:10
+#: View/GalaxyClusterBlocklists/index.ctp:19
+#: View/GalaxyClusterRelations/index.ctp:30
+#: View/GalaxyClusters/ajax/index.ctp:59
+#: View/Inbox/index.ctp:10
+#: View/ObjectTemplates/index.ctp:40
+#: View/Organisations/index.ctp:68
+#: View/Roles/index.ctp:133
+#: View/Servers/preview_index.ctp:60
+#: View/ShadowAttributes/index.ctp:25
+#: View/SharingGroups/index.ctp:36
+#: View/Sightingdb/index.ctp:10
+#: View/Tags/index.ctp:25
+#: View/Taxonomies/index.ctp:29
+#: View/Taxonomies/view.ctp:45
+#: View/Users/admin_index.ctp:55
+#: View/Users/registrations.ctp:26
+#: View/Warninglists/index.ctp:37
+msgid "Filter"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:30
+#: View/Cerebrates/index.ctp:71
+#: View/Cerebrates/preview_orgs.ctp:46
+#: View/Communities/index.ctp:26
+#: View/CorrelationExclusions/index.ctp:46
+#: View/Dashboards/list_templates.ctp:11
+#: View/Elements/eventattributetoolbar.ctp:231
+#: View/EventBlocklists/index.ctp:29
+#: View/EventDelegations/index.ctp:42
+#: View/EventReports/index.ctp:34
+#: View/Events/index.ctp:90
+#: View/Feeds/index.ctp:68
+#: View/Feeds/preview_index.ctp:22
+#: View/Feeds/search_caches.ctp:27
+#: View/Galaxies/index.ctp:11
+#: View/GalaxyClusterBlocklists/index.ctp:20
+#: View/GalaxyClusterRelations/index.ctp:31
+#: View/GalaxyClusters/ajax/index.ctp:60
+#: View/Inbox/index.ctp:11
+#: View/ObjectTemplates/index.ctp:41
+#: View/Organisations/index.ctp:69
+#: View/Roles/index.ctp:134
+#: View/Servers/preview_index.ctp:61
+#: View/ShadowAttributes/index.ctp:26
+#: View/SharingGroups/index.ctp:37
+#: View/Sightingdb/index.ctp:11
+#: View/Tags/index.ctp:26
+#: View/Taxonomies/index.ctp:30
+#: View/Users/admin_index.ctp:56
+#: View/Users/registrations.ctp:27
+#: View/Warninglists/index.ctp:38
+msgid "Enter value to search"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:56
+#: View/AuthKeys/view.ctp:54
+#: View/Users/statistics_sightings.ctp:13
+msgid "Expiration"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:73
+msgid "Authentication key Index"
+msgstr ""
+
+#: View/AuthKeys/index.ctp:74
+msgid "A list of API keys bound to a user."
+msgstr ""
+
+#: View/AuthKeys/index.ctp:92
+msgid "Delete auth key"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:25
+#: View/Elements/Events/eventIndexTable.ctp:34
+#: View/Elements/Users/userIndexTable.ctp:3
+#: View/EventReports/index.ctp:48
+#: View/EventReports/view.ctp:3
+#: View/EventReports/ajax/indexForEvent.ctp:71
+#: View/Events/get_event_info_by_id.ctp:12
+#: View/Feeds/index.ctp:85
+#: View/Feeds/view.ctp:3
+#: View/GalaxyClusters/ajax/index.ctp:67
+#: View/ObjectTemplates/view.ctp:3
+#: View/Objects/add.ctp:214
+#: View/Objects/group_attributes_into_object.ctp:54
+#: View/Organisations/view.ctp:5
+#: View/Organisations/ajax/merge.ctp:56;63
+#: View/Pages/doc/using_the_system.ctp:163;203
+#: View/Roles/index.ctp:4
+#: View/Servers/compare_servers.ctp:4
+#: View/Servers/index.ctp:14
+#: View/ShadowAttributes/index.ctp:34
+#: View/SharingGroups/index.ctp:49
+#: View/SharingGroups/view.ctp:6
+#: View/Tags/index.ctp:34
+#: View/Taxonomies/index.ctp:37
+#: View/Taxonomies/view.ctp:14
+#: View/Users/admin_index.ctp:63
+#: View/Users/view.ctp:3
+#: View/Warninglists/index.ctp:48
+msgid "ID"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:29
+#: View/Cerebrates/preview_orgs.ctp:15
+#: View/Communities/view.ctp:5
+#: View/Dashboards/list_templates.ctp:25
+#: View/Elements/Events/View/row_object.ctp:61
+#: View/Elements/GalaxyClusters/relations_graph.ctp:440
+#: View/EventReports/view.ctp:4
+#: View/Events/resolved_misp_format.ctp:94;144;339
+#: View/Events/show_i_o_c_results.ctp:10;32
+#: View/Feeds/preview_event.ctp:11
+#: View/Galaxies/view.ctp:8
+#: View/GalaxyClusters/view.ctp:48
+#: View/ObjectTemplates/index.ctp:59
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:58
+#: View/OrgBlocklists/index.ctp:16
+#: View/Organisations/admin_add.ctp:21
+#: View/Organisations/admin_edit.ctp:20
+#: View/Organisations/view.ctp:7
+#: View/Organisations/ajax/merge.ctp:58;65
+#: View/Pages/doc/using_the_system.ctp:204
+#: View/Servers/id_translator.ctp:45
+#: View/Servers/preview_event.ctp:4
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+#: View/SharingGroups/index.ctp:57
+#: View/SharingGroups/view.ctp:7
+#: View/TagCollections/index.ctp:8
+msgid "UUID"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:49
+#: View/Elements/Users/userIndexTable.ctp:19
+#: View/GalaxyClusterBlocklists/index.ctp:44
+#: View/Pages/doc/administration.ctp:183
+#: View/Pages/doc/using_the_system.ctp:272
+#: View/ShadowAttributes/index.ctp:92
+#: View/Users/admin_index.ctp:145
+#: View/Users/view.ctp:104
+msgid "Created"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:59
+msgid "Key usage"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:68
+msgid "Last used"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:69
+msgid "Not used yet"
+msgstr ""
+
+#: View/AuthKeys/view.ctp:73
+msgid "Unique IPs"
+msgstr ""
+
+#: View/Cerebrates/add.ctp:31
+msgid "Pull Organisations"
+msgstr ""
+
+#: View/Cerebrates/add.ctp:36
+msgid "Pull Sharing Groups"
+msgstr ""
+
+#: View/Cerebrates/add.ctp:43
+msgid "Edit Cerebrate connection"
+msgstr ""
+
+#: View/Cerebrates/add.ctp:43
+msgid "Add Cerebrate connection"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:4
+#: View/Cerebrates/preview_orgs.ctp:4
+#: View/Cerebrates/view.ctp:9
+#: View/Communities/index.ctp:34
+#: View/Communities/view.ctp:4
+#: View/Dashboards/list_templates.ctp:19
+#: View/EventDelegations/index.ctp:50
+#: View/Feeds/search_caches.ctp:35
+#: View/GalaxyClusterBlocklists/index.ctp:28
+#: View/GalaxyClusterRelations/index.ctp:39
+#: View/GalaxyClusters/view_relations.ctp:8
+#: View/Inbox/index.ctp:19
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:5
+#: View/Sightingdb/index.ctp:26
+#: View/Templates/view.ctp:4
+#: View/UserSettings/index.ctp:50
+#: View/Users/registrations.ctp:39
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:9
+#: View/GalaxyClusterRelations/index.ctp:85
+#: View/GalaxyClusters/ajax/index.ctp:98
+#: View/Pages/doc/using_the_system.ctp:162
+#: View/Servers/preview_event.ctp:6
+msgid "Owner Org"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:15
+#: View/Cerebrates/preview_orgs.ctp:20
+#: View/Cerebrates/view.ctp:13
+#: View/Communities/view.ctp:6
+#: View/Dashboards/list_templates.ctp:37
+#: View/DecayingModel/index.ctp:81
+#: View/DecayingModel/view.ctp:14
+#: View/Elements/Events/View/row_attribute.ctp:214
+#: View/Elements/GalaxyClusters/relations_graph.ctp:425
+#: View/Elements/Servers/View/row_object.ctp:19
+#: View/Elements/templateElements/templateRowAttribute.ctp:12
+#: View/Elements/templateElements/templateRowFile.ctp:12
+#: View/Elements/templateElements/templateRowText.ctp:12
+#: View/EventReports/index.ctp:56
+#: View/EventReports/ajax/indexForEvent.ctp:77
+#: View/Events/resolved_misp_format.ctp:93
+#: View/Events/view.ctp:408
+#: View/Feeds/index.ctp:108
+#: View/Feeds/search_caches.ctp:47
+#: View/Feeds/view.ctp:4
+#: View/Galaxies/index.ctp:37
+#: View/Galaxies/view.ctp:6
+#: View/GalaxyClusters/add.ctp:27
+#: View/GalaxyClusters/view.ctp:42
+#: View/ObjectTemplates/view.ctp:4
+#: View/Objects/add.ctp:218
+#: View/Objects/revise_object.ctp:8
+#: View/Organisations/ajax/merge.ctp:57;64
+#: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
+#: View/Roles/index.ctp:26
+#: View/Roles/view.ctp:9
+#: View/Servers/compare_servers.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
+#: View/SharingGroups/index.ctp:63
+#: View/SharingGroups/view.ctp:8;46;71
+#: View/Sightingdb/index.ctp:51
+#: View/Tags/index.ctp:54
+#: View/Templates/view.ctp:9
+#: View/Users/statistics_orgs.ctp:33
+#: View/Warninglists/index.ctp:56
+#: View/Warninglists/view.ctp:10
+msgid "Name"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:20
+#: View/Cerebrates/view.ctp:17
+#: View/Elements/Events/View/row_attribute.ctp:215
+#: View/EventReports/ajax/importReportFromUrl.ctp:13
+#: View/Events/automation.ctp:286
+#: View/Events/legacy_automation.ctp:394
+#: View/Events/view.ctp:409
+#: View/Feeds/add.ctp:53
+#: View/Feeds/edit.ctp:84
+#: View/Feeds/index.ctp:139
+#: View/Feeds/view.ctp:5
+#: View/Pages/doc/using_the_system.ctp:445
+#: View/Servers/compare_servers.ctp:4
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
+#: View/SharingGroups/view.ctp:72
+msgid "URL"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:25
+#: View/Cerebrates/view.ctp:30
+#: View/Communities/index.ctp:59
+#: View/Dashboards/list_templates.ctp:43
+#: View/Dashboards/save_template.ctp:21
+#: View/DecayingModel/index.ctp:82
+#: View/DecayingModel/view.ctp:21
+#: View/Elements/GalaxyClusters/relations_graph.ctp:427
+#: View/Elements/Servers/View/row_object.ctp:24
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
+#: 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:26
+#: View/Galaxies/index.ctp:53
+#: View/Galaxies/view.ctp:9
+#: View/GalaxyClusters/view.ctp:44
+#: View/GalaxyClusters/ajax/index.ctp:150
+#: View/ObjectTemplates/view.ctp:10
+#: View/Objects/add.ctp:26;125;222
+#: View/Objects/group_attributes_into_object.ctp:8
+#: View/Objects/propose_objects_from_attributes.ctp:17
+#: View/Organisations/view.ctp:20
+#: 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/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:76
+#: View/SharingGroups/view.ctp:10
+#: View/Sightingdb/index.ctp:88
+#: View/TagCollections/index.ctp:15
+#: View/Taxonomies/index.ctp:49
+#: View/Taxonomies/view.ctp:16
+#: View/Templates/view.ctp:14
+#: View/Warninglists/index.ctp:67
+#: View/Warninglists/view.ctp:11
+msgid "Description"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:30
+msgid "Pull Orgs"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:36
+msgid "Pull SGs"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:56
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:818
+msgid "Add Cerebrate"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:78
+msgid "Linked Cerebrates"
+msgstr ""
+
+#: View/Cerebrates/index.ctp:79
+msgid "You can connect your MISP to one or several Cerebrate instances to act as lookup directories for organisation and sharing group information."
+msgstr ""
+
+#: View/Cerebrates/index.ctp:92
+msgid "Pull all organisations"
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:9
+#: View/Elements/Servers/Module/type.ctp:11
+#: View/Elements/healthElements/diagnostics.ctp:419
+#: View/Pages/doc/administration.ctp:56;228
+#: View/Servers/ajax/submoduleStatus.ctp:6
+msgid "Status"
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:25
+#: View/Organisations/view.ctp:45
+#: View/Users/statistics_orgs.ctp:39
+msgid "Sector"
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:30
+#: View/Organisations/view.ctp:41
+#: View/Users/statistics_orgs.ctp:37
+msgid "Nationality"
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:54
+msgid "Organisations list via Cerebrate %s (%s)"
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:59
+msgid "Preview of the organisations known to the remote Cerebrate instance."
+msgstr ""
+
+#: View/Cerebrates/preview_orgs.ctp:69
+msgid "Fetch organisation object"
+msgstr ""
+
+#: View/Cerebrates/view.ctp:23
+#: View/GalaxyClusters/view.ctp:62
+msgid "Owner Organisation"
+msgstr ""
+
+#: View/Cerebrates/view.ctp:39
+msgid "The Cerebrate Project"
+msgstr ""
+
 #: View/Communities/index.ctp:14
 msgid "Vetted by the MISP-project team"
 msgstr ""
@@ -6387,75 +8370,6 @@ msgstr ""
 msgid "Unvetted"
 msgstr ""
 
-#: View/Communities/index.ctp:25
-#: View/Dashboards/list_templates.ctp:10
-#: View/EventBlacklists/index.ctp:35
-#: View/EventDelegations/index.ctp:41
-#: View/Events/index.ctp:94
-#: View/Feeds/index.ctp:67
-#: View/Feeds/preview_index.ctp:25
-#: View/Feeds/search_caches.ctp:26
-#: View/Galaxies/index.ctp:25
-#: View/GalaxyClusters/ajax/index.ctp:27
-#: View/Inbox/index.ctp:10
-#: View/ObjectTemplates/index.ctp:47
-#: View/Organisations/index.ctp:75
-#: View/Servers/preview_index.ctp:64
-#: View/ShadowAttributes/index.ctp:37
-#: View/Sightingdb/index.ctp:10
-#: View/Tags/index.ctp:56
-#: View/Taxonomies/view.ctp:65
-#: View/Users/admin_index.ctp:35
-#: View/Users/registrations.ctp:26
-msgid "Filter"
-msgstr ""
-
-#: View/Communities/index.ctp:26
-#: View/Dashboards/list_templates.ctp:11
-#: View/Elements/eventattributetoolbar.ctp:231
-#: View/EventBlacklists/index.ctp:36
-#: View/EventDelegations/index.ctp:42
-#: View/Events/index.ctp:95
-#: View/Feeds/index.ctp:68
-#: View/Feeds/preview_index.ctp:26
-#: View/Feeds/search_caches.ctp:27
-#: View/Galaxies/index.ctp:26
-#: View/GalaxyClusters/ajax/index.ctp:28
-#: View/Inbox/index.ctp:11
-#: View/ObjectTemplates/index.ctp:48
-#: View/Organisations/index.ctp:76
-#: View/Servers/preview_index.ctp:65
-#: View/ShadowAttributes/index.ctp:38
-#: View/Sightingdb/index.ctp:11
-#: View/Users/admin_index.ctp:36
-#: View/Users/registrations.ctp:27
-msgid "Enter value to search"
-msgstr ""
-
-#: View/Communities/index.ctp:34
-#: View/Communities/view.ctp:4
-#: View/Dashboards/list_templates.ctp:19
-#: View/EventDelegations/index.ctp:50
-#: View/Feeds/index.ctp:85
-#: View/Feeds/search_caches.ctp:35
-#: View/Feeds/view.ctp:3
-#: View/Inbox/index.ctp:19
-#: View/ObjectTemplates/view.ctp:3
-#: View/Organisations/view.ctp:5
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:3
-#: View/Sightingdb/index.ctp:26
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/UserSettings/index.ctp:50
-#: View/Users/admin_index.ctp:44
-#: View/Users/admin_view.ctp:6
-#: View/Users/registrations.ctp:39
-#: View/Users/view.ctp:3
-#: View/Warninglists/view.ctp:9
-msgid "Id"
-msgstr ""
-
 #: View/Communities/index.ctp:40
 msgid "Vetted"
 msgstr ""
@@ -6468,46 +8382,6 @@ msgstr ""
 msgid "Community name"
 msgstr ""
 
-#: View/Communities/index.ctp:59
-#: View/Dashboards/list_templates.ctp:43
-#: View/Dashboards/save_template.ctp:21
-#: View/DecayingModel/index.ctp:89
-#: View/DecayingModel/view.ctp:21
-#: View/Elements/Servers/View/row_object.ctp:24
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
-#: 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:26
-#: View/Galaxies/index.ctp:65
-#: View/Galaxies/view.ctp:9
-#: View/GalaxyClusters/view.ctp:8
-#: View/GalaxyClusters/ajax/index.ctp:64
-#: View/ObjectTemplates/view.ctp:9
-#: View/Objects/add.ctp:22;113;210
-#: View/Objects/group_attributes_into_object.ctp:8
-#: View/Objects/propose_objects_from_attributes.ctp:17
-#: 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:46
-#: View/Sightingdb/index.ctp:88
-#: View/TagCollections/index.ctp:15
-#: View/Taxonomies/view.ctp:14
-#: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:11
-msgid "Description"
-msgstr ""
-
 #: View/Communities/index.ctp:63
 msgid "Self-reg"
 msgstr ""
@@ -6533,10 +8407,10 @@ msgid "Requestor E-mail address"
 msgstr ""
 
 #: View/Communities/request_access.ctp:15
-#: View/Jobs/index.ctp:104
-#: View/OrgBlacklists/add.ctp:17
-#: View/OrgBlacklists/index.ctp:22
-#: View/Organisations/view.ctp:6
+#: View/Jobs/index.ctp:97
+#: View/OrgBlocklists/add.ctp:18
+#: View/OrgBlocklists/index.ctp:15
+#: View/Organisations/view.ctp:11
 msgid "Organisation name"
 msgstr ""
 
@@ -6553,6 +8427,7 @@ msgid "Message to the community host organisation"
 msgstr ""
 
 #: View/Communities/request_access.ctp:37
+#: View/Elements/footer.ctp:15;17
 msgid "PGP public key"
 msgstr ""
 
@@ -6588,59 +8463,7 @@ msgstr ""
 msgid "Message:"
 msgstr ""
 
-#: View/Communities/view.ctp:5
-#: View/Dashboards/list_templates.ctp:25
-#: View/Elements/Events/View/row_object.ctp:72
-#: View/Events/resolved_misp_format.ctp:93;288
-#: View/Galaxies/view.ctp:8
-#: View/GalaxyClusters/view.ctp:9
-#: View/ObjectTemplates/index.ctp:66
-#: View/ObjectTemplates/view.ctp:6
-#: View/Objects/revise_object.ctp:68
-#: View/OrgBlacklists/index.ctp:23
-#: View/Organisations/admin_add.ctp:21
-#: View/Organisations/admin_edit.ctp:20
-#: View/Organisations/view.ctp:24
-#: View/Organisations/ajax/merge.ctp:58;65
-#: View/SharingGroups/add.ctp:72
-#: View/SharingGroups/edit.ctp:72
-#: View/SharingGroups/index.ctp:43
-#: View/TagCollections/index.ctp:8
-msgid "UUID"
-msgstr ""
-
-#: View/Communities/view.ctp:6
-#: View/Dashboards/list_templates.ctp:37
-#: View/DecayingModel/index.ctp:88
-#: View/DecayingModel/view.ctp:14
-#: View/Elements/Servers/View/row_object.ctp:19
-#: View/Elements/templateElements/templateRowAttribute.ctp:12
-#: View/Elements/templateElements/templateRowFile.ctp:12
-#: View/Elements/templateElements/templateRowText.ctp:12
-#: View/Feeds/index.ctp:108
-#: View/Feeds/search_caches.ctp:47
-#: View/Feeds/view.ctp:4
-#: View/Galaxies/index.ctp:49
-#: View/Galaxies/view.ctp:6
-#: View/GalaxyClusters/view.ctp:6
-#: View/ObjectTemplates/view.ctp:4
-#: View/Objects/add.ctp:206
-#: View/Objects/revise_object.ctp:27
-#: 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/Sightingdb/index.ctp:51
-#: View/Templates/view.ctp:9
-#: View/Users/statistics_orgs.ctp:33
-#: View/Warninglists/view.ctp:10
-msgid "Name"
-msgstr ""
-
 #: View/Communities/view.ctp:7
-#: View/SharingGroups/view.ctp:68
 msgid "Url"
 msgstr ""
 
@@ -6653,12 +8476,6 @@ msgid "Vetted by MISP-project"
 msgstr ""
 
 #: View/Communities/view.ctp:27
-#: View/Elements/footer.ctp:15
-#: View/Users/admin_add.ctp:70
-#: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:72
-#: View/Users/edit.ctp:23
-#: View/Users/view.ctp:32
 msgid "GnuPG key"
 msgstr ""
 
@@ -6667,12 +8484,62 @@ msgid "Community "
 msgstr ""
 
 #: View/Communities/view.ctp:51
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:665
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:766
 msgid "Request Access"
 msgstr ""
 
+#: View/CorrelationExclusions/add.ctp:4
+msgid "Add Correlation Exclusion Entry"
+msgstr ""
+
+#: View/CorrelationExclusions/add.ctp:5
+msgid "If you wish to exclude certain entries from being correlated on, simply add an entry here."
+msgstr ""
+
+#: View/CorrelationExclusions/add.ctp:9
+#: View/DecayingModel/decaying_tool_rest_search.ctp:27
+#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
+#: 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/resolved_misp_format.ctp:143;338
+#: View/Events/show_i_o_c_results.ctp:13
+#: View/Feeds/freetext_index.ctp:29
+#: View/GalaxyClusters/update_cluster.ctp:19;47;85
+#: View/GalaxyClusters/ajax/index.ctp:83
+#: View/GalaxyElements/ajax/index.ctp:56
+#: View/Noticelists/view.ctp:42
+#: View/Objects/add.ctp:127;245
+#: View/Objects/group_attributes_into_object.ctp:58
+#: View/Objects/revise_object.ctp:55
+#: View/Objects/ajax/quickAddAttributeForm.ctp:78
+#: 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/UserSettings/index.ctp:68
+#: View/Users/admin_filter_user_index.ctp:71
+msgid "Value"
+msgstr ""
+
+#: View/CorrelationExclusions/index.ctp:14
+msgid "Add correlation exclusion entry"
+msgstr ""
+
+#: View/CorrelationExclusions/index.ctp:71
+msgid "Correlation Exclusions Index"
+msgstr ""
+
+#: View/CorrelationExclusions/index.ctp:72
+msgid "A list of values to exclude from the correlation engine."
+msgstr ""
+
+#: View/CorrelationExclusions/index.ctp:82
+msgid "Delete correlation exclusion entry"
+msgstr ""
+
 #: View/Dashboards/add.ctp:17
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:21
 msgid "Add Widget"
 msgstr ""
 
@@ -6717,15 +8584,21 @@ msgstr ""
 
 #: View/Dashboards/list_templates.ctp:52
 #: View/Dashboards/save_template.ctp:52
-#: View/SharingGroups/view.ctp:12
+#: View/SharingGroups/view.ctp:11
 msgid "Selectable"
 msgstr ""
 
 #: View/Dashboards/list_templates.ctp:58
 #: View/Dashboards/save_template.ctp:59
-#: View/Jobs/index.ctp:71
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
+#: View/Elements/GalaxyClusters/relations_graph.ctp:428
+#: View/EventReports/index.ctp:22
+#: View/EventReports/ajax/indexForEvent.ctp:56
+#: View/GalaxyClusterRelations/index.ctp:45
+#: View/GalaxyClusters/view.ctp:46
+#: View/GalaxyClusters/view_relations.ctp:13
+#: View/GalaxyClusters/ajax/index.ctp:24;120
+#: View/Jobs/index.ctp:64
+#: View/Roles/index.ctp:9;19
 msgid "Default"
 msgstr ""
 
@@ -6827,16 +8700,16 @@ msgstr ""
 #: View/Elements/templateElements/templateRowAttribute.ctp:30
 #: View/Elements/templateElements/templateRowFile.ctp:30
 #: View/Events/resolved_attributes.ctp:47
-#: View/Events/resolved_misp_format.ctp:90;285
+#: View/Events/resolved_misp_format.ctp:141;336
 #: View/Events/show_i_o_c_results.ctp:11
-#: View/Feeds/freetext_index.ctp:31
-#: View/Objects/add.ctp:114
+#: View/Feeds/freetext_index.ctp:27
+#: View/Objects/add.ctp:126
 #: View/Objects/group_attributes_into_object.ctp:57
 #: View/Objects/propose_objects_from_attributes.ctp:16
-#: View/Objects/revise_object.ctp:63
+#: View/Objects/revise_object.ctp:53
 #: 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:65
+#: View/ShadowAttributes/index.ctp:80
 #: 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
@@ -6847,7 +8720,7 @@ msgstr ""
 
 #: View/DecayingModel/decaying_tool.ctp:25
 #: View/DecayingModel/view.ctp:3
-#: View/Logs/admin_index.ctp:75
+#: View/Logs/admin_index.ctp:68
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr ""
@@ -6872,33 +8745,6 @@ msgstr ""
 msgid "Model's Settings"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool.ctp:137
-#: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:231
-#: View/Elements/Events/View/row_attribute.ctp:413
-#: View/Elements/TagCollections/index_row.ctp:44
-#: View/Elements/Users/userIndexTable.ctp:90
-#: View/EventBlacklists/edit.ctp:37
-#: View/EventBlacklists/index.ctp:69
-#: View/Feeds/edit.ctp:220
-#: View/Feeds/index.ctp:285
-#: View/News/index.ctp:22
-#: View/OrgBlacklists/edit.ctp:30
-#: View/OrgBlacklists/index.ctp:36
-#: View/Organisations/index.ctp:138
-#: View/Pages/doc/using_the_system.ctp:191
-#: View/Regexp/admin_index.ctp:34
-#: View/Roles/admin_edit.ctp:56
-#: View/Roles/admin_index.ctp:89
-#: View/Servers/index.ctp:182
-#: View/SharingGroups/index.ctp:88
-#: View/Tags/edit.ctp:36
-#: View/Tags/index.ctp:124
-#: View/Templates/edit.ctp:49
-#: View/Whitelists/admin_index.ctp:31
-msgid "Edit"
-msgstr ""
-
 #: View/DecayingModel/decaying_tool.ctp:137
 #: View/Templates/add.ctp:49
 msgid "Create"
@@ -6933,7 +8779,7 @@ msgid "Default basescore"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_basescore.ctp:13
-#: View/Taxonomies/index.ctp:2
+#: View/Taxonomies/index.ctp:3
 msgid "Taxonomies"
 msgstr ""
 
@@ -6941,98 +8787,68 @@ msgstr ""
 msgid "Weight"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:91
+#: View/DecayingModel/decaying_tool_basescore.ctp:49
+msgid "Numerical value overriden by userSetting.&#10;Original numerical_value = %s"
+msgstr ""
+
+#: View/DecayingModel/decaying_tool_basescore.ctp:100
 msgid "Excluded"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:112
+#: View/DecayingModel/decaying_tool_basescore.ctp:121
 msgid "Placeholder for `Organisation source confidence`"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:115
+#: View/DecayingModel/decaying_tool_basescore.ctp:124
 msgid "Example"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:141;146;151
+#: View/DecayingModel/decaying_tool_basescore.ctp:150;155;160
 msgid "Pick a Taxonomy"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:157
+#: View/DecayingModel/decaying_tool_basescore.ctp:166
 msgid "Computation steps"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_basescore.ctp:160
+#: View/DecayingModel/decaying_tool_basescore.ctp:169
 msgid "Apply base score"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_rest_search.ctp:26
+#: View/Elements/GalaxyClusters/relations_graph.ctp:447
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:13
 #: View/Events/export.ctp:26
 #: View/Events/resolved_attributes.ctp:48
-#: View/Events/resolved_misp_format.ctp:91;286
+#: View/Events/resolved_misp_format.ctp:142;337
 #: View/Events/show_i_o_c_results.ctp:12
-#: View/Feeds/freetext_index.ctp:32
+#: View/Feeds/freetext_index.ctp:28
 #: View/Feeds/search_caches.ctp:41
 #: View/Inbox/index.ctp:25
-#: View/Objects/revise_object.ctp:64
+#: View/Objects/add.ctp:244
+#: View/Objects/revise_object.ctp:54
 #: 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:53;68
+#: View/ShadowAttributes/index.ctp:86
 #: View/SharingGroups/add.ctp:70
 #: View/SharingGroups/edit.ctp:70
-#: View/Sightings/ajax/list_sightings.ctp:7
+#: View/Sightings/ajax/list_sightings.ctp:11
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:38
+#: View/Warninglists/index.ctp:71
 #: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_rest_search.ctp:27
-#: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:12
-#: 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/resolved_misp_format.ctp:92;287
-#: View/Events/show_i_o_c_results.ctp:13
-#: View/Feeds/freetext_index.ctp:33
-#: View/GalaxyClusters/ajax/index.ctp:37
-#: View/Noticelists/view.ctp:42
-#: View/Objects/add.ctp:115
-#: View/Objects/group_attributes_into_object.ctp:58
-#: View/Objects/revise_object.ctp:65
-#: View/Objects/ajax/quickAddAttributeForm.ctp:78
-#: 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/UserSettings/index.ctp:68
-#: View/Users/admin_filter_user_index.ctp:71
-msgid "Value"
-msgstr ""
-
 #: View/DecayingModel/decaying_tool_rest_search.ctp:29
 msgid "Event Tags"
 msgstr ""
 
-#: View/DecayingModel/decaying_tool_rest_search.ctp:31
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/resolved_misp_format.ctp:97;292
-#: View/Inbox/index.ctp:36
-#: View/ObjectReferences/ajax/add.ctp:30
-#: View/Objects/add.ctp:67;119
-#: View/Objects/group_attributes_into_object.ctp:30
-#: View/Objects/revise_object.ctp:49;67
-#: View/Pages/doc/using_the_system.ctp:234;284
-#: View/Templates/populate_event_from_template_attributes.ctp:9
-#: View/Users/registrations.ctp:88
-msgid "Comment"
-msgstr ""
-
 #: View/DecayingModel/decaying_tool_rest_search.ctp:35
-#: View/Elements/eventattribute.ctp:179
+#: View/Elements/eventattribute.ctp:156
 msgid "Score"
 msgstr ""
 
@@ -7046,7 +8862,8 @@ msgid "Decaying Model RestSearch"
 msgstr ""
 
 #: View/DecayingModel/decaying_tool_simulation.ctp:45
-#: View/Events/automation.ctp:24
+#: View/Elements/genericElements/ListTopBar/group_search.ctp:23
+#: View/Events/automation.ctp:38
 #: View/Logs/admin_index.ctp:20;21
 #: View/Logs/admin_search.ctp:25
 msgid "Search"
@@ -7106,6 +8923,8 @@ msgstr ""
 
 #: View/DecayingModel/import.ctp:10
 #: View/Feeds/import_feeds.ctp:10
+#: View/Galaxies/import.ctp:17
+#: View/GalaxyElements/ajax/flattenJson.ctp:11
 #: View/Servers/import.ctp:10
 #: View/TagCollections/import.ctp:10
 msgid "JSON"
@@ -7116,141 +8935,129 @@ msgid "Model JSON"
 msgstr ""
 
 #: View/DecayingModel/import.ctp:18
+#: View/Galaxies/import.ctp:23
 msgid "JSON file"
 msgstr ""
 
-#: View/DecayingModel/import.ctp:25
-#: View/DecayingModelMapping/link_attribute_type_to_model.ctp:15
-#: View/Elements/genericElements/org_picker.ctp:17
-#: View/EventBlacklists/add.ctp:36
-#: View/Events/filter_event_index.ctp:125
-#: View/Feeds/add.ctp:220
-#: View/Feeds/import_feeds.ctp:20
-#: View/OrgBlacklists/add.ctp:29
-#: View/Regexp/admin_add.ctp:32
-#: View/Regexp/admin_edit.ctp:42
-#: View/Roles/admin_add.ctp:57
-#: View/Servers/import.ctp:20
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
-#: View/Sightings/ajax/add_sighting.ctp:33
-#: View/TagCollections/import.ctp:20
-#: View/Tags/add.ctp:35
-#: View/Users/admin_filter_user_index.ctp:62
-#: View/Whitelists/admin_add.ctp:13
-msgid "Add"
-msgstr ""
-
 #: View/DecayingModel/index.ctp:2
 msgid "Decaying Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:30;31
+#: View/DecayingModel/index.ctp:23;24
 msgid "All Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:41
+#: View/DecayingModel/index.ctp:34
 msgid "My models only"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:42
+#: View/DecayingModel/index.ctp:35
 msgid "My Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:53
+#: View/DecayingModel/index.ctp:46
 msgid "Models available to everyone"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:54
+#: View/DecayingModel/index.ctp:47
 msgid "Shared Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:65
+#: View/DecayingModel/index.ctp:58
 msgid "Default models only"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:66
+#: View/DecayingModel/index.ctp:59
 msgid "Default Models"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:86
+#: View/DecayingModel/index.ctp:79
 #: View/Pages/doc/using_the_system.ctp:398
 msgid "Organization"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:87
+#: View/DecayingModel/index.ctp:80
 msgid "Usable to everyone"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:91
+#: View/DecayingModel/index.ctp:84
 #: View/DecayingModel/view.ctp:40
 msgid "Parameters"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:92
+#: View/DecayingModel/index.ctp:85
 msgid "Pretty print"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:95
+#: View/DecayingModel/index.ctp:88
 #: View/DecayingModel/view.ctp:35
 msgid "Formula"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:96
+#: View/DecayingModel/index.ctp:89
 msgid "# Assigned Types"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:97
+#: View/DecayingModel/index.ctp:90
 #: View/DecayingModel/view.ctp:25
+#: View/Elements/GalaxyClusters/relations_graph.ctp:439
+#: View/Elements/genericElements/IndexTable/Fields/galaxy_cluster_link.ctp:27
 #: View/Galaxies/view.ctp:10
+#: View/GalaxyClusters/view.ctp:47
 #: View/ObjectTemplates/view.ctp:7
-#: View/Taxonomies/view.ctp:19
+#: View/Taxonomies/index.ctp:54
+#: View/Taxonomies/view.ctp:17
+#: View/Warninglists/index.ctp:61
 #: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:98
+#: View/DecayingModel/index.ctp:91
 #: View/DecayingModel/view.ctp:31
-#: View/Events/view.ctp:310
+#: View/Events/view.ctp:304
 #: View/Feeds/index.ctp:91
 #: View/Feeds/view.ctp:63
-#: View/Noticelists/index.ctp:63
-#: View/ObjectTemplates/index.ctp:35
+#: View/Noticelists/index.ctp:56
+#: View/ObjectTemplates/index.ctp:28
 #: View/Sightingdb/index.ctp:19
-#: View/Taxonomies/view.ctp:24
+#: View/Taxonomies/index.ctp:17;60
+#: View/Taxonomies/view.ctp:18
+#: View/Warninglists/index.ctp:25;89
 #: View/Warninglists/view.ctp:16
 msgid "Enabled"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:114
+#: View/DecayingModel/index.ctp:107
 #: View/DecayingModel/view.ctp:18
 msgid "Default Model from MISP Project"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:137
+#: View/DecayingModel/index.ctp:130
 msgid "Download model"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:142
+#: View/DecayingModel/index.ctp:135
 msgid "Are you sure you want to delete DecayingModel #"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:148
+#: View/DecayingModel/index.ctp:141
 msgid "Are you sure you want to disable DecayingModel #"
 msgstr ""
 
-#: View/DecayingModel/index.ctp:150
+#: View/DecayingModel/index.ctp:143
 msgid "Are you sure you want to enable DecayingModel #"
 msgstr ""
 
 #: View/DecayingModel/view.ctp:5
-#: View/Events/view.ctp:86
+#: View/Elements/Events/eventIndexTable.ctp:22
+#: View/Events/view.ctp:61
 msgid "Creator org"
 msgstr ""
 
 #: View/DecayingModel/view.ctp:27
 #: View/SharingGroups/add.ctp:93
 #: View/SharingGroups/edit.ctp:101
-#: View/SharingGroups/view.ctp:69
+#: View/SharingGroups/view.ctp:73
 #: View/TagCollections/index.ctp:12
 msgid "All orgs"
 msgstr ""
@@ -7277,9 +9084,8 @@ msgstr ""
 
 #: View/Elements/ajaxAttributeTags.ctp:29
 #: View/Elements/ajaxTagCollectionTags.ctp:16
-#: View/Elements/ajaxTags.ctp:104
+#: View/Elements/ajaxTags.ctp:92
 #: View/Elements/ajaxTemplateTag.ctp:10
-#: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr ""
 
@@ -7290,116 +9096,103 @@ msgstr ""
 msgid "Add tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:73;74
+#: View/Elements/ajaxTags.ctp:10
+msgid "Missing taxonomies: <span class=\"red bold\">%s</span><br>"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:60;61
 msgid "Local tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:73;74
+#: View/Elements/ajaxTags.ctp:60;61
 msgid "Global tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:107
+#: View/Elements/ajaxTags.ctp:95
 msgid "Remove tag %s"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:123;124
-#: View/Elements/galaxyQuickView.ctp:122
-#: View/Elements/galaxyQuickViewMini.ctp:115
+#: View/Elements/ajaxTags.ctp:110;111
+#: View/Elements/galaxyQuickView.ctp:123
+#: View/Elements/galaxyQuickViewMini.ctp:99
 #: View/Templates/add.ctp:28
 #: View/Templates/edit.ctp:28
 msgid "Add a tag"
 msgstr ""
 
-#: View/Elements/ajaxTags.ctp:141;142
-#: View/Elements/galaxyQuickView.ctp:135
-#: View/Elements/galaxyQuickViewMini.ctp:128
+#: View/Elements/ajaxTags.ctp:127;128
+#: View/Elements/galaxyQuickView.ctp:136
+#: View/Elements/galaxyQuickViewMini.ctp:112
 msgid "Add a local tag"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:67;69;254;256
+#: View/Elements/eventattribute.ctp:49;51;213;215
 #: View/Elements/Feeds/eventattribute.ctp:28;31;95;98
-#: View/Elements/Servers/eventattribute.ctp:28;31;95;98
+#: View/Elements/Servers/eventattribute.ctp:25;28;89;92
 msgid "view all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:132
+#: View/Elements/eventattribute.ctp:113
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/EventBlacklists/index.ctp:47
+#: View/EventBlocklists/index.ctp:40
 msgid "Select all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:132
+#: View/Elements/eventattribute.ctp:113
 msgid "Select all attributes/proposals on current page"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:138
+#: View/Elements/eventattribute.ctp:119
 #: View/Elements/Feeds/eventattribute.ctp:42
-#: View/Elements/Servers/eventattribute.ctp:42
-#: View/Objects/revise_object.ctp:52
+#: View/Elements/Servers/eventattribute.ctp:39
+#: View/Objects/revise_object.ctp:13
 msgid "First seen"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:138
+#: View/Elements/eventattribute.ctp:119
 #: View/Elements/Feeds/eventattribute.ctp:42
-#: View/Elements/Servers/eventattribute.ctp:42
-#: View/Objects/revise_object.ctp:56
+#: View/Elements/Servers/eventattribute.ctp:39
+#: View/Objects/revise_object.ctp:14
 msgid "Last seen"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:143
-#: View/Elements/eventdiscussion.ctp:143
-#: View/Events/view.ctp:219;230
+#: View/Elements/eventattribute.ctp:122
+#: View/Elements/eventdiscussion.ctp:138
+#: View/EventReports/view.ctp:6
+#: View/Events/view.ctp:212;223
 #: 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:48
 msgid "Event"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:154
+#: View/Elements/eventattribute.ctp:131
 #: View/Elements/eventattributetoolbar.ctp:201
 msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:171
+#: View/Elements/eventattribute.ctp:148
 #: View/Elements/eventattributetoolbar.ctp:185
 msgid "SightingDB"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:178
+#: View/Elements/eventattribute.ctp:155
 msgid "Decaying Score"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:227
+#: View/Elements/eventattribute.ctp:198
 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:231
+#: View/Elements/eventattribute.ctp:202
 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:205
-#: View/Galaxies/index.ctp:14
-#: View/GalaxyClusters/ajax/index.ctp:16
-#: View/Jobs/index.ctp:13;65
-#: View/ObjectTemplates/index.ctp:40
-#: View/Regexp/admin_add.ctp:17
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-#: View/UserSettings/index.ctp:41
-msgid "All"
-msgstr ""
-
 #: View/Elements/eventattributetoolbar.ctp:15
 msgid "Only show %s related attributes"
 msgstr ""
@@ -7409,7 +9202,7 @@ msgid "Only show proposals"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:25
-#: View/Logs/event_index.ctp:44
+#: View/Logs/event_index.ctp:37
 msgid "Proposal"
 msgstr ""
 
@@ -7418,7 +9211,7 @@ msgid "Only show correlating attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:33
-#: View/Events/view.ctp:306
+#: View/Events/view.ctp:300
 msgid "Correlation"
 msgstr ""
 
@@ -7427,8 +9220,9 @@ msgid "Only show potentially false positive attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:41
-#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:67;73;235
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:73
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:74;80;246
+#: View/Elements/healthElements/diagnostics.ctp:138
 #: View/Elements/healthElements/workers.ctp:5
 msgid "Warning"
 msgstr ""
@@ -7499,6 +9293,10 @@ msgid "Include deleted attributes"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:166
+#: View/EventReports/index.ctp:27
+#: View/EventReports/view.ctp:28
+#: View/EventReports/ajax/indexForEvent.ctp:61
+#: View/GalaxyClusters/ajax/index.ctp:43
 msgid "Deleted"
 msgstr ""
 
@@ -7539,84 +9337,97 @@ msgid "%s active rule(s)"
 msgstr ""
 
 #: View/Elements/eventattributetoolbar.ctp:235
-#: View/Events/index.ctp:65
-#: View/Logs/admin_index.ctp:62
-#: View/Servers/preview_index.ctp:57
-#: View/Tags/index.ctp:52
+#: View/EventReports/index.ctp:38
+#: View/Events/index.ctp:60
+#: View/Galaxies/index.ctp:15
+#: View/Logs/admin_index.ctp:55
+#: View/Servers/preview_index.ctp:53
+#: View/SharingGroups/index.ctp:41
 msgid "Remove filters"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:34
+#: View/Elements/eventdiscussion.ctp:2
+#: View/Events/view.ctp:525
+msgid "Discussion"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:32
 msgid "Date: "
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:52
+#: View/Elements/eventdiscussion.ctp:34
+msgid "Top"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:48
 msgid "Deactivated user"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:73
-msgid "Message edited at "
+#: View/Elements/eventdiscussion.ctp:69
+msgid "Message edited at %s"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:83
+#: View/Elements/eventdiscussion.ctp:79
 msgid "User "
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:90;98
+#: View/Elements/eventdiscussion.ctp:86;94
 msgid "Are you sure you want to delete this post?"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:93;100
+#: View/Elements/eventdiscussion.ctp:89;96
 msgid "Reply"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:142
+#: View/Elements/eventdiscussion.ctp:137
 #: View/Posts/add.ctp:32
 msgid "Insert a quote - just paste your quote between the [quote][/quote] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:142
+#: View/Elements/eventdiscussion.ctp:137
+#: View/Elements/markdownEditor/markdownEditor.ctp:130
 #: View/Posts/add.ctp:32
 msgid "Quote"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:143
+#: View/Elements/eventdiscussion.ctp:138
+#: View/Posts/add.ctp:33
 msgid "Insert a link to an event - just enter the event ID between the [event][/event] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:144
+#: View/Elements/eventdiscussion.ctp:139
 #: 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:144
+#: View/Elements/eventdiscussion.ctp:139
 #: View/Posts/add.ctp:34
 msgid "Thread"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:140
 #: View/Posts/add.ctp:35
 msgid "Insert a link [link][/link] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:145
+#: View/Elements/eventdiscussion.ctp:140
 #: View/Posts/add.ctp:35
 msgid "Link"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:146
+#: View/Elements/eventdiscussion.ctp:141
 #: View/Posts/add.ctp:36
 msgid "Insert a code [code][/code] tags."
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:146
+#: View/Elements/eventdiscussion.ctp:141
+#: View/Elements/markdownEditor/markdownEditor.ctp:131
 #: View/Posts/add.ctp:36
 msgid "Code"
 msgstr ""
 
-#: View/Elements/eventdiscussion.ctp:157
-#: View/Users/ajax/emailConfirmTemplate.ctp:13
-msgid "Send"
+#: View/Elements/eventdiscussion.ctp:152
+msgid "Send comment"
 msgstr ""
 
 #: View/Elements/flashErrorMessage.ctp:2
@@ -7624,6 +9435,7 @@ msgid "Errors"
 msgstr ""
 
 #: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/GalaxyClusters/clusterElementUI.ctp:34
 #: View/Jobs/ajax/error.ctp:34
 msgid "Close"
 msgstr ""
@@ -7636,199 +9448,203 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: View/Elements/footer.ctp:17
-msgid "Could not locate the GnuPG public key."
+#: View/Elements/footer.ctp:19
+msgid "Could not locate the PGP public key."
 msgstr ""
 
 #: View/Elements/footer.ctp:24
-msgid "Could not locate SMIME certificate."
+msgid "S/MIME certificate"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:53
+#: View/Elements/footer.ctp:26
+msgid "Could not locate S/MIME certificate."
+msgstr ""
+
+#: View/Elements/form_seen_input.ctp:52
 msgid "First seen date"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:57
+#: View/Elements/form_seen_input.ctp:56
 msgid "Last seen date"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:63
+#: View/Elements/form_seen_input.ctp:62
 msgid "First seen time"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:64;69
+#: View/Elements/form_seen_input.ctp:63;68
 msgid "Expected format: HH:MM:SS.ssssss+TT:TT"
 msgstr ""
 
-#: View/Elements/form_seen_input.ctp:68
+#: View/Elements/form_seen_input.ctp:67
 msgid "Last seen time"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:76
-#: View/Elements/galaxyQuickViewMini.ctp:79
+#: View/Elements/galaxyQuickView.ctp:77
+#: View/Elements/galaxyQuickViewMini.ctp:63
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:77
-#: View/Elements/galaxyQuickViewMini.ctp:80
+#: View/Elements/galaxyQuickView.ctp:78
+#: View/Elements/galaxyQuickViewMini.ctp:64
 msgid "View cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:83;84
-#: View/Elements/galaxyQuickViewMini.ctp:86;87
+#: View/Elements/galaxyQuickView.ctp:84;85
+#: View/Elements/galaxyQuickViewMini.ctp:70;71
 msgid "View all events containing this cluster."
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:97
+#: View/Elements/galaxyQuickView.ctp:98
 msgid "detach"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:98
+#: View/Elements/galaxyQuickView.ctp:99
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:114
+#: View/Elements/galaxyQuickView.ctp:115
 msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:115
+#: View/Elements/galaxyQuickView.ctp:116
 msgid "View galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:122
-#: View/Elements/galaxyQuickViewMini.ctp:115
+#: View/Elements/galaxyQuickView.ctp:123
+#: View/Elements/galaxyQuickViewMini.ctp:99
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:135
-#: View/Elements/galaxyQuickViewMini.ctp:128
+#: View/Elements/galaxyQuickView.ctp:136
+#: View/Elements/galaxyQuickViewMini.ctp:112
 msgid "Add new local cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:100
+#: View/Elements/galaxyQuickViewMini.ctp:84
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:187
+#: View/Elements/generic_picker.ctp:217
 msgid "No item picked"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:209
+#: View/Elements/generic_picker.ctp:248
 msgid "Due to the large number of options, no contextual information is provided."
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:277
+#: View/Elements/generic_picker.ctp:316
 msgid "Nothing to pick"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:7
+#: View/Elements/global_menu.ctp:13
 msgid "Home"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:11
+#: View/Elements/global_menu.ctp:17
 #: View/Pages/doc/general.ctp:20
 msgid "Event Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:14
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:269;312
+#: View/Elements/global_menu.ctp:20
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:278;323
 #: 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:274;318
+#: View/Elements/global_menu.ctp:24
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:283;329
 #: View/Events/add.ctp:7
 #: 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:337
+#: View/Elements/global_menu.ctp:29
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:351
 #: 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:342
+#: View/Elements/global_menu.ctp:33
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:356
 #: 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:330
+#: View/Elements/global_menu.ctp:37
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 #: View/Servers/rest.ctp:17
 msgid "REST client"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:38
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+#: View/Elements/global_menu.ctp:45
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:372
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:42
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:363
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:377
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:47
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+#: View/Elements/global_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:383
 msgid "View delegation requests"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:53
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:921
+#: View/Elements/global_menu.ctp:61
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1074
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:57
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:282
+#: View/Elements/global_menu.ctp:65
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:291
 msgid "List Tag Collections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:61
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:926
+#: View/Elements/global_menu.ctp:69
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1079
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 msgid "Add Tag"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:66
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:955
+#: View/Elements/global_menu.ctp:74
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1107
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:70
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:983
+#: View/Elements/global_menu.ctp:78
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:74
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1142
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:82
+#: View/Elements/global_menu.ctp:90
 #: View/Elements/view_event_graph.ctp:15
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:373
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:389
 #: 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:86
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
-#: View/Events/automation.ctp:2
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+#: View/Events/automation.ctp:5
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
@@ -7836,17 +9652,37 @@ msgstr ""
 msgid "Automation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:98
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1146
+#: View/Elements/global_menu.ctp:106;426
+msgid "Blocklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:113;431
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409;999
+msgid "Manage Event Blocklists"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:123
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:609
+#: View/Users/dashboard.ctp:2
+msgid "Dashboard"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:132
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1301;1423;1467
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:105
+#: View/Elements/global_menu.ctp:136
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1313;1479
+msgid "List Relationships"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:143
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:108;113
+#: View/Elements/global_menu.ctp:146;151
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -7855,107 +9691,98 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:118;123
-#: 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:128
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Elements/global_menu.ctp:166
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:507
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:132
+#: View/Elements/global_menu.ctp:170
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:139
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:490
+msgid "List Correlation Exclusions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:182
 #: View/Pages/doc/general.ctp:22;54
 msgid "Global Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:143
+#: View/Elements/global_menu.ctp:185
 #: 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:147
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:505
+#: View/Elements/global_menu.ctp:189
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:595
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:151
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:510
+#: View/Elements/global_menu.ctp:193
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:600
 msgid "My Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:515;752
+#: View/Elements/global_menu.ctp:197
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:605;904
 msgid "Set Setting"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:159
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:519
-#: View/Users/dashboard.ctp:2
-msgid "Dashboard"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:168
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:538
+#: View/Elements/global_menu.ctp:206
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:628
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:175
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1190
+#: View/Elements/global_menu.ctp:213
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1494
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:182
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:555
+#: View/Elements/global_menu.ctp:220
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:645
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:186
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:561
+#: View/Elements/global_menu.ctp:224
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:194
+#: View/Elements/global_menu.ctp:232
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1185
 msgid "Decaying Models Tool"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:199
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1037
+#: View/Elements/global_menu.ctp:237
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1191
 msgid "List Decaying Models"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:206
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:568
+#: View/Elements/global_menu.ctp:244
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:658
 #: 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:210
+#: View/Elements/global_menu.ctp:248
 msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:214
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:572
+#: View/Elements/global_menu.ctp:252
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:662
 msgid "Terms & Conditions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:218
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:576
+#: View/Elements/global_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:666
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -7969,61 +9796,65 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:225
+#: View/Elements/global_menu.ctp:263
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:229
+#: View/Elements/global_menu.ctp:267
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:236
+#: View/Elements/global_menu.ctp:274
 #: View/Pages/doc/general.ctp:23;66
 msgid "Sync Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:240
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:584
+#: View/Elements/global_menu.ctp:278
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:674
 msgid "Create Sync Config"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:245
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:590
+#: View/Elements/global_menu.ctp:283
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 msgid "Import Server Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:250
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:651
+#: View/Elements/global_menu.ctp:288
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:255
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
+#: View/Elements/global_menu.ctp:293
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1212
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:260
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
+#: View/Elements/global_menu.ctp:298
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1216
 msgid "Search Feed Caches"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:265
+#: View/Elements/global_menu.ctp:303
 msgid "List SightingDB Connections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:270
+#: View/Elements/global_menu.ctp:308
 msgid "Add SightingDB Connection"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:275
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:660
+#: View/Elements/global_menu.ctp:313
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
 msgid "List Communities"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:283
+#: View/Elements/global_menu.ctp:318
+msgid "Cerebrates"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:331
 #: View/Pages/doc/administration.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
@@ -8033,113 +9864,122 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:288
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:735
+#: View/Elements/global_menu.ctp:336
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:292
+#: View/Elements/global_menu.ctp:340
+msgid "List Auth Keys"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:344
 msgid "List User Settings"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:296
+#: View/Elements/global_menu.ctp:348
 #: View/UserSettings/set_setting.ctp:5
 msgid "Set User Setting"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:300
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:730
+#: View/Elements/global_menu.ctp:352
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
 msgid "Add User"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:304
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+#: View/Elements/global_menu.ctp:357
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:308
+#: View/Elements/global_menu.ctp:361
 msgid "User Registrations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:315
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:525;795
+#: View/Elements/global_menu.ctp:369
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615;947
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:319
+#: View/Elements/global_menu.ctp:373
 msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:326
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+#: View/Elements/global_menu.ctp:381
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:959
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:330
+#: View/Elements/global_menu.ctp:385
 msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:338
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:813
+#: View/Elements/global_menu.ctp:394
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:965
 #: View/Servers/server_settings.ctp:5
 msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:347
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:828
+#: View/Elements/global_menu.ctp:403
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:976
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:356
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:834
+#: View/Elements/global_menu.ctp:412
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:982
 #: 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:365
-msgid "Blacklist Event"
+#: View/Elements/global_menu.ctp:417
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:988
+msgid "Event Block Rules"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:370
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:846
-msgid "Manage Event Blacklists"
+#: View/Elements/global_menu.ctp:440
+msgid "Blocklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:379
-msgid "Blacklist Organisation"
+#: View/Elements/global_menu.ctp:445
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1011
+msgid "Manage Org Blocklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:384
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:858
-msgid "Manage Org Blacklists"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:392
+#: View/Elements/global_menu.ctp:453
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:396
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+#: View/Elements/global_menu.ctp:457
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1020
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:400
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:871
+#: View/Elements/global_menu.ctp:461
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1024
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:436
+#: View/Elements/global_menu.ctp:474;475
+msgid "Set the current page as your home page in MISP"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:495
+#: View/Elements/dashboard/dashboard_notifications.ctp:2
+msgid "Notifications"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:501
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -8162,9 +10002,8 @@ msgstr ""
 
 #: View/Elements/view_event_distribution_graph.ctp:9
 #: View/Elements/view_timeline.ctp:23
-#: View/Layouts/dashboard.ctp:94
-#: View/Layouts/default.ctp:93
-#: View/Layouts/graph.ctp:84
+#: View/Layouts/dashboard.ctp:93
+#: View/Layouts/default.ctp:89
 msgid "Loading"
 msgstr ""
 
@@ -8195,9 +10034,9 @@ msgid "Display"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Events/index.ctp:58
+#: View/Events/index.ctp:53
 #: View/Pages/doc/using_the_system.ctp:197
-#: View/Servers/preview_index.ctp:50
+#: View/Servers/preview_index.ctp:46
 msgid "Filters"
 msgstr ""
 
@@ -8211,11 +10050,12 @@ msgstr ""
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: View/Elements/view_galaxy_matrix.ctp:91
+#: View/Elements/view_galaxy_matrix.ctp:88
+#: View/Elements/Events/View/value_field.ctp:116;160
 msgid "Show all"
 msgstr ""
 
-#: View/Elements/view_galaxy_matrix.ctp:129
+#: View/Elements/view_galaxy_matrix.ctp:127
 msgid "(%s items)"
 msgstr ""
 
@@ -8224,8 +10064,8 @@ msgid "Time scope"
 msgstr ""
 
 #: View/Elements/DecayingModels/View/basescore_computation_steps.ctp:5
-#: View/Feeds/index.ctp:190
-#: View/Taxonomies/view.ctp:83
+#: View/Feeds/index.ctp:191
+#: View/Taxonomies/view.ctp:63
 msgid "Tag"
 msgstr ""
 
@@ -8254,13 +10094,105 @@ msgstr ""
 msgid "Pick an Attribute"
 msgstr ""
 
+#: View/Elements/EventReports/reportEditor.ctp:6
+msgid "invalid scope or id"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:3
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:24
+msgid "No html support, typographer & autolinker"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:4
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:25
+msgid "An additional syntax to reference MISP Elements"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:10
+#: View/EventReports/view.ctp:59
+#: View/EventReports/view_summary.ctp:22
+msgid "Markdown format"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:11
+msgid "The suported markdown format is similar to %s with some differences:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:18
+msgid "Markdown extended format"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:19
+msgid "In order to have a visually pleasant report but more importantly, avoid hardcoding element's value or ID, MISP elements such as attributes and objects can be referenced with the following special syntax"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:23
+msgid "Where:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:25
+msgid "Is the scope to which the UUID is related to."
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:27
+msgid "Can be one of the following: %s"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:29
+msgid "Is the UUID of the MISP element with only one exception for the tag"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:31;48;59;71
+msgid "Examples:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:38
+msgid "Pictures from attachment-type attributes"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:39
+msgid "Syntax for pictures is like the syntax for referencing MISP elements but with two differences:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:41
+msgid "The addition of the %s character to indicate that the picture should be displayed and not the atttribute"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:42
+msgid "The scope is fixed to %s as only attributes can contain a file"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:54
+msgid "Syntax for representing tags is similar the syntax for referencing MISP elements but with two differences:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:56;68
+msgid "The scope is fixed to %s"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:57
+msgid "The UUID is replaced by the tag name sa tags don't have UUID"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:65
+msgid "Event's Galaxy matrixes"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:66
+msgid "Syntax for embedding the ATT&CK matrix or any other galaxy matrixes is similar to the syntax for referencing MISP elements:"
+msgstr ""
+
+#: View/Elements/EventReports/reportHelpModal.ctp:69
+msgid "The matrix will be generated for the whole event for which the report is linked to"
+msgstr ""
+
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/EventBlacklists/index.ctp:47
+#: View/EventBlocklists/index.ctp:40
 msgid "Select all events on current page"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:27
-#: View/Events/view.ctp:96
+#: View/Events/view.ctp:71
 msgid "Owner org"
 msgstr ""
 
@@ -8306,167 +10238,159 @@ msgid "#Posts"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:53
-#: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:122
-#: View/Jobs/index.ctp:77
-#: 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_index.ctp:63
-#: View/Users/admin_view.ctp:8
-#: View/Users/registrations.ctp:61
-#: View/Users/view.ctp:4
-msgid "Email"
+#: View/Events/view.ctp:95
+msgid "Creator user"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:82;86;237
-#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/Events/eventIndexTable.ctp:79;223
+#: View/Elements/Users/userIndexTable.ctp:98
 #: 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:121
+#: View/Events/proposal_event_index.ctp:39;43
+#: View/Feeds/preview_index.ctp:69
+#: View/Noticelists/index.ctp:59
+#: View/ObjectTemplates/index.ctp:114
 #: View/Organisations/index.ctp:143
 #: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/index.ctp:103
-#: View/Servers/preview_index.ctp:174
-#: View/SharingGroups/index.ctp:91
-#: View/Taxonomies/index.ctp:49
-#: View/Warninglists/index.ctp:60
+#: View/Servers/index.ctp:96
+#: View/Servers/preview_index.ctp:170
+#: View/Users/admin_index.ctp:229
 msgid "View"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:157
+#: View/Elements/Events/eventIndexTable.ctp:145
 msgid " correlation(s). Show filtered event with correlation only."
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:175;180
+#: View/Elements/Events/eventIndexTable.ctp:161;166
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:185
+#: View/Elements/Events/eventIndexTable.ctp:171
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:176
+#: View/Elements/Events/eventIndexTable.ctp:212
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
 msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:212
 #: 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:227
+#: View/Elements/Events/eventIndexTable.ctp:213
 msgid "Not published"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:234
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:109;412;479;646;722;789
-#: View/Servers/index.ctp:183
-msgid "Are you sure you want to delete # %s?"
+#: View/Elements/Events/eventIndexTable.ctp:251
+msgid "Are you sure you want to delete #"
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:17
-msgid "Show "
-msgstr ""
-
-#: View/Elements/Events/View/attribute_correlations.ctp:17
-msgid " more..."
+msgid "Show %s more..."
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:53
-#: View/Events/view.ctp:399
+#: View/Events/view.ctp:391
 #: View/Feeds/preview_event.ctp:88
-#: View/Servers/preview_event.ctp:116
+#: View/Servers/preview_event.ctp:89
 msgid "Collapse…"
 msgstr ""
 
-#: View/Elements/Events/View/eventSightingValue.ctp:14
+#: View/Elements/Events/View/eventSightingValue.ctp:21
 msgid "- restricted to own organisation only."
 msgstr ""
 
-#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+#: View/Elements/Events/View/eventSightingValue.ctp:24;25
 msgid "Advanced Sightings"
 msgstr ""
 
-#: View/Elements/Events/View/related_event.ctp:26
-msgid "This related event contains %s unique correlation(s)"
-msgstr ""
+#: View/Elements/Events/View/related_event.ctp:27
+msgid "This related event contains %s unique correlation"
+msgid_plural "This related event contains %s unique correlations"
+msgstr[0] ""
+msgstr[1] ""
 
-#: View/Elements/Events/View/row_attribute.ctp:43
+#: View/Elements/Events/View/row_attribute.ctp:59
 msgid "Select attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:155
-#: View/Elements/Events/View/row_proposal.ctp:113
-#: View/Elements/Feeds/View/row_attribute.ctp:63
-#: View/Elements/Servers/View/row_attribute.ctp:70
-msgid "warning"
+#: View/Elements/Events/View/row_attribute.ctp:131
+msgid "Show hover enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:199;200
+#: View/Elements/Events/View/row_attribute.ctp:185;186
 #: View/Events/ajax/toggle_correlation.ctp:20
 msgid "Toggle correlation"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:326
+#: View/Elements/Events/View/row_attribute.ctp:216
+#: View/Events/view.ctp:410
+#: View/Feeds/add.ctp:26
+#: View/Feeds/index.ctp:120
+#: View/Feeds/view.ctp:31
+msgid "Provider"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:219
+msgid "Event UUIDs"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:307
 msgid "Toggle IDS flag"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:376
+#: View/Elements/Events/View/row_attribute.ctp:353
 msgid "Restore attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:377;417
+#: View/Elements/Events/View/row_attribute.ctp:354;394
 msgid "Permanently delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:384
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:384
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:389
+#: View/Elements/Events/View/row_attribute.ctp:366
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:389
+#: View/Elements/Events/View/row_attribute.ctp:366
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:393
+#: View/Elements/Events/View/row_attribute.ctp:370
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:394
+#: View/Elements/Events/View/row_attribute.ctp:371
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:404;409
+#: View/Elements/Events/View/row_attribute.ctp:381;386
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:409
+#: View/Elements/Events/View/row_attribute.ctp:386
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:421
+#: View/Elements/Events/View/row_attribute.ctp:398
 msgid "Soft-delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:68
-#: View/Elements/Feeds/View/row_object.ctp:19
-#: View/Events/resolved_misp_format.ctp:113
-msgid "Name: "
+#: View/Elements/Events/View/row_object.ctp:57
+msgid "Object name: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:69
+#: View/Elements/Events/View/row_object.ctp:58
 #: 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:20
@@ -8475,29 +10399,29 @@ msgstr ""
 #: View/Elements/Servers/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object_reference.ctp:7
 #: View/Elements/Servers/View/row_object_referenced_by.ctp:7
-#: View/Events/resolved_misp_format.ctp:114;135
+#: View/Events/resolved_misp_format.ctp:165;186
 msgid "Expand or Collapse"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:73
+#: View/Elements/Events/View/row_object.ctp:62
 msgid "Meta-category: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:74
+#: View/Elements/Events/View/row_object.ctp:63
 #: View/Elements/Feeds/View/row_object.ctp:24
 msgid "Description: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:75
+#: View/Elements/Events/View/row_object.ctp:64
 #: View/Elements/Feeds/View/row_object.ctp:25
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:139
+#: View/Elements/Events/View/row_object.ctp:129;139
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:139
+#: View/Elements/Events/View/row_object.ctp:129
 msgid "Soft delete object"
 msgstr ""
 
@@ -8507,7 +10431,7 @@ msgstr ""
 
 #: View/Elements/Events/View/row_object_reference.ctp:1
 #: View/Elements/Feeds/View/row_object_reference.ctp:1
-#: View/Events/resolved_misp_format.ctp:130
+#: View/Events/resolved_misp_format.ctp:181
 msgid "References: "
 msgstr ""
 
@@ -8516,7 +10440,7 @@ msgstr ""
 msgid "Add reference"
 msgstr ""
 
-#: View/Elements/Events/View/row_object_reference.ctp:51
+#: View/Elements/Events/View/row_object_reference.ctp:50
 msgid "Delete object reference"
 msgstr ""
 
@@ -8525,58 +10449,83 @@ msgstr ""
 msgid "Referenced by: "
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:41
+#: View/Elements/Events/View/row_proposal.ctp:40
 msgid "Select proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:194
-#: View/Elements/Events/View/row_proposal_delete.ctp:80
+#: View/Elements/Events/View/row_proposal.ctp:172
+#: View/Elements/Events/View/row_proposal_delete.ctp:76
 msgid "Accept Proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:194
-#: View/Elements/Events/View/row_proposal_delete.ctp:80
+#: View/Elements/Events/View/row_proposal.ctp:172
+#: View/Elements/Events/View/row_proposal_delete.ctp:76
 msgid "Accept proposal"
 msgstr ""
 
-#: View/Elements/Events/View/row_proposal.ctp:199
-#: View/Elements/Events/View/row_proposal_delete.ctp:85
+#: View/Elements/Events/View/row_proposal.ctp:177
+#: View/Elements/Events/View/row_proposal_delete.ctp:81
 msgid "Discard proposal"
 msgstr ""
 
-#: View/Elements/Events/View/sighting_field.ctp:12
+#: View/Elements/Events/View/row_proposal_delete.ctp:52
+msgid "DELETE"
+msgstr ""
+
+#: View/Elements/Events/View/sighting_field.ctp:30
 #: 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
+#: View/Elements/Events/View/sighting_field.ctp:31
 msgid "Mark as false-positive"
 msgstr ""
 
-#: View/Elements/Events/View/sighting_field.ctp:14
+#: View/Elements/Events/View/sighting_field.ctp:32
 msgid "Advanced sightings"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:52
-msgid "Cortex object"
+#: View/Elements/Events/View/value_field.ctp:51
+msgid "This file was not checked by AV scan. Do you really want to download it?"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:68
-msgid "Hexadecimal representation"
+#: View/Elements/Events/View/value_field.ctp:53
+msgid "According to AV scan, this file contains %s malware. Do you really want to download it?"
 msgstr ""
 
 #: View/Elements/Events/View/value_field.ctp:69
+msgid "This file contains malware %s"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:83
+msgid "Show more information about this vulnerability in external tool"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:94
+msgid "Show more information about this weakness in external tool"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:103
+msgid "Cortex object"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:124
+msgid "Hexadecimal representation"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:125
 msgid "Switch to binary representation"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:96
-msgid "Warning, this doesn't seem to be a legitimate "
+#: View/Elements/Events/View/value_field.ctp:168
+msgid "Warning, this doesn't seem to be a legitimate %s value"
 msgstr ""
 
-#: View/Elements/Events/View/value_field.ctp:96
-msgid " value"
+#: View/Elements/Events/View/value_field.ctp:176
+#: View/Elements/Feeds/View/row_attribute.ctp:59
+msgid "warning"
 msgstr ""
 
 #: View/Elements/Feeds/View/feed_overlap_tool.ctp:9
@@ -8599,14 +10548,86 @@ msgstr ""
 msgid "Check coverage"
 msgstr ""
 
+#: View/Elements/Feeds/View/row_object.ctp:19
+#: View/Events/resolved_misp_format.ctp:164
+msgid "Name: "
+msgstr ""
+
 #: View/Elements/Feeds/View/row_object.ctp:23
 #: View/Elements/Servers/View/row_object.ctp:23
-#: View/ObjectTemplates/index.ctp:69
+#: View/ObjectTemplates/index.ctp:62
 #: View/ObjectTemplates/view.ctp:8
-#: View/Objects/revise_object.ctp:31
+#: View/Objects/revise_object.ctp:10
 msgid "Meta-category"
 msgstr ""
 
+#: View/Elements/GalaxyClusters/clusterElementUI.ctp:3
+msgid "Toggle Cluster Elements UI"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/clusterElementUI.ctp:10
+msgid "Edit Cluster's Elements"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/clusterElementUI.ctp:30
+msgid "Add Element"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/clusterElementUI.ctp:33
+msgid "Save changes"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:45
+msgid "This galaxy does not have any relationships."
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:426
+#: View/Events/view.ctp:504
+msgid "Galaxy"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:431;432
+msgid "Owner Org."
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:435;436
+msgid "Creator Org."
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:438
+msgid "Tag name"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:445
+#: View/Feeds/index.ctp:133
+#: View/GalaxyClusters/view.ctp:51
+#: View/Pages/doc/using_the_system.ctp:145
+#: View/Sightings/ajax/list_sightings.ctp:12
+#: View/Users/statistics_sightings.ctp:9
+msgid "Source"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:446
+#: View/Events/filter_event_index.ctp:133
+#: View/Feeds/index.ctp:150
+#: View/Users/admin_filter_user_index.ctp:70
+msgid "Target"
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:460
+msgid "Numerical value: "
+msgstr ""
+
+#: View/Elements/GalaxyClusters/relations_graph.ctp:470
+msgid "Average value"
+msgstr ""
+
+#: View/Elements/Objects/object_add_attributes.ctp:40
+#: View/Elements/healthElements/diagnostics.ctp:208
+#: View/Taxonomies/index.ctp:67
+msgid "Required"
+msgstr ""
+
 #: View/Elements/Objects/object_similarities.ctp:76
 msgid "Update template and merge"
 msgstr ""
@@ -8651,40 +10672,36 @@ msgstr ""
 msgid "-- Select an option --"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:31;98
+#: View/Elements/Servers/eventattribute.ctp:28;92
 msgid "all"
 msgstr ""
 
-#: View/Elements/Servers/eventattribute.ctp:50
+#: View/Elements/Servers/eventattribute.ctp:47
 #: View/Elements/templateElements/templateRowAttribute.ctp:82
 #: View/Events/resolved_attributes.ctp:49
-#: View/Events/resolved_misp_format.ctp:95;290
-#: View/Feeds/freetext_index.ctp:34
-#: View/Objects/add.ctp:116
+#: View/Events/resolved_misp_format.ctp:146;341
+#: View/Feeds/freetext_index.ctp:30
+#: View/Objects/add.ctp:128
 #: 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:367
-#: View/Pages/doc/administration.ctp:56;228
-#: View/Servers/ajax/submoduleStatus.ctp:6
-msgid "Status"
-msgstr ""
-
-#: View/Elements/Servers/View/row_attribute.ctp:95
-#: View/Elements/Users/userIndexTable.ctp:66;67;70
+#: View/Elements/Servers/View/row_attribute.ctp:76
+#: View/Elements/Users/userIndexTable.ctp:70;71;74
 #: View/Elements/genericElements/key.ctp:2
+#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:6
+#: View/Elements/healthElements/diagnostics.ctp:400
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:243;250;257;278;285
+#: View/Events/automation.ctp:295;302;309;330;337
 #: View/Events/export.ctp:74;80;85
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
-#: View/Events/view.ctp:191
-#: View/GalaxyClusters/view.ctp:12
-#: View/Taxonomies/view.ctp:108;119;164
-#: View/Users/admin_view.ctp:95
+#: View/Events/view.ctp:184
+#: View/GalaxyClusters/view.ctp:56
+#: View/Servers/preview_event.ctp:47
+#: View/Taxonomies/view.ctp:97;108;153
+#: View/Users/view.ctp:105;110
 msgid "N/A"
 msgstr ""
 
@@ -8704,46 +10721,64 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
-#: View/Elements/TagCollections/index_row.ctp:45
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr ""
-
 #: View/Elements/TagCollections/index_row.ctp:51;52
 msgid "Download configuration"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:24
 #: View/Users/accept_registrations.ctp:72
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_edit.ctp:54
-#: View/Users/admin_index.ctp:56
-#: View/Users/admin_view.ctp:25
-#: View/Users/view.ctp:6
+#: View/Users/admin_edit.ctp:62
+#: View/Users/admin_index.ctp:75
+#: View/Users/view.ctp:17
 msgid "Role"
 msgstr ""
 
+#: View/Elements/Users/userIndexTable.ctp:10
+#: View/Users/admin_index.ctp:95
+msgid "Event alert"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:11
+#: View/Users/admin_index.ctp:102
+msgid "Contact alert"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:12
+#: View/Users/admin_index.ctp:109
+msgid "PGP Key"
+msgstr ""
+
 #: View/Elements/Users/userIndexTable.ctp:16
-msgid "Last login"
+#: View/Users/admin_add.ctp:62
+#: View/Users/admin_edit.ctp:65
+#: View/Users/admin_index.ctp:124
+#: View/Users/edit.ctp:21
+msgid "NIDS SID"
 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:71
-#: View/Users/admin_index.ctp:125
-msgid "Created"
+#: View/Users/admin_edit.ctp:81
+#: View/Users/view.ctp:76
+msgid "Terms accepted"
 msgstr ""
 
-#: View/Elements/Users/userIndexTable.ctp:88
-#: View/Users/admin_index.ctp:169
+#: View/Elements/Users/userIndexTable.ctp:18
+msgid "Last login"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:47
+#: View/Elements/genericElements/IndexTable/Fields/generic_field.ctp:26
+#: View/Users/view.ctp:32
+msgid "Reveal hidden value"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:92
+#: View/Users/admin_index.ctp:186
 msgid "Create new credentials and inform user"
 msgstr ""
 
-#: View/Elements/Users/userIndexTable.ctp:91
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:708
+#: View/Elements/Users/userIndexTable.ctp:95
 msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -8760,14 +10795,10 @@ msgid "Events published: "
 msgstr ""
 
 #: View/Elements/dashboard/dashboard_events.ctp:7
-#: View/Servers/index.ctp:107
+#: View/Servers/index.ctp:100
 msgid "Reset"
 msgstr ""
 
-#: View/Elements/dashboard/dashboard_notifications.ctp:2
-msgid "Notifications"
-msgstr ""
-
 #: View/Elements/dashboard/dashboard_notifications.ctp:4
 msgid "Proposals: "
 msgstr ""
@@ -8788,29 +10819,112 @@ msgstr ""
 msgid "Remove widget"
 msgstr ""
 
+#: View/Elements/dashboard/Widgets/Achievements.ctp:16
+msgid "Achievements Unlocked!"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/Achievements.ctp:18
+msgid "You don't have any achievement yet. Check them below to get started!"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/Achievements.ctp:29
+msgid "Next on your list:"
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/Achievements.ctp:31
+msgid "Well done! You got them all."
+msgstr ""
+
+#: View/Elements/dashboard/Widgets/Achievements.ctp:39
+msgid "Read more here"
+msgstr ""
+
 #: View/Elements/dashboard/Widgets/BarChart.ctp:38
 msgid "No data."
 msgstr ""
 
-#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:52
+#: View/Elements/genericElements/Form/genericForm.ctp:65
+#: View/GalaxyClusters/view_relations.ctp:106;119
+msgid "Picker"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:21
+msgid "Are you sure you want to delete %s %s (%s)?"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:24
+msgid "%s a %s propagates the deletion to other instances and lets you restore it in the future"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:24
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:6
+msgid "Soft-deleting"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:25
+msgid "%s a %s permanentaly deletes it"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:25
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:7
+msgid "Hard-deleting"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:37
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:15
+msgid "Soft-delete"
+msgstr ""
+
+#: View/Elements/genericElements/Form/hardSoftDeleteForm.ctp:43
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:21
+msgid "Hard-delete"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/pagination_links.ctp:5
+msgid "first"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/pagination_links.ctp:33
+msgid "last"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/action_toggle.ctp:34
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:41
+msgid "Could not retrieve current state."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/action_toggle.ctp:46
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:54
+msgid "Field updated."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/action_toggle.ctp:49
+#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:57
+msgid "Could not update field."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:63
 #: View/Feeds/add.ctp:213
 #: View/Feeds/edit.ctp:213
 msgid "Filter rules"
 msgstr ""
 
-#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:54
+#: View/Elements/genericElements/IndexTable/Fields/boolean.ctp:65
 #: View/Feeds/view.ctp:55
-#: View/Servers/index.ctp:120;121
+#: View/Servers/index.ctp:113;114
 msgid "Rules"
 msgstr ""
 
+#: View/Elements/genericElements/IndexTable/Fields/booleanOrNA.ctp:7
+msgid "Not applicable"
+msgstr ""
+
 #: View/Elements/genericElements/IndexTable/Fields/caching.ctp:17
-#: View/Servers/index.ctp:141
 msgid "Age: "
 msgstr ""
 
 #: View/Elements/genericElements/IndexTable/Fields/caching.ctp:19
-#: View/Servers/index.ctp:149
+#: View/Servers/index.ctp:142
 msgid "Not cached"
 msgstr ""
 
@@ -8818,6 +10932,56 @@ msgstr ""
 msgid "Cache feed"
 msgstr ""
 
+#: View/Elements/genericElements/IndexTable/Fields/checkbox_action.ctp:11
+msgid "%s toggle"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:17
+#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:17
+msgid "Indefinite"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:20
+#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:20
+msgid "Expired at %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:21
+#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:21
+msgid "Expired"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/expiration.ctp:25
+#: View/Elements/genericElements/SingleViews/Fields/expirationField.ctp:25
+msgid "Will expire in %s day"
+msgid_plural "Will expire in %s days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: View/Elements/genericElements/IndexTable/Fields/galaxy_cluster_link.ctp:34
+msgid "Target galaxy cluster not found."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/galaxy_cluster_link.ctp:35
+msgid "Unkown cluster"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/in_out_counts.ctp:3;10
+msgid "This %s %s %s other %s"
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/remote_status.ctp:9
+msgid "Object does not exist locally."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/remote_status.ctp:14
+msgid "Object exists locally."
+msgstr ""
+
+#: View/Elements/genericElements/IndexTable/Fields/remote_status.ctp:18
+msgid "Object exists locally, but the following fields contain different information on the remote: %s"
+msgstr ""
+
 #: View/Elements/genericElements/IndexTable/Fields/self_registration.ctp:12
 #: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
 msgid "click here"
@@ -8847,538 +11011,618 @@ msgstr ""
 msgid "Feed not enabled"
 msgstr ""
 
-#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:34
-msgid "Could not retrieve current state."
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:46
-msgid "Field updated."
-msgstr ""
-
-#: View/Elements/genericElements/IndexTable/Fields/toggle.ctp:49
-msgid "Could not update field."
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:9
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17
 msgid "View Dashboard"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:29
 msgid "Import Config JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:32
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:37
 msgid "Export Config JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:45
 msgid "Save Dashboard Config"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:50
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:54
 msgid "List Dashboard Templates"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:65;139
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:70;147
 msgid "Populate From Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:72
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:75
 msgid "Enrichment Module Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:80
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:81
 msgid "Freetext Import Result"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:87
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:88
+#: View/ShadowAttributes/index.ctp:106
 msgid "View Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:92;947;1176
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:93;1099;1399;1440
 msgid "View Correlation Graph"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:97
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:98
 msgid "View Event History"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:104
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:105
 #: View/Events/add.ctp:7
 msgid "Edit Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:109
 msgid "Delete Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:118
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:110
+msgid "Are you sure you want to delete event #%s?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:119
 msgid "Add Object"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:127
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
 msgid "Add Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:134
-msgid "Populate from..."
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:133;424;425
+#: View/EventReports/ajax/indexForEvent.ctp:19
+msgid "Add Event Report"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:141
+msgid "Populate from…"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:155
 #: View/Events/ajax/enrich_event.ctp:2
 msgid "Enrich Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:152
-msgid "Merge attributes from..."
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:160
+msgid "Merge attributes from…"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:159
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:167
 msgid "Propose Attribute"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
 #: View/ShadowAttributes/add_attachment.ctp:4
 msgid "Propose Attachment"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:184
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
 msgid "Publish (no email)"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:192
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:200
 msgid "Unpublish"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209
 msgid "Publish Sightings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:211
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:219
 msgid "Delegate Publishing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:222
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
 #: View/EventDelegations/ajax/accept_delegation.ctp:2
 msgid "Accept Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:230
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
 msgid "Discard Delegation Request"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:246
 msgid "Publish event to ZMQ"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:239
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
 msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:248
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:257
 msgid "Publish event to Kafka"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:258
 msgid "Are you sure you wish to republish the current event to the Kafka topic?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:256
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:265
 msgid "Contact Reporter"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:264;351
-msgid "Download as..."
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:273;365
+msgid "Download as…"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:287;292
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296;301
 #: View/TagCollections/add.ctp:6
 msgid "Add Tag Collection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:299
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:308
 msgid "Export Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:304
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:314
 msgid "Import Tag Collections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:325
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:337
 msgid "Import from…"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:390
-msgid "List Regexp"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:404;994
+msgid "Blocklists Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
-msgid "New Regexp"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:419
+msgid "List Event Reports"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:399
-msgid "Perform on existing"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:400
-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:407
-msgid "Edit Regexp"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:411
-msgid "Delete Regexp"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:421
-msgid "View Warninglist"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:432
-msgid "Update Warninglists"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:433
-msgid "Are you sure you want to update all warninglists?"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:436
+msgid "View Event Report"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:441
-msgid "View Noticelist"
+msgid "Edit Event Report"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:447
-msgid "List Noticelist"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:453
+msgid "List Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
-msgid "Update Noticelists"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:452
-msgid "Do you wish to continue and update all noticelists?"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:458
+msgid "New Regexp"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:462
-msgid "List Whitelist"
+msgid "Perform on existing"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:467
-msgid "New Whitelist"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:463
+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:470
+msgid "Edit Regexp"
 msgstr ""
 
 #: View/Elements/genericElements/SideMenu/side_menu.ctp:474
-msgid "Edit Whitelist"
+msgid "Delete Regexp"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:478
-msgid "Delete Whitelist"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475;564;741;870;941
+#: View/Servers/index.ctp:178
+msgid "Are you sure you want to delete #%s?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:488
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:484
+msgid "View Correlation Exclusion"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:495
+msgid "Add Correlation Exclusion"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "View Warninglist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Update Warninglists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:523
+msgid "View Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:529
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:534
+msgid "Update Noticelists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:535
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:547
+msgid "List Allowedlist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:552
+msgid "New Allowedlist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:559
+msgid "Edit Allowedlist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "Delete Allowedlist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:574
 #: View/Users/edit.ctp:4
 msgid "Edit My Profile"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:492
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580;586
 #: 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:499;697
-msgid "Reset Password"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:532;784
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:622;936
 msgid "View Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:544
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:634
 #: View/SharingGroups/edit.ctp:3
+#: View/SharingGroups/index.ctp:146
 msgid "Edit Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:549
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:639
+#: View/SharingGroups/index.ctp:135
 msgid "View Sharing Group"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:599;629
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:690;723
 msgid "Explore Remote Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:607
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:699
 msgid "Explore Remote Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:618;1116
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:711;1271
 msgid "Fetch This Event"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:619;1117
-#: View/Feeds/preview_index.ctp:72
-#: View/Servers/preview_index.ctp:173
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:712;1272
+#: View/Feeds/preview_index.ctp:68
+#: View/Servers/preview_index.ctp:169
 msgid "Are you sure you want to fetch and save this event on your instance?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:731
 #: View/Servers/edit.ctp:5
 msgid "Edit Server"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:656
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:753
 msgid "New Servers"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:670
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
 msgid "View community"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:678
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
 msgid "Request E-mail"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:690
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:795
+msgid "List Cerebrates"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:803
+msgid "View Cerebrate"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:810
+msgid "Edit Cerebrate"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:829
+#: View/Events/restore_deleted_events.ctp:48
+msgid "Restore Deleted Events"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:836
 msgid "View User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:702
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:844
+msgid "Reset Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:850
 msgid "Edit User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:707
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:855
 msgid "Delete User"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:716
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:856
+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/genericElements/SideMenu/side_menu.ctp:864
 #: View/Roles/admin_edit.ctp:4
 msgid "Edit Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:721
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:869
 msgid "Delete Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:740
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:892
 msgid "Pending registrations"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:747
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
 msgid "User settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:765
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
 msgid "Add Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:771
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:923
 #: View/Organisations/admin_edit.ctp:4
 msgid "Edit Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:779
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 #: View/Organisations/ajax/merge.ctp:5
 msgid "Merge Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:788
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:940
 msgid "Delete Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:801
-#: View/Roles/admin_add.ctp:4
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:953
+#: View/Roles/admin_add.ctp:69
 msgid "Add Role"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:817
-msgid "Inbox"
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1006
+msgid "Blocklists Organisation"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:841
-msgid "Blacklists Event"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
-msgid "Blacklists Organisation"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:880;894
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1033;1047
 msgid "View Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:885
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1038
 #: View/Posts/add.ctp:4
 msgid "Add Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:899
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1052
 #: View/Posts/edit.ctp:4
 msgid "Edit Post"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:905
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1058
 msgid "List Threads"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:909
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1062
 msgid "New Thread"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:917
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1070
 msgid "List Favourite Tags"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:933
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1085
 #: View/Tags/edit.ctp:4
 msgid "Edit Tag"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:941;960
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1093;1112
 msgid "View Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:968
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1121
 msgid "Delete Taxonomy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1129
 msgid "Update Taxonomies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:995
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1149
 msgid "View Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1001
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1155
 #: View/Templates/edit.ctp:6
 msgid "Edit Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1012
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166
 msgid "Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1017
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
 msgid "Force Update Default Models"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1022
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1176
 msgid "Import Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1027
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1181
 msgid "Add Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1031
-msgid "Decaying Tool"
-msgstr ""
-
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1043
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1197
 msgid "View Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1049
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1203
 msgid "Edit Decaying Model"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1067
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1221
 msgid "Add Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1072
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1226
 msgid "Import Feeds from JSON"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1078
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1232
 #: View/Feeds/compare_feeds.ctp:8
 msgid "Feed overlap analysis matrix"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1083
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1237
 msgid "Export Feed settings"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1091
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1245
 msgid "Edit Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1096
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1250
 msgid "View Feed"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1102
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1256
 msgid "PreviewIndex"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1108
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1262
 msgid "PreviewEvent"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1126
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1281
 msgid "View News"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1131
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1286
 #: View/News/add.ctp:6
 msgid "Add News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1137
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1291
 #: View/News/edit.ctp:6
 msgid "Edit News Item"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1152
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1307;1473
+msgid "List Cluster Blocklists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1320
 msgid "Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1153
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1321
 msgid "Are you sure you want to reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1158
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1326
 msgid "Force Update Galaxies"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1159
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1327
 msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1166;1182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1334
+msgid "Import Galaxy Clusters"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1341
+msgid "Export Galaxy Clusters"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1349;1408;1429
 msgid "View Galaxy"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1171
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1355;1435
 msgid "View Cluster"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1195
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1362
+msgid "Edit Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1369;1414
+msgid "Add Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1375
+msgid "Fork Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1390
+msgid "Unpublish Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1390;1457
+msgid "Publish Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1486
+msgid "Add Relationship"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1499
 msgid "Update Objects"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1201
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1505
 msgid "View Object Template"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1209
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1513
 #: View/Sightingdb/add.ctp:6
 msgid "Add SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1217
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1521
 msgid "Edit SightingDB connection"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu.ctp:1222
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:1526
 msgid "List SightingDB connections"
 msgstr ""
 
-#: View/Elements/genericElements/SideMenu/side_menu_post_link.ctp:26
-#: View/Errors/error403.ctp:4
-msgid "%s"
+#: View/Elements/genericElements/SingleViews/single_view.ctp:91
+msgid "%s view"
+msgstr ""
+
+#: View/Elements/genericElements/SingleViews/Fields/alignmentField.ctp:58
+msgid "Add organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SingleViews/Fields/alignmentField.ctp:58
+msgid "Add individual"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:4
@@ -9390,6 +11634,7 @@ msgid "Index diagnostic:"
 msgstr ""
 
 #: View/Elements/healthElements/db_indexes_diagnostic.ctp:12
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:63
 msgid "Notice"
 msgstr ""
 
@@ -9397,93 +11642,111 @@ msgstr ""
 msgid "The highlighted issues may be benign. if you are unsure, please open an issue and ask for clarification."
 msgstr ""
 
-#: View/Elements/healthElements/db_indexes_diagnostic.ctp:47
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:47;48
 msgid "Fix Database Index Schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_indexes_diagnostic.ctp:72
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:235
+#: View/Elements/healthElements/db_indexes_diagnostic.ctp:73
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:246
 msgid "Executing this query might take some time and may harm your database. Please review the query below or backup your database in case of doubt."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:62
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:64
+msgid "An update is currently in progress."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:65
+msgid "You can check the current progress %s."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:65
+#: View/Events/automation.ctp:30
+#: View/Users/admin_index.ctp:6
+msgid "here"
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:69
 msgid "The current database schema does not match the expected format."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:63;132
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:70;141
 msgid "Database schema diagnostic: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:68;74
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:75;81
 msgid "The MISP database state does not match the expected schema. Resolving these issues is recommended."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:69;75
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:76;82
 msgid "⚠ This diagnostic tool is in experimental state - the highlighted issues may be benign. If you are unsure, please open an issue on with the issues identified over at https://github.com/MISP/MISP for clarification."
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:79
-msgid "Reveal benign deltas"
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:86
+msgid "Debug mode: Reveal benign deltas"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:87
+msgid "Most of the time, these benign deltas are artifacts coming from a different database version or RDBMS system used by this instance and thus, can be ignored."
+msgstr ""
+
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
 msgid "Table name"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
 msgid "Expected schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:83
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:91
 msgid "Actual schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:119
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:127;128
 msgid "Fix Database schema"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:131
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:140
 msgid "The current database is correct"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:142
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
 msgid "Expected DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:146
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:155
 msgid "The current database version matches the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:147;152
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:156;161
 msgid "Actual DB_version: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:151
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:160
 msgid "The current database version does not match the expected one"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:159
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168
 msgid "Updates are locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:159;163
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;172
 msgid "Updates are not locked"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:171
 #: View/Servers/update_progress.ctp:32
 msgid "Updates are locked due to to many update fails"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:162
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:171
 msgid "Updates unlocked in %s"
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:168;169
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:177;178
 msgid "DataSource: "
 msgstr ""
 
-#: View/Elements/healthElements/db_schema_diagnostic.ctp:204
+#: View/Elements/healthElements/db_schema_diagnostic.ctp:215
 msgid "Column diagnostic"
 msgstr ""
 
@@ -9513,447 +11776,524 @@ msgid "Outdated version"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:30
-msgid "Could not retrieve version from github"
+msgid "Could not retrieve version from GitHub"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:40
-msgid "Unable to fetch current commit id, check apache user read privilege."
+#: View/Elements/healthElements/diagnostics.ctp:39
+msgid "Unable to fetch current commit ID, check apache user read privilege."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:45
+#: View/Elements/healthElements/diagnostics.ctp:44
 msgid "Latest available version…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:52
+#: View/Elements/healthElements/diagnostics.ctp:49
 msgid "Status…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:59
+#: View/Elements/healthElements/diagnostics.ctp:52
 msgid "Current branch…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:57
 msgid "You are not on a branch, Update MISP will fail"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:68
-msgid "Pull the latest MISP version from github"
+#: View/Elements/healthElements/diagnostics.ctp:61
+msgid "Pull the latest MISP version from GitHub"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:61
 msgid "Update MISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:69
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Click the following button to go to the update progress page. This page lists all updates that are currently queued and executed."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:69
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "View Update Progress"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:71
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Submodules version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:72
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "Refresh submodules version."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:68
 msgid "Load all JSON into the database."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:76
+#: View/Elements/healthElements/diagnostics.ctp:69
 msgid "Load JSON into database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:79
+#: View/Elements/healthElements/diagnostics.ctp:72
 msgid "Writeable Directories and files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:80
+#: View/Elements/healthElements/diagnostics.ctp:73
 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:81
+#: View/Elements/healthElements/diagnostics.ctp:74
 msgid "Directories"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:88
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Directory "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:96
+#: View/Elements/healthElements/diagnostics.ctp:89
 msgid "Writeable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:103;117
+#: View/Elements/healthElements/diagnostics.ctp:96;110
 msgid "File "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:110
+#: View/Elements/healthElements/diagnostics.ctp:103
 msgid "Readable Files"
 msgstr ""
 
+#: View/Elements/healthElements/diagnostics.ctp:118
+msgid "Security Audit"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:120
+msgid "Congratulation, your instance pass all security checks."
+msgstr ""
+
 #: View/Elements/healthElements/diagnostics.ctp:125
+msgid "Area"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:126
+msgid "Level"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:127
+#: View/EventDelegations/index.ctp:82
+#: View/Events/automation.ctp:331;338
+#: 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/Elements/healthElements/diagnostics.ctp:140
+msgid "Hint"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:143
+msgid "More info"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:150
 msgid "PHP Settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:128;140
+#: View/Elements/healthElements/diagnostics.ctp:153;165
 msgid "Up to date"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:134
-#: View/Elements/healthElements/workers.ctp:83;85
-#: View/Organisations/view.ctp:26
-msgid "Unknown"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:136
+#: View/Elements/healthElements/diagnostics.ctp:161
 msgid "Issues determining version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:143;152
+#: View/Elements/healthElements/diagnostics.ctp:168;181
 msgid "Update highly recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:146;155
+#: View/Elements/healthElements/diagnostics.ctp:171;184
 msgid "Version unsupported, update ASAP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:159
+#: View/Elements/healthElements/diagnostics.ctp:176
+msgid "Version unsupported, 8.x support not available yet."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PHP ini path"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:189
 msgid "PHP Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:160;161
+#: View/Elements/healthElements/diagnostics.ctp:189;190
 msgid "recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:161
+#: View/Elements/healthElements/diagnostics.ctp:190
 msgid "PHP CLI Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:162
+#: View/Elements/healthElements/diagnostics.ctp:191
 msgid "Please note that the support for Python versions below 3.6 and below PHP 7.2 has been dropped as of 2020-01-01 and are henceforth considered unsupported. More info: "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:163
+#: View/Elements/healthElements/diagnostics.ctp:192
 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:170
+#: View/Elements/healthElements/diagnostics.ctp:199
 #: 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:174
+#: View/Elements/healthElements/diagnostics.ctp:203
 msgid "PHP Extensions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:184
-msgid "Not loaded"
+#: View/Elements/healthElements/diagnostics.ctp:207
+msgid "Extension"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
-msgid "Issues reading PHP settings. This could be due to the test script not being readable."
+#: View/Elements/healthElements/diagnostics.ctp:209
+msgid "Why to install"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:206
-msgid "Table"
+#: View/Elements/healthElements/diagnostics.ctp:210
+msgid "Web"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:211
-msgid "Used"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:217
-msgid "Reclaimable"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:223
-msgid "SQL database status"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:224
-msgid "Size of each individual table on disk, along with the size that can be freed via SQL optimize. Make sure that you always have at least 3x the size of the largest table in free space in order for the update scripts to work as expected."
+msgid "CLI"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:229
-msgid "Schema status"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:246
-msgid "Redis info"
+msgid "Version %s installed, but required at least %s"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:248
-msgid "PHP extension version"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:248
-msgid "Not installed."
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:250
-msgid "Redis version"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:251
-msgid "Memory allocator"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:252
-msgid "Memory usage"
+#: View/Elements/markdownEditor/markdownEditor.ctp:132
+msgid "Table"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:253
-msgid "Peak memory usage"
-msgstr ""
-
-#: View/Elements/healthElements/diagnostics.ctp:254
-msgid "Total system memory"
+msgid "Used"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:259
+msgid "Reclaimable"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:265
+msgid "SQL database status"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:266
+msgid "Size of each individual table on disk, along with the size that can be freed via SQL optimize. Make sure that you always have at least 3x the size of the largest table in free space in order for the update scripts to work as expected."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:271
+msgid "Schema status"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:288
+msgid "Redis info"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:290
+msgid "PHP extension version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:290
+msgid "Not installed."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:292
+msgid "Redis version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:293
+msgid "Memory allocator"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:294
+msgid "Memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:295
+msgid "Peak memory usage"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:296
+msgid "Total system memory"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:301
 msgid "Advanced attachment handler"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:260
+#: View/Elements/healthElements/diagnostics.ctp:302
 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:265
+#: View/Elements/healthElements/diagnostics.ctp:307
 msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:265
+#: View/Elements/healthElements/diagnostics.ctp:307
 msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:277
+#: View/Elements/healthElements/diagnostics.ctp:319
+msgid "Attachment scan module"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:325
+msgid "Not available."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:329
 msgid "STIX and Cybox libraries"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:278
+#: View/Elements/healthElements/diagnostics.ctp:330
 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:279
+#: View/Elements/healthElements/diagnostics.ctp:331
 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:286
+#: View/Elements/healthElements/diagnostics.ctp:338
 msgid "Other versions might work but are not tested / recommended."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:295
+#: View/Elements/healthElements/diagnostics.ctp:347
 msgid "STIX and CyBox"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:295
+#: View/Elements/healthElements/diagnostics.ctp:347
 msgid "Could not read test script (stixtest.py)."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:309
+#: View/Elements/healthElements/diagnostics.ctp:361
 msgid " library version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:326
+#: View/Elements/healthElements/diagnostics.ctp:378
 msgid "Yara"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:327
+#: View/Elements/healthElements/diagnostics.ctp:379
 msgid "This tool tests whether plyara, the library used by the yara export tool is installed or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:334
+#: View/Elements/healthElements/diagnostics.ctp:386
 msgid "Invalid plyara version / plyara not installed. Please run pip3 install plyara"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:336
+#: View/Elements/healthElements/diagnostics.ctp:388
 msgid "plyara library installed"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:340
+#: View/Elements/healthElements/diagnostics.ctp:392
 msgid "GnuPG"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:341
+#: View/Elements/healthElements/diagnostics.ctp:393
 msgid "This tool tests whether your GnuPG is set up correctly or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:349
+#: View/Elements/healthElements/diagnostics.ctp:398
 msgid "GnuPG installation and settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:352
+#: View/Elements/healthElements/diagnostics.ctp:400
+msgid "GnuPG version: %s"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:404
 msgid "ZeroMQ"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:353
+#: View/Elements/healthElements/diagnostics.ctp:405
 msgid "This tool tests whether the ZeroMQ extension is installed and functional."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:361
+#: View/Elements/healthElements/diagnostics.ctp:413
 msgid "ZeroMQ settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:365
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Start ZMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:365
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Start ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:365
+#: View/Elements/healthElements/diagnostics.ctp:417
 msgid "Start"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:366
+#: View/Elements/healthElements/diagnostics.ctp:418
 msgid "Stop ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:366
+#: View/Elements/healthElements/diagnostics.ctp:418
 msgid "Stop"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:367
+#: View/Elements/healthElements/diagnostics.ctp:419
 msgid "Check ZeroMQ service status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:369
+#: View/Elements/healthElements/diagnostics.ctp:421
 msgid "Proxy"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:370
+#: View/Elements/healthElements/diagnostics.ctp:422
 msgid "This tool tests whether your HTTP proxy settings are correct."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:378
+#: View/Elements/healthElements/diagnostics.ctp:430
 #: View/Pages/doc/administration.ctp:35
 msgid "Proxy settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:381
+#: View/Elements/healthElements/diagnostics.ctp:433
 msgid "Module System"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:382
+#: View/Elements/healthElements/diagnostics.ctp:434
 msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:397
+#: View/Elements/healthElements/diagnostics.ctp:449
 msgid " module system"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:403
+#: View/Elements/healthElements/diagnostics.ctp:455
 msgid "Session table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:404
+#: View/Elements/healthElements/diagnostics.ctp:456
 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:411
+#: View/Elements/healthElements/diagnostics.ctp:463
 msgid "Expired sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:417
+#: View/Elements/healthElements/diagnostics.ctp:469
 msgid "Purge sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:421
+#: View/Elements/healthElements/diagnostics.ctp:473
+msgid "Upgrade authkeys keys to the advanced keys format"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:476
+msgid "MISP can store the user API keys either in the clear directly attached to the users, or as of recently, it can generate a list of hashed keys for different purposes. If the latter feature is enabled, it might be useful to move all existing keys over to the new format so that users do not lose access to the system. In order to do so, run the following functionality."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:478
+msgid "Update Authkeys to advanced Authkeys"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:480
 msgid "Clean model cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:422
+#: View/Elements/healthElements/diagnostics.ctp:481
 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:423
+#: View/Elements/healthElements/diagnostics.ctp:482
 msgid "Clean cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:427
+#: View/Elements/healthElements/diagnostics.ctp:486
 msgid "Check for deprecated function usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:428
+#: View/Elements/healthElements/diagnostics.ctp:487
 msgid "In an effort to identify the usage of deprecated functionalities, MISP has started aggregating the count of access requests to these endpoints. Check the frequency of their use below along with the users to potentially warn about better ways of achieving their goals."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:431;432;434
+#: View/Elements/healthElements/diagnostics.ctp:490;491;493
 msgid "View deprecated endpoint usage"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:438;441
+#: View/Elements/healthElements/diagnostics.ctp:497;500
 msgid "Orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:439
+#: View/Elements/healthElements/diagnostics.ctp:498
 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:441;455
+#: View/Elements/healthElements/diagnostics.ctp:500;514
 msgid "Run the test below"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:443
+#: View/Elements/healthElements/diagnostics.ctp:502
 msgid "Check for orphaned attribute"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:443
+#: View/Elements/healthElements/diagnostics.ctp:502
 msgid "Check for orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:444
+#: View/Elements/healthElements/diagnostics.ctp:503
 msgid "Remove orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:445
+#: View/Elements/healthElements/diagnostics.ctp:504
 msgid "Remove published empty events"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:446;448
+#: View/Elements/healthElements/diagnostics.ctp:505;507
 #: View/Servers/ondemand_action.ctp:7
 msgid "Administrator On-demand Action"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:447
+#: View/Elements/healthElements/diagnostics.ctp:506
 msgid "Click the following button to go to the Administrator On-demand Action page."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:449;451
+#: View/Elements/healthElements/diagnostics.ctp:508;510
 msgid "Legacy Administrative Tools"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:450
+#: View/Elements/healthElements/diagnostics.ctp:509
 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:452
+#: View/Elements/healthElements/diagnostics.ctp:511
 msgid "Verify bad link on attachments"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:453
+#: View/Elements/healthElements/diagnostics.ctp:512
 msgid "Verify each attachment referenced in database is accessible on filesystem."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:455
+#: View/Elements/healthElements/diagnostics.ctp:514
 msgid "Non existing attachments referenced in Database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:457
+#: View/Elements/healthElements/diagnostics.ctp:516
 msgid "Check bad link on attachments"
 msgstr ""
 
+#: View/Elements/healthElements/diagnostics.ctp:517;519
+msgid "Recover deleted events"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:518
+msgid "Due to a bug introduced after 2.4.129, users could occasionally accidentally and unknowingly trigger event deletions. Use the tool below to display any events deleted during the timeframe when the bug was active and optionally recover individual events if you believe they were removed in error."
+msgstr ""
+
 #: View/Elements/healthElements/files.ctp:2
 msgid "Below you will find a list of the uploaded files based on type."
 msgstr ""
@@ -9979,18 +12319,14 @@ msgid "Size"
 msgstr ""
 
 #: View/Elements/healthElements/files.ctp:32
-#: View/Roles/admin_add.ctp:15
+#: View/Roles/admin_add.ctp:16
 #: View/Roles/admin_edit.ctp:15
-#: View/Roles/admin_index.ctp:25
-#: View/Roles/index.ctp:24
 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:90
-#: View/SharingGroups/index.ctp:89
+#: View/Regexp/admin_index.ctp:28
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
@@ -10139,16 +12475,6 @@ msgstr ""
 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/TagCollections/index.ctp:14
-#: View/UserSettings/index.ctp:56
-#: View/Users/admin_view.ctp:109
-#: View/Users/view.ctp:59
-msgid "User"
-msgstr ""
-
 #: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr ""
@@ -10193,6 +12519,205 @@ msgstr ""
 msgid "Restart dead workers"
 msgstr ""
 
+#: View/Elements/healthElements/workers.ctp:138
+msgid "Kill all workers"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:146
+msgid "Force kill all workers"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:151
+msgid "Are you sure you want to force kill all workers? This will issue a kill -9 and terminate any processing underway."
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:34
+msgid "Split Screen"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:39
+msgid "Markdown"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:43
+#: View/Galaxies/export.ctp:45
+msgid "Raw"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:50
+#: View/Objects/add.ctp:123
+msgid "Save"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:55
+msgid "Menu"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:67
+msgid "Download PDF (via print)"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:71
+msgid "Download Markdown"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:73
+msgid "Replace custom syntax by a valid one"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:75
+msgid "Download GFM simplified format"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:82
+msgid "Markdown parsing rules"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:87
+msgid "Image parsing"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:88;94
+#: View/Noticelists/index.ctp:29
+#: View/Pages/doc/using_the_system.ctp:371
+msgid "enabled"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:89;95
+#: View/Pages/doc/using_the_system.ctp:368
+msgid "disabled"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:93
+msgid "Link parsing"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:103
+msgid "Edit report"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:110
+msgid "Help"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:122
+msgid "Bold"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:123
+msgid "Italic"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:124
+msgid "Heading"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:125
+msgid "Strikethrough"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:127
+msgid "Unordered list"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:128
+msgid "Ordered list"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:141
+msgid "Last updated"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:143
+msgid "Toggle autocompletion while typing"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:149
+msgid "Synchronize scrolling"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:155
+msgid "Automatically render markdown when typing"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:161
+msgid "Toggle fullscreen mode"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:178
+msgid "You are about to save the document. Do you wish to proceed?"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:181
+msgid "In order to save the PDF, you have to set the print destination to `Save as PDF`."
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:182
+msgid "You are about to leave the page with unsaved changes. Do you want to proceed?"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditor.ctp:183
+msgid "Unsaved changes"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:27
+msgid "Command"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:27
+#: View/Events/recover_event.ctp:15
+#: View/Pages/doc/administration.ctp:133;184;197
+#: View/Pages/doc/using_the_system.ctp:269
+#: View/Servers/ondemand_action.ctp:3
+#: View/Servers/ajax/submoduleStatus.ctp:7
+#: View/Taxonomies/view.ctp:69
+msgid "Action"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:29
+msgid "Triggers autocomplete if applicable"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:30
+msgid "Makes text bold"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:31
+msgid "Makes text italic"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:32
+msgid "Insert a MISP Element"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:33
+msgid "Makes text as header"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:39;51
+msgid "Editor shortcuts"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:40
+msgid "Markdown plugin"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:59
+msgid "Markdown plugins"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:60
+msgid "Highlighted language"
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:61
+msgid "Languages rendered in code block can be highlighted using the %s plugin. The list of supported languages can be found %s."
+msgstr ""
+
+#: View/Elements/markdownEditor/markdownEditorHelpModal.ctp:71
+msgid "Markdown viewer help"
+msgstr ""
+
 #: View/Elements/serverRuleElements/pull.ctp:3
 msgid "Set pull rules"
 msgstr ""
@@ -10292,6 +12817,7 @@ msgstr ""
 
 #: View/Elements/serverRuleElements/pull.ctp:68
 #: View/Elements/serverRuleElements/push.ctp:67
+#: View/GalaxyClusters/update_cluster.ctp:112
 msgid "Update"
 msgstr ""
 
@@ -10333,10 +12859,6 @@ msgstr ""
 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
@@ -10348,8 +12870,8 @@ msgid "Template ID"
 msgstr ""
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:26
-#: View/SharingGroups/view.ctp:23
+#: View/Organisations/view.ctp:30
+#: View/SharingGroups/view.ctp:13
 msgid "Created by"
 msgstr ""
 
@@ -10369,7 +12891,7 @@ msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
 #: View/ObjectReferences/ajax/add.ctp:86
-#: View/Objects/revise_object.ctp:62
+#: View/Objects/revise_object.ctp:52
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
 msgid "Attribute"
@@ -10420,23 +12942,27 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: View/Errors/error400.ctp:33
+#: View/Errors/error400.ctp:25
 msgid "You have tripped the cross-site request forgery protection of MISP"
 msgstr ""
 
-#: View/Errors/error400.ctp:35
+#: View/Errors/error400.ctp:27
 msgid "CSRF error"
 msgstr ""
 
-#: View/Errors/error400.ctp:36
+#: View/Errors/error400.ctp:28
 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
+#: View/Errors/error400.ctp:31
 msgid "Alternatively, click <a href=\"%s\">here</a> to continue to the start page."
 msgstr ""
 
-#: View/Errors/missing_connection.ctp:1
+#: View/Errors/error403.ctp:5
+msgid "%s"
+msgstr ""
+
+#: View/Errors/missing_connection.ctp:2
 #: View/Errors/missing_datasource_config.ctp:1
 msgid "Missing Database Connection"
 msgstr ""
@@ -10445,73 +12971,74 @@ msgstr ""
 msgid "PDO error"
 msgstr ""
 
-#: View/EventBlacklists/add.ctp:4
-msgid "Add Event Blacklist Entries"
+#: View/EventBlocklists/add.ctp:4
+msgid "Add Event Blocklist Entries"
 msgstr ""
 
-#: View/EventBlacklists/add.ctp:5
+#: View/EventBlocklists/add.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:9
-#: View/EventBlacklists/edit.ctp:9
-#: View/OrgBlacklists/add.ctp:9
-#: View/OrgBlacklists/edit.ctp:9
+#: View/EventBlocklists/add.ctp:9
+#: View/EventBlocklists/edit.ctp:9
+#: View/OrgBlocklists/add.ctp:10
+#: View/OrgBlocklists/edit.ctp:8
 msgid "UUIDs"
 msgstr ""
 
-#: View/EventBlacklists/add.ctp:12
-#: View/OrgBlacklists/add.ctp:12
+#: View/EventBlocklists/add.ctp:12
+#: View/GalaxyClusterBlocklists/add.ctp:3
+#: View/OrgBlocklists/add.ctp:13
 msgid "Enter a single or a list of UUIDs"
 msgstr ""
 
-#: View/EventBlacklists/add.ctp:18
+#: View/EventBlocklists/add.ctp:18
+#: View/GalaxyClusterBlocklists/add.ctp:4
 msgid "(Optional) The organisation that the event is associated with"
 msgstr ""
 
-#: View/EventBlacklists/add.ctp:25
+#: View/EventBlocklists/add.ctp:25
 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:31
-#: View/OrgBlacklists/add.ctp:24
+#: View/EventBlocklists/add.ctp:31
+#: View/OrgBlocklists/add.ctp:25
 msgid "(Optional) Any comments you would like to add regarding this (or these) entries."
 msgstr ""
 
-#: View/EventBlacklists/edit.ctp:4
-#: View/OrgBlacklists/edit.ctp:4
-msgid "Edit Event Blacklist Entries"
+#: View/EventBlocklists/edit.ctp:4
+msgid "Edit Event Blocklist Entries"
 msgstr ""
 
-#: View/EventBlacklists/edit.ctp:5
-#: View/OrgBlacklists/edit.ctp:5
+#: View/EventBlocklists/edit.ctp:5
 msgid "List of all the event UUIDs that you wish to block from being entered."
 msgstr ""
 
-#: View/EventBlacklists/edit.ctp:18
-#: View/OrgBlacklists/edit.ctp:18
+#: View/EventBlocklists/edit.ctp:18
+#: View/GalaxyClusterBlocklists/add.ctp:26
+#: View/OrgBlocklists/edit.ctp:17
 msgid "Creating organisation"
 msgstr ""
 
-#: View/EventBlacklists/index.ctp:2
-msgid "Event Blacklists"
+#: View/EventBlocklists/index.ctp:2
+msgid "Event Blocklists"
 msgstr ""
 
-#: View/EventBlacklists/index.ctp:51
-#: View/Events/resolved_misp_format.ctp:39
+#: View/EventBlocklists/index.ctp:44
+#: View/Events/resolved_misp_format.ctp:40
 msgid "Event UUID"
 msgstr ""
 
-#: View/EventBlacklists/index.ctp:70
-msgid "Are you sure you want to delete the blacklist entry for the event UUID %s?"
+#: View/EventBlocklists/index.ctp:63
+msgid "Are you sure you want to delete the blocklist entry for the event UUID %s?"
 msgstr ""
 
-#: View/EventBlacklists/mass_delete.ctp:10
-msgid "Delete blacklisted events"
+#: View/EventBlocklists/mass_delete.ctp:10
+msgid "Delete blocklisted events"
 msgstr ""
 
-#: View/EventBlacklists/mass_delete.ctp:12
-msgid "Are you sure you want to delete from the blacklist the selected events?"
+#: View/EventBlocklists/mass_delete.ctp:12
+msgid "Are you sure you want to delete from the blocklist the selected events?"
 msgstr ""
 
 #: View/EventDelegations/index.ctp:30
@@ -10531,21 +13058,11 @@ msgstr ""
 msgid "Recipient"
 msgstr ""
 
-#: View/EventDelegations/index.ctp:82
-#: View/Events/automation.ctp:279;286
-#: 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/EventDelegations/index.ctp:86
 msgid "Delegation index"
 msgstr ""
 
 #: View/EventDelegations/index.ctp:87
-#: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 
@@ -10623,13 +13140,7 @@ 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 ""
 
@@ -10638,11 +13149,6 @@ 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 ""
 
@@ -10662,16 +13168,135 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
+#: View/EventReports/add.ctp:6
+msgid "Add Event Report for Event #%s"
+msgstr ""
+
+#: View/EventReports/add.ctp:6
+msgid "Edit Event Report %s (event #%s)"
+msgstr ""
+
+#: View/EventReports/index.ctp:44
+msgid "Event Reports %s"
+msgstr ""
+
+#: View/EventReports/index.ctp:44
+msgid "for Event %s"
+msgstr ""
+
+#: View/EventReports/index.ctp:60
+#: View/EventReports/ajax/indexForEvent.ctp:82
+#: View/Events/resolved_misp_format.ctp:36
+#: View/Events/view.ctp:23
+#: View/Servers/preview_event.ctp:3
+#: View/ShadowAttributes/index.ctp:40
+#: View/Sightings/ajax/list_sightings.ctp:13
+msgid "Event ID"
+msgstr ""
+
+#: View/EventReports/index.ctp:67
+#: View/EventReports/view.ctp:23
+#: View/EventReports/ajax/indexForEvent.ctp:90
+msgid "Last update"
+msgstr ""
+
+#: View/EventReports/index.ctp:115
+#: View/EventReports/ajax/indexForEvent.ctp:131
+msgid "Restore report"
+msgstr ""
+
+#: View/EventReports/index.ctp:120
+#: View/EventReports/ajax/indexForEvent.ctp:136
+msgid "Are you sure you want to restore the Report?"
+msgstr ""
+
+#: View/EventReports/view_summary.ctp:3
+msgid "Event report: %s"
+msgstr ""
+
+#: View/EventReports/ajax/delete.ctp:3
+msgid "Delete Event Report"
+msgstr ""
+
+#: View/EventReports/ajax/delete.ctp:4
+msgid "report"
+msgstr ""
+
+#: View/EventReports/ajax/extractAllFromReport.ctp:6
+msgid "Automatic entities extraction"
+msgstr ""
+
+#: View/EventReports/ajax/extractAllFromReport.ctp:7
+msgid "Automatically extracting entities from a report will use the freetext import tools to extract and create attributes from the report."
+msgstr ""
+
+#: View/EventReports/ajax/extractAllFromReport.ctp:10
+msgid "Post extraction actions:"
+msgstr ""
+
+#: View/EventReports/ajax/extractAllFromReport.ctp:12
+msgid "Tag the event with contextual elements found in the report"
+msgstr ""
+
+#: View/EventReports/ajax/importReportFromUrl.ctp:5
+msgid "Import from URL (event %s)"
+msgstr ""
+
+#: View/EventReports/ajax/importReportFromUrl.ctp:13
+#: View/EventReports/ajax/indexForEvent.ctp:28
+msgid "Content for this URL will be downloaded and converted to Markdown"
+msgstr ""
+
+#: View/EventReports/ajax/indexForEvent.ctp:3
+msgid "Viewing reports in extended event view"
+msgstr ""
+
+#: View/EventReports/ajax/indexForEvent.ctp:27
+msgid "Import from URL"
+msgstr ""
+
+#: View/EventReports/ajax/indexForEvent.ctp:36
+msgid "Generate report from Event"
+msgstr ""
+
+#: View/EventReports/ajax/indexForEvent.ctp:37
+msgid "Based on filters, create a report summarizing the event"
+msgstr ""
+
+#: View/EventReports/ajax/indexForEvent.ctp:195
+msgid "Failed to load Event report table"
+msgstr ""
+
+#: View/EventReports/ajax/replaceSuggestionInReport.ctp:5
+msgid "Replace suggestions in report"
+msgstr ""
+
+#: View/EventReports/ajax/reportFromEvent.ctp:5
+msgid "Create report from event"
+msgstr ""
+
+#: View/EventReports/ajax/reportFromEvent.ctp:6
+msgid "Generate a report based on filtering criterias."
+msgstr ""
+
+#: View/EventReports/ajax/reportFromEvent.ctp:14
+msgid "REST search filters"
+msgstr ""
+
+#: View/EventReports/ajax/reportFromEvent.ctp:15
+msgid "Provide the filtering criterias for attributes to be taken into account in the report"
+msgstr ""
+
 #: View/Events/add.ctp:39
-#: View/Events/view.ctp:148
+#: View/Events/view.ctp:121
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
-#: View/Servers/preview_event.ctp:41
+#: View/Servers/preview_event.ctp:22
 msgid "Threat Level"
 msgstr ""
 
 #: View/Events/add.ctp:49
-#: View/ShadowAttributes/index.ctp:59
+#: View/Events/restore_deleted_events.ctp:14
 msgid "Event Info"
 msgstr ""
 
@@ -10721,7 +13346,7 @@ msgid "Details"
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:115
+#: View/Jobs/index.ctp:108
 msgid "Failed"
 msgstr ""
 
@@ -10734,703 +13359,774 @@ msgid "Event with this UUID already exists."
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:112
+#: View/Servers/preview_index.ctp:108
 msgid "Event "
 msgstr ""
 
-#: View/Events/automation.ctp:3
+#: View/Events/automation.ctp:6
 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:5
-msgid "You can use the <a href=\"/servers/rest\">REST client</a> to test your API queries against your MISP and export the resulting tuned queries as curl or python scripts."
+#: View/Events/automation.ctp:8
+msgid "You can use the <a href=\""
 msgstr ""
 
-#: View/Events/automation.ctp:6
+#: View/Events/automation.ctp:9
 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
-msgid "To view the old MISP automation page, click <a href=\"automation/1\">here</a>."
-msgstr ""
-
-#: View/Events/automation.ctp:11
-msgid "Your current key is: <code>%s</code>. You can %s this key."
+#: View/Events/automation.ctp:10
+msgid "To view the old MISP automation page, click <a href=\""
 msgstr ""
 
 #: View/Events/automation.ctp:15
+msgid "Your current key is: <code>%s</code>. You can %s this key."
+msgstr ""
+
+#: View/Events/automation.ctp:19
 #: View/Events/legacy_automation.ctp:8
-#: View/Users/admin_view.ctp:37
-#: View/Users/view.ctp:20
+#: View/Users/view.ctp:35
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:26
+#: View/Events/automation.ctp:25
+msgid "You can view and manage your API keys under your profile, found %s"
+msgstr ""
+
+#: View/Events/automation.ctp:40
 #: 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:27
+#: View/Events/automation.ctp:41
 #: 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:28
+#: View/Events/automation.ctp:42
 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:31
+#: View/Events/automation.ctp:45
 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:32
+#: View/Events/automation.ctp:46
 msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr ""
 
-#: View/Events/automation.ctp:33
+#: View/Events/automation.ctp:47;112
 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:34
+#: View/Events/automation.ctp:48
 #: View/Events/legacy_automation.ctp:268;297
 msgid "Search for the given value in the attributes' value field."
 msgstr ""
 
-#: View/Events/automation.ctp:35
+#: View/Events/automation.ctp:49
 #: 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:36
+#: View/Events/automation.ctp:50
 #: View/Events/legacy_automation.ctp:61;270;299
 msgid "The attribute category, any valid MISP attribute category is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:37
+#: View/Events/automation.ctp:51
 #: View/Events/legacy_automation.ctp:271;300
 msgid "Search by the creator organisation by supplying the organisation identifier."
 msgstr ""
 
-#: View/Events/automation.ctp:38
+#: View/Events/automation.ctp:52
 #: 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:39
+#: View/Events/automation.ctp:53
 #: 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:40;160
+#: View/Events/automation.ctp:54;212
 #: 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:41;161
+#: View/Events/automation.ctp:55;213
 #: 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:42
+#: View/Events/automation.ctp:56
 #: View/Events/legacy_automation.ctp:282;307
 msgid "The events that should be included / excluded from the search"
 msgstr ""
 
-#: View/Events/automation.ctp:43
+#: View/Events/automation.ctp:57
 #: 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:44
+#: View/Events/automation.ctp:58
 #: 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:45
+#: View/Events/automation.ctp:59
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
-#: View/Events/automation.ctp:46
+#: View/Events/automation.ctp:60
 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:47
+#: View/Events/automation.ctp:61
 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:48
+#: View/Events/automation.ctp:62
 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:49
+#: View/Events/automation.ctp:63
 #: 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:50
+#: View/Events/automation.ctp:64
 #: 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:51
+#: View/Events/automation.ctp:65
 #: 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:52
+#: View/Events/automation.ctp:66
 #: 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:53
+#: View/Events/automation.ctp:67
 #: 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:54
+#: View/Events/automation.ctp:68
 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:55
+#: View/Events/automation.ctp:69
 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:56
+#: View/Events/automation.ctp:70
 msgid "Filter on the event's info field."
 msgstr ""
 
-#: View/Events/automation.ctp:57
+#: View/Events/automation.ctp:71
 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:58
+#: View/Events/automation.ctp:72
 msgid "Select the ATT&CK matrix like galaxy to use when using returnFormat = attack. Defaults to the Mitre ATT&CK library via mitre-attack-pattern."
 msgstr ""
 
-#: View/Events/automation.ctp:71
+#: View/Events/automation.ctp:85
 msgid "To export all attributes of types ip-src and ip-dst that have a TLP marking and are not marked TLP:red, use the syntax below. String searches are by default exact lookups, but you can use mysql style \"%\" wildcards to do substring searches."
 msgstr ""
 
-#: View/Events/automation.ctp:88
+#: View/Events/automation.ctp:104
+msgid "Galaxy Cluster Search"
+msgstr ""
+
+#: View/Events/automation.ctp:106
+msgid "It is possible to search the database for galaxy clustesrs based on a list of criteria."
+msgstr ""
+
+#: View/Events/automation.ctp:107
+msgid "To return an cluster or a list of clusters in the JSON format, use the following syntax"
+msgstr ""
+
+#: View/Events/automation.ctp:108
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive"
+msgstr ""
+
+#: View/Events/automation.ctp:111
+msgid "Limit the number of results returned, depending on the scope (for example 10 clusters)."
+msgstr ""
+
+#: View/Events/automation.ctp:113
+msgid "Specify the exact local ID the be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:114
+msgid "Specify the exact local UUID the be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:115
+msgid "Specify the exact local ID of the galaxy containing all the clusters the be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:116
+msgid "Specify the exact local UUID of the galaxy containing all the clusters the be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:117
+msgid "Specify the publication state of the clusters to be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:118
+msgid "Specify the value of the clusters to be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:119
+msgid "Specify the UUID of the cluster that was forked by the returned clusters"
+msgstr ""
+
+#: View/Events/automation.ctp:120
+msgid "Specify the version of the cluster that was forked by the returned clusters"
+msgstr ""
+
+#: View/Events/automation.ctp:121
+msgid "Specify the version to be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:122
+msgid "Specify the distribution to be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:123
+msgid "Specify the org_id to get all clusters belonging to this organisation."
+msgstr ""
+
+#: View/Events/automation.ctp:124
+msgid "Specify the orgc_id to get all clusters that were created by this organisation."
+msgstr ""
+
+#: View/Events/automation.ctp:125
+msgid "Specify the tag name of the cluster to be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:126
+msgid "Specify if custom, default or both clusters should be returned"
+msgstr ""
+
+#: View/Events/automation.ctp:127
+msgid "Only return the UUID and the version of the returned clusters"
+msgstr ""
+
+#: View/Events/automation.ctp:140
 msgid "CSV specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:90
+#: View/Events/automation.ctp:142
 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:91
+#: View/Events/automation.ctp:143
 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:92
+#: View/Events/automation.ctp:144
 msgid "The CSV created when this setting is set to true will not contain the header row."
 msgstr ""
 
-#: View/Events/automation.ctp:95
+#: View/Events/automation.ctp:147
 msgid "URL parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:98
+#: View/Events/automation.ctp:150
 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:100
+#: View/Events/automation.ctp:152
 msgid "As you can see above, \"||\" can be used to add more values to a \"list\" and all parameters are passed as key:value components to the URL. Keep in mind, certain special characters in URLs can cause issues, your searches may end up being leaked to logs in transit and there are length limitations to take into account. Use this as a last resort."
 msgstr ""
 
-#: View/Events/automation.ctp:103
+#: View/Events/automation.ctp:155
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:104
+#: View/Events/automation.ctp:156
 #: 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:107
+#: View/Events/automation.ctp:159
 #: 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:111
+#: View/Events/automation.ctp:163
 #: 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:113
+#: View/Events/automation.ctp:165
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:117
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:118
+#: View/Events/automation.ctp:170
 #: 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:119
+#: View/Events/automation.ctp:171
 #: 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:125
+#: View/Events/automation.ctp:177
 #: 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:128
+#: View/Events/automation.ctp:180
 #: 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:146
+#: View/Events/automation.ctp:198
 #: 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:148
+#: View/Events/automation.ctp:200
 #: 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:155
+#: View/Events/automation.ctp:207
 #: 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:158
+#: View/Events/automation.ctp:210
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:159
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:162
+#: View/Events/automation.ctp:214
 #: 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:163
+#: View/Events/automation.ctp:215
 #: 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:165
+#: View/Events/automation.ctp:217
 #: 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:166
+#: View/Events/automation.ctp:218
 #: 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:169
+#: View/Events/automation.ctp:221
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:170
+#: View/Events/automation.ctp:222
 #: 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:172
+#: View/Events/automation.ctp:224
 #: 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:177
+#: View/Events/automation.ctp:229
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:178
+#: View/Events/automation.ctp:230
 #: 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:180
+#: View/Events/automation.ctp:232
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:181
+#: View/Events/automation.ctp:233
 #: 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:182
+#: View/Events/automation.ctp:234
 #: 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:183
+#: View/Events/automation.ctp:235
 #: 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:185
+#: View/Events/automation.ctp:237
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:189
+#: View/Events/automation.ctp:241
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:193
+#: View/Events/automation.ctp:245
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:194
+#: View/Events/automation.ctp:246
 #: 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:195
+#: View/Events/automation.ctp:247
 #: 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:196
+#: View/Events/automation.ctp:248
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:197
+#: View/Events/automation.ctp:249
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:199
+#: View/Events/automation.ctp:251
 #: 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:200
+#: View/Events/automation.ctp:252
 #: 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:201
+#: View/Events/automation.ctp:253
 #: 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:202
+#: View/Events/automation.ctp:254
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:263
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:264
 #: 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:213
+#: View/Events/automation.ctp:265
 #: 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:214
+#: View/Events/automation.ctp:266
 #: 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:215
+#: View/Events/automation.ctp:267
 #: 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:216
+#: View/Events/automation.ctp:268
 #: 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:217
+#: View/Events/automation.ctp:269
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:218
+#: View/Events/automation.ctp:270
 #: 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:219
+#: View/Events/automation.ctp:271
 #: 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:220
+#: View/Events/automation.ctp:272
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:221
+#: View/Events/automation.ctp:273
 #: 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:224
+#: View/Events/automation.ctp:276
 #: 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:226
+#: View/Events/automation.ctp:278
 #: 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:228
+#: View/Events/automation.ctp:280
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:229
+#: View/Events/automation.ctp:281
 #: 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:233
+#: View/Events/automation.ctp:285
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:234
-#: View/Events/legacy_automation.ctp:394
-#: View/Feeds/add.ctp:53
-#: View/Feeds/edit.ctp:84
-#: View/Feeds/index.ctp:138
-#: View/Feeds/view.ctp:5
-#: 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:235
+#: View/Events/automation.ctp:287
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:236
+#: View/Events/automation.ctp:288
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:237
+#: View/Events/automation.ctp:289
 #: View/Events/legacy_automation.ctp:397
-#: View/Servers/rest.ctp:161
+#: View/Servers/rest.ctp:162
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:294
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:244;264;265;271;272
+#: View/Events/automation.ctp:296;316;317;323;324
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:249
+#: View/Events/automation.ctp:301
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:251;258
+#: View/Events/automation.ctp:303;310
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:256
+#: View/Events/automation.ctp:308
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:263
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:270
+#: View/Events/automation.ctp:322
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:277
+#: View/Events/automation.ctp:329
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:336
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:289
+#: View/Events/automation.ctp:341
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:294
+#: View/Events/automation.ctp:346
 #: 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:296
+#: View/Events/automation.ctp:348
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:297
+#: View/Events/automation.ctp:349
 #: 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:301
+#: View/Events/automation.ctp:353
 #: 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:312
+#: View/Events/automation.ctp:364
 #: 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:313
+#: View/Events/automation.ctp:365
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:366
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:315
+#: View/Events/automation.ctp:367
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:316
+#: View/Events/automation.ctp:368
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:317
+#: View/Events/automation.ctp:369
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:318
+#: View/Events/automation.ctp:370
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:319
+#: View/Events/automation.ctp:371
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:320
+#: View/Events/automation.ctp:372
 #: 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:321
+#: View/Events/automation.ctp:373
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:322
+#: View/Events/automation.ctp:374
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:323
+#: View/Events/automation.ctp:375
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:324
+#: View/Events/automation.ctp:376
 #: 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:325
+#: View/Events/automation.ctp:377
 #: 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:328
+#: View/Events/automation.ctp:380
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:382
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:331
+#: View/Events/automation.ctp:383
 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:332
+#: View/Events/automation.ctp:384
 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:333
+#: View/Events/automation.ctp:385
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:395
 msgid "Administering the background workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:397
 msgid "You can start/stop and view the bacground workers via the API."
 msgstr ""
 
-#: View/Events/automation.ctp:346
+#: View/Events/automation.ctp:398
 msgid "Add worker"
 msgstr ""
 
-#: View/Events/automation.ctp:347
+#: View/Events/automation.ctp:399
 msgid "Stop worker"
 msgstr ""
 
-#: View/Events/automation.ctp:348
+#: View/Events/automation.ctp:400
 msgid "Get worker info"
 msgstr ""
 
-#: View/Events/contact.ctp:8
-msgid "Contact organization reporting event "
+#: View/Events/contact.ctp:4
+msgid "Contact organization reporting event %s"
 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."
+#: View/Events/contact.ctp:5
+msgid "You are about to contact the organization %s 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
+#: View/Events/contact.ctp:17
 msgid "Submit only to the person that created the event"
 msgstr ""
 
@@ -11477,21 +14173,17 @@ msgid "Loading…"
 msgstr ""
 
 #: View/Events/export.ctp:78
-#: View/Jobs/index.ctp:122
+#: View/Jobs/index.ctp:115
 msgid "Queued"
 msgstr ""
 
 #: View/Events/export.ctp:83
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:7;127
+#: View/Jobs/index.ctp:7;120
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr ""
 
-#: View/Events/export.ctp:115;144
-msgid "Download"
-msgstr ""
-
 #: View/Events/export.ctp:125
 msgid "Generate"
 msgstr ""
@@ -11598,12 +14290,6 @@ msgstr ""
 msgid "Ongoing"
 msgstr ""
 
-#: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:149
-#: View/Users/admin_filter_user_index.ctp:70
-msgid "Target"
-msgstr ""
-
 #: View/Events/filter_event_index.ctp:145
 msgid "Delete filter"
 msgstr ""
@@ -11637,52 +14323,86 @@ msgstr ""
 msgid "Paste a list of IOCs into the field below for automatic detection."
 msgstr ""
 
+#: View/Events/get_event_info_by_id.ctp:2
+msgid "Matched event"
+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."
+#: View/Events/get_event_info_by_id.ctp:7
+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:99
+#: View/Events/get_event_info_by_id.ctp:13
+#: View/Events/view.ctp:147
+#: View/Feeds/preview_event.ctp:37
+#: View/Pages/doc/using_the_system.ctp:70;177;210
+#: View/Servers/preview_event.ctp:28
+msgid "Analysis"
+msgstr ""
+
+#: View/Events/get_event_info_by_id.ctp:14
+msgid "Threat level"
+msgstr ""
+
+#: View/Events/get_event_info_by_id.ctp:16
+#: View/Events/view.ctp:177
+#: View/Feeds/preview_event.ctp:42
+#: View/Pages/doc/using_the_system.ctp:185;212
+#: View/Servers/id_translator.ctp:46
+#: View/Servers/preview_event.ctp:40
+msgid "Info"
+msgstr ""
+
+#: View/Events/import_module.ctp:72
+msgid "File upload"
+msgstr ""
+
+#: View/Events/import_module.ctp:75
+msgid "Paste Input"
+msgstr ""
+
+#: View/Events/import_module.ctp:90
 msgid "Input File"
 msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/GalaxyClusters/view.ctp:14
-#: View/Organisations/view.ctp:66;67
+#: View/GalaxyClusters/view.ctp:70
+#: View/Organisations/view.ctp:69;70
+#: View/SharingGroups/view.ctp:25
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:35
 msgid "Events"
 msgstr ""
 
-#: View/Events/index.ctp:34
-#: View/Logs/admin_index.ctp:54
-#: View/Servers/preview_index.ctp:37
+#: View/Events/index.ctp:29
+#: View/Logs/admin_index.ctp:47
+#: View/Servers/preview_index.ctp:33
 #: View/Users/admin_index.ctp:26
 msgid "Modify filters"
 msgstr ""
 
-#: View/Events/index.ctp:45
+#: View/Events/index.ctp:40
 msgid "Delete selected Events"
 msgstr ""
 
-#: View/Events/index.ctp:73
+#: View/Events/index.ctp:68
 msgid "My events only"
 msgstr ""
 
-#: View/Events/index.ctp:74
+#: View/Events/index.ctp:69
 msgid "My Events"
 msgstr ""
 
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:77
 msgid "My organisation's events only"
 msgstr ""
 
-#: View/Events/index.ctp:83
+#: View/Events/index.ctp:78
 msgid "Org Events"
 msgstr ""
 
@@ -12006,39 +14726,70 @@ msgstr ""
 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 - WARNING: this feature is very outdated and should not be used anymore."
+#: View/Events/merge.ctp:5
+msgid "Merge data from event"
 msgstr ""
 
-#: View/Events/merge.ctp:9
-msgid "Event id to copy the attributes from"
+#: View/Events/merge.ctp:6
+msgid "Merge all objects, attributes and their respective tags from the selected event into event #%s"
 msgstr ""
 
-#: View/Events/merge.ctp:20
-msgid "copy only IDS attributes"
+#: View/Events/merge.ctp:13
+msgid "Source event ID or UUID"
 msgstr ""
 
-#: View/Events/merge.ctp:26
-#: View/Organisations/ajax/merge.ctp:70
-msgid "Merge"
+#: View/Events/merge.ctp:14
+msgid "ID or UUID of the event to merge from"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:2
 msgid "Event with proposals"
 msgstr ""
 
-#: View/Events/proposal_event_index.ctp:24
+#: View/Events/proposal_event_index.ctp:18
 #: View/Pages/doc/concepts.ctp:28
-#: View/ShadowAttributes/index.ctp:2
+#: View/ShadowAttributes/index.ctp:99
 msgid "Proposals"
 msgstr ""
 
-#: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:116
+#: View/Events/proposal_event_index.ctp:19
+#: View/Events/view.ctp:89
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr ""
 
+#: View/Events/proposal_event_index.ctp:21
+#: View/Jobs/index.ctp:70
+#: 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_index.ctp:82
+#: View/Users/registrations.ctp:61
+#: View/Users/view.ctp:5
+msgid "Email"
+msgstr ""
+
+#: View/Events/recover_event.ctp:3
+msgid "Return to the event restoration index"
+msgstr ""
+
+#: View/Events/recover_event.ctp:10
+#: View/Pages/doc/using_the_system.ctp:270
+msgid "Model"
+msgstr ""
+
+#: View/Events/recover_event.ctp:20
+msgid "Data"
+msgstr ""
+
+#: View/Events/recover_event.ctp:26
+msgid "Recovery process log"
+msgstr ""
+
+#: View/Events/recover_event.ctp:27
+msgid "Below is a list of actions the recovery process would take in order to restore the event."
+msgstr ""
+
 #: View/Events/report_validation_issues_events.ctp:2
 msgid "Listing invalid event validations"
 msgstr ""
@@ -12072,11 +14823,19 @@ msgid "Similar Attributes"
 msgstr ""
 
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/resolved_misp_format.ctp:96;291
-#: View/Objects/add.ctp:117
+#: View/Events/resolved_misp_format.ctp:147;342
+#: View/Objects/add.ctp:129
 msgid "Disable Correlation"
 msgstr ""
 
+#: View/Events/resolved_attributes.ctp:53
+msgid "Tags (separated by comma)"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:108
+msgid "10 +more"
+msgstr ""
+
 #: View/Events/resolved_attributes.ctp:195
 msgid "Remove resolved attribute"
 msgstr ""
@@ -12097,37 +14856,91 @@ msgstr ""
 msgid "Update all comment fields"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:36
-#: View/Events/view.ctp:53
-#: View/Servers/preview_event.ctp:12
-#: View/Sightings/ajax/list_sightings.ctp:9
-msgid "Event ID"
-msgstr ""
-
-#: View/Events/resolved_misp_format.ctp:43
+#: View/Events/resolved_misp_format.ctp:45
 msgid "Event creator org"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:78
-msgid "#Resolved Attributes"
+#: View/Events/resolved_misp_format.ctp:80
+msgid "# of resolved Attributes"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:89;284
+#: View/Events/resolved_misp_format.ctp:81
+msgid "# of resolved Reports"
+msgstr ""
+
+#: View/Events/resolved_misp_format.ctp:92;140;335
+#: View/GalaxyClusters/update_cluster.ctp:97
 msgid "Import"
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:111
+#: View/Events/resolved_misp_format.ctp:95
+#: View/Events/show_i_o_c_results.ctp:34
+msgid "Content"
+msgstr ""
+
+#: View/Events/resolved_misp_format.ctp:162
 msgid "ID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:127
+#: View/Events/resolved_misp_format.ctp:178
 msgid "UUID: "
 msgstr ""
 
-#: View/Events/resolved_misp_format.ctp:128
+#: View/Events/resolved_misp_format.ctp:179
 msgid "Meta Category: "
 msgstr ""
 
+#: View/Events/resolved_misp_format.ctp:65
+msgid "%s (%s object)"
+msgid_plural "%s (%s objects)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: View/Events/restore_deleted_events.ctp:9
+msgid "Event Id"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:18
+#: View/Organisations/view.ctp:31
+msgid "Creation time"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:23
+msgid "Deletion time"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:28;38
+msgid "Event Creator"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:33
+msgid "Event Owner"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:43
+msgid "Deleted By"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:49
+msgid "Below are a list of events that can be recovered via the log entries. Make sure that your log table is well indexed (adding indeces to `model`, `model_id`, `created` and `action` highly recommended)."
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:57
+msgid "Mock the recovery process and output the potential changes"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:59
+msgid "Are you sure you want to mock the recovery of the event? No data will be modified, but the request might take some time."
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:67
+msgid "Execute the recovery process"
+msgstr ""
+
+#: View/Events/restore_deleted_events.ctp:69
+msgid "Are you sure you want to attempt to recover the event?"
+msgstr ""
+
 #: View/Events/show_i_o_c_results.ctp:2
 msgid ">Results of the import"
 msgstr ""
@@ -12140,13 +14953,6 @@ msgstr ""
 msgid "Successfully added attributes"
 msgstr ""
 
-#: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Feeds/preview_event.ctp:11
-#: 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 ""
@@ -12155,10 +14961,6 @@ msgstr ""
 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 ""
@@ -12183,200 +14985,240 @@ msgstr ""
 msgid "Include the original imported file as attachment"
 msgstr ""
 
-#: View/Events/view.ctp:61
+#: View/Events/view.ctp:31
 msgid "Extend this event"
 msgstr ""
 
-#: View/Events/view.ctp:67
+#: View/Events/view.ctp:36
+msgid "Check this event on different servers"
+msgstr ""
+
+#: View/Events/view.ctp:42
 #: View/Feeds/preview_event.ctp:13
+#: View/Servers/preview_event.ctp:5
 msgid "Source Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:76
+#: View/Events/view.ctp:51
+#: View/Servers/preview_event.ctp:6
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:154
-#: View/Feeds/preview_event.ctp:37
-#: View/Pages/doc/using_the_system.ctp:70;177;210
-#: View/Servers/preview_event.ctp:48
-msgid "Analysis"
+#: View/Events/view.ctp:140
+msgid "Undisclosed sharing group"
 msgstr ""
 
-#: View/Events/view.ctp:178
+#: View/Events/view.ctp:141
+msgid "your organisation is the local owner of this event, however it is not explicitly listed in the sharing group."
+msgstr ""
+
+#: View/Events/view.ctp:171
 msgid "Toggle advanced sharing network viewer"
 msgstr ""
 
-#: View/Events/view.ctp:184
-#: View/Feeds/preview_event.ctp:42
-#: View/Pages/doc/using_the_system.ctp:185;212
-msgid "Info"
-msgstr ""
-
-#: View/Events/view.ctp:188
+#: View/Events/view.ctp:181
 #: View/Feeds/preview_event.ctp:55;60;65
+#: View/GalaxyClusters/view.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:76
 #: View/Pages/doc/using_the_system.ctp:160;213
-#: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:112
+#: View/Servers/preview_event.ctp:44
+#: View/Servers/preview_index.ctp:108
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:194
-msgid " (%s Objects)"
-msgstr ""
-
-#: View/Events/view.ctp:194
-msgid " (%s Object)"
-msgstr ""
-
-#: View/Events/view.ctp:196
+#: View/Events/view.ctp:189
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:200
+#: View/Events/view.ctp:193
 msgid "First recorded change"
 msgstr ""
 
-#: View/Events/view.ctp:204
+#: View/Events/view.ctp:197
+#: View/Servers/preview_event.ctp:50
 msgid "Last change"
 msgstr ""
 
-#: View/Events/view.ctp:208
+#: View/Events/view.ctp:201
 msgid "Modification map"
 msgstr ""
 
-#: View/Events/view.ctp:214
+#: View/Events/view.ctp:207
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:233
+#: View/Events/view.ctp:226
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:240
+#: View/Events/view.ctp:231
+msgid "Currently in %s view."
+msgstr ""
+
+#: View/Events/view.ctp:233
 msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:240
+#: View/Events/view.ctp:233
 msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:271
+#: View/Events/view.ctp:240
+msgid "Switch to atomic view"
+msgstr ""
+
+#: View/Events/view.ctp:240
+msgid "Switch to extended view"
+msgstr ""
+
+#: View/Events/view.ctp:264
 msgid "%s has requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:270
 msgid "%s has requested that you take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:283
+#: View/Events/view.ctp:276
 msgid "You have requested that %s take over this event."
 msgstr ""
 
-#: View/Events/view.ctp:288
+#: View/Events/view.ctp:281
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:300
+#: View/Events/view.ctp:293
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:310
-#: View/Users/admin_index.ctp:155
-#: View/Users/admin_view.ctp:97
+#: View/Events/view.ctp:304
+#: View/Taxonomies/index.ctp:22
+#: View/Users/admin_index.ctp:48;172
+#: View/Users/view.ctp:113
+#: View/Warninglists/index.ctp:30
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:319
+#: View/Events/view.ctp:313
 #: View/Warninglists/view.ctp:24
 msgid "enable"
 msgstr ""
 
-#: View/Events/view.ctp:319
+#: View/Events/view.ctp:313
 #: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:330
+#: View/Events/view.ctp:323
 msgid "Extended view"
 msgstr ""
 
-#: View/Events/view.ctp:337
+#: View/Events/view.ctp:330
 msgid "Warning: Taxonomy inconsistencies"
 msgstr ""
 
-#: View/Events/view.ctp:382
+#: View/Events/view.ctp:374
 #: View/Feeds/preview_event.ctp:84
-#: View/Servers/preview_event.ctp:112
+#: View/Servers/preview_event.ctp:85
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:443;478
+#: View/Events/view.ctp:400
+msgid "Related Feeds"
+msgstr ""
+
+#: View/Events/view.ctp:400
+msgid "Show just attributes that has feed hits"
+msgstr ""
+
+#: View/Events/view.ctp:400;485
+msgid "(show)"
+msgstr ""
+
+#: View/Events/view.ctp:439;474
 msgid "This event has "
 msgstr ""
 
-#: View/Events/view.ctp:444;479
+#: View/Events/view.ctp:440;475
 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:487
+#: View/Events/view.ctp:484
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:503
+#: View/Events/view.ctp:485
+msgid "Show just attributes that has warning"
+msgstr ""
+
+#: View/Events/view.ctp:501
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:503
+#: View/Events/view.ctp:501
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:506
+#: View/Events/view.ctp:504
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:506
-msgid "Galaxy"
-msgstr ""
-
-#: View/Events/view.ctp:509
+#: View/Events/view.ctp:507
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:512
+#: View/Events/view.ctp:510
 msgid "Toggle Event timeline"
 msgstr ""
 
-#: View/Events/view.ctp:512
+#: View/Events/view.ctp:510
 msgid "Event timeline"
 msgstr ""
 
-#: View/Events/view.ctp:515
+#: View/Events/view.ctp:513
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:515
+#: View/Events/view.ctp:513
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:518
+#: View/Events/view.ctp:516
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:518
+#: View/Events/view.ctp:516
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:521
+#: View/Events/view.ctp:519
+msgid "Toggle reports"
+msgstr ""
+
+#: View/Events/view.ctp:519
+msgid "Event reports"
+msgstr ""
+
+#: View/Events/view.ctp:522
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:524
+#: View/Events/view.ctp:525
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:524
-msgid "Discussion"
+#: View/Events/view.ctp:548
+msgid "Event Reports"
+msgstr ""
+
+#: View/Events/view.ctp:187
+msgid " (%s Object)"
+msgid_plural " (%s Objects)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: View/Events/view_cluster_relations.ctp:3
+msgid "There are no Cluster relationships in this Event."
 msgstr ""
 
 #: View/Events/view_graph.ctp:20
@@ -12444,7 +15286,8 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:28
-#: View/Feeds/index.ctp:161
+#: View/Feeds/index.ctp:162
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:25
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -12501,12 +15344,6 @@ msgstr ""
 msgid "Feed name"
 msgstr ""
 
-#: View/Feeds/add.ctp:26
-#: View/Feeds/index.ctp:119
-#: View/Feeds/view.ctp:31
-msgid "Provider"
-msgstr ""
-
 #: View/Feeds/add.ctp:27
 #: View/Feeds/edit.ctp:32
 msgid "Name of the content provider"
@@ -12555,9 +15392,9 @@ msgstr ""
 #: View/Feeds/edit.ctp:64
 #: View/Pages/doc/administration.ctp:88;117
 #: View/Users/admin_add.ctp:40
-#: View/Users/admin_edit.ctp:40
+#: View/Users/admin_edit.ctp:48
 #: View/Users/change_pw.ctp:9
-#: View/Users/edit.ctp:13
+#: View/Users/edit.ctp:14
 msgid "Password"
 msgstr ""
 
@@ -12681,8 +15518,8 @@ msgstr ""
 
 #: View/Feeds/add.ctp:218
 #: View/Feeds/edit.ctp:218
-#: View/Servers/add.ctp:116
-#: View/Servers/edit.ctp:155;162
+#: View/Servers/add.ctp:118
+#: View/Servers/edit.ctp:157;164
 msgid "Modify"
 msgstr ""
 
@@ -12711,53 +15548,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr ""
 
 #: View/Feeds/edit.ctp:234
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:190
+#: View/Servers/add.ctp:148
+#: View/Servers/edit.ctp:192
 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:235
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:149
+#: View/Servers/edit.ctp:191
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
 #: View/Feeds/edit.ctp:236
-#: View/Servers/add.ctp:148
-#: View/Servers/edit.ctp:191
+#: View/Servers/add.ctp:150
+#: View/Servers/edit.ctp:193
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:237
-#: View/Servers/add.ctp:149
-#: View/Servers/edit.ctp:192
+#: View/Servers/add.ctp:151
+#: View/Servers/edit.ctp:194
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
 #: View/Feeds/edit.ctp:238
-#: View/Servers/add.ctp:150
-#: View/Servers/edit.ctp:193
+#: View/Servers/add.ctp:152
+#: View/Servers/edit.ctp:195
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:239
-#: View/Servers/edit.ctp:194
+#: View/Servers/edit.ctp:196
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:240
-#: View/Servers/edit.ctp:195
+#: View/Servers/edit.ctp:197
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:241
-#: View/Servers/edit.ctp:196
+#: View/Servers/edit.ctp:198
 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:242
-#: View/Servers/add.ctp:154
-#: View/Servers/edit.ctp:198
+#: View/Servers/add.ctp:156
+#: View/Servers/edit.ctp:200
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -12769,7 +15606,7 @@ msgstr ""
 msgid "Fetch selected"
 msgstr ""
 
-#: View/Feeds/freetext_index.ctp:35
+#: View/Feeds/freetext_index.ctp:31
 msgid "Correlations"
 msgstr ""
 
@@ -12821,7 +15658,7 @@ msgstr ""
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:100;203
+#: View/Feeds/index.ctp:100;205
 msgid "Caching"
 msgstr ""
 
@@ -12829,84 +15666,76 @@ msgstr ""
 msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
 msgstr ""
 
-#: View/Feeds/index.ctp:113
+#: View/Feeds/index.ctp:114
 msgid "Format"
 msgstr ""
 
-#: View/Feeds/index.ctp:132
-#: View/GalaxyClusters/view.ctp:11
-#: 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/Feeds/index.ctp:144
-#: View/Servers/rest.ctp:164
+#: View/Feeds/index.ctp:145
+#: View/Servers/rest.ctp:166
 msgid "Headers"
 msgstr ""
 
-#: View/Feeds/index.ctp:168
+#: View/Feeds/index.ctp:169
 msgid "Delta"
 msgstr ""
 
-#: View/Feeds/index.ctp:169
+#: View/Feeds/index.ctp:170
 msgid "Delta Merge strategy - align the local feed with the remote state"
 msgstr ""
 
-#: View/Feeds/index.ctp:176
+#: View/Feeds/index.ctp:177
 msgid "Override"
 msgstr ""
 
-#: View/Feeds/index.ctp:177
+#: View/Feeds/index.ctp:178
 msgid "Override the IDS flags and set all derived attribute to IDS off"
 msgstr ""
 
-#: View/Feeds/index.ctp:196
+#: View/Feeds/index.ctp:198
 msgid "Visible"
 msgstr ""
 
-#: View/Feeds/index.ctp:211
+#: View/Feeds/index.ctp:214
 msgid "Feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:212
+#: View/Feeds/index.ctp:215
 msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
 msgstr ""
 
-#: View/Feeds/index.ctp:216
+#: View/Feeds/index.ctp:219
 msgid "Load default feed metadata"
 msgstr ""
 
-#: View/Feeds/index.ctp:228
+#: View/Feeds/index.ctp:231
 msgid "Cache all feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:234
+#: View/Feeds/index.ctp:237
 msgid "Cache freetext/CSV feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:240
+#: View/Feeds/index.ctp:243
 msgid "Cache MISP feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:247
+#: View/Feeds/index.ctp:250
 msgid "Fetch and store all feed data"
 msgstr ""
 
-#: View/Feeds/index.ctp:255
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:261
+#: View/Feeds/index.ctp:264
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:294
+#: View/Feeds/index.ctp:297
 msgid "Are you sure you want to permanently remove the feed?"
 msgstr ""
 
-#: View/Feeds/index.ctp:302
+#: View/Feeds/index.ctp:305
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -12918,12 +15747,12 @@ msgstr ""
 msgid "You are currently viewing the event index of a feed (%s by %s)."
 msgstr ""
 
-#: View/Feeds/preview_index.ctp:44
+#: View/Feeds/preview_index.ctp:40
 msgid "Timestamp"
 msgstr ""
 
-#: View/Feeds/preview_index.ctp:72
-#: View/Servers/preview_index.ctp:173
+#: View/Feeds/preview_index.ctp:68
+#: View/Servers/preview_index.ctp:169
 msgid "Fetch the event"
 msgstr ""
 
@@ -12959,34 +15788,136 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
-#: View/Galaxies/index.ctp:35
+#: View/Galaxies/export.ctp:6
+msgid "Export galaxy: %s"
+msgstr ""
+
+#: View/Galaxies/export.ctp:10
+msgid "Clusters' distribution:"
+msgstr ""
+
+#: View/Galaxies/export.ctp:19
+msgid "Include Custom Clusters"
+msgstr ""
+
+#: View/Galaxies/export.ctp:25
+msgid "Include Default Clusters"
+msgstr ""
+
+#: View/Galaxies/export.ctp:31
+msgid "Export format"
+msgstr ""
+
+#: View/Galaxies/export.ctp:33
+msgid "MISP Format"
+msgstr ""
+
+#: View/Galaxies/export.ctp:33
+msgid "To re-import in another MISP"
+msgstr ""
+
+#: View/Galaxies/export.ctp:34
+msgid "misp-galaxy format"
+msgstr ""
+
+#: View/Galaxies/export.ctp:34
+msgid "Usable to be integrated into the official repository"
+msgstr ""
+
+#: View/Galaxies/export.ctp:38
+msgid "Warning!"
+msgstr ""
+
+#: View/Galaxies/export.ctp:38
+msgid "The exported JSON will not contain the `category` key. Also, other keys such as `authors` and `version` may need to be adjusted manually."
+msgstr ""
+
+#: View/Galaxies/export.ctp:42
+msgid "Export type"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:5
+#: View/Galaxies/relations_graph.ctp:4
+msgid "Back to galaxy"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:8
+msgid "%s galaxy cluster extensions"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:126
+msgid "Update cluster to parent's new version"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:162
+msgid "Latest version of the parent cluster"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:253
+msgid "Version:"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:254
+msgid "ID:"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:256
+msgid "Description:"
+msgstr ""
+
+#: View/Galaxies/fork_tree.ctp:274
+msgid "Galaxy elements:"
+msgstr ""
+
+#: View/Galaxies/import.ctp:9
+msgid "Import galaxy clusters"
+msgstr ""
+
+#: View/Galaxies/import.ctp:10
+msgid "Paste a JSON of cluster to import or provide a JSON file below."
+msgstr ""
+
+#: View/Galaxies/import.ctp:18
+msgid "Galaxy JSON"
+msgstr ""
+
+#: View/Galaxies/index.ctp:23
 msgid "Galaxy Id"
 msgstr ""
 
-#: View/Galaxies/index.ctp:43
+#: View/Galaxies/index.ctp:31
 msgid "Icon"
 msgstr ""
 
-#: View/Galaxies/index.ctp:55
-#: View/Noticelists/index.ctp:35
+#: View/Galaxies/index.ctp:43
+#: View/Noticelists/index.ctp:28
 msgid "version"
 msgstr ""
 
-#: View/Galaxies/index.ctp:60
+#: View/Galaxies/index.ctp:48
 #: View/Galaxies/view.ctp:7
 #: View/Sightingdb/index.ctp:71
-#: View/Taxonomies/view.ctp:9
+#: View/Taxonomies/index.ctp:43
+#: View/Taxonomies/view.ctp:15
 msgid "Namespace"
 msgstr ""
 
-#: View/Galaxies/index.ctp:69
+#: View/Galaxies/index.ctp:57
 msgid "Galaxy index"
 msgstr ""
 
-#: View/Galaxies/index.ctp:85
+#: View/Galaxies/index.ctp:73
 msgid "Are you sure you want to delete the Galaxy?"
 msgstr ""
 
+#: View/Galaxies/relations_graph.ctp:7
+msgid "%s galaxy cluster relationships"
+msgstr ""
+
+#: View/Galaxies/relations_graph.ctp:10
+msgid "There are no relations in this Galaxy"
+msgstr ""
+
 #: View/Galaxies/view.ctp:5
 msgid "Galaxy ID"
 msgstr ""
@@ -12995,67 +15926,430 @@ msgstr ""
 msgid "Kill chain order"
 msgstr ""
 
+#: View/GalaxyClusterBlocklists/add.ctp:5
+msgid "(Optional) The cluster value that you would like to block"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:6
+msgid "(Optional) Any comments you would like to add regarding this (or these) entries"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:11
+msgid "Add block entry for Galaxy Cluster"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:11
+msgid "Edit block entry for Galaxy Cluster"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:16
+msgid "Cluster UUID"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:20
+#: View/GalaxyClusterRelations/add.ctp:24
+msgid "Pick target cluster"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/add.ctp:32
+#: View/GalaxyClusterBlocklists/index.ctp:50
+msgid "Cluster value"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/index.ctp:13
+msgid "+ Add entry to blocklist"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/index.ctp:39
+msgid "Galaxy Cluster UUID"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/index.ctp:62
+msgid "Galaxy Cluster Blocklist Index"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/index.ctp:63
+msgid "List all galaxy clusters that will be prevented to be created (also via synchronization) on this instance"
+msgstr ""
+
+#: View/GalaxyClusterBlocklists/index.ctp:80
+msgid "Are you sure you want to delete the entry?"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:3
+msgid "relationships which can be used to link clusters together and explain the context of the relationship."
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:8
+msgid "Galaxy Cluster Relationship"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:12
+#: View/GalaxyClusters/view_relations.ctp:90
+msgid "Source UUID"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:15
+msgid "Pick source cluster"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:21
+#: View/GalaxyClusters/view_relations.ctp:104
+#: View/ObjectReferences/ajax/add.ctp:42
+msgid "Target UUID"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:41
+#: View/GalaxyClusterRelations/index.ctp:69
+#: View/GalaxyClusters/view_relations.ctp:27
+msgid "Relationship Type"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:42
+msgid "is-similar"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:45
+msgid "Pick type"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:51
+msgid "Tag list"
+msgstr ""
+
+#: View/GalaxyClusterRelations/add.ctp:55
+msgid "Pick tags"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:19
+msgid "Default Galaxy Cluster Relations"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:24
+msgid "Custom Galaxy Cluster Relations"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:51
+msgid "Galaxy Cluster Source"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:60
+msgid "Galaxy Cluster Target"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:75
+#: View/GalaxyClusters/view_relations.ctp:32
+msgid "Relationship Tag"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:96
+#: View/GalaxyClusters/ajax/index.ctp:109
+msgid "Creator Org"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:113
+msgid "Galaxy Cluster Relationships Index"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:114
+msgid "List all relationships between Galaxy Clusters"
+msgstr ""
+
+#: View/GalaxyClusterRelations/index.ctp:146
+#: View/GalaxyClusters/view_relations.ctp:72
+msgid "Are you sure you want to delete the Relationship?"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:20
+msgid "Fork Galaxy Cluster"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:20
+msgid "Add Galaxy Cluster"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:21
+msgid "Edit Galaxy Cluster"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:43
+msgid "Forked Cluster data"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:77
+msgid "Galaxy Cluster Elements"
+msgstr ""
+
+#: View/GalaxyClusters/add.ctp:82
+msgid "Toggle UI"
+msgstr ""
+
 #: View/GalaxyClusters/cluster_matrix.ctp:1
 msgid "Toggle ATT&CK Matrix"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:5
-msgid "Cluster ID"
+#: View/GalaxyClusters/update_cluster.ctp:2
+msgid "Merge updates from parent cluster"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:7
-msgid "Parent Galaxy"
+#: View/GalaxyClusters/update_cluster.ctp:4
+msgid "No new version available"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:10
-msgid "Collection UUID"
+#: View/GalaxyClusters/update_cluster.ctp:6
+msgid "This interface allows you to update the selected cluster to the latest version of its parent."
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:12
-msgid "Authors"
+#: View/GalaxyClusters/update_cluster.ctp:7
+msgid "You can pick galaxy cluster's elements to import from the parent to the selected cluster."
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:13
-msgid "Connector tag"
+#: View/GalaxyClusters/update_cluster.ctp:11
+msgid "Parent fork elements"
 msgstr ""
 
-#: View/GalaxyClusters/view.ctp:18
-msgid "event(s)"
+#: View/GalaxyClusters/update_cluster.ctp:13
+msgid "Version: %s (newer)"
 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 %s?<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:46
-msgid "Synonyms"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:59
-msgid "#Events"
-msgstr ""
-
-#: View/GalaxyClusters/ajax/index.ctp:94
-msgid "Are you sure you want to delete the Galaxy Cluster?"
-msgstr ""
-
-#: View/GalaxyElements/ajax/index.ctp:22
+#: View/GalaxyClusters/update_cluster.ctp:18;46;84
+#: View/GalaxyElements/ajax/index.ctp:51
 msgid "Key"
 msgstr ""
 
-#: View/Helper/GenericPickerHelper.php:90
+#: View/GalaxyClusters/update_cluster.ctp:25;53
+msgid "No cluster element"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:39
+msgid "Current elements"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:41
+msgid "Parent version: %s (older)"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:73
+msgid "You are all set!"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:73
+msgid "There are no new elements to be added from the parent cluster"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:78
+msgid "Elements in parent fork but not in this cluster"
+msgstr ""
+
+#: View/GalaxyClusters/update_cluster.ctp:86
+msgid "Import element into the cluster"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:11
+msgid "%s (version: %s)"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:17
+msgid "New version available! <a href=\"%s\">Update cluster to version <b>%s</b></a>"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:31
+msgid "%s (parent version: %s)"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:41
+msgid "Cluster ID"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:43
+msgid "Parent Galaxy"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:49
+msgid "Collection UUID"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:56
+msgid "Authors"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:66
+msgid "Creator Organisation"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:69
+msgid "Connector tag"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:78
+msgid "Forked From"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:81
+msgid "Forked By"
+msgstr ""
+
+#: View/GalaxyClusters/view.ctp:73
+#: View/SharingGroups/view.ctp:26
+msgid "%s event"
+msgid_plural "%s events"
+msgstr[0] ""
+msgstr[1] ""
+
+#: View/GalaxyClusters/view_relations.ctp:19
+msgid "Galaxy Cluster Target (galaxy :: cluster)"
+msgstr ""
+
+#: View/GalaxyClusters/view_relations.ctp:81
+msgid "Toggle Cluster relationships"
+msgstr ""
+
+#: View/GalaxyClusters/view_relations.ctp:94
+#: View/ObjectReferences/ajax/add.ctp:10;17
+msgid "Relationship type"
+msgstr ""
+
+#: View/GalaxyClusters/view_relations.ctp:96
+msgid "custom"
+msgstr ""
+
+#: View/GalaxyClusters/view_relations.ctp:96
+msgid "-- Custom relationship --"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:2
+msgid "Galaxy Cluster Deletion"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:4
+msgid "Are you sure you want to delete Galaxy Cluster %s (%s)?"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:6
+msgid "%s a cluster propagates the deletion to other instances and lets you restore it in the future"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:7
+msgid "%s a cluster permanentaly deletes it and prevents it be created again by blocklisting it"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "For default clusters, you can restore the cluster at any time by force updating your galaxies"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:29
+msgid "Custom"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:38
+msgid "My Clusters"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:48
+msgid "View Fork Tree"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:53
+msgid "View Galaxy Relationships"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:92
+msgid "Synonyms"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:134
+msgid "#Events"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:139
+msgid "#Relations"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:144
+msgid "cluster"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:145
+msgid "is being targeted by"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:146
+msgid "targets"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:189
+msgid "Are you sure you want to restore the Galaxy Cluster?"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:211
+msgid "Are you sure you want to publish the Galaxy Cluster?"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:6
+msgid "Publish cluster %s"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:8
+msgid "Unpublish cluster %s"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:16
+msgid "Are you sure you wish to publish the cluster?"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/publishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the cluster?"
+msgstr ""
+
+#: View/GalaxyElements/ajax/delete.ctp:3
+msgid "Delete Galaxy Cluster Element"
+msgstr ""
+
+#: View/GalaxyElements/ajax/delete.ctp:4
+msgid "galaxy element"
+msgstr ""
+
+#: View/GalaxyElements/ajax/flattenJson.ctp:6
+msgid "Convert JSON into galaxy cluster's elements"
+msgstr ""
+
+#: View/GalaxyElements/ajax/index.ctp:12
+msgid "Tabular view"
+msgstr ""
+
+#: View/GalaxyElements/ajax/index.ctp:22
+msgid "JSON view"
+msgstr ""
+
+#: View/GalaxyElements/ajax/index.ctp:39
+msgid "Add JSON as cluster's elements"
+msgstr ""
+
+#: View/GalaxyElements/ajax/index.ctp:40
+msgid "The provided JSON will be converted into Galaxy Cluster Elements"
+msgstr ""
+
+#: View/Helper/GenericPickerHelper.php:87
 msgid "Start the galaxy matrix picker"
 msgstr ""
 
+#: View/Helper/GenericPickerHelper.php:92
+msgid "Use the picker instead"
+msgstr ""
+
+#: View/Helper/IconHelper.php:27
+msgid "Flag of %s"
+msgstr ""
+
+#: View/Helper/PivotHelper.php:28
+msgid "Remove pivot"
+msgstr ""
+
 #: View/Inbox/index.ctp:31
 #: 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
+#: View/Threads/index.ctp:15
 msgid "Title"
 msgstr ""
 
@@ -13084,70 +16378,70 @@ msgstr ""
 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:50
+#: View/Jobs/index.ctp:43
 msgid "Completed."
 msgstr ""
 
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:59
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:72
+#: View/Jobs/index.ctp:65
 msgid "Show default queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:78
+#: View/Jobs/index.ctp:71
 msgid "Show email queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:83
+#: View/Jobs/index.ctp:76
 msgid "Cache"
 msgstr ""
 
-#: View/Jobs/index.ctp:84
+#: View/Jobs/index.ctp:77
 msgid "Show cache queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:97
+#: View/Jobs/index.ctp:90
 msgid "Date created"
 msgstr ""
 
-#: View/Jobs/index.ctp:98
+#: View/Jobs/index.ctp:91
 msgid "Date modified"
 msgstr ""
 
-#: View/Jobs/index.ctp:99
+#: View/Jobs/index.ctp:92
 msgid "Process ID"
 msgstr ""
 
-#: View/Jobs/index.ctp:100
+#: View/Jobs/index.ctp:93
 #: View/Pages/doc/administration.ctp:223
 msgid "Worker"
 msgstr ""
 
-#: View/Jobs/index.ctp:101
+#: View/Jobs/index.ctp:94
 msgid "Job type"
 msgstr ""
 
-#: View/Jobs/index.ctp:102
+#: View/Jobs/index.ctp:95
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr ""
 
-#: View/Jobs/index.ctp:106
+#: View/Jobs/index.ctp:99
 #: View/Pages/doc/administration.ctp:229
 msgid "Retries"
 msgstr ""
 
-#: View/Jobs/index.ctp:118
+#: View/Jobs/index.ctp:111
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:122
+#: View/Jobs/index.ctp:115
 msgid "Running"
 msgstr ""
 
-#: View/Jobs/index.ctp:150
+#: View/Jobs/index.ctp:143
 msgid "View stacktrace"
 msgstr ""
 
@@ -13209,17 +16503,16 @@ msgid "from IP"
 msgstr ""
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:67
+#: View/ObjectTemplates/index.ctp:60
 #: View/ObjectTemplates/view.ctp:5
-#: View/Sightings/ajax/list_sightings.ctp:6
+#: View/Sightings/ajax/list_sightings.ctp:10
 #: View/TagCollections/index.ctp:13
 #: View/Templates/view.ctp:33
 #: View/UserSettings/index.ctp:35
 #: View/Users/accept_registrations.ctp:64
 #: View/Users/admin_add.ctp:51
-#: View/Users/admin_edit.ctp:51
-#: View/Users/admin_view.ctp:17
-#: View/Users/view.ctp:5
+#: View/Users/admin_edit.ctp:59
+#: View/Users/view.ctp:14
 msgid "Organisation"
 msgstr ""
 
@@ -13250,7 +16543,7 @@ msgid "Edit news message"
 msgstr ""
 
 #: View/News/index.ctp:24
-msgid "Are you sure you want to delete news item # %s?"
+msgid "Are you sure you want to delete news item #%s?"
 msgstr ""
 
 #: View/News/index.ctp:47
@@ -13261,43 +16554,40 @@ msgstr ""
 msgid "Noticelists"
 msgstr ""
 
-#: View/Noticelists/index.ctp:32
+#: View/Noticelists/index.ctp:25
 msgid "Expanded name"
 msgstr ""
 
-#: View/Noticelists/index.ctp:33
+#: View/Noticelists/index.ctp:26
 msgid "ref"
 msgstr ""
 
-#: View/Noticelists/index.ctp:34
+#: View/Noticelists/index.ctp:27
 msgid "geographical_area"
 msgstr ""
 
-#: View/Noticelists/index.ctp:36
-#: View/Pages/doc/using_the_system.ctp:371
-msgid "enabled"
-msgstr ""
-
 #: View/Noticelists/view.ctp:21
-#: View/Taxonomies/view.ctp:29
+#: View/Taxonomies/view.ctp:8
 msgid "(disable)"
 msgstr ""
 
 #: View/Noticelists/view.ctp:21
-#: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:29;155
+#: View/Taxonomies/index.ctp:110
+#: View/Taxonomies/view.ctp:8;144
+#: View/Warninglists/index.ctp:115
 #: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr ""
 
 #: View/Noticelists/view.ctp:23
-#: View/Taxonomies/view.ctp:31
+#: View/Taxonomies/view.ctp:10
 msgid "(enable)"
 msgstr ""
 
 #: View/Noticelists/view.ctp:23
-#: View/Taxonomies/index.ctp:45
-#: View/Taxonomies/view.ctp:31;159
+#: View/Taxonomies/index.ctp:92
+#: View/Taxonomies/view.ctp:10;148
+#: View/Warninglists/index.ctp:97
 #: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr ""
@@ -13314,14 +16604,6 @@ msgstr ""
 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"
@@ -13347,33 +16629,33 @@ msgstr ""
 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:19
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:17
 msgid "Object relation"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:21
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:19
 msgid "Multiple"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:22
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:20
 msgid "UI-priority"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:24
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:22
 #: 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
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:23
 msgid "Sane defaults"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:26
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:24
 msgid "List of valid Values"
 msgstr ""
 
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:27
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:25
 msgid "Disable correlation"
 msgstr ""
 
@@ -13381,134 +16663,140 @@ msgstr ""
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:60
+#: View/ObjectTemplates/index.ctp:53
+#: View/Users/admin_index.ctp:43
 msgid "Active"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:71
-#: View/ObjectTemplates/view.ctp:26
+#: View/ObjectTemplates/index.ctp:64
+#: View/ObjectTemplates/view.ctp:28
 msgid "Requirements"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:124
+#: View/ObjectTemplates/index.ctp:117
 msgid "Force update"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:124
+#: View/ObjectTemplates/index.ctp:117
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:125
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:33
+#: View/ObjectTemplates/view.ctp:35
 msgid " Object Template"
 msgstr ""
 
-#: View/Objects/add.ctp:7
+#: View/Objects/add.ctp:11
 msgid " Object"
 msgstr ""
 
-#: View/Objects/add.ctp:10
+#: View/Objects/add.ctp:14
 #: View/Objects/group_attributes_into_object.ctp:6
 msgid "Object Template"
 msgstr ""
 
-#: View/Objects/add.ctp:15
+#: View/Objects/add.ctp:19
 msgid "Update the template of this object to the newer version: "
 msgstr ""
 
-#: View/Objects/add.ctp:17
-msgid "Update template"
+#: View/Objects/add.ctp:21
+msgid "Update template to v%s"
 msgstr ""
 
-#: View/Objects/add.ctp:43
+#: View/Objects/add.ctp:47
 #: View/Objects/group_attributes_into_object.ctp:10
 msgid "Meta category"
 msgstr ""
 
-#: View/Objects/add.ctp:98
+#: View/Objects/add.ctp:110
 msgid "Warning, issues found with the template"
 msgstr ""
 
-#: View/Objects/add.ctp:111
-msgid "Save"
-msgstr ""
-
-#: View/Objects/add.ctp:112
+#: View/Objects/add.ctp:124
 msgid "Name :: type"
 msgstr ""
 
-#: View/Objects/add.ctp:169;180
+#: View/Objects/add.ctp:181;192
 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:184
+#: View/Objects/add.ctp:196
 msgid "Back"
 msgstr ""
 
-#: View/Objects/add.ctp:196
-msgid "Pre-update object's template"
+#: View/Objects/add.ctp:208
+msgid "Current Object state on older template version"
 msgstr ""
 
-#: View/Objects/add.ctp:202
-#: View/Objects/group_attributes_into_object.ctp:54
-#: View/Organisations/ajax/merge.ctp:56;63
-#: View/Pages/doc/using_the_system.ctp:163;203
-msgid "ID"
-msgstr ""
-
-#: View/Objects/add.ctp:218
-#: View/Objects/revise_object.ctp:45
+#: View/Objects/add.ctp:230
+#: View/Objects/revise_object.ctp:9
 msgid "Template version"
 msgstr ""
 
-#: View/Objects/add.ctp:225;285
+#: View/Objects/add.ctp:233
+msgid "The original object's template is unkown and some attributes might be lost. Please review carefully"
+msgstr ""
+
+#: View/Objects/add.ctp:234
+msgid "Unkown original template"
+msgstr ""
+
+#: View/Objects/add.ctp:242
+msgid "Obj. rel."
+msgstr ""
+
+#: View/Objects/add.ctp:243
+msgid "Categ."
+msgstr ""
+
+#: View/Objects/add.ctp:250;310
 msgid "Can not be merged automatically"
 msgstr ""
 
-#: View/Objects/add.ctp:230;290
+#: View/Objects/add.ctp:255;315
 msgid "This attribute type is missing from the new template. It will be lost if not taken care of right now."
 msgstr ""
 
-#: View/Objects/add.ctp:252
+#: View/Objects/add.ctp:277
 msgid "Insert"
 msgstr ""
 
-#: View/Objects/add.ctp:255
+#: View/Objects/add.ctp:280
 msgid "No valid type. This attribute will be lost."
 msgstr ""
 
-#: View/Objects/add.ctp:262
+#: View/Objects/add.ctp:287
 msgid "This attribute can be merged automatically. Injection in the template done."
 msgstr ""
 
-#: View/Objects/add.ctp:277
+#: View/Objects/add.ctp:302
 msgid "Attributes to merge"
 msgstr ""
 
-#: View/Objects/add.ctp:278
+#: View/Objects/add.ctp:303
 msgid "Contextual information and actions"
 msgstr ""
 
-#: View/Objects/add.ctp:288
+#: View/Objects/add.ctp:313
 msgid "Overwrite the current attribute value with this one"
 msgstr ""
 
-#: View/Objects/add.ctp:298
+#: View/Objects/add.ctp:323
 msgid "Original value: "
 msgstr ""
 
-#: View/Objects/add.ctp:303
+#: View/Objects/add.ctp:328
 msgid "Can be merged automatically. Injection done."
 msgstr ""
 
-#: View/Objects/add.ctp:306
+#: View/Objects/add.ctp:331
 msgid "An instance of this attribute already exists. However, as multiple instances are allowed by this template, the two attributes will be kept."
 msgstr ""
 
-#: View/Objects/add.ctp:335;346
+#: View/Objects/add.ctp:360;371
 msgid "Enter value manually"
 msgstr ""
 
@@ -13544,14 +16832,6 @@ msgstr ""
 msgid "Selected Attributes will be %s deleted"
 msgstr ""
 
-#: View/Objects/group_attributes_into_object.ctp:129
-msgid "hard"
-msgstr ""
-
-#: View/Objects/group_attributes_into_object.ctp:129
-msgid "soft"
-msgstr ""
-
 #: View/Objects/orphaned_object_diagnostics.ctp:3
 msgid "Object reconstruction"
 msgstr ""
@@ -13616,43 +16896,47 @@ msgstr ""
 msgid "This Attribute type is not allowed to be present multiple time in this Object. Consider only picking one."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:2
+#: View/Objects/revise_object.ctp:18
 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."
+#: View/Objects/revise_object.ctp:19
+msgid "Make sure that the below Object reflects your expectation before submitting it."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:66
+#: View/Objects/revise_object.ctp:56
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:110
+#: View/Objects/revise_object.ctp:103
 msgid "Create new object"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:111
+#: View/Objects/revise_object.ctp:103
+msgid "Update object"
+msgstr ""
+
+#: View/Objects/revise_object.ctp:104
 msgid "Back to review"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:114
+#: View/Objects/revise_object.ctp:107
 msgid "This event contains similar objects."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:115
+#: View/Objects/revise_object.ctp:108
 msgid "Instead of creating a new object, would you like to merge your new object into one of the following?"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:132
+#: View/Objects/revise_object.ctp:125
 msgid "All similar objects not displayed..."
 msgstr ""
 
-#: View/Objects/revise_object.ctp:133
+#: View/Objects/revise_object.ctp:126
 msgid "%s Similar objects found. %s not displayed"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:170
+#: View/Objects/revise_object.ctp:164
 msgid "This attribute will NOT be merged into the similar object as it is conflicting with another attribute."
 msgstr ""
 
@@ -13672,24 +16956,32 @@ msgstr ""
 msgid "Add Object attribute"
 msgstr ""
 
-#: View/OrgBlacklists/add.ctp:4
-msgid "Add Organisation Blacklist Entries"
+#: View/OrgBlocklists/add.ctp:4
+msgid "Add Organisation Blocklist 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."
+#: View/OrgBlocklists/add.ctp:5
+msgid "Blocklisting an organisation prevents the creation of any event by that organisation on this instance as well as syncing of that organisation's events to this instance. It does not prevent a local user of the blocklisted organisation from logging in and editing or viewing data."
 msgstr ""
 
-#: View/OrgBlacklists/add.ctp:18
+#: View/OrgBlocklists/add.ctp:6
+msgid "Paste a list of all the organisation UUIDs that you want to add to the blocklist below (one per line)."
+msgstr ""
+
+#: View/OrgBlocklists/add.ctp:19
 msgid "(Optional) The organisation name that the organisation is associated with"
 msgstr ""
 
-#: View/OrgBlacklists/index.ctp:2
-msgid "Organisation Blacklists"
+#: View/OrgBlocklists/edit.ctp:4
+msgid "Edit Organisation Blocklist Entries"
 msgstr ""
 
-#: View/OrgBlacklists/index.ctp:37
-msgid "Are you sure you want to delete the blacklist entry for the organisation UUID %s?"
+#: View/OrgBlocklists/index.ctp:2
+msgid "Organisation Blocklists"
+msgstr ""
+
+#: View/OrgBlocklists/index.ctp:30
+msgid "Are you sure you want to delete the blocklist entry for the organisation UUID %s?"
 msgstr ""
 
 #: View/Organisations/admin_add.ctp:4
@@ -13762,7 +17054,7 @@ msgstr ""
 
 #: View/Organisations/admin_add.ctp:37
 #: View/Organisations/admin_edit.ctp:48
-msgid "Logo (48x48 png)"
+msgid "Logo (48×48 PNG or SVG)"
 msgstr ""
 
 #: View/Organisations/admin_add.ctp:43
@@ -13801,9 +17093,9 @@ msgstr ""
 msgid "Contacts"
 msgstr ""
 
-#: View/Organisations/index.ctp:5;67
+#: View/Organisations/index.ctp:5;60
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:57
+#: View/Users/statistics_data.ctp:59
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr ""
@@ -13812,7 +17104,7 @@ msgstr ""
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9;62
+#: View/Organisations/index.ctp:9;55
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -13821,7 +17113,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13;57
+#: View/Organisations/index.ctp:13;50
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr ""
@@ -13838,65 +17130,58 @@ msgstr ""
 msgid "View all"
 msgstr ""
 
-#: View/Organisations/index.ctp:86
+#: View/Organisations/index.ctp:79
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:32
 msgid "Logo"
 msgstr ""
 
-#: View/Organisations/index.ctp:97
+#: View/Organisations/index.ctp:90
 msgid "Added by"
 msgstr ""
 
-#: View/Organisations/view.ctp:8
+#: View/Organisations/index.ctp:93
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:34
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr ""
+
+#: View/Organisations/view.ctp:13
 msgid "Local or remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:12
-#: View/SharingGroups/view.ctp:43
+#: View/Organisations/view.ctp:17
 msgid "Local"
 msgstr ""
 
-#: View/Organisations/view.ctp:12
+#: View/Organisations/view.ctp:17
 msgid "Remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:27
 msgid "Domain restrictions"
 msgstr ""
 
-#: View/Organisations/view.ctp:27
-msgid "Creation time"
-msgstr ""
-
-#: View/Organisations/view.ctp:28
+#: View/Organisations/view.ctp:32
 msgid "Last modified"
 msgstr ""
 
-#: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:39
-msgid "Sector"
-msgstr ""
-
-#: View/Organisations/view.ctp:30
-#: View/Users/statistics_orgs.ctp:37
-msgid "Nationality"
-msgstr ""
-
-#: View/Organisations/view.ctp:30
+#: View/Organisations/view.ctp:45
 #: View/Organisations/ajax/merge.ctp:19
 msgid "Organisation type"
 msgstr ""
 
-#: View/Organisations/view.ctp:30
+#: View/Organisations/view.ctp:45
 msgid "Contact information"
 msgstr ""
 
-#: View/Organisations/view.ctp:39
+#: View/Organisations/view.ctp:54
 msgid "Organisation "
 msgstr ""
 
-#: View/Organisations/view.ctp:62;63
+#: View/Organisations/view.ctp:66;67
 msgid "Members"
 msgstr ""
 
@@ -13916,10 +17201,6 @@ msgstr ""
 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 ""
@@ -13944,6 +17225,10 @@ msgstr ""
 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 ""
@@ -14138,7 +17423,7 @@ msgid "Settings and Diagnostics"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:11;171
-msgid "Blacklist"
+msgid "Blocklist"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:14
@@ -14225,7 +17510,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
-#: View/Servers/edit.ctp:90
+#: View/Servers/edit.ctp:92
 msgid "Misc settings"
 msgstr ""
 
@@ -14302,11 +17587,11 @@ msgid "Displays OK if the worker is running. If the _schdlr_ worker is the only
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:59
-msgid "Import Blacklist"
+msgid "Import Blocklist"
 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."
+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 blocklisting the value in this section."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:61;69
@@ -14314,7 +17599,7 @@ 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."
+msgid "Administrators can add, edit or delete blocklisted 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
@@ -14338,19 +17623,19 @@ msgid "Add, edit or remove Regexp entries that will affect all newly created att
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:73
-msgid "Managing the Signature whitelist"
+msgid "Managing the Signature allowedlist"
 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."
+msgid "The signature allowedlist view, accessible through the administration menu on the left, allows administrators to create and maintain a list of addresses that are allowedlisted 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"
+msgid "Allowedlisting 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."
+msgid "While in the allowedlist view, click on New Allowedlist on the left to bring up the add allowedlist view to add a new address."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:77
@@ -14358,7 +17643,7 @@ 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."
+msgid "When viewing the list of allowedlisted addresses, the following pieces of information are shown: The ID of the allowedlist entry (assigned automatically when a new address is added), the address itself that is being allowedlisted and a set of controls allowing you to delete the entry or edit the address."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:79
@@ -14410,8 +17695,7 @@ msgid "The organisation of the user. Entering ADMIN into this field will give ad
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:91;120;170
-#: View/Roles/admin_index.ctp:2
-#: View/Roles/index.ctp:2
+#: View/Roles/index.ctp:140
 msgid "Roles"
 msgstr ""
 
@@ -14420,9 +17704,6 @@ msgid "A drop-down list allows you to choose a role-group that the user should b
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:92;121
-#: View/Users/admin_add.ctp:77
-#: View/Users/admin_edit.ctp:71
-#: View/Users/edit.ctp:28
 msgid "Receive alerts when events are published"
 msgstr ""
 
@@ -14431,9 +17712,6 @@ msgid "This option will subscribe the new user to automatically generated e-mail
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:93;122
-#: View/Users/admin_add.ctp:82
-#: View/Users/admin_edit.ctp:72
-#: View/Users/edit.ctp:29
 msgid "Receive alerts from \"contact reporter\" requests"
 msgstr ""
 
@@ -14443,8 +17721,8 @@ 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:26
+#: View/Users/admin_edit.ctp:63
+#: View/Users/admin_index.ctp:87
 msgid "Authkey"
 msgstr ""
 
@@ -14497,9 +17775,6 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_index.ctp:76
-#: View/Users/admin_view.ctp:26
-#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -14528,7 +17803,6 @@ 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:95
 msgid "Newsread"
 msgstr ""
 
@@ -14588,14 +17862,6 @@ msgstr ""
 msgid "Contact your users here."
 msgstr ""
 
-#: View/Pages/doc/administration.ctp:133;184;197
-#: View/Pages/doc/using_the_system.ctp:269
-#: View/Servers/ondemand_action.ctp:3
-#: View/Servers/ajax/submoduleStatus.ctp:7
-#: 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 ""
@@ -14779,12 +18045,12 @@ msgid "Creation, deletion, Accept, Discard"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:172
-msgid "Whitelist"
+msgid "Allowedlist"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:173
-#: View/Regexp/admin_index.ctp:22
-#: View/Regexp/index.ctp:22
+#: View/Regexp/admin_index.ctp:15
+#: View/Regexp/index.ctp:15
 msgid "Regexp"
 msgstr ""
 
@@ -15013,7 +18279,7 @@ msgid "The time (in 24h format) when the task should be executed the next time i
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:240
-#: View/Tasks/index.ctp:38
+#: View/Tasks/index.ctp:31
 msgid "Next Run"
 msgstr ""
 
@@ -15316,7 +18582,7 @@ msgid "You can view the Regular Expression rules, which modify the data that can
 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."
+msgid "You can view the allowedlist 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
@@ -15610,7 +18876,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:53
+#: View/Users/statistics_data.ctp:55
 msgid "Activity Heatmap"
 msgstr ""
 
@@ -15627,7 +18893,7 @@ msgid "All the events and attributes that get entered into MISP will be run thro
 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."
+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 blocklist data by not defining a replacement for a regular expression."
 msgstr ""
 
 #: View/Pages/doc/user_management.ctp:70
@@ -16050,10 +19316,6 @@ msgstr ""
 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 ""
@@ -16390,10 +19652,6 @@ msgstr ""
 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 ""
@@ -16925,7 +20183,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:175
+#: View/Servers/index.ctp:171
 msgid "Push all"
 msgstr ""
 
@@ -16933,11 +20191,6 @@ msgstr ""
 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:172
-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 ""
@@ -17068,75 +20321,71 @@ msgstr ""
 msgid "Edit Import Regexp"
 msgstr ""
 
-#: View/Regexp/admin_index.ctp:23
-#: View/Regexp/index.ctp:23
+#: View/Regexp/admin_index.ctp:16
+#: View/Regexp/index.ctp:16
 msgid "Replacement"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:9
+#: View/Roles/admin_add.ctp:6
 #: View/Roles/admin_edit.ctp:9
 msgid "Restrict to site admins"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:19
-#: View/Roles/admin_edit.ctp:18
-#: View/Roles/admin_index.ctp:33
-msgid "Memory limit"
+#: View/Roles/admin_add.ctp:24
+msgid "Memory limit (%s)"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:20
-#: View/Roles/admin_edit.ctp:19
-msgid "Maximum execution time"
+#: View/Roles/admin_add.ctp:29
+msgid "Maximum execution time (%ss)"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:26
+#: View/Roles/admin_add.ctp:33
 #: View/Roles/admin_edit.ctp:26
 msgid "Enforce search rate limit"
 msgstr ""
 
-#: View/Roles/admin_add.ctp:32
+#: View/Roles/admin_add.ctp:38
 #: View/Roles/admin_edit.ctp:32
 msgid "# of searches / 15 min"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:24
-msgid "Restricted to site admins"
+#: View/Roles/admin_edit.ctp:18
+msgid "Memory limit"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:34
+#: View/Roles/admin_edit.ctp:19
+msgid "Maximum execution time"
+msgstr ""
+
+#: View/Roles/index.ctp:31
+msgid "Permission"
+msgstr ""
+
+#: View/Roles/index.ctp:54
+msgid "Memory Limit"
+msgstr ""
+
+#: View/Roles/index.ctp:64
 msgid "Max execution time"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:35
+#: View/Roles/index.ctp:74
 msgid "Searches / 15 mins"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:41
-msgid "Default role"
+#: View/Roles/index.ctp:78
+msgid "Unlimited"
 msgstr ""
 
-#: View/Roles/admin_index.ctp:53
-#: View/Roles/index.ctp:47
-msgid "%s permission %s"
+#: View/Roles/index.ctp:117
+msgid "Add role"
 msgstr ""
 
-#: View/Roles/index.ctp:36
-msgid "ok"
+#: View/Roles/index.ctp:141
+msgid "Instance specific permission roles."
 msgstr ""
 
-#: View/Roles/index.ctp:36
-msgid "remove"
-msgstr ""
-
-#: View/Roles/index.ctp:45
-msgid "Granted"
-msgstr ""
-
-#: View/Roles/index.ctp:45
-msgid "Not granted"
-msgstr ""
-
-#: View/Roles/view.ctp:5
+#: View/Roles/view.ctp:13
 msgid "Permission level"
 msgstr ""
 
@@ -17194,7 +20443,7 @@ msgstr ""
 
 #: View/Servers/add.ctp:67
 #: View/Servers/edit.ctp:74
-msgid "Remote Organisation's Uuid"
+msgid "Remote Organisation's UUID"
 msgstr ""
 
 #: View/Servers/add.ctp:76
@@ -17207,61 +20456,81 @@ msgstr ""
 msgid "Enabled synchronisation methods"
 msgstr ""
 
-#: View/Servers/add.ctp:100
+#: View/Servers/add.ctp:102
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:106
+#: View/Servers/add.ctp:108
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:111
-#: View/Servers/edit.ctp:150
+#: View/Servers/add.ctp:113
+#: View/Servers/edit.ctp:152
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
-msgid "Events with the following tags allowed: "
-msgstr ""
-
-#: View/Servers/add.ctp:113;119
-#: View/Servers/edit.ctp:152;158
-msgid "Events with the following tags blocked: "
-msgstr ""
-
 #: View/Servers/add.ctp:114;120
 #: View/Servers/edit.ctp:153;159
-msgid "Events with the following organisations allowed: "
+msgid "Events with the following tags allowed: "
 msgstr ""
 
 #: View/Servers/add.ctp:115;121
 #: View/Servers/edit.ctp:154;160
+msgid "Events with the following tags blocked: "
+msgstr ""
+
+#: View/Servers/add.ctp:116;122
+#: View/Servers/edit.ctp:155;161
+msgid "Events with the following organisations allowed: "
+msgstr ""
+
+#: View/Servers/add.ctp:117;123
+#: View/Servers/edit.ctp:156;162
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:117
-#: View/Servers/edit.ctp:156
+#: View/Servers/add.ctp:119
+#: View/Servers/edit.ctp:158
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:147
+#: View/Servers/edit.ctp:190
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:151
+#: View/Servers/add.ctp:153
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:152
+#: View/Servers/add.ctp:154
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:153
+#: View/Servers/add.ctp:155
 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/compare_servers.ctp:4
+msgid "Events count"
+msgstr ""
+
+#: View/Servers/compare_servers.ctp:11
+msgid "Server events overlap analysis matrix"
+msgstr ""
+
+#: View/Servers/compare_servers.ctp:37
+msgid "<b>S%s</b>: %s"
+msgstr ""
+
+#: View/Servers/compare_servers.ctp:62
+msgid "None or less than 1 % of the events of %s is contained in %s (%s matching events)"
+msgstr ""
+
+#: View/Servers/compare_servers.ctp:64
+msgid "%s % of the events of %s is contained in %s (%s matching events)"
+msgstr ""
+
 #: View/Servers/create_sync.ctp:4
 msgid "Server configuration"
 msgstr ""
@@ -17282,34 +20551,46 @@ msgstr ""
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:107
+#: View/Servers/edit.ctp:109
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:115;137
+#: View/Servers/edit.ctp:117;139
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:116;138
+#: View/Servers/edit.ctp:118;140
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:129
+#: View/Servers/edit.ctp:131
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:161
+#: View/Servers/edit.ctp:163
 msgid "Additional parameters: "
 msgstr ""
 
-#: View/Servers/edit.ctp:197
+#: View/Servers/edit.ctp:199
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:263;267
+#: View/Servers/edit.ctp:265;269
 msgid "Not set."
 msgstr ""
 
+#: View/Servers/event_block_rule.ctp:7
+msgid "Set event block rules"
+msgstr ""
+
+#: View/Servers/event_block_rule.ctp:8
+msgid "Event block rules allow you to add a simple tag filter to block events from being added or synced. Events with a tag that matches any of the tags in the rule list will be blocked. It is not possible to add more complex rules with boolean logic (NOT, AND)."
+msgstr ""
+
+#: View/Servers/event_block_rule.ctp:13
+msgid "Rule set (json)"
+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 ""
@@ -17322,6 +20603,50 @@ msgstr ""
 msgid "Apply filters to the remote instance's index"
 msgstr ""
 
+#: View/Servers/id_translator.ctp:7
+msgid "Allows to translate a local ID into the corresponding event ID on sync servers configured."
+msgstr ""
+
+#: View/Servers/id_translator.ctp:12
+msgid "Event ID or UUID"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:14
+msgid "1234"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:20
+msgid "Referencing an event which is"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:22
+msgid "remote"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:31
+msgid "ID referenced on server"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:48
+msgid "Local ID"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:51
+msgid "Remote ID:"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:53
+msgid "preview"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:57
+msgid "Remote server unreachable: %s"
+msgstr ""
+
+#: View/Servers/id_translator.ctp:59
+msgid "Not found"
+msgstr ""
+
 #: View/Servers/import.ctp:4
 msgid "Paste server data"
 msgstr ""
@@ -17338,76 +20663,88 @@ msgstr ""
 msgid "Servers"
 msgstr ""
 
-#: View/Servers/index.ctp:23
+#: View/Servers/index.ctp:16
 msgid "Prio"
 msgstr ""
 
-#: View/Servers/index.ctp:24
+#: View/Servers/index.ctp:17
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:25
+#: View/Servers/index.ctp:18
 msgid "Sync user"
 msgstr ""
 
-#: View/Servers/index.ctp:26
+#: View/Servers/index.ctp:19
 msgid "Reset API key"
 msgstr ""
 
-#: View/Servers/index.ctp:35
+#: View/Servers/index.ctp:30
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:70
+#: View/Servers/index.ctp:65
 msgid "URL params"
 msgstr ""
 
-#: View/Servers/index.ctp:85;86
+#: View/Servers/index.ctp:80;81
 msgid "Move server priority up"
 msgstr ""
 
-#: View/Servers/index.ctp:85;86
+#: View/Servers/index.ctp:80;81
 msgid "Move server priority down"
 msgstr ""
 
-#: View/Servers/index.ctp:102
+#: View/Servers/index.ctp:95
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:102
+#: View/Servers/index.ctp:95
 #: View/Sightingdb/index.ctp:35
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:103
+#: View/Servers/index.ctp:96
 msgid "View the sync user of the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:111;112
+#: View/Servers/index.ctp:104;105
 msgid "Remotely reset API key"
 msgstr ""
 
-#: View/Servers/index.ctp:119
+#: View/Servers/index.ctp:112
 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:119
+#: View/Servers/index.ctp:112
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:169
+#: View/Servers/index.ctp:136
+msgid "Age: %s%s"
+msgstr ""
+
+#: View/Servers/index.ctp:162
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:171
+#: View/Servers/index.ctp:164
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
-#: View/Servers/index.ctp:171
+#: View/Servers/index.ctp:164
 msgid "Pull updates"
 msgstr ""
 
-#: View/Servers/index.ctp:178
+#: View/Servers/index.ctp:168
+msgid "Pull known relevant custom clusters"
+msgstr ""
+
+#: View/Servers/index.ctp:168
+msgid "Pull relevant clusters"
+msgstr ""
+
+#: View/Servers/index.ctp:174
 msgid "Cache instance"
 msgstr ""
 
@@ -17439,27 +20776,27 @@ msgstr ""
 msgid "This action has been done and cannot be run again."
 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
+#: View/Servers/preview_event.ctp:13
 msgid "Filter the remote instance by tag: %s"
 msgstr ""
 
-#: View/Servers/preview_event.ctp:31
+#: View/Servers/preview_event.ctp:13
 msgid "Filter the remote instance on the tag: %s"
 msgstr ""
 
+#: View/Servers/preview_event.ctp:60
+msgid "You are currently viewing an event on the remote instance %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
+#: View/Servers/preview_index.ctp:108
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:112
+#: View/Servers/preview_index.ctp:108
 msgid "published"
 msgstr ""
 
@@ -17519,51 +20856,55 @@ msgstr ""
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:69
+#: View/Servers/rest.ctp:70
 msgid "Use full path - disclose my apikey"
 msgstr ""
 
-#: View/Servers/rest.ctp:73
+#: View/Servers/rest.ctp:75
 msgid "Bookmark query"
 msgstr ""
 
-#: View/Servers/rest.ctp:82
+#: View/Servers/rest.ctp:84
 msgid "Bookmark name"
 msgstr ""
 
-#: View/Servers/rest.ctp:90
+#: View/Servers/rest.ctp:92
 msgid "Show result"
 msgstr ""
 
-#: View/Servers/rest.ctp:95
+#: View/Servers/rest.ctp:97
 msgid "Skip SSL validation"
 msgstr ""
 
-#: View/Servers/rest.ctp:102
+#: View/Servers/rest.ctp:104
 msgid "HTTP headers"
 msgstr ""
 
-#: View/Servers/rest.ctp:115
+#: View/Servers/rest.ctp:117
 msgid " Inject"
 msgstr ""
 
-#: View/Servers/rest.ctp:116
+#: View/Servers/rest.ctp:118
 msgid " Show rules"
 msgstr ""
 
-#: View/Servers/rest.ctp:125
+#: View/Servers/rest.ctp:127
 msgid "HTTP body"
 msgstr ""
 
-#: View/Servers/rest.ctp:133
+#: View/Servers/rest.ctp:135
 msgid "Run query"
 msgstr ""
 
-#: View/Servers/rest.ctp:162
+#: View/Servers/rest.ctp:163
+msgid "Queried URL"
+msgstr ""
+
+#: View/Servers/rest.ctp:164
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:163
+#: View/Servers/rest.ctp:165
 msgid "Request duration"
 msgstr ""
 
@@ -17576,46 +20917,54 @@ msgid "To edit a setting, simply double click it."
 msgstr ""
 
 #: View/Servers/update_progress.ctp:34
-msgid "Updates are locked due to an ongoing update process. Release lock only if you know what you are doing."
+msgid "Updates are locked due to an ongoing update process. Release the update lock only if you know what you are doing."
 msgstr ""
 
 #: View/Servers/update_progress.ctp:35
+msgid "Before unlocking, make sure %s is healthy"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:35
+msgid "the update worker"
+msgstr ""
+
+#: View/Servers/update_progress.ctp:36
 msgid "automatically unlock in %smin %ssec"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:40
+#: View/Servers/update_progress.ctp:41
 msgid "Release update lock"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:54
+#: View/Servers/update_progress.ctp:55
 msgid "Complete update progression"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:55
+#: View/Servers/update_progress.ctp:56
 msgid "%s remaining"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:62
+#: View/Servers/update_progress.ctp:63
 msgid "Database Update progress for update %s"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:133
+#: View/Servers/update_progress.ctp:134
 msgid "Update "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:136
+#: View/Servers/update_progress.ctp:137
 msgid "Started @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:140
+#: View/Servers/update_progress.ctp:141
 msgid "Elapsed Time @ "
 msgstr ""
 
-#: View/Servers/update_progress.ctp:192
+#: View/Servers/update_progress.ctp:193
 msgid "No update in progress"
 msgstr ""
 
-#: View/Servers/update_progress.ctp:213
+#: View/Servers/update_progress.ctp:214
 msgid "Follow updates"
 msgstr ""
 
@@ -17663,6 +21012,10 @@ msgstr ""
 msgid "Update all submodules"
 msgstr ""
 
+#: View/Servers/ajax/submoduleStatus.ctp:32
+msgid " (%s days, %s hours older than super project)"
+msgstr ""
+
 #: View/Servers/ajax/submoduleStatus.ctp:36
 msgid "Newer version. Make sure to update MISP"
 msgstr ""
@@ -17679,8 +21032,12 @@ msgstr ""
 msgid "Update submodule"
 msgstr ""
 
+#: View/Servers/ajax/submoduleStatus.ctp:68
+msgid "Update result:"
+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."
+msgid "Do you want to pull the latest commit from the %s branch? If you have made local changes to MISP the merge will fail."
 msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:2
@@ -17688,68 +21045,72 @@ msgid "ZeroMQ Server Status"
 msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:5
-msgid "Start time"
+msgid "Reply time"
 msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:6
-msgid "Settings read at"
+msgid "Start time"
 msgstr ""
 
 #: View/Servers/ajax/zeromqstatus.ctp:7
 msgid "Events processed"
 msgstr ""
 
-#: View/Servers/ajax/zeromqstatus.ctp:9
+#: View/Servers/ajax/zeromqstatus.ctp:8
+msgid "Messages processed"
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:10
 msgid "The ZeroMQ server is unreachable."
 msgstr ""
 
-#: View/Servers/ajax/zeromqstatus.ctp:11
+#: View/Servers/ajax/zeromqstatus.ctp:12
 msgid "Cancel prompt"
 msgstr ""
 
-#: View/ShadowAttributes/add.ctp:4
+#: View/ShadowAttributes/add.ctp:5
 #: View/ShadowAttributes/edit.ctp:4
 msgid "Add Proposal"
 msgstr ""
 
-#: View/ShadowAttributes/add.ctp:63;76
+#: View/ShadowAttributes/add.ctp:63
 #: View/ShadowAttributes/add_attachment.ctp:35
 #: View/ShadowAttributes/edit.ctp:62
 msgid "Propose"
 msgstr ""
 
-#: View/ShadowAttributes/edit.ctp:41
-msgid "IDS Signature?"
+#: View/ShadowAttributes/edit.ctp:14
+msgid "Type "
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:24
+#: View/ShadowAttributes/edit.ctp:56;65
+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/ShadowAttributes/index.ctp:12
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:29
+#: View/ShadowAttributes/index.ctp:17
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:50
+#: View/ShadowAttributes/index.ctp:49
 msgid "Proposal by"
 msgstr ""
 
 #: View/ShadowAttributes/index.ctp:56
+msgid "Change requested"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:63
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:62
+#: View/ShadowAttributes/index.ctp:75
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:91
-msgid "Attribute edit"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:93
-msgid "New Attribute"
-msgstr ""
-
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:7
 msgid "Are you sure you want to propose to delete Attribute #%s?"
 msgstr ""
@@ -17816,7 +21177,7 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:53
 #: View/SharingGroups/edit.ctp:53
-#: View/SharingGroups/index.ctp:47
+#: View/SharingGroups/index.ctp:86
 msgid "Releasable to"
 msgstr ""
 
@@ -17867,7 +21228,6 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:73
 #: View/SharingGroups/edit.ctp:73
-#: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr ""
 
@@ -17929,26 +21289,60 @@ msgstr ""
 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
+#: View/SharingGroups/index.ctp:24
 msgid "Active Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:31
+#: View/SharingGroups/index.ctp:29
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:82
+#: View/SharingGroups/index.ctp:69
+msgid "Creator"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:80
+msgid "Org count"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:89
+msgid "Organisations:"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:119
 msgid "Distribution List"
 msgstr ""
 
-#: View/SharingGroups/view.ctp:28
+#: View/SharingGroups/index.ctp:152
+msgid "Are you sure you want to delete the sharing group?"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:159
+msgid "Delete Sharing Group"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:9
+msgid "Releasability"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:19
 msgid "Synced by"
 msgstr ""
 
+#: View/SharingGroups/view.ctp:47
+msgid "Is local"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:48
+msgid "Can extend"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:31
+msgid "%s organisation"
+msgid_plural "%s organisations"
+msgstr[0] ""
+msgstr[1] ""
+
 #: View/Sightingdb/index.ctp:41
 msgid "Quick Search"
 msgstr ""
@@ -18006,12 +21400,12 @@ msgstr ""
 msgid "My org"
 msgstr ""
 
-#: View/Sightings/ajax/list_sightings.ctp:10
-msgid "Attribute ID"
+#: View/Sightings/ajax/list_sightings.ctp:3
+msgid "Delete sighting"
 msgstr ""
 
-#: View/Sightings/ajax/list_sightings.ctp:35
-msgid "Delete sighting"
+#: View/Sightings/ajax/list_sightings.ctp:14
+msgid "Attribute ID"
 msgstr ""
 
 #: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
@@ -18072,52 +21466,59 @@ msgstr ""
 msgid "Unselectable Tag"
 msgstr ""
 
-#: View/Tags/index.ctp:10
-msgid "Your Favourite Tags"
+#: View/Tags/index.ctp:14
+msgid "Simple"
 msgstr ""
 
-#: View/Tags/index.ctp:56
-msgid "Filter user tags"
+#: View/Tags/index.ctp:19
+msgid "Advanced"
 msgstr ""
 
-#: View/Tags/index.ctp:63
+#: View/Tags/index.ctp:40
 msgid "Exportable"
 msgstr ""
 
-#: View/Tags/index.ctp:64
-#: View/Taxonomies/view.ctp:128
+#: View/Tags/index.ctp:47
+#: View/Taxonomies/view.ctp:117
 msgid "Hidden"
 msgstr ""
 
-#: View/Tags/index.ctp:66
+#: View/Tags/index.ctp:63
 msgid "Restricted to org"
 msgstr ""
 
-#: View/Tags/index.ctp:68
+#: View/Tags/index.ctp:70
 msgid "Restricted to user"
 msgstr ""
 
-#: View/Tags/index.ctp:70
+#: View/Tags/index.ctp:77
 msgid "Taxonomy"
 msgstr ""
 
-#: View/Tags/index.ctp:71
+#: View/Tags/index.ctp:85
 msgid "Tagged events"
 msgstr ""
 
-#: View/Tags/index.ctp:72
+#: View/Tags/index.ctp:92
 msgid "Tagged attributes"
 msgstr ""
 
-#: View/Tags/index.ctp:74;119
+#: View/Tags/index.ctp:109
 msgid "Favourite"
 msgstr ""
 
-#: View/Tags/index.ctp:123
-#: View/Taxonomies/view.ctp:137
+#: View/Tags/index.ctp:125
 msgid "View graph"
 msgstr ""
 
+#: View/Tags/index.ctp:142
+msgid "Are you sure you want to delete the Tag?"
+msgstr ""
+
+#: View/Tags/index.ctp:144
+msgid "Delete tag"
+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 ""
@@ -18126,81 +21527,89 @@ msgstr ""
 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:36
+#: View/Tasks/index.ctp:29
 msgid "Frequency (h)"
 msgstr ""
 
-#: View/Tasks/index.ctp:55
+#: View/Tasks/index.ctp:48
 msgid "Set frequency timer for scheduled task"
 msgstr ""
 
-#: View/Tasks/index.ctp:70
+#: View/Tasks/index.ctp:63
 msgid "Set scheduled time for task"
 msgstr ""
 
-#: View/Tasks/index.ctp:96
+#: View/Tasks/index.ctp:89
 msgid "Update all"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:26
-msgid "Required"
-msgstr ""
-
-#: View/Taxonomies/index.ctp:27
+#: View/Taxonomies/index.ctp:78
 msgid "Active Tags"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:38
+#: View/Taxonomies/index.ctp:84
 msgid "enable all"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:38
+#: View/Taxonomies/index.ctp:84
 msgid "Enable all tags"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:38
+#: View/Taxonomies/index.ctp:84
 msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:29
-msgid "Are you sure you want to disable this taxonomy library?"
-msgstr ""
-
-#: View/Taxonomies/index.ctp:45
-#: View/Taxonomies/view.ctp:31
+#: View/Taxonomies/index.ctp:97
+#: View/Taxonomies/view.ctp:10
 msgid "Are you sure you want to enable this taxonomy library?"
 msgstr ""
 
-#: View/Taxonomies/index.ctp:50
+#: View/Taxonomies/index.ctp:115
+#: View/Taxonomies/view.ctp:8
+msgid "Are you sure you want to disable this taxonomy library?"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:131
 msgid "Delete taxonomy"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:62
+#: View/Taxonomies/index.ctp:140
+msgid "View taxonomy"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:42
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:68;69
+#: View/Taxonomies/view.ctp:48;49
 msgid "Hide selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:73;74
+#: View/Taxonomies/view.ctp:53;54
 msgid "Unhide selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:84
+#: View/Taxonomies/view.ctp:64
 msgid "Expanded"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:85
+#: View/Taxonomies/view.ctp:65
 msgid "Numerical value"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:154
+#: View/Taxonomies/view.ctp:85
+msgid "Numerical value overridden by userSetting.&#10;Original numerical_value = %s"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:126
+msgid "View correlation graph"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:143
 msgid "Refresh"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:159
+#: View/Taxonomies/view.ctp:148
 msgid "Refresh or enable"
 msgstr ""
 
@@ -18209,7 +21618,7 @@ 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."
+msgid "Are you sure you want to delete Taxonomy #%s?<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
@@ -18390,7 +21799,7 @@ msgstr ""
 msgid "Templates"
 msgstr ""
 
-#: View/Templates/index.ctp:45
+#: View/Templates/index.ctp:38
 msgid "Are you sure you want to delete Template #"
 msgstr ""
 
@@ -18422,23 +21831,23 @@ msgstr ""
 msgid "Shareable"
 msgstr ""
 
-#: View/Threads/index.ctp:23
+#: View/Threads/index.ctp:16
 msgid "Last Post On"
 msgstr ""
 
-#: View/Threads/index.ctp:24
+#: View/Threads/index.ctp:17
 msgid "Last Post By"
 msgstr ""
 
-#: View/Threads/index.ctp:25
+#: View/Threads/index.ctp:18
 msgid "Thread started On"
 msgstr ""
 
-#: View/Threads/index.ctp:26
+#: View/Threads/index.ctp:19
 msgid "Posts"
 msgstr ""
 
-#: View/Threads/index.ctp:81
+#: View/Threads/index.ctp:73
 msgid "View Discussion"
 msgstr ""
 
@@ -18486,11 +21895,11 @@ msgstr ""
 msgid "Accept registrations"
 msgstr ""
 
-#: View/Users/accept_registrations.ctp:98
+#: View/Users/accept_registrations.ctp:97
 msgid "The selected Role does not satisfy the user request"
 msgstr ""
 
-#: View/Users/accept_registrations.ctp:102
+#: View/Users/accept_registrations.ctp:101
 msgid "The selected Role satisfies the user request"
 msgstr ""
 
@@ -18499,19 +21908,20 @@ msgid "Admin Add User"
 msgstr ""
 
 #: View/Users/admin_add.ctp:32
-#: View/Users/admin_edit.ctp:32
+#: View/Users/admin_edit.ctp:37
 msgid "Set password"
 msgstr ""
 
 #: View/Users/admin_add.ctp:37
-#: View/Users/admin_edit.ctp:37
-#: View/Users/edit.ctp:10
-msgid "Length"
+#: View/Users/change_pw.ctp:6
+#: View/Users/edit.ctp:11
+msgid "Minimal length"
 msgstr ""
 
 #: View/Users/admin_add.ctp:38
-#: View/Users/admin_edit.ctp:38
-#: View/Users/edit.ctp:11
+#: View/Users/admin_edit.ctp:46
+#: View/Users/change_pw.ctp:7
+#: View/Users/edit.ctp:12
 msgid "Complexity"
 msgstr ""
 
@@ -18520,66 +21930,104 @@ msgid "Choose organisation"
 msgstr ""
 
 #: View/Users/admin_add.ctp:66
-#: View/Users/admin_edit.ctp:60
+#: View/Users/admin_edit.ctp:69
 msgid "Sync user for"
 msgstr ""
 
 #: View/Users/admin_add.ctp:70
-#: View/Users/admin_edit.ctp:64
-#: View/Users/edit.ctp:23
-msgid "Paste the user's GnuPG key here or try to retrieve it from the CIRCL 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/admin_edit.ctp:73
 #: View/Users/edit.ctp:25
-msgid "Fetch GnuPG key"
+#: View/Users/view.ctp:80
+msgid "PGP key"
+msgstr ""
+
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:73
+#: View/Users/edit.ctp:25
+msgid "Paste the user's PGP key here or try to retrieve it from the CIRCL key server by clicking on \"Fetch PGP key\" below."
+msgstr ""
+
+#: View/Users/admin_add.ctp:72
+#: View/Users/admin_edit.ctp:75
+msgid "Fetch the user's PGP key"
+msgstr ""
+
+#: View/Users/admin_add.ctp:72
+#: View/Users/admin_edit.ctp:75
+#: View/Users/edit.ctp:27
+msgid "Fetch PGP key"
 msgstr ""
 
 #: View/Users/admin_add.ctp:74
-#: View/Users/admin_edit.ctp:68
-msgid "SMIME key"
+#: View/Users/admin_edit.ctp:78
+#: View/Users/edit.ctp:30
+msgid "S/MIME Public certificate (PEM format)"
 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."
+#: View/Users/admin_edit.ctp:78
+msgid "Paste the user's S/MIME public key in PEM format here."
+msgstr ""
+
+#: View/Users/admin_add.ctp:80
+#: View/Users/admin_edit.ctp:88
+#: View/Users/edit.ctp:33
+msgid "Receive email alerts when events are published"
+msgstr ""
+
+#: View/Users/admin_add.ctp:85
+#: View/Users/admin_edit.ctp:89
+#: View/Users/edit.ctp:34
+msgid "Receive email alerts from \"Contact reporter\" requests"
 msgstr ""
 
 #: View/Users/admin_add.ctp:89
-#: View/Users/admin_edit.ctp:78
-msgid "Disable this user account"
+#: View/Users/admin_edit.ctp:90
+msgid "Immediately disable this user account"
 msgstr ""
 
 #: View/Users/admin_add.ctp:91
 msgid "Send credentials automatically"
 msgstr ""
 
+#: View/Users/admin_add.ctp:99
+msgid "Create user"
+msgstr ""
+
 #: View/Users/admin_edit.ctp:4
 msgid "Admin Edit User"
 msgstr ""
 
-#: View/Users/admin_edit.ctp:69
-#: View/Users/admin_view.ctp:69
-#: View/Users/view.ctp:30
-msgid "Terms accepted"
+#: View/Users/admin_edit.ctp:8
+msgid "User login change is disabled on this instance"
 msgstr ""
 
-#: View/Users/admin_edit.ctp:74
-msgid "Reset Auth Key"
+#: View/Users/admin_edit.ctp:39;86
+msgid "User password change is disabled on this instance"
 msgstr ""
 
-#: View/Users/admin_edit.ctp:86
+#: View/Users/admin_edit.ctp:45
+msgid "Length"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:63
+msgid "(Reset)"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:84
+msgid "User must change password"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:98
 #: View/Users/change_pw.ctp:18
-#: View/Users/edit.ctp:36
+#: View/Users/edit.ctp:42
 msgid "Confirm with your current password"
 msgstr ""
 
+#: View/Users/admin_edit.ctp:103
+msgid "Edit user"
+msgstr ""
+
 #: View/Users/admin_email.ctp:2
 msgid "Contact User(s)"
 msgstr ""
@@ -18605,7 +22053,7 @@ msgid "You can then specify (if eligible) what the e-mail address of the target
 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."
+msgid "In the case of a new user, you can specify the future user's PGP key, to send his/her new key in an encrypted e-mail."
 msgstr ""
 
 #: View/Users/admin_email.ctp:13
@@ -18672,10 +22120,6 @@ msgstr ""
 msgid "Click %s to reset the API keys of all sync and org admin users in one shot. This will also automatically inform them of their new API keys."
 msgstr ""
 
-#: View/Users/admin_index.ctp:6
-msgid "here"
-msgstr ""
-
 #: View/Users/admin_index.ctp:9;10
 msgid "Reset all sync user API keys"
 msgstr ""
@@ -18684,49 +22128,35 @@ msgstr ""
 msgid "Are you sure you wish to reset the API keys of all users with sync privileges?"
 msgstr ""
 
-#: View/Users/admin_index.ctp:68
-msgid "authkey"
+#: View/Users/admin_index.ctp:116
+msgid "S/MIME"
 msgstr ""
 
-#: View/Users/admin_index.ctp:83
-#: View/Users/admin_view.ctp:27
-#: View/Users/view.ctp:8
-msgid "Contactalert"
-msgstr ""
-
-#: View/Users/admin_index.ctp:90
-msgid "PGP Key"
-msgstr ""
-
-#: View/Users/admin_index.ctp:97
-msgid "SMIME"
-msgstr ""
-
-#: View/Users/admin_index.ctp:105
-msgid "NIDS SID"
-msgstr ""
-
-#: View/Users/admin_index.ctp:111
+#: View/Users/admin_index.ctp:130
 msgid "Terms Accepted"
 msgstr ""
 
-#: View/Users/admin_index.ctp:118
+#: View/Users/admin_index.ctp:137
 msgid "Last Login"
 msgstr ""
 
-#: View/Users/admin_index.ctp:132
+#: View/Users/admin_index.ctp:140
+msgid "Never"
+msgstr ""
+
+#: View/Users/admin_index.ctp:152
 msgid "External Auth"
 msgstr ""
 
-#: View/Users/admin_index.ctp:140
+#: View/Users/admin_index.ctp:160
 msgid "Monitored"
 msgstr ""
 
-#: View/Users/admin_index.ctp:162
+#: View/Users/admin_index.ctp:179
 msgid "Users index"
 msgstr ""
 
-#: View/Users/admin_index.ctp:201
+#: View/Users/admin_index.ctp:219
 msgid "Are you sure you want to delete the user? It is highly recommended to never delete users but to disable them instead."
 msgstr ""
 
@@ -18742,52 +22172,6 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
-#: View/Users/admin_view.ctp:30
-#: View/Users/view.ctp:11
-msgid "Request API access"
-msgstr ""
-
-#: View/Users/admin_view.ctp:47
-msgid "Customauth header"
-msgstr ""
-
-#: View/Users/admin_view.ctp:55
-msgid "Invited By"
-msgstr ""
-
-#: View/Users/admin_view.ctp:67
-msgid "Org_admin"
-msgstr ""
-
-#: View/Users/admin_view.ctp:68
-#: View/Users/view.ctp:29
-msgid "NIDS Start SID"
-msgstr ""
-
-#: View/Users/admin_view.ctp:70
-msgid "Password change"
-msgstr ""
-
-#: View/Users/admin_view.ctp:78
-#: View/Users/view.ctp:38
-msgid "GnuPG fingerprint"
-msgstr ""
-
-#: View/Users/admin_view.ctp:83
-#: View/Users/view.ctp:43
-msgid "GnuPG status"
-msgstr ""
-
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:50
-msgid "S/MIME Public certificate"
-msgstr ""
-
-#: View/Users/admin_view.ctp:119
-#: View/Users/view.ctp:65
-msgid "Download user profile for data portability"
-msgstr ""
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr ""
@@ -18796,19 +22180,39 @@ msgstr ""
 msgid "No failed composites"
 msgstr ""
 
-#: View/Users/edit.ctp:27
-msgid "SMIME Public certificate (PEM format)"
+#: View/Users/email_otp.ctp:5
+msgid "Your administrator has turned on an additional authentication step which\n      requires you to enter a OTP (one time password) you have received via email."
 msgstr ""
 
-#: View/Users/login.ctp:37;53
+#: View/Users/email_otp.ctp:8
+msgid "Make sure to check your SPAM folder."
+msgstr ""
+
+#: View/Users/email_otp.ctp:9
+msgid "Resend"
+msgstr ""
+
+#: View/Users/email_otp.ctp:17
+msgid "Validate your OTP"
+msgstr ""
+
+#: View/Users/email_otp.ctp:21
+msgid "One Time Password"
+msgstr ""
+
+#: View/Users/email_otp.ctp:23
+msgid "Enter your OTP here"
+msgstr ""
+
+#: View/Users/login.ctp:38;53
 msgid "Login"
 msgstr ""
 
-#: View/Users/login.ctp:47
+#: View/Users/login.ctp:48
 msgid "Registration will be sent to the administrators of the instance for consideration."
 msgstr ""
 
-#: View/Users/login.ctp:48
+#: View/Users/login.ctp:49
 msgid "No account yet? Register now!"
 msgstr ""
 
@@ -18911,45 +22315,38 @@ msgstr ""
 msgid "Proposals active"
 msgstr ""
 
-#: View/Users/statistics.ctp:25
-#: View/Users/statistics_data.ctp:30
-#: View/Users/statistics_orgs.ctp:34
-#: View/Users/ajax/admin_index.ctp:3
-msgid "Users"
-msgstr ""
-
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:40
+#: View/Users/statistics_data.ctp:42
 msgid "Discussion threads"
 msgstr ""
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:45
+#: View/Users/statistics_data.ctp:47
 msgid "Discussion posts"
 msgstr ""
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:54
+#: View/Users/statistics_data.ctp:56
 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
+#: View/Users/statistics_data.ctp:73
 msgid "Go left"
 msgstr ""
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:77
+#: View/Users/statistics_data.ctp:79
 msgid "Go right"
 msgstr ""
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:124
+#: View/Users/statistics_data.ctp:126
 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
+#: View/Users/statistics_data.ctp:130
 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 ""
 
@@ -18966,6 +22363,10 @@ msgid "Local Organisations"
 msgstr ""
 
 #: View/Users/statistics_data.ctp:38
+msgid "Event creator orgs"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:40
 msgid "Average Users / Org"
 msgstr ""
 
@@ -19001,10 +22402,6 @@ msgstr ""
 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 ""
@@ -19037,6 +22434,74 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
+#: View/Users/view.ctp:10;69
+msgid "Send email to user"
+msgstr ""
+
+#: View/Users/view.ctp:18
+msgid "Event alert enabled"
+msgstr ""
+
+#: View/Users/view.ctp:19
+msgid "Contact alert enabled"
+msgstr ""
+
+#: View/Users/view.ctp:23;39
+msgid "Auth key"
+msgstr ""
+
+#: View/Users/view.ctp:24
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/view.ctp:47
+msgid "Customauth header"
+msgstr ""
+
+#: View/Users/view.ctp:56
+msgid "Invited By"
+msgstr ""
+
+#: View/Users/view.ctp:72
+msgid "Org admin"
+msgstr ""
+
+#: View/Users/view.ctp:74
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/view.ctp:77
+msgid "Must change password"
+msgstr ""
+
+#: View/Users/view.ctp:86
+msgid "PGP key fingerprint"
+msgstr ""
+
+#: View/Users/view.ctp:91
+msgid "PGP key status"
+msgstr ""
+
+#: View/Users/view.ctp:98
+msgid "S/MIME Public certificate"
+msgstr ""
+
+#: View/Users/view.ctp:109
+msgid "News read at"
+msgstr ""
+
+#: View/Users/view.ctp:126
+msgid "User %s"
+msgstr ""
+
+#: View/Users/view.ctp:136
+msgid "Download user profile for data portability"
+msgstr ""
+
+#: View/Users/view.ctp:138
+msgid "Auth keys"
+msgstr ""
+
 #: View/Users/ajax/discardRegistrations.ctp:5
 msgid "Discard User Registrations"
 msgstr ""
@@ -19053,6 +22518,10 @@ msgstr ""
 msgid "You are about to send a mail to %s recipient(s)?"
 msgstr ""
 
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
+msgid "Send"
+msgstr ""
+
 #: View/Users/ajax/fetchpgpkey.ctp:2
 msgid "Choose the key that you would like to use"
 msgstr ""
@@ -19078,7 +22547,7 @@ msgid "Associated E-mail addresses"
 msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:16
-msgid "Select GnuPG key"
+msgid "Select PGP key"
 msgstr ""
 
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:3
@@ -19109,26 +22578,18 @@ msgstr ""
 msgid "Submit password reset"
 msgstr ""
 
-#: View/Warninglists/index.ctp:2
+#: View/Warninglists/index.ctp:44
 msgid "Warninglists"
 msgstr ""
 
-#: View/Warninglists/index.ctp:35
+#: View/Warninglists/index.ctp:77
 msgid "Valid attributes"
 msgstr ""
 
-#: View/Warninglists/index.ctp:36
+#: View/Warninglists/index.ctp:83
 msgid "Entries"
 msgstr ""
 
-#: View/Warninglists/index.ctp:61
-msgid "Delete Warninglist"
-msgstr ""
-
-#: View/Warninglists/index.ctp:61
-msgid "Delete warninglist"
-msgstr ""
-
 #: View/Warninglists/view.ctp:14
 msgid "Accepted attribute types"
 msgstr ""
@@ -19141,21 +22602,48 @@ msgstr ""
 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"
+#: View/genericTemplates/delete.ctp:9
+msgid "Delete %s"
 msgstr ""
 
-#: View/Whitelists/admin_edit.ctp:4
-msgid "Edit Signature Whitelist"
+#: View/genericTemplates/delete.ctp:20
+msgid "Are you sure you want to delete %s #%s?"
 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)."
+#: Model/Allowedlist.php:validation for field name
+#: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
+#: Model/DecayingModelMapping.php:validation for field attribute_type;validation for field model_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/GalaxyClusterRelationTag.php:validation for field galaxy_cluster_relation_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/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
+msgid "valueNotEmpty"
+msgstr ""
+
+#: Model/Allowedlist.php:validation for field name
+msgid "Name not in the right format. Allowedlist 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 ""
+
+#: Model/Allowedlist.php:validation for field name
+#: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
+msgid "A similar name already exists."
 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/EventReport.php:validation for field event_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
@@ -19173,10 +22661,16 @@ msgid "Options : Payload delivery, Antivirus detection, Payload installation, Fi
 msgstr ""
 
 #: Model/Attribute.php:validation for field value
+#: Model/GalaxyCluster.php:validation for field value
+#: Model/GalaxyClusterRelation.php:validation for field referenced_galaxy_cluster_type
 #: Model/ShadowAttribute.php:validation for field value
 msgid "stringNotEmpty"
 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
 #: Model/ShadowAttribute.php:validation for field value
 msgid "Value not in the right type/format. Please double check the value or select type \"other\"."
@@ -19186,16 +22680,13 @@ msgstr ""
 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/GalaxyCluster.php:validation for field published
 #: Model/Server.php:validation for field push;validation for field pull;validation for field push_sightings
 #: 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
@@ -19204,22 +22695,28 @@ msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
 #: Model/Dashboard.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/Event.php:validation for field uuid
+#: Model/EventBlocklist.php:validation for field event_uuid
+#: Model/EventReport.php:validation for field uuid
+#: Model/GalaxyCluster.php:validation for field uuid
 #: Model/MispObject.php:validation for field uuid
-#: Model/OrgBlacklist.php:validation for field org_uuid
+#: Model/OrgBlocklist.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"
+#: Model/TagCollection.php:validation for field uuid
+msgid "Please provide a valid RFC 4122 UUID"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/EventReport.php:validation for field uuid
+#: Model/GalaxyCluster.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
+#: Model/EventReport.php:validation for field distribution
 msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group, Inherit event"
 msgstr ""
 
@@ -19229,27 +22726,6 @@ msgstr ""
 msgid "Invalid ISO 8601 format"
 msgstr ""
 
-#: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
-#: Model/DecayingModelMapping.php:validation for field attribute_type;validation for field model_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 ""
@@ -19270,8 +22746,14 @@ msgstr ""
 msgid "Options : 0, 1, 2 (for Initial, Ongoing, Completed)"
 msgstr ""
 
-#: Model/EventBlacklist.php:validation for field event_uuid
-msgid "Event already blacklisted."
+#: Model/Event.php:validation for field extends_uuid
+#: Model/GalaxyClusterBlocklist.php:validation for field cluster_uuid
+#: Model/GalaxyClusterRelation.php:validation for field galaxy_cluster_uuid;validation for field referenced_galaxy_cluster_uuid
+msgid "Please provide a valid UUID"
+msgstr ""
+
+#: Model/EventBlocklist.php:validation for field event_uuid
+msgid "Event already blocklisted."
 msgstr ""
 
 #: Model/EventGraph.php:validation for field network_json
@@ -19297,6 +22779,15 @@ msgstr ""
 msgid "Please enter a numeric event ID or leave this field blank."
 msgstr ""
 
+#: Model/GalaxyCluster.php:validation for field distribution
+#: Model/GalaxyClusterRelation.php:validation for field distribution
+msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group"
+msgstr ""
+
+#: Model/GalaxyClusterBlocklist.php:validation for field cluster_uuid
+msgid "Galaxy Cluster already blocklisted."
+msgstr ""
+
 #: Model/Log.php:validation for field action
 msgid "Options : ..."
 msgstr ""
@@ -19305,8 +22796,8 @@ msgstr ""
 msgid "A relationship with this name already exists."
 msgstr ""
 
-#: Model/OrgBlacklist.php:validation for field org_uuid
-msgid "Organisation already blacklisted."
+#: Model/OrgBlocklist.php:validation for field org_uuid
+msgid "Organisation already blocklisted."
 msgstr ""
 
 #: Model/Organisation.php:validation for field name
@@ -19365,12 +22856,6 @@ msgstr ""
 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 ""
@@ -19441,7 +22926,3 @@ msgstr ""
 msgid "isValidJson"
 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 ""
-

From bfd93609f2eaa8a4911b60a88b2813c235fd7579 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Fri, 26 Mar 2021 15:01:29 +0900
Subject: [PATCH 414/437] chg: [doc] reshuffle documentation order and archive
 some older guides

---
 docs/{ => archive}/xINSTALL.centos6.md               |  0
 docs/{ => archive}/xINSTALL.debian9-postgresql.md    |  0
 docs/{ => archive}/xINSTALL.debian9.md               |  0
 .../{ => archive}/xINSTALL.ubuntu1804.with.webmin.md |  0
 mkdocs.yml                                           | 12 ++++++------
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename docs/{ => archive}/xINSTALL.centos6.md (100%)
 rename docs/{ => archive}/xINSTALL.debian9-postgresql.md (100%)
 rename docs/{ => archive}/xINSTALL.debian9.md (100%)
 rename docs/{ => archive}/xINSTALL.ubuntu1804.with.webmin.md (100%)

diff --git a/docs/xINSTALL.centos6.md b/docs/archive/xINSTALL.centos6.md
similarity index 100%
rename from docs/xINSTALL.centos6.md
rename to docs/archive/xINSTALL.centos6.md
diff --git a/docs/xINSTALL.debian9-postgresql.md b/docs/archive/xINSTALL.debian9-postgresql.md
similarity index 100%
rename from docs/xINSTALL.debian9-postgresql.md
rename to docs/archive/xINSTALL.debian9-postgresql.md
diff --git a/docs/xINSTALL.debian9.md b/docs/archive/xINSTALL.debian9.md
similarity index 100%
rename from docs/xINSTALL.debian9.md
rename to docs/archive/xINSTALL.debian9.md
diff --git a/docs/xINSTALL.ubuntu1804.with.webmin.md b/docs/archive/xINSTALL.ubuntu1804.with.webmin.md
similarity index 100%
rename from docs/xINSTALL.ubuntu1804.with.webmin.md
rename to docs/archive/xINSTALL.ubuntu1804.with.webmin.md
diff --git a/mkdocs.yml b/mkdocs.yml
index 6401dfd6d..a735a9fec 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -14,7 +14,7 @@ edit_uri: ""
 #dev_addr: "192.168.10.34:8000"
 
 # Copyright
-copyright: "Copyright &copy; 2020 MISP Project"
+copyright: "Copyright &copy; 2021 MISP Project"
 
 # Options
 extra:
@@ -70,14 +70,13 @@ nav:
       - 'Ubuntu 18.04': 'INSTALL.ubuntu1804.md'
       - 'Ubuntu 20.04': 'INSTALL.ubuntu2004.md'
       - 'Kali Linux': 'INSTALL.kali.md'
-      - 'RHEL7/CentOS7': 'INSTALL.rhel7.md'
       - 'RHEL8/CentOS8': 'INSTALL.rhel8.md'
+      - 'RHEL7/CentOS7': 'INSTALL.rhel7.md'
     - xInstall Guides: 
       - 'Warning': 'xINSTALL.md'
       - 'Debian 10': 'xINSTALL.debian10.md'
-      - 'Ubuntu 18.04 \w webmin': 'xINSTALL.ubuntu1804.with.webmin.md'
       - 'Tsurugi Linux': 'xINSTALL.tsurugi.md'
-      - 'OpenBSD 6.7': 'xINSTALL.OpenBSD.md'
+      - 'OpenBSD 6.8': 'xINSTALL.OpenBSD.md'
     - Config Guides:
       - 'Elastic Search Logging': 'CONFIG.elasticsearch-logging.md'
       - 'Amazon S3 attachments': 'CONFIG.s3-attachments.md'
@@ -86,9 +85,10 @@ nav:
     - Upgrading MISP: 'UPGRADE.md'
     - Old guides:
       - '2.3 to 2.4 upgrade': 'archive/old-2_3to2_4-UPGRADE.md'
+      - 'Ubuntu 18.04 \w webmin': 'archive/xINSTALL.ubuntu1804.with.webmin.md'
       - 'Ubuntu 16.04': 'archive/INSTALL.ubuntu1604.md'
-      - 'Debian 9': 'xINSTALL.debian9.md'
-      - 'Centos 6': 'xINSTALL.centos6.md'
+      - 'Debian 9': 'archive/xINSTALL.debian9.md'
+      - 'Centos 6': 'archive/xINSTALL.centos6.md'
       - 'FreeBSD': 'archive/xINSTALL.FreeBSD.md'
     - About:
       - 'MISP Release Notes': 'Changelog.md'

From df93bfc322b883579d625018059d499b9bc66de5 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Fri, 26 Mar 2021 17:27:08 +0900
Subject: [PATCH 415/437] chg: [doc] CentOS8Stream is now supported

---
 docs/INSTALL.rhel8.md               | 38 ++++++++++++++++-------------
 docs/generic/globalVariables.md     | 13 ++++++++++
 docs/generic/misp-modules-centos.md |  2 +-
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 3cbf8a5c1..111cd100b 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -1,4 +1,4 @@
-# INSTALLATION INSTRUCTIONS for RHEL 8.x and partially Fedora Server 30
+# INSTALLATION INSTRUCTIONS for RHEL 8.x, CentOS8/Stream
 -------------------------
 
 ### -1/ Installer and Manual install instructions
@@ -105,16 +105,18 @@ yumUpdate () {
 # <snippet-end 0_yum-update.sh>
 ```
 
-## 1.6/ **[RHEL]** Install the EPEL and remi repo
+## 1.6/ Install the EPEL and remi repo
 ```bash
-# <snippet-begin 0_RHEL_EPEL.sh>
-enableEPEL () {
+# <snippet-begin 0_EPEL_REMI.sh>
+enableEPEL_REMI () {
   sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
   sudo yum install http://rpms.remirepo.net/enterprise/remi-release-8.rpm -y
   sudo yum install yum-utils -y
   sudo dnf module enable php:remi-7.4 -y
+  [[ ${DISTRI} == "centos8stream" ]] &&sudo dnf config-manager --set-enabled powertools
+  [[ ${DISTRI} == "centos8" ]] &&sudo dnf config-manager --set-enabled powertools
 }
-# <snippet-end 0_RHEL_EPEL.sh>
+# <snippet-end 0_EPEL_REMI.sh>
 ```
 
 ### 2/ Dependencies
@@ -146,7 +148,6 @@ yumInstallCoreDeps () {
   # Enable and start redis
   sudo systemctl enable --now redis.service
 
-  PHP_INI="/etc/opt/remi/php74/php.ini"
   # Install PHP 7.4 from Remi's repo, see https://rpms.remirepo.net/enterprise/8/php74/x86_64/repoview/
   sudo yum install php php-fpm php-devel \
                    php-mysqlnd \
@@ -160,8 +161,8 @@ yumInstallCoreDeps () {
                    php-intl \
                    php-gd -y
 
-  # cake has php baked in, thus we link to it, ignore if this fails or exists.
-  sudo ln -s /usr/bin/php74 /usr/bin/php
+  # cake has php baked in, thus we link to it if necessary.
+  [[ ! -e "/usr/bin/php" ]] && sudo ln -s /usr/bin/php74 /usr/bin/php
 }
 # <snippet-end 0_yumInstallCoreDeps.sh>
 ```
@@ -252,13 +253,15 @@ installCoreRHEL () {
 
   # lief needs manual compilation
   sudo yum groupinstall "Development Tools" -y
-  sudo yum install cmake3 -y
+  [[ ${DISTRI} == 'rhel' ]] && sudo yum install cmake3 -y && CMAKE_BIN='cmake3'
+  [[ ${DISTRI} == 'centos8stream' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
+  [[ ${DISTRI} == 'centos' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
 
   cd $PATH_TO_MISP/app/files/scripts/lief
   $SUDO_WWW git config core.filemode false
   $SUDO_WWW mkdir build
   cd build
-  $SUDO_WWW cmake3 \
+  $SUDO_WWW ${CMAKE_BIN} \
   -DLIEF_PYTHON_API=on \
   -DPYTHON_VERSION=3.6 \
   -DPYTHON_EXECUTABLE=$PATH_TO_MISP/venv/bin/python \
@@ -295,7 +298,7 @@ installCoreRHEL () {
 
   # FIXME: Remove libfaup etc once the egg has the library baked-in
   # BROKEN: This needs to be tested on RHEL/CentOS
-  sudo yum install libcaca-devel cmake3 -y
+  sudo yum install libcaca-devel -y
   cd /tmp
   [[ ! -d "faup" ]] && $SUDO_CMD git clone https://github.com/stricaud/faup.git faup
   [[ ! -d "gtcaca" ]] && $SUDO_CMD git clone https://github.com/stricaud/gtcaca.git gtcaca
@@ -303,21 +306,22 @@ installCoreRHEL () {
   cd gtcaca
   $SUDO_CMD mkdir -p build
   cd build
-  $SUDO_CMD cmake .. && $SUDO_CMD make
+  $SUDO_CMD ${CMAKE_BIN} .. && $SUDO_CMD make
   sudo make install
   cd ../../faup
   $SUDO_CMD mkdir -p build
   cd build
-  $SUDO_CMD cmake .. && $SUDO_CMD make
+  $SUDO_CMD ${CMAKE_BIN} .. && $SUDO_CMD make
   sudo make install
   sudo ldconfig
 
   # Enable dependencies detection in the diagnostics page
   # This allows MISP to detect GnuPG, the Python modules' versions and to read the PHP settings.
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/remi/php74/php-fpm.d/www.conf
-  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/remi/php74/php-fpm.d/www.conf
-  sudo systemctl restart php74-php-fpm.service
-  # TODO investigate: listen = 127.0.0.1:9000
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a ${PHP_BASE}/php-fpm.d/www.conf
+  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' ${PHP_BASE}/php-fpm.d/www.conf  # TODO check if below is different on RHEL8 php74-php-fpm.service also dbl check paths
+  sudo sed -i.org -e 's/^\(listen =\) \/run\/php-fpm\/www\.sock/\1 127.0.0.1:9000/' ${PHP_BASE}/php-fpm.d/www.conf
+
+  sudo systemctl restart php-fpm.service
 
   umask $UMASK
 }
diff --git a/docs/generic/globalVariables.md b/docs/generic/globalVariables.md
index 2db64c218..5532296ef 100644
--- a/docs/generic/globalVariables.md
+++ b/docs/generic/globalVariables.md
@@ -10,6 +10,19 @@ MISPvars () {
   MISP_USER="${MISP_USER:-misp}"
   MISP_PASSWORD="${MISP_PASSWORD:-$(openssl rand -hex 32)}"
 
+  # Cheap distribution detector
+  FLAVOUR="$(. /etc/os-release && echo "$ID"| tr '[:upper:]' '[:lower:]')"
+  STREAM="$(. /etc/os-release && echo "$NAME"| grep -o -i stream |tr '[:upper:]' '[:lower:]')"
+  DIST_VER="$(. /etc/os-release && echo "$VERSION_ID")"
+  DISTRI=${FLAVOUR}${DIST_VER}${STREAM}
+
+  # Assess the php.ini location
+  [[ ${DISTRI} == 'rhel' ]] && PHP_INI="/etc/opt/remi/php74/php.ini" && PHP_BASE=/etc/opt/remi/php74/
+  [[ ${DISTRI} == 'centos8' ]] && PHP_INI="/etc/php.ini" && PHP_BASE=/etc/
+  [[ ${DISTRI} == 'centos8stream' ]] && PHP_INI="/etc/php.ini" && PHP_BASE=/etc/
+  # default to /etc/php/*/php.ini
+  PHP_INI="${PHP_INI:-/etc/php/*/apache2/php.ini}"
+
   # The web server user
   # RHEL/CentOS
   if [[ -f "/etc/redhat-release" ]]; then
diff --git a/docs/generic/misp-modules-centos.md b/docs/generic/misp-modules-centos.md
index 4abc61535..d08f87561 100644
--- a/docs/generic/misp-modules-centos.md
+++ b/docs/generic/misp-modules-centos.md
@@ -21,7 +21,7 @@ mispmodulesRHEL () {
   # some misp-modules dependencies for RHEL<8
   sudo yum install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
   # some misp-modules dependencies for RHEL8
-  sudo dnf install https://packages.endpoint.com/rhel/8/main/x86_64/endpoint-repo-8-1.ep8.noarch.rpm
+  sudo dnf install https://packages.endpoint.com/rhel/8/main/x86_64/endpoint-repo-8-1.ep8.noarch.rpm -y
   sudo yum install zbar-devel opencv-devel -y
 
   echo "[Unit]

From e59fbf1f3092f97f97b6e02161969a5995cad205 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Fri, 26 Mar 2021 19:46:41 +0900
Subject: [PATCH 416/437] chg: [doc] when enabling remi 7.4 by default, paths
 change

---
 docs/INSTALL.rhel7.md           | 17 ++++++++++++++---
 docs/INSTALL.rhel8.md           | 28 ++++++++++++++++++----------
 docs/generic/globalVariables.md |  7 -------
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index d918b4a1a..67e022814 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -1,9 +1,17 @@
 # INSTALLATION INSTRUCTIONS for RHEL 7.x and CentOS 7.x
 -------------------------
 
-### -1/ Installer and Manual install instructions
+### -2/ RHEL7/CentOS7 - status
+-------------------------
+!!! notice
+    MISP-core and misp-modules Tested working by [@SteveClement](https://twitter.com/SteveClement) on 20210326
 
-Make sure you are reading the parsed version of this Document. When in doubt [click here](https://misp.github.io/MISP/INSTALL.rhel7/).
+!!! notice
+    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
+    Which explains why you will see the use of shell *functions* in various steps.
+    Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc...
+
+### -1/ Installer and Manual install instructions
 
 !!! warning
     In the **future**, to install MISP on a fresh RHEL 7 install all you need to do is:
@@ -19,10 +27,13 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
     ```
     **The above does NOT work yet**
 
-### 0/ Overview and Assumptions
+!!! notice
+    If the next line is `[!generic/community.md!]()` [click here](https://misp.github.io/MISP/INSTALL.rhel7/).
 
 {!generic/community.md!}
 
+### 0/ Overview and Assumptions
+
 {!generic/rhelVScentos.md!}
 
 !!! warning
diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 111cd100b..034c93b9a 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -1,9 +1,17 @@
 # INSTALLATION INSTRUCTIONS for RHEL 8.x, CentOS8/Stream
 -------------------------
 
-### -1/ Installer and Manual install instructions
+### -2/ RHEL8/CentOS8 - status
+-------------------------
+!!! notice
+    MISP-core and misp-modules Tested working by [@SteveClement](https://twitter.com/SteveClement) on 20210326
 
-Make sure you are reading the parsed version of this Document. When in doubt [click here](https://misp.github.io/MISP/INSTALL.rhel8/).
+!!! notice
+    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
+    Which explains why you will see the use of shell *functions* in various steps.
+    Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc...
+
+### -1/ Installer and Manual install instructions
 
 !!! warning
     In the **future**, to install MISP on a fresh RHEL 8 install all you need to do is:
@@ -19,21 +27,19 @@ Make sure you are reading the parsed version of this Document. When in doubt [cl
     ```
     **The above does NOT work yet**
 
-### 0/ Overview and Assumptions
+!!! notice
+    If the next line is `[!generic/community.md!]()` [click here](https://misp.github.io/MISP/INSTALL.rhel8/).
 
 {!generic/community.md!}
 
+### 0/ Overview and Assumptions
+
 {!generic/rhelVScentos.md!}
 
 !!! warning
     The core MISP team cannot verify if this guide is working or not. Please help us in keeping it up to date and accurate.
     Thus we also have difficulties in supporting RHEL issues but will do a best effort on a similar yet slightly different setup.
 
-!!! notice
-    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
-    Which explains why you will see the use of shell *functions* in various steps.
-    Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc...
-
 !!! notice
     Maintenance for CentOS 8 will end on: December 31st, 2021 [Source[0]](https://wiki.centos.org/About/Product) [Source[1]](https://linuxlifecycle.com/)
     CentOS 8 [NetInstallURL](http://mirrorlist.centos.org/?release=8&arch=x86_64&repo=BaseOS)
@@ -132,6 +138,8 @@ enableEPEL_REMI () {
 # <snippet-begin 0_yumInstallCoreDeps.sh>
 yumInstallCoreDeps () {
   # Install the dependencies:
+  PHP_BASE="/etc/"
+  PHP_INI="/etc/php.ini"
   sudo yum install @httpd -y
   sudo yum install gcc git zip \
                    httpd \
@@ -253,9 +261,9 @@ installCoreRHEL () {
 
   # lief needs manual compilation
   sudo yum groupinstall "Development Tools" -y
-  [[ ${DISTRI} == 'rhel' ]] && sudo yum install cmake3 -y && CMAKE_BIN='cmake3'
+  [[ ${DISTRI} == 'rhel8.3' ]] && sudo yum install cmake3 -y && CMAKE_BIN='cmake3'
   [[ ${DISTRI} == 'centos8stream' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
-  [[ ${DISTRI} == 'centos' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
+  [[ ${DISTRI} == 'centos8' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
 
   cd $PATH_TO_MISP/app/files/scripts/lief
   $SUDO_WWW git config core.filemode false
diff --git a/docs/generic/globalVariables.md b/docs/generic/globalVariables.md
index 5532296ef..4a374746c 100644
--- a/docs/generic/globalVariables.md
+++ b/docs/generic/globalVariables.md
@@ -16,13 +16,6 @@ MISPvars () {
   DIST_VER="$(. /etc/os-release && echo "$VERSION_ID")"
   DISTRI=${FLAVOUR}${DIST_VER}${STREAM}
 
-  # Assess the php.ini location
-  [[ ${DISTRI} == 'rhel' ]] && PHP_INI="/etc/opt/remi/php74/php.ini" && PHP_BASE=/etc/opt/remi/php74/
-  [[ ${DISTRI} == 'centos8' ]] && PHP_INI="/etc/php.ini" && PHP_BASE=/etc/
-  [[ ${DISTRI} == 'centos8stream' ]] && PHP_INI="/etc/php.ini" && PHP_BASE=/etc/
-  # default to /etc/php/*/php.ini
-  PHP_INI="${PHP_INI:-/etc/php/*/apache2/php.ini}"
-
   # The web server user
   # RHEL/CentOS
   if [[ -f "/etc/redhat-release" ]]; then

From 1fe69156a452785ae620e8b2dd2dac1108a7f6e1 Mon Sep 17 00:00:00 2001
From: Jakub Onderka <jakub.onderka@gmail.com>
Date: Sun, 28 Mar 2021 10:03:38 +0200
Subject: [PATCH 417/437] chg: [galaxy] Update

---
 app/files/misp-galaxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/misp-galaxy b/app/files/misp-galaxy
index 05cacfc5a..eba33a1c9 160000
--- a/app/files/misp-galaxy
+++ b/app/files/misp-galaxy
@@ -1 +1 @@
-Subproject commit 05cacfc5accbd1e217d82c5a2a2fd5329b5bc8f3
+Subproject commit eba33a1c91c59b41dd9bc58d80ed3a1e54cdb2e1

From 327fc15150f91ca2c310edb277fc14806cdac4bf Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Sun, 28 Mar 2021 15:42:27 +0200
Subject: [PATCH 418/437] chg: [misp-galaxy] updated

---
 app/files/misp-galaxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/misp-galaxy b/app/files/misp-galaxy
index 05cacfc5a..eba33a1c9 160000
--- a/app/files/misp-galaxy
+++ b/app/files/misp-galaxy
@@ -1 +1 @@
-Subproject commit 05cacfc5accbd1e217d82c5a2a2fd5329b5bc8f3
+Subproject commit eba33a1c91c59b41dd9bc58d80ed3a1e54cdb2e1

From 934d43db59f16c36ba36734cab56054fdb2a7e6c Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 29 Mar 2021 10:37:27 +0200
Subject: [PATCH 419/437] fix: [attribute:restSearch] `includeCorrelations` Do
 not longer returns soft-deleted attributes

---
 app/Model/Attribute.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 2ac07d674..c4a9bab72 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -1405,6 +1405,7 @@ class Attribute extends AppModel
         // prepare the conditions
         $conditions = array(
                 'Attribute.event_id !=' => $attribute['event_id'],
+                'Attribute.deleted !=' => 1,
                 );
 
         // prevent issues with empty fields

From f069c8039b2f253a4786d366b8e2e971693129c5 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Mon, 29 Mar 2021 12:06:24 +0200
Subject: [PATCH 420/437] chg: [warning-lists] updated

---
 app/files/warninglists | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/warninglists b/app/files/warninglists
index 2ca8b466c..43592376c 160000
--- a/app/files/warninglists
+++ b/app/files/warninglists
@@ -1 +1 @@
-Subproject commit 2ca8b466cb95eb06a6409f2386b3abd233c0e006
+Subproject commit 43592376c030195575976ae33594487d10c40a9f

From 92f2631c44e8f86924e51ec2e7413dd8e559c08d Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Mon, 29 Mar 2021 14:09:23 +0200
Subject: [PATCH 421/437] chg; [version] bump

---
 VERSION.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.json b/VERSION.json
index 5d3d5ea23..8aa74a3da 100644
--- a/VERSION.json
+++ b/VERSION.json
@@ -1 +1 @@
-{"major":2, "minor":4, "hotfix":140}
+{"major":2, "minor":4, "hotfix":141}

From 6f1868008353ecca8a42e5af2d1c3b9ae8db949c Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 30 Mar 2021 00:41:02 +0200
Subject: [PATCH 422/437] new: [chg] timestamp index field allows a new "x
 units ago" representation

- just pass "ago": 1 as a parameter to the field
---
 .../IndexTable/Fields/timestamp.ctp           | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/View/Elements/genericElements/IndexTable/Fields/timestamp.ctp b/app/View/Elements/genericElements/IndexTable/Fields/timestamp.ctp
index 0abf4ed9f..a939be792 100644
--- a/app/View/Elements/genericElements/IndexTable/Fields/timestamp.ctp
+++ b/app/View/Elements/genericElements/IndexTable/Fields/timestamp.ctp
@@ -1,7 +1,32 @@
 <?php
     $timestamp = Hash::extract($row, $field['data_path'])[0];
+    $raw = false;
     if (!empty($field['time_format'])) {
         $timestamp = date($field['time_format'], $timestamp);
+    } else if (!empty($field['ago'])) {
+        if (date('Ymd') == date('Ymd', $timestamp)) {
+            $offset = time() - $timestamp;
+            $unit = 'second(s)';
+            $colour = 'red';
+            if ($offset >= 60) {
+                $offset = ceil($offset / 60);
+                $unit = 'minute(s)';
+                $colour = 'orange';
+            }
+            if ($offset >= 60) {
+                $offset = ceil($offset / 60);
+                $unit = 'hour(s)';
+                $colour = 'green';
+            }
+            if ($offset >= 24) {
+                $offset = ceil($offset / 24);
+                $unit = 'day(s)';
+            }
+            $raw = true;
+            $timestamp = sprintf('<span class="bold %s">%s %s ago</span>', $colour, $offset, $unit);
+        } else {
+            $timestamp = date('Y-m-d H:i:s', $timestamp);
+        }
     }
-    echo h($timestamp);
+    echo $raw ? $timestamp : h($timestamp);
 ?>

From e57826c084ea52d89a42725733f3f37906d71e44 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Tue, 30 Mar 2021 10:42:06 +0900
Subject: [PATCH 423/437] chg: [doc] Added details on MISPvars

---
 docs/generic/globalVariables.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/generic/globalVariables.md b/docs/generic/globalVariables.md
index 4a374746c..823eda93c 100644
--- a/docs/generic/globalVariables.md
+++ b/docs/generic/globalVariables.md
@@ -1,5 +1,16 @@
 #### MISP configuration variables
 
+If you are doing a manual install, copy and pasting from this document, please do the following before starting:
+
+```bash
+eval "$(curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/docs/generic/globalVariables.md | grep -v \`\`\`)"
+MISPvars
+```
+
+!!! notice
+    Do NOT leave your session after this mid-install as some initial passwords have been generated and thus would be lost.
+    Consider using a mux like [screen or tmux](https://superuser.com/questions/423310/byobu-vs-gnu-screen-vs-tmux-usefulness-and-transferability-of-skills).
+
 ```bash
 # <snippet-begin 0_global-vars.sh>
 # $ eval "$(curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/docs/generic/globalVariables.md | grep -v \`\`\`)"
@@ -19,6 +30,7 @@ MISPvars () {
   # The web server user
   # RHEL/CentOS
   if [[ -f "/etc/redhat-release" ]]; then
+    SE_LINUX=$(sestatus  -v -b |grep "^SELinux status"| grep enabled ; echo $?)
     WWW_USER="apache"
     SUDO_WWW="sudo -H -u ${WWW_USER} "
   # Debian flavoured

From 0b2afbdf6e9a110e820991c627228f2fc235958e Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Tue, 30 Mar 2021 10:57:35 +0900
Subject: [PATCH 424/437] fix: [tools] now works on MacOS and considers gsed

---
 tools/gen_misp_install_docs.sh | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/tools/gen_misp_install_docs.sh b/tools/gen_misp_install_docs.sh
index 351909aca..b928ae4c2 100755
--- a/tools/gen_misp_install_docs.sh
+++ b/tools/gen_misp_install_docs.sh
@@ -3,7 +3,7 @@
 set -e
 # set -x
 
-if [ -e "/usr/bin/virtualenv" ]; then
+if [ -e "$(which virtualenv)" ]; then
 	echo "Python virtualenv exists, continuing with mkdocs build"
 else
 	echo "NO virtualenv present, bye."
@@ -16,6 +16,8 @@ if [ -z "$VIRTUAL_ENV" ]; then
   ${PWD}/mkdocs/bin/pip install mkdocs==1.0.4 mkdocs-material==4.6.3 markdown-include python-markdown-comments gitchangelog git+https://github.com/ryneeverett/python-markdown-comments.git
 fi
 
+[[ -e "$(which gsed)" ]] && xSED="gsed" || xSED="sed"
+
 # Fixing ASCII aborration introduced in: https://github.com/MISP/MISP/commit/1b028ee15a3bd2f209102cd6204e6c4bb519be97
 ${PWD}/mkdocs/bin/gitchangelog |grep -v -e "  ,," -e "\.\.," > ../docs/Changelog.md
 # Removing consecutive dupe lines
@@ -28,18 +30,18 @@ ${PWD}/gen_misp_changelog.py
 # This search and replace is sub-optimal. It replaces 3 "~"s beginning of the line 
 # and then just replaces the remaining 2 following tildes in the document. 
 # This might change the sense of some commit messages...
-sed -i "s/^\~\~\~/---/" ../docs/Changelog.md
-sed -i "s/^- \#/- \\\#/" ../docs/Changelog.md
-sed -i "s/\~\~/--/g" ../docs/Changelog.md
-sed -i "s/%%version%%/v2.4 aka 2.4 for ever/g" ../docs/Changelog.md
-sed -i "s/\(unreleased\)/current changelog/g" ../docs/Changelog.md
+${xSED} -i "s/^\~\~\~/---/" ../docs/Changelog.md
+${xSED} -i "s/^- \#/- \\\#/" ../docs/Changelog.md
+${xSED} -i "s/\~\~/--/g" ../docs/Changelog.md
+${xSED} -i "s/%%version%%/v2.4 aka 2.4 for ever/g" ../docs/Changelog.md
+${xSED} -i "s/\(unreleased\)/current changelog/g" ../docs/Changelog.md
 
 # Emojifying things
-sed -i "s/\/\!\\\/:warning:/g" ../docs/Changelog.md
-sed -i "s/WiP/:construction:/g" ../docs/Changelog.md
-sed -i "s/WIP/:construction:/g" ../docs/Changelog.md
-sed -i "s/Wip:/:construction:/g" ../docs/Changelog.md
-sed -i "s/\[security\]/:lock:/g" ../docs/Changelog.md
+${xSED} -i "s/\/\!\\\/:warning:/g" ../docs/Changelog.md
+${xSED} -i "s/WiP/:construction:/g" ../docs/Changelog.md
+${xSED} -i "s/WIP/:construction:/g" ../docs/Changelog.md
+${xSED} -i "s/Wip:/:construction:/g" ../docs/Changelog.md
+${xSED} -i "s/\[security\]/:lock:/g" ../docs/Changelog.md
 
 ## Other creative ways in sprinkling emoji goodness:
 ### Source: https://gist.github.com/pocotan001/68f96bf86891db316f20

From 58d8e840d5aa0a24dbca3567b20cb9ca3cd6a556 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Tue, 30 Mar 2021 11:05:47 +0900
Subject: [PATCH 425/437] chg: [doc] Updated Changelog.md

---
 docs/Changelog.md | 2211 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2211 insertions(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index e1d58777f..058a193c5 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -4,10 +4,1754 @@ Changelog
 v2.4 aka 2.4 for ever (current changelog)
 ------------------------
 
+Changes
+-------
+- [doc] Added details on MISPvars. [Steve Clement]
+
+Other
+-----
+- Merge pull request #7268 from SteveClement/guides. [Steve Clement]
+
+  chg: [doc] Added details on MISPvars
+- Merge pull request #7233 from EvaYiYang/patch-1. [Andras Iklody]
+
+  fix: [internal] Keep AadAuth setting in config.php when modify setting value from UI
+- Merge branch '2.4' into patch-1. [Andras Iklody]
+- Add AadAuth module as saved settings. [Eva Yang]
+
+v2.4.141 (2021-03-29)
+---------------------
+
 New
 ---
+- [cli] enable all tags for a taxonomy. [Jeroen Pinoy]
+- [eventgraph:viewPicture] Allow access to saved picture from the
+  eventgraph history. [mokaddem]
+- [UI] Reworked galaxy quick view. [Jakub Onderka]
+- [UI] Show threat level icons on event index. [Jakub Onderka]
+- [freetext] Faster freetext parsing with more tests. [Jakub Onderka]
+- [event loader] has a new extensionList parameter. [iglocska]
+
+  - boolean, if set includes a list of extension events, metadata only
+- [test] Alert email generating. [Jakub Onderka]
+- [email] New setting `MISP.event_alert_metadata_only` [Jakub Onderka]
+- [email] Command for testing generated alert email. [Jakub Onderka]
+- [email] Allow to set email subject from template. [Jakub Onderka]
+- [mail] Add reference for event alert emails. [Jakub Onderka]
+- [mail] Move contact alert email to templates. [Jakub Onderka]
+- [mail] HTML alert emails. [Jakub Onderka]
+- [mail] Backend support for sending HTML emails. [Jakub Onderka]
+- [shortcuts] Show help when pressing ? key. [Jakub Onderka]
+- [internal] Security setting force_https. [Jakub Onderka]
+- [authkeys] Copy key info when resetting key. [Jakub Onderka]
+- [authkeys] Allowed IPs. [Jakub Onderka]
+- [UI] Render galaxy cluster description as markdown. [Jakub Onderka]
+
+Changes
+-------
+- [warning-lists] updated. [Alexandre Dulaunoy]
+- [misp-galaxy] updated. [Alexandre Dulaunoy]
+- [doc] when enabling remi 7.4 by default, paths change. [Steve Clement]
+- [doc] CentOS8Stream is now supported. [Steve Clement]
+- [doc] reshuffle documentation order and archive some older guides.
+  [Steve Clement]
+- [i18n] Updated base strings. [Steve Clement]
+- [i8n] Added localization progress. [Steve Clement]
+- [i18n] Fix mrg conflict. [Steve Clement]
+- [i18n] Updated base strings. [Steve Clement]
+- [i18n] Updated translations. [Steve Clement]
+- [galaxy] Update. [Jakub Onderka]
+- [UI] fix debugon for debug = 1. fix #7131. [Jeroen Pinoy]
+- [PyMISP] updated to the latest version. [Alexandre Dulaunoy]
+- [taxonomies] updated to the latest version. [Alexandre Dulaunoy]
+- [doc] more fine tuning to RHEL8. [Steve Clement]
+- [doc] Balanced RHEL 8 and 7 Docs. [Steve Clement]
+- [doc] Move away from expect. [Steve Clement]
+- [installer] Update to latest. [Steve Clement]
+- [doc] Added additional hardening and logging defaults. [Steve Clement]
+- [doc] Some minor changes and hardening. [Steve Clement]
+- [doc] Minor adjustments to permissions setter. [Steve Clement]
+- [doc] typo. [Steve Clement]
+- [doc] Added symlink to php. [Steve Clement]
+- [doc] Be friendly to automation. [Steve Clement]
+- [taxonomies] updated. [Alexandre Dulaunoy]
+- [PyMISP] updated to the latest version. [Alexandre Dulaunoy]
+- [taxonomies] updated to the latest version. [Alexandre Dulaunoy]
+- [auth] if no API key is provided for an API action - log it.
+  [iglocska]
+- [auth key] logging no longer collapsed if the new setting is enabled.
+  [iglocska]
+
+  Security.log_each_individual_auth_fail will log all API failures instead of collapsing repeated queries
+- [statistics] fix typo in statistics_data view - monthly attributes
+  styling check. [Jeroen Pinoy]
+- [ShibbAuth] Add login entry on logging in for audit. [Jeroen Pinoy]
+- [statistics] fix typo in statistics_data view - monthly attributes
+  styling check. [Jeroen Pinoy]
+- [ShibbAuth] Add login entry on logging in for audit. [Jeroen Pinoy]
+- [feed] Check if value is clean IP without doing expensive operations.
+  [Jakub Onderka]
+- [test] Add test for #7214. [Jakub Onderka]
+- [shibbauth] added two extra settings. [iglocska]
+
+  - ApacheShibbauth.DefaultRole: defaults to false, if set, pick the supplied roleID for any user authenticating. Can be used together with BlockRoleModifications
+  - ApacheShibbauth.BlockRoleModifications: defaults to false, boolean. If set to true, will block any updates to the existing users on authentication. This preserves any modifications made by a site admin in MISP.
+- [misp-galaxy] updated to the latest version. [Alexandre Dulaunoy]
+- [UI] Show number of items in freetext feed. [Jakub Onderka]
+- [UI] Make feed event preview nicer. [Jakub Onderka]
+- [misp-galaxy] updated to the latest version. [Alexandre Dulaunoy]
+- [internal] Threat levels list. [Jakub Onderka]
+- [restClient:querybuilder] add events and attributes addTag and
+  removeTag actions. [Jeroen Pinoy]
+- [attributes] fix attribute addtag by name conditions for find not set.
+  [Jeroen Pinoy]
+- [attributes] fix copypasta error leading to internal server error on
+  addtag with tag name. [Jeroen Pinoy]
+- [attributes] fix copypasta error leading to internal server error on
+  addtag with tag name. [Jeroen Pinoy]
+- Bumped queryversion. [mokaddem]
+- [optimisation] Faster Model::_findList method. [Jakub Onderka]
+- [internal] Faster event locks with Redis. [Jakub Onderka]
+- [correlation] Do not update info and date column, since they are not
+  used anymore. [Jakub Onderka]
+- [restClient:querybuilder] fix remove tag from object template. [Jeroen
+  Pinoy]
+- [restClient:querybuilder] add events and attributes addTag and
+  removeTag actions. [Jeroen Pinoy]
+- [attributes] fix attribute addtag by name conditions for find not set.
+  [Jeroen Pinoy]
+- [attributes] fix copypasta error leading to internal server error on
+  addtag with tag name. [Jeroen Pinoy]
+- [email] Move event alert email subject generting. [Jakub Onderka]
+- [internal] Fetch attribute UUIDs for sightings in different query.
+  [Jakub Onderka]
+- [UI] It is 2021! Removed -moz and -webkit specific CSS properties.
+  [Jakub Onderka]
+- [UI] Make some parts of MISP nicer. [Jakub Onderka]
+- [eventGraph] Improved object coloring strategy. [mokaddem]
+- [security audit] removed sharing group recommendation and fixed
+  grammar. [iglocska]
+
+  - the hide sharing group org setting is actively harmful, we should definitely not promote it
+- [sync] Code cleanup. [Jakub Onderka]
+- [sync] Do not decode body if is empty. [Jakub Onderka]
+- [UI] Nicer pivots. [Jakub Onderka]
+- [diagnostics] Show Redis memory fragmentation. [Jakub Onderka]
+- [internal] When caching feed, save progress to db less often. [Jakub
+  Onderka]
+- [PyMISP] Bump version. [Raphaël Vinot]
+- [PyMISP] Fix tests. [Raphaël Vinot]
+- [PyMISP] Bump before release. [Raphaël Vinot]
+- [internal] Set cookie name just when no name is set. [Jakub Onderka]
+- [schema] Add index for EventReport.event_id. [Jakub Onderka]
+- [schema] Convert GalaxyCluster tag name to case insensitive. [Jakub
+  Onderka]
+- [UI] Do not show published for default galaxy clusters. [Jakub
+  Onderka]
+- [internal] Cleanup code that is resposible for fetching server
+  setting. [Jakub Onderka]
+- [UI] Simplify keyboard-shortcuts.js. [Jakub Onderka]
+- [UI] Use Page Visibility API. [Jakub Onderka]
+- [optimise] Faster loading galaxy cluster index. [Jakub Onderka]
+
+Fix
+---
+- [attribute:restSearch] `includeCorrelations` Do not longer returns
+  soft-deleted attributes. [mokaddem]
+- [sharinggroup:captureSG] Correctly capture the roaming state.
+  [mokaddem]
+
+  Fix #7254
+- [attribute] typo in place-port-of-original-embarkation fixed.
+  [Alexandre Dulaunoy]
+- [doc] Partial fix for misp-modules. [Steve Clement]
+- [doc] Fixed a bash variable bug. [Steve Clement]
+- [doc] MISP-core now working on RHEL 7.9. [Steve Clement]
+- [doc] next stages of the RHEL7 install. [Steve Clement]
+- [sync:local-tag] Local tags converted into global after sync for
+  internal sync. [mokaddem]
+
+  Fix #7253
+- [attribute] typo in place-port-of-original-embarkation fixed.
+  [Alexandre Dulaunoy]
+- [attributes:restSearch] pop attribute timestamp filtering condition.
+  [mokaddem]
+
+  This avoid the condition to propagates to the event level.
+  Fix #7096
+- [command:admin] UpdateTaxonomies provides correct feedback Fix #7132.
+  [mokaddem]
+- [tags] More granularity for local and global add cluster buttons.
+  [mokaddem]
+- [tags] More granularity for local and global add tag buttons.
+  [mokaddem]
+- [attributes:addTag] Pass the event to check ACL. [mokaddem]
+- [taxonomy] avoid MISP becoming unhappy when trying to enable tags for
+  a non-existing taxonomy. [iglocska]
+- [doc] rhel 7 install doc initial fixes. [Steve Clement]
+- [selinux] allow log files rename. [Richard van den Berg]
+- [db_schema] Cerebrates's comment default value. [mokaddem]
+
+  Fix #7200, fix #7137
+- [API] Fixes crash when a new indicator in existing event has a
+  sighting. [Tom King]
+- [Sync] Crash when attempting to sync with 'Pull Galaxy Clusters'
+  enabled. [Tom King]
+- [swp] /var/swap.img is not a safe place. [Steve Clement]
+- [merge] Local tags should stay local vol. 2. [Jakub Onderka]
+- [internal] Keep OidcAuth setting when modify setting value from UI.
+  [Jakub Onderka]
+- Remove broken refang. [Raphaël Vinot]
+- [config.php] file permission after changes fixes #7229. [iglocska]
+
+  - will revert to the permissions before the save
+  - caused by the create -> rename cycle that backs up server settings on each change actually creating a new file instead of modifying it
+- [sharing groups] uuid not logged when saving failed due to invalid
+  variable lookup. [iglocska]
+- [UI] signature allowedlist clarification. [iglocska]
+- Fixes bug that stops country flag being displayed alongside the coutry
+  in galaxy clusters. [Tom King]
+- [refanging] Removed obnoxious regexes, fixes #7214. [iglocska]
+
+  - refanging \\. and .. to . is a stupid idea
+- [shibbauth] fixed invalid varname. [iglocska]
+- [test] Repo is missing. [Jakub Onderka]
+- [feed] Convert invalid key case. [Jakub Onderka]
+- [test] Repo is missing. [Jakub Onderka]
+- [internal] Remove unnecessary create call. [Jakub Onderka]
+- [workers] Worker name when processing freetext. [Jakub Onderka]
+- [merge] Local tags should stay local. [Jakub Onderka]
+- [unsafe API keys] fixed. [iglocska]
+
+  - if you really have to use them, they should work again
+
+  - please don't use them, you are disclosing your APIkey via the URL
+  - apache logs, proxy logs they will all have your APIkey
+  - adding headers with your APIkey isn't so difficult
+  - if a tool you use has no way of configuring headers, reach out to your vendor, they ought to do something about that
+- [UI] indextable link generation on empty result set. [iglocska]
+
+  - empty string instead of notice barfed back
+- [email] Correctly check if user has PGP or S/MIME key. [Jakub Onderka]
+- [email] Correct Content-Type header for alternative content. [Jakub
+  Onderka]
+- [email] Correctly set domain for email message ID. [Jakub Onderka]
+- [internal] PHP warnings when pivoting. [Jakub Onderka]
+- [internal] Warning when object has no attributes. [Jakub Onderka]
+- [SG] allow saving sharing groups with empty releasabiltiy tags, fixes
+  #7165. [iglocska]
+- [sync] Warning when sync object without attributes. [Jakub Onderka]
+- [UI] event matrix heatmap view correctly flattens the event.
+  [iglocska]
+
+  - object attributes were excluded
+- [UI] fix broken checkbox layout in generic Form builder forms.
+  [iglocska]
+- [Freetext import] handle end of sentence periods and brackets better,
+  fixes #7163. [iglocska]
+- [UI] Module diagnostics view. [Jakub Onderka]
+- [UI] event matrix heatmap view correctly flattens the event.
+  [iglocska]
+
+  - object attributes were excluded
+- [UI] Add attribute checkboxes. [Jakub Onderka]
+- [UI] Diagnostics box. [Jakub Onderka]
+- [UI] Remove warning about old PHP a Python. [Jakub Onderka]
+- [diagnostics] Typo in security audit message. [Jakub Onderka]
+- [UI] fix broken checkbox layout in generic Form builder forms.
+  [iglocska]
+- [OIDC] Change algo how roles are assigned to users. [Jakub Onderka]
+- [internal] Undefined index when importing from module. [Jakub Onderka]
+
+Other
+-----
+- Chg; [version] bump. [iglocska]
+- Merge branch 'develop' into 2.4. [iglocska]
+- Merge branch '2.4' into develop. [iglocska]
+- Merge pull request #7261 from SteveClement/guides. [Steve Clement]
+
+  chg: [doc] when enabling remi 7.4 by default, paths change
+- Merge pull request #7260 from SteveClement/guides. [Steve Clement]
+
+  chg: [doc] CentOS8Stream is now supported
+- Merge pull request #7259 from SteveClement/guides. [Steve Clement]
+- Merge pull request #7257 from SteveClement/i18n. [Steve Clement]
+- Merge remote-tracking branch 'upstream/2.4' into i18n. [Steve Clement]
+- Merge pull request #7256 from SteveClement/i18n. [Steve Clement]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge pull request #7264 from JakubOnderka/galaxy-update. [Jakub
+  Onderka]
+
+  chg: [galaxy] Update
+- Merge pull request #7255 from Wachizungu/fix-debugon-gui-logic.
+  [Alexandre Dulaunoy]
+
+  chg: [UI] fix debugon for debug = 1. fix #7131
+- Merge remote-tracking branch 'origin/2.4' into develop. [mokaddem]
+- Merge branch '2.4' of github.com:MISP/MISP into develop. [mokaddem]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [mokaddem]
+- Merge pull request #7251 from SteveClement/guides. [Steve Clement]
+
+  fix: [doc] Partial fix for misp-modules
+- Merge pull request #7250 from SteveClement/guides. [Steve Clement]
+
+  chg: [doc] more fine tuning to RHEL8
+- Merge pull request #7249 from SteveClement/guides. [Steve Clement]
+- Merge pull request #7248 from SteveClement/guides. [Steve Clement]
+
+  fix: [doc] Fixed a bash variable bug
+- Merge pull request #7247 from SteveClement/guides. [Steve Clement]
+
+  chg: [doc] Added additional hardening and logging defaults
+- Merge pull request #7246 from SteveClement/guides. [Steve Clement]
+- Merge pull request #7245 from SteveClement/guides. [Steve Clement]
+- Merge pull request #7244 from SteveClement/guides. [Steve Clement]
+
+  fix: [doc] MISP-core now working on RHEL 7.9
+- Merge pull request #7243 from SteveClement/guides. [Steve Clement]
+
+  fix: [doc] next stages of the RHEL7 install
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7242 from Wachizungu/add-enable-taxonomy-tags-
+  cake-command. [Andras Iklody]
+
+  new: [cli] enable all tags for a taxonomy
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge remote-tracking branch 'origin/2.4' into develop. [mokaddem]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge pull request #7236 from Wachizungu/fix-users-statistics-data-
+  typo. [Alexandre Dulaunoy]
+
+  chg: [statistics] fix typo in statistics_data view - monthly attribut…
+- Merge pull request #7231 from Wachizungu/add-login-log-shibbauth.
+  [Alexandre Dulaunoy]
+
+  chg: [ShibbAuth] Add login entry on logging in for audit
+- Merge branch '2.4' into develop. [iglocska]
+- Merge pull request #7238 from SteveClement/guides. [Steve Clement]
+- Merge pull request #7237 from RichieB2B/ncsc-nl/selinux-rename. [Steve
+  Clement]
+- Merge pull request #7206 from tomking2/bug/sighting_crash. [Andras
+  Iklody]
+
+  fix: [api] Fixes crash when a new indicator in existing event has a sighting
+- Merge pull request #7219 from tomking2/bug/galaxy-cluster-
+  sharinggroup. [Jakub Onderka]
+
+  fix: [sync] Crash when attempting to sync with 'Pull Galaxy Clusters' enabled
+- Merge pull request #7215 from SteveClement/tools. [Steve Clement]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7081 from JakubOnderka/galaxy-view-new. [Jakub
+  Onderka]
+
+  New galaxy view for events
+- Merge pull request #6722 from JakubOnderka/threat-level-index. [Jakub
+  Onderka]
+
+  new: [UI] Show threat level icons on event index
+- Merge pull request #7183 from JakubOnderka/merge-local-tags-v2. [Jakub
+  Onderka]
+
+  fix: [merge] Local tags should stay local vol. 2
+- Merge pull request #7181 from JakubOnderka/freetext-speedup. [Jakub
+  Onderka]
+
+  new: [freetext] Faster freetext parsing with more tests
+- Merge pull request #7213 from JakubOnderka/oidc-keep-setting. [Jakub
+  Onderka]
+
+  fix: [internal] Keep OidcAuth setting when modify setting value from UI
+- Merge pull request #7222 from JakubOnderka/refang-test. [Jakub
+  Onderka]
+
+  chg: [test] Add test for #7214
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
+- Merge pull request #7205 from tomking2/bug/galaxy_country_flag. [Jakub
+  Onderka]
+
+  fix: [UI] Fixes bug that stops country flag being displayed alongside country
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [Alexandre
+  Dulaunoy]
+- Merge pull request #7188 from dataplane/2.4. [Alexandre Dulaunoy]
+
+  added newest DataPlane.org feeds
+- Added newest DataPlane.org feeds. [John Kristoff]
+- Merge pull request #7207 from JakubOnderka/freetext-feed-view. [Jakub
+  Onderka]
+
+  chg: [UI] Show number of items in freetext feed
+- Merge pull request #7184 from JakubOnderka/feed-event-preview-nicer.
+  [Jakub Onderka]
+
+  chg: [UI] Make feed event preview nicer
+- Merge pull request #7203 from JakubOnderka/fix-build. [Alexandre
+  Dulaunoy]
+
+  fix: [test] Repo is missing
+- Merge pull request #7191 from JakubOnderka/create-no-need. [Jakub
+  Onderka]
+
+  fix: [internal] Remove unnecessary create call
+- Merge pull request #7190 from JakubOnderka/worker-name. [Jakub
+  Onderka]
+
+  fix: [workers] Worker name when processing freetext
+- Merge pull request #7186 from JakubOnderka/threat-level-list. [Jakub
+  Onderka]
+
+  chg: [internal] Threat levels list
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7182 from JakubOnderka/merge-local-tags. [Jakub
+  Onderka]
+
+  fix: [merge] Local tags should stay local
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
+- Merge branch 'eventgraph-node-coloring' into develop. [mokaddem]
+- Merge branch 'develop' of github.com:MISP/MISP into eventgraph-node-
+  coloring. [mokaddem]
+- Merge pull request #7170 from JakubOnderka/find-list-optim. [Jakub
+  Onderka]
+
+  chg: [optimisation] Faster Model::_findList method
+- Merge pull request #7174 from JakubOnderka/event-locks-faster. [Jakub
+  Onderka]
+
+  chg: [internal] Faster event locks with Redis
+- Merge pull request #7173 from JakubOnderka/disable-correlation-info-
+  date. [Jakub Onderka]
+
+  chg: [correlation] Do not update info and date column
+- Merge pull request #7159 from Wachizungu/fix-removetag-querybuilder-
+  template. [Alexandre Dulaunoy]
+
+  chg: [restClient:querybuilder] fix remove tag from object template
+- Merge pull request #7172 from Wachizungu/add-addTag-removeTag-actions-
+  event-attribute-query-builder. [Alexandre Dulaunoy]
+
+  chg: [restClient:querybuilder] add events and attributes addTag and r…
+- Merge pull request #7171 from Wachizungu/fix-attributes-addtag-by-
+  name. [Alexandre Dulaunoy]
+
+  chg: [attributes] fix attribute addtag by name conditions for find no…
+- Merge pull request #7168 from Wachizungu/fix-copypasta-error-
+  attributes-addTag. [Jakub Onderka]
+
+  chg: [attributes] fix copypasta error leading to internal server erro…
+- Merge pull request #6967 from JakubOnderka/html-alert-email. [Jakub
+  Onderka]
+
+  HTML alert email
+- Merge pull request #7161 from JakubOnderka/sighting-different-query.
+  [Jakub Onderka]
+
+  chg: [internal] Fetch attribute UUIDs for sightings in different query
+- Merge pull request #7133 from JakubOnderka/pivot-fix. [Jakub Onderka]
+
+  fix: [internal] PHP warnings when pivoting
+- Merge pull request #7156 from JakubOnderka/fix-empty-object. [Jakub
+  Onderka]
+
+  fix: [internal] Warning when object has no attributes
+- Merge pull request #7166 from JakubOnderka/css-nice. [Jakub Onderka]
+
+  CSS nice
+- Merge pull request #7167 from JakubOnderka/keyboard-shortucts. [Jakub
+  Onderka]
+
+  Keyboard shortcuts
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge branch '2.4' into develop. [iglocska]
+- Merge pull request #7162 from JakubOnderka/empty-object-sync. [Jakub
+  Onderka]
+
+  fix: [sync] Warning when sync object without attributes
+- Merge branch '2.4' into develop. [iglocska]
+- Merge pull request #7160 from JakubOnderka/fix-diagnotics. [Jakub
+  Onderka]
+
+  fix: [UI] Module diagnostics view
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7155 from JakubOnderka/push-optim. [Jakub Onderka]
+
+  Push optim
+- Merge pull request #7154 from JakubOnderka/diagnostics. [Jakub
+  Onderka]
+
+  Diagnostics
+- Merge pull request #7150 from JakubOnderka/force-https. [Jakub
+  Onderka]
+
+  new: [internal] Security setting force_https
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7138 from JakubOnderka/oidc-role-fix. [Jakub
+  Onderka]
+
+  fix: [OIDC] Change algo how roles are assigned to users
+- Merge pull request #7086 from JakubOnderka/save-progress. [Jakub
+  Onderka]
+
+  chg: [internal] When caching feed, save progress to db less often
+- Merge pull request #7104 from JakubOnderka/authkeys-allowed-ips.
+  [Jakub Onderka]
+
+  new: [authkeys] Allowed IPs
+- Merge pull request #7111 from JakubOnderka/cookie-name. [Jakub
+  Onderka]
+
+  chg: [internal] Set cookie name just when no name is set
+- Merge pull request #7060 from JakubOnderka/galaxy-cluster-tag-name-ci.
+  [Jakub Onderka]
+
+  chg: [schema] Convert GalaxyCluster tag name to case insensitive
+- Merge pull request #7112 from JakubOnderka/galaxy-cluster-md. [Jakub
+  Onderka]
+
+  new: [UI] Render galaxy cluster description as markdown
+- Merge pull request #7127 from JakubOnderka/server-setting-cleanup.
+  [Jakub Onderka]
+
+  chg: [internal] Cleanup code that is resposible for fetching setting
+- Merge pull request #7117 from JakubOnderka/keyboard-shortcuts. [Jakub
+  Onderka]
+
+  chg: [UI] Simplify keyboard-shortcuts.js
+- Merge pull request #7116 from JakubOnderka/page-visibility-api. [Jakub
+  Onderka]
+
+  chg: [UI] Use Page Visibility API
+- Merge pull request #7125 from JakubOnderka/fix-undefined-index. [Jakub
+  Onderka]
+
+  fix: [internal] Undefined index when importing from module
+- Merge pull request #7113 from JakubOnderka/optimise-loading-clusters.
+  [Jakub Onderka]
+
+  chg: [optimise] Faster loading galaxy cluster index
+- Merge branch '2.4' into develop. [iglocska]
+
+v2.4.140 (2021-03-03)
+---------------------
+
+New
+---
+- [test] Password change. [Jakub Onderka]
+- [server shell] list servers, fixes #7115. [iglocska]
+
+  - simple human readable listing
+  - kept the old weird JSON producing listServers intact
+- [oidc] Readme. [Jakub Onderka]
+- :lock: Content-Security-Policy support. [Jakub Onderka]
+- [CLI] check if updates are done yet or not. [iglocska]
+
+  usage:
+
+  - /var/www/MISP/app/Console/cake Admin updatesDone [blocking]
+  - returns True or False based on whether it is done
+  - When the blocking parameter is set, it will not return until all updates are done
+- [api] When creating object, allow to mark tag as local. [Jakub
+  Onderka]
+- [type] new dkim and dkim-signature attribute type. [Alexandre
+  Dulaunoy]
+- [objectReference] Allow adding reference across extended events.
+  [mokaddem]
+
+  Fix #6255
+- [UI] Event locks for background jobs and automatic tools. [Jakub
+  Onderka]
+- [UI] Show tag info in taxonomy view. [Jakub Onderka]
+- [sync] Compressed requests support. [Jakub Onderka]
+- :lock: Security audit. [Jakub Onderka]
+- [oidc] OpenID Connect authentication. [Jakub Onderka]
+- [devshell] added a new shell for developer related tasks. [iglocska]
+
+  - 1 task currently, cleanFeedDefault
+    - runs some cleanup on the feed definition file to remove local IDs etc
+- [object] Allows updating from an unknown object templates. [mokaddem]
+
+Changes
+-------
+- [csp] Add Security.csp_enforce to server setting. [Jakub Onderka]
+- [csp] Report only by default. [Jakub Onderka]
+- [PyMISP] Bump version. [Raphaël Vinot]
+- [PyMISP] Fix tests. [Raphaël Vinot]
+- [PyMISP] Bump before release. [Raphaël Vinot]
+- [misp-objects] updated to the latest version. [Alexandre Dulaunoy]
+- [version] bump. [iglocska]
+- [UI] fix keyboard shortcut manager popup triangle. [Jeroen Pinoy]
+- [UI] Add small description of what event block rules do. [Jeroen
+  Pinoy]
+- [sighting] Simplified sighting deletion. [Jakub Onderka]
+- Bump PyMISP. [Raphaël Vinot]
+- [genericForm] added description field to the explanation. [iglocska]
+- Add small description of what org blocklist does. Fix #4363. [Jeroen
+  Pinoy]
+- [oidc] Use first match as user role. [Jakub Onderka]
+- [UI] correct edit org blocklist entries view. [Jeroen Pinoy]
+- [taxonomies] updated to the latest version. [Alexandre Dulaunoy]
+- [UI] Disable sync XHR. [Jakub Onderka]
+- [ineternal] Opimise GalaxyCluster::fetchGalaxyClusters when full is
+  True. [Jakub Onderka]
+- [UI] Put type under name for object add form. [Jakub Onderka]
+- [UI] Nicer Object pre-save review. [Jakub Onderka]
+- [UI] Make different forms nicer. [Jakub Onderka]
+- [internal] Check missing taxonomies at one place. [Jakub Onderka]
+- [internal] New method Taxonomy::splitTagToComponents. [Jakub Onderka]
+- [misp-objects] updated to the latest version. [Alexandre Dulaunoy]
+- Add can access check for correlation exclusions menu entry. [Jeroen
+  Pinoy]
+- [PyMISP] updated. [Alexandre Dulaunoy]
+- [js] Use proper message when remote server returns 401. [Jakub
+  Onderka]
+- [internal] Faster fetching galaxy clusters when fetching event. [Jakub
+  Onderka]
+- [UI] Remove authors from galaxy cluster popover. [Jakub Onderka]
+- [UI] Do not create links for galaxy cluster source popover. [Jakub
+  Onderka]
+
+  Links are not clickable in popovers
+- [UI] Do not show refs for galaxy cluster popover, becasue links are
+  not clickable. [Jakub Onderka]
+- [UI] Do not show description if is empty for galaxy cluster popover.
+  [Jakub Onderka]
+- [galaxy] Make Galaxy cluster description optional. [Jakub Onderka]
+- [server] DBSchemaDiagnostic consider nullable inconsistencies as
+  critical. [mokaddem]
+- [genericPicker] Allow using picker for galaxy matrixes. [mokaddem]
+- [objectReference] Renamed function. [mokaddem]
+- [events:eventGraph] Improved hull algorithm and UI. [mokaddem]
+- [js] Move code from template to misp.js. [Jakub Onderka]
+- [internal] Faster Event::removeOlder method used when pulling from
+  remote server. [Jakub Onderka]
+- [internal] Simplified ServersController::serverSettings. [Jakub
+  Onderka]
+- Use a more suitable Sighting creation function as recommended, grab
+  the Org ID from the user if present. [Tom King]
+- Add in ability to update sightings against each attribute from a
+  POSTed MISP Event. [Tom King]
+- [feed] Simplified code for loading feeds. [Jakub Onderka]
+- [restResponse] Return role_id along with its name. [mokaddem]
+- [objectReference] Added objectReference/view endpoint. [mokaddem]
+- [dashboard] added to the root level of the top menu. [iglocska]
+- [internal] Make Redis connection static. [Jakub Onderka]
+- [internal] Faster updating taxonomies. [Jakub Onderka]
+
+Fix
+---
+- [csp] Incorrect variable name. [Jakub Onderka]
+- [csp] Custom policies. [Jakub Onderka]
+- [Sharing groups] capturing a sharing group correctly ignores the
+  incoming data's active flag when editing. [iglocska]
+
+  - based on PR #7101 by @lfortemps
+- [sync] prevent local tags from being pulled. [Golbark]
+- [email_otp] Trim value for increased UX. [Loïc Fortemps]
+- [sharing groups] fixed regression with updating local sharing groups.
+  [iglocska]
+- [comments] updated for two recent changes in the code. [iglocska]
+- [sharing groups] Allow users to see events they own, even if their
+  organisation is not explicitly mentioned in the SG. [iglocska]
+
+  - however, show a clear message that this is the case
+  - in-line with the rest of the ACL
+- :lock: sharing group all org flag too lax. [iglocska]
+
+  - the all org flag was used as a trigger to make the sharing group obejct itself viewable to all local organisations
+  - even if the all org flag was set for an instance other than the local one
+
+  - as reported by Jeroen Pinoy
+- [tag index] remove sorting on count fields. [iglocska]
+
+  - doesn't work anyway
+- [galaxyCluster] Revoke relations on sync. [mokaddem]
+
+  - Relationships are now re-build from scratch for the cluster being sync
+  - This cancels any modification done locally (which should not have
+  happened in the first place)
+- [galaxyClusterRelations] Bump cluster's timestamp after performing
+  CRUD on relations. [mokaddem]
+- [pull] invalid internal vs external server lookup when deciding
+  whether to pull local tags. [iglocska]
+- [sharing group] saving fixed. [iglocska]
+
+  invalid boolean operator when encoding the local org
+- [email_otp] skip OTP for disabled users. [Loïc Fortemps]
+- [internal] Empty object when getting event info for event report.
+  [Jakub Onderka]
+- [internal] Correctly save log. [Jakub Onderka]
+- [Sharing group] refactored and fixed. [iglocska]
+
+  - include own org in pulled sharing groups (to avoid implicit inclusion not being visible after a pull)
+  - refactor the pulling method to be more maintainable
+  - avoid pulling proposals/sightings on each event cherry pick
+- [internal] Incorrect tag three components split. [Jakub Onderka]
+- [UI] Fetch GalaxyElements for event index. [Jakub Onderka]
+- [UI] Pagination for event reports in event view. [Jakub Onderka]
+- [internal] Bad 7085. [Jakub Onderka]
+- [internal] Bad merge that prevents language change. [Jakub Onderka]
+- [sync] Undefined index when pushing sightings. [Jakub Onderka]
+- [internal] perm_tag_editor can just create tags. [Jakub Onderka]
+- [internal] Include cluster elements for user interface. [Jakub
+  Onderka]
+- [internal] Really disable password change. [Jakub Onderka]
+- [sync] Fixed a critical issue causing sharing groups to lose
+  orgs/instance information on sync when using non sync users on a pull.
+  [iglocska]
+- Ui  _ function does not exist, l10n function is __ [Patrizio Tufarolo]
+- Syntax error in constructTaxonomyInfo() [Fredrik Soderblom]
+- [server] Add application/x-pie-executable to the list of accepted
+  mimetypes in testForBinExec. [Patrizio Tufarolo]
+- [schema feed] remove non-required fields in feed format. [Alexandre
+  Dulaunoy]
+- [API] password reset was broken for admins. [iglocska]
+- [tools] misp-wipe updated list of table to truncate. [mokaddem]
+- [js] Use error callback for relevant ajax calls. [Jakub Onderka]
+- [js] Remove async default value. [Jakub Onderka]
+- [galaxy] GalaxyClusterRelation doesn't have Org and Orgc. [Jakub
+  Onderka]
+- [restsearch] fixed a bug introduced via the new page/limit filters.
+  [iglocska]
+- [caching] monkey-patching a client side MISP bug causing the caching
+  to loop endlessly. [iglocska]
+
+  - MISP caching can run into an endless loop if errors are returned for whatever reason
+  - This patch handles the specific case when the remote MISP requests an attribute range for caching that has an offset beyond the highest ID (should never happen)
+
+  - It's a dirty fix but should have nearly no impact on performance whilst resolving the issue
+- [server] Caching a server ensures that the returned data is an actual
+  UUID. [mokaddem]
+- [ACL] opened up postTest to all roles. [Andras Iklody]
+- [securityAudit] Display python version. [mokaddem]
+- [dashboard] Saving an invalid JSON when importing templates shows an
+  error. [mokaddem]
+- [galaxy] Missing variable when editing relation. [Jakub Onderka]
+- [attributes] full_group_by fix for statistics. Fix #7014. [mokaddem]
+- [event] Fix retreiving selected referenced element data. [mokaddem]
+- [event] Provide text for missing referenced elements. [mokaddem]
+
+  - The event might not contain the referenced elements if they belong to
+  an extended event
+- [events:eventGraph] Make sure to include event_id for attribute nodes.
+  [mokaddem]
+- [post] Do not send emails to disabled user for new posts. [Jakub
+  Onderka]
+- [UI] Attribute create button nicer. [Jakub Onderka]
+- [internal] Remove unused ServerTag. [Jakub Onderka]
+- [internal] Remove unused layouts. [Jakub Onderka]
+- [internal] Remove unused roboto font. [Jakub Onderka]
+- [UI] Remove unnecessary CSS from default template. [Jakub Onderka]
+- [restClient] Make sure to split value on strings. [mokaddem]
+
+  Fix #7032
+- [objectReference] Make sure to bump timestamp. [mokaddem]
+- [objectReference] Make sure to save source_uuid field as well.
+  [mokaddem]
+- [Event] Correctly save references after sync. [mokaddem]
+- [galaxy] Fix undefined variable when capturing clusters. [Jakub
+  Onderka]
+- [feed defaults] Removed some required properties in the validation
+  schema. [mokaddem]
+
+  - Propoerties like IDs are instance dependant and therefore are not
+  necessary
+- [dashboard] Saving an invalid JSON shows an error. [mokaddem]
+
+  Fix #6975
+- [feed defaults] removed a bunch of feeds and clarified the description
+  of some, fixes #7006. [iglocska]
+- [UI] Galaxy pagination. [Jakub Onderka]
+- [feed] edit ignored changes to the header, fixes #6780. [iglocska]
+- [UI] Showing date and time in user profile. [Jakub Onderka]
+- [UI] Object template pagination. [Jakub Onderka]
+- [feeds] feed edit ignored the headers field, ffixes #6780. [iglocska]
+- Allow cluster authors to be an actual array. [Tom King]
+- Allow 'hard' param in POSTed body for deleting a cluster, send back a
+  proper message. [Tom King]
+
+Other
+-----
+- Merge pull request #7149 from JakubOnderka/csp-setting. [Jakub
+  Onderka]
+
+  chg: [csp] Add Security.csp_enforce to server setting
+- Merge pull request #7145 from JakubOnderka/fix-change-pw. [Jakub
+  Onderka]
+
+  new: [test] Password change by org admin
+- Merge pull request #7147 from JakubOnderka/fix-csp-again. [Jakub
+  Onderka]
+
+  fix: [csp] Incorrect variable name
+- Merge branch 'jakub' into 2.4. [iglocska]
+- Merge pull request #7142 from JakubOnderka/fix-csp. [Jakub Onderka]
+
+  fix: [csp] Custom policies
+- Merge branch 'develop' into 2.4. [iglocska]
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
+- Merge pull request #6661 from cudeso/2.4. [Andras Iklody]
+
+  Azure Active Directory Authentication
+- Avoid "TODO" in the README to avoid CodeFactor. [Koen Van Impe]
+- Azure Active Directory Authentication. [Koen Van Impe]
+- Merge pull request #7100 from lfortemps/local-tags-fix. [Andras
+  Iklody]
+
+  Prevent pulling local tags
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7130 from Wachizungu/fix-shortcut-manager-
+  triangle-popup. [Andras Iklody]
+
+  chg: [UI] fix keyboard shortcut manager popup triangle
+- Merge pull request #7114 from Wachizungu/add-short-event-block-rule-
+  explanation. [Andras Iklody]
+
+  chg: [UI] Add small description of what event block rules do
+- Merge pull request #6736 from JakubOnderka/sighting-deletion. [Andras
+  Iklody]
+
+  chg: [sighting] Simplified sighting deletion
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
+- Merge pull request #7059 from adammchugh/patch-1. [Andras Iklody]
+
+  Inclusion of full-name under person
+- Inclusion of full-name under person. [adammchugh]
+
+  Proposing the inclusion of full-name under person to allow for better capture and correlation of full names of identified persons in events. Particularly where there are multiple identities within an event which may create confusion with multiple first-name and last-name entries.
+- Merge pull request #7080 from StefanKelm/2.4. [Andras Iklody]
+
+  Update resolved_misp_format.ctp
+- Update resolved_misp_format.ctp. [StefanKelm]
+
+  slight rewording
+- Merge pull request #7092 from lfortemps/patch-2. [Andras Iklody]
+
+  fix: [email_otp] Trim value for increased UX
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge remote-tracking branch 'origin/2.4' into develop. [mokaddem]
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7094 from JakubOnderka/oidc-readme. [Jakub
+  Onderka]
+
+  new: [oidc] Readme
+- Merge pull request #7106 from Wachizungu/add-short-org-blocklist-
+  explanation. [Alexandre Dulaunoy]
+
+  chg: [UI] Add small description of what org blocklist does. Fix #4363
+- Merge pull request #7105 from JakubOnderka/oidc-roles. [Jakub Onderka]
+
+  chg: [oidc] Use first match as user role
+- Merge pull request #7107 from Wachizungu/change-edit-org-blocklist-
+  view-title. [Jakub Onderka]
+
+  chg: [UI] correct edit org blocklist entries view
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge pull request #7091 from Golbark/patch-1. [Alexandre Dulaunoy]
+
+  fix: [email_otp] skip OTP for disabled users
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [Alexandre Dulaunoy]
+- Merge pull request #7095 from JakubOnderka/event-report-empty-objects.
+  [Jakub Onderka]
+
+  fix: [internal] Empty object when getting event info for event report
+- Merge pull request #7097 from JakubOnderka/csp. [Jakub Onderka]
+
+  new: :lock: Content-Security-Policy support
+- Merge pull request #7102 from JakubOnderka/disable-sync-xhr. [Jakub
+  Onderka]
+
+  chg: [UI] Disable sync XHR
+- Merge pull request #7090 from JakubOnderka/fix-saving-log. [Jakub
+  Onderka]
+
+  fix: [internal] Correctly save log
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [Alexandre Dulaunoy]
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7089 from JakubOnderka/fix-tag-split. [Jakub
+  Onderka]
+
+  fix: [internal] Incorrect tag three components split
+- Merge pull request #7083 from JakubOnderka/event-index-galaxy-
+  elements. [Jakub Onderka]
+
+  fix: [UI] Fetch GalaxyElements for event index
+- Merge pull request #7088 from JakubOnderka/event-report-pagination.
+  [Jakub Onderka]
+
+  fix: [UI] Pagination for event reports in event view
+- Merge pull request #7087 from JakubOnderka/fix-7085. [Jakub Onderka]
+
+  fix: [internal] Bad 7085
+- Merge pull request #7085 from JakubOnderka/optimise-cluster-fetch.
+  [Jakub Onderka]
+
+  Optimise cluster fetch
+- Merge pull request #7084 from JakubOnderka/fix-bad-merge-lang. [Jakub
+  Onderka]
+
+  fix: [internal] Bad merge that prevents language change
+- Merge pull request #7049 from JakubOnderka/ui-form-fixes. [Jakub
+  Onderka]
+
+  chg: [UI] Make different forms nicer
+- Merge pull request #7079 from JakubOnderka/fix-sightings-pushing.
+  [Jakub Onderka]
+
+  fix: [sync] Undefined index when pushing sightings
+- Merge pull request #7078 from JakubOnderka/missing-taxonomies. [Jakub
+  Onderka]
+
+  Missing taxonomies
+- Merge pull request #7069 from JakubOnderka/tag-edit-delete. [Jakub
+  Onderka]
+
+  fix: [internal] perm_tag_editor can just create tags
+- Merge pull request #7073 from JakubOnderka/include-cluster-meta.
+  [Jakub Onderka]
+
+  fix: [internal] Include cluster elements for user interface
+- Merge pull request #7065 from JakubOnderka/disable-password-change.
+  [Jakub Onderka]
+
+  fix: [internal] Really disable password change
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
+- Merge pull request #7056 from Wachizungu/add-can-access-check-for-
+  menu-entry-correlation-exclusions. [Jakub Onderka]
+
+  chg: [UI] Add can access check for correlation exclusions menu entry
+- Merge pull request #7070 from fsoderblom/fix-syntaxerror. [Andras
+  Iklody]
+
+  fix: syntax error in constructTaxonomyInfo()
+- Update misp-wipe.sql. [Raphaël Vinot]
+
+  Rename whitelist -> allowedlist / blacklist -> blocklist
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
+- Merge pull request #7037 from Wachizungu/add-list-auth-keys-button-to-
+  global-menu. [Alexandre Dulaunoy]
+
+  Adds 'List Auth Keys' button to Administration in global menu
+- Adds 'List Auth Keys' button to Administration in global menu. [Jeroen
+  Pinoy]
+- Merge pull request #7052 from patriziotufarolo/patch-1. [Alexandre
+  Dulaunoy]
+
+  fix: [server] Add application/x-pie-executable to the list of accepted mimetypes in testForBinExec
+- Merge pull request #7053 from eCrimeLabs/2.4. [Alexandre Dulaunoy]
+
+  Fix for ZeroMQ - #7040 and #7039
+- Fix for #7040 and #7039. [eCrimeLabs]
+
+  The following commit contains the fix for ZeroMQ only listening on 0.0.0.0
+- Merge pull request #7033 from MISP/fix-misp-wipe. [Andras Iklody]
+
+  fix: [tools] misp-wipe updated list of table to truncate
+- Merge pull request #7048 from JakubOnderka/xhr-401-handling. [Jakub
+  Onderka]
+
+  XHR 401 handling
+- Merge pull request #7055 from JakubOnderka/fast-event-galaxies. [Jakub
+  Onderka]
+
+  chg: [internal] Faster fetching galaxy clusters when fetching event
+- Merge pull request #7057 from JakubOnderka/tag-local. [Jakub Onderka]
+
+  new: [api] When creating object, allow to mark tag as local
+- Merge pull request #7050 from JakubOnderka/cluster-relation. [Jakub
+  Onderka]
+
+  fix: [galaxy] GalaxyClusterRelation doesn't have Org and Orgc
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [Alexandre
+  Dulaunoy]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7027 from JakubOnderka/galaxy-view-mini. [Jakub
+  Onderka]
+
+  Galaxy view mini
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge pull request #7029 from JakubOnderka/galaxy-cluster-description.
+  [Jakub Onderka]
+
+  chg: [galaxy] Make Galaxy cluster description optional
+- Merge pull request #7043 from JakubOnderka/cluster-relattion-missing-
+  var. [Jakub Onderka]
+
+  fix: [galaxy] Missing variable when editing relation
+- Merge branch 'feature-reference-for-extended-event' into develop.
+  [mokaddem]
+- Merge branch 'develop' into feature-reference-for-extended-event.
+  [mokaddem]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge pull request #6742 from JakubOnderka/post-user-disabled. [Jakub
+  Onderka]
+
+  fix: [post] Do not send emails to disabled user for new posts
+- Merge pull request #6925 from JakubOnderka/event-locks. [Jakub
+  Onderka]
+
+  new: [UI] Event locks for background jobs and automatic tools
+- Merge pull request #6943 from JakubOnderka/ui-create-button. [Jakub
+  Onderka]
+
+  fix: [UI] Attribute create button nicer
+- Merge pull request #7002 from JakubOnderka/code-cleanup. [Jakub
+  Onderka]
+
+  fix: [UI] Remove unnecessary CSS from default template
+- Merge pull request #7034 from JakubOnderka/taxonomy-tag-info. [Jakub
+  Onderka]
+
+  new: [UI] Show tag info in taxonomy view
+- Merge pull request #6906 from JakubOnderka/compressed-requests. [Jakub
+  Onderka]
+
+  new: [sync] Compressed requests support
+- Merge pull request #6871 from JakubOnderka/faster-pull. [Jakub
+  Onderka]
+
+  chg: [internal] Faster Event::removeOlder method used when pulling
+- Merge pull request #6741 from JakubOnderka/security-diagnostics.
+  [Jakub Onderka]
+
+  new: :lock: Security diagnostics
+- Merge pull request #6938 from tomking2/feature/attribute_sightings.
+  [Jakub Onderka]
+
+  [API] Update attribute sightings from REST POST
+- Merge remote-tracking branch 'upstream/2.4' into
+  feature/attribute_sightings. [Tom King]
+- Merge branch '2.4' into feature/attribute_sightings. [Tom King]
+- Merge pull request #6984 from JakubOnderka/oidc. [Jakub Onderka]
+
+  new: [oidc] OpenID Connect authentication
+- Merge pull request #7020 from JakubOnderka/feed-saving-simplified.
+  [Jakub Onderka]
+
+  chg: [feed] Simplified code for saving feed
+- Merge remote-tracking branch 'origin/2.4' into develop. [mokaddem]
+- Merge branch 'fix-sync-object-relations' into 2.4. [mokaddem]
+- Merge branch '2.4' of github.com:MISP/MISP into fix-sync-object-
+  relations. [mokaddem]
+- Merge pull request #7035 from JakubOnderka/galaxy-fix-undefined-
+  variable. [Jakub Onderka]
+
+  fix: [galaxy] Fix undefined variable when capturing clusters
+- Merge branch 'tomking2-bug/galaxy_cluster' into develop. [mokaddem]
+- Merge remote-tracking branch 'origin/develop' into
+  tomking2-bug/galaxy_cluster. [mokaddem]
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7017 from JakubOnderka/fix-galaxies-pagination.
+  [Jakub Onderka]
+
+  fix: [UI] Galaxy pagination
+- Merge pull request #7015 from JakubOnderka/redis-static. [Jakub
+  Onderka]
+
+  chg: [internal] Make Redis connection static
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7016 from JakubOnderka/fix-user-view-time. [Jakub
+  Onderka]
+
+  fix: [UI] Showing date and time in user profile
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge pull request #7008 from JakubOnderka/update-taxnomies-faster.
+  [Jakub Onderka]
+
+  chg: [internal] Faster updating taxonomies
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7007 from JakubOnderka/object-template. [Jakub
+  Onderka]
+
+  fix: [UI] Object template
+- Merge branch '2.4' into develop. [iglocska]
+- Merge remote-tracking branch 'upstream/2.4' into bug/galaxy_cluster.
+  [Tom King]
+
+v2.4.139 (2021-02-16)
+---------------------
+
+New
+---
+- [widget] Eventstream widget and index widget UI added. [iglocska]
+
+  - EventStream
+    - add a lightweight event index to your dashboard
+    - configure filters for the events you're interested in (tags, orgs, published)
+    - set the number of events to display (limit)
+    - set the list of fields it should display (id, orgc, info, tags, threat_level, analysis, date)
+
+  - Index widget UI
+    - uses the generic index builder
+    - build simple index like UIs
+- [event] Added supports of eventReport coming from modules. [mokaddem]
+- [modules] Export module can specify event fetch options. [Jakub
+  Onderka]
+
+Changes
+-------
+- [version] bump. [iglocska]
+- [array lookup index field] updatd to work correctly. [iglocska]
+- [event model] fetchEvent() now accepts page/limit/order as parameters.
+  [iglocska]
+- [misp-objects] updated to the latest version. [Alexandre Dulaunoy]
+- [events] Enables index search for object. Fix #6961. [mokaddem]
+- [organisation] "International" typo fixed + Europe added. [Alexandre
+  Dulaunoy]
+
+  Notes TODO: Improve the selection using the region galaxy in addition to
+  country galaxy
+- [installer] Updated installer Checksums. [Steve Clement]
+- [installer] The installer is compatible with Ubuntu 21.04 LTS. [Steve
+  Clement]
+- [LogsController] add missing EventReport in log search. [Alexandre
+  Dulaunoy]
+- [organisation] "International" typo fixed + Europe added. [Alexandre
+  Dulaunoy]
+
+  Notes TODO: Improve the selection using the region galaxy in addition to
+  country galaxy
+- [UI] Make event preview nicer. [Jakub Onderka]
+- [UI] Highlight column for roles table. [Jakub Onderka]
+- [internal] Faster updating warninglist. [Jakub Onderka]
+- [UI] Allow filter enabled/disabled warninglists. [Jakub Onderka]
+- [internal] Small optimisation for filterEventIds. [Jakub Onderka]
+- [internal] Use RestResponse for filterEventIdsForPush. [Jakub Onderka]
+- [internal] Update moment javascript library. [Jakub Onderka]
+- [internal] Update composer to 2.0.9. [Jakub Onderka]
+- [UI] Use TimeHelper for datetime formatting. [Jakub Onderka]
+- [internal] Refactor TagsController::view. [Jakub Onderka]
+- [event fetcher] add limit and page parameters to the event fetcher.
+  [iglocska]
+- [connection test] clarified that read only users can pull. [iglocska]
+
+  - Reduced error level to "orange"
+  - Added a clarification that they can still pull
+
+Fix
+---
+- [dashboard] removed training example left in the code. [iglocska]
+
+  - restricted new module to only 3 user IDs
+- [event index] changed the galaxy cluster field width. [iglocska]
+
+  - no longer looks like it was sandwiched between two semis
+- [UI] Escaping in row_attribute. [Jakub Onderka]
+- [internal] Field name in HttpSocketExtended. [Jakub Onderka]
+- [breakOnDuplicate] on event add fixed, fixes #6917. [iglocska]
+
+  - add breakOnDuplicate on the event level as a flag
+    - {"Event":{"breakOnDuplicate":1, "info": "foo", ...}}
+
+  - correctly handle 2 equal objects added to the same event in memory
+- [auto logout] disabled. [iglocska]
+
+  - this crap just causes issues and is pretty pointless
+- [event] `merge from` feature correctly saves object relations. Fix
+  #6969. [mokaddem]
+- [event] Includes eventReport when using the `merge from` feature.
+  [mokaddem]
+- [dashboard] Typo breakig the dashboards fixed. [iglocska]
+- [eventreport] add fixed to avoid ID collisions. [iglocska]
+- [STIX] fix typo in message. [Alexandre Dulaunoy]
+- [events] Attach cluster from matrix in multiselect. Fix #6956.
+  [mokaddem]
+- [eventTimeline] Refrsh attribute index when dragging. Fix #6958.
+  [mokaddem]
+- [STIX] fix typo in message. [Alexandre Dulaunoy]
+- [taxonomy] Hide unselectable tags by default. Fix #6912. [mokaddem]
+- [event] Publishing to pub/sub queues includes all tags. [mokaddem]
+- [internal] Bad variable. [Jakub Onderka]
+- [UI] Undefined variables in authkeys view. [Jakub Onderka]
+- [idTranslator] Distinguish between not found and unreachable. [Jakub
+  Onderka]
+- [UI] Broken checkboxes for role permissions. [Jakub Onderka]
+- [internal] GalaxyCluster::getCluster also accepts ID. [Jakub Onderka]
+- Correctly show hidden tags in tag-list. [marjatech]
+- [UI] Attach correct count of enabled taxonomy tags. [Jakub Onderka]
+- [UI] Remove right margin from form seen input. [Jakub Onderka]
+- [feed] Feed name is required. [Jakub Onderka]
+- [internal] idTranslator could show invalid results. [Jakub Onderka]
+- [generic_picker] Improved perfs by adding a debounce for redrawing
+  results. [mokaddem]
+- [logs] aded eventgraph to log search. [iglocska]
+- [UI] Undefined variables in authkeys view. [Jakub Onderka]
+- [galaxyClusters:view_relation_tree] Fix inital draw of the tree.
+  [mokaddem]
+
+  - Declare variables before assigning value
+- Elasticsearch complains when an IP is an empty string. [Tom King]
+- [tag collections] typo causing tag collections to break completely
+  fixed. [iglocska]
+- [bro] export fixed. [iglocska]
+
+  - invalid group by statement removed
+
+Other
+-----
+- Merge branch 'develop' into 2.4. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #7012 from JakubOnderka/row-attribute-escaping.
+  [Jakub Onderka]
+
+  fix: [UI] Escaping in row_attribute
+- Merge pull request #7011 from JakubOnderka/http-socket-fied-name.
+  [Jakub Onderka]
+
+  fix: [internal] Field name in HttpSocketExtended
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [Alexandre Dulaunoy]
+- Merge remote-tracking branch 'origin/2.4' into develop. [mokaddem]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [mokaddem]
+- Merge pull request #7009 from SteveClement/guides. [Steve Clement]
+
+  chg: [installer] The installer is compatible with Ubuntu 21.04 LTS
+- Merge pull request #7001 from JakubOnderka/nicer-event-preview. [Jakub
+  Onderka]
+
+  chg: [UI] Make event preview nicer
+- Merge pull request #7004 from JakubOnderka/bad-variable. [Jakub
+  Onderka]
+
+  fix: [internal] Bad variable
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #6999 from JakubOnderka/authkey-undefined-
+  variables. [Jakub Onderka]
+
+  fix: [UI] Undefined variables in authkeys view
+- Merge pull request #6997 from JakubOnderka/id-translator-fixes. [Jakub
+  Onderka]
+
+  fix: [idTranslator] Distinguish between not found and unreachable
+- Merge pull request #6995 from JakubOnderka/fix-role-edit-view. [Jakub
+  Onderka]
+
+  fix: [UI] Broken checkboxes for role permissions
+- Merge pull request #6996 from JakubOnderka/highlight-column-role.
+  [Jakub Onderka]
+
+  chg: [UI] Highlight column for roles table
+- Merge pull request #6994 from JakubOnderka/get-cluster-id. [Jakub
+  Onderka]
+
+  fix: [internal] GalaxyCluster::getCluster also accepts ID
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #6993 from JakubOnderka/warninglist-index. [Jakub
+  Onderka]
+
+  chg: [UI] Allow filter enabled/disabled warninglists
+- Merge pull request #6816 from JakubOnderka/filter-event-ids-
+  optimisation. [Jakub Onderka]
+
+  chg: [internal] Small optimisation for filterEventIds
+- Merge pull request #6872 from JakubOnderka/rest-response-filter-event.
+  [Jakub Onderka]
+
+  chg: [internal] Use RestResponse for filterEventIdsForPush
+- Merge pull request #6898 from JakubOnderka/export-module-fetch-
+  options. [Jakub Onderka]
+
+  new: [modules] Export module can specify event fetch options
+- Merge pull request #6937 from marjatech/fix_list_hidden_tags. [Jakub
+  Onderka]
+
+  fix: correctly show hidden tags in tag-list
+- Merge pull request #6992 from JakubOnderka/taxonomy-attach-real-count.
+  [Jakub Onderka]
+
+  fix: [UI] Attach correct count of enabled taxonomy tags
+- Merge branch '2.4' into develop. [mokaddem]
+- Merge pull request #6989 from JakubOnderka/moment-update. [Jakub
+  Onderka]
+
+  chg: [internal] Update moment javascript library
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge pull request #6985 from JakubOnderka/form-seen-fix. [Jakub
+  Onderka]
+
+  fix: [UI] Remove right margin from form seen input
+- Merge pull request #6986 from JakubOnderka/feed-name-required. [Jakub
+  Onderka]
+
+  fix: [feed] Feed name is required
+- Merge pull request #6983 from JakubOnderka/composer-update-2. [Jakub
+  Onderka]
+
+  chg: [internal] Update composer to 2.0.9
+- Merge pull request #6982 from JakubOnderka/time-helper. [Jakub
+  Onderka]
+
+  chg: [UI] Use TimeHelper for datetime formatting
+- Merge pull request #6980 from JakubOnderka/tag-view-refactor. [Jakub
+  Onderka]
+
+  chg: [internal] Refactor TagsController::view
+- Merge pull request #6977 from JakubOnderka/fix-idTranslator. [Jakub
+  Onderka]
+
+  fix: [internal] idTranslator could show invalid results
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [Alexandre
+  Dulaunoy]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
+- Merge pull request #6988 from tomking2/bug/elasticsearch_ip.
+  [Alexandre Dulaunoy]
+
+  fix: Elasticsearch complains when an IP is an empty string
+
+v2.4.138 (2021-02-08)
+---------------------
+
+New
+---
+- [settings] Allow to use ThreatLevel.name for alert filter. [Jakub
+  Onderka]
+- [test] Update github actions build to Ubuntu 20.04. [Jakub Onderka]
+- [internal] Cidr tool for faster checking CIDR ranges. [Jakub Onderka]
+- [objectTemplate] Allow fetching the raw template stored on disk by
+  UUID or name. [mokaddem]
+- [PHP] version notification. [iglocska]
+
+  - 8.0 is not supported, let users know in a more obvious way
+
+Changes
+-------
+- [misp-galaxy] updated to the latest version. [Alexandre Dulaunoy]
+- [taxonomies] updated to the latest version. [Alexandre Dulaunoy]
+- [version] bump. [iglocska]
+- Bump PyMISP & version. [Raphaël Vinot]
+- [ACLComponent] Added new galaxy element endpoints. [mokaddem]
+- [tools] Removed useless library. [mokaddem]
+- [galaxyClusters:view_relation] Reuse already fetched relations.
+  [mokaddem]
+- [galaxyElement] Added individual deletion and JSON
+  flattening/expanding. [mokaddem]
+- [misp.js] Allow index filtering without searchbox. [mokaddem]
+- [galaxyElements] Migrated galaxy element index to generic factory.
+  [mokaddem]
+- [galaxyElement] Added draft of element flattening and unflattening.
+  [mokaddem]
+- [internal] Optimise fetching trending tags widget. [Jakub Onderka]
+- [internal] Cache warninglist for eight hours. [Jakub Onderka]
+- [UI] Make toggle buttons nicer. [Jakub Onderka]
+- [internal] Optimise correlation exclusion. [Jakub Onderka]
+- [internal] Optimise CidrTool. [Jakub Onderka]
+- [PyMISP] Bump, update deps (reportlab release removed) [Raphaël Vinot]
+- Bump PyMISP. [Raphaël Vinot]
+- [objecTemplate:getRaw] Refactored and optimized feature. [mokaddem]
+- [eventReports:delete] Make delete/restore call consistent with other
+  models. [mokaddem]
+- [internal] Raise memory limit for TmptFileTool to 5 MB. [Jakub
+  Onderka]
+- [internal] Generate event to TmpFile. [Jakub Onderka]
+- [eventReports:delete] Accept hard flag to be passed in POST body.
+  [mokaddem]
+- Bumped queryversion. [mokaddem]
+- [eventReports] Improved manual extraction layout. [mokaddem]
+- [export:csv] Added support of decaying model. Fix #6734. [mokaddem]
+- [console:admin] Improved feedback when updating object templates. Fix
+  #6715. [mokaddem]
+- [objects:delete] Support of hard flag in posted body. Fix #6689.
+  [mokaddem]
+- [PyMISP] bump to latest version. [Alexandre Dulaunoy]
+- [misp-objects] updated to the latest version. [Alexandre Dulaunoy]
+- [installer] fixes to misp-modules. [Steve Clement]
+- [misp-modules] some reqs are not in sync, fixing manually. [Steve
+  Clement]
+- [installer] Update to latest installer. [Steve Clement]
+- [misp-objects] updated to the latest. [Alexandre Dulaunoy]
+- [misp-objects] updated to the latest version. [Alexandre Dulaunoy]
+- [cake] Make misp-after-installer less yellow. [Steve Clement]
+- [misp-galaxy] updated (RSIT galaxy added) [Alexandre Dulaunoy]
+- [misp-objects] updated to the latest version. [Alexandre Dulaunoy]
+- Bumped queryversion. [mokaddem]
+- [objects:delete] Support of hard flag in posted body. Fix #6689.
+  [mokaddem]
+- Bumped queryversion. [mokaddem]
+
+Fix
+---
+- [zmq/kafka] attribute edits should include non exportable attributes.
+  [iglocska]
+- [UI] notice resolved on the feed index. [iglocska]
+- [internal] Do not throw warning when user don't have collections.
+  [Jakub Onderka]
+- [galaxyCluster] Delete elements if field is empty. [mokaddem]
+- [galaxyCluster] Integrated changes of improved index factory.
+  [mokaddem]
+- [CLI] Check user existence. [Jakub Onderka]
+- [UI] passedArgs should be JSON encoded. [Jakub Onderka]
+- [widget] Typo in MispSystemResourceWidget. [Jakub Onderka]
+- [internal] First check if attribute value is valid composite, then run
+  other checks. [Jakub Onderka]
+- [internal] Bump CakePHP to 2.10.24. [Jakub Onderka]
+- [internal] Bump PyMISP. [Jakub Onderka]
+- [UI] Nicer forms. [Jakub Onderka]
+- [internal] Fix some warnings. [Jakub Onderka]
+- [logs:event] Added missing line breaks. [mokaddem]
+- [log] Allow to filter logs by org name. [Jakub Onderka]
+- [acl] Added missing ACL entry. [mokaddem]
+- [objectTemplate:update] Typo instance variable. [mokaddem]
+- [shadowAttributes:viewPicture] Allows shadow attribute's pictures to
+  be displayed. [mokaddem]
+- [attributes:viewPicture] Allow viewing pictures of deleted attributes.
+  [mokaddem]
+- [events:eventGraph] Deleted object reference are no longer shown in
+  the graph. [mokaddem]
+
+  - Fix #6487
+- [UI] Allow to download attachments from attribute index. [Jakub
+  Onderka]
+- [internal] Remove compact method call that do nothing. [Jakub Onderka]
+- [eventReport:getProxyElement] Prevent crash if viewing a report for an
+  extended event. [mokaddem]
+
+  - Make sure merging array happens in existing keys
+- [server:recoveyQuery] Only add `unsigned` when applicable. Fix #6762.
+  [mokaddem]
+
+  - Correctly compare return value of strpos
+- [UI] Show proper unit for diagnostics. [Jakub Onderka]
+- [servers:rest] Speed up rest client and improved reactivity.
+  [mokaddem]
+
+  - Added debounce when typing
+  - Only update query builder when its displayed
+- [warninglists:index] Fixed URL for ID. [mokaddem]
+- [UI] Remote event preview. [Jakub Onderka]
+- [stix2 import] Fixed pattern parsing. [chrisr3d]
+
+  - Stripping patterns to avoid issue with space
+    characters at the beginning or at the end of the
+    patterns
+- [UI] hard-delete option missing for soft-deleted objects. [iglocska]
+- [internal] timestmaping when adding clusters to attributes wasn't
+  working. [iglocska]
+
+  - added it as a quick fix, should be moved in the future to a more generic place
+- [extended event] layout broken, fixes #6946. [iglocska]
+- [internal] Capturing sightings for attributes. [Jakub Onderka]
+- [kali] Fixed Kali installer, now only works on 2020.4 and higher.
+  [Steve Clement]
+- [breakOnDuplicate] invalid placement return, affects #6917. [iglocska]
+
+  - as reported by @github-germ
+- [UI] Allow to sort feeds by name. [Jakub Onderka]
+- [eventReport:edit] Editing event via /events/edit should work as
+  expected. [mokaddem]
+
+  - Correct call to editReport
+  - Force local ID to match provided UUID
+- [dashboards] saving the dashboard state failed due to uninitialised
+  model. [Andras Iklody]
+- [events:eventTimeline] Correctly restore elements after changing
+  context or group. [mokaddem]
+
+  - Fix #6885
+- [events:eventGraph] Makes additions and editions of nodes working as
+  expected. [mokaddem]
+
+  Fix #6877
+- Bump PyMISP, make gh actions happy. [Raphaël Vinot]
+- [eventReport:getProxyElement] Prevent crash if viewing a report for an
+  extended event. [mokaddem]
+
+  - Make sure merging array happens in existing keys
+- [server:recoveyQuery] Only add `unsigned` when applicable. Fix #6762.
+  [mokaddem]
+
+  - Correctly compare return value of strpos
+- [servers:rest] Speed up rest client and improved reactivity.
+  [mokaddem]
+
+  - Added debounce when typing
+  - Only update query builder when its displayed
+- [warninglists:index] Fixed URL for ID. [mokaddem]
+- [diagnostics] complain about PHP >= 8.0. [iglocska]
+
+Other
+-----
+- Merge branch 'develop' into 2.4. [iglocska]
+- Merge pull request #6939 from JakubOnderka/warnings-fix. [Jakub
+  Onderka]
+
+  fix: [internal] Do not throw warning when user don't have collections
+- Merge branch 'feature-galaxy-element-tree-view' into develop.
+  [mokaddem]
+- Merge remote-tracking branch 'origin/develop' into feature-galaxy-
+  element-tree-view. [mokaddem]
+- Merge branch 'develop' into feature-galaxy-element-tree-view.
+  [mokaddem]
+- Merge branch 'develop' of github.com:MISP/MISP into feature-galaxy-
+  element-tree-view. [mokaddem]
+- Merge branch '2.4' of github.com:MISP/MISP into feature-galaxy-
+  element-tree-view. [mokaddem]
+- Merge pull request #6973 from JakubOnderka/check-user-existence.
+  [Jakub Onderka]
+
+  fix: [CLI] Check user existence
+- Merge pull request #6971 from JakubOnderka/threat-level-notification-
+  filter. [Jakub Onderka]
+
+  new: [settings] Allow to use ThreatLevel.name for alert filter
+- Merge pull request #6948 from JakubOnderka/fix-passed-args. [Jakub
+  Onderka]
+
+  fix: [UI] passedArgs should be JSON encoded
+- Merge pull request #6962 from JakubOnderka/trending-tags-optimisation.
+  [Jakub Onderka]
+
+  chg: [internal] Optimise fetching trending tags widget
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [chrisr3d]
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge pull request #6964 from JakubOnderka/attribute-validation-order.
+  [Jakub Onderka]
+
+  fix: [internal] First check if attribute value is valid composite
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge branch '2.4' into develop. [Steve Clement]
+- Merge pull request #6950 from JakubOnderka/bump-cakephp. [Jakub
+  Onderka]
+
+  fix: [internal] Bump CakePHP to 2.10.24
+- Merge pull request #6949 from JakubOnderka/bump-pymisp-v2. [Jakub
+  Onderka]
+
+  fix: [internal] Bump PyMISP
+- Merge pull request #6944 from JakubOnderka/warninglist-cache-raise.
+  [Jakub Onderka]
+
+  chg: [internal] Cache warninglist for eight hours
+- Merge pull request #6935 from JakubOnderka/event-toggle-buttons.
+  [Jakub Onderka]
+
+  chg: [UI] Make toggle buttons nicer
+- Merge pull request #6894 from JakubOnderka/github-actions-os. [Jakub
+  Onderka]
+
+  new: [test] Update github actions build to Ubuntu 20.04
+- Merge pull request #6888 from JakubOnderka/form-ui-fixes. [Jakub
+  Onderka]
+
+  fix: [UI] Nicer forms
+- Merge pull request #6927 from JakubOnderka/correlation-exclusion-
+  optimise. [Jakub Onderka]
+
+  chg: [internal] Optimise correlation exclusion
+- Merge pull request #6926 from JakubOnderka/faster-cidr-tool. [Jakub
+  Onderka]
+
+  chg: [internal] Optimise CidrTool
+- Merge pull request #6899 from marjatech/smime-signature. [Andras
+  Iklody]
+
+  fix: generate S/MIME Signature in DETACHED mode
+- Switch S/MIME Signature generation to DETACHED mode. [marjatech]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge pull request #6924 from JakubOnderka/cidr-tool. [Jakub Onderka]
+
+  new: [internal] Cidr tool for faster checking CIDR ranges
+- Merge pull request #6922 from JakubOnderka/warnings-fixes. [Jakub
+  Onderka]
+
+  fix: [internal] Fix some warnings
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [Alexandre Dulaunoy]
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge branch '2.4' into develop. [iglocska]
+- Merge pull request #6889 from JakubOnderka/log-org-filter. [Jakub
+  Onderka]
+
+  fix: [log] Allow to filter logs by org name
+- Merge branch 'feature-getRawObjectTemplate' into develop. [mokaddem]
+- Merge branch 'develop' of github.com:MISP/MISP into feature-
+  getRawObjectTemplate. [mokaddem]
+- Merge remote-tracking branch 'origin/2.4' into develop. [mokaddem]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge pull request #6873 from JakubOnderka/event-output. [Jakub
+  Onderka]
+
+  Event output
+- Merge remote-tracking branch 'origin/2.4' into develop. [mokaddem]
+- Merge branch '2.4' into develop. [mokaddem]
+- Merge pull request #6900 from JakubOnderka/attribute-index-attachment-
+  download. [Jakub Onderka]
+
+  fix: [UI] Allow to download attachments from attribute index
+- Merge pull request #6737 from JakubOnderka/remove-compat. [Andras
+  Iklody]
+
+  fix: [internal] Remove compact method call that do nothing
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [mokaddem]
+- Merge pull request #6890 from JakubOnderka/php-diagnostics-unit.
+  [Jakub Onderka]
+
+  fix: [UI] Show proper unit for diagnostics
+- Merge remote-tracking branch 'origin/2.4' into develop. [mokaddem]
+- Merge pull request #6881 from JakubOnderka/remote-event-preview-fix.
+  [Jakub Onderka]
+
+  fix: [UI] Remote event preview
+- Merge pull request #6976 from StefanKelm/2.4. [Jakub Onderka]
+
+  Update Server.php
+- Update Server.php. [StefanKelm]
+
+  wording
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [Alexandre
+  Dulaunoy]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
+- Merge pull request #6951 from JakubOnderka/fix-sighting-capture.
+  [Jakub Onderka]
+
+  fix: [internal] Capturing sightings for attributes
+- Merge pull request #6953 from SteveClement/guides. [Steve Clement]
+
+  chg: [misp-modules] some reqs are not in sync, fixing manually.
+- Merge pull request #6952 from SteveClement/guides. [Steve Clement]
+- Merge remote-tracking branch 'upstream/2.4' into guides. [Steve
+  Clement]
+- Merge pull request #6916 from JakubOnderka/feed-sort. [Jakub Onderka]
+
+  fix: [UI] Allow to sort feeds by name
+
+v2.4.137 (2021-01-21)
+---------------------
+
+New
+---
+- [UI] Show event count in server popover for comparison. [Jakub
+  Onderka]
+- [object add] make add event / edit event breakOnDuplicate aware.
+  [iglocska]
+
+  - cull objects that would be duplicates
+  - cache the fetching of existing objects to speed up the query
+
+  - thanks to @github-germ for the suggested fixes to the duplicate checking to accomodate this patch
+- [API] update command got new branch parameter. [iglocska]
+
+  - instruct the update process to be prepended by a checkout of a given branch
+  - passed via a URL parameter (/servers/update/branch:develop)
+  OR
+  - passed via a JSON object ({"branch": "develop"})
+- [server] Compare server events overlap. [Jakub Onderka]
+- [internal] New ability to get JSON data from event preview. [Jakub
+  Onderka]
 - [doc] Added doc about how to change the installer generator. [Steve
   Clement]
+- [taxonomy] Importing taxonomy in machinetag format by REST API. [Jakub
+  Onderka]
+- [UI] Show link to event preview for ID translator. [Jakub Onderka]
+- [idTranslator] Allow check event on different servers from event view.
+  [Jakub Onderka]
+- [UI] Show sharing groups in org view. [Jakub Onderka]
+- [sync] Enable compression for server sync. [Jakub Onderka]
+- [feed] Support brotli compression. [Jakub Onderka]
+- [correlation] added system to exclude certain values from the
+  correlation engine. [iglocska]
+
+  - simply add values at /exclude_correlations
+  - new values coming in will not correlate if they trip over the values listed there
+  - to remove existing correlations run the cleaner tool on the above endpoint
+
+  - values can be 1:1 matches, or substring searches (denoted with a leading, ending, or both '%')
+    - https://www.google.com/%  will match anything starting with https://www.google.com/
+    - %google.com% will match anything that contains google.com
+- [UI] Allow to sort orgs by number of orgs. [Jakub Onderka]
+- [sighting] New setting that will allow users to see host org
+  sightings. [Jakub Onderka]
+- [UI] Show tag description if tag belongs to taxonomy. [Jakub Onderka]
+- [internal] New model method find('column') [Jakub Onderka]
+- :lock: Check org list when accessing distribution graph. [Jakub
+  Onderka]
+- :lock: Test for hide_organisations_in_sharing_groups setting.
+  [Jakub Onderka]
+- :lock: Setting to hide orgs form sharing group view. [Jakub
+  Onderka]
+- [internal] Allow to output directly TmpFileTool. [Jakub Onderka]
+- [UI] Show number of unique IPs for key usage. [Jakub Onderka]
+- [UI] Show last key usage in index table. [Jakub Onderka]
+- [UI] Show information about key expiration in server list. [Jakub
+  Onderka]
+- :lock: Cancel API session right after auth key is deleted. [Jakub
+  Onderka]
+- :lock: Put information about key expiration into response header.
+  [Jakub Onderka]
+- :lock: Allow to set key validity. [Jakub Onderka]
+- :lock: New setting Security.username_in_response_header. [Jakub
+  Onderka]
+- [test] Check when `MISP.authkey_keep_session` is true. [Jakub Onderka]
+- [internal] Show auth key usage in key view page. [Jakub Onderka]
+- [internal] Allow to log authkey usage in Redis. [Jakub Onderka]
+- [rest] Allow to search sightings by event or attribute UUID. [Jakub
+  Onderka]
+- [UI] Download GPG public key from GPG homedir. [Jakub Onderka]
 - [type] favicon-mmh3 is the murmur3 hash of a favicon as used in
   Shodan. [Alexandre Dulaunoy]
 - [Statistics shell] Added new statistics shell. [iglocska]
@@ -18,13 +1762,128 @@ New
 
 Changes
 -------
+- [VERSION] bump. [iglocska]
+- Bump PyMISP version. [Raphaël Vinot]
+- [pgp] default pgp key server updated to openpgp.circl.lu. [Alexandre
+  Dulaunoy]
+
+  openpgp.circl.lu is the replacement keyserver of pgp.circl.lu
+- [misp-galaxy] updated to the latest version. [Alexandre Dulaunoy]
+- [misp-objects] updated. [Alexandre Dulaunoy]
+- Add authenticode support in generate_file_objects. [Raphaël Vinot]
+- [PyMISP] Bump package (new lief). [Raphaël Vinot]
+- [internal] Faster fetching galaxy clusters by REST API. [Jakub
+  Onderka]
+- [internal] Simplified code for index and event preview. [Jakub
+  Onderka]
+- [internal] Remove deprecated Set class calls. [Jakub Onderka]
+- [internal] Optimise fetching tags for event index API requests. [Jakub
+  Onderka]
+- [internal] Optimise filter event index window. [Jakub Onderka]
+- [UI] Simplified event ajax index template. [Jakub Onderka]
+- [UI] Generate pagination just once. [Jakub Onderka]
+- [internal] Fetch user email just when user is site admin. [Jakub
+  Onderka]
+- [internal] Optimise appending tags to events. [Jakub Onderka]
+- [internal] Do not fetch unnecessary fields. [Jakub Onderka]
+- [internal] Do not fetch full clusters for rest event index. [Jakub
+  Onderka]
+- [internal] Optimise fetching tags for rest client. [Jakub Onderka]
+- [internal] Optimise fetching event index by API. [Jakub Onderka]
+- [UI] Optimise fetching tags for picker. [Jakub Onderka]
+- [misp-warninglists] updated. [Alexandre Dulaunoy]
+- [warning-lists] updated to the latest version. [Alexandre Dulaunoy]
+- [installer] Updated installer. [Steve Clement]
+- [doc] Considered $DBHOST. [Steve Clement]
+- [UI] Optimise loading taxonomy tags for for tagging form. [Jakub
+  Onderka]
+- [sync] Simplified fetching version from remote server. [Jakub Onderka]
+- [taxonomy] Faster fetching event and attribute counts for tag. [Jakub
+  Onderka]
 - [installer] Update to latest. [Steve Clement]
 - [git] Made the checkouts more proxy friendly. [Steve Clement]
 - [misp-galaxy] updated to the latest version. [Alexandre Dulaunoy]
 - [taxonomies] updated. [Alexandre Dulaunoy]
+- [idTranslator] Allow to use from GET request. [Jakub Onderka]
+- [idTranslator] Check also servers that we push. [Jakub Onderka]
+- [UI] Optimise generic picker. [Jakub Onderka]
+- [UI] Faster paginator for index table. [Jakub Onderka]
+- [UI] Faster event paginator. [Jakub Onderka]
+- [internal] Remove unnecessary Attribute::defaultCategories array.
+  [Jakub Onderka]
+- [internal] Call array_values method just when necessary. [Jakub
+  Onderka]
+- [internal] Use strict comparison for in_array. [Jakub Onderka]
+- [internal] Generate server settings just when need. [Jakub Onderka]
+- [internal] Generate type definitions just when required. [Jakub
+  Onderka]
+- [UI] Deduplicate sightings form. [Jakub Onderka]
+- [internal] Optimise sightings saving. [Jakub Onderka]
+- [UI] Make server index view nicer. [Jakub Onderka]
+- [sync] Optimise version compatibility checking to save sql queries.
+  [Jakub Onderka]
+- [sync] Return content encoding in postTest. [Jakub Onderka]
+- [sync] Convert connection timeout to exception. [Jakub Onderka]
 - [misp-objects] updated to the latest version. [Alexandre Dulaunoy]
 - [PyMISP] updated to the latest version. [Alexandre Dulaunoy]
 - [warning-lists] updated to the latest version. [Alexandre Dulaunoy]
+- [optimisation] Faster Tag::fetchSimpleEventsForTag method. [Jakub
+  Onderka]
+- [optimisation] Faster fetching attributes with tags. [Jakub Onderka]
+- [optimisation] Decode JSON input from request just once. [Jakub
+  Onderka]
+- [internal] Remove unused methods. [Jakub Onderka]
+- [distribution-graph] Optimise loading. [Jakub Onderka]
+- [internal] Use find('column') on more places. [Jakub Onderka]
+- [internal] Do not load sightings for event log. [Jakub Onderka]
+- [taxonomies] updated. [Alexandre Dulaunoy]
+- [warning-lists] updated. [Alexandre Dulaunoy]
+- [internal] Use find('column') on more places. [Jakub Onderka]
+- [internal] Optimise loading event correlation graph. [Jakub Onderka]
+- [UI] Use chosen when select contains more than 10 sharing groups.
+  [Jakub Onderka]
+- [role] Do not allow delete role when is still assigned to user. [Jakub
+  Onderka]
+- [UI] Show cancel button for event report filter. [Jakub Onderka]
+- [UI] Merge roles index and admin_index. [Jakub Onderka]
+- [UI] Rotate header for role index table. [Jakub Onderka]
+- [UI] Site admin redirects from role index to admin index. [Jakub
+  Onderka]
+- [UI] Set dbclickAction for user index. [Jakub Onderka]
+- [UI] Go directly to edit mode after clicking to "Edit report" button.
+  [Jakub Onderka]
+- [UI] Make event report page nicer. [Jakub Onderka]
+- [sighting] Faster and memory efficient rest search. [Jakub Onderka]
+- [log] Do not log request type logs to syslog. [Jakub Onderka]
+- [REST] Close session early for `authkey_keep_session` connections.
+  [Jakub Onderka]
+- [test] Update testlive_security.py to new version. [Jakub Onderka]
+- [internal] Code cleanup. [Jakub Onderka]
+- [internal] Small optimisations. [Jakub Onderka]
+- [interna] AppController code cleanup. [Jakub Onderka]
+- [internal] Rename MISP.log_user_ips_auth ->
+  MISP.log_user_ips_authkeys. [Jakub Onderka]
+- [internal] Move access monitoring to own method. [Jakub Onderka]
+- [internal] Force to update session data after database update. [Jakub
+  Onderka]
+- [internal] Allow to reuse session for API requests. [Jakub Onderka]
+- [internal] Do not log full authkeys. [Jakub Onderka]
+- [internal] Simplify User::describeAuthFields. [Jakub Onderka]
+- [internal] Update role changes immediately. [Jakub Onderka]
+- [internal] Do not fetch user settings for User::getAuthUser. [Jakub
+  Onderka]
+- [UI] Change description for user edit checkboxes. [Jakub Onderka]
+- [internal] Load just necessary info when loading homepage info. [Jakub
+  Onderka]
+- [internal] Load user role info from session data. [Jakub Onderka]
+- [internal] Move user checks to one place. [Jakub Onderka]
+- [UI] Convert taxonomies to default view. [Jakub Onderka]
+- [sync] When pushing event to remote server, request back just
+  metadata. [Jakub Onderka]
+- [eventReport] Load tags in one call. [Jakub Onderka]
+- [shibb] Better log messages for ApacheShibbAuthenticate. [Jakub
+  Onderka]
+- [sighting] Optimise bulk sighting saving. [Jakub Onderka]
 - [debug] cleanup. [iglocska]
 - [misp-galaxy] updated. [Alexandre Dulaunoy]
 - [misp-objects] updated. [Alexandre Dulaunoy]
@@ -45,15 +1904,107 @@ Changes
 
 Fix
 ---
+- [helper:genericPicker] Adding object from pill selector - Prevents
+  double encoding of the passed data. [mokaddem]
+- [login] Correctly convert old password hash to blowfish. [Jakub
+  Onderka]
+- [login] Convert old password hash to blowfish. [Jakub Onderka]
+- [update] fixed due to issues introduced with the branch flag.
+  [iglocska]
+- :lock: Reflective XSS in the RestClient. [mokaddem]
+- :lock: XSS in the user homepage favourite button. [iglocska]
+
+  - navigating to a url in MISP with the URL containing a javascript payload would cause the execution of reflected xss
+  - automatically sanitised by modern browsers, but still confirmed via raw curl fetches
+- :lock: XSS via galaxy cluster element values for reference types
+  could contain javascript links. [iglocska]
+
+  - ref type elements are automatically converted to links. A user would have to click a javascript: link for it to trigger, it's still too risky to keep as is
+  - only urls starting with http:// and https:// are converted from here on
+
+  - As reported by Patrik Kontura from ESET
+- :lock: Stored XSS in the galaxy cluster view. [iglocska]
+
+  - Galaxy cluster names were vulnerable to XSS injection
+
+  - As reported by Patrik Kontura of ESET
+- :lock: Require password confirmations by default. [iglocska]
+
+  - the setting is optional, but the default should be that it's required unless disabled
+
+  - As reported by Patrix Kontura from ESET
+- [UI] Nicer first and last seen form. [Jakub Onderka]
+- [log] Correctly handle limit and page params. [Jakub Onderka]
+- [internal] Group for getting sightings for tag. [Jakub Onderka]
+- [taxonomy] Support unicode chars in tag names. [Jakub Onderka]
 - [S/MIME] don't sign e-mails if no signing key is set. [iglocska]
 
   - fixes e-mails not going out on instances where no signing key was provided
+- [server] Handle case when checking CLI version is not possible. [Jakub
+  Onderka]
+- [object] the optional blocking of duplicates fixed for objects
+  including malware samples. [iglocska]
+
+  - also looping the attributes through the pre-validation massaging ensures that attributes modified by it are correctly compared
 - [objects] breakonduplicate fixed. [iglocska]
+- [sighting] Order must contain group for some mysql servers. [Jakub
+  Onderka]
+- [UI] Make event paginator universal. [Jakub Onderka]
+- [UI] Remove nonsense paginator options. [Jakub Onderka]
+- [UI] Chosen autofocus. [Jakub Onderka]
+- [internal] Remove unused method isOwnedByOrg. [Jakub Onderka]
+- [internal] Remove duplicate array definition. [Jakub Onderka]
+- [rest] Allow to edit roaming mode of sharing group. [Jakub Onderka]
+- [dbSchema] Update to v65. [Jakub Onderka]
 - MIssing dependency. [Raphaël Vinot]
 - Call the security test suite properly. [Raphaël Vinot]
 - Remove call to python script out of the virtenv. [Raphaël Vinot]
+- [S/MIME] don't sign e-mails if no signing key is set. [iglocska]
+
+  - fixes e-mails not going out on instances where no signing key was provided
+- [inernal] Remove duplicates from server correlations. [Jakub Onderka]
+- [internal] Attaching warninglist for feed event preview without
+  attributes. [Jakub Onderka]
+- [UI] Multiple popovers for cluster relations. [Jakub Onderka]
+- [UI] Change role name for admin view and add title. [Jakub Onderka]
+- [UI] Redirect after add role modal to index page. [Jakub Onderka]
+- [UI] Cancelling search didn't work for index table. [Jakub Onderka]
+- [UI] Add Object works again for all databases. [Jakub Onderka]
+- [UI] Remove unnecessary padding from form. [Jakub Onderka]
+- [UI] Correctly show contributors in event view. [Jakub Onderka]
+- [UI] Fix attribte search in event view. [Jakub Onderka]
+- [UI] Show error message when galaxy info couldn't be loaded. [Jakub
+  Onderka]
+- [sighting] Grouping sighting fetch for tags. [Jakub Onderka]
 - [sighting] Order must contain group for some mysql servers. [Jakub
   Onderka]
+- [UI] Move debug mode variable before setting database connection.
+  [Jakub Onderka]
+- [monitoring] Do not encode payload, it is string. [Jakub Onderka]
+- [UI] Enable quick filter for auth keys. [Jakub Onderka]
+- [UI] Auth Key index and view changes and fixes. [Jakub Onderka]
+- [UI] Days to expire count. [Jakub Onderka]
+- :lock: Do not return hashed authentication key after creation.
+  [Jakub Onderka]
+- [internal] Check if setting value is scalar. [Jakub Onderka]
+- :lock: Auth key must be always random generated at server side.
+  [Jakub Onderka]
+- :lock: Do not allow to use API key authenticated session to do non
+  API calls. [Jakub Onderka]
+- [internal] Remove unused variables. [Jakub Onderka]
+- [internal] Remove unused $user siteadmin variable. [Jakub Onderka]
+- [UI] Use generic style for taxonomy view. [Jakub Onderka]
+- [UI] Autofocus generic picker. [Jakub Onderka]
+- [UI] Replace GnuPG with PGP. [Jakub Onderka]
+- [UI] Empty field for galaxy 'Forked From' and 'Forked By' [Jakub
+  Onderka]
+- [UI] Use correct font for Show all. [Jakub Onderka]
+- [UI] Send request just when opening event detail windows. [Jakub
+  Onderka]
+- [eventReport] Smarter extractWithReplacements. [Jakub Onderka]
+- [eventReport] Replace defanged values. [Jakub Onderka]
+- [eventReport] Notice when galaxy value is not separated by ` - `
+  [Jakub Onderka]
 - [stix2 import] Checking if attack-pattern, course-of-action and
   vulnerability names are known galaxies before importing them as MISP
   object. [chrisr3d]
@@ -80,9 +2031,92 @@ Fix
 
 Other
 -----
+- Merge pull request #6896 from JakubOnderka/fix-old-password-convert.
+  [Jakub Onderka]
+
+  fix: [login] Correctly convert old password hash to blowfish
+- Merge branch 'old-hash-transfer' into 2.4. [Christophe Vandeplas]
+- Merge branch '2.4' into develop. [iglocska]
+- Merge branch 'develop' into 2.4. [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [Alexandre Dulaunoy]
+- Merge pull request #6880 from JakubOnderka/server-compare-count.
+  [Jakub Onderka]
+
+  new: [UI] Show event count in server popover for comparison
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge remote-tracking branch 'origin/2.4' into develop. [mokaddem]
+- Merge branch '2.4' of github.com:MISP/MISP into 2.4. [mokaddem]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge branch '2.4' into develop. [iglocska]
+- Merge pull request #6879 from JakubOnderka/first-seen-input-format.
+  [Jakub Onderka]
+
+  fix: [UI] Nicer first and last seen form
+- Merge pull request #6870 from JakubOnderka/galaxy-cluster-rest-search.
+  [Jakub Onderka]
+
+  chg: [internal] Faster fetching galaxy clusters by REST API
+- Merge pull request #6860 from JakubOnderka/log-fix. [Jakub Onderka]
+
+  fix: [log] Correctly handle limit and page params
+- Merge pull request #6874 from JakubOnderka/preview-server. [Jakub
+  Onderka]
+
+  Preview server
+- Merge pull request #6869 from JakubOnderka/event-index-tags. [Jakub
+  Onderka]
+
+  chg: [internal] Optimise fetching tags for event index API requests
+- Merge pull request #6868 from JakubOnderka/event-index-rest-optim.
+  [Jakub Onderka]
+
+  Event index rest optim
+- Merge pull request #6867 from JakubOnderka/event-index-rest-optim.
+  [Jakub Onderka]
+
+  chg: [internal] Optimise fetching event index by API
+- Merge pull request #6866 from JakubOnderka/fix-bad-merge. [Jakub
+  Onderka]
+
+  fix: [internal] Group for getting sightings for tag
+- Merge pull request #6863 from JakubOnderka/tag-fetching-optimisation.
+  [Jakub Onderka]
+
+  chg: [UI] Optimise fetching tags for picker
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge branch '2.4' into develop. [iglocska]
+- Merge pull request #6865 from SteveClement/guides. [Andras Iklody]
+
+  chg: [doc] Considered $DBHOST
 - Merge pull request #6858 from SteveClement/guides. [Steve Clement]
 
   new: [doc] Added doc about how to change the installer generator
+- Merge pull request #6862 from JakubOnderka/tag-chose-optimise. [Jakub
+  Onderka]
+
+  chg: [UI] Optimise loading taxonomy tags for for tagging form
+- Merge pull request #6861 from JakubOnderka/taxonomy-unicode. [Jakub
+  Onderka]
+
+  fix: [taxonomy] Support unicode chars in tag names
+- Merge branch '2.4' into develop. [Steve Clement]
+- Merge pull request #6854 from JakubOnderka/server-pull-version. [Jakub
+  Onderka]
+
+  chg: [sync] Simplified fetching version from remote server
+- Merge pull request #6851 from JakubOnderka/taxonomy-import. [Jakub
+  Onderka]
+
+  new: [taxonomy] Importing taxonomy in machinetag format by REST API
+- Merge pull request #6853 from JakubOnderka/server-diagnostic-fix.
+  [Jakub Onderka]
+
+  fix: [server] Handle case when checking CLI version is not possible
+- Merge branch '2.4' into develop. [iglocska]
 - Merge pull request #6835 from MISP/dependabot/pip/lxml-4.6.2.
   [Alexandre Dulaunoy]
 
@@ -106,12 +2140,189 @@ Other
 - Fix git urls to https (users behind proxy) [Alexandre Dulaunoy]
 
   Fix git urls to https (users behind proxy)
+- Merge pull request #6849 from JakubOnderka/id-translator-preview-link.
+  [Jakub Onderka]
+
+  new: [UI] Show link to event preview for ID translator
+- Merge pull request #6833 from JakubOnderka/id-translator-push. [Jakub
+  Onderka]
+
+  chg: [idTranslator] Check also servers that we push
+- Merge pull request #6845 from JakubOnderka/generic-picker-
+  optimisation. [Jakub Onderka]
+
+  chg: [UI] Optimise generic picker
+- Merge pull request #6841 from JakubOnderka/paginator-fix. [Jakub
+  Onderka]
+
+  Paginator fix
+- Merge pull request #6843 from JakubOnderka/choosen-autofocus-fix.
+  [Jakub Onderka]
+
+  fix: [UI] Chosen autofocus
+- Merge pull request #6842 from JakubOnderka/small-optims. [Jakub
+  Onderka]
+
+  Small optims
+- Merge pull request #6840 from JakubOnderka/translate-optimisation.
+  [Jakub Onderka]
+
+  Translate optimisation
+- Merge pull request #6839 from JakubOnderka/deduplicate-sighting-form.
+  [Jakub Onderka]
+
+  chg: [UI] Deduplicate sightings form
+- Merge pull request #6809 from JakubOnderka/optimise-sightings-saving.
+  [Jakub Onderka]
+
+  chg: [internal] Optimise sightings saving
+- Merge pull request #6827 from JakubOnderka/sharing_groups_org. [Jakub
+  Onderka]
+
+  new: [UI] Show sharing groups in org view
+- Merge pull request #6830 from JakubOnderka/sg-roaming-edit. [Jakub
+  Onderka]
+
+  fix: [rest] Allow to edit roaming mode of sharing group
+- Merge pull request #6837 from JakubOnderka/db-schema. [Jakub Onderka]
+
+  fix: [dbSchema] Update to v65
+- Merge pull request #6831 from JakubOnderka/server-view-ui. [Jakub
+  Onderka]
+
+  chg: [UI] Make server index view nicer
+- Merge pull request #6828 from JakubOnderka/check-version-
+  compatibility-optim. [Jakub Onderka]
+
+  chg: [sync] Optimise version compatibility checking to save sql queries
+- Merge pull request #6822 from JakubOnderka/server-sync-compression.
+  [Jakub Onderka]
+
+  new: [sync] Enable compression for server sync
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge pull request #6821 from JakubOnderka/http-socket-brotli. [Jakub
+  Onderka]
+
+  new: [feed] Support brotli compression
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
 - Merge pull request #6820 from MISP/Rafiot-patch-6. [Raphaël Vinot]
 
   [Test] Run the security suite from the virtualenv
 - [Test] Run the security suite from the virtualenv. [Raphaël Vinot]
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
 - Merge branch '2.4' of github.com:MISP/MISP into 2.4. [Alexandre
   Dulaunoy]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [Alexandre Dulaunoy]
+- Merge branch '2.4' of github.com:MISP/MISP into develop. [Alexandre
+  Dulaunoy]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [iglocska]
+- Merge branch 'develop' of https://github.com/MISP/MISP into develop.
+  [chrisr3d]
+- Merge pull request #6813 from JakubOnderka/feed-cache-deduplicate.
+  [Jakub Onderka]
+
+  fix: [inernal] Remove duplicates from server correlations
+- Merge pull request #6812 from JakubOnderka/feed-warninglist. [Jakub
+  Onderka]
+
+  fix: [internal] Attaching warninglist for feed event preview without …
+- Merge pull request #6811 from JakubOnderka/attach-tags-to-attributes.
+  [Jakub Onderka]
+
+  Attach tags to attributes
+- Merge pull request #6810 from JakubOnderka/json-decode-just-once.
+  [Jakub Onderka]
+
+  chg: [optimisation] Decode JSON input from request just once
+- Merge pull request #6804 from JakubOnderka/optimisations-vol2. [Jakub
+  Onderka]
+
+  Optimisations vol2
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [Alexandre Dulaunoy]
+- Merge pull request #6797 from JakubOnderka/optimisations. [Jakub
+  Onderka]
+
+  Optimisations
+- Merge pull request #6745 from JakubOnderka/user-sort. [Jakub Onderka]
+
+  User sort
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [Alexandre Dulaunoy]
+- Merge pull request #6772 from JakubOnderka/sighting-policy-host-org.
+  [Jakub Onderka]
+
+  new: [sighting] New setting that will allow users to see host org sig…
+- Merge pull request #6778 from JakubOnderka/tag-info. [Jakub Onderka]
+
+  Tag info popover
+- Merge pull request #6749 from JakubOnderka/hide-orgs-from-sg. [Jakub
+  Onderka]
+
+  Hide orgs from sharing group view
+- Merge pull request #6788 from JakubOnderka/ui-fixes. [Jakub Onderka]
+
+  UI fixes
+- Merge pull request #6789 from JakubOnderka/sighting-tag-group. [Jakub
+  Onderka]
+
+  Sighting tag group
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge branch 'develop' of github.com:MISP/MISP into develop.
+  [Alexandre Dulaunoy]
+- Merge pull request #6497 from JakubOnderka/experimental-cake-tmp-
+  response. [Jakub Onderka]
+- Merge pull request #6787 from JakubOnderka/sighting-rest-optim. [Jakub
+  Onderka]
+
+  chg: [sighting] Faster and memory efficient rest search
+- Merge pull request #6786 from JakubOnderka/sighting-bug-6773. [Jakub
+  Onderka]
+
+  fix: [sighting] Order must contain group for some mysql servers
+- Merge pull request #6581 from JakubOnderka/newsread-loading. [Jakub
+  Onderka]
+
+  chg: [internal] Move user checks to one place
+- Merge branch '2.4' into develop. [Alexandre Dulaunoy]
+- Merge branch '2.4' into develop. [Steve Clement]
+- Merge pull request #6782 from JakubOnderka/taxonomies-view. [Jakub
+  Onderka]
+
+  chg: [UI] Convert taxonomies to default view
+- Merge pull request #6760 from JakubOnderka/sighting-rest-uuid. [Jakub
+  Onderka]
+
+  new: [rest] Allow to search sightings by event or attribute UUID
+- Merge pull request #6781 from JakubOnderka/another-ui-fixes. [Jakub
+  Onderka]
+
+  Another UI fixes
+- Merge pull request #6776 from JakubOnderka/event-push-metadata. [Jakub
+  Onderka]
+
+  chg: [sync] When pushing event to remote server, request back just me…
+- Merge pull request #6779 from JakubOnderka/event-report-extract-fix.
+  [Jakub Onderka]
+
+  Event report extract fix
+- Merge pull request #6755 from JakubOnderka/shibb-log-messages. [Jakub
+  Onderka]
+
+  chg: [shibb] Better log messages for ApacheShibbAuthenticate
+- Merge pull request #6759 from JakubOnderka/bulk-sighting-saving-optim.
+  [Jakub Onderka]
+
+  chg: [sighting] Optimise bulk sighting saving
+- Merge pull request #5234 from JakubOnderka/gpg_key_footer. [Jakub
+  Onderka]
+
+  new: [UI] Download GPG public key from GPG homedir
 - Merge branch '2.4' of github.com:MISP/MISP into 2.4. [iglocska]
 - Merge pull request #6747 from legoguy1000/ja3_zeek_intel_rules.
   [Alexandre Dulaunoy]

From 7966310045f8b455951ceb135553152efa22b333 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Tue, 30 Mar 2021 11:06:06 +0900
Subject: [PATCH 426/437] fix: [installer] globalVariables fix to ignore
 preceeding lines

---
 docs/generic/globalVariables.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/generic/globalVariables.md b/docs/generic/globalVariables.md
index 823eda93c..9a30fcc8a 100644
--- a/docs/generic/globalVariables.md
+++ b/docs/generic/globalVariables.md
@@ -3,7 +3,7 @@
 If you are doing a manual install, copy and pasting from this document, please do the following before starting:
 
 ```bash
-eval "$(curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/docs/generic/globalVariables.md | grep -v \`\`\`)"
+eval "$(curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/docs/generic/globalVariables.md | grep -A31337 -m1 -e 'snippet-begin' | grep -v \`\`\`)"
 MISPvars
 ```
 
@@ -13,7 +13,7 @@ MISPvars
 
 ```bash
 # <snippet-begin 0_global-vars.sh>
-# $ eval "$(curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/docs/generic/globalVariables.md | grep -v \`\`\`)"
+# $ eval "$(curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/docs/generic/globalVariables.md | grep -A31337 -m1 -e 'snippet-begin' | grep -v \`\`\`)"
 # $ MISPvars
 MISPvars () {
   debug "Setting generic ${LBLUE}MISP${NC} variables shared by all flavours" 2> /dev/null

From d945a5175fb489ce8bb0421a8612fa3e8c6ffc31 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Tue, 30 Mar 2021 11:35:05 +0900
Subject: [PATCH 427/437] fix: [installer] Use awk to print until EoF from
 match.

---
 docs/generic/globalVariables.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/generic/globalVariables.md b/docs/generic/globalVariables.md
index 9a30fcc8a..26b5707c6 100644
--- a/docs/generic/globalVariables.md
+++ b/docs/generic/globalVariables.md
@@ -3,7 +3,7 @@
 If you are doing a manual install, copy and pasting from this document, please do the following before starting:
 
 ```bash
-eval "$(curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/docs/generic/globalVariables.md | grep -A31337 -m1 -e 'snippet-begin' | grep -v \`\`\`)"
+eval "$(curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/docs/generic/globalVariables.md | awk '/^# <snippet-begin/,0' | grep -v \`\`\`)"
 MISPvars
 ```
 
@@ -13,7 +13,7 @@ MISPvars
 
 ```bash
 # <snippet-begin 0_global-vars.sh>
-# $ eval "$(curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/docs/generic/globalVariables.md | grep -A31337 -m1 -e 'snippet-begin' | grep -v \`\`\`)"
+# $ eval "$(curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/docs/generic/globalVariables.md | awk '/^# <snippet-begin/,0' | grep -v \`\`\`)"
 # $ MISPvars
 MISPvars () {
   debug "Setting generic ${LBLUE}MISP${NC} variables shared by all flavours" 2> /dev/null

From 7e4e8e07da384802b21383f7df5c3a38638042cc Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Tue, 30 Mar 2021 12:12:42 +0900
Subject: [PATCH 428/437] fix: [doc] CentOS 7 needs to use Remi too.

---
 docs/INSTALL.rhel7.md | 55 ++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index 67e022814..d2a31d279 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -112,6 +112,9 @@ centosEPEL () {
   # Since MISP 2.4 PHP 5.5 is a minimal requirement, so we need a newer version than CentOS base provides
   # Software Collections is a way do to this, see https://wiki.centos.org/AdditionalResources/Repositories/SCL
   sudo yum install centos-release-scl -y
+  sudo yum install yum-utils -y
+  sudo yum install http://rpms.remirepo.net/enterprise/remi-release-7.rpm -y
+  sudo yum-config-manager --enable remi-php74
 }
 # <snippet-end 0_CentOS_EPEL.sh>
 ```
@@ -169,6 +172,8 @@ enableEPEL () {
 # <snippet-begin 0_yumInstallCoreDeps.sh>
 yumInstallCoreDeps () {
   # Install the dependencies:
+  PHP_BASE="/etc/"
+  PHP_INI="/etc/php.ini"
   sudo yum install gcc git zip \
                    mod_ssl \
                    redis \
@@ -185,27 +190,26 @@ yumInstallCoreDeps () {
   rm mariadb_repo_setup
   sudo yum install MariaDB-server -y
 
-  PHP_INI="/etc/opt/remi/php74/php.ini"
   # Install PHP 7.4 from Remi's repo, see https://rpms.remirepo.net/enterprise/7/php74/x86_64/repoview/
-  sudo yum install php74 php74-php-fpm php74-php-devel \
-                   php74-php-mysqlnd \
-                   php74-php-mbstring \
-                   php74-php-xml \
-                   php74-php-bcmath \
-                   php74-php-opcache \
-                   php74-php-zip \
-                   php74-php-pear \
-                   php74-php-brotli \
-                   php74-php-intl \
-                   php74-php-gd -y
+  sudo yum install php php-fpm php-devel \
+                   php-mysqlnd \
+                   php-mbstring \
+                   php-xml \
+                   php-bcmath \
+                   php-opcache \
+                   php-zip \
+                   php-pear \
+                   php-brotli \
+                   php-intl \
+                   php-gd -y
 
-  # cake has php baked in, thus we link to it
-  sudo ln -s /usr/bin/php74 /usr/bin/php
+  # cake has php baked in, thus we link to it if necessary.
+  [[ ! -e "/usr/bin/php" ]] && sudo ln -s /usr/bin/php74 /usr/bin/php
 
   # Python 3.6 is now available in RHEL 7.7 base
   sudo yum install python3 python3-devel -y
 
-  sudo systemctl enable --now php74-php-fpm.service
+  sudo systemctl enable --now php-fpm.service
 }
 # <snippet-end 0_yumInstallCoreDeps.sh>
 ```
@@ -315,9 +319,11 @@ installCoreRHEL () {
 
   # Enable dependencies detection in the diagnostics page
   # This allows MISP to detect GnuPG, the Python modules' versions and to read the PHP settings.
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a /etc/opt/remi/php74/php-fpm.d/www.conf
-  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' /etc/opt/remi/php74/php-fpm.d/www.conf
-  sudo systemctl restart php74-php-fpm.service
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a ${PHP_BASE}/php-fpm.d/www.conf
+  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' ${PHP_BASE}/php-fpm.d/www.conf
+  sudo sed -i.org -e 's/^\(listen =\) \/run\/php-fpm\/www\.sock/\1 127.0.0.1:9000/' ${PHP_BASE}/php-fpm.d/www.conf
+
+  sudo systemctl restart php-fpm.service
   umask $UMASK
 }
 # <snippet-end 1_mispCoreInstall_RHEL.sh>
@@ -345,14 +351,15 @@ installCake_RHEL ()
   #$SUDO_WWW php -r "unlink('composer-setup.php');"
   $SUDO_WWW php composer.phar install
 
-  sudo yum install php74-php-pecl-redis php74-php-pecl-ssdeep php74-php-pecl-gnupg -y
+  sudo yum install php-pecl-redis php-pecl-ssdeep php-pecl-gnupg -y
 
-  sudo systemctl restart php74-php-fpm.service
+  sudo systemctl restart php-fpm.service
 
   # If you have not yet set a timezone in php.ini
-  echo 'date.timezone = "Asia/Tokyo"' |sudo tee /etc/opt/remi/php74/php.d/timezone.ini
+  echo 'date.timezone = "Asia/Tokyo"' |sudo tee /etc/php-fpm.d/timezone.ini
+  sudo ln -s ../php-fpm.d/timezone.ini /etc/php.d/99-timezone.ini
 
-  # Recommended: Change some PHP settings in /etc/opt/remi/php74/php.ini
+  # Recommended: Change some PHP settings in /etc/php.ini
   # max_execution_time = 300
   # memory_limit = 2048M
   # upload_max_filesize = 50M
@@ -363,7 +370,7 @@ installCake_RHEL ()
   done
   sudo sed -i "s/^\(session.sid_length\).*/\1 = $(eval echo \${session0sid_length})/" $PHP_INI
   sudo sed -i "s/^\(session.use_strict_mode\).*/\1 = $(eval echo \${session0use_strict_mode})/" $PHP_INI
-  sudo systemctl restart php74-php-fpm.service
+  sudo systemctl restart php-fpm.service
 
   # To use the scheduler worker for scheduled tasks, do the following:
   sudo cp -fa $PATH_TO_MISP/INSTALL/setup/config.php $PATH_TO_MISP/app/Plugin/CakeResque/Config/config.php
@@ -655,7 +662,7 @@ EOF
 configWorkersRHEL () {
   echo "[Unit]
   Description=MISP background workers
-  After=mariadb.service redis.service php74-php-fpm.service
+  After=mariadb.service redis.service php-fpm.service
 
   [Service]
   Type=forking

From a6e604d89937236dcafb3f668ace591df1406f18 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Tue, 30 Mar 2021 12:33:02 +0900
Subject: [PATCH 429/437] chg: [doc] Automation adaption

---
 docs/generic/misp-modules-centos.md | 89 ++++++++++++++---------------
 1 file changed, 44 insertions(+), 45 deletions(-)

diff --git a/docs/generic/misp-modules-centos.md b/docs/generic/misp-modules-centos.md
index d08f87561..66aaacbd2 100644
--- a/docs/generic/misp-modules-centos.md
+++ b/docs/generic/misp-modules-centos.md
@@ -4,25 +4,24 @@
 # <snippet-begin 3_misp-modules_RHEL.sh>
 mispmodulesRHEL () {
   # some misp-modules dependencies for RHEL<8
-  sudo yum install openjpeg-devel gcc-c++ poppler-cpp-devel pkgconfig python-devel redhat-rpm-config -y
+  [[ "${DIST_VER}" =~ ^[7].* ]] && sudo yum install openjpeg-devel gcc-c++ poppler-cpp-devel pkgconfig python-devel redhat-rpm-config -y
 
   # some misp-modules dependencies for RHEL8
-  sudo yum install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python2-devel redhat-rpm-config -y
+  [[ "${DIST_VER}" =~ ^[8].* ]] && sudo yum install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python2-devel redhat-rpm-config -y
 
   sudo chmod 2777 /usr/local/src
   sudo chown root:users /usr/local/src
   cd /usr/local/src/
-  false; while [[ $? -ne 0 ]]; do $SUDO_WWW git clone https://github.com/MISP/misp-modules.git; done
+  false; while [[ $? -ne 0 ]]; do ${SUDO_WWW} git clone https://github.com/MISP/misp-modules.git; done
   cd misp-modules
   # pip install
-  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U -I -r REQUIREMENTS
-  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U .
-  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install pyfaup censys
+  ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install -U -I -r REQUIREMENTS
+  ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install -U .
+  ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install pyfaup censys
   # some misp-modules dependencies for RHEL<8
-  sudo yum install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
+  [[ "${DIST_VER}" =~ ^[7].* ]] && sudo yum install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
   # some misp-modules dependencies for RHEL8
-  sudo dnf install https://packages.endpoint.com/rhel/8/main/x86_64/endpoint-repo-8-1.ep8.noarch.rpm -y
-  sudo yum install zbar-devel opencv-devel -y
+  [[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpoint.com/rhel/8/main/x86_64/endpoint-repo-8-1.ep8.noarch.rpm -y && sudo yum install zbar-devel opencv-devel -y
 
   echo "[Unit]
   Description=MISP modules
@@ -30,8 +29,8 @@ mispmodulesRHEL () {
 
   [Service]
   Type=simple
-  User=$WWW_USER
-  Group=$WWW_USER
+  User=${WWW_USER}
+  Group=${WWW_USER}
   WorkingDirectory=/usr/local/src/misp-modules
   Environment="PATH=/var/www/MISP/venv/bin"
   ExecStart=\"${PATH_TO_MISP}/venv/bin/misp-modules -l 127.0.0.1 -s\"
@@ -43,48 +42,48 @@ mispmodulesRHEL () {
 
   sudo systemctl daemon-reload
   # Test misp-modules
-  $SUDO_WWW $PATH_TO_MISP/venv/bin/misp-modules -l 127.0.0.1 -s &
+  ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/misp-modules -l 127.0.0.1 -s &
   sudo systemctl enable --now misp-modules
 
   # Enable Enrichment, set better timeouts
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_services_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_hover_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_timeout" 300
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_hover_timeout" 150
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_services_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_hover_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_timeout" 300
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_hover_timeout" 150
   # TODO:"Investigate why the next one fails"
-  #$SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_asn_history_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_cve_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_dns_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_btc_steroids_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_ipasn_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_yara_syntax_validator_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_yara_query_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_pdf_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_docx_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_xlsx_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_pptx_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_ods_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_odt_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_services_url" "http://127.0.0.1"
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_services_port" 6666
+  #${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_asn_history_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_cve_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_dns_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_btc_steroids_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_ipasn_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_yara_syntax_validator_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_yara_query_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_pdf_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_docx_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_xlsx_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_pptx_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_ods_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_odt_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_services_url" "http://127.0.0.1"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_services_port" 6666
 
   # Enable Import modules, set better timeout
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_services_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_services_url" "http://127.0.0.1"
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_services_port" 6666
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_timeout" 300
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_ocr_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_mispjson_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_openiocimport_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_threatanalyzer_import_enabled" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Import_csvimport_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_services_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_services_url" "http://127.0.0.1"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_services_port" 6666
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_timeout" 300
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_ocr_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_mispjson_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_openiocimport_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_threatanalyzer_import_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_csvimport_enabled" true
 
   # Enable Export modules, set better timeout
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Export_services_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Export_services_url" "http://127.0.0.1"
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Export_services_port" 6666
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Export_timeout" 300
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Export_pdfexport_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_services_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_services_url" "http://127.0.0.1"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_services_port" 6666
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_timeout" 300
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_pdfexport_enabled" true
 }
 # <snippet-end 3_misp-modules_RHEL.sh>
 ```

From 8f13e5f41aa4fa4a582e6fb71cb3a573453f9cc7 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 30 Mar 2021 09:38:41 +0200
Subject: [PATCH 430/437] fix: [internal] ThreatLevel::list() function renamed

- causes issues under certain PHP versions as it's a reserved keyword
---
 app/Controller/EventsController.php  | 6 +++---
 app/Controller/FeedsController.php   | 2 +-
 app/Controller/ServersController.php | 4 ++--
 app/Model/ThreatLevel.php            | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index 90bf21afe..fc6d23eab 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -590,7 +590,7 @@ class EventsController extends AppController
                         $searchTermInternal = $searchTerm;
                         if ($searchTerm == 'threatlevel') {
                             $searchTermInternal = 'threat_level_id';
-                            $terms = $this->Event->ThreatLevel->list();
+                            $terms = $this->Event->ThreatLevel->listThreatLevels();
                         } elseif ($searchTerm == 'analysis') {
                             $terms = $this->Event->analysisLevels;
                         } else {
@@ -4694,7 +4694,7 @@ class EventsController extends AppController
             $this->render('/Elements/view_galaxy_matrix');
         }
     }
-    
+
     // Displays all the cluster relations for the provided event
     public function viewClusterRelations($eventId)
     {
@@ -4759,7 +4759,7 @@ class EventsController extends AppController
         );
 
         $this->set('events', $this->paginate());
-        $this->set('threatLevels', $this->Event->ThreatLevel->list());
+        $this->set('threatLevels', $this->Event->ThreatLevel->listThreatLevels());
         $this->set('eventDescriptions', $this->Event->fieldDescriptions);
         $this->set('analysisLevels', $this->Event->analysisLevels);
         $this->set('distributionLevels', $this->Event->distributionLevels);
diff --git a/app/Controller/FeedsController.php b/app/Controller/FeedsController.php
index b07c07c29..aa7b6d8c5 100644
--- a/app/Controller/FeedsController.php
+++ b/app/Controller/FeedsController.php
@@ -694,7 +694,7 @@ class FeedsController extends AppController
         }
         $this->set('events', $events);
         $this->loadModel('Event');
-        $this->set('threatLevels', $this->Event->ThreatLevel->list());
+        $this->set('threatLevels', $this->Event->ThreatLevel->listThreatLevels());
         $this->set('eventDescriptions', $this->Event->fieldDescriptions);
         $this->set('analysisLevels', $this->Event->analysisLevels);
         $this->set('distributionLevels', $this->Event->distributionLevels);
diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index d8eb3a38c..c89f30a94 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -124,7 +124,7 @@ class ServersController extends AppController
         }
 
         $this->loadModel('Event');
-        $this->set('threatLevels', $this->Event->ThreatLevel->list());
+        $this->set('threatLevels', $this->Event->ThreatLevel->listThreatLevels());
         App::uses('CustomPaginationTool', 'Tools');
         $customPagination = new CustomPaginationTool();
         $params = $customPagination->createPaginationRules($events, $this->passedArgs, $this->alias);
@@ -202,7 +202,7 @@ class ServersController extends AppController
                 $this->set($alias, $currentModel->{$variable});
             }
         }
-        $this->set('threatLevels', $this->Event->ThreatLevel->list());
+        $this->set('threatLevels', $this->Event->ThreatLevel->listThreatLevels());
         $this->set('title_for_layout', __('Remote event preview'));
     }
 
diff --git a/app/Model/ThreatLevel.php b/app/Model/ThreatLevel.php
index 1b0114450..6e6118b2e 100644
--- a/app/Model/ThreatLevel.php
+++ b/app/Model/ThreatLevel.php
@@ -23,7 +23,7 @@ class ThreatLevel extends AppModel
         ),
     );
 
-    public function list()
+    public function listThreatLevels()
     {
         return $this->find('list', [
             'fields' => ['id', 'name'],

From 0d9305322a09d7e81bc6c72b520456f98d143858 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Wed, 31 Mar 2021 11:12:30 +0900
Subject: [PATCH 431/437] chg: [doc] Seperated cake commands into seperate
 files

---
 docs/INSTALL.rhel7.md                 |  4 +++
 docs/INSTALL.rhel8.md                 |  4 +++
 docs/INSTALL.ubuntu1804.md            |  4 +++
 docs/INSTALL.ubuntu2004.md            |  4 +++
 docs/generic/misp-dashboard-cake.md   | 21 +++++++++++++
 docs/generic/misp-dashboard-centos.md | 20 +-----------
 docs/generic/misp-dashboard-debian.md | 25 +--------------
 docs/generic/misp-modules-cake.md     | 44 +++++++++++++++++++++++++++
 docs/generic/misp-modules-centos.md   | 40 ------------------------
 docs/generic/misp-modules-debian.md   | 41 -------------------------
 docs/xINSTALL.centos7.md              |  2 ++
 docs/xINSTALL.debian10.md             |  5 +++
 12 files changed, 90 insertions(+), 124 deletions(-)
 create mode 100644 docs/generic/misp-dashboard-cake.md
 create mode 100644 docs/generic/misp-modules-cake.md

diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index d2a31d279..7ba24651f 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -685,10 +685,14 @@ configWorkersRHEL () {
 
 {!generic/misp-modules-centos.md!}
 
+{!generic/misp-modules-cake.md!}
+
 {!generic/MISP_CAKE_init.md!}
 
 {!generic/misp-dashboard-centos.md!}
 
+{!generic/misp-dashboard-cake.md!}
+
 {!generic/INSTALL.done.md!}
 
 {!generic/recommended.actions.md!}
diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 034c93b9a..34ff4d280 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -694,10 +694,14 @@ configWorkersRHEL () {
 
 {!generic/misp-modules-centos.md!}
 
+{!generic/misp-modules-cake.md!}
+
 {!generic/MISP_CAKE_init.md!}
 
 {!generic/misp-dashboard-centos.md!}
 
+{!generic/misp-dashboard-cake.md!}
+
 {!generic/INSTALL.done.md!}
 
 {!generic/recommended.actions.md!}
diff --git a/docs/INSTALL.ubuntu1804.md b/docs/INSTALL.ubuntu1804.md
index d74cde3ea..7fd3791a3 100644
--- a/docs/INSTALL.ubuntu1804.md
+++ b/docs/INSTALL.ubuntu1804.md
@@ -507,6 +507,8 @@ echo "User  (misp) DB Password: $DBPASSWORD_MISP"
 
 {!generic/misp-modules-debian.md!}
 
+{!generic/misp-modules-cake.md!}
+
 {!generic/INSTALL.done.md!}
 
 {!generic/recommended.actions.md!}
@@ -534,6 +536,8 @@ installKafka () {
 
 {!generic/misp-dashboard-debian.md!}
 
+{!generic/misp-dashboard-cake.md!}
+
 {!generic/viper-debian.md!}
 
 {!generic/ssdeep-debian.md!}
diff --git a/docs/INSTALL.ubuntu2004.md b/docs/INSTALL.ubuntu2004.md
index 2e39ae3d1..22bc00ff2 100644
--- a/docs/INSTALL.ubuntu2004.md
+++ b/docs/INSTALL.ubuntu2004.md
@@ -507,6 +507,8 @@ echo "User  (misp) DB Password: $DBPASSWORD_MISP"
 
 {!generic/misp-modules-debian.md!}
 
+{!generic/misp-modules-cake.md!}
+
 {!generic/INSTALL.done.md!}
 
 {!generic/recommended.actions.md!}
@@ -534,6 +536,8 @@ installKafka () {
 
 {!generic/misp-dashboard-debian.md!}
 
+{!generic/misp-dashboard-cake.md!}
+
 {!generic/viper-debian.md!}
 
 {!generic/ssdeep-debian.md!}
diff --git a/docs/generic/misp-dashboard-cake.md b/docs/generic/misp-dashboard-cake.md
new file mode 100644
index 000000000..d61d1f2b9
--- /dev/null
+++ b/docs/generic/misp-dashboard-cake.md
@@ -0,0 +1,21 @@
+# <snippet-begin 4_misp-dashboard-cake.sh>
+dashboardCAKE () {
+  # Enable ZeroMQ for misp-dashboard
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_event_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_object_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_object_reference_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_attribute_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_sighting_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_user_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_organisation_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_port" 50000
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_host" "localhost"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_port" 6379
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_database" 1
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_namespace" "mispq"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_include_attachments" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_tag_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_audit_notifications_enable" false
+}
+# <snippet-end 4_misp-dashboard-cake.sh>
diff --git a/docs/generic/misp-dashboard-centos.md b/docs/generic/misp-dashboard-centos.md
index c53871fcd..41b4fa8b8 100644
--- a/docs/generic/misp-dashboard-centos.md
+++ b/docs/generic/misp-dashboard-centos.md
@@ -2,7 +2,7 @@
 --------------
 
 !!! warning
-    Currently defunct due to upstream dependency changes
+    A valid MaxMind DB key is required.
 
 !!! warning
     Does not work on RHEL 8
@@ -68,24 +68,6 @@ mispDashboard () {
 
   # Add misp-dashboard to rc.local to start on boot.
   sudo sed -i -e '$i \sudo -u apache bash /var/www/misp-dashboard/start_all.sh > /tmp/misp-dashboard_rc.local.log\n' /etc/rc.local
-
-  # Enable ZeroMQ for misp-dashboard
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_event_notifications_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_object_notifications_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_object_reference_notifications_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_attribute_notifications_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_sighting_notifications_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_user_notifications_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_organisation_notifications_enable" true
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_port" 50000
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_redis_host" "localhost"
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_redis_port" 6379
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_redis_database" 1
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_redis_namespace" "mispq"
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_include_attachments" false
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_tag_notifications_enable" false
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.ZeroMQ_audit_notifications_enable" false
 }
 # <snippet-end 4_misp-dashboardRHEL.sh>
 ```
diff --git a/docs/generic/misp-dashboard-debian.md b/docs/generic/misp-dashboard-debian.md
index 0e2928f16..c631cf6ec 100644
--- a/docs/generic/misp-dashboard-debian.md
+++ b/docs/generic/misp-dashboard-debian.md
@@ -2,7 +2,7 @@
 --------------
 
 !!! warning
-    Currently defunct due to upstream dependency changes
+    A valid MaxMind DB key is required.
 
 ```bash
 # <snippet-begin 4_misp-dashboard.sh>
@@ -75,26 +75,3 @@ mispDashboard () {
   sudo sed -i -e '$i \sudo -u www-data bash /var/www/misp-dashboard/start_all.sh > /tmp/misp-dashboard_rc.local.log\n' /etc/rc.local
 }
 # <snippet-end 4_misp-dashboard.sh>
-
-# <snippet-begin 4_misp-dashboard-cake.sh>
-dashboardCAKE () {
-  # Enable ZeroMQ for misp-dashboard
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_event_notifications_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_object_notifications_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_object_reference_notifications_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_attribute_notifications_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_sighting_notifications_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_user_notifications_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_organisation_notifications_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_port" 50000
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_redis_host" "localhost"
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_redis_port" 6379
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_redis_database" 1
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_redis_namespace" "mispq"
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_include_attachments" false
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_tag_notifications_enable" false
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.ZeroMQ_audit_notifications_enable" false
-}
-# <snippet-end 4_misp-dashboard-cake.sh>
-```
diff --git a/docs/generic/misp-modules-cake.md b/docs/generic/misp-modules-cake.md
new file mode 100644
index 000000000..e91c8deaa
--- /dev/null
+++ b/docs/generic/misp-modules-cake.md
@@ -0,0 +1,44 @@
+# <snippet-begin 3_misp-modules-cake.sh>
+modulesCAKE () {
+  # Enable Enrichment, set better timeouts
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_services_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_hover_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_hover_popover_only" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_hover_timeout" 150
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_timeout" 300
+  # TODO:"Investigate why the next one fails"
+  #${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_asn_history_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_cve_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_dns_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_btc_steroids_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_ipasn_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_yara_syntax_validator_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_yara_query_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_pdf_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_docx_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_xlsx_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_pptx_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_ods_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_odt_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_services_url" "http://127.0.0.1"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_services_port" 6666
+
+  # Enable Import modules, set better timeout
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_services_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_services_url" "http://127.0.0.1"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_services_port" 6666
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_timeout" 300
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_ocr_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_mispjson_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_openiocimport_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_threatanalyzer_import_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_csvimport_enabled" true
+
+  # Enable Export modules, set better timeout
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_services_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_services_url" "http://127.0.0.1"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_services_port" 6666
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_timeout" 300
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_pdfexport_enabled" true
+}
+# <snippet-end 3_misp-modules-cake.sh>
diff --git a/docs/generic/misp-modules-centos.md b/docs/generic/misp-modules-centos.md
index 66aaacbd2..a87181da9 100644
--- a/docs/generic/misp-modules-centos.md
+++ b/docs/generic/misp-modules-centos.md
@@ -44,46 +44,6 @@ mispmodulesRHEL () {
   # Test misp-modules
   ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/misp-modules -l 127.0.0.1 -s &
   sudo systemctl enable --now misp-modules
-
-  # Enable Enrichment, set better timeouts
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_services_enable" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_hover_enable" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_timeout" 300
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_hover_timeout" 150
-  # TODO:"Investigate why the next one fails"
-  #${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_asn_history_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_cve_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_dns_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_btc_steroids_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_ipasn_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_yara_syntax_validator_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_yara_query_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_pdf_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_docx_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_xlsx_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_pptx_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_ods_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_odt_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_services_url" "http://127.0.0.1"
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_services_port" 6666
-
-  # Enable Import modules, set better timeout
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_services_enable" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_services_url" "http://127.0.0.1"
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_services_port" 6666
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_timeout" 300
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_ocr_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_mispjson_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_openiocimport_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_threatanalyzer_import_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Import_csvimport_enabled" true
-
-  # Enable Export modules, set better timeout
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_services_enable" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_services_url" "http://127.0.0.1"
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_services_port" 6666
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_timeout" 300
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_pdfexport_enabled" true
 }
 # <snippet-end 3_misp-modules_RHEL.sh>
 ```
diff --git a/docs/generic/misp-modules-debian.md b/docs/generic/misp-modules-debian.md
index 8d614119e..65dbd9a84 100644
--- a/docs/generic/misp-modules-debian.md
+++ b/docs/generic/misp-modules-debian.md
@@ -50,47 +50,6 @@ mispmodules () {
 
   # Sleep 9 seconds to give misp-modules a chance to spawn
   sleep 9
-
-  # Enable Enrichment, set better timeouts
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_services_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_hover_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_hover_popover_only" false
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_timeout" 300
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_hover_timeout" 150
-  # TODO:"Investigate why the next one fails"
-  #$SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_asn_history_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_cve_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_dns_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_btc_steroids_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_ipasn_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_yara_syntax_validator_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_yara_query_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_pdf_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_docx_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_xlsx_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_pptx_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_ods_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_odt_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_services_url" "http://127.0.0.1"
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Enrichment_services_port" 6666
-
-  # Enable Import modules, set better timeout
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Import_services_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Import_services_url" "http://127.0.0.1"
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Import_services_port" 6666
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Import_timeout" 300
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Import_ocr_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Import_mispjson_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Import_openiocimport_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Import_threatanalyzer_import_enabled" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Import_csvimport_enabled" true
-
-  # Enable Export modules, set better timeout
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Export_services_enable" true
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Export_services_url" "http://127.0.0.1"
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Export_services_port" 6666
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Export_timeout" 300
-  $SUDO_WWW $CAKE Admin setSetting "Plugin.Export_pdfexport_enabled" true
 }
 # <snippet-end 3_misp-modules.sh>
 ```
diff --git a/docs/xINSTALL.centos7.md b/docs/xINSTALL.centos7.md
index 5b484c267..b4f5e410c 100644
--- a/docs/xINSTALL.centos7.md
+++ b/docs/xINSTALL.centos7.md
@@ -599,6 +599,8 @@ sudo sed -i -e '$i \sudo -u apache ${PATH_TO_MISP}/venv/bin/misp-modules -l 127.
 
 {!generic/misp-dashboard-centos.md!}
 
+{!generic/misp-dashboard-cake.md!}
+
 {!generic/MISP_CAKE_init.md!}
 
 {!generic/INSTALL.done.md!}
diff --git a/docs/xINSTALL.debian10.md b/docs/xINSTALL.debian10.md
index a13ce42a1..016d6a227 100644
--- a/docs/xINSTALL.debian10.md
+++ b/docs/xINSTALL.debian10.md
@@ -443,6 +443,7 @@ then
     sudo chmod u+x /etc/rc.local
 fi
 ```
+
 {!generic/MISP_CAKE_init.md!}
 
 ```bash
@@ -454,6 +455,8 @@ sudo sed -i -e '$i \sysctl vm.overcommit_memory=1\n' /etc/rc.local
 
 {!generic/misp-modules-debian.md!}
 
+{!generic/misp-modules-cake.md!}
+
 ```bash
 echo "Admin (root) DB Password: $DBPASSWORD_ADMIN"
 echo "User  (misp) DB Password: $DBPASSWORD_MISP"
@@ -497,6 +500,8 @@ sudo service apache2 restart
 
 {!generic/misp-dashboard-debian.md!}
 
+{!generic/misp-dashboard-cake.md!}
+
 {!generic/viper-debian.md!}
 
 {!generic/ssdeep-debian.md!}

From f1e6a41ed7b19ef952cadf62c0ea95ec3f8e4ab2 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Wed, 31 Mar 2021 13:18:18 +0900
Subject: [PATCH 432/437] chg: [doc] some cleanups

---
 docs/INSTALL.kali.md                 |  4 ++--
 docs/INSTALL.rhel7.md                | 11 ++++-------
 docs/INSTALL.rhel8.md                |  2 ++
 docs/INSTALL.ubuntu1804.md           | 13 +++++--------
 docs/INSTALL.ubuntu2004.md           | 15 ++++++---------
 docs/generic/manual-install-notes.md |  3 +++
 docs/generic/misp-dashboard-cake.md  |  2 ++
 docs/generic/misp-modules-cake.md    |  2 ++
 docs/license.md                      |  2 +-
 9 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 docs/generic/manual-install-notes.md

diff --git a/docs/INSTALL.kali.md b/docs/INSTALL.kali.md
index e7d93384a..1ba0f6e64 100644
--- a/docs/INSTALL.kali.md
+++ b/docs/INSTALL.kali.md
@@ -1,8 +1,8 @@
 # INSTALLATION INSTRUCTIONS
-## for Kali Linux 2020.4
+## for Kali Linux 2021.1
 # 0/ Quick MISP Instance on Kali Linux - Status
 
-This has been tested by @SteveClement on 20210203
+This has been tested by @SteveClement on 20210331
 
 # 1/ Prepare Kali with a MISP User
 
diff --git a/docs/INSTALL.rhel7.md b/docs/INSTALL.rhel7.md
index 7ba24651f..146bbd3cb 100644
--- a/docs/INSTALL.rhel7.md
+++ b/docs/INSTALL.rhel7.md
@@ -25,7 +25,7 @@
     wget -O /tmp/INSTALL.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh
     bash /tmp/INSTALL.sh -c
     ```
-    **The above does NOT work yet**
+    **The above does NOT fully work yet**
 
 !!! notice
     If the next line is `[!generic/community.md!]()` [click here](https://misp.github.io/MISP/INSTALL.rhel7/).
@@ -37,18 +37,15 @@
 {!generic/rhelVScentos.md!}
 
 !!! warning
-    The core MISP team cannot verify if this guide is working or not. Please help us in keeping it up to date and accurate.
+    The core MISP team cannot easily verify if this guide is working or not. Please help us in keeping it up to date and accurate.
     Thus we also have difficulties in supporting RHEL issues but will do a best effort on a similar yet slightly different setup.
 
-!!! notice
-    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
-    Which explains why you will see the use of shell *functions* in various steps.
-    Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc...
-
 !!! notice
     Maintenance for CentOS 7 will end on: June 30th, 2024 [Source[0]](https://wiki.centos.org/About/Product) [Source[1]](https://linuxlifecycle.com/)
     CentOS 7-1908 [NetInstallURL](http://mirror.centos.org/centos/7/os/x86_64/)
 
+{!generic/manual-install-notes.md!}
+
 This document details the steps to install MISP on Red Hat Enterprise Linux 7.x (RHEL 7.x) and CentOS 7.x.
 At time of this writing it was tested on versions 7.6 for both.
 This is a joint RHEL/CentOS install guide. The authors tried to make it contextually evident what applies to which flavor.
diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 34ff4d280..6d47df160 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -44,6 +44,8 @@
     Maintenance for CentOS 8 will end on: December 31st, 2021 [Source[0]](https://wiki.centos.org/About/Product) [Source[1]](https://linuxlifecycle.com/)
     CentOS 8 [NetInstallURL](http://mirrorlist.centos.org/?release=8&arch=x86_64&repo=BaseOS)
 
+{!generic/manual-install-notes.md!}
+
 This document details the steps to install MISP on Red Hat Enterprise Linux 8.x (RHEL 8.x) and CentOS 8.x.
 At time of this writing it was tested on versions 8.0 for RHEL.
 This is a joint RHEL/CentOS install guide. The authors tried to make it contextually evident what applies to which flavor.
diff --git a/docs/INSTALL.ubuntu1804.md b/docs/INSTALL.ubuntu1804.md
index 7fd3791a3..d7bf1a408 100644
--- a/docs/INSTALL.ubuntu1804.md
+++ b/docs/INSTALL.ubuntu1804.md
@@ -1,11 +1,11 @@
 # INSTALLATION INSTRUCTIONS
-## for Ubuntu 18.04.4-server
+## for Ubuntu 18.04.5-server
 
 ### -1/ Installer and Manual install instructions
 
 Make sure you are reading the parsed version of this Document. When in doubt [click here](https://misp.github.io/MISP/INSTALL.ubuntu1804/).
 
-To install MISP on a fresh Ubuntu 18.04, all you need to do is the following:
+To install MISP on a *fresh* Ubuntu 18.04, all you need to do is the following:
 
 ```bash
 # Please check the installer options first to make the best choice for your install
@@ -20,12 +20,9 @@ bash /tmp/INSTALL.sh -c
 ### 0/ MISP Ubuntu 18.04-server install - status
 -------------------------
 !!! notice
-    Installer tested working by [@SteveClement](https://twitter.com/SteveClement) on 20210324 (works with **Ubuntu 18.10/19.04** too)
+    Installer tested working by [@SteveClement](https://twitter.com/SteveClement) on 20210324 (works with **Ubuntu 19.04/20.04/21.04** too)
 
-!!! notice
-    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
-    Which explains why you will see the use of shell *functions* in various steps.
-    Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc...
+{!generic/manual-install-notes.md!}
 
 !!! notice
     If the next line is `[!generic/core.md!]()` [click here](https://misp.github.io/MISP/INSTALL.ubuntu1804/).
@@ -37,7 +34,7 @@ bash /tmp/INSTALL.sh -c
 
 #### Install a minimal Ubuntu 18.04-server system with the software:
 - OpenSSH server
-- This guide assumes a user name of 'misp' with sudo working
+- This guide assumes a user name of 'misp' with sudo working but can be overwritten by setting the environment variable: *${MISP_USER}*
 
 #### Make sure your system is up2date
 ```bash
diff --git a/docs/INSTALL.ubuntu2004.md b/docs/INSTALL.ubuntu2004.md
index 22bc00ff2..ec243d6ea 100644
--- a/docs/INSTALL.ubuntu2004.md
+++ b/docs/INSTALL.ubuntu2004.md
@@ -1,11 +1,11 @@
 # INSTALLATION INSTRUCTIONS
-## for Ubuntu 20.04-server
+## for Ubuntu 20.04.2.0-server
 
 ### -1/ Installer and Manual install instructions
 
-Make sure you are reading the parsed version of this Document. When in doubt [click here](https://misp.github.io/MISP/INSTALL.ubuntu1804/).
+Make sure you are reading the parsed version of this Document. When in doubt [click here](https://misp.github.io/MISP/INSTALL.ubuntu2004/).
 
-To install MISP on a fresh Ubuntu 20.04, all you need to do is the following:
+To install MISP on a *fresh* Ubuntu 20.04, all you need to do is the following:
 
 ```bash
 # Please check the installer options first to make the best choice for your install
@@ -20,12 +20,9 @@ bash /tmp/INSTALL.sh -c
 ### 0/ MISP Ubuntu 20.04-server install - status
 -------------------------
 !!! notice
-    Installer tested working by [@SteveClement](https://twitter.com/SteveClement) on 20200501
+    Installer tested working by [@SteveClement](https://twitter.com/SteveClement) on 20210331
 
-!!! notice
-    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
-    Which explains why you will see the use of shell *functions* in various steps.
-    Henceforth the document will also follow a more logical flow. In the sense that all the dependencies are installed first then config files are generated, etc...
+{!generic/manual-install-notes.md!}
 
 !!! notice
     If the next line is `[!generic/core.md!]()` [click here](https://misp.github.io/MISP/INSTALL.ubuntu2004/).
@@ -37,7 +34,7 @@ bash /tmp/INSTALL.sh -c
 
 #### Install a minimal Ubuntu 20.04-server system with the software:
 - OpenSSH server
-- This guide assumes a user name of 'misp' with sudo working
+- This guide assumes a user name of 'misp' with sudo working but can be overwritten by setting the environment variable: *${MISP_USER}*
 
 #### Make sure your system is up2date
 ```bash
diff --git a/docs/generic/manual-install-notes.md b/docs/generic/manual-install-notes.md
new file mode 100644
index 000000000..f7d9cd573
--- /dev/null
+++ b/docs/generic/manual-install-notes.md
@@ -0,0 +1,3 @@
+!!! notice
+    This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
+    You will see bash-*functions* in various steps. You can either copy between the *{}*'s or copy the entire function and just run it.
diff --git a/docs/generic/misp-dashboard-cake.md b/docs/generic/misp-dashboard-cake.md
index d61d1f2b9..fc4ce4db4 100644
--- a/docs/generic/misp-dashboard-cake.md
+++ b/docs/generic/misp-dashboard-cake.md
@@ -1,3 +1,4 @@
+```bash
 # <snippet-begin 4_misp-dashboard-cake.sh>
 dashboardCAKE () {
   # Enable ZeroMQ for misp-dashboard
@@ -19,3 +20,4 @@ dashboardCAKE () {
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_audit_notifications_enable" false
 }
 # <snippet-end 4_misp-dashboard-cake.sh>
+```
diff --git a/docs/generic/misp-modules-cake.md b/docs/generic/misp-modules-cake.md
index e91c8deaa..0383bd28e 100644
--- a/docs/generic/misp-modules-cake.md
+++ b/docs/generic/misp-modules-cake.md
@@ -1,3 +1,4 @@
+```bash
 # <snippet-begin 3_misp-modules-cake.sh>
 modulesCAKE () {
   # Enable Enrichment, set better timeouts
@@ -42,3 +43,4 @@ modulesCAKE () {
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Export_pdfexport_enabled" true
 }
 # <snippet-end 3_misp-modules-cake.sh>
+```
diff --git a/docs/license.md b/docs/license.md
index faa87e2f0..5644e386e 100644
--- a/docs/license.md
+++ b/docs/license.md
@@ -2,4 +2,4 @@
 
 The MISP INSTALL guides are dual-licensed under [GNU Affero General Public License version 3](http://www.gnu.org/licenses/agpl-3.0.html) and [CC-BY-SA 4.0 international](https://creativecommons.org/licenses/by-sa/4.0/).
 
-* Copyright \(C\) 2014-2018 CIRCL - Computer Incident Response Center Luxembourg
+* Copyright \(C\) 2014-2021 CIRCL - Computer Incident Response Center Luxembourg

From 83fa04903a50f268d59c3dde99753984c49e3318 Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Wed, 31 Mar 2021 17:07:45 +0900
Subject: [PATCH 433/437] chg: [doc] Seperated RHEL 7/8 install fn. Fedora33
 supported.

---
 INSTALL/INSTALL.tpl.sh                      | 18 +++++++++++++-----
 INSTALL/xINSTALL.centos6.txt                |  1 -
 INSTALL/xINSTALL.debian9-postgresql.txt     |  1 -
 INSTALL/xINSTALL.debian9.txt                |  1 -
 INSTALL/xINSTALL.ubuntu1804.with.webmin.txt |  1 -
 docs/INSTALL.rhel8.md                       | 20 +++++++++++++-------
 docs/generic/misp-modules-centos.md         |  4 ++--
 docs/generic/supportFunctions.md            |  9 +++++----
 8 files changed, 33 insertions(+), 22 deletions(-)
 delete mode 120000 INSTALL/xINSTALL.centos6.txt
 delete mode 120000 INSTALL/xINSTALL.debian9-postgresql.txt
 delete mode 120000 INSTALL/xINSTALL.debian9.txt
 delete mode 120000 INSTALL/xINSTALL.ubuntu1804.with.webmin.txt

diff --git a/INSTALL/INSTALL.tpl.sh b/INSTALL/INSTALL.tpl.sh
index 0832d2c9d..b61e0fca3 100755
--- a/INSTALL/INSTALL.tpl.sh
+++ b/INSTALL/INSTALL.tpl.sh
@@ -88,6 +88,7 @@
 ## 2_logRotation.sh ##
 ## 2_backgroundWorkers.sh ##
 ## 3_misp-modules.sh ##
+## 3_misp-modules-cake.sh ##
 ## 4_misp-dashboard.sh ##
 ## 4_misp-dashboard-cake.sh ##
 ## 5_mail_to_misp.sh ##
@@ -147,12 +148,12 @@ generateInstaller () {
   cp ../INSTALL.tpl.sh .
 
   # Pull code snippets out of Main Install Documents
-  for f in `echo INSTALL.ubuntu2004.md INSTALL.ubuntu1804.md xINSTALL.debian9.md INSTALL.kali.md xINSTALL.debian10.md xINSTALL.tsurugi.md xINSTALL.debian9-postgresql.md xINSTALL.ubuntu1804.with.webmin.md INSTALL.rhel7.md`; do
+  for f in `echo INSTALL.ubuntu2004.md INSTALL.ubuntu1804.md xINSTALL.debian10.md xINSTALL.tsurugi.md INSTALL.rhel7.md INSTALL.rhel8.md`; do
     xsnippet . ../../docs/${f}
   done
 
   # Pull out code snippets from generic Install Documents
-  for f in `echo globalVariables.md mail_to_misp-debian.md MISP_CAKE_init.md misp-dashboard-debian.md misp-modules-debian.md gnupg.md ssdeep-debian.md sudo_etckeeper.md supportFunctions.md viper-debian.md misp-modules-centos.md`; do
+  for f in `echo globalVariables.md mail_to_misp-debian.md MISP_CAKE_init.md misp-dashboard-debian.md misp-dashboard-centos.md misp-dashboard-cake.md misp-modules-debian.md misp-modules-centos.md misp-modules-cake.md gnupg.md ssdeep-debian.md sudo_etckeeper.md supportFunctions.md viper-debian.md`; do
     xsnippet . ../../docs/generic/${f}
   done
 
@@ -181,6 +182,7 @@ generateInstaller () {
   perl -pe 's/^## 2_logRotation.sh ##/`cat 2_logRotation.sh`/ge' -i INSTALL.tpl.sh
   perl -pe 's/^## 2_backgroundWorkers.sh ##/`cat 2_backgroundWorkers.sh`/ge' -i INSTALL.tpl.sh
   perl -pe 's/^## 2_core-cake.sh ##/`cat 2_core-cake.sh`/ge' -i INSTALL.tpl.sh
+  perl -pe 's/^## 3_misp-modules-cake.sh ##/`cat 3_misp-modules-cake.sh`/ge' -i INSTALL.tpl.sh
   perl -pe 's/^## 3_misp-modules.sh ##/`cat 3_misp-modules.sh`/ge' -i INSTALL.tpl.sh
   perl -pe 's/^## 4_misp-dashboard-cake.sh ##/`cat 4_misp-dashboard-cake.sh`/ge' -i INSTALL.tpl.sh
   perl -pe 's/^## 4_misp-dashboard.sh ##/`cat 4_misp-dashboard.sh`/ge' -i INSTALL.tpl.sh
@@ -661,7 +663,7 @@ installMISPRHEL () {
     fi 
     
     debug "Enabling Extras Repos (SCL)"
-    if [[ "${FLAVOUR}" == "rhel" ]]; then
+    if [[ "${DISTRI}" == "rhel7" ]]; then
       sudo subscription-manager register --auto-attach
       enableReposRHEL
       enableEPEL
@@ -782,13 +784,19 @@ fi
 SUPPORT_MAP="
 x86_64-centos-7
 x86_64-rhel-7
-x86_64-fedora-30
+x86_64-centos-8
+x86_64-rhel-8
+x86_64-fedora-33
 x86_64-debian-stretch
 x86_64-debian-buster
 x86_64-ubuntu-bionic
 x86_64-ubuntu-focal
 x86_64-ubuntu-hirsute
 x86_64-kali-2020.4
+x86_64-kali-2021.1
+x86_64-kali-2021.2
+x86_64-kali-2021.3
+x86_64-kali-2021.4
 armv6l-raspbian-stretch
 armv7l-raspbian-stretch
 armv7l-debian-jessie
@@ -893,7 +901,7 @@ if [[ "${FLAVOUR}" == "kali" ]]; then
 fi
 
 # If RHEL/CentOS is detected, run appropriate script
-if [[ "${FLAVOUR}" == "rhel" ]] || [[ "${FLAVOUR}" == "centos" ]]; then
+if [[ "${FLAVOUR}" == "rhel" ]] || [[ "${FLAVOUR}" == "centos" ]] || [[ "${FLAVOUR}" == "fedora" ]]; then
   installMISPRHEL
   echo "Installation done !"
   exit
diff --git a/INSTALL/xINSTALL.centos6.txt b/INSTALL/xINSTALL.centos6.txt
deleted file mode 120000
index 0c0c397a5..000000000
--- a/INSTALL/xINSTALL.centos6.txt
+++ /dev/null
@@ -1 +0,0 @@
-../docs/xINSTALL.centos6.md
\ No newline at end of file
diff --git a/INSTALL/xINSTALL.debian9-postgresql.txt b/INSTALL/xINSTALL.debian9-postgresql.txt
deleted file mode 120000
index cedbea0b5..000000000
--- a/INSTALL/xINSTALL.debian9-postgresql.txt
+++ /dev/null
@@ -1 +0,0 @@
-../docs/xINSTALL.debian9-postgresql.md
\ No newline at end of file
diff --git a/INSTALL/xINSTALL.debian9.txt b/INSTALL/xINSTALL.debian9.txt
deleted file mode 120000
index 23316cb33..000000000
--- a/INSTALL/xINSTALL.debian9.txt
+++ /dev/null
@@ -1 +0,0 @@
-../docs/xINSTALL.debian9.md
\ No newline at end of file
diff --git a/INSTALL/xINSTALL.ubuntu1804.with.webmin.txt b/INSTALL/xINSTALL.ubuntu1804.with.webmin.txt
deleted file mode 120000
index ce49b61d2..000000000
--- a/INSTALL/xINSTALL.ubuntu1804.with.webmin.txt
+++ /dev/null
@@ -1 +0,0 @@
-../docs/xINSTALL.ubuntu1804.with.webmin.md
\ No newline at end of file
diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 6d47df160..298073fb4 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -1,7 +1,7 @@
 # INSTALLATION INSTRUCTIONS for RHEL 8.x, CentOS8/Stream
 -------------------------
 
-### -2/ RHEL8/CentOS8 - status
+### -2/ RHEL8/CentOS8/CentOS_Stream/Fedora33 - status
 -------------------------
 !!! notice
     MISP-core and misp-modules Tested working by [@SteveClement](https://twitter.com/SteveClement) on 20210326
@@ -14,7 +14,7 @@
 ### -1/ Installer and Manual install instructions
 
 !!! warning
-    In the **future**, to install MISP on a fresh RHEL 8 install all you need to do is:
+    In the **future**, to install MISP on a fresh RHEL 8 or CentOS 8 install all you need to do is:
 
     ```bash
     # Please check the installer options first to make the best choice for your install
@@ -116,13 +116,18 @@ yumUpdate () {
 ## 1.6/ Install the EPEL and remi repo
 ```bash
 # <snippet-begin 0_EPEL_REMI.sh>
-enableEPEL_REMI () {
+enableEPEL_REMI_8 () {
   sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
   sudo yum install http://rpms.remirepo.net/enterprise/remi-release-8.rpm -y
   sudo yum install yum-utils -y
   sudo dnf module enable php:remi-7.4 -y
-  [[ ${DISTRI} == "centos8stream" ]] &&sudo dnf config-manager --set-enabled powertools
-  [[ ${DISTRI} == "centos8" ]] &&sudo dnf config-manager --set-enabled powertools
+  [[ ${DISTRI} == "centos8stream" ]] && sudo dnf config-manager --set-enabled powertools
+  [[ ${DISTRI} == "centos8" ]] && sudo dnf config-manager --set-enabled powertools
+}
+enableREMI_f33 () {
+  sudo yum install http://rpms.remirepo.net/fedora/remi-release-33.rpm
+  sudo yum install yum-utils -y
+  sudo dnf module enable php:remi-7.4 -y
 }
 # <snippet-end 0_EPEL_REMI.sh>
 ```
@@ -218,7 +223,8 @@ installCoreRHEL () {
   $SUDO_WWW git config core.filemode false
 
   # Create a python3 virtualenv
-  $SUDO_WWW virtualenv-3 -p python3 $PATH_TO_MISP/venv
+  [[ -e $(which virtualenv-3 2>/dev/null) ]] && $SUDO_WWW virtualenv-3 -p python3 $PATH_TO_MISP/venv
+  [[ -e $(which virtualenv 2>/dev/null) ]] && $SUDO_WWW virtualenv -p python3 $PATH_TO_MISP/venv
   sudo mkdir /usr/share/httpd/.cache
   sudo chown $WWW_USER:$WWW_USER /usr/share/httpd/.cache
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U pip setuptools
@@ -263,7 +269,7 @@ installCoreRHEL () {
 
   # lief needs manual compilation
   sudo yum groupinstall "Development Tools" -y
-  [[ ${DISTRI} == 'rhel8.3' ]] && sudo yum install cmake3 -y && CMAKE_BIN='cmake3'
+  [[ ${DISTRI} == 'fedora33' ]] || [[ ${DISTRI} == 'rhel8.3' ]] && sudo yum install cmake3 -y && CMAKE_BIN='cmake3'
   [[ ${DISTRI} == 'centos8stream' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
   [[ ${DISTRI} == 'centos8' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
 
diff --git a/docs/generic/misp-modules-centos.md b/docs/generic/misp-modules-centos.md
index a87181da9..4f48b6101 100644
--- a/docs/generic/misp-modules-centos.md
+++ b/docs/generic/misp-modules-centos.md
@@ -7,7 +7,7 @@ mispmodulesRHEL () {
   [[ "${DIST_VER}" =~ ^[7].* ]] && sudo yum install openjpeg-devel gcc-c++ poppler-cpp-devel pkgconfig python-devel redhat-rpm-config -y
 
   # some misp-modules dependencies for RHEL8
-  [[ "${DIST_VER}" =~ ^[8].* ]] && sudo yum install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python2-devel redhat-rpm-config -y
+  ([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[8].* ]]) && sudo yum install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python2-devel redhat-rpm-config -y
 
   sudo chmod 2777 /usr/local/src
   sudo chown root:users /usr/local/src
@@ -19,7 +19,7 @@ mispmodulesRHEL () {
   ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install -U .
   ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install pyfaup censys
   # some misp-modules dependencies for RHEL<8
-  [[ "${DIST_VER}" =~ ^[7].* ]] && sudo yum install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
+  ([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[7].* ]]) && sudo yum install rubygem-rouge rubygem-asciidoctor zbar-devel opencv-devel -y
   # some misp-modules dependencies for RHEL8
   [[ "${DIST_VER}" =~ ^[8].* ]] && sudo dnf install https://packages.endpoint.com/rhel/8/main/x86_64/endpoint-repo-8-1.ep8.noarch.rpm -y && sudo yum install zbar-devel opencv-devel -y
 
diff --git a/docs/generic/supportFunctions.md b/docs/generic/supportFunctions.md
index 12b186c34..501adf81d 100644
--- a/docs/generic/supportFunctions.md
+++ b/docs/generic/supportFunctions.md
@@ -155,12 +155,13 @@ checkFlavour () {
       fi
       echo "${FLAVOUR} support is experimental at the moment"
     ;;
-    rhel|ol|sles)
+    rhel|ol|sles|fedora)
       if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
+        # FIXME: On fedora the trimming fails
         dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
-	dist_version=${dist_version:0:1}  # Only interested about major version
+        dist_version=${dist_version:0:1}  # Only interested about major version
       fi
-      # Only tested for RHEL 7 so far 
+      # FIXME: Only tested for RHEL 7 so far 
       echo "${FLAVOUR} support is experimental at the moment"
     ;;
     *)
@@ -230,7 +231,7 @@ EOF
 
 checkInstaller () {
   # Workaround: shasum is not available on RHEL, only checking sha512
-  if [[ "${FLAVOUR}" == "rhel" ]] || [[ "${FLAVOUR}" == "centos" ]]; then
+  if [[ "${FLAVOUR}" == "rhel" ]] || [[ "${FLAVOUR}" == "centos" ]] || [[ "${FLAVOUR}" == "fedora" ]]; then
   INSTsum=$(sha512sum ${0} | cut -f1 -d\ )
   /usr/bin/wget --no-cache -q -O /tmp/INSTALL.sh.sha512 https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.sh.sha512
         chsum=$(cat /tmp/INSTALL.sh.sha512)

From 4f01b44ae4350a30fbab32d7f72c818f61d7f2da Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Wed, 31 Mar 2021 19:17:58 +0900
Subject: [PATCH 434/437] chg: [doc] Further RHELL tweaks

---
 docs/INSTALL.rhel8.md                 | 33 ++++++++++++++++-----------
 docs/generic/misp-dashboard-centos.md | 10 ++++----
 docs/generic/misp-modules-centos.md   |  4 ++--
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 298073fb4..0a595b9f1 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -85,17 +85,22 @@ sudo hostnamectl set-hostname misp.local # Your choice, in a production environm
 Can be skipped if the Machine has been registered during install phase.
 ```bash
 # <snippet-begin 0_RHEL_register.sh>
-sudo subscription-manager register --auto-attach # register your system to an account and attach to a current subscription
+registerRHEL () {
+  sudo subscription-manager register --auto-attach # register your system to an account and attach to a current subscription
+}
 # <snippet-end 0_RHEL_register.sh>
 ```
 
 ## 1.4/ **[RHEL]** Enable the optional repos (obsolete in v8)
 ```bash
 # <snippet-begin 0_RHEL_SCL.sh>
-sudo subscription-manager refresh 
-# The following is needed for -devel repos and ONLY for misp-modules, ignore if not needed
-sudo subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms
-# Software Collections is available for Red Hat Enterprise Linux 7 and previous supported releases. Starting with Red Hat Enterprise Linux 8, the content traditionally consumed via Software Collections is now part of Application Streams. Please see the Application Streams Life Cycle documentation for that release. Source: https://access.redhat.com/support/policy/updates/rhscl
+enableOptionalRHEL8 () {
+  sudo subscription-manager refresh 
+
+  # The following is needed for -devel repos and ONLY for misp-modules, ignore if not needed
+  sudo subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms
+  # Software Collections is available for Red Hat Enterprise Linux 7 and previous supported releases. Starting with Red Hat Enterprise Linux 8, the content traditionally consumed via Software Collections is now part of Application Streams. Please see the Application Streams Life Cycle documentation for that release. Source: https://access.redhat.com/support/policy/updates/rhscl
+}
 # <snippet-end 0_RHEL_SCL.sh>
 ```
 
@@ -124,6 +129,7 @@ enableEPEL_REMI_8 () {
   [[ ${DISTRI} == "centos8stream" ]] && sudo dnf config-manager --set-enabled powertools
   [[ ${DISTRI} == "centos8" ]] && sudo dnf config-manager --set-enabled powertools
 }
+
 enableREMI_f33 () {
   sudo yum install http://rpms.remirepo.net/fedora/remi-release-33.rpm
   sudo yum install yum-utils -y
@@ -184,10 +190,12 @@ yumInstallCoreDeps () {
 
 ```bash
 # <snippet-begin 0_yumInstallHaveged.sh>
-# GPG needs lots of entropy, haveged provides entropy
-# /!\ Only do this if you're not running rngd to provide randomness and your kernel randomness is not sufficient.
-sudo yum install haveged -y
-sudo systemctl enable --now haveged.service
+installEntropyRHEL () {
+  # GPG needs lots of entropy, haveged provides entropy
+  # /!\ Only do this if you're not running rngd to provide randomness and your kernel randomness is not sufficient.
+  sudo yum install haveged -y
+  sudo systemctl enable --now haveged.service
+}
 # <snippet-end 0_yumInstallHaveged.sh>
 ```
 
@@ -200,14 +208,12 @@ sudo systemctl enable --now haveged.service
 sudo systemctl enable --now php-fpm.service
 ```
 
-TODO: Add a CentOS/RHEL rng thing, à la haveged (not in base anymore) or similar.
-
 ### 3/ MISP code
 ## 3.01/ Download MISP code using git in /var/www/ directory
 
 ```bash
 # <snippet-begin 1_mispCoreInstall_RHEL.sh>
-installCoreRHEL () {
+installCoreRHEL8 () {
   # Download MISP using git in the $PATH_TO_MISP directory.
   sudo mkdir -p $(dirname $PATH_TO_MISP)
   sudo chown $WWW_USER:$WWW_USER $(dirname $PATH_TO_MISP)
@@ -269,7 +275,7 @@ installCoreRHEL () {
 
   # lief needs manual compilation
   sudo yum groupinstall "Development Tools" -y
-  [[ ${DISTRI} == 'fedora33' ]] || [[ ${DISTRI} == 'rhel8.3' ]] && sudo yum install cmake3 -y && CMAKE_BIN='cmake3'
+  ([[ ${DISTRI} == 'fedora33' ]] || [[ ${DISTRI} == 'rhel8.3' ]]) && sudo yum install cmake3 -y && CMAKE_BIN='cmake3'
   [[ ${DISTRI} == 'centos8stream' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
   [[ ${DISTRI} == 'centos8' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
 
@@ -303,6 +309,7 @@ installCoreRHEL () {
 
   # The following adds a PYTHONPATH to where the pyLIEF module has been compiled
   echo /var/www/MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee /var/www/MISP/venv/lib/python3.6/site-packages/lief.pth
+  [[ "${DISTRI}" == "fedora33" ]] && (echo /var/www/MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee /var/www/MISP/venv/lib/python3.9/site-packages/lief.pth)
 
   # install magic, pydeep
 ##$SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U python-magic git+https://github.com/kbandla/pydeep.git plyara
diff --git a/docs/generic/misp-dashboard-centos.md b/docs/generic/misp-dashboard-centos.md
index 41b4fa8b8..a67a3e955 100644
--- a/docs/generic/misp-dashboard-centos.md
+++ b/docs/generic/misp-dashboard-centos.md
@@ -5,7 +5,7 @@
     A valid MaxMind DB key is required.
 
 !!! warning
-    Does not work on RHEL 8
+    Does not work fully on RHEL 8
 
 ```bash
 # <snippet-begin 4_misp-dashboardRHEL.sh>
@@ -21,9 +21,11 @@ mispDashboard () {
   sudo -H /var/www/misp-dashboard/install_dependencies.sh
   sudo sed -i "s/^host\ =\ localhost/host\ =\ 0.0.0.0/g" /var/www/misp-dashboard/config/config.cfg
   sudo sed -i '/Listen 80/a Listen 0.0.0.0:8001' /etc/httpd/conf/httpd.conf
-  sudo yum install rh-python36-mod_wsgi -y
-  sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/
-  sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/
+  # TODO: Check if this works on 7.x
+  [[ "${DIST_VER}" =~ ^[7].* ]] && sudo yum install rh-python36-mod_wsgi -y
+  [[ "${DIST_VER}" =~ ^[7].* ]] && sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/
+  [[ "${DIST_VER}" =~ ^[7].* ]] && sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/
+  ([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[8].* ]]) && sudo yum install python3-mod_wsgi -y
 
   echo "<VirtualHost *:8001>
       ServerAdmin admin@misp.local
diff --git a/docs/generic/misp-modules-centos.md b/docs/generic/misp-modules-centos.md
index 4f48b6101..024721ccc 100644
--- a/docs/generic/misp-modules-centos.md
+++ b/docs/generic/misp-modules-centos.md
@@ -4,10 +4,10 @@
 # <snippet-begin 3_misp-modules_RHEL.sh>
 mispmodulesRHEL () {
   # some misp-modules dependencies for RHEL<8
-  [[ "${DIST_VER}" =~ ^[7].* ]] && sudo yum install openjpeg-devel gcc-c++ poppler-cpp-devel pkgconfig python-devel redhat-rpm-config -y
+  [[ "${DIST_VER}" =~ ^[7].* ]] && sudo yum install openjpeg-devel gcc-c++ poppler-cpp-devel pkgconfig python3-devel redhat-rpm-config -y
 
   # some misp-modules dependencies for RHEL8
-  ([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[8].* ]]) && sudo yum install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python2-devel redhat-rpm-config -y
+  ([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[8].* ]]) && sudo yum install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python3-devel redhat-rpm-config -y
 
   sudo chmod 2777 /usr/local/src
   sudo chown root:users /usr/local/src

From 381c441df02f413893b564f35eac802a2b0d5674 Mon Sep 17 00:00:00 2001
From: chrisr3d <chris.studer.68@gmail.com>
Date: Wed, 31 Mar 2021 13:25:11 +0200
Subject: [PATCH 435/437] add: [module results] Catching MISP Objects
 first_seen & last_seen values

- Will probably also check at attribute level to
  have it too if needed
---
 app/View/Events/resolved_misp_format.ctp | 10 +++++++++-
 app/webroot/js/misp.js                   |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/View/Events/resolved_misp_format.ctp b/app/View/Events/resolved_misp_format.ctp
index e21c27900..dc3111d98 100644
--- a/app/View/Events/resolved_misp_format.ctp
+++ b/app/View/Events/resolved_misp_format.ctp
@@ -177,7 +177,15 @@
                     }
                 ?>
                 <span class="bold"><?php echo __('UUID: ');?></span><span class="ObjectUUID"><?php echo h($object['uuid']); ?></span><br />
-                <span class="bold"><?php echo __('Meta Category: ');?></span><span class="ObjectMetaCategory"><?php echo h($object['meta-category']); ?></span>
+                <span class="bold"><?php echo __('Meta Category: ');?></span><span class="ObjectMetaCategory"><?php echo h($object['meta-category']); ?></span><br />
+                <?php
+                    if (!empty($object['first_seen'])) {
+                        echo '<span class="bold">First seen: </span><span class="ObjectFirstSeen">' . h($object['first_seen']) . '</span><br/>';
+                    }
+                    if (!empty($object['last_seen'])) {
+                        echo '<span class="bold">Last seen: </span><span class="ObjectLastSeen">' . h($object['last_seen']) . '</span><br/>';
+                    }
+                ?>
               </div>
               <span class="bold"><?php echo __('References: ')?></span>
               <?php
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index a9c318c6d..fc75874d9 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -2803,6 +2803,12 @@ function moduleResultsSubmit(id) {
             if ($(this).has('.TemplateUUID').length) {
                 temp['template_uuid'] = $(this).find('.TemplateUUID').text();
             }
+            if ($(this).has('.ObjectFirstSeen').length) {
+                temp['first_seen'] = $(this).find('.ObjectFirstSeen').text();
+            }
+            if ($(this).has('.ObjectLastSeen').length) {
+                temp['last_seen'] = $(this).find('.ObjectLastSeen').text();
+            }
             if ($(this).has('.ObjectReference').length) {
                 var references = [];
                 $(this).find('.ObjectReference').each(function() {

From 25c67bf06a809c83a76bb3eb2297ae8e1214274a Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 1 Apr 2021 14:26:33 +0900
Subject: [PATCH 436/437] chf: [doc] More amendments to RHEL8

---
 docs/INSTALL.rhel8.md | 144 +++++++++++++++++++++---------------------
 1 file changed, 73 insertions(+), 71 deletions(-)

diff --git a/docs/INSTALL.rhel8.md b/docs/INSTALL.rhel8.md
index 0a595b9f1..d90850099 100644
--- a/docs/INSTALL.rhel8.md
+++ b/docs/INSTALL.rhel8.md
@@ -4,7 +4,8 @@
 ### -2/ RHEL8/CentOS8/CentOS_Stream/Fedora33 - status
 -------------------------
 !!! notice
-    MISP-core and misp-modules Tested working by [@SteveClement](https://twitter.com/SteveClement) on 20210326
+    Tested fully working without SELinux by [@SteveClement](https://twitter.com/SteveClement) on 20210401
+    TODO: Fix SELinux permissions, *pull-requests welcome*.
 
 !!! notice
     This document also serves as a source for the [INSTALL-misp.sh](https://github.com/MISP/MISP/blob/2.4/INSTALL/INSTALL.sh) script.
@@ -106,14 +107,14 @@ enableOptionalRHEL8 () {
 
 ## 1.5a/ Install the deltarpm package to help reduce download size when installing updates (optional)
 ```bash
-sudo yum install drpm -y
+sudo dnf install drpm -y
 ```
 
 ## 1.5/ Update the system and reboot
 ```bash
 # <snippet-begin 0_yum-update.sh>
 yumUpdate () {
-  sudo yum update -y
+  sudo dnf update -y
 }
 # <snippet-end 0_yum-update.sh>
 ```
@@ -122,17 +123,17 @@ yumUpdate () {
 ```bash
 # <snippet-begin 0_EPEL_REMI.sh>
 enableEPEL_REMI_8 () {
-  sudo yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
-  sudo yum install http://rpms.remirepo.net/enterprise/remi-release-8.rpm -y
-  sudo yum install yum-utils -y
+  sudo dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
+  sudo dnf install http://rpms.remirepo.net/enterprise/remi-release-8.rpm -y
+  sudo dnf install dnf-utils -y
   sudo dnf module enable php:remi-7.4 -y
   [[ ${DISTRI} == "centos8stream" ]] && sudo dnf config-manager --set-enabled powertools
   [[ ${DISTRI} == "centos8" ]] && sudo dnf config-manager --set-enabled powertools
 }
 
 enableREMI_f33 () {
-  sudo yum install http://rpms.remirepo.net/fedora/remi-release-33.rpm
-  sudo yum install yum-utils -y
+  sudo dnf install http://rpms.remirepo.net/fedora/remi-release-33.rpm
+  sudo dnf install dnf-utils -y
   sudo dnf module enable php:remi-7.4 -y
 }
 # <snippet-end 0_EPEL_REMI.sh>
@@ -153,8 +154,8 @@ yumInstallCoreDeps () {
   # Install the dependencies:
   PHP_BASE="/etc/"
   PHP_INI="/etc/php.ini"
-  sudo yum install @httpd -y
-  sudo yum install gcc git zip \
+  sudo dnf install @httpd -y
+  sudo dnf install gcc git zip \
                    httpd \
                    mod_ssl \
                    redis \
@@ -170,7 +171,7 @@ yumInstallCoreDeps () {
   sudo systemctl enable --now redis.service
 
   # Install PHP 7.4 from Remi's repo, see https://rpms.remirepo.net/enterprise/8/php74/x86_64/repoview/
-  sudo yum install php php-fpm php-devel \
+  sudo dnf install php php-fpm php-devel \
                    php-mysqlnd \
                    php-mbstring \
                    php-xml \
@@ -193,7 +194,7 @@ yumInstallCoreDeps () {
 installEntropyRHEL () {
   # GPG needs lots of entropy, haveged provides entropy
   # /!\ Only do this if you're not running rngd to provide randomness and your kernel randomness is not sufficient.
-  sudo yum install haveged -y
+  sudo dnf install haveged -y
   sudo systemctl enable --now haveged.service
 }
 # <snippet-end 0_yumInstallHaveged.sh>
@@ -213,6 +214,46 @@ sudo systemctl enable --now php-fpm.service
 
 ```bash
 # <snippet-begin 1_mispCoreInstall_RHEL.sh>
+compileLiefRHEL8 () {
+  cd $PATH_TO_MISP/app/files/scripts
+  $SUDO_WWW git clone --branch master --single-branch https://github.com/lief-project/LIEF.git lief
+  # lief might need manual compilation
+  sudo dnf groupinstall "Development Tools" -y
+
+  cd $PATH_TO_MISP/app/files/scripts/lief
+  $SUDO_WWW git config core.filemode false
+  $SUDO_WWW mkdir build
+  cd build
+  $SUDO_WWW ${CMAKE_BIN} \
+    -DLIEF_PYTHON_API=on \
+    -DPYTHON_VERSION=3.6 \
+    -DPYTHON_EXECUTABLE=$PATH_TO_MISP/venv/bin/python \
+    -DLIEF_DOC=off \
+    -DCMAKE_BUILD_TYPE=Release \
+  ..
+  $SUDO_WWW make -j3 pyLIEF
+
+  if [ $? == 2 ]; then
+    # In case you get "internal compiler error: Killed (program cc1plus)"
+    # You ran out of memory.
+    # Create some swap
+    TEMP_DIR=$(mktemp -d)
+    TEMP_SWAP=${TEMP_DIR}/swap.img
+    sudo dd if=/dev/zero of=${TEMP_SWAP} bs=1024k count=4000
+    sudo mkswap ${TEMP_SWAP}
+    sudo swapon ${TEMP_SWAP}
+    # And compile again
+    ${SUDO_WWW} make -j3 pyLIEF
+    sudo swapoff ${TEMP_SWAP}
+    sudo rm -r ${TEMP_DIR}
+  fi
+
+  # The following adds a PYTHONPATH to where the pyLIEF module has been compiled
+  echo /var/www/MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee /var/www/MISP/venv/lib/python3.6/site-packages/lief.pth
+  [[ "${DISTRI}" == "fedora33" ]] && (echo /var/www/MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee /var/www/MISP/venv/lib/python3.9/site-packages/lief.pth)
+$SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U python-magic plyara
+}
+
 installCoreRHEL8 () {
   # Download MISP using git in the $PATH_TO_MISP directory.
   sudo mkdir -p $(dirname $PATH_TO_MISP)
@@ -238,12 +279,15 @@ installCoreRHEL8 () {
   cd $PATH_TO_MISP/app/files/scripts
   $SUDO_WWW git clone https://github.com/CybOXProject/python-cybox.git
   $SUDO_WWW git clone https://github.com/STIXProject/python-stix.git
-  $SUDO_WWW git clone --branch master --single-branch https://github.com/lief-project/LIEF.git lief
   $SUDO_WWW git clone https://github.com/CybOXProject/mixbox.git
 
   cd $PATH_TO_MISP/app/files/scripts/python-cybox
   $SUDO_WWW git config core.filemode false
   # If you umask is has been changed from the default, it is a good idea to reset it to 0022 before installing python modules
+  ([[ ${DISTRI} == 'fedora33' ]] || [[ ${DISTRI} == 'rhel8.3' ]]) && sudo dnf install cmake3 -y && CMAKE_BIN='cmake3'
+  [[ ${DISTRI} == 'centos8stream' ]] && sudo dnf install cmake -y && CMAKE_BIN='cmake'
+  [[ ${DISTRI} == 'centos8' ]] && sudo dnf install cmake -y && CMAKE_BIN='cmake'
+
   UMASK=$(umask)
   umask 0022
 
@@ -264,56 +308,14 @@ installCoreRHEL8 () {
   cd $PATH_TO_MISP/cti-python-stix2
   $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install .
 
-  # install maec
-  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U maec
-
-  # install zmq
-  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U zmq
-
-  # install redis
-  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U redis
-
-  # lief needs manual compilation
-  sudo yum groupinstall "Development Tools" -y
-  ([[ ${DISTRI} == 'fedora33' ]] || [[ ${DISTRI} == 'rhel8.3' ]]) && sudo yum install cmake3 -y && CMAKE_BIN='cmake3'
-  [[ ${DISTRI} == 'centos8stream' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
-  [[ ${DISTRI} == 'centos8' ]] && sudo yum install cmake -y && CMAKE_BIN='cmake'
-
-  cd $PATH_TO_MISP/app/files/scripts/lief
-  $SUDO_WWW git config core.filemode false
-  $SUDO_WWW mkdir build
-  cd build
-  $SUDO_WWW ${CMAKE_BIN} \
-  -DLIEF_PYTHON_API=on \
-  -DPYTHON_VERSION=3.6 \
-  -DPYTHON_EXECUTABLE=$PATH_TO_MISP/venv/bin/python \
-  -DLIEF_DOC=off \
-  -DCMAKE_BUILD_TYPE=Release \
-  ..
-  $SUDO_WWW make -j3 pyLIEF
-
-  if [ $? == 2 ]; then
-    # In case you get "internal compiler error: Killed (program cc1plus)"
-    # You ran out of memory.
-    # Create some swap
-    TEMP_DIR=$(mktemp -d)
-    TEMP_SWAP=${TEMP_DIR}/swap.img
-    sudo dd if=/dev/zero of=${TEMP_SWAP} bs=1024k count=4000
-    sudo mkswap ${TEMP_SWAP}
-    sudo swapon ${TEMP_SWAP}
-    # And compile again
-    ${SUDO_WWW} make -j3 pyLIEF
-    sudo swapoff ${TEMP_SWAP}
-    sudo rm -r ${TEMP_DIR}
-  fi
-
-  # The following adds a PYTHONPATH to where the pyLIEF module has been compiled
-  echo /var/www/MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee /var/www/MISP/venv/lib/python3.6/site-packages/lief.pth
-  [[ "${DISTRI}" == "fedora33" ]] && (echo /var/www/MISP/app/files/scripts/lief/build/api/python |$SUDO_WWW tee /var/www/MISP/venv/lib/python3.9/site-packages/lief.pth)
+  # install maec, zmq, redis
+  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U maec zmq redis
 
   # install magic, pydeep
-##$SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U python-magic git+https://github.com/kbandla/pydeep.git plyara
-  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U python-magic plyara
+  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U python-magic git+https://github.com/kbandla/pydeep.git plyara
+
+  # install lief
+  $SUDO_WWW $PATH_TO_MISP/venv/bin/pip install -U lief || compileLiefRHEL8
 
   # install PyMISP
   cd $PATH_TO_MISP/PyMISP
@@ -321,7 +323,7 @@ installCoreRHEL8 () {
 
   # FIXME: Remove libfaup etc once the egg has the library baked-in
   # BROKEN: This needs to be tested on RHEL/CentOS
-  sudo yum install libcaca-devel -y
+  sudo dnf install libcaca-devel -y
   cd /tmp
   [[ ! -d "faup" ]] && $SUDO_CMD git clone https://github.com/stricaud/faup.git faup
   [[ ! -d "gtcaca" ]] && $SUDO_CMD git clone https://github.com/stricaud/gtcaca.git gtcaca
@@ -341,12 +343,12 @@ installCoreRHEL8 () {
   # Enable dependencies detection in the diagnostics page
   # This allows MISP to detect GnuPG, the Python modules' versions and to read the PHP settings.
   echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" |sudo tee -a ${PHP_BASE}/php-fpm.d/www.conf
-  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' ${PHP_BASE}/php-fpm.d/www.conf  # TODO check if below is different on RHEL8 php74-php-fpm.service also dbl check paths
+  sudo sed -i.org -e 's/^;\(clear_env = no\)/\1/' ${PHP_BASE}/php-fpm.d/www.conf
   sudo sed -i.org -e 's/^\(listen =\) \/run\/php-fpm\/www\.sock/\1 127.0.0.1:9000/' ${PHP_BASE}/php-fpm.d/www.conf
 
-  sudo systemctl restart php-fpm.service
-
   umask $UMASK
+
+  sudo systemctl restart php-fpm.service
 }
 # <snippet-end 1_mispCoreInstall_RHEL.sh>
 ```
@@ -359,7 +361,7 @@ installCoreRHEL8 () {
 
 ```bash
 # <snippet-begin 1_installCake_RHEL.sh>
-installCake_RHEL ()
+installCake_RHEL8 ()
 {
   sudo chown -R $WWW_USER:$WWW_USER $PATH_TO_MISP
   sudo mkdir /usr/share/httpd/.composer
@@ -372,7 +374,7 @@ installCake_RHEL ()
   #$SUDO_WWW php -r "unlink('composer-setup.php');"
   $SUDO_WWW php composer.phar install
 
-  sudo yum install php-pecl-redis php-pecl-ssdeep php-pecl-gnupg -y
+  sudo dnf install php-pecl-redis php-pecl-ssdeep php-pecl-gnupg -y
 
   sudo systemctl restart php-fpm.service
 
@@ -403,7 +405,7 @@ installCake_RHEL ()
 ```bash
 # <snippet-begin 2_permissions_RHEL.sh>
 # Main function to fix permissions to something sane
-permissions_RHEL () {
+permissions_RHEL8 () {
   sudo chown -R $WWW_USER:$WWW_USER $PATH_TO_MISP
   ## ? chown -R root:$WWW_USER $PATH_TO_MISP
   sudo find $PATH_TO_MISP -type d -exec chmod g=rx {} \;
@@ -432,7 +434,7 @@ permissions_RHEL () {
 ## 6.01/ Set database to listen on localhost only
 ```bash
 # <snippet-begin 1_prepareDB_RHEL.sh>
-prepareDB_RHEL () {
+prepareDB_RHEL8 () {
   # Enable, start and secure your mysql database server
   sudo systemctl enable --now mariadb.service
   echo [mysqld] |sudo tee /etc/my.cnf.d/bind-address.cnf
@@ -475,7 +477,7 @@ prepareDB_RHEL () {
 
 ```bash
 # <snippet-begin 1_apacheConfig_RHEL.sh>
-apacheConfig_RHEL () {
+apacheConfig_RHEL8 () {
   # Now configure your apache server with the DocumentRoot $PATH_TO_MISP/app/webroot/
   # A sample vhost can be found in $PATH_TO_MISP/INSTALL/apache.misp.centos7
 
@@ -510,7 +512,7 @@ apacheConfig_RHEL () {
   sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Console/worker/*.sh"
   sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*.py"
   sudo sh -c "chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/*/*.py"
-  sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/lief/build/api/python/lief.so
+  [[ -e ${PATH_TO_MISP}/app/files/scripts/lief/build/api/python/lief.so ]] && sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/files/scripts/lief/build/api/python/lief.so
   sudo chcon -t httpd_sys_script_exec_t $PATH_TO_MISP/app/Vendor/pear/crypt_gpg/scripts/crypt-gpg-pinentry
   sudo sh -c "chcon -R -t bin_t $PATH_TO_MISP/venv/bin/*"
   sudo find $PATH_TO_MISP/venv -type f -name "*.so*" -or -name "*.so.*" | xargs sudo chcon -t lib_t

From 1fc7fc5a49253ecfd3cffb8432ea9ccb7cd9deda Mon Sep 17 00:00:00 2001
From: Steve Clement <steve@localhost.lu>
Date: Thu, 1 Apr 2021 14:27:19 +0900
Subject: [PATCH 437/437] chg: [doc] Updated cake config defaults

---
 docs/generic/MISP_CAKE_init.md      | 102 ++++++++++++++++++++++++++--
 docs/generic/misp-dashboard-cake.md |  15 ++--
 docs/generic/misp-modules-cake.md   |  37 +++++++---
 3 files changed, 135 insertions(+), 19 deletions(-)

diff --git a/docs/generic/MISP_CAKE_init.md b/docs/generic/MISP_CAKE_init.md
index 807a6b9c1..314fba1ed 100644
--- a/docs/generic/MISP_CAKE_init.md
+++ b/docs/generic/MISP_CAKE_init.md
@@ -27,13 +27,13 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Session.cookieTimeout" 3600
 
   # Change base url, either with this CLI command or in the UI
-  $SUDO_WWW $RUN_PHP -- $CAKE Baseurl $MISP_BASEURL
+  [[ ! -z ${MISP_BASEURL} ]] && $SUDO_WWW $RUN_PHP -- $CAKE Baseurl $MISP_BASEURL
   # example: 'baseurl' => 'https://<your.FQDN.here>',
   # alternatively, you can leave this field empty if you would like to use relative pathing in MISP
   # 'baseurl' => '',
   # 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.
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.external_baseurl" $MISP_BASEURL
+  [[ ! -z ${MISP_BASEURL} ]] && $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.external_baseurl" $MISP_BASEURL
 
   # Enable GnuPG
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "GnuPG.email" "$GPG_EMAIL_ADDRESS"
@@ -69,8 +69,54 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Sightings_range" 365
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Sightings_sighting_db_enable" false
 
-  # Plugin Enrichment hover defaults
-  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.Enrichment_hover_popover_only" false
+  # Set API_Required modules to false
+  for PLUG in $(echo "Plugin.Enrichment_cuckoo_submit_enabled
+                      Plugin.Enrichment_vmray_submit_enabled
+                      Plugin.Enrichment_circl_passivedns_enabled
+                      Plugin.Enrichment_circl_passivessl_enabled
+                      Plugin.Enrichment_domaintools_enabled
+                      Plugin.Enrichment_eupi_enabled
+                      Plugin.Enrichment_farsight_passivedns_enabled
+                      Plugin.Enrichment_passivetotal_enabled
+                      Plugin.Enrichment_passivetotal_enabled
+                      Plugin.Enrichment_virustotal_enabled
+                      Plugin.Enrichment_whois_enabled
+                      Plugin.Enrichment_shodan_enabled
+                      Plugin.Enrichment_geoip_asn_enabled
+                      Plugin.Enrichment_geoip_city_enabled
+                      Plugin.Enrichment_geoip_country_enabled
+                      Plugin.Enrichment_iprep_enabled
+                      Plugin.Enrichment_otx_enabled
+                      Plugin.Enrichment_vulndb_enabled
+                      Plugin.Enrichment_crowdstrike_falcon_enabled
+                      Plugin.Enrichment_onyphe_enabled
+                      Plugin.Enrichment_xforceexchange_enabled
+                      Plugin.Enrichment_vulners_enabled
+                      Plugin.Enrichment_macaddress_io_enabled
+                      Plugin.Enrichment_intel471_enabled
+                      Plugin.Enrichment_backscatter_io_enabled
+                      Plugin.Enrichment_hibp_enabled
+                      Plugin.Enrichment_greynoise_enabled
+                      Plugin.Enrichment_joesandbox_submit_enabled
+                      Plugin.Enrichment_virustotal_public_enabled
+                      Plugin.Enrichment_apiosintds_enabled
+                      Plugin.Enrichment_urlscan_enabled
+                      Plugin.Enrichment_securitytrails_enabled
+                      Plugin.Enrichment_apivoid_enabled
+                      Plugin.Enrichment_assemblyline_submit_enabled
+                      Plugin.Enrichment_assemblyline_query_enabled
+                      Plugin.Enrichment_ransomcoindb_enabled
+                      Plugin.Enrichment_lastline_query_enabled
+                      Plugin.Enrichment_sophoslabs_intelix_enabled
+                      Plugin.Enrichment_cytomic_orion_enabled
+                      Plugin.Enrichment_censys_enrich_enabled
+                      Plugin.Enrichment_trustar_enrich_enabled
+                      Plugin.Enrichment_recordedfuture_enabled
+                      Plugin.ElasticSearch_logging_enable
+                      Plugin.S3_enable"); do
+
+    ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting ${PLUG} false
+  done
 
   # Plugin CustomAuth tuneable
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.CustomAuth_disable_logout" false
@@ -88,6 +134,52 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.RPZ_ns_alt" ""
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Plugin.RPZ_email" "root.localhost"
 
+  # Kafka settings
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_brokers" "kafka:9092"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_rdkafka_config" "/etc/rdkafka.ini"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_include_attachments" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_event_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_event_notifications_topic" "misp_event"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_event_publish_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_event_publish_notifications_topic" "misp_event_publish"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_object_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_object_notifications_topic" "misp_object"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_object_reference_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_object_reference_notifications_topic" "misp_object_reference"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_attribute_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_attribute_notifications_topic" "misp_attribute"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_shadow_attribute_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_shadow_attribute_notifications_topic" "misp_shadow_attribute"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_tag_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_tag_notifications_topic" "misp_tag"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_sighting_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_sighting_notifications_topic" "misp_sighting"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_user_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_user_notifications_topic" "misp_user"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_organisation_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_organisation_notifications_topic" "misp_organisation"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_audit_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Kafka_audit_notifications_topic" "misp_audit"
+
+  # ZeroMQ settings
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_host" "127.0.0.1"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_port" 50000
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_host" "localhost"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_port" 6379
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_database" 1
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_namespace" "mispq"
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_event_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_object_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_object_reference_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_attribute_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_sighting_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_user_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_organisation_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_include_attachments" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_tag_notifications_enable" false
+
   # Force defaults to make MISP Server Settings less RED
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.language" "eng"
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.proposals_block_attributes" false
@@ -128,6 +220,7 @@ coreCAKE () {
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.welcome_text_bottom" "Welcome to MISP on $FLAVOUR, change this message in MISP Settings"
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.attachments_dir" "$PATH_TO_MISP/app/files"
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.download_attachments_on_load" true
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.event_alert_metadata_only" false
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.title_text" "MISP"
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.terms_download" false
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "MISP.showorgalternate" false
@@ -136,6 +229,7 @@ coreCAKE () {
   # Force defaults to make MISP Server Settings less GREEN
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "debug" 0
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.auth_enforced" false
+  $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.log_each_individual_auth_fail" false
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.rest_client_baseurl" ""
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.advanced_authkeys" false
   $SUDO_WWW $RUN_PHP -- $CAKE Admin setSetting "Security.password_policy_length" 12
diff --git a/docs/generic/misp-dashboard-cake.md b/docs/generic/misp-dashboard-cake.md
index fc4ce4db4..e0ee03081 100644
--- a/docs/generic/misp-dashboard-cake.md
+++ b/docs/generic/misp-dashboard-cake.md
@@ -3,20 +3,21 @@
 dashboardCAKE () {
   # Enable ZeroMQ for misp-dashboard
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_enable" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_event_notifications_enable" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_object_notifications_enable" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_object_reference_notifications_enable" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_attribute_notifications_enable" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_sighting_notifications_enable" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_user_notifications_enable" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_organisation_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_host" "127.0.0.1"
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_port" 50000
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_host" "localhost"
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_port" 6379
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_database" 1
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_redis_namespace" "mispq"
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_include_attachments" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_event_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_object_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_object_reference_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_attribute_notifications_enable" true
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_tag_notifications_enable" false
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_sighting_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_user_notifications_enable" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_organisation_notifications_enable" true
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.ZeroMQ_audit_notifications_enable" false
 }
 # <snippet-end 4_misp-dashboard-cake.sh>
diff --git a/docs/generic/misp-modules-cake.md b/docs/generic/misp-modules-cake.md
index 0383bd28e..e0e2e23f1 100644
--- a/docs/generic/misp-modules-cake.md
+++ b/docs/generic/misp-modules-cake.md
@@ -7,20 +7,41 @@ modulesCAKE () {
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_hover_popover_only" false
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_hover_timeout" 150
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_timeout" 300
-  # TODO:"Investigate why the next one fails"
-  #${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_asn_history_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_bgpranking_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_countrycode_enabled" true
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_cve_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_cve_advanced_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_cpe_enabled" true
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_dns_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_eql_enabled" true
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_btc_steroids_enabled" true
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_ipasn_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_reversedns_enabled" true
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_yara_syntax_validator_enabled" true
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_yara_query_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_pdf_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_docx_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_xlsx_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_pptx_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_ods_enabled" true
-  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_odt_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_wiki_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_threatminer_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_threatcrowd_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_hashdd_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_rbl_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_sigma_syntax_validator_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_stix2_pattern_syntax_validator_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_sigma_queries_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_dbl_spamhaus_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_btc_scam_check_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_macvendors_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_qrcode_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_ocr_enrich_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_pdf_enrich_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_docx_enrich_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_xlsx_enrich_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_pptx_enrich_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_ods_enrich_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_odt_enrich_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_urlhaus_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_malwarebazaar_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_html_to_markdown_enabled" true
+  ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_socialscan_enabled" true
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_services_url" "http://127.0.0.1"
   ${SUDO_WWW} ${RUN_PHP} -- ${CAKE} Admin setSetting "Plugin.Enrichment_services_port" 6666